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 C98D91384B4 for ; Wed, 18 Nov 2015 17:46:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8373E0855; Wed, 18 Nov 2015 17:46:31 +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 5F5C5E0855 for ; Wed, 18 Nov 2015 17:46:31 +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 8AAD1340821 for ; Wed, 18 Nov 2015 17:46:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 830071A8 for ; Wed, 18 Nov 2015 17:46:26 +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: <1447868642.edc5db6221dae6af6ddbea71ae9b36756e634f1f.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: edc5db6221dae6af6ddbea71ae9b36756e634f1f X-VCS-Branch: master Date: Wed, 18 Nov 2015 17:46:26 +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: 215d6286-9e48-4f99-a859-4d6b70bfb9d2 X-Archives-Hash: f683b3070df4e56a34af9b14b9f80adf commit: edc5db6221dae6af6ddbea71ae9b36756e634f1f Author: Michael Palimaka gentoo org> AuthorDate: Wed Nov 18 17:44:00 2015 +0000 Commit: Michael Palimaka gentoo 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[@]}")