commit: bae217db1cc8a57c51fe7691510dbb447669ad7f
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 21:15:46 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 12 00:49:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae217db
qt5-build.eclass: switch to eapi7-ver.eclass
eclass/qt5-build.eclass | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b381c28495c..e3c501787b1 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -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)
