gentoo resync : 21.06.2020

4 files changed, 18 insertions, 9 deletions

diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 48c5869afb96..165725d33958 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/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 llvm-ocaml-10.0.0.ebuild 3219 BLAKE2B 8d2ac0dc88b865f723c527315aaabb6bbd75773660b63197c833c72d7915495e494d73144f84a451dec3793d45a2f7f44dc22beb5c60f55dfd88a23bb04aede0 SHA512 fa83b587c1170564e25c040e2809daf6dc13d1718074d22a7093f08e7444d6378dbeb2f5ddc57f681f4a93b14c95275c87027c9e9191757b1fba4c9008464d38
-EBUILD llvm-ocaml-10.0.1.9999.ebuild 3206 BLAKE2B 5eebb24bcd854430172565433326f723f1707fbadc941d9a891dc42934120fa00d27f4ec8c14467b8919dd4132d9f0bb00ad84db6ac98008bf7218d7403ed34a SHA512 62d413a75c1c3eb03b1b0dd63814d25b248632fd0faaea1e9f74ad089d0a79e03503db293b0081712e4ea0d55c2b8d186d79f933a04ba50e327a56122a96c33f
-EBUILD llvm-ocaml-10.0.1_rc1.ebuild 3203 BLAKE2B 0704301a50ed440809470c0753a7c59ba2118dac3cc284f4bdaed07ff9080d2ac09cc624aa7001526f900c7ffa27dc2f04a42ed964f6759d313d7c5281591311 SHA512 86c415b7cda21fac1137f4af120bf6df3e65afbf0c08a3afba60854383306faec4bd4b32fa1be3d7cafdcdbe3faa3efe2f482142d49d01c5cebc0a7f1515fa53
-EBUILD llvm-ocaml-11.0.0.9999.ebuild 3206 BLAKE2B 9f18892346ac171baff4f5044b34d80a206e6257dbdabb7f95794e4eea8c58de58f45c315586f7569e2e4068d8363233e466bfb11cb28003dda977aacd689713 SHA512 1c257c6bb2b04a7fade003b7a035cce1016457c1287950ee7d6c4e5ecdb4d0cacd5970048d326092bfa68ce97eaf68fed44b1dc8e52751d2752fd9e5f09af824
+EBUILD llvm-ocaml-10.0.1.9999.ebuild 3288 BLAKE2B 7d5b7a5dd2c3a78eb9a5e57ce60bd4c1149d34c4b7c348c535a0999c04aa713df12710cd30dca54f0d76218e92c0e1e490bae7e662613c231f7600e88688dee7 SHA512 3d5c358dcbb34f39894a2c19d0ecd235b47dd8476e2699cce199f7517ef1ed12c06f881ac18a51f7f658c6b131c77fca16bd92fbc1cd604520c8a2cf653426a2
+EBUILD llvm-ocaml-10.0.1_rc1.ebuild 3245 BLAKE2B d97a0aec60d364da29f24529fb3f759c1a58539b7462d225849c4ef69de37b6a0f0043bdcb0cb1244505b202484116430c9f25c054b6c68be2637c9537a91547 SHA512 a68284736cd4b2f418cf19a3eef30f78bead858bd449da510e6b523b96365f42de2997abc27ffa6487398374e95be49465557cf779fd9603faaebba3d8d027e9
+EBUILD llvm-ocaml-11.0.0.9999.ebuild 3288 BLAKE2B ce014ec9c876645defb9484f374579aa69767cfbab0dc2ac96729ff91cde86be7090c3aa8fc58b9907aea0fff835c1141021e21c74cdd254893c3c9b0ebe522f SHA512 0593a39a81f0528bd6cc4a57d6c46c163c06cc19aa33915bccaa21ae17f5f3e33b26d7c9f8219e539246facc87f00da9ec561df13bc468acd6405b89b4aaf001
 EBUILD llvm-ocaml-8.0.1.ebuild 3064 BLAKE2B 41792ef0b7764c4b7c297a05ee56d4e613cbfbcb2e2157e7b70c8ecbb71aea698079abca2324291f9e0b9565e36509e81ee313bd152bb0c15c74c6b69c5f4dd6 SHA512 042075a171609318603e93320a6080f6b75319b7a6490a85bced7138001d30a72b45a0bf348a0e7c5a80f56c8c7cf3e6f921ed5fea41b62ece3226d00dde49d3
 EBUILD llvm-ocaml-9.0.1.ebuild 2922 BLAKE2B d7ae97c680d9f223a0fbaf2989ee60c4ae2baebf73664c9909485fea6c99f5c4c817ff522bee6175a741a5632687d1d0ea5b7b961587a258ca0737ac419390ac SHA512 dc30f078950d944a5c9d18d8804db82300845564afc05878cc7b157d37ad32259c528b358b9cd12684da3b9885b62e92cc6a32b46b8c4cbf48269839bd4cfa02
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
index 52e3836cb57f..c87d9f13cf31 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild
@@ -50,6 +50,9 @@ src_prepare() {
 	# Python is needed to run tests using lit
 	python_setup
 
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
 	cmake-utils_src_prepare
 }
 
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
index 8a7efe8fca43..ff77167a7661 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-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="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -50,7 +50,10 @@ src_prepare() {
 	# Python is needed to run tests using lit
 	python_setup
 
-	cmake-utils_src_prepare
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -92,7 +95,7 @@ src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	# also: custom rules for OCaml do not work for CPPFLAGS
 	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	local llvm_libdir=$(llvm-config --libdir)
 	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
@@ -108,13 +111,13 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile ocaml_all
+	cmake_build ocaml_all
 }
 
 src_test() {
 	# respect TMPDIR!
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-llvm-bindings-ocaml
+	cmake_build check-llvm-bindings-ocaml
 }
 
 src_install() {
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
index a0e74a7dc12b..5a10d4d1de5c 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild
@@ -50,6 +50,9 @@ src_prepare() {
 	# Python is needed to run tests using lit
 	python_setup
 
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
 	cmake-utils_src_prepare
 }