dev-vcs/git-flow: Use bundled shflags

Gentoo-Bug: 538938

Package-Manager: portage-2.2.20.1

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 (file)
index 6e96d54..0000000
--- 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.ebuild b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
similarity index 95%
rename from dev-vcs/git-flow/git-flow-1.8.0.ebuild
rename to dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
index c852e1ad4ea822bbd6b61a266a0c5f27a43e08e4..dbd444db535d1c828cdce0b889bdf260c39464bf 100644 (file)
--- a/dev-vcs/git-flow/git-flow-1.8.0.ebuild
+++ b/dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild
@@ -28,8 +28,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS Changes.mdown README.mdown )
 
-PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" )
-
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_prepare() {