summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-11-12 18:25:37 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-11-12 18:25:37 +0000
commitc5aac3c55fc3a187fba329dfa98405307645a746 (patch)
treec02348205a5830544b40bbc1550072ce3697059a /eclass/eutils.eclass
parentadded ppc to keywords (diff)
downloadhistorical-c5aac3c55fc3a187fba329dfa98405307645a746.tar.gz
historical-c5aac3c55fc3a187fba329dfa98405307645a746.tar.bz2
historical-c5aac3c55fc3a187fba329dfa98405307645a746.zip
update to use .Z; Add EPATCH_EXCLUDE
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass17
1 files changed, 14 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 376fd537eb75..1af277a2bcd8 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,7 +1,7 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.5 2002/11/11 22:36:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.6 2002/11/12 18:25:37 azarah Exp $
# This eclass is for general purpose functions that most ebuilds
# have to implement themselfs.
#
@@ -89,6 +89,9 @@ EPATCH_SOURCE="${WORKDIR}/patch"
EPATCH_SUFFIX="patch.bz2"
# Default options for patch
EPATCH_OPTS=""
+# List of patches not to apply. Not this is only file names,
+# and not the full path ..
+EPATCH_EXCLUDE=""
# This function is for bulk patching, or in theory for just one
# or two patches.
@@ -153,10 +156,10 @@ epatch() {
bz2)
PIPE_CMD="bzip2 -dc"
;;
- gz)
+ gz|Z|z)
PIPE_CMD="gzip -dc"
;;
- zip)
+ ZIP|zip)
PIPE_CMD="unzip -p"
;;
*)
@@ -179,6 +182,14 @@ epatch() {
then
local count=0
local popts="${EPATCH_OPTS}"
+
+ if [ -n "${EPATCH_EXCLUDE}" ]
+ then
+ if [ "${EPATCH_EXCLUDE/${x##*/}}" != "${EPATCH_EXCLUDE}" ]
+ then
+ continue
+ fi
+ fi
if [ "${SINGLE_PATCH}" = "yes" ]
then