summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorBo Ørsted Andresen <zlin@gentoo.org>2008-05-17 14:09:03 +0000
committerBo Ørsted Andresen <zlin@gentoo.org>2008-05-17 14:09:03 +0000
commit6f555f0c231033b5825af7503dc2c66d9d016ede (patch)
treef23abf05dd1690a6f3778475e3c85f953b175057 /eclass
parentStable on alpha, bug #213995 (diff)
downloadhistorical-6f555f0c231033b5825af7503dc2c66d9d016ede.tar.gz
historical-6f555f0c231033b5825af7503dc2c66d9d016ede.tar.bz2
historical-6f555f0c231033b5825af7503dc2c66d9d016ede.zip
Actually convert to an array... Bug #216863.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde4-base.eclass4
-rw-r--r--eclass/kde4-functions.eclass4
2 files changed, 4 insertions, 4 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index b1cb90573eb6..721f365390af 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
# Copyright 2007-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.11 2008/05/15 19:49:32 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.12 2008/05/17 14:09:03 zlin Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -299,7 +299,7 @@ kde4-base_pkg_setup() {
[[ -z ${line} ]] && continue
kde4_built_with_use_check+=("${line}")
done <<< "${KDE4_BUILT_WITH_USE_CHECK}"
- KDE4_BUILT_WITH_USE_CHECK="${kde4_built_with_use_check[@]}"
+ KDE4_BUILT_WITH_USE_CHECK=("${kde4_built_with_use_check[@]}")
fi
# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib".
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index bae292afe818..99ec36ff4ba9 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.6 2008/05/15 19:49:32 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.7 2008/05/17 14:09:03 zlin Exp $
# @ECLASS: kde4-functions.eclass
# @MAINTAINER:
@@ -504,7 +504,7 @@ _kde4-functions_built_with_use() {
kde4-functions_check_use() {
# I like to keep flags sorted
QT4_BUILT_WITH_USE_CHECK=$(echo "${QT4_BUILT_WITH_USE_CHECK}" | \
- tr '[:space:]' '\n' | sort | xargs)
+ tr '[:space:]' '\n' | sort | uniq | xargs)
local line missing
if [[ -n ${KDE4_BUILT_WITH_USE_CHECK[@]} && $(declare -p KDE4_BUILT_WITH_USE_CHECK) = 'declare -a '* ]]; then