[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/, dev-vcs/git-flow/files/

[Johannes Huber]

commit:     316abb925691051864ca9d838fb5ff98b95bae2c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 20:03:58 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 20:03:58 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=316abb92

[dev-vcs/git-flow] Patch handling

* rename patch
* support PATCHES array
* support user patches via epatch_user

Package-Manager: portage-2.2.8-r1

---
 ...system-shflags.patch => git-flow-0.4.1-unbundle-shflags.patch} | 0
 dev-vcs/git-flow/git-flow-0.4.1.ebuild                            | 8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-flow/files/system-shflags.patch 
b/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
similarity index 100%
rename from dev-vcs/git-flow/files/system-shflags.patch
rename to dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch

diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild 
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
index 55ceae3..e1262fe 100644
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
@@ -22,10 +22,14 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS Changes.mdown README.mdown )
 
+PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" )
+
 S="${WORKDIR}/nvie-gitflow-5b26edc"
 
 src_prepare() {
-       epatch "${FILESDIR}/system-shflags.patch"
+       [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+       debug-print "$FUNCNAME: applying user patches"
+       epatch_user
 }
 
 src_compile() {
@@ -35,7 +39,7 @@ src_compile() {
 src_install() {
        emake prefix="${D}/usr" install
 
-       dodoc "${DOCS[@]}"
+       [[ ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
 
        newbashcomp 
"${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash" 
git-flow
 }