1 |
https://archives.gentoo.org/gentoo-dev/message/6ff6dedb44fff4289764dc5eb960e1c6 |
2 |
|
3 |
Gentoo-bug: 514384 |
4 |
--- |
5 |
eclass/cmake-utils.eclass | 12 ++++++++++++ |
6 |
1 file changed, 12 insertions(+) |
7 |
|
8 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
9 |
index 960b34b..507d27d 100644 |
10 |
--- a/eclass/cmake-utils.eclass |
11 |
+++ b/eclass/cmake-utils.eclass |
12 |
@@ -161,6 +161,11 @@ unset CMAKEDEPEND |
13 |
_cmake_use_me_now() { |
14 |
debug-print-function ${FUNCNAME} "$@" |
15 |
|
16 |
+ local arg=$2 |
17 |
+ [[ ! -z $3 ]] && arg=$3 |
18 |
+ |
19 |
+ has "${EAPI:-0}" 2 3 4 5 || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead" |
20 |
+ |
21 |
local uper capitalised x |
22 |
[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]" |
23 |
if [[ ! -z $3 ]]; then |
24 |
@@ -178,6 +183,13 @@ _cmake_use_me_now() { |
25 |
_cmake_use_me_now_inverted() { |
26 |
debug-print-function ${FUNCNAME} "$@" |
27 |
|
28 |
+ local arg=$2 |
29 |
+ [[ ! -z $3 ]] && arg=$3 |
30 |
+ |
31 |
+ if ! has "${EAPI:-0}" 2 3 4 5 && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then |
32 |
+ die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss" |
33 |
+ fi |
34 |
+ |
35 |
local uper capitalised x |
36 |
[[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]" |
37 |
if [[ ! -z $3 ]]; then |
38 |
-- |
39 |
2.4.10 |