Dnia 20 stycznia 2016 11:43:11 CET, Michael Palimaka <kensing...@gentoo.org> napisał(a): >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 960b34b..507d27d 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
I suggest making it more explicit what kind of helper functions are banned in the commit message. -- Best regards, Michał Górny (by phone)
