Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Wed, 05 Feb 2014 14:07:32
Message-Id: 1391609115.284fb39ac904067620114bf267b6816fe6ea18b3.kensington@gentoo
1 commit: 284fb39ac904067620114bf267b6816fe6ea18b3
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 5 14:05:15 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 5 14:05:15 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=284fb39a
7
8 [eclass] Simply supported EAPI logic.
9
10 ---
11 eclass/cmake-utils.eclass | 9 ++++-----
12 1 file changed, 4 insertions(+), 5 deletions(-)
13
14 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
15 index e74ce50..b72454b 100644
16 --- a/eclass/cmake-utils.eclass
17 +++ b/eclass/cmake-utils.eclass
18 @@ -68,13 +68,12 @@ case ${WANT_CMAKE} in
19 esac
20 inherit toolchain-funcs multilib flag-o-matic eutils
21
22 -CMAKE_EXPF="src_compile src_test src_install"
23 case ${EAPI:-0} in
24 - 2|3|4|5) CMAKE_EXPF+=" src_prepare src_configure" ;;
25 - 1|0) eerror "cmake-utils no longer supports EAPI 0-1." && die
26 - ;;
27 - *) die "Unknown EAPI, bug eclass maintainers." ;;
28 + 2|3|4|5) : ;;
29 + *) die "EAPI=${EAPI} is not supported" ;;
30 esac
31 +
32 +CMAKE_EXPF="src_prepare src_configure src_compile src_test src_install"
33 EXPORT_FUNCTIONS ${CMAKE_EXPF}
34
35 case ${CMAKE_MAKEFILE_GENERATOR} in