diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-25 17:41:53 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-26 10:22:31 +0200 |
| commit | 3ee0e26843b1a85d36e19572612efca1ee5ae739 (patch) | |
| tree | 8f3e35e5a87acda6efdc96ee54e499671688e54c /eclass | |
| parent | kde5-functions.eclass: improve documentation (diff) | |
| download | gentoo-3ee0e26843b1a85d36e19572612efca1ee5ae739.tar.gz gentoo-3ee0e26843b1a85d36e19572612efca1ee5ae739.tar.bz2 gentoo-3ee0e26843b1a85d36e19572612efca1ee5ae739.zip | |
kde5-functions.eclass: Fix default version handling
- don't cut off version components in add_category_dep, instead do it
in add_plasma_dep and add_kdeapps_dep
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde5-functions.eclass | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index fca63e07507d..47e1e969b42d 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -142,7 +142,7 @@ _add_category_dep() { if [[ -n ${version} ]] ; then local operator=">=" - local version="-$(get_version_component_range 1-3 ${version})" + local version="-${version}" fi if [[ -n ${slot} ]] ; then @@ -179,7 +179,7 @@ add_frameworks_dep() { version=${3} elif [[ ${CATEGORY} = kde-frameworks ]]; then version=$(get_version_component_range 1-2) - elif [[ -z "${version}" ]] ; then + elif [[ -z ${3} ]] ; then version=${FRAMEWORKS_MINIMAL} fi @@ -210,8 +210,8 @@ add_plasma_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-plasma ]]; then - version=${PV} - elif [[ -z "${version}" ]] ; then + version=$(get_version_component_range 1-3) + elif [[ -z ${3} ]] ; then version=${PLASMA_MINIMAL} fi @@ -242,8 +242,8 @@ add_kdeapps_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-apps ]]; then - version=${PV} - elif [[ -z "${version}" ]] ; then + version=$(get_version_component_range 1-3) + elif [[ -z ${3} ]] ; then version=${KDE_APPS_MINIMAL} fi @@ -269,15 +269,12 @@ add_qt_dep() { die "${FUNCNAME} was called with too many arguments" fi - local version + local version=${3} local slot=${4} - if [[ -n ${3} ]]; then - version=${3} - elif [[ -z "${version}" ]]; then + if [[ -z ${version} ]]; then version=${QT_MINIMAL} fi - if [[ -z ${slot} ]]; then slot="5" fi |