diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-04-06 21:39:05 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-04-06 21:39:05 +0000 |
| commit | af5458976587cd4b4bd455193bdadc1f3681ac9c (patch) | |
| tree | 61de1fc804a5fb907e7891e6c7cb3311649d2f6d /eclass/kde.eclass | |
| parent | Use an array for PATCHES on the eclass level regardless if the ebuild explici... (diff) | |
| download | gentoo-2-af5458976587cd4b4bd455193bdadc1f3681ac9c.tar.gz gentoo-2-af5458976587cd4b4bd455193bdadc1f3681ac9c.tar.bz2 gentoo-2-af5458976587cd4b4bd455193bdadc1f3681ac9c.zip | |
Add support to kde.eclass too for making PATCHES an array for proper quoting.
Diffstat (limited to 'eclass/kde.eclass')
| -rw-r--r-- | eclass/kde.eclass | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 5e6bf2035524..c72c04adebea 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.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/kde.eclass,v 1.208 2008/04/06 14:28:23 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.209 2008/04/06 21:39:05 zlin Exp $ # @ECLASS: kde.eclass # @MAINTAINER: @@ -134,14 +134,23 @@ kde_src_unpack() { else packages="${PN}" fi - for _p in ${packages} ; do - PATCHES="${PATCHES} $(ls ${PATCHDIR}/${_p}-${PV}-*{diff,patch} 2>/dev/null)" - if [[ -n "${KDEBASE}" ]] ; then - PATCHES="${PATCHES} $(ls ${PATCHDIR}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)" - fi - done + if [[ ${#PATCHES[@]} -gt 1 ]]; then + for _p in ${_packages}; do + PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null) ) + if [[ -n "${KDEBASE}" ]]; then + PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null) ) + fi + done + else + for _p in ${_packages}; do + PATCHES=(${PATCHES} $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null)) + if [[ -n "${KDEBASE}" ]]; then + PATCHES=(${PATCHES} $(ls ${_patchdir}/${_p}-${SLOT}-*{diff,patch} 2>/dev/null)) + fi + done + fi fi - [[ -n ${PATCHES} ]] && base_src_unpack autopatch + [[ -n ${PATCHES[@]} ]] && base_src_unpack autopatch else # Call base_src_unpack, which has sections, to do unpacking and patching # step by step transparently as defined in the ebuild. |