summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-08-30 20:08:52 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-09-03 17:43:03 +0200
commita2023adbf400a1fd419bdfd7656312885dd1eb24 (patch)
tree8fd46a0e996044d8af904bcbfe59facbf92f69c4 /eclass/kde4-functions.eclass
parentnet-dns/knot: version bump (diff)
downloadgentoo-a2023adbf400a1fd419bdfd7656312885dd1eb24.tar.gz
gentoo-a2023adbf400a1fd419bdfd7656312885dd1eb24.tar.bz2
gentoo-a2023adbf400a1fd419bdfd7656312885dd1eb24.zip
kde4*.eclass: Drop USE=aqua
Diffstat (limited to 'eclass/kde4-functions.eclass')
-rw-r--r--eclass/kde4-functions.eclass14
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index fc37db293c07..4fdd299948d2 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -296,6 +296,10 @@ add_kdeapps_dep() {
local ver
+ if [[ -n ${2} ]] ; then
+ local use="[${2}]"
+ fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -313,9 +317,7 @@ add_kdeapps_dep() {
[[ -z ${1} ]] && die "Missing parameter"
- #FIXME
- # Drop aqua= from kf5 packages
- echo " >=kde-apps/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=kde-apps/${1}-${ver}:4${use}"
}
# @FUNCTION: add_kdebase_dep
@@ -332,6 +334,10 @@ add_kdebase_dep() {
local ver
+ if [[ -n ${2} ]] ; then
+ local use="[${2}]"
+ fi
+
if [[ -n ${3} ]]; then
ver=${3}
elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then
@@ -351,7 +357,7 @@ add_kdebase_dep() {
[[ -z ${1} ]] && die "Missing parameter"
- echo " >=kde-base/${1}-${ver}:4[aqua=${2:+,${2}}]"
+ echo " >=kde-base/${1}-${ver}:4${use}"
}
# local function to enable specified translations for specified directory