cmake-utils.eclass: Switch to eapi7-ver

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 3302f27608b3eb6c53992fb2c25f1ce2a8e6d213..cbce280625ef2b8911c5ac6232b1bfe517e74d17 100644 (file)
--- 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 $(version_is_at_least 3.4.0 $(ver_cut 1-3 ${PV})) ; then
                        includes="<INCLUDES>"
                fi
        elif ROOT=/ has_version \>=dev-util/cmake-3.4.0_rc1 ; then