Gentoo Archives: gentoo-dev

From: Michael Palimaka <kensington@g.o>
To: gentoo-dev@l.g.o
Cc: Michael Palimaka <kensington@g.o>
Subject: [gentoo-dev] [PATCH 11/15] cmake-utils.eclass: use default_src_prepare in EAPI 6 and later
Date: Wed, 20 Jan 2016 10:51:35
Message-Id: 1453286593-26823-12-git-send-email-kensington@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/15] EAPI 6 support for cmake-utils.eclas by Michael Palimaka
1 ---
2 eclass/cmake-utils.eclass | 15 +++++++++------
3 1 file changed, 9 insertions(+), 6 deletions(-)
4
5 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
6 index e6d77ef..51da1c0 100644
7 --- a/eclass/cmake-utils.eclass
8 +++ b/eclass/cmake-utils.eclass
9 @@ -438,13 +438,16 @@ enable_cmake-utils_src_prepare() {
10
11 pushd "${S}" > /dev/null || die
12
13 - has "${EAPI:-0}" 6 && _cmake_cleanup_cmake
14 -
15 - debug-print "$FUNCNAME: PATCHES=$PATCHES"
16 - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
17 + if ! has "${EAPI:-0}" 2 3 4 5 ; then
18 + default_src_prepare
19 + _cmake_cleanup_cmake
20 + else
21 + debug-print "$FUNCNAME: PATCHES=$PATCHES"
22 + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
23
24 - debug-print "$FUNCNAME: applying user patches"
25 - epatch_user
26 + debug-print "$FUNCNAME: applying user patches"
27 + epatch_user
28 + fi
29
30 popd > /dev/null || die
31 }
32 --
33 2.4.10