diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-03-31 02:17:12 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-31 02:17:12 +0000 |
| commit | d60ec1f34cfce01a5878ed6970819e6638e43847 (patch) | |
| tree | 9f9888c8ca5fc8661270a8b609d46e24387fb10a /eclass/eutils.eclass | |
| parent | Version bump per bug #456224, as requested by actown@osuosl.org. (diff) | |
| download | historical-d60ec1f34cfce01a5878ed6970819e6638e43847.tar.gz historical-d60ec1f34cfce01a5878ed6970819e6638e43847.tar.bz2 historical-d60ec1f34cfce01a5878ed6970819e6638e43847.zip | |
epatch: add support for users to exclude specific patches via EPATCH_USER_EXCLUDE #439402
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 493e59cc85d4..467cf1727cd3 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.415 2013/03/12 14:16:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.416 2013/03/31 02:17:12 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -261,6 +261,11 @@ EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." # Only require patches to match EPATCH_SUFFIX rather than the extended # arch naming style. EPATCH_FORCE="no" +# @VARIABLE: EPATCH_USER_EXCLUDE +# @DEFAULT_UNSET +# @DESCRIPTION: +# List of patches not to apply. Note this is only file names, +# and not the full path. Globs accepted. # @FUNCTION: epatch # @USAGE: [options] [patches] [dirs of patches] @@ -405,6 +410,15 @@ epatch() { local ex for ex in ${EPATCH_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then + einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." + eshopts_pop + continue 2 + fi + done + + for ex in ${EPATCH_USER_EXCLUDE} ; do + if [[ ${patchname} == ${ex} ]] ; then + einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." eshopts_pop continue 2 fi |