[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/libcxxabi/files/, sys-libs/libcxx/, sys-libs/libcxx/files/, ...

[Fabian Groffen]

commit:     1f20a711898c2d7855d43a2cb293dc6ceb1e0323
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 09:40:17 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 09:40:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f20a711

sys-libs/libcxx{,abi,-headers} drop packages

these are very out of date, and not in sync with llvm current

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/libcxx-headers/Manifest                   |   4 -
 .../files/libcxx-headers-3.5.1-availability.patch  |  46 ----
 .../files/libcxx-headers-3.5.1-cmath-conv.patch    |  28 ---
 .../libcxx-headers/libcxx-headers-3.5.1.ebuild     |  38 ----
 .../libcxx-headers/libcxx-headers-3.7.1.ebuild     |  38 ----
 .../libcxx-headers/libcxx-headers-3.8.1.ebuild     |  38 ----
 .../libcxx-headers/libcxx-headers-3.9.0.ebuild     |  45 ----
 sys-libs/libcxx-headers/metadata.xml               |   8 -
 sys-libs/libcxx/Manifest                           |   5 -
 sys-libs/libcxx/files/Makefile                     |  38 ----
 .../libcxx/files/libcxx-3.5.1-availability.patch   |  46 ----
 .../libcxx/files/libcxx-3.5.1-cmath-conv.patch     |  28 ---
 sys-libs/libcxx/files/libcxx-3.5.1-eprintf.patch   |  32 ---
 sys-libs/libcxx/files/libcxx-3.5.1-olddarwin.patch |  34 ---
 .../libcxx/files/libcxx-3.9-cmake-link-flags.patch |  23 --
 .../libcxx/files/libcxx-3.9-cmake-static-lib.patch | 196 -----------------
 sys-libs/libcxx/libcxx-3.5.1.ebuild                | 241 --------------------
 sys-libs/libcxx/libcxx-3.7.1.ebuild                | 241 --------------------
 sys-libs/libcxx/libcxx-3.8.1.ebuild                | 242 ---------------------
 sys-libs/libcxx/libcxx-3.9.1.ebuild                | 233 --------------------
 sys-libs/libcxx/libcxx-5.0.1.ebuild                | 238 --------------------
 sys-libs/libcxx/metadata.xml                       |  21 --
 sys-libs/libcxxabi/Manifest                        |   8 -
 .../libcxxabi/files/libcxxabi-3.5.1-eprintf.patch  |  28 ---
 .../files/libcxxabi-3.9.0-cmake-path.patch         |  34 ---
 .../files/libcxxabi-3.9.0-test-unwind.patch        |  37 ----
 sys-libs/libcxxabi/libcxxabi-3.5.1.ebuild          |  89 --------
 sys-libs/libcxxabi/libcxxabi-3.7.1.ebuild          |  86 --------
 sys-libs/libcxxabi/libcxxabi-3.8.1.ebuild          |  90 --------
 sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild          |  60 -----
 sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild          | 106 ---------
 sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild          | 102 ---------
 sys-libs/libcxxabi/metadata.xml                    |  10 -
 33 files changed, 2513 deletions(-)

diff --git a/sys-libs/libcxx-headers/Manifest b/sys-libs/libcxx-headers/Manifest
deleted file mode 100644
index 83e27efff7..0000000000
--- a/sys-libs/libcxx-headers/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libcxx-3.5.1.src.tar.xz 912248 BLAKE2B 9215341a119eb56be7f6cefe9b8de664ab2e9e5e208ab017aa73cd539c8f5f9e0b41209f245904793adf2933a72afd0aa2428fb1983480190d4e2f4e83e62e0d SHA512 3be33787c79aa5d03a3f507be20ef986215d6008e4f0370e3c5906d76a620bf27c9ed4c35f4561c1ac507a1b217fa7fc7577611e7205f3f2433c677bf86b8632
-DIST libcxx-3.7.1.src.tar.xz 995724 BLAKE2B aab68f1b99a2c817e7154b71c04c81bd809154d1ae1c077a2dfede37319070729d6d768223b6ba5e2a866d6c2f18972dd501ce517864378ebc26c49cacafb635 SHA512 08d2399a8b36aa15290733256c896c9fa43f1a1223bc5c73bbcd014fddf8880e514d2a6dcc456bcf18b537c01fb6911b092e6d9958bccd8e64e9f375ed7a1ab9
-DIST libcxx-3.8.1.src.tar.xz 1074164 BLAKE2B 8aa07974a0301684f852408a62c173084fb913179bec951df3bae33895f8b46434eddc95b838cb936a5ef31f5b8ead25b7d0e241adc039eaea38ef95045c8ccb SHA512 782ff3cdb85d02e92404e943474d0266ff601725c202f0667d60e7807f1ba3cfdebbdb062e27a52fec96be1c99339044be93a88ba7e396682f98d99c9ac175b2
-DIST libcxx-3.9.0.src.tar.xz 1198308 BLAKE2B 689fed969562466bd230445a0edb886880d1034c45d5387922d1dd307898547e5605035c5aa901f3e844be3c1b2d066cf27aa0b996d7ade176ee38a9f49ac98a SHA512 55d5c4adff378ee02b0b99d732bc9f326910f9e49ab8c320a588eccdd0362fe009bc9a6a4337d29faf6338420c91b10d0d7d67f66128268f01258d30502c4f4a

diff --git a/sys-libs/libcxx-headers/files/libcxx-headers-3.5.1-availability.patch b/sys-libs/libcxx-headers/files/libcxx-headers-3.5.1-availability.patch
deleted file mode 100644
index 5b11750148..0000000000
--- a/sys-libs/libcxx-headers/files/libcxx-headers-3.5.1-availability.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Older OS X does not have Availability.h. Use AvailabilityMacros.h instead.
-Since those platforms don't know anything about the iPhone, we can drop those
-checks.
-
---- libcxx-3.5.1.src/include/iterator.orig	2015-01-26 22:39:31.000000000 +0100
-+++ libcxx-3.5.1.src/include/iterator	2015-01-26 22:40:40.000000000 +0100
-@@ -335,7 +335,7 @@
- #include <iosfwd>
- #include <initializer_list>
- #ifdef __APPLE__
--#include <Availability.h>
-+#include <AvailabilityMacros.h>
- #endif
- 
- #ifdef _LIBCPP_DEBUG
-@@ -913,8 +913,7 @@
-     _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
- 
- #if !defined(__APPLE__) || \
--    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
--    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-+    (defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
- 
-     template <class _Ch, class _Tr>
-     friend
---- libcxx-3.5.1.src/include/locale.orig	2015-01-26 23:39:10.000000000 +0100
-+++ libcxx-3.5.1.src/include/locale	2015-01-26 23:39:34.000000000 +0100
-@@ -198,7 +198,7 @@
- #endif
- 
- #ifdef __APPLE__
--#include <Availability.h>
-+#include <AvailabilityMacros.h>
- #endif
- 
- #include <__undef_min_max>
-@@ -1467,8 +1467,7 @@
- }
- 
- #if !defined(__APPLE__) || \
--    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
--    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-+    (defined(MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
- 
- template <class _CharT, class _Traits>
- _LIBCPP_HIDDEN

diff --git a/sys-libs/libcxx-headers/files/libcxx-headers-3.5.1-cmath-conv.patch b/sys-libs/libcxx-headers/files/libcxx-headers-3.5.1-cmath-conv.patch
deleted file mode 100644
index 2239d5e682..0000000000
--- a/sys-libs/libcxx-headers/files/libcxx-headers-3.5.1-cmath-conv.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Work around bug in OS X 10.6 math.h headers which never declare the long long
-float conversion functions even if allowed.
-
---- libcxx-3.5.1.src/include/cmath.orig	2015-01-15 12:05:28.000000000 +0100
-+++ libcxx-3.5.1.src/include/cmath	2015-01-15 12:09:31.000000000 +0100
-@@ -299,6 +299,22 @@
- 
- #include <__config>
- #include <math.h>
-+
-+/* work around bug in OS X 10.6 math.h headers which never declare the long
-+ * long float conversion functions even if allowed */
-+#if !(__DARWIN_NO_LONG_LONG)
-+    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
-+    extern long long int llrint ( double );
-+    extern long long int llrintf ( float );
-+
-+    extern long long int llround ( double );
-+    extern long long int llroundf ( float );
-+
-+    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
-+    extern long long int llrintl(long double);
-+    extern long long int llroundl(long double);
-+#endif /* #if !(__DARWIN_NO_LONG_LONG) */
-+
- #include <type_traits>
- 
- #ifdef _LIBCPP_MSVCRT

diff --git a/sys-libs/libcxx-headers/libcxx-headers-3.5.1.ebuild b/sys-libs/libcxx-headers/libcxx-headers-3.5.1.ebuild
deleted file mode 100644
index 5cef9f4681..0000000000
--- a/sys-libs/libcxx-headers/libcxx-headers-3.5.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN%%-headers}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}.src"
-
-inherit eutils
-
-DESCRIPTION="Header files for libc++ required by e.g. libc++abi to be compiled"
-HOMEPAGE="http://libcxx.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		[[ "${CHOST##*-darwin}" -le 10 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-cmath-conv.patch
-		[[ "${CHOST##*-darwin}" -le 8 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-		rm -f include/CMakeLists.txt
-	fi
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/include/c++/v1
-	doins -r include/*
-}

diff --git a/sys-libs/libcxx-headers/libcxx-headers-3.7.1.ebuild b/sys-libs/libcxx-headers/libcxx-headers-3.7.1.ebuild
deleted file mode 100644
index c12fdca5ab..0000000000
--- a/sys-libs/libcxx-headers/libcxx-headers-3.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN%%-headers}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}.src"
-
-inherit eutils
-
-DESCRIPTION="Header files for libc++ required by e.g. libc++abi to be compiled"
-HOMEPAGE="http://libcxx.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		[[ "${CHOST##*-darwin}" -le 10 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-cmath-conv.patch
-		[[ "${CHOST##*-darwin}" -le 8 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-		rm -f include/CMakeLists.txt
-	fi
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/include/c++/v1
-	doins -r include/*
-}

diff --git a/sys-libs/libcxx-headers/libcxx-headers-3.8.1.ebuild b/sys-libs/libcxx-headers/libcxx-headers-3.8.1.ebuild
deleted file mode 100644
index c12fdca5ab..0000000000
--- a/sys-libs/libcxx-headers/libcxx-headers-3.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN%%-headers}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}.src"
-
-inherit eutils
-
-DESCRIPTION="Header files for libc++ required by e.g. libc++abi to be compiled"
-HOMEPAGE="http://libcxx.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		[[ "${CHOST##*-darwin}" -le 10 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-cmath-conv.patch
-		[[ "${CHOST##*-darwin}" -le 8 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-		rm -f include/CMakeLists.txt
-	fi
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /usr/include/c++/v1
-	doins -r include/*
-}

diff --git a/sys-libs/libcxx-headers/libcxx-headers-3.9.0.ebuild b/sys-libs/libcxx-headers/libcxx-headers-3.9.0.ebuild
deleted file mode 100644
index 5ff46d0799..0000000000
--- a/sys-libs/libcxx-headers/libcxx-headers-3.9.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=${PN%%-headers}
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}.src"
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Header files for libc++ required by e.g. libc++abi to be compiled"
-HOMEPAGE="http://libcxx.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
-	sed -i -e "/set.LLVM_CMAKE_PATH.*\\/cmake\\/modules/s@cmake/modules@cmake@" \
-		cmake/Modules/HandleOutOfTreeLLVM.cmake
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		[[ "${CHOST##*-darwin}" -le 8 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_PATH=${EPREFIX}/usr/share/llvm
-		# disable installation and indirectly build of libc++ because we only
-		# want the headers
-		-DLIBCXX_INSTALL_LIBRARY=NO
-		# disable libc++experimental as well because it will re-enable the
-		# build of libc++
-		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=NO 
-	)
-
-	cmake-utils_src_configure
-}

diff --git a/sys-libs/libcxx-headers/metadata.xml b/sys-libs/libcxx-headers/metadata.xml
deleted file mode 100644
index b592ddf756..0000000000
--- a/sys-libs/libcxx-headers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>prefix@g.o</email>
-    <name>Prefix Project</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
deleted file mode 100644
index b998ef46cd..0000000000
--- a/sys-libs/libcxx/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST libcxx-3.5.1.src.tar.xz 912248 BLAKE2B 9215341a119eb56be7f6cefe9b8de664ab2e9e5e208ab017aa73cd539c8f5f9e0b41209f245904793adf2933a72afd0aa2428fb1983480190d4e2f4e83e62e0d SHA512 3be33787c79aa5d03a3f507be20ef986215d6008e4f0370e3c5906d76a620bf27c9ed4c35f4561c1ac507a1b217fa7fc7577611e7205f3f2433c677bf86b8632
-DIST libcxx-3.7.1.src.tar.xz 995724 BLAKE2B aab68f1b99a2c817e7154b71c04c81bd809154d1ae1c077a2dfede37319070729d6d768223b6ba5e2a866d6c2f18972dd501ce517864378ebc26c49cacafb635 SHA512 08d2399a8b36aa15290733256c896c9fa43f1a1223bc5c73bbcd014fddf8880e514d2a6dcc456bcf18b537c01fb6911b092e6d9958bccd8e64e9f375ed7a1ab9
-DIST libcxx-3.8.1.src.tar.xz 1074164 BLAKE2B 8aa07974a0301684f852408a62c173084fb913179bec951df3bae33895f8b46434eddc95b838cb936a5ef31f5b8ead25b7d0e241adc039eaea38ef95045c8ccb SHA512 782ff3cdb85d02e92404e943474d0266ff601725c202f0667d60e7807f1ba3cfdebbdb062e27a52fec96be1c99339044be93a88ba7e396682f98d99c9ac175b2
-DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
-DIST libcxx-5.0.1.src.tar.xz 1527852 BLAKE2B 9454fbca8228ee456feb79b65a63ce5daa27bf2e47e457d79592f4974dceeace19fe6cdeee51cc51f94e9072d7ce3c03e5acb617507670153647b9c435feadbd SHA512 994681d3c79047fc2d618c5584b08e9b5c925dab48f8812fc0adc81a575b49a637e9481bb9a0f7ae6f7f352b2b33f40056c347c27123cd6c96c6c226febd002c

diff --git a/sys-libs/libcxx/files/Makefile b/sys-libs/libcxx/files/Makefile
deleted file mode 100644
index 029e7295b8..0000000000
--- a/sys-libs/libcxx/files/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-CXXFLAGS+=-std=c++11 -fstrict-aliasing -Wall -Wextra -Wshadow -Wconversion \
-	  -Wpadded -Wstrict-aliasing=2 -Wstrict-overflow=4
-
-SRCDIR=..
-LIB=libc++
-STATIC=libc++.a
-MAJOR=1
-MINOR=0
-SHEXT?=.so
-SHLIB=$(LIB)$(SHEXT).$(MAJOR).$(MINOR)
-SONAME=$(LIB)$(SHEXT).$(MAJOR)
-
-SRC=$(wildcard $(SRCDIR)/src/*.cpp)
-OBJ=$(SRC:$(SRCDIR)/src/%.cpp=%.o)
-SOBJ=$(SRC:$(SRCDIR)/src/%.cpp=%.So)
-
-
-%.So: $(SRCDIR)/src/%.cpp
-	$(CXX) -I$(SRCDIR)/include $(CPPFLAGS) $(CXXFLAGS) -fPIC -nostdinc++ -c $< -o $@
-
-%.o: $(SRCDIR)/src/%.cpp
-	$(CXX) -I$(SRCDIR)/include $(CPPFLAGS) $(CXXFLAGS) -nostdinc++ -c $< -o $@
-
-$(STATIC): $(OBJ)
-	$(AR) cr $@ $^
-
-static: $(STATIC)
-
-$(SHLIB): $(SOBJ)
-	$(CXX) -fPIC -nodefaultlibs $(CXXFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(LIBS)
-
-$(SONAME): $(SHLIB)
-	ln -s $< $@
-
-$(LIB)$(SHEXT): $(SONAME)
-	ln -s $< $@
-
-shared: $(SHLIB) $(SONAME) $(LIB)$(SHEXT)

diff --git a/sys-libs/libcxx/files/libcxx-3.5.1-availability.patch b/sys-libs/libcxx/files/libcxx-3.5.1-availability.patch
deleted file mode 100644
index 5b11750148..0000000000
--- a/sys-libs/libcxx/files/libcxx-3.5.1-availability.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Older OS X does not have Availability.h. Use AvailabilityMacros.h instead.
-Since those platforms don't know anything about the iPhone, we can drop those
-checks.
-
---- libcxx-3.5.1.src/include/iterator.orig	2015-01-26 22:39:31.000000000 +0100
-+++ libcxx-3.5.1.src/include/iterator	2015-01-26 22:40:40.000000000 +0100
-@@ -335,7 +335,7 @@
- #include <iosfwd>
- #include <initializer_list>
- #ifdef __APPLE__
--#include <Availability.h>
-+#include <AvailabilityMacros.h>
- #endif
- 
- #ifdef _LIBCPP_DEBUG
-@@ -913,8 +913,7 @@
-     _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
- 
- #if !defined(__APPLE__) || \
--    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
--    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-+    (defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
- 
-     template <class _Ch, class _Tr>
-     friend
---- libcxx-3.5.1.src/include/locale.orig	2015-01-26 23:39:10.000000000 +0100
-+++ libcxx-3.5.1.src/include/locale	2015-01-26 23:39:34.000000000 +0100
-@@ -198,7 +198,7 @@
- #endif
- 
- #ifdef __APPLE__
--#include <Availability.h>
-+#include <AvailabilityMacros.h>
- #endif
- 
- #include <__undef_min_max>
-@@ -1467,8 +1467,7 @@
- }
- 
- #if !defined(__APPLE__) || \
--    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
--    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-+    (defined(MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
- 
- template <class _CharT, class _Traits>
- _LIBCPP_HIDDEN

diff --git a/sys-libs/libcxx/files/libcxx-3.5.1-cmath-conv.patch b/sys-libs/libcxx/files/libcxx-3.5.1-cmath-conv.patch
deleted file mode 100644
index 2239d5e682..0000000000
--- a/sys-libs/libcxx/files/libcxx-3.5.1-cmath-conv.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Work around bug in OS X 10.6 math.h headers which never declare the long long
-float conversion functions even if allowed.
-
---- libcxx-3.5.1.src/include/cmath.orig	2015-01-15 12:05:28.000000000 +0100
-+++ libcxx-3.5.1.src/include/cmath	2015-01-15 12:09:31.000000000 +0100
-@@ -299,6 +299,22 @@
- 
- #include <__config>
- #include <math.h>
-+
-+/* work around bug in OS X 10.6 math.h headers which never declare the long
-+ * long float conversion functions even if allowed */
-+#if !(__DARWIN_NO_LONG_LONG)
-+    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
-+    extern long long int llrint ( double );
-+    extern long long int llrintf ( float );
-+
-+    extern long long int llround ( double );
-+    extern long long int llroundf ( float );
-+
-+    /* long long is not part of C90. Make sure you are passing -std=c99 or -std=gnu99 or better if you need this. */
-+    extern long long int llrintl(long double);
-+    extern long long int llroundl(long double);
-+#endif /* #if !(__DARWIN_NO_LONG_LONG) */
-+
- #include <type_traits>
- 
- #ifdef _LIBCPP_MSVCRT

diff --git a/sys-libs/libcxx/files/libcxx-3.5.1-eprintf.patch b/sys-libs/libcxx/files/libcxx-3.5.1-eprintf.patch
deleted file mode 100644
index 1860e5efa0..0000000000
--- a/sys-libs/libcxx/files/libcxx-3.5.1-eprintf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-On older OS X assert.h refers to eprintf which is nowhere to be found. That's
-why everyone (libstdc++, clang compiler-rt) bring their own implementation.
-Ours is nicked from Apple's patch to libstdc++-39.
-
---- libcxx-3.5.1.src/src/mutex.cpp.orig	2015-01-26 23:55:25.000000000 +0100
-+++ libcxx-3.5.1.src/src/mutex.cpp	2015-01-26 23:56:30.000000000 +0100
-@@ -13,6 +13,25 @@
- #include "system_error"
- #include "cassert"
- 
-+#ifdef __APPLE__
-+#include <AvailabilityMacros.h>
-+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1050)
-+#include <cstdio>
-+#include <cstdlib>
-+
-+using namespace std;
-+extern "C"
-+__attribute__((visibility("hidden")))
-+void __eprintf (const char *string, const char *expression,
-+	unsigned int line, const char *filename)
-+{
-+	fprintf (stderr, string, expression, line, filename);
-+	fflush (stderr);
-+	abort ();
-+}
-+#endif
-+#endif /* __APPLE__ */
-+
- _LIBCPP_BEGIN_NAMESPACE_STD
- 
- const defer_lock_t  defer_lock = {};

diff --git a/sys-libs/libcxx/files/libcxx-3.5.1-olddarwin.patch b/sys-libs/libcxx/files/libcxx-3.5.1-olddarwin.patch
deleted file mode 100644
index 2717c16296..0000000000
--- a/sys-libs/libcxx/files/libcxx-3.5.1-olddarwin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Make buildit recognise older OS X and build for them the same as on 10.6.
-
---- libcxx-3.5.1.src/lib/buildit.orig	2015-01-18 11:21:51.000000000 -0900
-+++ libcxx-3.5.1.src/lib/buildit	2015-01-18 11:32:36.000000000 -0900
-@@ -50,8 +50,8 @@
-       RC_CFLAGS="-arch i386 -arch x86_64"
-     fi
-     SOEXT=dylib
--    if [ "$MACOSX_DEPLOYMENT_TARGET" = "10.6" ]
--    then
-+    case "${MACOSX_DEPLOYMENT_TARGET}" in
-+    10.[0123456])
-         EXTRA_FLAGS="-nostdinc++ -std=c++11 -U__STRICT_ANSI__"
-         LDSHARED_FLAGS="-o libc++.1.dylib \
-             -dynamiclib -nodefaultlibs -current_version 1 \
-@@ -60,7 +60,8 @@
-             -Wl,-reexport_library,/Users/michael/Gentoo/usr/lib/libc++abi.dylib \
-             -Wl,-unexported_symbols_list,libc++unexp.exp  \
-             /usr/lib/libSystem.B.dylib"
--    else
-+        ;;
-+    *)
-         if [ -n "$SDKROOT" ]
-         then
-             EXTRA_FLAGS+="-isysroot ${SDKROOT} "
-@@ -92,7 +93,7 @@
-             ${RE_EXPORT_LINE}  \
-             -Wl,-force_symbols_not_weak_list,notweak.exp \
-             -Wl,-force_symbols_weak_list,weak.exp"
--    fi
-+    esac
-     ;;
-   *-*-mingw*)
-     # FIXME: removing libgcc and libsupc++ dependencies means porting libcxxrt and LLVM/compiler-rt

diff --git a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch b/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch
deleted file mode 100644
index bef5bc1875..0000000000
--- a/sys-libs/libcxx/files/libcxx-3.9-cmake-link-flags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d618e83..0e76525 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -293,6 +293,18 @@ remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG
- # so they don't get transformed into -Wno and -errors respectivly.
- remove_flags(-Wno-pedantic -pedantic-errors -pedantic)
- 
-+# FIXME: this is cribbed from HandleLLVMOptions.cmake.
-+if(LIBCXX_STANDALONE_BUILD)
-+  # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO
-+  # build might work on ELF but fail on MachO/COFF.
-+  if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
-+          ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
-+          ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND
-+     NOT LLVM_USE_SANITIZER)
-+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
-+  endif()
-+endif()
-+
- # Required flags ==============================================================
- add_compile_flags_if_supported(-std=c++11)
- if (NOT MSVC AND NOT LIBCXX_SUPPORTS_STD_EQ_CXX11_FLAG)

diff --git a/sys-libs/libcxx/files/libcxx-3.9-cmake-static-lib.patch b/sys-libs/libcxx/files/libcxx-3.9-cmake-static-lib.patch
deleted file mode 100644
index 5f0e31864d..0000000000
--- a/sys-libs/libcxx/files/libcxx-3.9-cmake-static-lib.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From b640da0b315ead39690d4d65c76938ab8aeb5449 Mon Sep 17 00:00:00 2001
-From: Petr Hosek <phosek@××××××××.org>
-Date: Mon, 8 Aug 2016 22:57:25 +0000
-Subject: [PATCH] Allow building both shared and static library
-
-This change allows building both shared and static version of libc++
-in a single build, sharing object files between both versions.
-
-Differential Revision: https://reviews.llvm.org/D23232
-
-git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@278068 91177308-0d34-0410-b5e6-96231b3b80d8
----
- CMakeLists.txt          |  5 ++++
- docs/BuildingLibcxx.rst | 11 ++++++--
- lib/CMakeLists.txt      | 71 ++++++++++++++++++++++++++++++++++---------------
- 3 files changed, 63 insertions(+), 24 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 950070d..98886b0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,7 @@ MACRO_ENSURE_OUT_OF_SOURCE_BUILD(
- # Basic options ---------------------------------------------------------------
- option(LIBCXX_ENABLE_ASSERTIONS "Enable assertions independent of build mode." ON)
- option(LIBCXX_ENABLE_SHARED "Build libc++ as a shared library." ON)
-+option(LIBCXX_ENABLE_STATIC "Build libc++ as a static library." ON)
- option(LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY "Build libc++experimental.a" ON)
- option(LIBCXX_ENABLE_FILESYSTEM
-         "Build filesystem as part of libc++experimental.a" ${LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY})
-@@ -68,6 +69,10 @@ option(LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY "Install libc++experimental.a" OFF)
- set(LIBCXX_ABI_VERSION 1 CACHE STRING "ABI version of libc++.")
- option(LIBCXX_ABI_UNSTABLE "Unstable ABI of libc++." OFF)
- 
-+if (NOT LIBCXX_ENABLE_SHARED AND NOT LIBCXX_ENABLE_STATIC)
-+  message(FATAL_ERROR "libc++ must be built as either a shared or static library.")
-+endif()
-+
- # ABI Library options ---------------------------------------------------------
- set(LIBCXX_CXX_ABI "${LIBCXX_CXX_ABI}" CACHE STRING
-     "Specify C++ ABI library to use." FORCE)
-diff --git a/docs/BuildingLibcxx.rst b/docs/BuildingLibcxx.rst
-index 5dd174a..6709352 100644
---- a/docs/BuildingLibcxx.rst
-+++ b/docs/BuildingLibcxx.rst
-@@ -150,8 +150,15 @@ libc++ specific options
- 
-   **Default**: ``ON``
- 
--  Build libc++ as a shared library. If ``OFF`` is specified then libc++ is
--  built as a static library.
-+  Build libc++ as a shared library. Either :option:`LIBCXX_ENABLE_SHARED` or
-+  :option:`LIBCXX_ENABLE_STATIC` has to be enabled.
-+
-+.. option:: LIBCXX_ENABLE_STATIC:BOOL
-+
-+  **Default**: ``ON``
-+
-+  Build libc++ as a static library. Either :option:`LIBCXX_ENABLE_SHARED` or
-+  :option:`LIBCXX_ENABLE_STATIC` has to be enabled.
- 
- .. option:: LIBCXX_LIBDIR_SUFFIX:STRING
- 
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index afc388e..cabf2e6 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -28,16 +28,6 @@ if(NOT LIBCXX_INSTALL_LIBRARY)
-   set(exclude_from_all EXCLUDE_FROM_ALL)
- endif()
- 
--if (LIBCXX_ENABLE_SHARED)
--  add_library(cxx SHARED ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
--else()
--  add_library(cxx STATIC ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
--endif()
--
--if (DEFINED LIBCXX_CXX_ABI_DEPS)
--  add_dependencies(cxx LIBCXX_CXX_ABI_DEPS)
--endif()
--
- #if LIBCXX_CXX_ABI_LIBRARY_PATH is defined we want to add it to the search path.
- add_link_flags_if(LIBCXX_CXX_ABI_LIBRARY_PATH "-L${LIBCXX_CXX_ABI_LIBRARY_PATH}")
- 
-@@ -139,18 +129,51 @@ if ( APPLE AND (LIBCXX_CXX_ABI_LIBNAME STREQUAL "libcxxabi" OR
-   endif()
- endif()
- 
--target_link_libraries(cxx ${LIBCXX_LIBRARIES})
- split_list(LIBCXX_COMPILE_FLAGS)
- split_list(LIBCXX_LINK_FLAGS)
- 
--set_target_properties(cxx
-+# Add a object library that contains the compiled source files.
-+add_library(cxx_objects OBJECT ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
-+
-+set_target_properties(cxx_objects
-   PROPERTIES
-     COMPILE_FLAGS "${LIBCXX_COMPILE_FLAGS}"
--    LINK_FLAGS    "${LIBCXX_LINK_FLAGS}"
--    OUTPUT_NAME   "c++"
--    VERSION       "${LIBCXX_ABI_VERSION}.0"
--    SOVERSION     "${LIBCXX_ABI_VERSION}"
-+)
-+
-+set(LIBCXX_TARGETS)
-+
-+# Build the shared library.
-+if (LIBCXX_ENABLE_SHARED)
-+  add_library(cxx_shared SHARED $<TARGET_OBJECTS:cxx_objects>)
-+  target_link_libraries(cxx_shared ${LIBCXX_LIBRARIES})
-+  set_target_properties(cxx_shared
-+    PROPERTIES
-+      LINK_FLAGS    "${LIBCXX_LINK_FLAGS}"
-+      OUTPUT_NAME   "c++"
-+      VERSION       "${LIBCXX_ABI_VERSION}.0"
-+      SOVERSION     "${LIBCXX_ABI_VERSION}"
-   )
-+  list(APPEND LIBCXX_TARGETS "cxx_shared")
-+endif()
-+
-+# Build the static library.
-+if (LIBCXX_ENABLE_STATIC)
-+  add_library(cxx_static STATIC $<TARGET_OBJECTS:cxx_objects>)
-+  target_link_libraries(cxx_static ${LIBCXX_LIBRARIES})
-+  set_target_properties(cxx_static
-+    PROPERTIES
-+      LINK_FLAGS    "${LIBCXX_LINK_FLAGS}"
-+      OUTPUT_NAME   "c++"
-+  )
-+  list(APPEND LIBCXX_TARGETS "cxx_static")
-+endif()
-+
-+# Add a meta-target for both libraries.
-+add_custom_target(cxx DEPENDS ${LIBCXX_TARGETS})
-+
-+if (DEFINED LIBCXX_CXX_ABI_DEPS)
-+  add_dependencies(cxx LIBCXX_CXX_ABI_DEPS)
-+endif()
- 
- if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
-   file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp)
-@@ -158,7 +181,11 @@ if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
-     file(GLOB LIBCXX_FILESYSTEM_SOURCES ../src/experimental/filesystem/*.cpp)
-   endif()
-   add_library(cxx_experimental STATIC ${LIBCXX_EXPERIMENTAL_SOURCES} ${LIBCXX_FILESYSTEM_SOURCES})
--  target_link_libraries(cxx_experimental cxx)
-+  if (LIBCXX_ENABLE_SHARED)
-+    target_link_libraries(cxx_experimental cxx_shared)
-+  else()
-+    target_link_libraries(cxx_experimental cxx_static)
-+  endif()
- 
-   set(experimental_flags "${LIBCXX_COMPILE_FLAGS}")
-   check_flag_supported(-std=c++14)
-@@ -174,7 +201,7 @@ endif()
- 
- # Generate a linker script inplace of a libc++.so symlink. Rerun this command
- # after cxx builds.
--if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
-+if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
-   # Get the name of the ABI library and handle the case where CXXABI_LIBNAME
-   # is a target name and not a library. Ex cxxabi_shared.
-   set(SCRIPT_ABI_LIBNAME "${LIBCXX_CXX_ABI_LIBRARY}")
-@@ -183,11 +210,11 @@ if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
-   endif()
-   # Generate a linker script inplace of a libc++.so symlink. Rerun this command
-   # after cxx builds.
--  add_custom_command(TARGET cxx POST_BUILD
-+  add_custom_command(TARGET cxx_shared POST_BUILD
-     COMMAND
-       ${PYTHON_EXECUTABLE} ${LIBCXX_SOURCE_DIR}/utils/gen_link_script/gen_link_script.py
-     ARGS
--      "$<TARGET_LINKER_FILE:cxx>"
-+      "$<TARGET_LINKER_FILE:cxx_shared>"
-       "${SCRIPT_ABI_LIBNAME}"
-     WORKING_DIRECTORY ${LIBCXX_BUILD_DIR}
-   )
-@@ -197,13 +224,13 @@ if (LIBCXX_INSTALL_LIBRARY)
-   if (LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY)
-     set(experimental_lib cxx_experimental)
-   endif()
--  install(TARGETS cxx ${experimental_lib}
-+  install(TARGETS ${LIBCXX_TARGETS} ${experimental_lib}
-     LIBRARY DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx
-     ARCHIVE DESTINATION lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT libcxx
-     )
-   # NOTE: This install command must go after the cxx install command otherwise
-   # it will not be executed after the library symlinks are installed.
--  if (LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
-+  if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
-     # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx>
-     # after we required CMake 3.0.
-     install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}"
--- 
-2.4.10
-

diff --git a/sys-libs/libcxx/libcxx-3.5.1.ebuild b/sys-libs/libcxx/libcxx-3.5.1.ebuild
deleted file mode 100644
index 2ad15f10d6..0000000000
--- a/sys-libs/libcxx/libcxx-3.5.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal epatch
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-	S="${WORKDIR}"/"${P}".src
-else
-	SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE="elibc_glibc +libcxxrt static-libs test"
-
-REQUIRED_USE="kernel_Darwin? ( libcxxrt !static-libs )"
-RDEPEND="
-	!kernel_Darwin? (
-		libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
-		!libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )
-	)
-	kernel_Darwin? (
-		=sys-libs/libcxx-headers-${PV}
-		=sys-libs/libcxxabi-${PV}
-		sys-devel/clang
-	)"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/clang )
-	app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		MY_CC=$(tc-getCC)
-		MY_CXX=$(tc-getCXX)
-		if [[ ${MY_CC} != *clang* || ${MY_CXX} != *clang++* ]] ; then
-			eerror "${PN} needs to be built with clang++. Please do not override"
-			eerror "CC ($MY_CC) and CXX ($MY_CXX)"
-			eerror "or point them at clang and clang++ respectively."
-			die
-		fi
-		return
-	fi
-	if ! use libcxxrt ; then
-		ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
-		ewarn "libsupc++. Please note that this is not well supported."
-		ewarn "In particular, static linking will not work."
-	fi
-	if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
-		eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-}
-
-src_prepare() {
-	cp -f "${FILESDIR}/Makefile" lib/ || die
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		epatch "${FILESDIR}"/${PN}-3.5.1-olddarwin.patch
-
-		[[ "${CHOST##*-darwin}" -le 10 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-cmath-conv.patch
-
-		# libc++abi needs stack unwinding functions provided by libSystem on
-		# Mac OS X >= 10.6. On < 10.6 they're in libgcc_s. So force link
-		# against that. Additionally, the crt1.o provided by our gcc-apple
-		# toolchain isn't universal. Since that's needed for linking any
-		# program on OS X < 10.7, universal support is effectively broken on
-		# those older OS Xes even if clang and libc++{,abi} were to support it.
-		# So we can just disable universal compilation.
-		gcc_s=gcc_s.1
-		[[ "${CHOST##*-darwin}" -eq 9 ]] && gcc_s=gcc_s.10.5
-		[[ "${CHOST##*-darwin}" -eq 8 ]] && gcc_s=gcc_s.10.4
-		[[ "${CHOST##*-darwin}" -le 9 ]]  && \
-			sed -i -e "s,/usr/lib/libSystem.B.dylib,-lSystem -l${gcc_s},g" \
-				-e "s,-arch i386 -arch x86_64,,g" \
-				lib/buildit
-
-		if [[ "${CHOST##*-darwin}" -le 8 ]] ; then
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-			epatch "${FILESDIR}"/${PN}-3.5.1-eprintf.patch
-		fi
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			sed -i -e '/RC_CFLAGS=""/s/""/"-fPIC"/' lib/buildit || die
-		fi
-
-		# fix library install names
-		sed -i \
-			-e "s,/usr/lib/libc++abi\.dylib,${EPREFIX}/usr/lib/libc++abi.dylib,g" \
-			-e "s,/usr/lib/libc++\.1\.dylib,${EPREFIX}/usr/lib/libc++.1.dylib,g" \
-			lib/buildit
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CC CXX
-
-	# on Darwin we're all set
-	[[ ${CHOST} == *darwin* ]] && return
-
-	export LIBS="-lpthread -lrt -lc -lgcc_s"
-	if use libcxxrt ; then
-		append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
-		LIBS="-lcxxrt ${LIBS}"
-		cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
-	else
-		# Very hackish, see $HOMEPAGE
-		# If someone has a clever idea, please share it!
-		local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
-		local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
-		append-cppflags -D__GLIBCXX__ ${includes}
-		LIBS="-lsupc++ ${LIBS}"
-		local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
-		for i in ${libsupcxx_includes} ; do
-			local found=""
-			[ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
-			for j in ${libcxx_gcc_dirs} ; do
-				if [ -f "${j}/${i}" ] ; then
-					cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
-					found=yes
-				fi
-			done
-			[ -n "${found}" ] || die "Header not found: ${i}"
-		done
-	fi
-
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
-	cd "${BUILD_DIR}/lib" || die
-	if [[ ${CHOST} == *darwin* ]] ; then
-		TRIPLE=-apple- ./buildit || die
-		return
-	fi
-
-	emake shared
-	use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
-		CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
-		HEADER_INCLUDE="-I${BUILD_DIR}/include" \
-		SOURCE_LIB="-L${BUILD_DIR}/lib" \
-		LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
-		./testit || die
-	# TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	if use libcxxrt ; then
-		# Move it first.
-		mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
-		# Generate libc++.a ldscript for inclusion of its dependencies so that
-		# clang++ -stdlib=libc++ -static works out of the box.
-		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
-		# On Linux/glibc it does not link without libpthread or libdl. It is
-		# fine on FreeBSD.
-		use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
-		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
-	fi
-	# TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
-	if use libcxxrt ; then
-		mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
-		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
-		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
-	fi
-	# TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
-	cd "${BUILD_DIR}/lib"
-	if [[ ${CHOST} == *darwin* ]] ; then
-		dolib.so libc++*dylib
-		return
-	fi
-
-	if use static-libs ; then
-		dolib.a libc++.a
-		gen_static_ldscript
-	fi
-	dolib.so libc++.so*
-	gen_shared_ldscript
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	# libc++abi needs the libc++ headers and we need libc++abi so the headers
-	# are already installed
-	[[ ${CHOST} == *darwin* ]] && return
-	insinto /usr/include/c++/v1
-	doins -r include/*
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}

diff --git a/sys-libs/libcxx/libcxx-3.7.1.ebuild b/sys-libs/libcxx/libcxx-3.7.1.ebuild
deleted file mode 100644
index a12d949398..0000000000
--- a/sys-libs/libcxx/libcxx-3.7.1.ebuild
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal epatch
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-	S="${WORKDIR}/${P}.src"
-else
-	SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~x64-macos ~x86-macos"
-else
-	KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt static-libs test"
-
-REQUIRED_USE="kernel_Darwin? ( libcxxrt !static-libs )"
-RDEPEND="
-	!kernel_Darwin? (
-		libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
-		!libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )
-	)
-	kernel_Darwin? (
-		=sys-libs/libcxx-headers-${PV}
-		=sys-libs/libcxxabi-${PV}
-		sys-devel/clang
-	)"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/clang )
-	app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		MY_CC=$(tc-getCC)
-		MY_CXX=$(tc-getCXX)
-		if [[ ${MY_CC} != *clang* || ${MY_CXX} != *clang++* ]] ; then
-			eerror "${PN} needs to be built with clang++. Please do not override"
-			eerror "CC ($MY_CC) and CXX ($MY_CXX)"
-			eerror "or point them at clang and clang++ respectively."
-			die
-		fi
-		return
-	fi
-	if ! use libcxxrt ; then
-		ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
-		ewarn "libsupc++. Please note that this is not well supported."
-		ewarn "In particular, static linking will not work."
-	fi
-	if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
-		eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-}
-
-src_prepare() {
-	cp -f "${FILESDIR}/Makefile" lib/ || die
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		epatch "${FILESDIR}"/${PN}-3.5.1-olddarwin.patch
-
-		[[ "${CHOST##*-darwin}" -le 10 ]] && \
-			epatch "${FILESDIR}"/${PN}-3.5.1-cmath-conv.patch
-
-		# libc++abi needs stack unwinding functions provided by libSystem on
-		# Mac OS X >= 10.6. On < 10.6 they're in libgcc_s. So force link
-		# against that. Additionally, the crt1.o provided by our gcc-apple
-		# toolchain isn't universal. Since that's needed for linking any
-		# program on OS X < 10.7, universal support is effectively broken on
-		# those older OS Xes even if clang and libc++{,abi} were to support it.
-		# So we can just disable universal compilation.
-		gcc_s=gcc_s.1
-		[[ "${CHOST##*-darwin}" -eq 9 ]] && gcc_s=gcc_s.10.5
-		[[ "${CHOST##*-darwin}" -eq 8 ]] && gcc_s=gcc_s.10.4
-		[[ "${CHOST##*-darwin}" -le 9 ]]  && \
-			sed -i -e "s,/usr/lib/libSystem.B.dylib,-lSystem -l${gcc_s},g" \
-				-e "s,-arch i386 -arch x86_64,,g" \
-				lib/buildit
-
-		if [[ "${CHOST##*-darwin}" -le 8 ]] ; then
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-			epatch "${FILESDIR}"/${PN}-3.5.1-eprintf.patch
-		fi
-
-		# fix library install names
-		sed -i \
-			-e "s,/usr/lib/libc++abi\.dylib,${EPREFIX}/usr/lib/libc++abi.dylib,g" \
-			-e "s,/usr/lib/libc++\.1\.dylib,${EPREFIX}/usr/lib/libc++.1.dylib,g" \
-			lib/buildit
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CC CXX
-
-	# on Darwin we're all set
-	[[ ${CHOST} == *darwin* ]] && return
-
-	export LIBS="-lpthread -lrt -lc -lgcc_s"
-	if use libcxxrt ; then
-		append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
-		LIBS="-lcxxrt ${LIBS}"
-		cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
-	else
-		# Very hackish, see $HOMEPAGE
-		# If someone has a clever idea, please share it!
-		local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
-		local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
-		append-cppflags -D__GLIBCXX__ ${includes}
-		LIBS="-lsupc++ ${LIBS}"
-		local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
-		for i in ${libsupcxx_includes} ; do
-			local found=""
-			[ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
-			for j in ${libcxx_gcc_dirs} ; do
-				if [ -f "${j}/${i}" ] ; then
-					cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
-					found=yes
-				fi
-			done
-			[ -n "${found}" ] || die "Header not found: ${i}"
-		done
-	fi
-
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
-	cd "${BUILD_DIR}/lib" || die
-	if [[ ${CHOST} == *darwin* ]] ; then
-		TRIPLE=-apple- ./buildit || die
-		return
-	fi
-
-	emake shared
-	use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
-		CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
-		HEADER_INCLUDE="-I${BUILD_DIR}/include" \
-		SOURCE_LIB="-L${BUILD_DIR}/lib" \
-		LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
-		./testit || die
-	# TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	if use libcxxrt ; then
-		# Move it first.
-		mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
-		# Generate libc++.a ldscript for inclusion of its dependencies so that
-		# clang++ -stdlib=libc++ -static works out of the box.
-		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
-		# On Linux/glibc it does not link without libpthread or libdl. It is
-		# fine on FreeBSD.
-		use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
-		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
-	fi
-	# TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
-	if use libcxxrt ; then
-		mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
-		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
-		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
-	fi
-	# TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
-	cd "${BUILD_DIR}/lib"
-	if [[ ${CHOST} == *darwin* ]] ; then
-		dolib.so libc++*dylib
-		return
-	fi
-
-	if use static-libs ; then
-		dolib.a libc++.a
-		gen_static_ldscript
-	fi
-	dolib.so libc++.so*
-	gen_shared_ldscript
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	# libc++abi needs the libc++ headers and we need libc++abi so the headers
-	# are already installed
-	[[ ${CHOST} == *darwin* ]] && return
-	insinto /usr/include/c++/v1
-	doins -r include/*
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}

diff --git a/sys-libs/libcxx/libcxx-3.8.1.ebuild b/sys-libs/libcxx/libcxx-3.8.1.ebuild
deleted file mode 100644
index f8f1518a6f..0000000000
--- a/sys-libs/libcxx/libcxx-3.8.1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ESVN_REPO_URI="http://llvm.org/svn/llvm-project/libcxx/trunk"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="subversion" || SCM=""
-
-inherit ${SCM} flag-o-matic toolchain-funcs multilib multilib-minimal epatch
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-	S="${WORKDIR}/${P}.src"
-else
-	SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~x64-macos ~x86-macos"
-else
-	KEYWORDS=""
-fi
-IUSE="elibc_glibc +libcxxrt static-libs test"
-
-REQUIRED_USE="kernel_Darwin? ( libcxxrt !static-libs )"
-RDEPEND="
-	!kernel_Darwin? (
-		libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[static-libs?,${MULTILIB_USEDEP}] )
-		!libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )
-	)
-	kernel_Darwin? (
-		=sys-libs/libcxx-headers-${PV}
-		=sys-libs/libcxxabi-${PV}
-		sys-devel/clang
-	)"
-DEPEND="${RDEPEND}
-	test? ( sys-devel/clang )
-	app-arch/xz-utils"
-
-DOCS=( CREDITS.TXT )
-
-pkg_setup() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		MY_CC=$(tc-getCC)
-		MY_CXX=$(tc-getCXX)
-		if [[ ${MY_CC} != *clang* || ${MY_CXX} != *clang++* ]] ; then
-			eerror "${PN} needs to be built with clang++. Please do not override"
-			eerror "CC ($MY_CC) and CXX ($MY_CXX)"
-			eerror "or point them at clang and clang++ respectively."
-			die
-		fi
-		return
-	fi
-	if ! use libcxxrt ; then
-		ewarn "You have disabled USE=libcxxrt. This will build ${PN} against"
-		ewarn "libsupc++. Please note that this is not well supported."
-		ewarn "In particular, static linking will not work."
-	fi
-	if [[ $(gcc-version) < 4.7 ]] && [[ $(tc-getCXX) != *clang++* ]] ; then
-		eerror "${PN} needs to be built with clang++ or gcc-4.7 or later."
-		eerror "Please use gcc-config to switch to gcc-4.7 or later version."
-		die
-	fi
-}
-
-src_prepare() {
-	cp -f "${FILESDIR}/Makefile" lib/ || die
-
-	if [[ ${CHOST} == *darwin* ]] ; then
-		epatch "${FILESDIR}"/${PN}-3.5.1-olddarwin.patch
-
-		# libc++abi needs stack unwinding functions provided by libSystem on
-		# Mac OS X >= 10.6. On < 10.6 they're in libgcc_s. So force link
-		# against that. Additionally, the crt1.o provided by our gcc-apple
-		# toolchain isn't universal. Since that's needed for linking any
-		# program on OS X < 10.7, universal support is effectively broken on
-		# those older OS Xes even if clang and libc++{,abi} were to support it.
-		# So we can just disable universal compilation.
-		gcc_s=gcc_s.1
-		[[ "${CHOST##*-darwin}" -eq 9 ]] && gcc_s=gcc_s.10.5
-		[[ "${CHOST##*-darwin}" -eq 8 ]] && gcc_s=gcc_s.10.4
-		[[ "${CHOST##*-darwin}" -le 9 ]]  && \
-			sed -i -e "s,/usr/lib/libSystem.B.dylib,-lSystem -l${gcc_s},g" \
-				-e "s,-arch i386 -arch x86_64,,g" \
-				lib/buildit
-
-		if [[ "${CHOST##*-darwin}" -le 8 ]] ; then
-			epatch "${FILESDIR}"/${PN}-3.5.1-availability.patch
-			epatch "${FILESDIR}"/${PN}-3.5.1-eprintf.patch
-		fi
-
-		if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-			sed -i -e '/RC_CFLAGS=""/s/""/"-fPIC"/' lib/buildit || die
-		fi
-
-		# fix library install names
-		sed -i \
-			-e "s,/usr/lib/libc++abi\.dylib,${EPREFIX}/usr/lib/libc++abi.dylib,g" \
-			-e "s,/usr/lib/libc++\.1\.dylib,${EPREFIX}/usr/lib/libc++.1.dylib,g" \
-			lib/buildit
-	fi
-
-	eapply_user
-
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CC CXX
-
-	# on Darwin we're all set
-	[[ ${CHOST} == *darwin* ]] && return
-
-	export LIBS="-lpthread -lrt -lc -lgcc_s"
-	if use libcxxrt ; then
-		append-cppflags -DLIBCXXRT "-I${EPREFIX}/usr/include/libcxxrt/"
-		LIBS="-lcxxrt ${LIBS}"
-		cp "${EPREFIX}/usr/include/libcxxrt/"*.h "${S}/include"
-	else
-		# Very hackish, see $HOMEPAGE
-		# If someone has a clever idea, please share it!
-		local includes="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | sed -e 's/^ /-I/' | tr '\n' ' ')"
-		local libcxx_gcc_dirs="$(echo | ${CHOST}-g++ -Wp,-v -x c++ - -fsyntax-only 2>&1 | grep -C 2 '#include.*<...>' | tail -n 2 | tr '\n' ' ')"
-		append-cppflags -D__GLIBCXX__ ${includes}
-		LIBS="-lsupc++ ${LIBS}"
-		local libsupcxx_includes="cxxabi.h bits/c++config.h bits/os_defines.h bits/cpu_defines.h bits/cxxabi_tweaks.h bits/cxxabi_forced.h"
-		for i in ${libsupcxx_includes} ; do
-			local found=""
-			[ -d "${S}/include/$(dirname ${i})/" ] || mkdir -p "${S}/include/$(dirname ${i})"
-			for j in ${libcxx_gcc_dirs} ; do
-				if [ -f "${j}/${i}" ] ; then
-					cp "${j}/${i}" "${S}/include/$(dirname ${i})/" || die
-					found=yes
-				fi
-			done
-			[ -n "${found}" ] || die "Header not found: ${i}"
-		done
-	fi
-
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-}
-
-multilib_src_compile() {
-	cd "${BUILD_DIR}/lib" || die
-	if [[ ${CHOST} == *darwin* ]] ; then
-		TRIPLE=-apple- ./buildit || die
-		return
-	fi
-
-	emake shared
-	use static-libs && emake static
-}
-
-# Tests fail for now, if anybody is able to fix them, help is very welcome.
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/lib:${LD_LIBRARY_PATH}" \
-		CC="clang++ $(get_abi_CFLAGS) ${CXXFLAGS}" \
-		HEADER_INCLUDE="-I${BUILD_DIR}/include" \
-		SOURCE_LIB="-L${BUILD_DIR}/lib" \
-		LIBS="-lm $(usex libcxxrt -lcxxrt "")" \
-		./testit || die
-	# TODO: fix link against libsupc++
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	if use libcxxrt ; then
-		# Move it first.
-		mv "${ED}/usr/$(get_libdir)/libc++.a" "${ED}/usr/$(get_libdir)/libc++_static.a" || die
-
-		# Generate libc++.a ldscript for inclusion of its dependencies so that
-		# clang++ -stdlib=libc++ -static works out of the box.
-		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_static.a ${EPREFIX}/usr/$(get_libdir)/libcxxrt.a"
-		# On Linux/glibc it does not link without libpthread or libdl. It is
-		# fine on FreeBSD.
-		use elibc_glibc && deps="${deps} ${EPREFIX}/usr/$(get_libdir)/libpthread.a ${EPREFIX}/usr/$(get_libdir)/libdl.a"
-
-		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.a"
-	fi
-	# TODO: Generate a libc++.a ldscript when building against libsupc++
-}
-
-gen_shared_ldscript() {
-	if use libcxxrt ; then
-		mv "${ED}/usr/$(get_libdir)/libc++.so" "${ED}/usr/$(get_libdir)/libc++_shared.so" || die
-		local deps="${EPREFIX}/usr/$(get_libdir)/libc++_shared.so ${EPREFIX}/usr/$(get_libdir)/libcxxrt.so"
-		gen_ldscript "${deps}" > "${ED}/usr/$(get_libdir)/libc++.so"
-	fi
-	# TODO: Generate the linker script for other confiurations too.
-}
-
-multilib_src_install() {
-	cd "${BUILD_DIR}/lib"
-	if [[ ${CHOST} == *darwin* ]] ; then
-		dolib.so libc++*dylib
-		return
-	fi
-
-	if use static-libs ; then
-		dolib.a libc++.a
-		gen_static_ldscript
-	fi
-	dolib.so libc++.so*
-	gen_shared_ldscript
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	# libc++abi needs the libc++ headers and we need libc++abi so the headers
-	# are already installed
-	[[ ${CHOST} == *darwin* ]] && return
-	insinto /usr/include/c++/v1
-	doins -r include/*
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}

diff --git a/sys-libs/libcxx/libcxx-3.9.1.ebuild b/sys-libs/libcxx/libcxx-3.9.1.ebuild
deleted file mode 100644
index 9bc41644b0..0000000000
--- a/sys-libs/libcxx/libcxx-3.9.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Ninja provides better scalability and cleaner verbose output, and is used
-# throughout all LLVM projects.
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-EGIT_REPO_URI="http://llvm.org/git/libcxx.git
-	https://github.com/llvm-mirror/libcxx.git"
-PYTHON_COMPAT=( python2_7 )
-
-[[ ${PV} == 9999 ]] && SCM="git-r3" || SCM=""
-
-inherit ${SCM} cmake-multilib python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [[ ${PV} != 9999 ]] ; then
-	SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-	S="${WORKDIR}/${P}.src"
-else
-	SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~x64-macos ~x86-macos"
-else
-	KEYWORDS=""
-fi
-IUSE="elibc_Darwin elibc_glibc elibc_musl +libcxxabi libcxxrt libunwind +static-libs test"
-REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
-	elibc_Darwin? ( libcxxabi )
-	?? ( libcxxabi libcxxrt )"
-
-RDEPEND="
-	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-	!elibc_Darwin? (
-		libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-		!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
-	)
-	elibc_Darwin? ( !sys-libs/libcxx-headers )"
-# llvm-3.9.0 needed because its cmake files installation path changed, which is
-# needed by libcxx
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
-	app-arch/xz-utils
-	>=sys-devel/llvm-3.9.0"
-
-DOCS=( CREDITS.TXT )
-
-PATCHES=(
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-
-	# Back-port of https://reviews.llvm.org/D23232, allowing building both
-	# shared and static libs in one run.
-	"${FILESDIR}/${PN}-3.9-cmake-static-lib.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
-		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
-		eerror "conformant compilers). Please use gcc-config to switch to"
-		eerror "gcc-4.7 or later version."
-		die
-	fi
-}
-
-src_configure() {
-	NATIVE_LIBDIR=$(get_libdir)
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
-	elif use libcxxrt; then
-		cxxabi=libcxxrt
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	# we want -lgcc_s for unwinder, and for compiler runtime when using
-	# gcc, clang with gcc runtime (or any unknown compiler)
-	local extra_libs=() want_gcc_s=ON
-	if use libunwind; then
-		# work-around missing -lunwind upstream
-		extra_libs+=( -lunwind )
-		# if we're using libunwind and clang with compiler-rt, we want
-		# to link to compiler-rt instead of -lgcc_s
-		if tc-is-clang; then
-			# get the full library list out of 'pretend mode'
-			# and grep it for libclang_rt references
-			local args=( $($(tc-getCC) -### -x c - 2>&1 | tail -n 1) )
-			local i
-			for i in "${args[@]}"; do
-				if [[ ${i} == *libclang_rt* ]]; then
-					want_gcc_s=OFF
-					extra_libs+=( "${i}" )
-				fi
-			done
-		fi
-	fi
-	# Darwin has libunwind in its system
-	[[ ${CHOST} == *-darwin* ]] && want_gcc_s=OFF
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# LLVM_LIBDIR_SUFFIX is used to find CMake files
-		# and we are happy to use the native set
-		-DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
-		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
-		# avoid guessing of libcxxabi version by installed SDK discovered
-		# via xc-run - we know better because we require a libcxxabi version
-		# matching our own
-		-DLIBCXX_LIBCPPABI_VERSION=2
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			# this can be any directory, it just needs to exist...
-			-DLLVM_MAIN_SRC_DIR="${T}"
-			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-		)
-	fi
-
-	# make sure we build multilib on OSX, because llvm insists on
-	# building multilib too
-	[[ ${CHOST} == *86*-darwin* ]] && append-flags -arch i386 -arch x86_64
-
-	cmake-utils_src_configure
-}
-
-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
-
-	cmake-utils_src_make check-libcxx
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
-
-	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}

diff --git a/sys-libs/libcxx/libcxx-5.0.1.ebuild b/sys-libs/libcxx/libcxx-5.0.1.ebuild
deleted file mode 100644
index b498d154ad..0000000000
--- a/sys-libs/libcxx/libcxx-5.0.1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Ninja provides better scalability and cleaner verbose output, and is used
-# throughout all LLVM projects.
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-EGIT_REPO_URI="http://llvm.org/git/libcxx.git
-	https://github.com/llvm-mirror/libcxx.git"
-PYTHON_COMPAT=( python2_7 )
-
-[[ ${PV} == 9999 ]] && SCM="git-r3" || SCM=""
-
-inherit ${SCM} cmake-multilib python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="http://libcxx.llvm.org/"
-if [[ ${PV} != 9999 ]] ; then
-	SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-	S="${WORKDIR}/${P}.src"
-else
-	SRC_URI=""
-fi
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-if [[ ${PV} != 9999 ]] ; then
-	KEYWORDS="~x64-macos ~x86-macos"
-else
-	KEYWORDS=""
-fi
-IUSE="elibc_Darwin elibc_glibc elibc_musl +libcxxabi libcxxrt libunwind +static-libs test"
-REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
-	elibc_Darwin? ( libcxxabi )
-	?? ( libcxxabi libcxxrt )"
-
-RDEPEND="
-	libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-	!elibc_Darwin? (
-		libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
-		!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )
-	)
-	elibc_Darwin? ( !sys-libs/libcxx-headers )"
-# llvm-3.9.0 needed because its cmake files installation path changed, which is
-# needed by libcxx
-# clang-3.9.0 installs necessary target symlinks unconditionally
-# which removes the need for MULTILIB_USEDEP
-DEPEND="${RDEPEND}
-	test? ( >=sys-devel/clang-3.9.0
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )
-	app-arch/xz-utils
-	>=sys-devel/llvm-3.9.0"
-
-DOCS=( CREDITS.TXT )
-
-PATCHES=(
-	# Add link flag "-Wl,-z,defs" to avoid underlinking; this is needed in a
-	# out-of-tree build.
-	"${FILESDIR}/${PN}-3.9-cmake-link-flags.patch"
-)
-
-src_prepare() {
-	default
-
-	# eprefixify static path references to libc++abi for symbol re-export to
-	# avoid linking against it twice in both /usr/lib and ${EPREFIX}/usr/lib
-	local lcpa=/usr/lib/libc++abi.dylib
-	sed -i -e "s,${lcpa},${EPREFIX}${lcpa},g" lib/CMakeLists.txt
-}
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-	if tc-is-gcc && [[ $(gcc-version) < 4.7 ]] ; then
-		eerror "${PN} needs to be built with gcc-4.7 or later (or other"
-		eerror "conformant compilers). Please use gcc-config to switch to"
-		eerror "gcc-4.7 or later version."
-		die
-	fi
-}
-
-src_configure() {
-	NATIVE_LIBDIR=$(get_libdir)
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
-	elif use libcxxrt; then
-		cxxabi=libcxxrt
-		cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	# we want -lgcc_s for unwinder, and for compiler runtime when using
-	# gcc, clang with gcc runtime (or any unknown compiler)
-	local extra_libs=() want_gcc_s=ON
-	if use libunwind; then
-		# work-around missing -lunwind upstream
-		extra_libs+=( -lunwind )
-		# if we're using libunwind and clang with compiler-rt, we want
-		# to link to compiler-rt instead of -lgcc_s
-		if tc-is-clang; then
-			# get the full library list out of 'pretend mode'
-			# and grep it for libclang_rt references
-			local args=( $($(tc-getCC) -### -x c - 2>&1 | tail -n 1) )
-			local i
-			for i in "${args[@]}"; do
-				if [[ ${i} == *libclang_rt* ]]; then
-					want_gcc_s=OFF
-					extra_libs+=( "${i}" )
-				fi
-			done
-		fi
-	fi
-	# Darwin has libunwind in its system
-	[[ ${CHOST} == *-darwin* ]] && want_gcc_s=OFF
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# LLVM_LIBDIR_SUFFIX is used to find CMake files
-		# and we are happy to use the native set
-		-DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
-		-DLIBCXX_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
-		# avoid guessing of libcxxabi version by installed SDK discovered
-		# via xc-run - we know better because we require a libcxxabi version
-		# matching our own
-		-DLIBCXX_LIBCPPABI_VERSION=2
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			# this can be any directory, it just needs to exist...
-			-DLLVM_MAIN_SRC_DIR="${T}"
-			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-		)
-	fi
-
-	# make sure we build multilib on OSX, because llvm insists on
-	# building multilib too
-	[[ ${CHOST} == *86*-darwin* ]] && append-flags -arch i386 -arch x86_64
-
-	cmake-utils_src_configure
-}
-
-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
-
-	cmake-utils_src_make check-libcxx
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	local libdir=$(get_libdir)
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
-
-	# Move it first.
-	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=" libpthread.a libdl.a"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
-}
-
-gen_shared_ldscript() {
-	local libdir=$(get_libdir)
-	# libsupc++ doesn't have a shared version
-	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
-
-	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
-	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
-
-	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-pkg_postinst() {
-	elog "This package (${PN}) is mainly intended as a replacement for the C++"
-	elog "standard library when using clang."
-	elog "To use it, instead of libstdc++, use:"
-	elog "    clang++ -stdlib=libc++"
-	elog "to compile your C++ programs."
-}

diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
deleted file mode 100644
index df0c52dcfc..0000000000
--- a/sys-libs/libcxx/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aballier@g.o</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>bsd@g.o</email>
-		<name>BSD Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>llvm@g.o</email>
-		<name>LLVM Project</name>
-	</maintainer>
-	<use>
-		<flag name="libcxxabi">Build on top of <pkg>sys-libs/libcxxabi</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
-		<flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
-		<flag name="libunwind">Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.</flag>
-	</use>
-</pkgmetadata>

diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
deleted file mode 100644
index af6d59af57..0000000000
--- a/sys-libs/libcxxabi/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070
-DIST libcxx-5.0.1.src.tar.xz 1527852 BLAKE2B 9454fbca8228ee456feb79b65a63ce5daa27bf2e47e457d79592f4974dceeace19fe6cdeee51cc51f94e9072d7ce3c03e5acb617507670153647b9c435feadbd SHA512 994681d3c79047fc2d618c5584b08e9b5c925dab48f8812fc0adc81a575b49a637e9481bb9a0f7ae6f7f352b2b33f40056c347c27123cd6c96c6c226febd002c
-DIST libcxxabi-3.5.1.src.tar.xz 551148 BLAKE2B 58a4d487dceff8772ce921addcbf836c5b80cf6eb29600b4789140164fb768e8d9bbde127ebceb757d47ef6dd458c6294af37001078430e2e4eddaa3b32e15da SHA512 1fa9215aba2228d0bc5547febea69d0497785289d1972103ffb24b202a0a4df06ea1f7d6311ec85fc344414b69e590640b547c66ef1f9b9ea73762cc4f4a83fa
-DIST libcxxabi-3.7.1.src.tar.xz 507428 BLAKE2B 7c458a7ac2720f30f80a3644047f19bd39c46141cf4997912ea42d97bad7d365e90e385fb0996f16048ba199f42fb6e3f95f608a44976ddd336e0f3bf3cc7df1 SHA512 d697d1b35a8cc1f27dd0f7d06d3f6e067e4c7ae613af982a8c91d4702a03aedfbdad1d4bd3c213f38db3d58473ad7fc6b4b8d1ffcfc6de04d1eb4e17e151c73a
-DIST libcxxabi-3.8.1.src.tar.xz 508392 BLAKE2B 38de3ea6f3b38a112ffd134572e2ebfa9e5f558d3ac7fabceaaf86ed826123515e283f64a1767689bb7b0f72ad31e523c1d947c049225888d7f7dd54ff1b4e65 SHA512 c401fe984f44c4f7a0b0fa10099d7a203c1552b89881b8b248645ac4fb3cd7e399c3d07841432cca069e816042ad6629f9cc068b278196fa6bd4c129d95d35be
-DIST libcxxabi-3.9.0.src.tar.xz 511324 BLAKE2B 75c35b2b30cb04db35db93378d1cc541f194071564c5c8d4c577f076153fc34c7aae793527566cc912437e0f255fbc0520533037b5376105e8e9e4f80a71ba6b SHA512 500207bfd59664bd42d920741d6b467c4b88569453742db6470af081c77be04894e097a14b8419e333b51abce484566366e35cbc3ed2607cd86dfc0ec0ddd0c5
-DIST libcxxabi-3.9.1.src.tar.xz 510964 BLAKE2B a6abda1b92473781ea3029169c43547f15c1aa6e0ec6f9692ae633d109e050a6ff82ce8bceb0455375991b85c99784a4f06a568b8c77a4cf2865b9b2861e9595 SHA512 4f5603f1476b759c86d4784728fbdd212c59b30dc56d787c1834bf68a9cd83071fa22658d24e5a58beb94c0c656b0e4457d7da6e3048715dd36bd68380fc336e
-DIST libcxxabi-5.0.1.src.tar.xz 521504 BLAKE2B e8263f458545ffb8ec27234e554427696644dcde3b46bea4fa0ee14b2b174d0c6c8dcc7905477140afaf567347e91815827aa6700c92ccfbfbea5364f591fc2a SHA512 a8d448653772690a19f68c1270f9cf18f27d7225847825f29c6ea21846c1074aa61c31b81bc2ae4007067985d389071c32e69b2560282ddb85864a99e9bdd884

diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.5.1-eprintf.patch b/sys-libs/libcxxabi/files/libcxxabi-3.5.1-eprintf.patch
deleted file mode 100644
index b5e32cd8dd..0000000000
--- a/sys-libs/libcxxabi/files/libcxxabi-3.5.1-eprintf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- libcxxabi-3.5.1.src/src/cxa_personality.cpp.orig	2015-01-26 23:20:13.000000000 +0100
-+++ libcxxabi-3.5.1.src/src/cxa_personality.cpp	2015-01-26 23:25:45.000000000 +0100
-@@ -21,6 +21,25 @@
- #include <stdlib.h>
- #include <assert.h>
- 
-+#ifdef __APPLE__
-+#include <AvailabilityMacros.h>
-+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1050)
-+#include <cstdio>
-+#include <cstdlib>
-+
-+using namespace std;
-+extern "C"
-+__attribute__((visibility("hidden")))
-+void __eprintf (const char *string, const char *expression,
-+	unsigned int line, const char *filename)
-+{
-+	fprintf (stderr, string, expression, line, filename);
-+	fflush (stderr);
-+	abort ();
-+}
-+#endif
-+#endif /* __APPLE__ */
-+
- /*
-     Exception Header Layout:
- 

diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-cmake-path.patch b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-cmake-path.patch
deleted file mode 100644
index b80c0f5722..0000000000
--- a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-cmake-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8d4d9af454a985d8c10ffdb0c56e87efec25ddff Mon Sep 17 00:00:00 2001
-From: Logan Chien <tzuhsiang.chien@×××××.com>
-Date: Mon, 3 Oct 2016 11:08:17 +0000
-Subject: [PATCH] [CMake] Fix libc++abi standalone cmake build.
-
-The cmake files install directory has been changed to
-${prefix}/lib/cmake/llvm since r259821.  Searching cmake modules in
-${prefix}/share/llvm/cmake will result in fatal errors.
-
-This commit fixes the out-of-tree build by changing the CMake module
-search path to: "$(llvm-config --obj-root)/lib/cmake/llvm"
-
-
-git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@283100 91177308-0d34-0410-b5e6-96231b3b80d8
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a33cf48..e75c0b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-     set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
-     set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
-     set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
--    set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
-+    set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
-     set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py")
-   else()
-     message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. "
--- 
-2.10.1
-

diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch
deleted file mode 100644
index 1005cb7d13..0000000000
--- a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From fff85c801ae564a09479e1e8e4cf81977536c550 Mon Sep 17 00:00:00 2001
-From: Petr Hosek <phosek@××××××××.org>
-Date: Mon, 8 Aug 2016 22:09:54 +0000
-Subject: [PATCH] Do not depend on unwind when building standalone
-
-When libcxxabi is being built standalone, unwind dependency is not
-available, so do not use it even when LLVM unwinder is being
-requested.
-
-Differential Revision: https://reviews.llvm.org/D23228
-
-git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@278058 91177308-0d34-0410-b5e6-96231b3b80d8
----
- test/CMakeLists.txt | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 31b5d1d..3a489bf 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -36,10 +36,9 @@ endif()
- 
- if (NOT LIBCXXABI_BUILT_STANDALONE)
-   list(APPEND LIBCXXABI_TEST_DEPS cxx)
--endif()
--
--if (LIBCXXABI_USE_LLVM_UNWINDER)
--  list(APPEND LIBCXXABI_TEST_DEPS unwind)
-+  if (LIBCXXABI_USE_LLVM_UNWINDER)
-+    list(APPEND LIBCXXABI_TEST_DEPS unwind)
-+  endif()
- endif()
- 
- add_lit_testsuite(check-libcxxabi "Running libcxxabi tests"
--- 
-2.10.1
-

diff --git a/sys-libs/libcxxabi/libcxxabi-3.5.1.ebuild b/sys-libs/libcxxabi/libcxxabi-3.5.1.ebuild
deleted file mode 100644
index b68811f725..0000000000
--- a/sys-libs/libcxxabi/libcxxabi-3.5.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-S="${WORKDIR}/${P}.src"
-
-inherit eutils epatch
-
-DESCRIPTION="New implementation of low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	=sys-libs/libcxx-headers-${PV}
-	sys-devel/clang"
-
-pkg_setup() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		MY_CC=$(tc-getCC)
-		MY_CXX=$(tc-getCXX)
-		if [[ ${MY_CC} != *clang* || ${MY_CXX} != *clang++* ]] ; then
-			eerror "${PN} needs to be built with clang++. Please do not override"
-			eerror "CC ($MY_CC) and CXX ($MY_CXX)"
-			eerror "or point them at clang and eerror clang++ respectively."
-			die
-		fi
-		return
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-}
-
-src_prepare() {
-	# libc++abi needs stack unwinding functions provided by libSystem on Mac OS X
-	# >= 10.6. On < 10.6 they're in libgcc_s. So force link against that.
-	# Additionally, the crt1.o provided by our gcc-apple toolchain isn't
-	# universal. Since that's needed for linking any program on OSX <
-	# 10.7, universal support is effectively broken on those older OSXes
-	# even if clang and libc++{,abi} were to support it. So we can just
-	# disable universal compilation.
-	gcc_s=gcc_s.1
-	[[ "${CHOST##*-darwin}" -eq 9 ]] && gcc_s=gcc_s.10.5
-	[[ "${CHOST##*-darwin}" -eq 8 ]] && gcc_s=gcc_s.10.4
-	[[ "${CHOST##*-darwin}" -le 9 ]] && \
-		sed -i -e "s,-lSystem,-lSystem -l${gcc_s},g" \
-			-e "s,-arch i386 -arch x86_64,,g" \
-			lib/buildit
-
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		sed -i -e '/RC_CFLAGS=""/s/""/"-fPIC"/' lib/buildit || die
-	fi
-
-	# assert.h refers to eprintf which is nowhere to be found. That's why
-	# everyone (libstdc++, clang compiler-rt) bring their own
-	# implementation. Ours is nicked from Apple's patch to libstdc++-39.
-	[[ "${CHOST##*-darwin}" -le 8 ]] && \
-		epatch "${FILESDIR}"/${PN}-3.5.1-eprintf.patch
-
-	sed -i -e "s,/usr/lib/libc++abi\.dylib,${EPREFIX}/usr/lib/libc++abi.dylib,g" \
-		lib/buildit || die
-
-	eapply_user
-}
-
-src_compile() {
-	cd "${S}/lib" || die
-	export TRIPLE=-apple-
-	./buildit || die
-}
-
-src_install() {
-	dolib.so lib/libc++*dylib
-
-	# do not install unwind.h and others since they're only in-source
-	# build-time dependencies
-	insinto /usr/include
-	doins -r include/cxxabi.h
-}

diff --git a/sys-libs/libcxxabi/libcxxabi-3.7.1.ebuild b/sys-libs/libcxxabi/libcxxabi-3.7.1.ebuild
deleted file mode 100644
index 2830150cba..0000000000
--- a/sys-libs/libcxxabi/libcxxabi-3.7.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-S="${WORKDIR}/${P}.src"
-
-inherit eutils epatch
-
-DESCRIPTION="New implementation of low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	=sys-libs/libcxx-headers-${PV}
-	sys-devel/clang"
-
-pkg_setup() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		MY_CC=$(tc-getCC)
-		MY_CXX=$(tc-getCXX)
-		if [[ ${MY_CC} != *clang* || ${MY_CXX} != *clang++* ]] ; then
-			eerror "${PN} needs to be built with clang++. Please do not override"
-			eerror "CC ($MY_CC) and CXX ($MY_CXX)"
-			eerror "or point them at clang and eerror clang++ respectively."
-			die
-		fi
-		return
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-}
-
-src_prepare() {
-	# libc++abi needs stack unwinding functions provided by libSystem on Mac OS X
-	# >= 10.6. On < 10.6 they're in libgcc_s. So force link against that.
-	# Additionally, the crt1.o provided by our gcc-apple toolchain isn't
-	# universal. Since that's needed for linking any program on OSX <
-	# 10.7, universal support is effectively broken on those older OSXes
-	# even if clang and libc++{,abi} were to support it. So we can just
-	# disable universal compilation.
-	gcc_s=gcc_s.1
-	[[ "${CHOST##*-darwin}" -eq 9 ]] && gcc_s=gcc_s.10.5
-	[[ "${CHOST##*-darwin}" -eq 8 ]] && gcc_s=gcc_s.10.4
-	[[ "${CHOST##*-darwin}" -le 9 ]] && \
-		sed -i -e "s,-lSystem,-lSystem -l${gcc_s},g" \
-			-e "s,-arch i386 -arch x86_64,,g" \
-			lib/buildit
-
-	# assert.h refers to eprintf which is nowhere to be found. That's why
-	# everyone (libstdc++, clang compiler-rt) bring their own
-	# implementation. Ours is nicked from Apple's patch to libstdc++-39.
-	[[ "${CHOST##*-darwin}" -le 8 ]] && \
-		epatch "${FILESDIR}"/${PN}-3.5.1-eprintf.patch
-
-	sed -i -e "s,/usr/lib/libc++abi\.dylib,${EPREFIX}/usr/lib/libc++abi.dylib,g" \
-		lib/buildit
-
-	eapply_user
-}
-
-src_compile() {
-	cd "${S}/lib" || die
-	export TRIPLE=-apple-
-	./buildit || die
-}
-
-src_install() {
-	dolib.so lib/libc++*dylib
-
-	# do not install unwind.h and others since they're only in-source
-	# build-time dependencies
-	insinto /usr/include
-	doins -r include/cxxabi.h
-	doins -r include/__cxxabi_config.h
-}

diff --git a/sys-libs/libcxxabi/libcxxabi-3.8.1.ebuild b/sys-libs/libcxxabi/libcxxabi-3.8.1.ebuild
deleted file mode 100644
index c431277456..0000000000
--- a/sys-libs/libcxxabi/libcxxabi-3.8.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-S="${WORKDIR}/${P}.src"
-
-inherit eutils epatch
-
-DESCRIPTION="New implementation of low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	=sys-libs/libcxx-headers-${PV}
-	sys-devel/clang"
-
-pkg_setup() {
-	if [[ ${CHOST} == *darwin* ]] ; then
-		MY_CC=$(tc-getCC)
-		MY_CXX=$(tc-getCXX)
-		if [[ ${MY_CC} != *clang* || ${MY_CXX} != *clang++* ]] ; then
-			eerror "${PN} needs to be built with clang++. Please do not override"
-			eerror "CC ($MY_CC) and CXX ($MY_CXX)"
-			eerror "or point them at clang and eerror clang++ respectively."
-			die
-		fi
-		return
-	fi
-}
-
-src_configure() {
-	tc-export CC CXX
-}
-
-src_prepare() {
-	# libc++abi needs stack unwinding functions provided by libSystem on Mac OS X
-	# >= 10.6. On < 10.6 they're in libgcc_s. So force link against that.
-	# Additionally, the crt1.o provided by our gcc-apple toolchain isn't
-	# universal. Since that's needed for linking any program on OSX <
-	# 10.7, universal support is effectively broken on those older OSXes
-	# even if clang and libc++{,abi} were to support it. So we can just
-	# disable universal compilation.
-	gcc_s=gcc_s.1
-	[[ "${CHOST##*-darwin}" -eq 9 ]] && gcc_s=gcc_s.10.5
-	[[ "${CHOST##*-darwin}" -eq 8 ]] && gcc_s=gcc_s.10.4
-	[[ "${CHOST##*-darwin}" -le 9 ]] && \
-		sed -i -e "s,-lSystem,-lSystem -l${gcc_s},g" \
-			-e "s,-arch i386 -arch x86_64,,g" \
-			lib/buildit
-
-	if [[ ${CHOST} == powerpc*-darwin* ]] ; then
-		sed -i -e '/RC_CFLAGS=""/s/""/"-fPIC"/' lib/buildit || die
-	fi
-
-	# assert.h refers to eprintf which is nowhere to be found. That's why
-	# everyone (libstdc++, clang compiler-rt) bring their own
-	# implementation. Ours is nicked from Apple's patch to libstdc++-39.
-	[[ "${CHOST##*-darwin}" -le 8 ]] && \
-		epatch "${FILESDIR}"/${PN}-3.5.1-eprintf.patch
-
-	sed -i -e "s,/usr/lib/libc++abi\.dylib,${EPREFIX}/usr/lib/libc++abi.dylib,g" \
-		lib/buildit
-
-	eapply_user
-}
-
-src_compile() {
-	cd "${S}/lib" || die
-	export TRIPLE=-apple-
-	./buildit || die
-}
-
-src_install() {
-	dolib.so lib/libc++*dylib
-
-	# do not install unwind.h and others since they're only in-source
-	# build-time dependencies
-	insinto /usr/include
-	doins -r include/cxxabi.h
-	doins -r include/__cxxabi_config.h
-}

diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
deleted file mode 100644
index 46d08a1474..0000000000
--- a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eutils cmake-multilib epatch
-
-S="${WORKDIR}/${P}.src"
-
-DESCRIPTION="New implementation of low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz"
-
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	=sys-libs/libcxx-headers-${PV}"
-
-# note the abscense of a requirement to compile with clang on OS X - it
-# actually compiles and works with recent gcc as well
-
-src_prepare() {
-	sed -i -e "/set.LLVM_CMAKE_PATH.*\\/cmake\\/modules/s@cmake/modules@cmake@" CMakeLists.txt
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLVM_PATH=${EPREFIX}/usr/share/llvm
-		-DLIBCXXABI_LIBCXX_INCLUDES=${EPREFIX}/usr/include/c++/v1
-		# silence warning "LIBCXXABI_LIBCXX_PATH was not specified and couldn't
-		# be infered" which is redundant because we have successfully provided
-		# the libc++ include path via LIBCXXABI_LIBCXX_INCLUDES already
-		-DLIBCXXABI_LIBCXX_PATH=shutup
-	)
-
-	# make sure we build multilib on OSX, because llvm insists on
-	# building multilib too
-	if [[ ${CHOST} == *86*-darwin* ]] ; then
-		append-flags -arch i386 -arch x86_64
-		append-cxxflags -std=c++11
-	fi
-
-	use static-libs && \
-		mycmakeargs+=( -DLIBCXXABI_ENABLE_STATIC=ON ) || \
-		mycmakeargs+=( -DLIBCXXABI_ENABLE_STATIC=OFF )
-
-	cmake-multilib_src_configure
-}
-
-multilib_src_install_all() {
-	# do not install unwind.h and others since they're only in-source
-	# build-time dependencies
-	insinto /usr/include
-	doins -r include/cxxabi.h
-	doins -r include/__cxxabi_config.h
-}

diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild
deleted file mode 100644
index 6bb135e3fb..0000000000
--- a/sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib python-any-r1 flag-o-matic
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-# also needs libcxx sources for headers
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	http://llvm.org/releases/${PV}/${P/abi/}.src.tar.xz"
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE="elibc_Darwin elibc_musl libunwind +static-libs 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}]
-		)
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-3.9.0
-	test? ( >=sys-devel/clang-3.9.0
-		~sys-libs/libcxx-${PV}[libcxxabi(-)]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${P}.src
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# backport cmake path fix for llvm-3.9+
-	eapply "${FILESDIR}/${PN}-3.9.0-cmake-path.patch"
-	# kill stray unwind test dep in stand-alone builds
-	eapply "${FILESDIR}/${PN}-3.9.0-test-unwind.patch"
-}
-
-src_configure() {
-	NATIVE_LIBDIR=$(get_libdir)
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
-		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/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
-		# this only needs to exist, it does not have to make sense
-		-DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-		)
-	fi
-	if use elibc_musl; then
-		local -x CPPFLAGS="${CPPFLAGS} -D_LIBCPP_HAS_MUSL_LIBC=1"
-	fi
-
-	# make sure we build multilib on OSX, because llvm insists on
-	# building multilib too
-	if [[ ${CHOST} == *86*-darwin* ]] ; then
-		append-flags -arch i386 -arch x86_64
-		append-cxxflags -std=c++11
-	fi
-
-	cmake-utils_src_configure
-}
-
-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
-
-	cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
-	insinto /usr/include/libcxxabi
-	doins -r include/.
-}

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 598ff99f97..0000000000
--- a/sys-libs/libcxxabi/libcxxabi-5.0.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib python-any-r1 flag-o-matic
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="http://libcxxabi.llvm.org/"
-# also needs libcxx sources for headers
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	http://llvm.org/releases/${PV}/${P/abi/}.src.tar.xz"
-LICENSE="|| ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~x64-macos ~x86-macos"
-IUSE="elibc_Darwin elibc_musl libunwind +static-libs 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}]
-		)
-	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/llvm-3.9.0
-	test? ( >=sys-devel/clang-3.9.0
-		~sys-libs/libcxx-${PV}[libcxxabi(-)]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )"
-
-S=${WORKDIR}/${P}.src
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	NATIVE_LIBDIR=$(get_libdir)
-	cmake-multilib_src_configure
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib}
-		-DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-
-		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/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
-		# this only needs to exist, it does not have to make sense
-		-DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
-		)
-	fi
-	if use elibc_musl; then
-		local -x CPPFLAGS="${CPPFLAGS} -D_LIBCPP_HAS_MUSL_LIBC=1"
-	fi
-
-	# make sure we build multilib on OSX, because llvm insists on
-	# building multilib too
-	if [[ ${CHOST} == *86*-darwin* ]] ; then
-		append-flags -arch i386 -arch x86_64
-		append-cxxflags -std=c++11
-		local mycmakeargs+=(
-			# disable test for libstdc++ leaking in from LLVM cmake module -
-			# apart from libcxx headers, libcxxabi is self-contained
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-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
-
-	cmake-utils_src_make check-libcxxabi
-}
-
-multilib_src_install_all() {
-	insinto /usr/include/libcxxabi
-	doins -r include/.
-}

diff --git a/sys-libs/libcxxabi/metadata.xml b/sys-libs/libcxxabi/metadata.xml
deleted file mode 100644
index 78c7d7d981..0000000000
--- a/sys-libs/libcxxabi/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>llvm@g.o</email>
-	</maintainer>
-	<use>
-		<flag name="libunwind">Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependency on gcc</flag>
-	</use>
-</pkgmetadata>