[gentoo-commits] proj/kde:master commit in: eclass/

[Michael Palimaka]

commit:     27d9b2c35be819c77cc42edea9f894a4ef04782b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 11:48:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 11:48:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=27d9b2c3

cmake-utils.eclass: ban helper functions in EAPI 6 and later

 eclass/cmake-utils.eclass | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index ee6098e..0190ae4 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -161,6 +161,11 @@ unset CMAKEDEPEND
 _use_me_now() {
        debug-print-function ${FUNCNAME} "$@"
 
+       local arg=$2
+       [[ ! -z $3 ]] && arg=$3
+
+       has "${EAPI:-0}" 2 3 4 5 || die "${FUNCNAME[1]} is banned in EAPI 6 and 
later: use -D$1${arg}=\"\$(usex $2)\" instead"
+
        local uper capitalised x
        [[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
        if [[ ! -z $3 ]]; then
@@ -178,6 +183,13 @@ _use_me_now() {
 _use_me_now_inverted() {
        debug-print-function ${FUNCNAME} "$@"
 
+       local arg=$2
+       [[ ! -z $3 ]] && arg=$3
+
+       if ! has "${EAPI:-0}" 2 3 4 5 && [[ "${FUNCNAME[1]}" != 
cmake-utils_use_find_package ]] ; then
+               die "${FUNCNAME[1]} is banned in EAPI 6 and later: use 
-D$1${arg}=\"\$(usex $2)\" insteadss"
+       fi
+
        local uper capitalised x
        [[ -z $2 ]] && die "cmake-utils_use-$1 <USE flag> [<flag name>]"
        if [[ ! -z $3 ]]; then