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

[Michael Palimaka]

commit:     edc5db6221dae6af6ddbea71ae9b36756e634f1f
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 17:44:00 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 17:44:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=edc5db62

cmake-utils.eclass: don't warn about deprecated usage when not defined

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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 2b858cc..df7d643 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -573,8 +573,11 @@ enable_cmake-utils_src_configure() {
        # Convert mycmakeargs to an array, for backwards compatibility
        # Make the array a local variable since <=portage-2.1.6.x does not
        # support global arrays (see bug #297255).
-       if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; 
then
-               eqawarn "Declaring mycmakeargs as a variable is deprecated. 
Please use an array instead."
+       local mycmakeargstype=$(declare -p mycmakeargs 2>&-)
+       if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then
+               if [[ -n "${mycmakeargstype}" ]] ; then
+                       eqawarn "Declaring mycmakeargs as a variable is 
deprecated. Please use an array instead."
+               fi
                local mycmakeargs_local=(${mycmakeargs})
        else
                local mycmakeargs_local=("${mycmakeargs[@]}")