From 3cab7ad1ee0f1c98391646e16b80416d74c7f7ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 7 Sep 2005 10:40:28 +0000 Subject: [PATCH] Use epatch instead of patch, as discussed on gentoo-dev. --- eclass/base.eclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/eclass/base.eclass b/eclass/base.eclass index 9d77ea343738..2bece4b1dba7 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.27 2005/07/11 15:08:06 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.28 2005/09/07 10:40:28 flameeyes Exp $ # # Author Dan Armak # @@ -27,19 +27,15 @@ base_src_unpack() { patch) debug-print-section patch cd ${S} - patch -p0 < ${FILESDIR}/${P}-gentoo.diff + epatch ${FILESDIR}/${P}-gentoo.diff ;; autopatch) debug-print-section autopatch debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1" cd ${S} - for x in $PATCHES; do + for x in $PATCHES $PATCHES1; do debug-print "$FUNCNAME: autopatch: patching from ${x}" - patch -p0 < ${x} - done - for x in $PATCHES1; do - debug-print "$FUNCNAME: autopatch: patching -p1 from ${x}" - patch -p1 < ${x} + epatch ${x} done ;; all) -- 2.26.2