diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-04-14 09:59:42 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-04-14 09:59:42 +0000 |
| commit | d476f3e8c983ebd3898ad0757c5c9140891f7160 (patch) | |
| tree | 9e17ea79692a4ad61397b18a63a00bc8474e9116 /eclass | |
| parent | Update Qt 4 dependencies. (diff) | |
| download | gentoo-2-d476f3e8c983ebd3898ad0757c5c9140891f7160.tar.gz gentoo-2-d476f3e8c983ebd3898ad0757c5c9140891f7160.tar.bz2 gentoo-2-d476f3e8c983ebd3898ad0757c5c9140891f7160.zip | |
Fix PATCHES handling.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde.eclass | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index 31ea20add791..e7c4c4a89a14 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.210 2008/04/12 16:22:59 zlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.211 2008/04/14 09:59:42 zlin Exp $ # @ECLASS: kde.eclass # @MAINTAINER: @@ -128,6 +128,7 @@ kde_src_unpack() { # placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches. [[ -d ${KDE_S} ]] || base_src_unpack unpack if [[ -d "${PATCHDIR}" ]] ; then + local packages p patchdir if is-parent-package ${CATEGORY}/${PN} ; then packages="$(get-child-packages ${CATEGORY}/${PN})" packages="${packages//${CATEGORY}\//} ${PN}" @@ -135,17 +136,17 @@ kde_src_unpack() { packages="${PN}" fi if [[ ${#PATCHES[@]} -gt 1 ]]; then - for _p in ${_packages}; do - PATCHES=( "${PATCHES[@]}" $(ls ${_patchdir}/${_p}-${PV}-*{diff,patch} 2>/dev/null) ) + 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) ) + 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)) + 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)) + PATCHES=(${PATCHES} $(ls ${patchdir}/${p}-${SLOT}-*{diff,patch} 2>/dev/null)) fi done fi |