From 04eb2b15e2ddaed51276c70a84fb7bff437f8365 Mon Sep 17 00:00:00 2001
From: Johannes Huber <johu@gentoo.org>
Date: Sun, 16 Aug 2015 00:12:40 +0200
Subject: dev-vcs/git-flow: Use bundled shflags

Gentoo-Bug: 538938

Package-Manager: portage-2.2.20.1
---
 .../files/git-flow-1.8.0-unbundle-shflags.patch    | 25 -----------
 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild          | 49 +++++++++++++++++++++
 dev-vcs/git-flow/git-flow-1.8.0.ebuild             | 51 ----------------------
 3 files changed, 49 insertions(+), 76 deletions(-)
 delete mode 100644 dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch
 create mode 100644 dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
 delete mode 100644 dev-vcs/git-flow/git-flow-1.8.0.ebuild

(limited to 'dev-vcs/git-flow')

diff --git a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch b/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch
deleted file mode 100644
index 6e96d541d411..000000000000
--- a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 0718bbb..f488922 100644
---- a/Makefile
-+++ b/Makefile
-@@ -43,7 +43,6 @@ SCRIPT_FILES+=git-flow-version
- SCRIPT_FILES+=git-flow-log
- SCRIPT_FILES+=git-flow-config
- SCRIPT_FILES+=gitflow-common
--SCRIPT_FILES+=gitflow-shFlags
- 
- # Hook files
- HOOK_FILES=$(wildcard hooks/*)
-diff --git a/git-flow b/git-flow
-index 7a962d2..2ba70ba 100755
---- a/git-flow
-+++ b/git-flow
-@@ -111,7 +111,7 @@ main() {
- 	fi
- 
- 	# Use the shFlags project to parse the command line arguments
--	. "$GITFLOW_DIR/gitflow-shFlags"
-+	. /usr/share/misc/shflags
- 	FLAGS_PARENT="git flow"
- 
- 	# Load common functionality
diff --git a/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..dbd444db535d
--- /dev/null
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-/}"
+COMP_PN="${PN}-completion"
+COMP_PV="0.5.1"
+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/petervanderdoes/gitflow"
+SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/petervanderdoes/${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 )
+
+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/git-flow-1.8.0.ebuild b/dev-vcs/git-flow/git-flow-1.8.0.ebuild
deleted file mode 100644
index c852e1ad4ea8..000000000000
--- a/dev-vcs/git-flow/git-flow-1.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-/}"
-COMP_PN="${PN}-completion"
-COMP_PV="0.5.1"
-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/petervanderdoes/gitflow"
-SRC_URI="https://github.com/petervanderdoes/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/petervanderdoes/${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}
-}
-- 
cgit v1.2.3-65-gdbad