From 97967bbbae8f43c98315b079178f1717f130e302 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 19 May 2018 13:06:44 +0100
Subject: gentoo resync : 19.05.2018

---
 eclass/cmake-utils.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'eclass/cmake-utils.eclass')

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 3302f27608b3..558ff3a1ef9b 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -109,11 +109,11 @@ case ${EAPI} in
 	*) die "EAPI=${EAPI:-0} is not supported" ;;
 esac
 
-inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing versionator xdg-utils
+inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
 
 case ${EAPI} in
 	7) ;;
-	*) inherit eutils multilib ;;
+	*) inherit eapi7-ver eutils multilib ;;
 esac
 
 EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
@@ -512,7 +512,7 @@ cmake-utils_src_configure() {
 	# we need to add "<INCLUDES>"
 	local includes=
 	if [[ ${PN} == cmake ]] ; then
-		if $(version_is_at_least 3.4.0 $(get_version_component_range 1-3 ${PV})) ; then
+		if $(ver_test $(ver_cut 1-3 ${PV}) -ge 3.4.0) ; then
 			includes="<INCLUDES>"
 		fi
 	elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then
-- 
cgit v1.2.3