Gentoo Archives: gentoo-commits

From: Maciej Mrozowski <reavertm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Thu, 04 Aug 2016 23:58:52
Message-Id: 1470355090.5a4dfd12ba10bec7ebfaaef73fcd14e31fe6d9f1.reavertm@gentoo
1 commit: 5a4dfd12ba10bec7ebfaaef73fcd14e31fe6d9f1
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 4 23:41:32 2016 +0000
4 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 4 23:58:10 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5a4dfd12
7
8 cmake-utils.eclass: Expand suggestion related to functions banned EAPI 6
9
10 eclass/cmake-utils.eclass | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
14 index 4bd404d..6363d31 100644
15 --- a/eclass/cmake-utils.eclass
16 +++ b/eclass/cmake-utils.eclass
17 @@ -161,7 +161,7 @@ _cmake_use_me_now() {
18 local arg=$2
19 [[ ! -z $3 ]] && arg=$3
20
21 - [[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later"
22 + [[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
23
24 local uper capitalised x
25 [[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
26 @@ -184,7 +184,7 @@ _cmake_use_me_now_inverted() {
27 [[ ! -z $3 ]] && arg=$3
28
29 if [[ ${EAPI} != [2345] && "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then
30 - die "${FUNCNAME[1]} is banned in EAPI 6 and later"
31 + die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1<related_CMake_variable>=\"\$(usex $2)\" instead"
32 fi
33
34 local uper capitalised x