gentoo resync : 13.03.2018

4 files changed, 22 insertions, 151 deletions

diff --git a/sys-libs/libcxxrt/Manifest b/sys-libs/libcxxrt/Manifest
index b4d86f4d2db6..ca60d3a95647 100644
--- a/sys-libs/libcxxrt/Manifest
+++ b/sys-libs/libcxxrt/Manifest
@@ -1,13 +1,9 @@
 AUX Makefile 513 BLAKE2B 582a1ee9c7cf3f50a3508470e68c987f7566a6b85fd525b9c5649d5c8b6a7463bdd9a11127c1c0d554fe595bfedfb5c260ebfad15bb8619752da7520252afd1c SHA512 acb4b2855ea3912db0d3a26c7f8e7703b865f7e6f17b22a3654d9ac10633fc25fae3ba3995f0f33c106f4eba14ca897e8c6256e339e4d7f1393d8efdee7f4ef4
 AUX Makefile.test 172 BLAKE2B 75bf612ce08664303e4e28d7003e111a28e5ac931940f61768ffe4244e5fd883bc4a8ec5ef3e41537734899353127801004659ab8a6890b0c4fea46b8bba4591 SHA512 fc93c26e4df1c5eca2f99ad3058e2d129fa85a876c9d3d6fcc9e456f397455ebd136b88b3c0ed8d27003dc7a00a985094b6c711fb34316d9fef39e1ab2aadaba
 AUX prepare_snapshot.sh 428 BLAKE2B 5fab8d5ccc8aafbb4c5e9f729dad99b87d45c9973be777d4a77d5fddba280731186ec5075fe79526130ed26396e621e955ee28f1cbc0293b1e19e109b54f363e SHA512 2fc1391df1178a1f6e2e29243731a0630e43718e7e525f95f8dcea3c9909905e86cba1cd9063c396be0a076965b6c3c1cfaac899ba6e30c9cf4f90e237fb5b25
-DIST libcxxrt-0.0_p20140322.tar.xz 58208 BLAKE2B 429740f2ea0e9d3fdc2631ae1c4d6e458b7c3f94d892721f74ddd4935f9fb982f6d178ea00eb5d3548088b5d2052fa35cb671689f670c23e4a843efa9232437f SHA512 8cc2f3779a28b8eb215c3dc97e1382651016127ec6b1feb5067de435841c20e6338662172176f003242f1393b8df3ecf91eaa85b54281e1c588dab44d01ca930
-DIST libcxxrt-0.0_p20150423.tar.xz 58596 BLAKE2B 80a0a91aa94ea3ad736a9832eb574c2481bf0c9120fac6a8872d60dd51b56e9a6b9013bc0c975c1fcf449d2f2652a952a7dfa16157bd6ec16342a5d0da8dc80e SHA512 67a3b9204cee7b7900228483b8e24898d83f76b3ff2ed94bbbd67ca3fba623021e1b346c91ef46955da78f2e001395dc84a2f496223b52a0e59e97ff2e27e247
-DIST libcxxrt-0.0_p20160922.tar.xz 60460 BLAKE2B a6ae2f76c2557049f85697928b5d8654e9a82057d431c33b4762856be85721c65b5c92e377ac9c92dbb5ca9ef723dc2f874ece29997bdcb685b1351dea1d7e1f SHA512 3ec60ef2127a7e51793f90291ef61c6853d9a7b23201617f9dde0d27d987901db5ad0b142e3adb3eee64884e11793676912f2fb8e8b090d35288277a54d261bd
 DIST libcxxrt-0.0_p20170515.tar.xz 60488 BLAKE2B ae605dbd85a619886a3dca4ded06529bf51309d2c12028aaa4d27180efcbb6a6cd40e59fe731511cc920ba1e3c5786a5051a560186923d60c9aa7eae34b1679e SHA512 cf0539ca8f836adadf83195784ad008008faea2b0dd8953191fa1012d542f10f546eb58ecc42fa8e864c1113530a6bceb28a8005aa62276570343a3aaba09266
-EBUILD libcxxrt-0.0_p20140322.ebuild 1942 BLAKE2B e61861d2061bb66a459212eed2d40876fb42072683fdca79284abaf1283b64a8fc7407f8576fd6c921f84b1e48df7eb29b77b7ccc74c741d15f8381d2e4b3f91 SHA512 bd3fc5bd87fa2970d62459308bd59f036e9cdfda9209d62047973ac8a02f703666ae02968cba2dcee27d392598f6b34f7be030530367a8e5b686148c7ec07f32
-EBUILD libcxxrt-0.0_p20150423-r1.ebuild 2008 BLAKE2B 6790376da589406d88efc9db2a12c168ea31f8b2a74d77069fc3d125d97912508a8146af68d7129821b83ee6df4873a8d98ead8149b9093df7c0c4e16b18e9e4 SHA512 3891bcd302e6505ffc3f7035427750ee942c6f07d953486c43f6e6d41b7cf357fd8d6710c10640d4650d954f504d0e441e5f77ccfd55b8683a16c58bac30e8b4
-EBUILD libcxxrt-0.0_p20160922.ebuild 2029 BLAKE2B 2be32591e8a4c3aa1d67b9190737ba83ef5e04b51263a6ba84f5d43d21e664f3ad0e8fe97b5aa26477b9eaec9d5aa79622cb6ac079a772e693e910de88d19fc0 SHA512 f93ceb87807602dd00cc05a79382a7402f0da4a8c3df1da9ffc06e7a7aeb2f74a29bc0e5c5cd83da25a0b7c7964592f126cdafb7b78d0c7c55417138836871b8
+DIST libcxxrt-0.0_p20180311.tar.xz 60920 BLAKE2B c75bf5bb88e0f5c448a377a7ae58b33444e644c5e4ce7d6e0f5242c4ee61335be6a8b878bcc06f47bb44f9c48895845b174ca398c95aabb90182ebefd3d31815 SHA512 625aa0fab7d54c584faf4cf1e7f8f694776337fc0c6f441683f035743d00e3d18be3339a8ccfc8b61eb07819e4ccf7b1e5f3e7948fd584eefc5d61b200b32d50
 EBUILD libcxxrt-0.0_p20170515.ebuild 2325 BLAKE2B 59c0d167aca188e5280d8928a142190233f72b3af8a10ee1663f0d8eb96437163ee6fd299cfea65bb6a7311becafd9be8fe6499c606b755467045781378687b1 SHA512 353079acc3e04ca1056f38242814d2858a33b97a297164eaa08ff4c50c3b5e181b96229edb5d2658b2505724382b4f37155a0b49c7ecdf9155d628a077bec54b
+EBUILD libcxxrt-0.0_p20180311.ebuild 2313 BLAKE2B bf025284b1cba517bcc580685d48c754f38df052a82b4df13826068e5d3ee339d820c0eee918557f5af24aa2882fb9e2cc821f3ba0551f724f1a33c88867176e SHA512 450ff6fd64b3022226ee3caf7b56d971aa24904c35c740643e5ded2ea64ba8cca48f0af35cfa08328163d0081f0531f37d42de3551532572987e389ee8bd46b2
 EBUILD libcxxrt-9999.ebuild 2313 BLAKE2B cc8ee4a8d35ef736816f5b6509ed9c2429c4a0e18550cde29ed6de2827a754c7acbbfb21a41d245ca21d735292678390de546e71a29816873ba030c619d0ade7 SHA512 2432a677b870cb17f0677a1b211e09f27ad4472fbd095b9ff2c3fe6accc71511f72fc60d8bc89cfb0347bb3d401419a9ccad9b1374a5b1c0cb120d1f40075693
 MISC metadata.xml 772 BLAKE2B 918a0b6a0d5d7c07b86a8157e08d66f1df42d38e74099c3c38a5dcb2757d55637426df7e0b61d893afde5cd15eb9d4ab78920ccde846a781c5e7ee285161f0c1 SHA512 2740f5561f530ec9053c2e3cc1c32af9b11b61d6b9b1e1babc39d135132bd7fbc0670bcdef274408126c9444e93c9e6f964f7c51316cac06b4a64e177263be7a
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20140322.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20140322.ebuild
deleted file mode 100644
index 6448b81aa37f..000000000000
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20140322.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/pathscale/libcxxrt.git"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
-
-inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
-
-DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD"
-HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	SRC_URI=""
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="libunwind static-libs"
-
-RDEPEND="libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	${DEPEND}"
-
-DOCS=( AUTHORS COPYRIGHT README )
-
-src_prepare() {
-	cp "${FILESDIR}/Makefile" src/ || die
-	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
-	tc-export CC CXX AR
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${BUILD_DIR}/src"
-	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
-	use static-libs && emake static
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \
-		LIBS="-L${BUILD_DIR}/src -lcxxrt -l$(usex libunwind unwind gcc_s) -lc" \
-		emake check
-}
-
-multilib_src_install() {
-	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
-	# it. FreeBSD head installs it in /lib
-	dolib.so src/${PN}.so*
-	use static-libs && dolib.a src/${PN}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h src/unwind*.h
-}
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20160922.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20160922.ebuild
deleted file mode 100644
index da8a1e692772..000000000000
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20160922.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="https://github.com/pathscale/libcxxrt.git"
-
-[ "${PV%9999}" != "${PV}" ] && SCM="git-2" || SCM=""
-
-inherit flag-o-matic toolchain-funcs portability ${SCM} multilib-minimal
-
-DESCRIPTION="C++ Runtime from PathScale, FreeBSD and NetBSD"
-HOMEPAGE="https://github.com/pathscale/libcxxrt http://www.pathscale.com/node/265"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	DEPEND="app-arch/xz-utils"
-else
-	SRC_URI=""
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-else
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-IUSE="libunwind +static-libs"
-
-RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
-DEPEND="${RDEPEND}
-	${DEPEND}"
-
-DOCS=( AUTHORS COPYRIGHT README )
-
-src_prepare() {
-	cp "${FILESDIR}/Makefile" src/ || die
-	cp "${FILESDIR}/Makefile.test" test/Makefile || die
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	# Notes: we build -nodefaultlibs to avoid linking to gcc libs.
-	# libcxxrt needs: dladdr (dlopen_lib), libunwind or libgcc_s and the libc.
-	tc-export CC CXX AR
-	append-ldflags "-Wl,-z,defs" # make sure we are not underlinked
-	cd "${BUILD_DIR}/src"
-	LIBS="$(dlopen_lib) -l$(usex libunwind unwind gcc_s) -lc" emake shared
-	use static-libs && emake static
-}
-
-multilib_src_test() {
-	cd "${BUILD_DIR}/test"
-	LD_LIBRARY_PATH="${BUILD_DIR}/src:${LD_LIBRARY_PATH}" \
-		LIBS="-L${BUILD_DIR}/src -lcxxrt -l$(usex libunwind unwind gcc_s) -lc" \
-		emake check
-}
-
-multilib_src_install() {
-	# TODO: See README. Maybe hide it in a subdir and let only libcxx know about
-	# it. FreeBSD head installs it in /lib
-	dolib.so src/${PN}.so*
-	use static-libs && dolib.a src/${PN}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	insinto /usr/include/libcxxrt/
-	doins src/cxxabi.h src/unwind*.h
-}
diff --git a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
index 0b5466ce563d..0c117aac6bbe 100644
--- a/sys-libs/libcxxrt/libcxxrt-0.0_p20150423-r1.ebuild
+++ b/sys-libs/libcxxrt/libcxxrt-0.0_p20180311.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,19 +21,35 @@ fi
 LICENSE="BSD-2"
 SLOT="0"
 if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 else
 	KEYWORDS=""
 fi
-IUSE="libunwind +static-libs"
+IUSE="+libunwind +static-libs"
 
 RDEPEND="libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
+		sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}] ) )"
 DEPEND="${RDEPEND}
 	${DEPEND}"
 
 DOCS=( AUTHORS COPYRIGHT README )
 
+gcc_check() {
+	if tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]] && use test; then
+		eerror "At least gcc-6 is required to run tests. Please switch to a newer"
+		eerror "compiler before proceeding."
+		die "gcc-6 required for tests"
+	fi
+}
+
+pkg_pretend() {
+	gcc_check
+}
+
+pkg_setup() {
+	gcc_check
+}
+
 src_prepare() {
 	cp "${FILESDIR}/Makefile" src/ || die
 	cp "${FILESDIR}/Makefile.test" test/Makefile || die