gentoo resync : 11.02.2018

3 files changed, 80 insertions, 2 deletions

diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 27afe1f348c2..a1f2a804a738 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,10 +2,13 @@ AUX 4.0.1/0002-test-Use-LLD-specific-binary-library-dirs-when-build.patch 4381 B
 AUX 4.0.1/0003-test-Fix-zlib-cond-when-building-stand-alone-clean-u.patch 2924 BLAKE2B d429f8354506562ed8b11e1c34344a3d3868a74125d794e291ab89753328da2fe615300a005fd74735bf13c02ed20672377d806b9676fe49a955a38a2d8bd5e2 SHA512 1b82f754fb872318740f77f78fa08647e2523d5b6d9cdd0dd9108bdac82a213d5d5c698a8915c0f6bd60b2163cce3c8bd1c13095dad52d0beb08079f851d30d8
 DIST lld-4.0.1.src.tar.xz 593796 BLAKE2B 58eb8f013a4562ef60dd7e17ddd741f434b8f0228a3d3d746ec8c30521ce667863d0b6db6565659a1b86cb91550cdaa43a27600d3a979460523faf24eac8ea3f SHA512 63bd0813094dc7fa9a95fdee93eb7b97026882a15548f819b5c67f3f0f9fa2a582d968af27ad8f802dbff1f6cd1b8c2fb26b3c7c80379488d05c4a4984d7af68
 DIST lld-5.0.1.src.tar.xz 672952 BLAKE2B 67bb6687f04f809b12e0b65a047c493f89a22984e8d3ac35aaf18bd3179a97efd7798e2b38e00cd00cde07ccf37a1361f4de8a3eb1481571c039195b5214d6b6 SHA512 62c9682ae4e18a64af2c9e13d45925fbe022ca332d03b1c4232c6b730dab327418555c8da2b2bf8c6126032dfd378a0b9dedba83351d928784bf2b1f30dfaaca
+DIST lld-6.0.0rc2.src.tar.xz 789408 BLAKE2B 7d4613666a81de7736216ca2f6bf5687cb4da8b23eb4d233632d4830700dc8ef206d05100ebbcda07b1d93bf83179265f1ea216d5a2ebc7d2f45c632a08a8901 SHA512 391938bd4b51a5275e4573d4500c342d1db3b80a07aac560b5d324c370563693b4ed09d62754aa91c033a3ded16466dabaa7efd859d9227123c394274503a11a
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
+DIST llvm-6.0.0rc2.src.tar.xz 25288140 BLAKE2B 095f054ce2ccb1eee3def2b8c6cecc610c4392283062338aa20d2de33c951484a2dc6774db2727e19e879307cfc95dda2730185cde8e52f4f45851d8dd809b3e SHA512 3cb3521ba8d90bf2a90c49d753ab5e92f1e0ccfc86946f3767c06d0f276e2c4cf8ff2f984680835efbaa4dae1cd2d3a074468e547785e05a67ea55311b94a0e9
 EBUILD lld-4.0.1.ebuild 1721 BLAKE2B f3e848199052fbec33376e9630afd80c031cd729457d1e3c302d78c42a128cc7d8baa626ed294bdde19dc2ec00683a01e4e9d5d0f6d893e24a575024b9e92556 SHA512 e971195cbf8976a0bd5140c62c3c4d9a375beaf3813119342f3f8f28db9843e53dc9804cb13b6f1a49a1b7dc60cd631cd69f742faf1de56001f59230625dbef1
 EBUILD lld-5.0.1.ebuild 1589 BLAKE2B ce6f2b7d0b095223600a236432966cbc44d89d781f6fe20b699aeb77b859bbcdf65bab0b1ad37df63918ce95f75c018a5eb9d56605e5d56d057e062399427271 SHA512 16b397e9d580a52fa430b07788a1c73aabfdc3dec87ed8ee12807e231c9590f637966f412a0657a574476b3b27b0a952718c61de955246cc1f585ab4526d49cc
-EBUILD lld-6.0.9999.ebuild 1572 BLAKE2B 5fdb41096f95d23e3f7287dd0b6adbdc51181d64f942871d2d6cb665e194f575bbec5b4e8dc58282645e12057dead82fcd5eac1edb93b63127a62e3767b30e65 SHA512 36f07056e215b21f221ade183c629643c93e56dd859635ef770c1742536831051220bfd11de663807e557b6cd03bd651e6b41abca3a1e2c17ad301a054763069
+EBUILD lld-6.0.0_rc2.ebuild 1632 BLAKE2B cf3967b3616cbdfa0d2ee5abe4abbe92240c2216970ae038c42ede3c8d3c7a8f1541551e094b67a389228b375a3fdb9b8583b4bd4f510b25bfcc0d9309b82ab8 SHA512 5e4b7a52b64eddbad01324571b8273a6f98744c8d209044a9302b2e15b340a1cdf105b6ae013ad1d497ab189a9e0fecc3acdd3fa63e8b4b8c5aa3db207465c0f
+EBUILD lld-6.0.9999.ebuild 1596 BLAKE2B c657496e25cd94aab34fbbb2ac02b165b3915bbaabc0543d4683ae3250f2bbba746b98249b82e3303d7a79096c640edbc4cdad75dcfe035adf56574b85fec149 SHA512 b240c2cb32dc7b72d772e1e95bfb9bdd2b8d34983c6a287aa5dd67e727c5aec30f7d1bc965c6eebc758accf1bcccc05a1a0565cb4e38b6a3e5cd8d94576c0d62
 EBUILD lld-9999.ebuild 1547 BLAKE2B 412347828e4f73c4a0c8481dc6e4e6a89421d25874131b3f95db1863d91a92af19f498b73dc3ce028c0d0b79786568d39653b14e81d1dd8a1673540de0d56d0e SHA512 63f3a8fcf6a52ca31131db36c4b6efe45bd913d44e62a9ef773ceb02f39d721e0e81149b7dc7304bb2b93f42485f184b734bdebf5243027a1822d30cf33c7278
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-6.0.0_rc2.ebuild b/sys-devel/lld/lld-6.0.0_rc2.ebuild
new file mode 100644
index 000000000000..855955c6e9de
--- /dev/null
+++ b/sys-devel/lld/lld-6.0.0_rc2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm python-any-r1
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="~sys-devel/llvm-${PV}"
+DEPEND="${RDEPEND}
+	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/utils/{lit,unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lld
+}
diff --git a/sys-devel/lld/lld-6.0.9999.ebuild b/sys-devel/lld/lld-6.0.9999.ebuild
index b0e74d45d1fd..e09f7df135c6 100644
--- a/sys-devel/lld/lld-6.0.9999.ebuild
+++ b/sys-devel/lld/lld-6.0.9999.ebuild
@@ -35,7 +35,7 @@ python_check_deps() {
 }
 
 pkg_setup() {
-	llvm_pkg_setup
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	use test && python-any-r1_pkg_setup
 }