commit:     6595dad4f638da115b0ab474dcf4173bba3e50e9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 11 02:46:36 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 03:14:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6595dad4

sys-libs/libcxxabi: Remove old

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

 sys-libs/libcxxabi/Manifest                        |   3 -
 sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild         | 116 ---------------------
 .../libcxxabi/libcxxabi-17.0.0_pre20230314.ebuild  | 116 ---------------------
 3 files changed, 235 deletions(-)

diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 8ce7c3b50bd7..bea3a70b3746 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -3,8 +3,5 @@ DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B 
ee67c5407df8cef493b9c0004f
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B 
cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f
 SHA512 
b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
 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.0.src.tar.xz 117933476 BLAKE2B 
fa09cd8f647ce0daf5a7eae9ac03b99594a9b3193b12065f43f9a6731875243f2f5b354136bcadcb31622b246054e94f880eec3dab0bcd6ae89973fa9dca845c
 SHA512 
3f040abc1b03205693824aeff2ee6efb0cff25fe04bd5265141c093f294655a1f3fcda73cab9c57cbed7523c8f186a7e2484afce0792c55e90e3fb80450fabb7
-DIST llvm-project-16.0.0.src.tar.xz.sig 566 BLAKE2B 
daba130aa5662fbf7cc2e7aa8fa6b64f9cb355a72330f7a01a21b86389c6f2f85ae93de19ff08ba3f1cfe2834d9a2b7648bdf659caba3afdb2a0d13984774a54
 SHA512 
38e2449dce20cfbf813d1a9a68b36807722ac8ebb5ee07360fa215b2de8534d2329d3e41cfc3ed33e59e36714b94a6683a6d8077950bcf0037973492e0820fb3
 DIST llvm-project-16.0.1.src.tar.xz 117990772 BLAKE2B 
298189ce6d7245711e5bd3e03fa74d603dda5a458463ca0cb261fe6949290c46a70abbd1ad1c556e08da3adc5df577305e267c1135214b900d78502e39b46bc5
 SHA512 
98fc11c0ad90d5e5a2cb123b497b89a1583fe7f91b3ff05c335037801ef66cbfab08f6d2eff539f0da238e9685d4bc7a9fb2578e28864fc9e9357b84129cefaa
 DIST llvm-project-16.0.1.src.tar.xz.sig 566 BLAKE2B 
06c03d789e63ab30bba4c56ba9ec91400d804448482d6a7fd395252b3b9166a5ee7a42a94c2074aa0d1809a3327f993d8932211f3fc05ad281db64c17b2a7094
 SHA512 
f42db28eb8280db06b1c78fa7a7aaea3a79499cecee1a64ce18c49b90c755b3a78fc93f01d1855887c7918ccc927c3b6147cfc916520f05d4cef65381ca6fe60
-DIST llvm-project-4bf004e07e2b9d6e04e3f33e1b02628c679de664.tar.gz 180304467 
BLAKE2B 
6750855453b575eb8fcc861d5b24b144497bba62df9b9292ac586cf340e04b2b58290fe9df6d89142f29b56aa37ddeb3bd11cc3337e4dc985a4487954d1e2ffa
 SHA512 
d8a87064ba0f92967df019e9345222b87cda81852a9599902cedc4a49ec7d9e2175c972b7fa6d19920489c1d309822f9c31c23bdce0376a8d40c71d57bcd5068

diff --git a/sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild 
b/sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild
deleted file mode 100644
index e5d488bf1341..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-16.0.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-       toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-       !<sys-libs/libcxx-15
-"
-DEPEND="
-       ${RDEPEND}
-       sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-       clang? (
-               sys-devel/clang:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-       test? (
-               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-       )
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       # darwin prefix builds do not have llvm installed yet, so rely on 
bootstrap-prefix
-       # to set the appropriate path vars to LLVM instead of using 
llvm_pkg_setup.
-       if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-               LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       if use clang; then
-               local -x CC=${CHOST}-clang
-               local -x CXX=${CHOST}-clang++
-               strip-unsupported-flags
-       fi
-
-       # link to compiler-rt
-       local use_compiler_rt=OFF
-       [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-       local libdir=$(get_libdir)
-       local mycmakeargs=(
-               -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-               -DPython3_EXECUTABLE="${PYTHON}"
-               -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-               -DLLVM_INCLUDE_TESTS=OFF
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-               -DLIBCXXABI_ENABLE_SHARED=ON
-               -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-               -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-               -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-               # upstream is omitting standard search path for this
-               # probably because gcc & clang are bundling their own unwind.h
-               -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-               -DLIBCXX_LIBDIR_SUFFIX=
-               -DLIBCXX_ENABLE_SHARED=ON
-               -DLIBCXX_ENABLE_STATIC=OFF
-               -DLIBCXX_CXX_ABI=libcxxabi
-               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-               -DLIBCXX_HAS_GCC_S_LIB=OFF
-               -DLIBCXX_INCLUDE_BENCHMARKS=OFF
-               -DLIBCXX_INCLUDE_TESTS=OFF
-       )
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-                       -DPython3_EXECUTABLE="${PYTHON}"
-               )
-       fi
-       cmake_src_configure
-}
-
-multilib_src_compile() {
-       cmake_build cxxabi
-}
-
-multilib_src_test() {
-       local -x LIT_PRESERVES_TMP=1
-       cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-       DESTDIR="${D}" cmake_build install-cxxabi
-}

diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230314.ebuild 
b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230314.ebuild
deleted file mode 100644
index 16f40d6829fa..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230314.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-       toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-       !<sys-libs/libcxx-15
-"
-DEPEND="
-       ${RDEPEND}
-       sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-       clang? (
-               sys-devel/clang:${LLVM_MAJOR}
-       )
-       !test? (
-               ${PYTHON_DEPS}
-       )
-       test? (
-               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-       )
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       # darwin prefix builds do not have llvm installed yet, so rely on 
bootstrap-prefix
-       # to set the appropriate path vars to LLVM instead of using 
llvm_pkg_setup.
-       if [[ ${CHOST} != *-darwin* ]] || has_version sys-devel/llvm; then
-               LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-       fi
-       python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       if use clang; then
-               local -x CC=${CHOST}-clang
-               local -x CXX=${CHOST}-clang++
-               strip-unsupported-flags
-       fi
-
-       # link to compiler-rt
-       local use_compiler_rt=OFF
-       [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-       local libdir=$(get_libdir)
-       local mycmakeargs=(
-               -DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-               -DPython3_EXECUTABLE="${PYTHON}"
-               -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-               -DLLVM_INCLUDE_TESTS=OFF
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-               -DLIBCXXABI_ENABLE_SHARED=ON
-               -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-               -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-               -DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-               # upstream is omitting standard search path for this
-               # probably because gcc & clang are bundling their own unwind.h
-               -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-               -DLIBCXX_LIBDIR_SUFFIX=
-               -DLIBCXX_ENABLE_SHARED=ON
-               -DLIBCXX_ENABLE_STATIC=OFF
-               -DLIBCXX_CXX_ABI=libcxxabi
-               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-               -DLIBCXX_HAS_GCC_S_LIB=OFF
-               -DLIBCXX_INCLUDE_BENCHMARKS=OFF
-               -DLIBCXX_INCLUDE_TESTS=OFF
-       )
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-                       -DPython3_EXECUTABLE="${PYTHON}"
-               )
-       fi
-       cmake_src_configure
-}
-
-multilib_src_compile() {
-       cmake_build cxxabi
-}
-
-multilib_src_test() {
-       local -x LIT_PRESERVES_TMP=1
-       cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-       DESTDIR="${D}" cmake_build install-cxxabi
-}

Reply via email to