Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-flow/files/, dev-vcs/git-flow/
Date: Sat, 28 Nov 2015 10:31:41
Message-Id: 1448706684.804d753b22faf03a3296b47195fd1c7566e265d8.johu@gentoo
1 commit: 804d753b22faf03a3296b47195fd1c7566e265d8
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 10:31:03 2015 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 10:31:24 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=804d753b
7
8 dev-vcs/git-flow: Remove old
9
10 Package-Manager: portage-2.2.26
11
12 dev-vcs/git-flow/Manifest | 2 -
13 .../files/git-flow-0.4.1-unbundle-shflags.patch | 32 --------------
14 dev-vcs/git-flow/git-flow-0.4.1.ebuild | 51 ----------------------
15 3 files changed, 85 deletions(-)
16
17 diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
18 index 8e83d60..3e844ee 100644
19 --- a/dev-vcs/git-flow/Manifest
20 +++ b/dev-vcs/git-flow/Manifest
21 @@ -1,4 +1,2 @@
22 -DIST git-flow-0.4.1.tar.gz 16732 SHA256 c1271b0ba2c6655e4ad4d79562f6a910c3b884f3d4e16985e227e67f8d95c180 SHA512 f86edb2867ed55127a34c711f5e6b11daeb6a738e92005fe27879c9ede40cb4130ff1de35e9f69560c4c845e063a8d2c1a76ad52eb5eacb7312a087f77d2698b WHIRLPOOL 9ad859237cab91209acfa87ddcc70f975af1b5816e202f8b867de903e05a755174803e286a5e8d595edb1612b7b321f7fe21b405fb388b8bef155ece82cb4ccf
23 DIST git-flow-1.8.0.tar.gz 56304 SHA256 8239131b8dac160d7e929eab376fa14de44a55cbd5c5545e0ad4464d3a57adef SHA512 677bfb0c379eb91bfaf8ef676593d39a8306ff063251e1e638166c7101c24ce2eac59490bab85d0c76b712c1905f15d3a14a3ecc020df376848d3b1ea5ee7b0a WHIRLPOOL 6bf654329b941989a8b646ab8218c072b7bf455b0ec6a8441d43de10b9b480a5619bca931606acdd743b0f3f86e9b67f119ff07957eaa106fd17f5cddc96a328
24 -DIST git-flow-completion-0.4.2.2.tar.gz 5421 SHA256 1e82d039596c0e73bfc8c59d945ded34e4fce777d9b9bb45c3586ee539048ab9 SHA512 609653b6eaedabc4f31bb19d93b50bc48746876a2c351f139b79b48599104d49ba281400e8708a83411610cf57ce08a9ae941b0611216c11d80f8c01e0fa8409 WHIRLPOOL 9d2f4ec100932c2e349924620a4dbe3a98e9b6d93fcfbeb0ee065e13873da74af8e059dae5acf158088c541bfdb3aa49446ee789576aab5532e8322ab9530c15
25 DIST git-flow-completion-0.5.1.tar.gz 6916 SHA256 5c8547a549dc623a8d57cfc22c3fa88588f5630da9dc6de9638e5b69da9d47d0 SHA512 c1fc0000889faff8189cd985b077cb64b81ae13e17f02c9df27675f428c6edf8f00627effdf6ebdae7a7f0641ec4ac621a9ecd0a53f14be7d95ec7e124ab8c1b WHIRLPOOL fd59f799d944752eab06b35f05c1f1309ef589014a0378f292e4dde206578f0c0aeb3685e16ea8d2f810e93b77abb7a2bc42c3c335ef9057b9c3ee1dd6df9982
26
27 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
28 deleted file mode 100644
29 index 93ecb72..0000000
30 --- a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -diff --git a/Makefile b/Makefile
34 -index fbbfd2c..b0e2490 100644
35 ---- a/Makefile
36 -+++ b/Makefile
37 -@@ -40,14 +40,12 @@ SCRIPT_FILES+=git-flow-release
38 - SCRIPT_FILES+=git-flow-support
39 - SCRIPT_FILES+=git-flow-version
40 - SCRIPT_FILES+=gitflow-common
41 --SCRIPT_FILES+=gitflow-shFlags
42 -
43 - all:
44 - @echo "usage: make install"
45 - @echo " make uninstall"
46 -
47 - install:
48 -- @test -f gitflow-shFlags || (echo "Run 'git submodule init && git submodule update' first." ; exit 1 )
49 - install -d -m 0755 $(prefix)/bin
50 - install -m 0755 $(EXEC_FILES) $(prefix)/bin
51 - install -m 0644 $(SCRIPT_FILES) $(prefix)/bin
52 -diff --git a/git-flow b/git-flow
53 -index 93e9f0f..7b643d3 100755
54 ---- a/git-flow
55 -+++ b/git-flow
56 -@@ -78,7 +78,7 @@ main() {
57 - export POSIXLY_CORRECT=1
58 -
59 - # use the shFlags project to parse the command line arguments
60 -- . "$GITFLOW_DIR/gitflow-shFlags"
61 -+ . /usr/share/misc/shflags
62 - FLAGS_PARENT="git flow"
63 - FLAGS "$@" || exit $?
64 - eval set -- "${FLAGS_ARGV}"
65
66 diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
67 deleted file mode 100644
68 index e03b7e5..0000000
69 --- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
70 +++ /dev/null
71 @@ -1,51 +0,0 @@
72 -# Copyright 1999-2014 Gentoo Foundation
73 -# Distributed under the terms of the GNU General Public License v2
74 -# $Id$
75 -
76 -EAPI=5
77 -
78 -MY_PN="${PN/-/}"
79 -COMP_PN="${PN}-completion"
80 -COMP_PV="0.4.2.2"
81 -COMP_P="${COMP_PN}-${COMP_PV}"
82 -inherit eutils bash-completion-r1
83 -
84 -DESCRIPTION="Git extensions to provide high-level repository operations for Vincent Driessen's branching model"
85 -HOMEPAGE="https://github.com/nvie/gitflow"
86 -SRC_URI="https://github.com/nvie/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
87 -https://github.com/bobthecow/${COMP_PN}/archive/${COMP_PV}.tar.gz -> ${COMP_P}.tar.gz"
88 -
89 -LICENSE="BSD MIT"
90 -SLOT="0"
91 -KEYWORDS="amd64 x86"
92 -IUSE=""
93 -
94 -DEPEND=""
95 -RDEPEND="${DEPEND}
96 - dev-util/shflags
97 - dev-vcs/git
98 -"
99 -
100 -DOCS=( AUTHORS Changes.mdown README.mdown )
101 -
102 -PATCHES=( "${FILESDIR}/${P}-unbundle-shflags.patch" )
103 -
104 -S="${WORKDIR}/${MY_PN}-${PV}"
105 -
106 -src_prepare() {
107 - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
108 - debug-print "$FUNCNAME: applying user patches"
109 - epatch_user
110 -}
111 -
112 -src_compile() {
113 - true
114 -}
115 -
116 -src_install() {
117 - emake prefix="${D}/usr" install
118 -
119 - [[ ${DOCS[@]} ]] && dodoc "${DOCS[@]}"
120 -
121 - newbashcomp "${WORKDIR}/${COMP_P}/${COMP_PN}.bash" ${PN}
122 -}