| 1 |
commit: 6946849996bff6f4567158fae040a13045713772 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 6 21:35:19 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 12 14:01:17 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69468499 |
| 7 |
|
| 8 |
kde5.eclass: versionator -> eapi7-ver |
| 9 |
|
| 10 |
eclass/kde5.eclass | 14 +++++++++----- |
| 11 |
1 file changed, 9 insertions(+), 5 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 14 |
index 738020a3b4e..681066c3caa 100644 |
| 15 |
--- a/eclass/kde5.eclass |
| 16 |
+++ b/eclass/kde5.eclass |
| 17 |
@@ -31,7 +31,11 @@ _KDE5_ECLASS=1 |
| 18 |
# for tests you should proceed with setting VIRTUALX_REQUIRED=test. |
| 19 |
: ${VIRTUALX_REQUIRED:=manual} |
| 20 |
|
| 21 |
-inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg |
| 22 |
+inherit cmake-utils eutils flag-o-matic gnome2-utils kde5-functions virtualx xdg |
| 23 |
+ |
| 24 |
+case ${EAPI} in |
| 25 |
+ 6) inherit eapi7-ver ;; |
| 26 |
+esac |
| 27 |
|
| 28 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 29 |
case ${KDE_SCM} in |
| 30 |
@@ -180,7 +184,7 @@ case ${KDE_SUBSLOT} in |
| 31 |
kde-frameworks | \ |
| 32 |
kde-plasma | \ |
| 33 |
kde-apps) |
| 34 |
- SLOT+="/$(get_version_component_range 1-2)" |
| 35 |
+ SLOT+="/$(ver_cut 1-2)" |
| 36 |
;; |
| 37 |
*) |
| 38 |
SLOT+="/${PV}" |
| 39 |
@@ -338,7 +342,7 @@ _calculate_src_uri() { |
| 40 |
kde-frameworks) |
| 41 |
SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;; |
| 42 |
kde-plasma) |
| 43 |
- local plasmapv=$(get_version_component_range 1-3) |
| 44 |
+ local plasmapv=$(ver_cut 1-3) |
| 45 |
|
| 46 |
case ${PV} in |
| 47 |
5.?.[6-9]? | 5.??.[6-9]? ) |
| 48 |
@@ -407,11 +411,11 @@ _calculate_live_repo() { |
| 49 |
fi |
| 50 |
|
| 51 |
if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then |
| 52 |
- EGIT_BRANCH="Applications/$(get_version_component_range 1-2)" |
| 53 |
+ EGIT_BRANCH="Applications/$(ver_cut 1-2)" |
| 54 |
fi |
| 55 |
|
| 56 |
if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then |
| 57 |
- EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)" |
| 58 |
+ EGIT_BRANCH="Plasma/$(ver_cut 1-2)" |
| 59 |
fi |
| 60 |
|
| 61 |
EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}" |
Archives