| 1 |
commit: ebabacb20f7f8909ab2f895b593714baf04df93d |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 6 21:28:50 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=ebabacb2 |
| 7 |
|
| 8 |
kde5-functions.eclass: versionator -> eapi7-ver |
| 9 |
|
| 10 |
eclass/kde5-functions.eclass | 16 ++++++++-------- |
| 11 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 14 |
index 4435b09f69d..0fbff9846a6 100644 |
| 15 |
--- a/eclass/kde5-functions.eclass |
| 16 |
+++ b/eclass/kde5-functions.eclass |
| 17 |
@@ -15,10 +15,10 @@ |
| 18 |
if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then |
| 19 |
_KDE5_FUNCTIONS_ECLASS=1 |
| 20 |
|
| 21 |
-inherit toolchain-funcs versionator |
| 22 |
+inherit toolchain-funcs |
| 23 |
|
| 24 |
case ${EAPI} in |
| 25 |
- 6) ;; |
| 26 |
+ 6) inherit eapi7-ver ;; |
| 27 |
*) die "EAPI=${EAPI:-0} is not supported" ;; |
| 28 |
esac |
| 29 |
|
| 30 |
@@ -185,7 +185,7 @@ add_frameworks_dep() { |
| 31 |
if [[ -n ${3} ]]; then |
| 32 |
version=${3} |
| 33 |
elif [[ ${CATEGORY} = kde-frameworks ]]; then |
| 34 |
- version=$(get_version_component_range 1-2) |
| 35 |
+ version=$(ver_cut 1-2) |
| 36 |
elif [[ -z ${3} ]] ; then |
| 37 |
version=${FRAMEWORKS_MINIMAL} |
| 38 |
fi |
| 39 |
@@ -217,7 +217,7 @@ add_plasma_dep() { |
| 40 |
if [[ -n ${3} ]]; then |
| 41 |
version=${3} |
| 42 |
elif [[ ${CATEGORY} = kde-plasma ]]; then |
| 43 |
- version=$(get_version_component_range 1-3) |
| 44 |
+ version=$(ver_cut 1-3) |
| 45 |
elif [[ -z ${3} ]] ; then |
| 46 |
version=${PLASMA_MINIMAL} |
| 47 |
fi |
| 48 |
@@ -249,7 +249,7 @@ add_kdeapps_dep() { |
| 49 |
if [[ -n ${3} ]]; then |
| 50 |
version=${3} |
| 51 |
elif [[ ${CATEGORY} = kde-apps ]]; then |
| 52 |
- version=$(get_version_component_range 1-3) |
| 53 |
+ version=$(ver_cut 1-3) |
| 54 |
elif [[ -z ${3} ]] ; then |
| 55 |
version=${KDE_APPS_MINIMAL} |
| 56 |
fi |
| 57 |
@@ -302,9 +302,9 @@ add_qt_dep() { |
| 58 |
# If no version is specified, ${PV} is used. |
| 59 |
get_kde_version() { |
| 60 |
local ver=${1:-${PV}} |
| 61 |
- local major=$(get_major_version ${ver}) |
| 62 |
- local minor=$(get_version_component_range 2 ${ver}) |
| 63 |
- local micro=$(get_version_component_range 3 ${ver}) |
| 64 |
+ local major=$(ver_cut 1 ${ver}) |
| 65 |
+ local minor=$(ver_cut 2 ${ver}) |
| 66 |
+ local micro=$(ver_cut 3 ${ver}) |
| 67 |
if [[ ${ver} == 9999 ]]; then |
| 68 |
echo live |
| 69 |
else |
Archives