gnome.org.eclass: use eapi7-ver
authorMarty E. Plummer <hanetzer@startmail.com>
Tue, 1 Jan 2019 22:18:58 +0000 (16:18 -0600)
committerMart Raudsepp <leio@gentoo.org>
Mon, 11 Feb 2019 17:13:51 +0000 (19:13 +0200)
Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
eclass/gnome.org.eclass

index 6b2ae672a2d4bc9f548817970c1eaf78d329a6e7..f41646749a07bb9b85b23443334bad20f42e13c1 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: gnome.org.eclass
@@ -11,7 +11,7 @@
 # @DESCRIPTION:
 # Provide a default SRC_URI for tarball hosted on gnome.org mirrors.
 
-inherit versionator
+[[ ${EAPI} == [0123456] ]] && inherit eapi7-ver
 
 # @ECLASS-VARIABLE: GNOME_TARBALL_SUFFIX
 # @DESCRIPTION:
@@ -41,7 +41,7 @@ fi
 # @INTERNAL
 # @DESCRIPTION:
 # Major and minor numbers of the version number.
-: ${GNOME_ORG_PVP:=$(get_version_component_range 1-2)}
+: ${GNOME_ORG_PVP:=$(ver_cut 1-2)}
 
 SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}"