| 1 |
zlin 08/05/17 14:09:04 |
| 2 |
|
| 3 |
Modified: kde4-base.eclass kde4-functions.eclass |
| 4 |
Log: |
| 5 |
Actually convert to an array... Bug #216863. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.12 eclass/kde4-base.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.12&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.12&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.11&r2=1.12 |
| 13 |
|
| 14 |
Index: kde4-base.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v |
| 17 |
retrieving revision 1.11 |
| 18 |
retrieving revision 1.12 |
| 19 |
diff -u -r1.11 -r1.12 |
| 20 |
--- kde4-base.eclass 15 May 2008 19:49:32 -0000 1.11 |
| 21 |
+++ kde4-base.eclass 17 May 2008 14:09:03 -0000 1.12 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 2007-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.11 2008/05/15 19:49:32 ingmar Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.12 2008/05/17 14:09:03 zlin Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde4-base.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -299,7 +299,7 @@ |
| 31 |
[[ -z ${line} ]] && continue |
| 32 |
kde4_built_with_use_check+=("${line}") |
| 33 |
done <<< "${KDE4_BUILT_WITH_USE_CHECK}" |
| 34 |
- KDE4_BUILT_WITH_USE_CHECK="${kde4_built_with_use_check[@]}" |
| 35 |
+ KDE4_BUILT_WITH_USE_CHECK=("${kde4_built_with_use_check[@]}") |
| 36 |
fi |
| 37 |
|
| 38 |
# KDE4 applications require qt4 compiled with USE="accessibility dbus gif jpeg png qt3support ssl zlib". |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.7 eclass/kde4-functions.eclass |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.7&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.7&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.6&r2=1.7 |
| 47 |
|
| 48 |
Index: kde4-functions.eclass |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v |
| 51 |
retrieving revision 1.6 |
| 52 |
retrieving revision 1.7 |
| 53 |
diff -u -r1.6 -r1.7 |
| 54 |
--- kde4-functions.eclass 15 May 2008 19:49:32 -0000 1.6 |
| 55 |
+++ kde4-functions.eclass 17 May 2008 14:09:03 -0000 1.7 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2008 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.6 2008/05/15 19:49:32 ingmar Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.7 2008/05/17 14:09:03 zlin Exp $ |
| 61 |
|
| 62 |
# @ECLASS: kde4-functions.eclass |
| 63 |
# @MAINTAINER: |
| 64 |
@@ -504,7 +504,7 @@ |
| 65 |
kde4-functions_check_use() { |
| 66 |
# I like to keep flags sorted |
| 67 |
QT4_BUILT_WITH_USE_CHECK=$(echo "${QT4_BUILT_WITH_USE_CHECK}" | \ |
| 68 |
- tr '[:space:]' '\n' | sort | xargs) |
| 69 |
+ tr '[:space:]' '\n' | sort | uniq | xargs) |
| 70 |
|
| 71 |
local line missing |
| 72 |
if [[ -n ${KDE4_BUILT_WITH_USE_CHECK[@]} && $(declare -p KDE4_BUILT_WITH_USE_CHECK) = 'declare -a '* ]]; then |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives