[gentoo-commits] proj/kde-sunset:master commit in: eclass/

[Andreas Sturmlechner]

commit:     22c71e550e6e12a20663047f8a80ac3bdf7ef3d5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 31 17:57:09 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 31 18:29:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=22c71e55

kde4-functions-extra.eclass: Drop invalid aqua conditional

 eclass/kde4-functions-extra.eclass | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/eclass/kde4-functions-extra.eclass 
b/eclass/kde4-functions-extra.eclass
index 168bf43..a6ad847 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