[gentoo-commits] dev/johu:master commit in: dev-vcs/gitflow/, dev-vcs/gitflow/files/, dev-vcs/git-flow/, ...
commit: e014de98e2825b07e3882f145b3c0680074278c2
Author: Johannes Huber gentoo org>
AuthorDate: Mon Mar 17 17:55:27 2014 +
Commit: Johannes Huber gentoo org>
CommitDate: Mon Mar 17 17:55:27 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=e014de98
[dev-vcs/git-flow] Renamed from dev-vcs/gitflow
Package-Manager: portage-2.2.8-r1
---
dev-vcs/git-flow/Manifest | 2 ++
dev-vcs/{gitflow => git-flow}/files/system-shflags.patch| 0
.../{gitflow/gitflow-0.4.1.ebuild => git-flow/git-flow-0.4.1.ebuild}| 0
dev-vcs/{gitflow => git-flow}/metadata.xml | 0
dev-vcs/gitflow/Manifest| 2 --
5 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
new file mode 100644
index 000..55db3ec
--- /dev/null
+++ b/dev-vcs/git-flow/Manifest
@@ -0,0 +1,2 @@
+DIST git-flow-0.4.1-completion.tar.gz 3873 SHA256
9b5fd62f8f70bd5eb1fac1298929fd42022cb7dde5df5c0c6a852c085089dc1d SHA512
32ca98362511b29dfc1aea9f2ac69853b70fc13693ac1ff667a9a34a0c3d11b9f5820d1aa4aa23c1d614e4609b7d2e1073b0afbea87992f5ab3eb3e96344b09d
WHIRLPOOL
20ce7038138612d12d99e74c5abe052f8c33359c7c51dafcb68ad527895bab6a94a54fcc9f08f6177b74e94920457483dc94e8f54d5f0c3eea18c0110df40eee
+DIST git-flow-0.4.1.tar.gz 16745 SHA256
896fdbf1fecba4e79b666987c95ba2881565255452fd73006a5db526100cbf59 SHA512
fd60d18938e3ee73d1b666e1f213e4707e52bf9b7ed96beb56e4bc7bbebf7204cff0d5430ca89de0ea96c88128486efe9732b21835e1549be7be599288fcfa71
WHIRLPOOL
eb1cec4bafbcea3aecaf44598f4732ab677dfcda34d279fc7df9dcd3ca9d33ea0353d5995f1d3ce9e9f22b580ff17e44287e0cedb725b825463214bcf74ef343
diff --git a/dev-vcs/gitflow/files/system-shflags.patch
b/dev-vcs/git-flow/files/system-shflags.patch
similarity index 100%
rename from dev-vcs/gitflow/files/system-shflags.patch
rename to dev-vcs/git-flow/files/system-shflags.patch
diff --git a/dev-vcs/gitflow/gitflow-0.4.1.ebuild
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
similarity index 100%
rename from dev-vcs/gitflow/gitflow-0.4.1.ebuild
rename to dev-vcs/git-flow/git-flow-0.4.1.ebuild
diff --git a/dev-vcs/gitflow/metadata.xml b/dev-vcs/git-flow/metadata.xml
similarity index 100%
rename from dev-vcs/gitflow/metadata.xml
rename to dev-vcs/git-flow/metadata.xml
diff --git a/dev-vcs/gitflow/Manifest b/dev-vcs/gitflow/Manifest
deleted file mode 100644
index 7239d15..000
--- a/dev-vcs/gitflow/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gitflow-0.4.1-completion.tar.gz 3873 SHA256
9b5fd62f8f70bd5eb1fac1298929fd42022cb7dde5df5c0c6a852c085089dc1d SHA512
32ca98362511b29dfc1aea9f2ac69853b70fc13693ac1ff667a9a34a0c3d11b9f5820d1aa4aa23c1d614e4609b7d2e1073b0afbea87992f5ab3eb3e96344b09d
WHIRLPOOL
20ce7038138612d12d99e74c5abe052f8c33359c7c51dafcb68ad527895bab6a94a54fcc9f08f6177b74e94920457483dc94e8f54d5f0c3eea18c0110df40eee
-DIST gitflow-0.4.1.tar.gz 16745 SHA256
896fdbf1fecba4e79b666987c95ba2881565255452fd73006a5db526100cbf59 SHA512
fd60d18938e3ee73d1b666e1f213e4707e52bf9b7ed96beb56e4bc7bbebf7204cff0d5430ca89de0ea96c88128486efe9732b21835e1549be7be599288fcfa71
WHIRLPOOL
eb1cec4bafbcea3aecaf44598f4732ab677dfcda34d279fc7df9dcd3ca9d33ea0353d5995f1d3ce9e9f22b580ff17e44287e0cedb725b825463214bcf74ef343
[gentoo-commits] dev/johu:master commit in: dev-vcs/gitflow/, dev-vcs/gitflow/files/
commit: 90ff18ad624de50c9186f7701ac73f9f345ed672
Author: Johannes Huber gentoo org>
AuthorDate: Sun Mar 16 20:28:57 2014 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Mar 16 20:28:57 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=90ff18ad
[dev-vcs/gitflow] Initial import, bug #419943
Ebuild by Moritz Schlarb metalabs.de>
Package-Manager: portage-2.2.8-r1
---
dev-vcs/gitflow/Manifest | 2 ++
dev-vcs/gitflow/files/system-shflags.patch | 32 +
dev-vcs/gitflow/gitflow-0.4.1.ebuild | 45 ++
dev-vcs/gitflow/metadata.xml | 8 ++
4 files changed, 87 insertions(+)
diff --git a/dev-vcs/gitflow/Manifest b/dev-vcs/gitflow/Manifest
new file mode 100644
index 000..7239d15
--- /dev/null
+++ b/dev-vcs/gitflow/Manifest
@@ -0,0 +1,2 @@
+DIST gitflow-0.4.1-completion.tar.gz 3873 SHA256
9b5fd62f8f70bd5eb1fac1298929fd42022cb7dde5df5c0c6a852c085089dc1d SHA512
32ca98362511b29dfc1aea9f2ac69853b70fc13693ac1ff667a9a34a0c3d11b9f5820d1aa4aa23c1d614e4609b7d2e1073b0afbea87992f5ab3eb3e96344b09d
WHIRLPOOL
20ce7038138612d12d99e74c5abe052f8c33359c7c51dafcb68ad527895bab6a94a54fcc9f08f6177b74e94920457483dc94e8f54d5f0c3eea18c0110df40eee
+DIST gitflow-0.4.1.tar.gz 16745 SHA256
896fdbf1fecba4e79b666987c95ba2881565255452fd73006a5db526100cbf59 SHA512
fd60d18938e3ee73d1b666e1f213e4707e52bf9b7ed96beb56e4bc7bbebf7204cff0d5430ca89de0ea96c88128486efe9732b21835e1549be7be599288fcfa71
WHIRLPOOL
eb1cec4bafbcea3aecaf44598f4732ab677dfcda34d279fc7df9dcd3ca9d33ea0353d5995f1d3ce9e9f22b580ff17e44287e0cedb725b825463214bcf74ef343
diff --git a/dev-vcs/gitflow/files/system-shflags.patch
b/dev-vcs/gitflow/files/system-shflags.patch
new file mode 100644
index 000..93ecb72
--- /dev/null
+++ b/dev-vcs/gitflow/files/system-shflags.patch
@@ -0,0 +1,32 @@
+diff --git a/Makefile b/Makefile
+index fbbfd2c..b0e2490 100644
+--- a/Makefile
b/Makefile
+@@ -40,14 +40,12 @@ SCRIPT_FILES+=git-flow-release
+ SCRIPT_FILES+=git-flow-support
+ SCRIPT_FILES+=git-flow-version
+ SCRIPT_FILES+=gitflow-common
+-SCRIPT_FILES+=gitflow-shFlags
+
+ all:
+ @echo "usage: make install"
+ @echo " make uninstall"
+
+ install:
+- @test -f gitflow-shFlags || (echo "Run 'git submodule init && git
submodule update' first." ; exit 1 )
+ install -d -m 0755 $(prefix)/bin
+ install -m 0755 $(EXEC_FILES) $(prefix)/bin
+ install -m 0644 $(SCRIPT_FILES) $(prefix)/bin
+diff --git a/git-flow b/git-flow
+index 93e9f0f..7b643d3 100755
+--- a/git-flow
b/git-flow
+@@ -78,7 +78,7 @@ main() {
+ export POSIXLY_CORRECT=1
+
+ # use the shFlags project to parse the command line arguments
+- . "$GITFLOW_DIR/gitflow-shFlags"
++ . /usr/share/misc/shflags
+ FLAGS_PARENT="git flow"
+ FLAGS "$@" || exit $?
+ eval set -- "${FLAGS_ARGV}"
diff --git a/dev-vcs/gitflow/gitflow-0.4.1.ebuild
b/dev-vcs/gitflow/gitflow-0.4.1.ebuild
new file mode 100644
index 000..020cfc8
--- /dev/null
+++ b/dev-vcs/gitflow/gitflow-0.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils bash-completion-r1
+
+DESCRIPTION="Git extensions to provide high-level repository operations for
Vincent Driessen's branching model."
+HOMEPAGE="https://github.com/nvie/gitflow";
+SRC_URI="https://github.com/nvie/gitflow/tarball/0.4.1 -> ${P}.tar.gz
+ bash-completion? (
https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 ->
${P}-completion.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="bash-completion"
+
+DEPEND="dev-util/shflags"
+RDEPEND="${DEPEND}
+ dev-vcs/git[bash-completion?]"
+
+S="${WORKDIR}/nvie-gitflow-5b26edc"
+
+src_prepare() {
+ epatch "${FILESDIR}/system-shflags.patch"
+}
+
+src_compile() {
+ true
+}
+
+src_install() {
+ emake prefix="${D}" install
+ if use bash-completion; then
+ newbashcomp
"${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash"
git-flow
+ fi
+}
+
+pkg_postinst() {
+ if use bash-completion; then
+ elog "Use eselect to activate the bash-completion module:"
+ elog "git-flow"
+ fi
+}
diff --git a/dev-vcs/gitflow/metadata.xml b/dev-vcs/gitflow/metadata.xml
new file mode 100644
index 000..4a53d48
--- /dev/null
+++ b/dev-vcs/gitflow/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ j...@gentoo.org
+ Johannes Huber
+
+
[gentoo-commits] dev/johu:master commit in: dev-vcs/gitflow/
commit: 97f644c7fe99b14b3af8994d0ca144c6a3fd90bc
Author: Johannes Huber gentoo org>
AuthorDate: Sun Mar 16 21:11:09 2014 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Mar 16 21:11:09 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=97f644c7
[dev-vcs/gitflow] Fix repoman issues
* EAPI 5
* drop bash-completion use flag
* add ~amd64 keyword
* remove einfo
Package-Manager: portage-2.2.8-r1
---
dev-vcs/gitflow/gitflow-0.4.1.ebuild | 22 +++---
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/dev-vcs/gitflow/gitflow-0.4.1.ebuild
b/dev-vcs/gitflow/gitflow-0.4.1.ebuild
index 020cfc8..9c1db5b 100644
--- a/dev-vcs/gitflow/gitflow-0.4.1.ebuild
+++ b/dev-vcs/gitflow/gitflow-0.4.1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
+EAPI=5
inherit eutils bash-completion-r1
DESCRIPTION="Git extensions to provide high-level repository operations for
Vincent Driessen's branching model."
HOMEPAGE="https://github.com/nvie/gitflow";
SRC_URI="https://github.com/nvie/gitflow/tarball/0.4.1 -> ${P}.tar.gz
- bash-completion? (
https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 ->
${P}-completion.tar.gz )"
+https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 ->
${P}-completion.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~x86"
-IUSE="bash-completion"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
DEPEND="dev-util/shflags"
RDEPEND="${DEPEND}
- dev-vcs/git[bash-completion?]"
+ dev-vcs/git"
S="${WORKDIR}/nvie-gitflow-5b26edc"
@@ -32,14 +32,6 @@ src_compile() {
src_install() {
emake prefix="${D}" install
- if use bash-completion; then
- newbashcomp
"${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash"
git-flow
- fi
-}
-pkg_postinst() {
- if use bash-completion; then
- elog "Use eselect to activate the bash-completion module:"
- elog "git-flow"
- fi
+ newbashcomp
"${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash"
git-flow
}
