| 1 |
vapier 13/03/31 02:17:12 |
| 2 |
|
| 3 |
Modified: eutils.eclass |
| 4 |
Log: |
| 5 |
epatch: add support for users to exclude specific patches via EPATCH_USER_EXCLUDE #439402 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.416 eclass/eutils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.416&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?rev=1.416&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/eutils.eclass?r1=1.415&r2=1.416 |
| 13 |
|
| 14 |
Index: eutils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v |
| 17 |
retrieving revision 1.415 |
| 18 |
retrieving revision 1.416 |
| 19 |
diff -u -r1.415 -r1.416 |
| 20 |
--- eutils.eclass 12 Mar 2013 14:16:15 -0000 1.415 |
| 21 |
+++ eutils.eclass 31 Mar 2013 02:17:12 -0000 1.416 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.415 2013/03/12 14:16:15 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.416 2013/03/31 02:17:12 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: eutils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -261,6 +261,11 @@ |
| 31 |
# Only require patches to match EPATCH_SUFFIX rather than the extended |
| 32 |
# arch naming style. |
| 33 |
EPATCH_FORCE="no" |
| 34 |
+# @VARIABLE: EPATCH_USER_EXCLUDE |
| 35 |
+# @DEFAULT_UNSET |
| 36 |
+# @DESCRIPTION: |
| 37 |
+# List of patches not to apply. Note this is only file names, |
| 38 |
+# and not the full path. Globs accepted. |
| 39 |
|
| 40 |
# @FUNCTION: epatch |
| 41 |
# @USAGE: [options] [patches] [dirs of patches] |
| 42 |
@@ -405,6 +410,15 @@ |
| 43 |
local ex |
| 44 |
for ex in ${EPATCH_EXCLUDE} ; do |
| 45 |
if [[ ${patchname} == ${ex} ]] ; then |
| 46 |
+ einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." |
| 47 |
+ eshopts_pop |
| 48 |
+ continue 2 |
| 49 |
+ fi |
| 50 |
+ done |
| 51 |
+ |
| 52 |
+ for ex in ${EPATCH_USER_EXCLUDE} ; do |
| 53 |
+ if [[ ${patchname} == ${ex} ]] ; then |
| 54 |
+ einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." |
| 55 |
eshopts_pop |
| 56 |
continue 2 |
| 57 |
fi |
Archives