diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-12-04 21:21:06 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-12-04 21:21:06 +1100 |
| commit | 3c454f1fab9e64285b751039a4b4d4801095bb3a (patch) | |
| tree | bcc56544d142fd8e7fa37b0292c1cde16b4e464c /eclass/kde5-functions.eclass | |
| parent | 048036043d51a0fc18edf38f52336b1ffbec4c95 (diff) | |
| download | kde-3c454f1fab9e64285b751039a4b4d4801095bb3a.tar.gz kde-3c454f1fab9e64285b751039a4b4d4801095bb3a.tar.bz2 kde-3c454f1fab9e64285b751039a4b4d4801095bb3a.zip | |
[eclass] When using add_*_dep, automatically specify the correct SLOT.
Diffstat (limited to 'eclass/kde5-functions.eclass')
| -rw-r--r-- | eclass/kde5-functions.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 0a196a73140..d070993d6e0 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -87,7 +87,7 @@ _add_kdecategory_dep() { local package=${2} local use=${3} local version=${4} - local slot=${5} + local slot= if [[ -n ${use} ]] ; then local use="[${use}]" @@ -98,8 +98,8 @@ _add_kdecategory_dep() { local version="-${version}" fi - if [[ -n ${slot} ]] ; then - slot=":5" + if [[ ${SLOT} = 4 || ${SLOT} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then + slot=":${SLOT}" fi echo " ${operator}${category}/${package}${version}${slot}${use}" @@ -157,7 +157,7 @@ add_kdeapps_dep() { version=${PV} fi - _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}" "" + _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}" } # @FUNCTION: add_kdebase_dep |