commit: 04eb2b15e2ddaed51276c70a84fb7bff437f8365
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 22:12:40 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 22:12:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04eb2b15
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 ----------------------
...-flow-1.8.0.ebuild => git-flow-1.8.0-r1.ebuild} | 2 --
2 files changed, 27 deletions(-)
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 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 c852e1a..dbd444d 100644
--- 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() {
