diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-31 19:57:09 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-31 20:29:54 +0200 |
| commit | 22c71e550e6e12a20663047f8a80ac3bdf7ef3d5 (patch) | |
| tree | 2e37e415af07588feb34325fe49ad0a575606fa4 /eclass | |
| parent | profiles: use.desc: Add missing hal description (diff) | |
| download | kde-sunset-22c71e550e6e12a20663047f8a80ac3bdf7ef3d5.tar.gz kde-sunset-22c71e550e6e12a20663047f8a80ac3bdf7ef3d5.tar.bz2 kde-sunset-22c71e550e6e12a20663047f8a80ac3bdf7ef3d5.zip | |
kde4-functions-extra.eclass: Drop invalid aqua conditional
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-functions-extra.eclass | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/eclass/kde4-functions-extra.eclass b/eclass/kde4-functions-extra.eclass index 168bf432..a6ad8470 100644 --- a/eclass/kde4-functions-extra.eclass +++ b/eclass/kde4-functions-extra.eclass @@ -31,7 +31,11 @@ add_kdeplasma_dep() { debug-print-function ${FUNCNAME} "$@" local ver + local use=${2} + if [[ -n ${use} ]] ; then + use="[${use}]" + fi if [[ -n ${3} ]]; then ver=${3} elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then @@ -49,9 +53,7 @@ add_kdeplasma_dep() { [[ -z ${1} ]] && die "Missing parameter" - #FIXME - # Drop aqua= from kf5 packages - echo " >=kde-plasma/${1}-${ver}:4[aqua=${2:+,${2}}]" + echo " >=kde-plasma/${1}-${ver}:4${use}" } # @FUNCTION: add_kdeframeworks_dep @@ -67,7 +69,11 @@ add_kdeframeworks_dep() { debug-print-function ${FUNCNAME} "$@" local ver + local use=${2} + if [[ -n ${use} ]] ; then + use="[${use}]" + fi if [[ -n ${3} ]]; then ver=${3} elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then @@ -85,9 +91,7 @@ add_kdeframeworks_dep() { [[ -z ${1} ]] && die "Missing parameter" - #FIXME - # Drop aqua= from kf5 packages - echo " >=kde-frameworks/${1}-${ver}:4[aqua=${2:+,${2}}]" + echo " >=kde-frameworks/${1}-${ver}:4${use}" } fi |