sys-devel/clang: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
index 00c6e7371aec4334c41af06a9d50cee8399fa58d..1c7814d237e003fe63dad534f9fed73398afae64 100644 (file)
--- 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 9761120460e17b902f3041d35af767fde3f0be2b..966aaf7df53df6c943221b1bee11022536394443 100644 (file)
--- 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 82f086b4918bb766390aaf92df222e5eff714ca5..b8bfe4b8916aee7e975838e5ac47f3ab75016650 100644 (file)
--- 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,14 +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
-
-       # User patches
-       eapply_user
-}
-
 multilib_src_configure() {
        local llvm_version=$(llvm-config --version) || die
        local clang_version=$(ver_cut 1-3 "${llvm_version}")