| 1 |
zlin 08/04/14 12:46:58 |
| 2 |
|
| 3 |
Modified: kde.eclass |
| 4 |
Log: |
| 5 |
Really fix PATCHES handling. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.212 eclass/kde.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.212&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.212&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.211&r2=1.212 |
| 13 |
|
| 14 |
Index: kde.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v |
| 17 |
retrieving revision 1.211 |
| 18 |
retrieving revision 1.212 |
| 19 |
diff -u -r1.211 -r1.212 |
| 20 |
--- kde.eclass 14 Apr 2008 09:59:42 -0000 1.211 |
| 21 |
+++ kde.eclass 14 Apr 2008 12:46:58 -0000 1.212 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.211 2008/04/14 09:59:42 zlin Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.212 2008/04/14 12:46:58 zlin Exp $ |
| 27 |
|
| 28 |
# @ECLASS: kde.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -128,28 +128,26 @@ |
| 31 |
# placed in $PATCHDIR. Monolithic ebuilds will use the split ebuild patches. |
| 32 |
[[ -d ${KDE_S} ]] || base_src_unpack unpack |
| 33 |
if [[ -d "${PATCHDIR}" ]] ; then |
| 34 |
- local packages p patchdir |
| 35 |
+ local packages p f |
| 36 |
if is-parent-package ${CATEGORY}/${PN} ; then |
| 37 |
packages="$(get-child-packages ${CATEGORY}/${PN})" |
| 38 |
packages="${packages//${CATEGORY}\//} ${PN}" |
| 39 |
else |
| 40 |
packages="${PN}" |
| 41 |
fi |
| 42 |
- if [[ ${#PATCHES[@]} -gt 1 ]]; then |
| 43 |
- for p in ${packages}; do |
| 44 |
- PATCHES=( "${PATCHES[@]}" $(ls ${patchdir}/${p}-${PV}-*{diff,patch} 2>/dev/null) ) |
| 45 |
- if [[ -n "${KDEBASE}" ]]; then |
| 46 |
- PATCHES=( "${PATCHES[@]}" $(ls ${patchdir}/${p}-${SLOT}-*{diff,patch} 2>/dev/null) ) |
| 47 |
- fi |
| 48 |
- done |
| 49 |
- else |
| 50 |
- for p in ${packages}; do |
| 51 |
- PATCHES=(${PATCHES} $(ls ${patchdir}/${p}-${PV}-*{diff,patch} 2>/dev/null)) |
| 52 |
- if [[ -n "${KDEBASE}" ]]; then |
| 53 |
- PATCHES=(${PATCHES} $(ls ${patchdir}/${p}-${SLOT}-*{diff,patch} 2>/dev/null)) |
| 54 |
- fi |
| 55 |
- done |
| 56 |
+ if [[ $(declare -p PATCHES) != 'declare -a '* ]]; then |
| 57 |
+ PATCHES=(${PATCHES}) |
| 58 |
fi |
| 59 |
+ for p in ${packages}; do |
| 60 |
+ for f in "${PATCHDIR}"/${p}-${PV}-*{diff,patch}; do |
| 61 |
+ [[ -e ${f} ]] && PATCHES+=("${f}") |
| 62 |
+ done |
| 63 |
+ if [[ -n "${KDEBASE}" ]]; then |
| 64 |
+ for f in "${PATCHDIR}"/${p}-${SLOT}-*{diff,patch}; do |
| 65 |
+ [[ -e ${f} ]] && PATCHES+=("${f}") |
| 66 |
+ done |
| 67 |
+ fi |
| 68 |
+ done |
| 69 |
fi |
| 70 |
[[ -n ${PATCHES[@]} ]] && base_src_unpack autopatch |
| 71 |
else |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
-- |
| 76 |
gentoo-commits@l.g.o mailing list |
Archives