extend rpm_spec_epatch to handle -b %patch options (which is really patch --suffix)

diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass
index 21c7f24575a48338cbab39dc7f7b72e1f2df7c51..c4550919da893469e5745bab2efe09b0e6679c5e 100644 (file)
--- a/eclass/rpm.eclass
+++ b/eclass/rpm.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.20 2010/07/18 21:57:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/rpm.eclass,v 1.21 2011/12/10 08:50:47 vapier Exp $
 
 # @ECLASS: rpm.eclass
 # @MAINTAINER:
@@ -82,18 +82,46 @@ rpm_src_unpack() {
 # all the patches listed in it.  If the spec does funky things like moving
 # files around, well this won't handle that.
 rpm_spec_epatch() {
-       local p spec=${1:-${PN}.spec}
-       local dir=${spec%/*}
+       local p spec=$1
+       local dir
+
+       if [[ -z ${spec} ]] ; then
+               # search likely places for the spec file
+               for spec in "${PWD}" "${S}" "${WORKDIR}" ; do
+                       spec+="/${PN}.spec"
+                       [[ -e ${spec} ]] && break
+               done
+       fi
+       [[ ${spec} == */* ]] \
+               && dir=${spec%/*} \
+               || dir=
+
+       ebegin "Applying patches from ${spec}"
+
        grep '^%patch' "${spec}" | \
        while read line ; do
+               # expand the %patch line
                set -- ${line}
                p=$1
                shift
-               EPATCH_OPTS="$*"
+
+               # process the %patch arguments
+               local arg
+               EPATCH_OPTS=
+               for arg in "$@" ; do
+                       case ${arg} in
+                       -b) EPATCH_OPTS+=" --suffix" ;;
+                       *)  EPATCH_OPTS+=" ${arg}" ;;
+                       esac
+               done
+
+               # extract the patch name from the Patch# line
                set -- $(grep "^P${p#%p}: " "${spec}")
                shift
                epatch "${dir:+${dir}/}$*"
        done
+
+       eend
 }
 
 EXPORT_FUNCTIONS src_unpack