gentoo resync : 17.10.2017

4 files changed, 10 insertions, 18 deletions

diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index ae61ade1c436..b9231f11bfce 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -17,9 +17,9 @@ EBUILD clang-3.6.2-r100.ebuild 972 SHA256 53853dd1db09fad8943f076aaaa6f4f75347c0
 EBUILD clang-3.7.1-r100.ebuild 1136 SHA256 1d0a5208c02b286ceeaa9fad7811371f34595a53399aeec88422313a77523d17 SHA512 6cf313c813f93b93ea76d53006684912feff171d0738f6d202d996052f9eae731583ed1616fc21d8d493292028577c7e1bbeabc3aee21650653638cdba7e541d WHIRLPOOL 12d32294411e549c1843cb9c6a35077f763cabbfbfe47400d1d70d04e88f6631a36c9810459b92e5251729d082127de1c8f79f16e10e12d8b7e0a93a33345a26
 EBUILD clang-3.8.1-r100.ebuild 1127 SHA256 5b6465d519e47712e96bff101e2c8a116c68e8ed57a2601bbea103294a9c1d73 SHA512 29c01939021f9d73bcf503ec480586fba5660ddd8aa2da00fddd9a8217a63fe83a5e02111720a36192c497e7994e6f400f2e22d258eba9068c29ab4323761ffd WHIRLPOOL 0ac5cd0ea5afcb79261e4b9861c7a6ef19ad26858a65cd55f29024f0c4cb071ef9fa937013d235ee1a67d78d1c9b52270afb4940200f07da1c64289ead0a0ad1
 EBUILD clang-3.9.1-r100.ebuild 1534 SHA256 f47ffa2bc0bf2efc96e5fc8049e3b8d17a6714f196e7391461cb42474a8cb449 SHA512 84a3c016f9db31c6cbcee7620330b76af97702be3e92bd0db6e58883ccc054a792003a374cb5bf9d69b8f7c89165a2853ba495d58cd02d98524cf8025e99bcf0 WHIRLPOOL 36522b37ac7dafbd9a4011f4d9f5daf34dc2e1c2e119f6dcc2775a4e0bb75eeb4ebd6c25ce69c26620f09d9e91d908f3f048b56239ec96e291bee7ae019a110f
-EBUILD clang-4.0.1.ebuild 9523 SHA256 7adfa708e3bbe914f63ed908002a60d19468819e0b2e518de9670d887e22a3ad SHA512 e4fd88774de8671511debd039498b70b640abaaffe49509e4b905950880367560e0cd59c083d3a1ed55fe5be0a46014d7a6264a7db4213a7b29fc4325a8ac2be WHIRLPOOL 8f489c6116926d30a1590571cb7e7a32312d239f4d34327a6dc7e1f0c9b07f572e791a5a64681abcc0d42e8432dc47293d419266d22235ec36bde1fd78ee266d
-EBUILD clang-5.0.0.ebuild 9383 SHA256 349d9e228849c749b39463c12b21b05aa85db97d675b286d0b0c2b78abe28f94 SHA512 100af2724c09bd6645859adf502a4460a8ef06de555a41dd7eca82724980502bfd23225a177333c702d66c11a2565602893a956bce5922950dd013ce49bcca73 WHIRLPOOL c68a6bc993addeca02f08911444d0efec9f7a2be845cb2ac5038c9207e410b5ab370c33f50c41a946fabfb972d0f98370ebd9e20352f91a950248ddd89f7da7c
-EBUILD clang-5.0.9999.ebuild 9330 SHA256 3c81e4b9523db25b85c10e46c36f741dad8323ec509a5532ae83aae1ea76991a SHA512 114eea93b7d4dba8d664d070d9cb6fa667fba1a581930bea469cd4bdb5e0c1797ed3ef1c990305d509a687816f4441a9f5c9b09cb8fd87601fc27bf9bb486b0b WHIRLPOOL 9a6e6d1da94e8b55ced7ca132e37016d7f100f1f1b04f79a257f3a90fa84c1f9ff7668eb60097920fe1d7de77bd16780258fe923fdbaeb9b31b355b9f15b515c
+EBUILD clang-4.0.1.ebuild 9535 SHA256 9596110f320f2aa2d007cb6494e3a312879a4f62dae9d9aadc6c44ec4c8fa965 SHA512 be944895dce359ef642ba21068f168b91aeb4095e662e48eaa5c3768be27969641fc193e794dd53ad9422901efdc320bd7cb9314d0482f6701c238ef36f6dec5 WHIRLPOOL 346ff6754055ce9e394a764b4a98cb85f63e1011725cb5be52c6ce1c62050bcef0d643bbce89607ca34db8ce7368b211439954420ee40e1e9bfbe5a86c86f3de
+EBUILD clang-5.0.0.ebuild 9395 SHA256 4c51bc537acf59077ad69438467122cc978fb808045cc8f67eb59bd80de8a263 SHA512 a1e614f8a8611af3ccc34d1d79efd6ab14ae5319593b2caeb77f8f8d875f1fed03d38b7a489001857602475782012e7825872cde069cc21429a6145e4062d280 WHIRLPOOL 2fd2f3fbc8d1eb718d1d9d520e23ae48d571fafec61705002650169368d22750246fa1ed19b0670a0181c0a7409b767f184d5ca7a16144891ce6bb2dcc5eaf92
+EBUILD clang-5.0.9999.ebuild 9095 SHA256 8cd4cc1ac13fec543db64ab93df69fd0857ab2816410a80354d0882cd3525ec4 SHA512 564a721db6fc023e5a670fc5cb10467bc35c5195eedb4ba09240dcdfa1e84dd61409b086d407e855e1a03050577af6630215e40d9d28c625ee60911878358fb2 WHIRLPOOL 90791adee55818a03d9403573efa49729e20e005884daefa575a2101c29f88e8e865ae4679f4b88fc2e2bf82d14d8ff10445bc8defc38faeede2b072d21a9fb6
 EBUILD clang-9999.ebuild 8893 SHA256 0347d66fbdd794005447c8fb1875e96e90fe9a47559d372d15539620dee34bcd SHA512 84d827e53596b9a5d34185e8ca5335df8668b2cdda3f51810b24fe24a4ef509cdc09859b5fce682fdb9cc1a76c3f878b07b123ece6401038a2c4a5c2768cc8c2 WHIRLPOOL 37f8dc5ab38c0666391d9d625f94cc2d5e81399b301218d9531c9c4dbc179b2e4e6e07173b8ba0656b2159b6b827f2e1e6b8f9dfb3201447962d84650dca460a
 MISC ChangeLog 16828 SHA256 2c73f89e9b1b1f128aa6e6078ba05d23de1b926f52cf6c1658071635efa66bbb SHA512 7ea480154b342f96d8610a0becd2f48332609eba726ef33c913c65ceda9e5831566680f5b1228f705a1e7e4f78a7980519d3190aaa055c56fd346bca49ba669e WHIRLPOOL 1382f3943d43f12929b67c0a8807933b88d920ee75d01515de839689121153f99750b7de37986b0483bdcaebae3f20802f45a5c21eaa843cbf086e333a7940dd
 MISC ChangeLog-2015 22601 SHA256 3d7c0b50e6f54fa67374a5e53363c1557b36631daddb91bc8f4d4915cb0fee6f SHA512 4e9955602b26d91927115ef7f0017cf3223677cb4be6a046276a30d0b881d03045361d9a15f8a174c43f448ea09f0f0edc16e52b2718c0fdcfe328db705afc5c WHIRLPOOL 33a9711b3298387d125d3cb12cd9479d0df7d08bbb72225f9aa3aab1ecd1094026b743007c93a63241c3ba4b1ff5e0acbb25add109c6c535f8d74d6a5390f925
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
index 00c6e7371aec..1c7814d237e0 100644
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
 	cd - >/dev/null || die
 
 	# User patches
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/clang/clang-5.0.0.ebuild b/sys-devel/clang/clang-5.0.0.ebuild
index 9761120460e1..966aaf7df53d 100644
--- a/sys-devel/clang/clang-5.0.0.ebuild
+++ b/sys-devel/clang/clang-5.0.0.ebuild
@@ -101,7 +101,7 @@ src_prepare() {
 	cd - >/dev/null || die
 
 	# User patches
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild
index 82cff8b91407..b8bfe4b8916a 100644
--- a/sys-devel/clang/clang-5.0.9999.ebuild
+++ b/sys-devel/clang/clang-5.0.9999.ebuild
@@ -62,6 +62,11 @@ S=${WORKDIR}/x/y/${P}
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
+PATCHES=(
+	# fix finding compiler-rt libs
+	"${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
+)
+
 # Multilib notes:
 # 1. ABI_* flags control ABIs libclang* is built for only.
 # 2. clang is always capable of compiling code for all ABIs for enabled
@@ -101,19 +106,6 @@ src_unpack() {
 	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
 }
 
-src_prepare() {
-	# fix finding compiler-rt libs
-	eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
-
-	cd tools/extra || die
-	# fix stand-alone test build for extra tools
-	eapply "${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
-	cd - >/dev/null || die
-
-	# User patches
-	eapply_user
-}
-
 multilib_src_configure() {
 	local llvm_version=$(llvm-config --version) || die
 	local clang_version=$(ver_cut 1-3 "${llvm_version}")