commit: e9116b1aebc819a10410960cbb4931aa5e399af1 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Mon Jan 25 14:04:15 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Mon Jan 25 14:07:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9116b1a
cmake-utils.eclass: ban helper functions in EAPI 6 and later The affected helpers are: * cmake-utils_use_build * cmake-utils_use_disable * cmake-utils_use_enable * cmake-utils_use_has * cmake-utils_use_no * cmake-utils_use_use * cmake-utils_use_want * cmake-utils_use_with * cmake-utils_use * cmake-utils_useno https://archives.gentoo.org/gentoo-dev/message/6ff6dedb44fff4289764dc5eb960e1c6 Gentoo-bug: 514384 eclass/cmake-utils.eclass | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 8ed1ce9..6ae357b 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -161,6 +161,11 @@ unset CMAKEDEPEND _cmake_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 @@ _cmake_use_me_now() { _cmake_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
