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

llvm-core/clang: Remove old

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

 llvm-core/clang/Manifest                        |   8 -
 llvm-core/clang/clang-21.1.5.ebuild             | 467 ------------------------
 llvm-core/clang/clang-21.1.6.ebuild             | 467 ------------------------
 llvm-core/clang/clang-21.1.7.ebuild             | 467 ------------------------
 llvm-core/clang/clang-22.0.0_pre20251108.ebuild | 465 -----------------------
 llvm-core/clang/clang-22.0.0_pre20251120.ebuild | 465 -----------------------
 6 files changed, 2339 deletions(-)

diff --git a/llvm-core/clang/Manifest b/llvm-core/clang/Manifest
index c5edbe4fb187..6060cf0f5c31 100644
--- a/llvm-core/clang/Manifest
+++ b/llvm-core/clang/Manifest
@@ -9,7 +9,6 @@ DIST llvm-gentoo-patchset-15.0.7-r8.tar.xz 27904 BLAKE2B 
1fc5df0dc44484ea0225438
 DIST llvm-gentoo-patchset-16.0.6-r6.tar.xz 21672 BLAKE2B 
b52c29a7c19b60ccd076c01014e374e35aa5da061917cdc6a9d321f9386ce4e9286d5a7cccfffc23e0f6737c6eeb32ef4ab030b9d3165f528d1c657b53b6ab17
 SHA512 
f8a6cdaded545219107505c57b194b3f4df8ee7a2f1f0756b8e8884633e389ad7462445e1522414615210c0a4407a0358c84882366a475441f681a2ba75dc985
 DIST llvm-gentoo-patchset-17.0.6-r4.tar.xz 6636 BLAKE2B 
7b53f4b19e19b3493878ae9db925bfd07e81564e2ef01b10e6d7aa774a64928fd8d991a734ae5eca6a984489e18c288240187d2fe94f3b855643553e5fdaf024
 SHA512 
feffdd99b80f53c562ff2664b9b8a886132e400f1bc378e52d5f4559ee6a4139c5e7c4faee4fe015ce93ed4cff3a4b03844321254f3102b1f70f066ea84f7c10
 DIST llvm-gentoo-patchset-18.1.8-r7.tar.xz 26644 BLAKE2B 
8d7bbbd363bd646fc139405a10f094aa314a19401fec7ba52e89ee200d304fc958e32886f607f59704a163ee2adf416be2756a9cda5a8394ce2bb9a2392a6f3f
 SHA512 
e534f49c1a0428a490ef718e668e2db3294da181a835953457d29b711b1b3a5821d42f6ae81cfdac39c58302dd868652827ea4a04bc3aa2c147ab5c0a4d58a26
-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
@@ -22,14 +21,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/clang-21.1.5.ebuild 
b/llvm-core/clang/clang-21.1.5.ebuild
deleted file mode 100644
index b2c9b8c2d5f6..000000000000
--- a/llvm-core/clang/clang-21.1.5.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-
-inherit cmake llvm.org multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/";
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~arm64-macos ~x64-macos"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       ~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-       static-analyzer? ( dev-lang/perl:* )
-       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-       ${PYTHON_DEPS}
-       ${DEPEND}
-       >=llvm-core/clang-common-${PV}
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       test? ( ~llvm-core/lld-${PV} )
-       xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-       ~llvm-runtimes/clang-runtime-${PV}
-       llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-       clang clang-tools-extra cmake
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-       llvm/utils
-)
-LLVM_USE_TARGETS=llvm+eq
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-       $(python_gen_cond_dep '
-               dev-python/myst-parser[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       ')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-       # create extra parent dir for relative CLANG_RESOURCE_DIR access
-       mkdir -p x/y || die
-       BUILD_DIR=${WORKDIR}/x/y/clang
-
-       llvm.org_src_prepare
-
-       # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-       eprefixify \
-               lib/Lex/InitHeaderSearch.cpp \
-               lib/Driver/ToolChains/Darwin.cpp || die
-
-       if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-               sed -i "/LibDir.*Loader/s@return \"\/\"@return 
\"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-       fi
-}
-
-check_distribution_components() {
-       if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-               local all_targets=() my_targets=() l
-               cd "${BUILD_DIR}" || die
-
-               while read -r l; do
-                       if [[ ${l} == install-*-stripped:* ]]; then
-                               l=${l#install-}
-                               l=${l%%-stripped*}
-
-                               case ${l} in
-                                       # meta-targets
-                                       clang-libraries|distribution)
-                                               continue
-                                               ;;
-                                       # tools
-                                       clang|clangd|clang-*)
-                                               ;;
-                                       # static libraries
-                                       clang*|findAllSymbols)
-                                               continue
-                                               ;;
-                                       # conditional to USE=doc
-                                       docs-clang-html|docs-clang-tools-html)
-                                               use doc || continue
-                                               ;;
-                               esac
-
-                               all_targets+=( "${l}" )
-                       fi
-               done < <(${NINJA} -t targets all)
-
-               while read -r l; do
-                       my_targets+=( "${l}" )
-               done < <(get_distribution_components $"\n")
-
-               local add=() remove=()
-               for l in "${all_targets[@]}"; do
-                       if ! has "${l}" "${my_targets[@]}"; then
-                               add+=( "${l}" )
-                       fi
-               done
-               for l in "${my_targets[@]}"; do
-                       if ! has "${l}" "${all_targets[@]}"; then
-                               remove+=( "${l}" )
-                       fi
-               done
-
-               if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-                       eerror "get_distribution_components() is outdated!"
-                       eerror "   Add: ${add[*]}"
-                       eerror "Remove: ${remove[*]}"
-                       die "Update get_distribution_components()!"
-               fi
-               cd - >/dev/null || die
-       fi
-}
-
-get_distribution_components() {
-       local sep=${1-;}
-
-       local out=(
-               # common stuff
-               clang-cmake-exports
-               clang-headers
-               clang-resource-headers
-               libclang-headers
-
-               aarch64-resource-headers
-               arm-common-resource-headers
-               arm-resource-headers
-               core-resource-headers
-               cuda-resource-headers
-               hexagon-resource-headers
-               hip-resource-headers
-               hlsl-resource-headers
-               mips-resource-headers
-               opencl-resource-headers
-               openmp-resource-headers
-               ppc-htm-resource-headers
-               ppc-resource-headers
-               riscv-resource-headers
-               spirv-resource-headers
-               systemz-resource-headers
-               utility-resource-headers
-               ve-resource-headers
-               webassembly-resource-headers
-               windows-resource-headers
-               x86-resource-headers
-
-               # libs
-               clang-cpp
-               libclang
-       )
-
-       if multilib_is_native_abi; then
-               out+=(
-                       # common stuff
-                       bash-autocomplete
-                       libclang-python-bindings
-
-                       # tools
-                       c-index-test
-                       clang
-                       clang-format
-                       clang-installapi
-                       clang-linker-wrapper
-                       clang-nvlink-wrapper
-                       clang-offload-bundler
-                       clang-offload-packager
-                       clang-refactor
-                       clang-repl
-                       clang-scan-deps
-                       clang-sycl-linker
-                       diagtool
-                       hmaptool
-                       offload-arch
-
-                       # needed for cross-compiling Clang
-                       clang-tblgen
-               )
-
-               if use extra; then
-                       out+=(
-                               # extra tools
-                               clang-apply-replacements
-                               clang-change-namespace
-                               clang-doc
-                               clang-include-cleaner
-                               clang-include-fixer
-                               clang-move
-                               clang-query
-                               clang-reorder-fields
-                               clang-tidy
-                               clang-tidy-headers
-                               clangd
-                               find-all-symbols
-                               modularize
-                               pp-trace
-                       )
-
-                       use kernel_Darwin && out+=( ClangdXPCLib )
-               fi
-
-               if llvm_are_manpages_built; then
-                       out+=( docs-clang-man )
-                       use extra && out+=( docs-clang-tools-man )
-               fi
-
-               if use doc; then
-                       out+=( docs-clang-html )
-                       use extra && out+=( docs-clang-tools-html )
-               fi
-
-               use static-analyzer && out+=(
-                       clang-check
-                       clang-extdef-mapping
-                       scan-build
-                       scan-build-py
-                       scan-view
-               )
-       fi
-
-       printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-       local mycmakeargs=(
-               -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang/${LLVM_MAJOR}"
-               -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
-               # relative to bindir
-               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-               -DBUILD_SHARED_LIBS=OFF
-               -DCLANG_LINK_CLANG_DYLIB=ON
-               -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-               -DCLANG_INCLUDE_TESTS=$(usex test)
-
-               -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-               # these are not propagated reliably, so redefine them
-               -DLLVM_ENABLE_EH=ON
-               -DLLVM_ENABLE_RTTI=ON
-
-               # libgomp support fails to find headers without explicit -I
-               # furthermore, it provides only syntax checking
-               -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-               -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-               -DCLANG_ENABLE_LIBXML2=$(usex xml)
-               -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-               # TODO: CLANG_ENABLE_HLSL?
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if ! use elibc_musl; then
-               mycmakeargs+=(
-                       -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex 
ieee-long-double)
-               )
-       fi
-
-       use test && mycmakeargs+=(
-               -DLLVM_BUILD_TESTS=ON
-               -DLLVM_LIT_ARGS="$(get_lit_flags)"
-       )
-
-       if multilib_is_native_abi; then
-               local build_docs=OFF
-               if llvm_are_manpages_built; then
-                       build_docs=ON
-                       mycmakeargs+=(
-                               -DLLVM_BUILD_DOCS=ON
-                               -DLLVM_ENABLE_SPHINX=ON
-                               
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-                               -DSPHINX_WARNINGS_AS_ERRORS=OFF
-                       )
-                       if use extra; then
-                               mycmakeargs+=(
-                                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-                               )
-                       fi
-               fi
-               mycmakeargs+=(
-                       -DCLANG_INCLUDE_DOCS=${build_docs}
-               )
-       fi
-       if multilib_native_use extra; then
-               mycmakeargs+=(
-                       
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-               )
-       else
-               mycmakeargs+=(
-                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-               )
-       fi
-
-       if tc-is-cross-compiler; then
-               has_version -b llvm-core/clang:${LLVM_MAJOR} ||
-                       die "llvm-core/clang:${LLVM_MAJOR} is required on the 
build host."
-               local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-               mycmakeargs+=(
-                       -DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-                       -DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-               )
-       fi
-
-       # LLVM can have very high memory consumption while linking,
-       # exhausting the limit on 32-bit linker executable
-       use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-       cmake_src_configure
-
-       multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-       cmake_build distribution
-}
-
-multilib_src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       local test_targets=( check-clang )
-       if multilib_native_use extra; then
-               test_targets+=(
-                       check-clang-tools
-                       check-clangd
-               )
-       fi
-       cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-       MULTILIB_WRAPPED_HEADERS=(
-               /usr/include/clang/Config/config.h
-       )
-
-       multilib-minimal_src_install
-
-       # Move runtime headers to /usr/lib/clang, where they belong
-       mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-       # move (remaining) wrapped headers back
-       if use extra; then
-               mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-       fi
-       mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-       # Apply CHOST and version suffix to clang tools
-       local clang_tools=( clang clang++ clang-cl clang-cpp )
-       local abi i
-
-       # cmake gives us:
-       # - clang-X
-       # - clang -> clang-X
-       # - clang++, clang-cl, clang-cpp -> clang
-       # we want to have:
-       # - clang-X
-       # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-       # - clang, clang++, clang-cl, clang-cpp -> clang*-X
-       # also in CHOST variant
-       for i in "${clang_tools[@]:1}"; do
-               rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-               dosym "clang-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-               dosym "${i}-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-       done
-
-       # now create target symlinks for all supported ABIs
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               for i in "${clang_tools[@]}"; do
-                       dosym "${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-                       dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-               done
-       done
-}
-
-multilib_src_install() {
-       DESTDIR=${D} cmake_build install-distribution
-
-       # move headers to /usr/include for wrapping & ABI mismatch checks
-       # (also drop the version suffix from runtime headers)
-       rm -rf "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-       if multilib_native_use extra; then
-               # don't wrap clang-tidy headers, the list is too long
-               # (they're fine for non-native ABI but enabling the targets is 
problematic)
-               mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-       fi
-}
-
-multilib_src_install_all() {
-       python_fix_shebang "${ED}"
-       if use static-analyzer; then
-               python_optimize 
"${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-       fi
-
-       docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-       llvm_install_manpages
-       # match 'html' non-compression
-       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-       # +x for some reason; TODO: investigate
-       use static-analyzer && fperms a-x 
"/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow update all
-       fi
-
-       elog "You can find additional utility scripts in:"
-       elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-       if use extra; then
-               elog "Some of them are vim integration scripts (with 
instructions inside)."
-               elog "The run-clang-tidy.py script requires the following 
additional package:"
-               elog "  dev-python/pyyaml"
-       fi
-}
-
-pkg_postrm() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow clean all
-       fi
-}

diff --git a/llvm-core/clang/clang-21.1.6.ebuild 
b/llvm-core/clang/clang-21.1.6.ebuild
deleted file mode 100644
index b2c9b8c2d5f6..000000000000
--- a/llvm-core/clang/clang-21.1.6.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-
-inherit cmake llvm.org multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/";
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~arm64-macos ~x64-macos"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       ~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-       static-analyzer? ( dev-lang/perl:* )
-       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-       ${PYTHON_DEPS}
-       ${DEPEND}
-       >=llvm-core/clang-common-${PV}
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       test? ( ~llvm-core/lld-${PV} )
-       xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-       ~llvm-runtimes/clang-runtime-${PV}
-       llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-       clang clang-tools-extra cmake
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-       llvm/utils
-)
-LLVM_USE_TARGETS=llvm+eq
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-       $(python_gen_cond_dep '
-               dev-python/myst-parser[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       ')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-       # create extra parent dir for relative CLANG_RESOURCE_DIR access
-       mkdir -p x/y || die
-       BUILD_DIR=${WORKDIR}/x/y/clang
-
-       llvm.org_src_prepare
-
-       # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-       eprefixify \
-               lib/Lex/InitHeaderSearch.cpp \
-               lib/Driver/ToolChains/Darwin.cpp || die
-
-       if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-               sed -i "/LibDir.*Loader/s@return \"\/\"@return 
\"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-       fi
-}
-
-check_distribution_components() {
-       if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-               local all_targets=() my_targets=() l
-               cd "${BUILD_DIR}" || die
-
-               while read -r l; do
-                       if [[ ${l} == install-*-stripped:* ]]; then
-                               l=${l#install-}
-                               l=${l%%-stripped*}
-
-                               case ${l} in
-                                       # meta-targets
-                                       clang-libraries|distribution)
-                                               continue
-                                               ;;
-                                       # tools
-                                       clang|clangd|clang-*)
-                                               ;;
-                                       # static libraries
-                                       clang*|findAllSymbols)
-                                               continue
-                                               ;;
-                                       # conditional to USE=doc
-                                       docs-clang-html|docs-clang-tools-html)
-                                               use doc || continue
-                                               ;;
-                               esac
-
-                               all_targets+=( "${l}" )
-                       fi
-               done < <(${NINJA} -t targets all)
-
-               while read -r l; do
-                       my_targets+=( "${l}" )
-               done < <(get_distribution_components $"\n")
-
-               local add=() remove=()
-               for l in "${all_targets[@]}"; do
-                       if ! has "${l}" "${my_targets[@]}"; then
-                               add+=( "${l}" )
-                       fi
-               done
-               for l in "${my_targets[@]}"; do
-                       if ! has "${l}" "${all_targets[@]}"; then
-                               remove+=( "${l}" )
-                       fi
-               done
-
-               if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-                       eerror "get_distribution_components() is outdated!"
-                       eerror "   Add: ${add[*]}"
-                       eerror "Remove: ${remove[*]}"
-                       die "Update get_distribution_components()!"
-               fi
-               cd - >/dev/null || die
-       fi
-}
-
-get_distribution_components() {
-       local sep=${1-;}
-
-       local out=(
-               # common stuff
-               clang-cmake-exports
-               clang-headers
-               clang-resource-headers
-               libclang-headers
-
-               aarch64-resource-headers
-               arm-common-resource-headers
-               arm-resource-headers
-               core-resource-headers
-               cuda-resource-headers
-               hexagon-resource-headers
-               hip-resource-headers
-               hlsl-resource-headers
-               mips-resource-headers
-               opencl-resource-headers
-               openmp-resource-headers
-               ppc-htm-resource-headers
-               ppc-resource-headers
-               riscv-resource-headers
-               spirv-resource-headers
-               systemz-resource-headers
-               utility-resource-headers
-               ve-resource-headers
-               webassembly-resource-headers
-               windows-resource-headers
-               x86-resource-headers
-
-               # libs
-               clang-cpp
-               libclang
-       )
-
-       if multilib_is_native_abi; then
-               out+=(
-                       # common stuff
-                       bash-autocomplete
-                       libclang-python-bindings
-
-                       # tools
-                       c-index-test
-                       clang
-                       clang-format
-                       clang-installapi
-                       clang-linker-wrapper
-                       clang-nvlink-wrapper
-                       clang-offload-bundler
-                       clang-offload-packager
-                       clang-refactor
-                       clang-repl
-                       clang-scan-deps
-                       clang-sycl-linker
-                       diagtool
-                       hmaptool
-                       offload-arch
-
-                       # needed for cross-compiling Clang
-                       clang-tblgen
-               )
-
-               if use extra; then
-                       out+=(
-                               # extra tools
-                               clang-apply-replacements
-                               clang-change-namespace
-                               clang-doc
-                               clang-include-cleaner
-                               clang-include-fixer
-                               clang-move
-                               clang-query
-                               clang-reorder-fields
-                               clang-tidy
-                               clang-tidy-headers
-                               clangd
-                               find-all-symbols
-                               modularize
-                               pp-trace
-                       )
-
-                       use kernel_Darwin && out+=( ClangdXPCLib )
-               fi
-
-               if llvm_are_manpages_built; then
-                       out+=( docs-clang-man )
-                       use extra && out+=( docs-clang-tools-man )
-               fi
-
-               if use doc; then
-                       out+=( docs-clang-html )
-                       use extra && out+=( docs-clang-tools-html )
-               fi
-
-               use static-analyzer && out+=(
-                       clang-check
-                       clang-extdef-mapping
-                       scan-build
-                       scan-build-py
-                       scan-view
-               )
-       fi
-
-       printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-       local mycmakeargs=(
-               -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang/${LLVM_MAJOR}"
-               -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
-               # relative to bindir
-               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-               -DBUILD_SHARED_LIBS=OFF
-               -DCLANG_LINK_CLANG_DYLIB=ON
-               -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-               -DCLANG_INCLUDE_TESTS=$(usex test)
-
-               -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-               # these are not propagated reliably, so redefine them
-               -DLLVM_ENABLE_EH=ON
-               -DLLVM_ENABLE_RTTI=ON
-
-               # libgomp support fails to find headers without explicit -I
-               # furthermore, it provides only syntax checking
-               -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-               -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-               -DCLANG_ENABLE_LIBXML2=$(usex xml)
-               -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-               # TODO: CLANG_ENABLE_HLSL?
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if ! use elibc_musl; then
-               mycmakeargs+=(
-                       -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex 
ieee-long-double)
-               )
-       fi
-
-       use test && mycmakeargs+=(
-               -DLLVM_BUILD_TESTS=ON
-               -DLLVM_LIT_ARGS="$(get_lit_flags)"
-       )
-
-       if multilib_is_native_abi; then
-               local build_docs=OFF
-               if llvm_are_manpages_built; then
-                       build_docs=ON
-                       mycmakeargs+=(
-                               -DLLVM_BUILD_DOCS=ON
-                               -DLLVM_ENABLE_SPHINX=ON
-                               
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-                               -DSPHINX_WARNINGS_AS_ERRORS=OFF
-                       )
-                       if use extra; then
-                               mycmakeargs+=(
-                                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-                               )
-                       fi
-               fi
-               mycmakeargs+=(
-                       -DCLANG_INCLUDE_DOCS=${build_docs}
-               )
-       fi
-       if multilib_native_use extra; then
-               mycmakeargs+=(
-                       
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-               )
-       else
-               mycmakeargs+=(
-                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-               )
-       fi
-
-       if tc-is-cross-compiler; then
-               has_version -b llvm-core/clang:${LLVM_MAJOR} ||
-                       die "llvm-core/clang:${LLVM_MAJOR} is required on the 
build host."
-               local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-               mycmakeargs+=(
-                       -DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-                       -DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-               )
-       fi
-
-       # LLVM can have very high memory consumption while linking,
-       # exhausting the limit on 32-bit linker executable
-       use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-       cmake_src_configure
-
-       multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-       cmake_build distribution
-}
-
-multilib_src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       local test_targets=( check-clang )
-       if multilib_native_use extra; then
-               test_targets+=(
-                       check-clang-tools
-                       check-clangd
-               )
-       fi
-       cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-       MULTILIB_WRAPPED_HEADERS=(
-               /usr/include/clang/Config/config.h
-       )
-
-       multilib-minimal_src_install
-
-       # Move runtime headers to /usr/lib/clang, where they belong
-       mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-       # move (remaining) wrapped headers back
-       if use extra; then
-               mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-       fi
-       mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-       # Apply CHOST and version suffix to clang tools
-       local clang_tools=( clang clang++ clang-cl clang-cpp )
-       local abi i
-
-       # cmake gives us:
-       # - clang-X
-       # - clang -> clang-X
-       # - clang++, clang-cl, clang-cpp -> clang
-       # we want to have:
-       # - clang-X
-       # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-       # - clang, clang++, clang-cl, clang-cpp -> clang*-X
-       # also in CHOST variant
-       for i in "${clang_tools[@]:1}"; do
-               rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-               dosym "clang-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-               dosym "${i}-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-       done
-
-       # now create target symlinks for all supported ABIs
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               for i in "${clang_tools[@]}"; do
-                       dosym "${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-                       dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-               done
-       done
-}
-
-multilib_src_install() {
-       DESTDIR=${D} cmake_build install-distribution
-
-       # move headers to /usr/include for wrapping & ABI mismatch checks
-       # (also drop the version suffix from runtime headers)
-       rm -rf "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-       if multilib_native_use extra; then
-               # don't wrap clang-tidy headers, the list is too long
-               # (they're fine for non-native ABI but enabling the targets is 
problematic)
-               mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-       fi
-}
-
-multilib_src_install_all() {
-       python_fix_shebang "${ED}"
-       if use static-analyzer; then
-               python_optimize 
"${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-       fi
-
-       docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-       llvm_install_manpages
-       # match 'html' non-compression
-       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-       # +x for some reason; TODO: investigate
-       use static-analyzer && fperms a-x 
"/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow update all
-       fi
-
-       elog "You can find additional utility scripts in:"
-       elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-       if use extra; then
-               elog "Some of them are vim integration scripts (with 
instructions inside)."
-               elog "The run-clang-tidy.py script requires the following 
additional package:"
-               elog "  dev-python/pyyaml"
-       fi
-}
-
-pkg_postrm() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow clean all
-       fi
-}

diff --git a/llvm-core/clang/clang-21.1.7.ebuild 
b/llvm-core/clang/clang-21.1.7.ebuild
deleted file mode 100644
index b2c9b8c2d5f6..000000000000
--- a/llvm-core/clang/clang-21.1.7.ebuild
+++ /dev/null
@@ -1,467 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-
-inherit cmake llvm.org multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/";
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 
~arm64-macos ~x64-macos"
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       ~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-       static-analyzer? ( dev-lang/perl:* )
-       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-       ${PYTHON_DEPS}
-       ${DEPEND}
-       >=llvm-core/clang-common-${PV}
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       test? ( ~llvm-core/lld-${PV} )
-       xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-       ~llvm-runtimes/clang-runtime-${PV}
-       llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-       clang clang-tools-extra cmake
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-       llvm/utils
-)
-LLVM_USE_TARGETS=llvm+eq
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-       $(python_gen_cond_dep '
-               dev-python/myst-parser[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       ')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-       # create extra parent dir for relative CLANG_RESOURCE_DIR access
-       mkdir -p x/y || die
-       BUILD_DIR=${WORKDIR}/x/y/clang
-
-       llvm.org_src_prepare
-
-       # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-       eprefixify \
-               lib/Lex/InitHeaderSearch.cpp \
-               lib/Driver/ToolChains/Darwin.cpp || die
-
-       if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-               sed -i "/LibDir.*Loader/s@return \"\/\"@return 
\"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-       fi
-}
-
-check_distribution_components() {
-       if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-               local all_targets=() my_targets=() l
-               cd "${BUILD_DIR}" || die
-
-               while read -r l; do
-                       if [[ ${l} == install-*-stripped:* ]]; then
-                               l=${l#install-}
-                               l=${l%%-stripped*}
-
-                               case ${l} in
-                                       # meta-targets
-                                       clang-libraries|distribution)
-                                               continue
-                                               ;;
-                                       # tools
-                                       clang|clangd|clang-*)
-                                               ;;
-                                       # static libraries
-                                       clang*|findAllSymbols)
-                                               continue
-                                               ;;
-                                       # conditional to USE=doc
-                                       docs-clang-html|docs-clang-tools-html)
-                                               use doc || continue
-                                               ;;
-                               esac
-
-                               all_targets+=( "${l}" )
-                       fi
-               done < <(${NINJA} -t targets all)
-
-               while read -r l; do
-                       my_targets+=( "${l}" )
-               done < <(get_distribution_components $"\n")
-
-               local add=() remove=()
-               for l in "${all_targets[@]}"; do
-                       if ! has "${l}" "${my_targets[@]}"; then
-                               add+=( "${l}" )
-                       fi
-               done
-               for l in "${my_targets[@]}"; do
-                       if ! has "${l}" "${all_targets[@]}"; then
-                               remove+=( "${l}" )
-                       fi
-               done
-
-               if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-                       eerror "get_distribution_components() is outdated!"
-                       eerror "   Add: ${add[*]}"
-                       eerror "Remove: ${remove[*]}"
-                       die "Update get_distribution_components()!"
-               fi
-               cd - >/dev/null || die
-       fi
-}
-
-get_distribution_components() {
-       local sep=${1-;}
-
-       local out=(
-               # common stuff
-               clang-cmake-exports
-               clang-headers
-               clang-resource-headers
-               libclang-headers
-
-               aarch64-resource-headers
-               arm-common-resource-headers
-               arm-resource-headers
-               core-resource-headers
-               cuda-resource-headers
-               hexagon-resource-headers
-               hip-resource-headers
-               hlsl-resource-headers
-               mips-resource-headers
-               opencl-resource-headers
-               openmp-resource-headers
-               ppc-htm-resource-headers
-               ppc-resource-headers
-               riscv-resource-headers
-               spirv-resource-headers
-               systemz-resource-headers
-               utility-resource-headers
-               ve-resource-headers
-               webassembly-resource-headers
-               windows-resource-headers
-               x86-resource-headers
-
-               # libs
-               clang-cpp
-               libclang
-       )
-
-       if multilib_is_native_abi; then
-               out+=(
-                       # common stuff
-                       bash-autocomplete
-                       libclang-python-bindings
-
-                       # tools
-                       c-index-test
-                       clang
-                       clang-format
-                       clang-installapi
-                       clang-linker-wrapper
-                       clang-nvlink-wrapper
-                       clang-offload-bundler
-                       clang-offload-packager
-                       clang-refactor
-                       clang-repl
-                       clang-scan-deps
-                       clang-sycl-linker
-                       diagtool
-                       hmaptool
-                       offload-arch
-
-                       # needed for cross-compiling Clang
-                       clang-tblgen
-               )
-
-               if use extra; then
-                       out+=(
-                               # extra tools
-                               clang-apply-replacements
-                               clang-change-namespace
-                               clang-doc
-                               clang-include-cleaner
-                               clang-include-fixer
-                               clang-move
-                               clang-query
-                               clang-reorder-fields
-                               clang-tidy
-                               clang-tidy-headers
-                               clangd
-                               find-all-symbols
-                               modularize
-                               pp-trace
-                       )
-
-                       use kernel_Darwin && out+=( ClangdXPCLib )
-               fi
-
-               if llvm_are_manpages_built; then
-                       out+=( docs-clang-man )
-                       use extra && out+=( docs-clang-tools-man )
-               fi
-
-               if use doc; then
-                       out+=( docs-clang-html )
-                       use extra && out+=( docs-clang-tools-html )
-               fi
-
-               use static-analyzer && out+=(
-                       clang-check
-                       clang-extdef-mapping
-                       scan-build
-                       scan-build-py
-                       scan-view
-               )
-       fi
-
-       printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-       local mycmakeargs=(
-               -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang/${LLVM_MAJOR}"
-               -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
-               # relative to bindir
-               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-               -DBUILD_SHARED_LIBS=OFF
-               -DCLANG_LINK_CLANG_DYLIB=ON
-               -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-               -DCLANG_INCLUDE_TESTS=$(usex test)
-
-               -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-               # these are not propagated reliably, so redefine them
-               -DLLVM_ENABLE_EH=ON
-               -DLLVM_ENABLE_RTTI=ON
-
-               # libgomp support fails to find headers without explicit -I
-               # furthermore, it provides only syntax checking
-               -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-               -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-               -DCLANG_ENABLE_LIBXML2=$(usex xml)
-               -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-               # TODO: CLANG_ENABLE_HLSL?
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if ! use elibc_musl; then
-               mycmakeargs+=(
-                       -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex 
ieee-long-double)
-               )
-       fi
-
-       use test && mycmakeargs+=(
-               -DLLVM_BUILD_TESTS=ON
-               -DLLVM_LIT_ARGS="$(get_lit_flags)"
-       )
-
-       if multilib_is_native_abi; then
-               local build_docs=OFF
-               if llvm_are_manpages_built; then
-                       build_docs=ON
-                       mycmakeargs+=(
-                               -DLLVM_BUILD_DOCS=ON
-                               -DLLVM_ENABLE_SPHINX=ON
-                               
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-                               -DSPHINX_WARNINGS_AS_ERRORS=OFF
-                       )
-                       if use extra; then
-                               mycmakeargs+=(
-                                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-                               )
-                       fi
-               fi
-               mycmakeargs+=(
-                       -DCLANG_INCLUDE_DOCS=${build_docs}
-               )
-       fi
-       if multilib_native_use extra; then
-               mycmakeargs+=(
-                       
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-               )
-       else
-               mycmakeargs+=(
-                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-               )
-       fi
-
-       if tc-is-cross-compiler; then
-               has_version -b llvm-core/clang:${LLVM_MAJOR} ||
-                       die "llvm-core/clang:${LLVM_MAJOR} is required on the 
build host."
-               local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-               mycmakeargs+=(
-                       -DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-                       -DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-               )
-       fi
-
-       # LLVM can have very high memory consumption while linking,
-       # exhausting the limit on 32-bit linker executable
-       use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-       cmake_src_configure
-
-       multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-       cmake_build distribution
-}
-
-multilib_src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       local test_targets=( check-clang )
-       if multilib_native_use extra; then
-               test_targets+=(
-                       check-clang-tools
-                       check-clangd
-               )
-       fi
-       cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-       MULTILIB_WRAPPED_HEADERS=(
-               /usr/include/clang/Config/config.h
-       )
-
-       multilib-minimal_src_install
-
-       # Move runtime headers to /usr/lib/clang, where they belong
-       mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-       # move (remaining) wrapped headers back
-       if use extra; then
-               mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-       fi
-       mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-       # Apply CHOST and version suffix to clang tools
-       local clang_tools=( clang clang++ clang-cl clang-cpp )
-       local abi i
-
-       # cmake gives us:
-       # - clang-X
-       # - clang -> clang-X
-       # - clang++, clang-cl, clang-cpp -> clang
-       # we want to have:
-       # - clang-X
-       # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-       # - clang, clang++, clang-cl, clang-cpp -> clang*-X
-       # also in CHOST variant
-       for i in "${clang_tools[@]:1}"; do
-               rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-               dosym "clang-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-               dosym "${i}-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-       done
-
-       # now create target symlinks for all supported ABIs
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               for i in "${clang_tools[@]}"; do
-                       dosym "${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-                       dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-               done
-       done
-}
-
-multilib_src_install() {
-       DESTDIR=${D} cmake_build install-distribution
-
-       # move headers to /usr/include for wrapping & ABI mismatch checks
-       # (also drop the version suffix from runtime headers)
-       rm -rf "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-       if multilib_native_use extra; then
-               # don't wrap clang-tidy headers, the list is too long
-               # (they're fine for non-native ABI but enabling the targets is 
problematic)
-               mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-       fi
-}
-
-multilib_src_install_all() {
-       python_fix_shebang "${ED}"
-       if use static-analyzer; then
-               python_optimize 
"${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-       fi
-
-       docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-       llvm_install_manpages
-       # match 'html' non-compression
-       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-       # +x for some reason; TODO: investigate
-       use static-analyzer && fperms a-x 
"/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow update all
-       fi
-
-       elog "You can find additional utility scripts in:"
-       elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-       if use extra; then
-               elog "Some of them are vim integration scripts (with 
instructions inside)."
-               elog "The run-clang-tidy.py script requires the following 
additional package:"
-               elog "  dev-python/pyyaml"
-       fi
-}
-
-pkg_postrm() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow clean all
-       fi
-}

diff --git a/llvm-core/clang/clang-22.0.0_pre20251108.ebuild 
b/llvm-core/clang/clang-22.0.0_pre20251108.ebuild
deleted file mode 100644
index a7f3759197b4..000000000000
--- a/llvm-core/clang/clang-22.0.0_pre20251108.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-
-inherit cmake llvm.org multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/";
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       ~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-       static-analyzer? ( dev-lang/perl:* )
-       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-       ${PYTHON_DEPS}
-       ${DEPEND}
-       >=llvm-core/clang-common-${PV}
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       test? ( ~llvm-core/lld-${PV} )
-       xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-       llvm-runtimes/clang-runtime:${LLVM_MAJOR}
-       llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-       clang clang-tools-extra cmake
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-       llvm/utils
-)
-LLVM_USE_TARGETS=llvm+eq
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-       $(python_gen_cond_dep '
-               dev-python/myst-parser[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       ')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-       # create extra parent dir for relative CLANG_RESOURCE_DIR access
-       mkdir -p x/y || die
-       BUILD_DIR=${WORKDIR}/x/y/clang
-
-       llvm.org_src_prepare
-
-       # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-       eprefixify \
-               lib/Lex/InitHeaderSearch.cpp \
-               lib/Driver/ToolChains/Darwin.cpp || die
-
-       if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-               sed -i "/LibDir.*Loader/s@return \"\/\"@return 
\"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-       fi
-}
-
-check_distribution_components() {
-       if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-               local all_targets=() my_targets=() l
-               cd "${BUILD_DIR}" || die
-
-               while read -r l; do
-                       if [[ ${l} == install-*-stripped:* ]]; then
-                               l=${l#install-}
-                               l=${l%%-stripped*}
-
-                               case ${l} in
-                                       # meta-targets
-                                       clang-libraries|distribution)
-                                               continue
-                                               ;;
-                                       # tools
-                                       clang|clangd|clang-*)
-                                               ;;
-                                       # static libraries
-                                       clang*|findAllSymbols)
-                                               continue
-                                               ;;
-                                       # conditional to USE=doc
-                                       docs-clang-html|docs-clang-tools-html)
-                                               use doc || continue
-                                               ;;
-                               esac
-
-                               all_targets+=( "${l}" )
-                       fi
-               done < <(${NINJA} -t targets all)
-
-               while read -r l; do
-                       my_targets+=( "${l}" )
-               done < <(get_distribution_components $"\n")
-
-               local add=() remove=()
-               for l in "${all_targets[@]}"; do
-                       if ! has "${l}" "${my_targets[@]}"; then
-                               add+=( "${l}" )
-                       fi
-               done
-               for l in "${my_targets[@]}"; do
-                       if ! has "${l}" "${all_targets[@]}"; then
-                               remove+=( "${l}" )
-                       fi
-               done
-
-               if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-                       eerror "get_distribution_components() is outdated!"
-                       eerror "   Add: ${add[*]}"
-                       eerror "Remove: ${remove[*]}"
-                       die "Update get_distribution_components()!"
-               fi
-               cd - >/dev/null || die
-       fi
-}
-
-get_distribution_components() {
-       local sep=${1-;}
-
-       local out=(
-               # common stuff
-               clang-cmake-exports
-               clang-headers
-               clang-resource-headers
-               libclang-headers
-
-               aarch64-resource-headers
-               arm-common-resource-headers
-               arm-resource-headers
-               core-resource-headers
-               cuda-resource-headers
-               hexagon-resource-headers
-               hip-resource-headers
-               hlsl-resource-headers
-               mips-resource-headers
-               opencl-resource-headers
-               openmp-resource-headers
-               ppc-htm-resource-headers
-               ppc-resource-headers
-               riscv-resource-headers
-               spirv-resource-headers
-               systemz-resource-headers
-               utility-resource-headers
-               ve-resource-headers
-               webassembly-resource-headers
-               windows-resource-headers
-               x86-resource-headers
-
-               # libs
-               clang-cpp
-               libclang
-       )
-
-       if multilib_is_native_abi; then
-               out+=(
-                       # common stuff
-                       bash-autocomplete
-                       libclang-python-bindings
-
-                       # tools
-                       c-index-test
-                       clang
-                       clang-format
-                       clang-installapi
-                       clang-linker-wrapper
-                       clang-nvlink-wrapper
-                       clang-offload-bundler
-                       clang-refactor
-                       clang-repl
-                       clang-scan-deps
-                       clang-sycl-linker
-                       diagtool
-                       hmaptool
-                       offload-arch
-
-                       # needed for cross-compiling Clang
-                       clang-tblgen
-               )
-
-               if use extra; then
-                       out+=(
-                               # extra tools
-                               clang-apply-replacements
-                               clang-change-namespace
-                               clang-doc
-                               clang-include-cleaner
-                               clang-include-fixer
-                               clang-move
-                               clang-query
-                               clang-reorder-fields
-                               clang-tidy
-                               clang-tidy-headers
-                               clangd
-                               find-all-symbols
-                               modularize
-                               pp-trace
-                       )
-
-                       use kernel_Darwin && out+=( ClangdXPCLib )
-               fi
-
-               if llvm_are_manpages_built; then
-                       out+=( docs-clang-man )
-                       use extra && out+=( docs-clang-tools-man )
-               fi
-
-               if use doc; then
-                       out+=( docs-clang-html )
-                       use extra && out+=( docs-clang-tools-html )
-               fi
-
-               use static-analyzer && out+=(
-                       clang-check
-                       clang-extdef-mapping
-                       scan-build
-                       scan-build-py
-                       scan-view
-               )
-       fi
-
-       printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-       local mycmakeargs=(
-               -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang/${LLVM_MAJOR}"
-               -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
-               # relative to bindir
-               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-               -DBUILD_SHARED_LIBS=OFF
-               -DCLANG_LINK_CLANG_DYLIB=ON
-               -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-               -DCLANG_INCLUDE_TESTS=$(usex test)
-
-               -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-               # these are not propagated reliably, so redefine them
-               -DLLVM_ENABLE_EH=ON
-               -DLLVM_ENABLE_RTTI=ON
-
-               # libgomp support fails to find headers without explicit -I
-               # furthermore, it provides only syntax checking
-               -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-               -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-               -DCLANG_ENABLE_LIBXML2=$(usex xml)
-               -DCLANG_ENABLE_OBJC_REWRITER=ON
-               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-               # TODO: CLANG_ENABLE_HLSL?
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if ! use elibc_musl; then
-               mycmakeargs+=(
-                       -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex 
ieee-long-double)
-               )
-       fi
-
-       use test && mycmakeargs+=(
-               -DLLVM_BUILD_TESTS=ON
-               -DLLVM_LIT_ARGS="$(get_lit_flags)"
-       )
-
-       if multilib_is_native_abi; then
-               local build_docs=OFF
-               if llvm_are_manpages_built; then
-                       build_docs=ON
-                       mycmakeargs+=(
-                               -DLLVM_BUILD_DOCS=ON
-                               -DLLVM_ENABLE_SPHINX=ON
-                               
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-                               -DSPHINX_WARNINGS_AS_ERRORS=OFF
-                       )
-                       if use extra; then
-                               mycmakeargs+=(
-                                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-                               )
-                       fi
-               fi
-               mycmakeargs+=(
-                       -DCLANG_INCLUDE_DOCS=${build_docs}
-               )
-       fi
-       if multilib_native_use extra; then
-               mycmakeargs+=(
-                       
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-               )
-       else
-               mycmakeargs+=(
-                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-               )
-       fi
-
-       if tc-is-cross-compiler; then
-               has_version -b llvm-core/clang:${LLVM_MAJOR} ||
-                       die "llvm-core/clang:${LLVM_MAJOR} is required on the 
build host."
-               local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-               mycmakeargs+=(
-                       -DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-                       -DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-               )
-       fi
-
-       # LLVM can have very high memory consumption while linking,
-       # exhausting the limit on 32-bit linker executable
-       use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-       cmake_src_configure
-
-       multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-       cmake_build distribution
-}
-
-multilib_src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       local test_targets=( check-clang )
-       if multilib_native_use extra; then
-               test_targets+=(
-                       check-clang-tools
-                       check-clangd
-               )
-       fi
-       cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-       MULTILIB_WRAPPED_HEADERS=(
-               /usr/include/clang/Config/config.h
-       )
-
-       multilib-minimal_src_install
-
-       # Move runtime headers to /usr/lib/clang, where they belong
-       mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-       # move (remaining) wrapped headers back
-       if use extra; then
-               mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-       fi
-       mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-       # Apply CHOST and version suffix to clang tools
-       local clang_tools=( clang clang++ clang-cl clang-cpp )
-       local abi i
-
-       # cmake gives us:
-       # - clang-X
-       # - clang -> clang-X
-       # - clang++, clang-cl, clang-cpp -> clang
-       # we want to have:
-       # - clang-X
-       # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-       # - clang, clang++, clang-cl, clang-cpp -> clang*-X
-       # also in CHOST variant
-       for i in "${clang_tools[@]:1}"; do
-               rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-               dosym "clang-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-               dosym "${i}-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-       done
-
-       # now create target symlinks for all supported ABIs
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               for i in "${clang_tools[@]}"; do
-                       dosym "${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-                       dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-               done
-       done
-}
-
-multilib_src_install() {
-       DESTDIR=${D} cmake_build install-distribution
-
-       # move headers to /usr/include for wrapping & ABI mismatch checks
-       # (also drop the version suffix from runtime headers)
-       rm -rf "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-       if multilib_native_use extra; then
-               # don't wrap clang-tidy headers, the list is too long
-               # (they're fine for non-native ABI but enabling the targets is 
problematic)
-               mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-       fi
-}
-
-multilib_src_install_all() {
-       python_fix_shebang "${ED}"
-       if use static-analyzer; then
-               python_optimize 
"${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-       fi
-
-       docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-       llvm_install_manpages
-       # match 'html' non-compression
-       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-       # +x for some reason; TODO: investigate
-       use static-analyzer && fperms a-x 
"/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow update all
-       fi
-
-       elog "You can find additional utility scripts in:"
-       elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-       if use extra; then
-               elog "Some of them are vim integration scripts (with 
instructions inside)."
-               elog "The run-clang-tidy.py script requires the following 
additional package:"
-               elog "  dev-python/pyyaml"
-       fi
-}
-
-pkg_postrm() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow clean all
-       fi
-}

diff --git a/llvm-core/clang/clang-22.0.0_pre20251120.ebuild 
b/llvm-core/clang/clang-22.0.0_pre20251120.ebuild
deleted file mode 100644
index a7f3759197b4..000000000000
--- a/llvm-core/clang/clang-22.0.0_pre20251120.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{12..14} )
-
-inherit cmake llvm.org multilib multilib-minimal
-inherit prefix python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/";
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-IUSE="+debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       ~llvm-core/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-       static-analyzer? ( dev-lang/perl:* )
-       xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-       ${PYTHON_DEPS}
-       ${DEPEND}
-       >=llvm-core/clang-common-${PV}
-"
-BDEPEND="
-       ${PYTHON_DEPS}
-       test? ( ~llvm-core/lld-${PV} )
-       xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-       llvm-runtimes/clang-runtime:${LLVM_MAJOR}
-       llvm-core/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-       clang clang-tools-extra cmake
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-       llvm/utils
-)
-LLVM_USE_TARGETS=llvm+eq
-llvm.org_set_globals
-
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" doc? ( "
-BDEPEND+="
-       $(python_gen_cond_dep '
-               dev-python/myst-parser[${PYTHON_USEDEP}]
-               dev-python/sphinx[${PYTHON_USEDEP}]
-       ')
-"
-[[ -n ${LLVM_MANPAGE_DIST} ]] && BDEPEND+=" ) "
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use llvm-core/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-src_prepare() {
-       # create extra parent dir for relative CLANG_RESOURCE_DIR access
-       mkdir -p x/y || die
-       BUILD_DIR=${WORKDIR}/x/y/clang
-
-       llvm.org_src_prepare
-
-       # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-       eprefixify \
-               lib/Lex/InitHeaderSearch.cpp \
-               lib/Driver/ToolChains/Darwin.cpp || die
-
-       if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-               sed -i "/LibDir.*Loader/s@return \"\/\"@return 
\"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-       fi
-}
-
-check_distribution_components() {
-       if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-               local all_targets=() my_targets=() l
-               cd "${BUILD_DIR}" || die
-
-               while read -r l; do
-                       if [[ ${l} == install-*-stripped:* ]]; then
-                               l=${l#install-}
-                               l=${l%%-stripped*}
-
-                               case ${l} in
-                                       # meta-targets
-                                       clang-libraries|distribution)
-                                               continue
-                                               ;;
-                                       # tools
-                                       clang|clangd|clang-*)
-                                               ;;
-                                       # static libraries
-                                       clang*|findAllSymbols)
-                                               continue
-                                               ;;
-                                       # conditional to USE=doc
-                                       docs-clang-html|docs-clang-tools-html)
-                                               use doc || continue
-                                               ;;
-                               esac
-
-                               all_targets+=( "${l}" )
-                       fi
-               done < <(${NINJA} -t targets all)
-
-               while read -r l; do
-                       my_targets+=( "${l}" )
-               done < <(get_distribution_components $"\n")
-
-               local add=() remove=()
-               for l in "${all_targets[@]}"; do
-                       if ! has "${l}" "${my_targets[@]}"; then
-                               add+=( "${l}" )
-                       fi
-               done
-               for l in "${my_targets[@]}"; do
-                       if ! has "${l}" "${all_targets[@]}"; then
-                               remove+=( "${l}" )
-                       fi
-               done
-
-               if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-                       eerror "get_distribution_components() is outdated!"
-                       eerror "   Add: ${add[*]}"
-                       eerror "Remove: ${remove[*]}"
-                       die "Update get_distribution_components()!"
-               fi
-               cd - >/dev/null || die
-       fi
-}
-
-get_distribution_components() {
-       local sep=${1-;}
-
-       local out=(
-               # common stuff
-               clang-cmake-exports
-               clang-headers
-               clang-resource-headers
-               libclang-headers
-
-               aarch64-resource-headers
-               arm-common-resource-headers
-               arm-resource-headers
-               core-resource-headers
-               cuda-resource-headers
-               hexagon-resource-headers
-               hip-resource-headers
-               hlsl-resource-headers
-               mips-resource-headers
-               opencl-resource-headers
-               openmp-resource-headers
-               ppc-htm-resource-headers
-               ppc-resource-headers
-               riscv-resource-headers
-               spirv-resource-headers
-               systemz-resource-headers
-               utility-resource-headers
-               ve-resource-headers
-               webassembly-resource-headers
-               windows-resource-headers
-               x86-resource-headers
-
-               # libs
-               clang-cpp
-               libclang
-       )
-
-       if multilib_is_native_abi; then
-               out+=(
-                       # common stuff
-                       bash-autocomplete
-                       libclang-python-bindings
-
-                       # tools
-                       c-index-test
-                       clang
-                       clang-format
-                       clang-installapi
-                       clang-linker-wrapper
-                       clang-nvlink-wrapper
-                       clang-offload-bundler
-                       clang-refactor
-                       clang-repl
-                       clang-scan-deps
-                       clang-sycl-linker
-                       diagtool
-                       hmaptool
-                       offload-arch
-
-                       # needed for cross-compiling Clang
-                       clang-tblgen
-               )
-
-               if use extra; then
-                       out+=(
-                               # extra tools
-                               clang-apply-replacements
-                               clang-change-namespace
-                               clang-doc
-                               clang-include-cleaner
-                               clang-include-fixer
-                               clang-move
-                               clang-query
-                               clang-reorder-fields
-                               clang-tidy
-                               clang-tidy-headers
-                               clangd
-                               find-all-symbols
-                               modularize
-                               pp-trace
-                       )
-
-                       use kernel_Darwin && out+=( ClangdXPCLib )
-               fi
-
-               if llvm_are_manpages_built; then
-                       out+=( docs-clang-man )
-                       use extra && out+=( docs-clang-tools-man )
-               fi
-
-               if use doc; then
-                       out+=( docs-clang-html )
-                       use extra && out+=( docs-clang-tools-html )
-               fi
-
-               use static-analyzer && out+=(
-                       clang-check
-                       clang-extdef-mapping
-                       scan-build
-                       scan-build-py
-                       scan-view
-               )
-       fi
-
-       printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-       local mycmakeargs=(
-               -DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-               -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-               
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang/${LLVM_MAJOR}"
-               -DCLANG_CONFIG_FILE_USER_DIR="~/.config/clang"
-               # relative to bindir
-               -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-               -DBUILD_SHARED_LIBS=OFF
-               -DCLANG_LINK_CLANG_DYLIB=ON
-               -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-               -DCLANG_INCLUDE_TESTS=$(usex test)
-
-               -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-               # these are not propagated reliably, so redefine them
-               -DLLVM_ENABLE_EH=ON
-               -DLLVM_ENABLE_RTTI=ON
-
-               # libgomp support fails to find headers without explicit -I
-               # furthermore, it provides only syntax checking
-               -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-               -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-               -DCLANG_ENABLE_LIBXML2=$(usex xml)
-               -DCLANG_ENABLE_OBJC_REWRITER=ON
-               -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-               # TODO: CLANG_ENABLE_HLSL?
-
-               -DPython3_EXECUTABLE="${PYTHON}"
-       )
-
-       if ! use elibc_musl; then
-               mycmakeargs+=(
-                       -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex 
ieee-long-double)
-               )
-       fi
-
-       use test && mycmakeargs+=(
-               -DLLVM_BUILD_TESTS=ON
-               -DLLVM_LIT_ARGS="$(get_lit_flags)"
-       )
-
-       if multilib_is_native_abi; then
-               local build_docs=OFF
-               if llvm_are_manpages_built; then
-                       build_docs=ON
-                       mycmakeargs+=(
-                               -DLLVM_BUILD_DOCS=ON
-                               -DLLVM_ENABLE_SPHINX=ON
-                               
-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-                               -DSPHINX_WARNINGS_AS_ERRORS=OFF
-                       )
-                       if use extra; then
-                               mycmakeargs+=(
-                                       
-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-                               )
-                       fi
-               fi
-               mycmakeargs+=(
-                       -DCLANG_INCLUDE_DOCS=${build_docs}
-               )
-       fi
-       if multilib_native_use extra; then
-               mycmakeargs+=(
-                       
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-                       -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-               )
-       else
-               mycmakeargs+=(
-                       -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-               )
-       fi
-
-       if tc-is-cross-compiler; then
-               has_version -b llvm-core/clang:${LLVM_MAJOR} ||
-                       die "llvm-core/clang:${LLVM_MAJOR} is required on the 
build host."
-               local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-               mycmakeargs+=(
-                       -DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-                       -DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-               )
-       fi
-
-       # LLVM can have very high memory consumption while linking,
-       # exhausting the limit on 32-bit linker executable
-       use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-       # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-       use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-       cmake_src_configure
-
-       multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-       cmake_build distribution
-}
-
-multilib_src_test() {
-       # respect TMPDIR!
-       local -x LIT_PRESERVES_TMP=1
-       local test_targets=( check-clang )
-       if multilib_native_use extra; then
-               test_targets+=(
-                       check-clang-tools
-                       check-clangd
-               )
-       fi
-       cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-       MULTILIB_WRAPPED_HEADERS=(
-               /usr/include/clang/Config/config.h
-       )
-
-       multilib-minimal_src_install
-
-       # Move runtime headers to /usr/lib/clang, where they belong
-       mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-       # move (remaining) wrapped headers back
-       if use extra; then
-               mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-       fi
-       mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-       # Apply CHOST and version suffix to clang tools
-       local clang_tools=( clang clang++ clang-cl clang-cpp )
-       local abi i
-
-       # cmake gives us:
-       # - clang-X
-       # - clang -> clang-X
-       # - clang++, clang-cl, clang-cpp -> clang
-       # we want to have:
-       # - clang-X
-       # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-       # - clang, clang++, clang-cl, clang-cpp -> clang*-X
-       # also in CHOST variant
-       for i in "${clang_tools[@]:1}"; do
-               rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-               dosym "clang-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-               dosym "${i}-${LLVM_MAJOR}" 
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-       done
-
-       # now create target symlinks for all supported ABIs
-       for abi in $(get_all_abis); do
-               local abi_chost=$(get_abi_CHOST "${abi}")
-               for i in "${clang_tools[@]}"; do
-                       dosym "${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-                       dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-                               
"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-               done
-       done
-}
-
-multilib_src_install() {
-       DESTDIR=${D} cmake_build install-distribution
-
-       # move headers to /usr/include for wrapping & ABI mismatch checks
-       # (also drop the version suffix from runtime headers)
-       rm -rf "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-       mv "${ED}"/usr/lib/clang "${ED}"/usr/include/clangrt || die
-       if multilib_native_use extra; then
-               # don't wrap clang-tidy headers, the list is too long
-               # (they're fine for non-native ABI but enabling the targets is 
problematic)
-               mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-       fi
-}
-
-multilib_src_install_all() {
-       python_fix_shebang "${ED}"
-       if use static-analyzer; then
-               python_optimize 
"${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-       fi
-
-       docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-       llvm_install_manpages
-       # match 'html' non-compression
-       use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-       # +x for some reason; TODO: investigate
-       use static-analyzer && fperms a-x 
"/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow update all
-       fi
-
-       elog "You can find additional utility scripts in:"
-       elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-       if use extra; then
-               elog "Some of them are vim integration scripts (with 
instructions inside)."
-               elog "The run-clang-tidy.py script requires the following 
additional package:"
-               elog "  dev-python/pyyaml"
-       fi
-}
-
-pkg_postrm() {
-       if [[ -z ${ROOT} && -f 
${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-               eselect compiler-shadow clean all
-       fi
-}

Reply via email to