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

[Johannes Huber]

commit:     b6c48cc0aae681ff9b5e9e67398002408dbc3fe5
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun May 27 08:16:41 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> 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 "<INCLUDES>"
 	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="<INCLUDES>"
 		fi
-	elif [[ ${has_cmake_340} ]]; then
+	elif ${has_cmake_3_4_0}; then
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die