[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     95319bfc481d1f5e69738aa69a1cce005d1dd91d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 09:35:33 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 09:35:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=95319bfc

cmake-utils.eclass: use default_src_prepare in EAPI 6 and later

 eclass/cmake-utils.eclass | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 82e2f19..f6bb9dd 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -426,13 +426,18 @@ enable_cmake-utils_src_prepare() {
 
        pushd "${S}" > /dev/null || die
 
-       has "${EAPI:-0}" 6 && _cleanup_cmake
+       if has "${EAPI:-0}" 6 ; then
+               _cleanup_cmake
+               default_src_prepare
+       fi
 
-       debug-print "$FUNCNAME: PATCHES=$PATCHES"
-       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+       if has "${EAPI:-0}" 2 3 4 5 ; then
+               debug-print "$FUNCNAME: PATCHES=$PATCHES"
+               [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
 
-       debug-print "$FUNCNAME: applying user patches"
-       epatch_user
+               debug-print "$FUNCNAME: applying user patches"
+               epatch_user
+       fi
 
        popd > /dev/null || die
 }