qt5-build.eclass: switch to eapi7-ver.eclass
authorDavide Pesavento <pesa@gentoo.org>
Tue, 6 Mar 2018 21:15:46 +0000 (22:15 +0100)
committerMichael Palimaka <kensington@gentoo.org>
Mon, 12 Mar 2018 00:49:47 +0000 (11:49 +1100)
eclass/qt5-build.eclass

index b381c28495cbce3a2134816df2d7dbcfc07bb6f9..e3c501787b10c7ab9819f6b75f323f36659e5b4e 100644 (file)
@@ -13,7 +13,7 @@
 # Requires EAPI 6.
 
 if [[ ${CATEGORY} != dev-qt ]]; then
-       die "qt5-build.eclass is only to be used for building Qt 5."
+       die "qt5-build.eclass is only to be used for building Qt 5"
 fi
 
 case ${EAPI} in
@@ -57,15 +57,14 @@ esac
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit estack flag-o-matic ltprune toolchain-funcs versionator virtualx
+inherit eapi7-ver estack flag-o-matic ltprune toolchain-funcs virtualx
 
 HOMEPAGE="https://www.qt.io/"
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
-SLOT=5/$(get_version_component_range 1-2)
+SLOT=5/$(ver_cut 1-2)
 
-QT5_MINOR_VERSION=$(get_version_component_range 2)
-QT5_PATCH_VERSION=$(get_version_component_range 3)
-readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
+QT5_MINOR_VERSION=$(ver_cut 2)
+readonly QT5_MINOR_VERSION
 
 case ${PV} in
        5.9999)