diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde5-functions.eclass | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index e52e9ea3cbf..564dce81c42 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -86,24 +86,18 @@ _add_kdecategory_dep() { local category=${1} local package=${2} local use=${3} - local minversion=${4} - local version + local version=${4} - if [[ -n ${minversion} ]]; then - version=${minversion} - # if building stable-live version depend just on the raw KDE version - # to allow merging packages against more stable basic stuff - elif [[ ${PV} == *.9999 ]]; then - version=$(get_kde_version) - else - version=${PV} + if [[ -n ${use} ]] ; then + local use="[${use}]" fi - if [[ -n ${use} ]] ; then - usedep="[${use}]" + if [[ -n ${version} ]] ; then + local operator=">=" + local version="-${version}" fi - echo " >=${category}/${package}-${version}:5${usedep}" + echo " ${operator}${category}/${package}${version}:5${use}" } # @FUNCTION: add_frameworks_dep @@ -150,7 +144,15 @@ add_frameworks_dep() { add_kdebase_dep() { debug-print-function ${FUNCNAME} "$@" - _add_kdecategory_dep kde-base "${1}" "${2}" "${3}" + local version + + if [[ -n ${3} ]]; then + version=${3} + elif [[ ${CATEGORY} = kde-base ]]; then + version=${PV} + fi + + _add_kdecategory_dep kde-base "${1}" "${2}" "${version}" } # @FUNCTION: get_kde_version |