gentoo resync : 03.11.2019

4 files changed, 39 insertions, 91 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index ef4e98d21130..886d2797fffb 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -20,10 +20,10 @@ DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
-EBUILD clang-10.0.0.9999.ebuild 11554 BLAKE2B 4a5f81509bd9ae901436e3a834fb2dae840f84655e1f2f792922ba276f0139db665e07f85de23c5bcecb68c80f57442c7766ff7a9e74e2bbe68bfc15f2b45d9f SHA512 517816a43844239a3e0bf7f81ab30b078f99f238c298d6b83a282f10eccc28faf2f82863980dbacdb53942785ca9cd82414d105332acabef065043547d8bc776
+EBUILD clang-10.0.0.9999.ebuild 11008 BLAKE2B 66643542afe563a00694536970f02ce372292cdf571aeb3eba8183602ecb3912f930d8530ce87a8c8077f8bfa4a11da2de9b5da8456479d050af18f51d6930a6 SHA512 44146c6ef198bc0bae642c32d6dd581e7f5722b9da5a4c766eb278431b1623c010cf7165933b759a66e3f5e852cd8dcbece63b277f8841042881a310eafd0491
 EBUILD clang-6.0.1.ebuild 10260 BLAKE2B caa01b8f386069bccd3bc003172b158cb4c82ceb0014cb22c4065f0b8fb257c0a1d418f94b680b86e6386493d68f0192d6a357e98120daa4014283b627394aee SHA512 0efc198053d9f828ef0cc506f3ea731f0e440f2433dcbe3da59673fb7cdb33e746620515585c6d866304087038ce1b70b4b9f35be3cb1cddaf5f413d58e74891
 EBUILD clang-7.1.0.ebuild 10342 BLAKE2B bee118a01e7f6a123406d809e3e87f8f14bdac8060ee9cf0bbd21c0ab99493d215f057d42ce1a50aabab4faab15f5d79313e2123c2815c9346263231ddb18430 SHA512 924d9a98c439918cb1f03da5cda2b87dd412032209752aeaf1e1a69d5bbf8c01f403505681f43c8a08b731aa8a644e35a754bb18624da4d8e4ca5dfebeb17a18
 EBUILD clang-8.0.1.ebuild 10240 BLAKE2B 564acf26ff06469442f634c60cf2ee887f13f8d720f6ee9f104f84057c588e56b5b1e3bd0e3104eff4f25b52d6a69467b95e8f409e67be83887ef41426e8c33d SHA512 fd367c55c9a9f33d765e7d520806802b7e0de6e61eda33b46d1a5a24906e4c6a6295b2467c82d6001db6519be2609097f09ddb11e4b14165a890d85cfbb1ddb0
-EBUILD clang-9.0.0.ebuild 10156 BLAKE2B c2680af0efb87aca3b7b549df42ea1e8d84a3c7df66f71a3b3d63710f8182f14ae744ce8a51bb1f6eb24564a88372d96a517620cf72d87188cb0cdf23b21d740 SHA512 e0d64fc75df9bce9727f825b6cb197670c950cc3aea68a8d1566a86818c912a8ce9bbadef52d1c671a7c6dee307deeb9662e6447f9c55d5b5067ebeb910cf38c
-EBUILD clang-9.0.1.9999.ebuild 9531 BLAKE2B 339c3275077f63069f74ddbc3a9b7aa2e1b48ea0677fd18aeb996b414119d4371f5f226a1e248e10919e798244a7546c557e74fe4170bf93d69e2b502743bf80 SHA512 4bf2f4ab2ca5ab62ba2795089cc9c329e59a1a9c3c3094c770120d94625be74ced3f135b33b4898f69866754f16f6081b76169e0172a80a9ece3f9b07d0c83fc
+EBUILD clang-9.0.0.ebuild 9576 BLAKE2B 17ef1b35de29f82c0ab9132fa1fd1a21ada47f4cabe0d6b7c406d0237eadb7cef05dc73e1cae8fabddb455082d588672a4792699d79be20041ef0e5bf19a0c6b SHA512 5ee6973d2ed6592389a7e83410715e60623426f61b01b76dfb464fa6010e374ca2660b872f8af2516d0c5a3f50219871c62b69c39bf262cd2011970e0e5f5032
+EBUILD clang-9.0.1.9999.ebuild 8960 BLAKE2B b22eb0c4b03309707087ae5790d6f8e8ae2ed402d731057fbeb368a4e837178c21565704ced0ff867edb2decdddc9d1765ab2b292ea573c47745e975033537e4 SHA512 0cd4cb20bd1414744e5a5f259e132e34172d27b66e44506115833946b465eeea710f1dd76ae0f8769aa22b41b06ccb48b3412418f9164231cc4eff78c3928cc4
 MISC metadata.xml 1377 BLAKE2B 8b580be2bcaddb98c2d2b8defd1730c69a7478248f7d241dd00f533d36d750a3f45c1e55161a4fd2731b6211a22c658046cf8ad5a87028c32928dfe0cd4a862f SHA512 b08ea2bd3454abb09abfa92b62e6dae4f4e10db0266c1e4895bef0f6a2d2fadea0b36b9b861831389413e1cca0e3c412b4cf474fc8c4170902b40deeab06686a
diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild
index aa2c3a2ba5d8..6910230d08e5 100644
--- a/sys-devel/clang/clang-10.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-10.0.0.9999.ebuild
@@ -3,22 +3,20 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
 # We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
+S=${WORKDIR}/x/y/clang
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC AVR )
@@ -84,24 +82,8 @@ src_unpack() {
 	# create extra parent dir for CLANG_RESOURCE_DIR
 	mkdir -p x/y || die
 	cd x/y || die
-
-	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
-		https://github.com/llvm-mirror/clang-tools-extra.git"
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
-		"${S}"/tools/extra
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' \
-			lib/Testing/Support utils/{lit,llvm-lit,unittest}
-	fi
-	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
 }
 
 check_distribution_components() {
@@ -258,7 +240,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 	)
 	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild
index 2eabbee087ce..d6ca87c13d50 100644
--- a/sys-devel/clang/clang-9.0.0.ebuild
+++ b/sys-devel/clang/clang-9.0.0.ebuild
@@ -3,26 +3,22 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils llvm multilib-minimal multiprocessing \
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
-MY_P=cfe-${PV/_/}.src
-EXTRA_P=clang-tools-extra-${PV/_/}.src
-LLVM_P=llvm-${PV/_/}.src
-
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz
-	https://releases.llvm.org/${PV}/${EXTRA_P}.tar.xz
-	test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )
+SRC_URI="
 	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )"
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
 # We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${MY_P}
+S=${WORKDIR}/x/y/clang
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -98,24 +94,13 @@ src_unpack() {
 	# create extra parent dir for CLANG_RESOURCE_DIR
 	mkdir -p x/y || die
 	cd x/y || die
-
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-	einfo "Unpacking ${EXTRA_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${EXTRA_P}.tar.xz" || die
-
-	mv "${EXTRA_P}" "${S}"/tools/extra || die
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/lib/Testing/Support \
-			"${LLVM_P}"/utils/{lit,llvm-lit,unittest} || die
-		mv "${LLVM_P}" "${WORKDIR}"/llvm || die
-	fi
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
 
 	if ! use doc; then
-		einfo "Unpacking llvm-${PV}-manpages.tar.bz2 ..."
+		ebegin "Unpacking llvm-${PV}-manpages.tar.bz2"
 		tar -xf "${DISTDIR}/llvm-${PV}-manpages.tar.bz2" || die
+		eend
 	fi
 }
 
@@ -150,7 +135,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 	)
 	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
diff --git a/sys-devel/clang/clang-9.0.1.9999.ebuild b/sys-devel/clang/clang-9.0.1.9999.ebuild
index 848de712e241..1042dac71eef 100644
--- a/sys-devel/clang/clang-9.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-9.0.1.9999.ebuild
@@ -3,23 +3,20 @@
 
 EAPI=7
 
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \
+inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \
 	pax-utils python-single-r1 toolchain-funcs
 
 DESCRIPTION="C language family frontend for LLVM"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
+LLVM_COMPONENTS=( clang clang-tools-extra )
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+)
+llvm.org_set_globals
 # We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_90"
+S=${WORKDIR}/x/y/clang
 
 # Keep in sync with sys-devel/llvm
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
@@ -92,24 +89,8 @@ src_unpack() {
 	# create extra parent dir for CLANG_RESOURCE_DIR
 	mkdir -p x/y || die
 	cd x/y || die
-
-	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
-		https://github.com/llvm-mirror/clang-tools-extra.git"
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
-		"${S}"/tools/extra
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' \
-			lib/Testing/Support utils/{lit,llvm-lit,unittest}
-	fi
-	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
+	llvm.org_src_unpack
+	mv clang-tools-extra clang/tools/extra || die
 }
 
 multilib_src_configure() {
@@ -143,7 +124,7 @@ multilib_src_configure() {
 		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
 	)
 	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/x/y/llvm"
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)