| 1 |
commit: c5764a1a9654b008329dbf4355b5ef2482c8bc63 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 28 11:48:39 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 28 11:48:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5764a1a |
| 7 |
|
| 8 |
kde5-functions.eclass: Pin down Plasma 5.8 LTS deps to LTS versions |
| 9 |
|
| 10 |
eclass/kde5-functions.eclass | 27 +++++++++++++++++++-------- |
| 11 |
1 file changed, 19 insertions(+), 8 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 14 |
index d187f54283..b255cc88e6 100644 |
| 15 |
--- a/eclass/kde5-functions.eclass |
| 16 |
+++ b/eclass/kde5-functions.eclass |
| 17 |
@@ -142,16 +142,23 @@ _add_category_dep() { |
| 18 |
local category=${1} |
| 19 |
local package=${2} |
| 20 |
local use=${3} |
| 21 |
- local version=${4} |
| 22 |
- local slot=${5} |
| 23 |
+ local operator=${4} |
| 24 |
+ local version=${5} |
| 25 |
+ local slot=${6} |
| 26 |
|
| 27 |
if [[ -n ${use} ]] ; then |
| 28 |
local use="[${use}]" |
| 29 |
fi |
| 30 |
|
| 31 |
if [[ -n ${version} ]] ; then |
| 32 |
- local operator=">=" |
| 33 |
- local version="-$(get_version_component_range 1-3 ${version})" |
| 34 |
+ if [[ -z ${operator} ]] ; then |
| 35 |
+ operator=">=" |
| 36 |
+ fi |
| 37 |
+ if [[ ${operator} = ">=" ]] ; then |
| 38 |
+ version="-$(get_version_component_range 1-3 ${version})" |
| 39 |
+ else |
| 40 |
+ version="-${version}" |
| 41 |
+ fi |
| 42 |
fi |
| 43 |
|
| 44 |
if [[ -n ${slot} ]] ; then |
| 45 |
@@ -192,7 +199,7 @@ add_frameworks_dep() { |
| 46 |
version=${FRAMEWORKS_MINIMAL} |
| 47 |
fi |
| 48 |
|
| 49 |
- _add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}" |
| 50 |
+ _add_category_dep kde-frameworks "${1}" "${2}" "" "${version}" "${4}" |
| 51 |
} |
| 52 |
|
| 53 |
# @FUNCTION: add_plasma_dep |
| 54 |
@@ -214,17 +221,21 @@ add_plasma_dep() { |
| 55 |
die "${FUNCNAME} was called with too many arguments" |
| 56 |
fi |
| 57 |
|
| 58 |
+ local operator |
| 59 |
local version |
| 60 |
|
| 61 |
if [[ -n ${3} ]]; then |
| 62 |
version=${3} |
| 63 |
elif [[ ${CATEGORY} = kde-plasma ]]; then |
| 64 |
version=${PV} |
| 65 |
+ if [[ ${PV} = 5.8* ]] ; then |
| 66 |
+ operator="~" |
| 67 |
+ fi |
| 68 |
elif [[ -z "${version}" ]] ; then |
| 69 |
version=${PLASMA_MINIMAL} |
| 70 |
fi |
| 71 |
|
| 72 |
- _add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}" |
| 73 |
+ _add_category_dep kde-plasma "${1}" "${2}" "${operator}" "${version}" "${4}" |
| 74 |
} |
| 75 |
|
| 76 |
# @FUNCTION: add_kdeapps_dep |
| 77 |
@@ -261,7 +272,7 @@ add_kdeapps_dep() { |
| 78 |
fi |
| 79 |
fi |
| 80 |
|
| 81 |
- _add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}" |
| 82 |
+ _add_category_dep kde-apps "${1}" "${2}" "" "${version}" "${4}" |
| 83 |
} |
| 84 |
|
| 85 |
# @FUNCTION: add_qt_dep |
| 86 |
@@ -296,7 +307,7 @@ add_qt_dep() { |
| 87 |
slot="5" |
| 88 |
fi |
| 89 |
|
| 90 |
- _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" |
| 91 |
+ _add_category_dep dev-qt "${1}" "${2}" "" "${version}" "${slot}" |
| 92 |
} |
| 93 |
|
| 94 |
# @FUNCTION: get_kde_version |
Archives