| 1 |
commit: 54f1b16262cee137d0efd1d4f3e56e05cda48260 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 25 15:41:53 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 25 15:50:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=54f1b162 |
| 7 |
|
| 8 |
kde5-functions.eclass: Fix default version handling |
| 9 |
|
| 10 |
- don't cut off version components in add_category_dep, instead do it |
| 11 |
in add_plasma_dep and add_kdeapps_dep |
| 12 |
|
| 13 |
eclass/kde5-functions.eclass | 19 ++++++++----------- |
| 14 |
1 file changed, 8 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 17 |
index 0b49851f45..95eac433ab 100644 |
| 18 |
--- a/eclass/kde5-functions.eclass |
| 19 |
+++ b/eclass/kde5-functions.eclass |
| 20 |
@@ -141,7 +141,7 @@ _add_category_dep() { |
| 21 |
|
| 22 |
if [[ -n ${version} ]] ; then |
| 23 |
local operator=">=" |
| 24 |
- local version="-$(get_version_component_range 1-3 ${version})" |
| 25 |
+ local version="-${version}" |
| 26 |
fi |
| 27 |
|
| 28 |
if [[ -n ${slot} ]] ; then |
| 29 |
@@ -178,7 +178,7 @@ add_frameworks_dep() { |
| 30 |
version=${3} |
| 31 |
elif [[ ${CATEGORY} = kde-frameworks ]]; then |
| 32 |
version=$(get_version_component_range 1-2) |
| 33 |
- elif [[ -z "${version}" ]] ; then |
| 34 |
+ elif [[ -z ${3} ]] ; then |
| 35 |
version=${FRAMEWORKS_MINIMAL} |
| 36 |
fi |
| 37 |
|
| 38 |
@@ -209,8 +209,8 @@ add_plasma_dep() { |
| 39 |
if [[ -n ${3} ]]; then |
| 40 |
version=${3} |
| 41 |
elif [[ ${CATEGORY} = kde-plasma ]]; then |
| 42 |
- version=${PV} |
| 43 |
- elif [[ -z "${version}" ]] ; then |
| 44 |
+ version=$(get_version_component_range 1-3) |
| 45 |
+ elif [[ -z ${3} ]] ; then |
| 46 |
version=${PLASMA_MINIMAL} |
| 47 |
fi |
| 48 |
|
| 49 |
@@ -241,8 +241,8 @@ add_kdeapps_dep() { |
| 50 |
if [[ -n ${3} ]]; then |
| 51 |
version=${3} |
| 52 |
elif [[ ${CATEGORY} = kde-apps ]]; then |
| 53 |
- version=${PV} |
| 54 |
- elif [[ -z "${version}" ]] ; then |
| 55 |
+ version=$(get_version_component_range 1-3) |
| 56 |
+ elif [[ -z ${3} ]] ; then |
| 57 |
version=${KDE_APPS_MINIMAL} |
| 58 |
fi |
| 59 |
|
| 60 |
@@ -268,15 +268,12 @@ add_qt_dep() { |
| 61 |
die "${FUNCNAME} was called with too many arguments" |
| 62 |
fi |
| 63 |
|
| 64 |
- local version |
| 65 |
+ local version=${3} |
| 66 |
local slot=${4} |
| 67 |
|
| 68 |
- if [[ -n ${3} ]]; then |
| 69 |
- version=${3} |
| 70 |
- elif [[ -z "${version}" ]]; then |
| 71 |
+ if [[ -z ${version} ]]; then |
| 72 |
version=${QT_MINIMAL} |
| 73 |
fi |
| 74 |
- |
| 75 |
if [[ -z ${slot} ]]; then |
| 76 |
slot="5" |
| 77 |
fi |
Archives