diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-13 16:38:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-13 16:38:56 +0100 |
| commit | ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (patch) | |
| tree | 2fdc433d571e3ead010876d43ce2646b7d783680 /eclass/kde5.eclass | |
| parent | 88ebe56470c37b02a044e1091cad6b2df0f3be8f (diff) | |
gentoo resync : 13.05.2018
Diffstat (limited to 'eclass/kde5.eclass')
| -rw-r--r-- | eclass/kde5.eclass | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 738020a3b4e0..b1a8b064b9bb 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 eutils 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 eutils ;; +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}" @@ -338,7 +342,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]? ) @@ -407,11 +411,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}" |