Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 25 Jan 2016 14:09:24
Message-Id: 1453730825.e9a243610cb8184bfb8542d470cb38d917007039.kensington@gentoo
1 commit: e9a243610cb8184bfb8542d470cb38d917007039
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 25 14:04:12 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 25 14:07:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a24361
7
8 cmake-utils.eclass: ban WANT_CMAKE in EAPI 6 and later
9
10 It is basically unused across the tree and complicates the eclass. If it were
11 needed, it might be better to write custom ebuild phase functions instead.
12
13 eclass/cmake-utils.eclass | 3 +++
14 1 file changed, 3 insertions(+)
15
16 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
17 index aa73e44..32ce388 100644
18 --- a/eclass/cmake-utils.eclass
19 +++ b/eclass/cmake-utils.eclass
20 @@ -103,6 +103,8 @@ _CMAKE_UTILS_ECLASS=1
21 # This is useful when only part of application is using cmake build system.
22 # Valid values are: always [default], optional (where the value is the useflag
23 # used for optionality)
24 +#
25 +# This is banned in EAPI 6 and later.
26 : ${WANT_CMAKE:=always}
27
28 # @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE
29 @@ -125,6 +127,7 @@ case ${WANT_CMAKE} in
30 always)
31 ;;
32 *)
33 + has "${EAPI:-0}" 2 3 4 5 || die "WANT_CMAKE is banned in EAPI 6 and later"
34 IUSE+=" ${WANT_CMAKE}"
35 CMAKEDEPEND+="${WANT_CMAKE}? ( "
36 ;;