From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C825B58974 for ; Thu, 28 Jan 2016 16:30:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2CCF821C008; Thu, 28 Jan 2016 16:30:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F7D321C003 for ; Thu, 28 Jan 2016 16:30:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A844C340B55 for ; Thu, 28 Jan 2016 16:30:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 197AB8DE for ; Thu, 28 Jan 2016 16:30:47 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1453998626.62beda086e835d7f6f2d0e2176cd0cedb2e72e94.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 62beda086e835d7f6f2d0e2176cd0cedb2e72e94 X-VCS-Branch: master Date: Thu, 28 Jan 2016 16:30:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ebb7dc96-224e-4a5f-815e-e36e3fbb2523 X-Archives-Hash: 7293bd8729a8ab069edfe454fa83c8de commit: 62beda086e835d7f6f2d0e2176cd0cedb2e72e94 Author: Justin Lecher gentoo org> AuthorDate: Thu Jan 28 07:50:20 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Jan 28 16:30:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=62beda08 cmake-utils.eclass: Merge consecutive [[ ]] into single [[ ]] 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 " fi