[gentoo-commits] repo/gentoo:master commit in: eclass/

[Justin Lecher]

commit:     56f8075e23d42eba53c4b3d2561eb8950f2a98ec
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 07:50:20 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 07:51:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f8075e

cmake-utils.eclass: Merge consecutive [[ ]] into single [[ ]]

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 eclass/cmake-utils.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 99c0f76..a5704c1 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -185,7 +185,7 @@ _cmake_use_me_now_inverted() {
        local arg=$2
        [[ ! -z $3 ]] && arg=$3
 
-       if [[ ${EAPI} != [2345] ]] && [[ "${FUNCNAME[1]}" != 
cmake-utils_use_find_package ]] ; then
+       if [[ ${EAPI} != [2345] && "${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
 
@@ -314,7 +314,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; 
}
 # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is 
disabled.
 # This can be used to make find_package optional.
 cmake-utils_use_find_package() {
-       if [[ ${EAPI} != [2345] ]] && [[ "$#" != 2 ]] ; then
+       if [[ ${EAPI} != [2345] && "$#" != 2 ]] ; then
                die "Usage: cmake-utils_use_find_package <USE flag> <package 
name>"
        fi