From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C0E321385B0 for ; Sat, 15 Aug 2015 22:10:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E7EC142AE; Sat, 15 Aug 2015 22:10:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBD71142AE for ; Sat, 15 Aug 2015 22:10:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03E74340DB7 for ; Sat, 15 Aug 2015 22:10:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B96FD147 for ; Sat, 15 Aug 2015 22:10:32 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1439676777.04eb2b15e2ddaed51276c70a84fb7bff437f8365.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch dev-vcs/git-flow/git-flow-1.8.0-r1.ebuild dev-vcs/git-flow/git-flow-1.8.0.ebuild X-VCS-Directories: dev-vcs/git-flow/ dev-vcs/git-flow/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 04eb2b15e2ddaed51276c70a84fb7bff437f8365 X-VCS-Branch: master Date: Sat, 15 Aug 2015 22:10:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 287263bd-e4e8-4da9-8d80-19f38a5e9922 X-Archives-Hash: e44862f052975852d34a2d1d941be867 commit: 04eb2b15e2ddaed51276c70a84fb7bff437f8365 Author: Johannes Huber gentoo org> AuthorDate: Sat Aug 15 22:12:40 2015 +0000 Commit: Johannes Huber gentoo 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() {