| 1 |
commit: 22c71e550e6e12a20663047f8a80ac3bdf7ef3d5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 31 17:57:09 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 31 18:29:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=22c71e55 |
| 7 |
|
| 8 |
kde4-functions-extra.eclass: Drop invalid aqua conditional |
| 9 |
|
| 10 |
eclass/kde4-functions-extra.eclass | 16 ++++++++++------ |
| 11 |
1 file changed, 10 insertions(+), 6 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/kde4-functions-extra.eclass b/eclass/kde4-functions-extra.eclass |
| 14 |
index 168bf43..a6ad847 100644 |
| 15 |
--- a/eclass/kde4-functions-extra.eclass |
| 16 |
+++ b/eclass/kde4-functions-extra.eclass |
| 17 |
@@ -31,7 +31,11 @@ add_kdeplasma_dep() { |
| 18 |
debug-print-function ${FUNCNAME} "$@" |
| 19 |
|
| 20 |
local ver |
| 21 |
+ local use=${2} |
| 22 |
|
| 23 |
+ if [[ -n ${use} ]] ; then |
| 24 |
+ use="[${use}]" |
| 25 |
+ fi |
| 26 |
if [[ -n ${3} ]]; then |
| 27 |
ver=${3} |
| 28 |
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then |
| 29 |
@@ -49,9 +53,7 @@ add_kdeplasma_dep() { |
| 30 |
|
| 31 |
[[ -z ${1} ]] && die "Missing parameter" |
| 32 |
|
| 33 |
- #FIXME |
| 34 |
- # Drop aqua= from kf5 packages |
| 35 |
- echo " >=kde-plasma/${1}-${ver}:4[aqua=${2:+,${2}}]" |
| 36 |
+ echo " >=kde-plasma/${1}-${ver}:4${use}" |
| 37 |
} |
| 38 |
|
| 39 |
# @FUNCTION: add_kdeframeworks_dep |
| 40 |
@@ -67,7 +69,11 @@ add_kdeframeworks_dep() { |
| 41 |
debug-print-function ${FUNCNAME} "$@" |
| 42 |
|
| 43 |
local ver |
| 44 |
+ local use=${2} |
| 45 |
|
| 46 |
+ if [[ -n ${use} ]] ; then |
| 47 |
+ use="[${use}]" |
| 48 |
+ fi |
| 49 |
if [[ -n ${3} ]]; then |
| 50 |
ver=${3} |
| 51 |
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then |
| 52 |
@@ -85,9 +91,7 @@ add_kdeframeworks_dep() { |
| 53 |
|
| 54 |
[[ -z ${1} ]] && die "Missing parameter" |
| 55 |
|
| 56 |
- #FIXME |
| 57 |
- # Drop aqua= from kf5 packages |
| 58 |
- echo " >=kde-frameworks/${1}-${ver}:4[aqua=${2:+,${2}}]" |
| 59 |
+ echo " >=kde-frameworks/${1}-${ver}:4${use}" |
| 60 |
} |
| 61 |
|
| 62 |
fi |
Archives