commit:     4421b52818def880f37959cf03ad2c3589096552
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 06:41:11 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 08:22:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4421b528

sys-libs/libcxxabi: Drop old (5.0.1 & 6.0.0)

 sys-libs/libcxxabi/Manifest               |   4 -
 sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild | 123 ------------------------------
 sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild | 119 -----------------------------
 3 files changed, 246 deletions(-)

diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 387afe966ea..45db2beeb14 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,12 +1,8 @@
 DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 
510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad
 SHA512 
a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
 DIST libcxx-4.0.1.src.tar.xz 1446380 BLAKE2B 
cd871eff4c4ca25a1fe4d27f778e913fe536a0b5863ea7dd3c8895f6b743b6f039e4df71f9ba5124c98761a8099666f68e1dfd073b5ec7b9fe0007ef09a9117d
 SHA512 
91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a
-DIST libcxx-5.0.1.src.tar.xz 1527852 BLAKE2B 
9454fbca8228ee456feb79b65a63ce5daa27bf2e47e457d79592f4974dceeace19fe6cdeee51cc51f94e9072d7ce3c03e5acb617507670153647b9c435feadbd
 SHA512 
994681d3c79047fc2d618c5584b08e9b5c925dab48f8812fc0adc81a575b49a637e9481bb9a0f7ae6f7f352b2b33f40056c347c27123cd6c96c6c226febd002c
 DIST libcxx-5.0.2.src.tar.xz 1530908 BLAKE2B 
e0c47d6803668267a71c75df873a136a2c3bec3732a08c365107b286f6dfef883edb81f9f4d22a0f312228865528bf1f15450c41803f8d3a8c8081fe12b62c25
 SHA512 
c77e0ea6bb3dc03270312de4a24fdd0d027448b2e182af31489031fd52f0997377c9049769930b80b2ba0062fe21317d8ae823c5e80e12128f8ae8e6f171be22
-DIST libcxx-6.0.0.src.tar.xz 1549328 BLAKE2B 
93adb339b0e849fca1850d379c8e74b407b0db8220f3a05f888db70d83ad07c3200dbd2a7827f92c60a2ba91d3395e4d1b4434ba70479c29a95aceda6c213e02
 SHA512 
3d93910f85a778f36c5f7a4429639008acba5713a2c8ac79a9de09463af6f9a388af45d39af23423a7223660701697ba067f3391f25d5a970973691dd88635e3
 DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 
65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8
 SHA512 
c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875
 DIST libcxxabi-3.9.1.src.tar.xz 510964 BLAKE2B 
a6abda1b92473781ea3029169c43547f15c1aa6e0ec6f9692ae633d109e050a6ff82ce8bceb0455375991b85c99784a4f06a568b8c77a4cf2865b9b2861e9595
 SHA512 
4f5603f1476b759c86d4784728fbdd212c59b30dc56d787c1834bf68a9cd83071fa22658d24e5a58beb94c0c656b0e4457d7da6e3048715dd36bd68380fc336e
 DIST libcxxabi-4.0.1.src.tar.xz 515820 BLAKE2B 
7d9e0dee4f6cb3eaa22647d959f8bf3d86779f8c51c0738143ba3daca83881daacc0663a1d2463507c8c4b8a1b9e1d5c111b829e5af2cb5b6f86bae8f06a0d47
 SHA512 
e94315ba8a507d8481d70c33e7ab2d724d51726edb8412c70a1b5f59e3f15d5825f1502dc2db138b20e5293fb90a184050be94d5ac270fd7ce78b502efb9f86a
-DIST libcxxabi-5.0.1.src.tar.xz 521504 BLAKE2B 
e8263f458545ffb8ec27234e554427696644dcde3b46bea4fa0ee14b2b174d0c6c8dcc7905477140afaf567347e91815827aa6700c92ccfbfbea5364f591fc2a
 SHA512 
a8d448653772690a19f68c1270f9cf18f27d7225847825f29c6ea21846c1074aa61c31b81bc2ae4007067985d389071c32e69b2560282ddb85864a99e9bdd884
 DIST libcxxabi-5.0.2.src.tar.xz 521448 BLAKE2B 
e7e42908845f692cdb8709955eb46cbc18ee1f4ac9f0224b6e2a6bc2af998415eca5cda03ffcac27ef6a93cde928951bc38503bae9144b634abd17ec46ad96eb
 SHA512 
304c0ef1b2fd26d52dae66013ea0051de4c3cb1e9c8d1308833f34aec1ad288fcfe5d583f00ceb84c8d271c5cd5f868aa135a93f007138d124c01b70c13e842e
-DIST libcxxabi-6.0.0.src.tar.xz 529212 BLAKE2B 
ae020e8831a6ae71d59d71e294bbb0aa6dbedf1b3036b2536d9456db8c51f21e57d082c5abf5e00921a14876328bdfafab3c04b4d761cb76d52e35ff97107510
 SHA512 
c5e4cc05105770b42b20595fdbda5e1483be4582bc94335da1a15531ba43a0ecf30e1e0a252f62d4d0e6c79cda9d44ff5fdbe69a0a295b2431fd6de158410e2e
 DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B 
b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927
 SHA512 
bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2

diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild 
b/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
deleted file mode 100644
index 758b743df7e..00000000000
--- a/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm python-any-r1
-
-MY_P=${P/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/";
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-       https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz";
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+libunwind +static-libs test elibc_musl"
-
-RDEPEND="
-       libunwind? (
-               || (
-                       
>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-                       
>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-               )
-       )"
-# LLVM 4 required for llvm-config --cmakedir
-DEPEND="${RDEPEND}
-       >=sys-devel/llvm-4
-       test? ( >=sys-devel/clang-3.9.0
-               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-       has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       llvm_pkg_setup
-       use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-       default
-       mv "${LIBCXX_P}" libcxx || die
-}
-
-multilib_src_configure() {
-       local libdir=$(get_libdir)
-       local mycmakeargs=(
-               -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-               -DLIBCXXABI_ENABLE_SHARED=ON
-               -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-               -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-               -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-
-               -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-               # upstream is omitting standard search path for this
-               # probably because gcc & clang are bundling their own unwind.h
-               -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-       )
-       if use test; then
-               if has_version '>=sys-devel/llvm-6'; then
-                       mycmakeargs+=(
-                               -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       )
-               else
-                       mycmakeargs+=(
-                               -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-                       )
-               fi
-       fi
-       cmake-utils_src_configure
-}
-
-build_libcxx() {
-       local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-       local CMAKE_USE_DIR=${WORKDIR}/libcxx
-       local BUILD_DIR=${BUILD_DIR}/libcxx
-       local mycmakeargs=(
-               -DLIBCXX_LIBDIR_SUFFIX=
-               -DLIBCXX_ENABLE_SHARED=ON
-               -DLIBCXX_ENABLE_STATIC=OFF
-               -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-               -DLIBCXX_CXX_ABI=libcxxabi
-               -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
-               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-               -DLIBCXX_HAS_GCC_S_LIB=OFF
-               -DLIBCXX_INCLUDE_TESTS=OFF
-       )
-
-       cmake-utils_src_configure
-       cmake-utils_src_compile
-}
-
-multilib_src_test() {
-       local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
-       [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
-       sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" 
test/lit.site.cfg || die
-
-       # build a local copy of libc++ for testing to avoid circular dep
-       build_libcxx
-       mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die
-
-       cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
-       insinto /usr/include/libcxxabi
-       doins -r include/.
-}

diff --git a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild 
b/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
deleted file mode 100644
index 5c5a3146b60..00000000000
--- a/sys-libs/libcxxabi/libcxxabi-6.0.0.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib llvm multiprocessing python-any-r1
-
-MY_P=${P/_/}.src
-LIBCXX_P=libcxx-${PV/_/}.src
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/";
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-       https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz";
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
-IUSE="+libunwind +static-libs test elibc_musl"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-       libunwind? (
-               || (
-                       
>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-                       
>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
-               )
-       )"
-# llvm-6 for new lit options
-DEPEND="${RDEPEND}
-       >=sys-devel/llvm-6
-       test? ( >=sys-devel/clang-3.9.0
-               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-       has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       llvm_pkg_setup
-       use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-       default
-       mv "${LIBCXX_P}" libcxx || die
-}
-
-multilib_src_configure() {
-       local libdir=$(get_libdir)
-       local mycmakeargs=(
-               -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-               -DLIBCXXABI_ENABLE_SHARED=ON
-               -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-               -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-               -DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-
-               -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
-               # upstream is omitting standard search path for this
-               # probably because gcc & clang are bundling their own unwind.h
-               -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-       )
-       if use test; then
-               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
-               local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" 
"$(get_nproc)")}
-
-               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
-
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       
-DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
-               )
-       fi
-       cmake-utils_src_configure
-}
-
-build_libcxx() {
-       local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-       local CMAKE_USE_DIR=${WORKDIR}/libcxx
-       local BUILD_DIR=${BUILD_DIR}/libcxx
-       local mycmakeargs=(
-               -DLIBCXX_LIBDIR_SUFFIX=
-               -DLIBCXX_ENABLE_SHARED=ON
-               -DLIBCXX_ENABLE_STATIC=OFF
-               -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-               -DLIBCXX_CXX_ABI=libcxxabi
-               -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include
-               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-               -DLIBCXX_HAS_GCC_S_LIB=OFF
-               -DLIBCXX_INCLUDE_TESTS=OFF
-       )
-
-       cmake-utils_src_configure
-       cmake-utils_src_compile
-}
-
-multilib_src_test() {
-       # build a local copy of libc++ for testing to avoid circular dep
-       build_libcxx
-       mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die
-
-       cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
-       insinto /usr/include/libcxxabi
-       doins -r include/.
-}

Reply via email to