From c0df2e37a8dd20942d5bbb303a9c0d65ebb330d5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 20 Jul 2011 05:46:46 +0000
Subject: epatch: use EPATCH_SOURCE as a [relative] search dir even when
 patches are specified on the command line

---
 eclass/eutils.eclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 1d686e179341..ca429c070704 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.358 2011/07/08 11:35:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -252,6 +252,11 @@ epatch() {
 		# Some people like to make dirs of patches w/out suffixes (vim)
 		set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"}
 
+	elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then
+		# Re-use EPATCH_SOURCE as a search dir
+		epatch "${EPATCH_SOURCE}/$1"
+		return $?
+
 	else
 		# sanity check ... if it isn't a dir or file, wtf man ?
 		[[ $# -ne 0 ]] && EPATCH_SOURCE=$1
-- 
cgit v1.2.3-65-gdbad