[gentoo-commits] proj/kde:master commit in: eclass/

[Andreas Sturmlechner]

commit:     9aba5b04a031ec120d8e42c2accfa4f69a9c36a0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  6 21:35:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar  6 22:10:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9aba5b04

kde5.eclass: versionator -> eapi7-ver

 eclass/kde5.eclass | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 51fe304f2b..434ee7ec0a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -31,7 +31,11 @@ _KDE5_ECLASS=1
 # for tests you should proceed with setting VIRTUALX_REQUIRED=test.
 : ${VIRTUALX_REQUIRED:=manual}
 
-inherit cmake-utils flag-o-matic gnome2-utils kde5-functions versionator 
virtualx xdg
+inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg
+
+case ${EAPI} in
+       6) inherit eapi7-ver ;;
+esac
 
 if [[ ${KDE_BUILD_TYPE} = live ]]; then
        case ${KDE_SCM} in
@@ -180,7 +184,7 @@ case ${KDE_SUBSLOT} in
                        kde-frameworks | \
                        kde-plasma | \
                        kde-apps)
-                               SLOT+="/$(get_version_component_range 1-2)"
+                               SLOT+="/$(ver_cut 1-2)"
                                ;;
                        *)
                                SLOT+="/${PV}"
@@ -341,7 +345,7 @@ _calculate_src_uri() {
                kde-frameworks)
                        
SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;;
                kde-plasma)
-                       local plasmapv=$(get_version_component_range 1-3)
+                       local plasmapv=$(ver_cut 1-3)
 
                        case ${PV} in
                                5.?.[6-9]? | 5.??.[6-9]? )
@@ -410,11 +414,11 @@ _calculate_live_repo() {
                        fi
 
                        if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps 
]]; then
-                               
EGIT_BRANCH="Applications/$(get_version_component_range 1-2)"
+                               EGIT_BRANCH="Applications/$(ver_cut 1-2)"
                        fi
 
                        if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
-                               
EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)"
+                               EGIT_BRANCH="Plasma/$(ver_cut 1-2)"
                        fi
 
                        EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"