gentoo resync : 21.06.2020

4 files changed, 36 insertions, 15 deletions

diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index 23c4b6050c64..97f25f67939c 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -3,9 +3,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 compiler-rt-10.0.0.ebuild 2923 BLAKE2B c5f9ed65aa52a8c464d9b9ebff0dd36d7147a5637e2c9b7bb08bf29ee204a583d226c94dbaf5c5ac2eff4b28cd07b64d65271a8dcf3345b12b9d4022827dd12c SHA512 fe6aa86d6fdb5b211326e8c3d5414f0c684d53c0c64431c043a12f0d0483ada79ab724e70f4b69589d5c5166b6867a1620517040d833bcef5c1ba6953ac5fb01
-EBUILD compiler-rt-10.0.1.9999.ebuild 2847 BLAKE2B 79d7dbdf6ae014fbb41efe984ea88b5ba952af4c53c0899201017a8ed5b79211f00858e2b16290f7c485c133a9a064703332c54d13de9ee5ee873b59042e2d13 SHA512 e3bb02a9bb9d5be06aa2e79ee07f9a0ed7819e3832686442d7b95df903348b79d1812bcad40b2b61f5e192d51028c80dbf99df37979131c429ebd5715927fb29
-EBUILD compiler-rt-10.0.1_rc1.ebuild 2847 BLAKE2B 79d7dbdf6ae014fbb41efe984ea88b5ba952af4c53c0899201017a8ed5b79211f00858e2b16290f7c485c133a9a064703332c54d13de9ee5ee873b59042e2d13 SHA512 e3bb02a9bb9d5be06aa2e79ee07f9a0ed7819e3832686442d7b95df903348b79d1812bcad40b2b61f5e192d51028c80dbf99df37979131c429ebd5715927fb29
-EBUILD compiler-rt-11.0.0.9999.ebuild 2847 BLAKE2B 79d7dbdf6ae014fbb41efe984ea88b5ba952af4c53c0899201017a8ed5b79211f00858e2b16290f7c485c133a9a064703332c54d13de9ee5ee873b59042e2d13 SHA512 e3bb02a9bb9d5be06aa2e79ee07f9a0ed7819e3832686442d7b95df903348b79d1812bcad40b2b61f5e192d51028c80dbf99df37979131c429ebd5715927fb29
+EBUILD compiler-rt-10.0.1.9999.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
+EBUILD compiler-rt-10.0.1_rc1.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
+EBUILD compiler-rt-11.0.0.9999.ebuild 2945 BLAKE2B fe5825c468581ff72d62517e0f6f08f81df6eaf8ddca5447351a55c2a098f71bce970468db71095cafd4e4ea32efc0f9ffb6b38fa14ab3b27ba23e70390242e1 SHA512 8fe929c45af1f68528134d80f1293363fd26779930e7dd2f25802c63282c23f58bb01942e195a96894e9a753c4bfbbe93ece22676522a8338bf3bcd468045452
 EBUILD compiler-rt-8.0.1.ebuild 3033 BLAKE2B aae9682b1069da7024ea1e4bfd29914015cd2eb043d0f56fccc4d817bdf32ccdb3121f25232fe15fafa7e17d5bb9600de57c82b700d571d3ed2b3af3bf0d3673 SHA512 4ccaa041025603d7582775b1982a9644305110268d461bbdfdcfe094e0a85df0dd258aaf378e33d8a63ed6c5ff6d8f2f6701a69564c4ef1ab1a0662001d735da
 EBUILD compiler-rt-9.0.1.ebuild 2916 BLAKE2B 4725960cfa3ff697f1b17d709c7a9f463aa8aaf2da33592b6c5d129fc4acb51181a4712c1afce01c0b97e441685cc5932524f02cbacb339f5c7c315813e4ec72 SHA512 2b038aeb653043691f046ae2930cac58ada17ece1f7da2699e1e9ce4dbe1903f21366ca82cb3d08605875f0b24fc0a9707bbde2ea6a039c080f0d54268071f0f
 MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
index 597584d700e1..422f3ce2cf4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -49,6 +49,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,12 +106,12 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
 
-	cmake-utils_src_make check-builtins
+	cmake_build check-builtins
 }
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
index 597584d700e1..422f3ce2cf4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -49,6 +49,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,12 +106,12 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
 
-	cmake-utils_src_make check-builtins
+	cmake_build check-builtins
 }
diff --git a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
index 597584d700e1..422f3ce2cf4d 100644
--- a/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake flag-o-matic llvm llvm.org multiprocessing \
 	python-any-r1 toolchain-funcs
 
 DESCRIPTION="Compiler runtime library for clang (built-in part)"
@@ -49,6 +49,13 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 test_compiler() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
 		<<<'int main() { return 0; }' &>/dev/null
@@ -99,12 +106,12 @@ src_configure() {
 		)
 	fi
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
 
-	cmake-utils_src_make check-builtins
+	cmake_build check-builtins
 }