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

2014-03-22 Thread Johannes Huber
commit: 01b316336226e0e182f829518ed69d124a488cb0
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Mar 22 15:55:21 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Mar 22 15:55:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=01b31633

[dev-vcs/git-flow] Moved to tree

---
 dev-vcs/git-flow/Manifest  |  2 -
 .../files/git-flow-0.4.1-unbundle-shflags.patch| 32 --
 dev-vcs/git-flow/git-flow-0.4.1.ebuild | 51 --
 dev-vcs/git-flow/metadata.xml  | 11 -
 4 files changed, 96 deletions(-)

diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
deleted file mode 100644
index 16e9584..000
--- a/dev-vcs/git-flow/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST git-flow-0.4.1.tar.gz 16732 SHA256 
c1271b0ba2c6655e4ad4d79562f6a910c3b884f3d4e16985e227e67f8d95c180 SHA512 
f86edb2867ed55127a34c711f5e6b11daeb6a738e92005fe27879c9ede40cb4130ff1de35e9f69560c4c845e063a8d2c1a76ad52eb5eacb7312a087f77d2698b
 WHIRLPOOL 
9ad859237cab91209acfa87ddcc70f975af1b5816e202f8b867de903e05a755174803e286a5e8d595edb1612b7b321f7fe21b405fb388b8bef155ece82cb4ccf
-DIST git-flow-completion-0.4.2.2.tar.gz 5421 SHA256 
1e82d039596c0e73bfc8c59d945ded34e4fce777d9b9bb45c3586ee539048ab9 SHA512 
609653b6eaedabc4f31bb19d93b50bc48746876a2c351f139b79b48599104d49ba281400e8708a83411610cf57ce08a9ae941b0611216c11d80f8c01e0fa8409
 WHIRLPOOL 
9d2f4ec100932c2e349924620a4dbe3a98e9b6d93fcfbeb0ee065e13873da74af8e059dae5acf158088c541bfdb3aa49446ee789576aab5532e8322ab9530c15

diff --git a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch 
b/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
deleted file mode 100644
index 93ecb72..000
--- a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Makefile b/Makefile
-index fbbfd2c..b0e2490 100644
 a/Makefile
-+++ b/Makefile
-@@ -40,14 +40,12 @@ SCRIPT_FILES+=git-flow-release
- SCRIPT_FILES+=git-flow-support
- SCRIPT_FILES+=git-flow-version
- SCRIPT_FILES+=gitflow-common
--SCRIPT_FILES+=gitflow-shFlags
- 
- all:
-   @echo "usage: make install"
-   @echo "   make uninstall"
- 
- install:
--  @test -f gitflow-shFlags || (echo "Run 'git submodule init && git 
submodule update' first." ; exit 1 )
-   install -d -m 0755 $(prefix)/bin
-   install -m 0755 $(EXEC_FILES) $(prefix)/bin
-   install -m 0644 $(SCRIPT_FILES) $(prefix)/bin
-diff --git a/git-flow b/git-flow
-index 93e9f0f..7b643d3 100755
 a/git-flow
-+++ b/git-flow
-@@ -78,7 +78,7 @@ main() {
-   export POSIXLY_CORRECT=1
- 
-   # use the shFlags project to parse the command line arguments
--  . "$GITFLOW_DIR/gitflow-shFlags"
-+  . /usr/share/misc/shflags
-   FLAGS_PARENT="git flow"
-   FLAGS "$@" || exit $?
-   eval set -- "${FLAGS_ARGV}"

diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild 
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
deleted file mode 100644
index 750407d..000
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN="${PN/-/}"
-COMP_PN="${PN}-completion"
-COMP_PV="0.4.2.2"
-COMP_P="${COMP_PN}-${COMP_PV}"
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Git extensions to provide high-level repository operations for 
Vincent Driessen's branching model"
-HOMEPAGE="https://github.com/nvie/gitflow";
-SRC_URI="https://github.com/nvie/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/bobthecow/${COMP_PN}/archive/${COMP_PV}.tar.gz -> 
${COMP_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-   dev-util/shflags
-   dev-vcs/git
-"
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-   [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-   debug-print "$FUNCNAME: applying user patches"
-   epatch_user
-}
-
-src_compile() {
-   true
-}
-
-src_install() {
-   emake prefix="${D}/usr" install
-
-   [[ ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
-
-   newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
-}

diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml
deleted file mode 100644
index 4f5a42e..000
--- a/dev-vcs/git-flow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   j...@gentoo.org
-   Johannes Huber
-   
-   
-   nvie/gitflow
-   
-



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

2014-03-17 Thread Johannes Huber
commit: 316abb925691051864ca9d838fb5ff98b95bae2c
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Mar 17 20:03:58 2014 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Mar 17 20:03:58 2014 +
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
 }