From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B4DD138330 for ; Sun, 27 May 2018 08:44:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FD42E0957; Sun, 27 May 2018 08:44:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3652BE0957 for ; Sun, 27 May 2018 08:44:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94D3B335CBE for ; Sun, 27 May 2018 08:44:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B20C27A for ; Sun, 27 May 2018 08:44:33 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1527410652.b6c48cc0aae681ff9b5e9e67398002408dbc3fe5.johu@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: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: b6c48cc0aae681ff9b5e9e67398002408dbc3fe5 X-VCS-Branch: master Date: Sun, 27 May 2018 08:44:33 +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: 70f84593-c54c-4c06-a769-891a1721159e X-Archives-Hash: c6fa1ea55a48d25de0042a8adec59e9f commit: b6c48cc0aae681ff9b5e9e67398002408dbc3fe5 Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Sun May 27 08:16:41 2018 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun May 27 08:44:12 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b6c48cc0 cmake-utils.eclass: Fix usage of has_version. has_version has no output, and its result is provided by exit status. Fixes: a8d5b1da360ab6e7a09bceda8a34d37e2182b963 eclass/cmake-utils.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 3d571fef08..a9bafef264 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -521,14 +521,14 @@ cmake-utils_src_configure() { # we need to add "" local includes= - local has_cmake_340= + local has_cmake_3_4_0=false case ${EAPI} in 5|6) - has_cmake_34=$(ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1) - ;; + ROOT=/ has_version ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true + ;; *) - has_cmake_34=$(has_version -b \>=dev-util/cmake-3.4.0_rc1) - ;; + has_version -b ">=dev-util/cmake-3.4.0_rc1" && has_cmake_3_4_0=true + ;; esac @@ -536,7 +536,7 @@ cmake-utils_src_configure() { if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then includes="" fi - elif [[ ${has_cmake_340} ]]; then + elif ${has_cmake_3_4_0}; then includes="" fi cat > "${build_rules}" <<- _EOF_ || die