gentoo resync : 21.06.2020

4 files changed, 39 insertions, 18 deletions

diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 71bf355b61c4..580ef7bda600 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lld-10.0.0.ebuild 1483 BLAKE2B 7d949cb37acc2568db0915086fce712ad854df4fe0878ae42759f93c69a119e9f7f24fa8cd5047bc225b037d4afa178ce8e02f11eb9e1cd0e8c60ac3fe8a422d SHA512 bab240f2abe5b81f811080695d419683a423865dd38c62d8d65e7d2421aeb1b3d4da511298d78cd8b20ef53c18772f51367b25fc2b6252070297ceb262ffb1a2
-EBUILD lld-10.0.1.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
-EBUILD lld-10.0.1_rc1.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
-EBUILD lld-11.0.0.9999.ebuild 1453 BLAKE2B eece842076bb0a1e48c567ca4c57043bde3a988ef5a0b254b1336885d0fe5a51bbd5cb87b954f0b7b6dc2ecabcc0e9d47c0a0b522df3052e9ff5a7601695cc4f SHA512 0be2cc3d5613fd64769e3daf7aadcdcd30e8eb50ddf3bde02c4dd01906612a94d5b2edd4f036bb5f2f1177dd3e98d912f909fa23327b42b10e855b9375689a85
+EBUILD lld-10.0.1.9999.ebuild 1545 BLAKE2B b3b9fa04cb0f406ad925b6ab59d67871c0a1a096cdcb797dc2eb45f67e415696a7af6a4abdd1632350313d7849766c8b6504f725c3b01c0b12fbfa509503340c SHA512 cd8fe30a226f19a5e2569b383149e0d43b2498ac6db25e6064804fe69c131072fc0614de79ff01f623722f256c9f4ba63d4b128a1244d2c3c227d089ad85badd
+EBUILD lld-10.0.1_rc1.ebuild 1545 BLAKE2B b3b9fa04cb0f406ad925b6ab59d67871c0a1a096cdcb797dc2eb45f67e415696a7af6a4abdd1632350313d7849766c8b6504f725c3b01c0b12fbfa509503340c SHA512 cd8fe30a226f19a5e2569b383149e0d43b2498ac6db25e6064804fe69c131072fc0614de79ff01f623722f256c9f4ba63d4b128a1244d2c3c227d089ad85badd
+EBUILD lld-11.0.0.9999.ebuild 1545 BLAKE2B b3b9fa04cb0f406ad925b6ab59d67871c0a1a096cdcb797dc2eb45f67e415696a7af6a4abdd1632350313d7849766c8b6504f725c3b01c0b12fbfa509503340c SHA512 cd8fe30a226f19a5e2569b383149e0d43b2498ac6db25e6064804fe69c131072fc0614de79ff01f623722f256c9f4ba63d4b128a1244d2c3c227d089ad85badd
 EBUILD lld-8.0.1.ebuild 1794 BLAKE2B 31cf9d99132629908515eb9a8c6b074caa7b84bfbd86446fcd7f65391e247ac23ffd272b715836fc0d787c004a00f613c2c7b0d1bff96a1c8e9054554ae3fe41 SHA512 3d29acfa6f2eedd49917bf811f93f0f9646de38f4b17cf78d748e93c0bb0653f95e7ff1d6aefa0e77ad7af4479f7d3b27d4b10a49ae34aa86efcbeb636064e79
 EBUILD lld-9.0.1.ebuild 1323 BLAKE2B 042f875208515a2b9c39289239601e9b573aa2d9603f2bd58652612d44ff9e62b5776a2370eac1b6933f38f6dd085d3ba24749509eeb2084416e78dc4b5f8fe2 SHA512 d0a352fa95f0e5c47edce97ed4344555ee56d09b70db50b79f2b0ce50ab41e71aaa427dd4218f7239bfa56a439d04b9e99d4eabaa07f573617d55ac259721b55
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-10.0.1.9999.ebuild b/sys-devel/lld/lld-10.0.1.9999.ebuild
index f15808abce81..ab0472be1ac9 100644
--- a/sys-devel/lld/lld-10.0.1.9999.ebuild
+++ b/sys-devel/lld/lld-10.0.1.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
@@ -47,16 +54,16 @@ src_configure() {
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
+	cmake_build check-lld
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	# LLD has no shared libraries, so strip it all for the time being
 	rm -r "${ED}"/usr/{include,lib*} || die
 }
diff --git a/sys-devel/lld/lld-10.0.1_rc1.ebuild b/sys-devel/lld/lld-10.0.1_rc1.ebuild
index f15808abce81..ab0472be1ac9 100644
--- a/sys-devel/lld/lld-10.0.1_rc1.ebuild
+++ b/sys-devel/lld/lld-10.0.1_rc1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
@@ -47,16 +54,16 @@ src_configure() {
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
+	cmake_build check-lld
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	# LLD has no shared libraries, so strip it all for the time being
 	rm -r "${ED}"/usr/{include,lib*} || die
 }
diff --git a/sys-devel/lld/lld-11.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0.9999.ebuild
index f15808abce81..ab0472be1ac9 100644
--- a/sys-devel/lld/lld-11.0.0.9999.ebuild
+++ b/sys-devel/lld/lld-11.0.0.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multiprocessing python-any-r1
 
 DESCRIPTION="The LLVM linker (link editor)"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,13 @@ pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=OFF
@@ -47,16 +54,16 @@ src_configure() {
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lld
+	cmake_build check-lld
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	# LLD has no shared libraries, so strip it all for the time being
 	rm -r "${ED}"/usr/{include,lib*} || die
 }