[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/
commit: 4039bdade1dcffd5cfd5b095bfe501767cd3bd52 Author: Johannes Huber johu AT gentoo DOT org AuthorDate: Sat Mar 22 15:32:37 2014 + Commit: Johannes Huber johu AT gentoo DOT org CommitDate: Sat Mar 22 15:32:37 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=4039bdad [dev-vcs/git-flow] Add upstream remote id Package-Manager: portage-2.2.8-r1 --- dev-vcs/git-flow/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml index 4a53d48..4f5a42e 100644 --- a/dev-vcs/git-flow/metadata.xml +++ b/dev-vcs/git-flow/metadata.xml @@ -5,4 +5,7 @@ emailj...@gentoo.org/email nameJohannes Huber/name /maintainer + upstream + remote-id type=githubnvie/gitflow/remote-id + /upstream /pkgmetadata
[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/, dev-vcs/git-flow/files/
commit: 01b316336226e0e182f829518ed69d124a488cb0
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Mar 22 15:55:21 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Mar 22 15:55:21 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=01b31633
[dev-vcs/git-flow] Moved to tree
---
dev-vcs/git-flow/Manifest | 2 -
.../files/git-flow-0.4.1-unbundle-shflags.patch| 32 --
dev-vcs/git-flow/git-flow-0.4.1.ebuild | 51 --
dev-vcs/git-flow/metadata.xml | 11 -
4 files changed, 96 deletions(-)
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
deleted file mode 100644
index 16e9584..000
--- a/dev-vcs/git-flow/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST git-flow-0.4.1.tar.gz 16732 SHA256
c1271b0ba2c6655e4ad4d79562f6a910c3b884f3d4e16985e227e67f8d95c180 SHA512
f86edb2867ed55127a34c711f5e6b11daeb6a738e92005fe27879c9ede40cb4130ff1de35e9f69560c4c845e063a8d2c1a76ad52eb5eacb7312a087f77d2698b
WHIRLPOOL
9ad859237cab91209acfa87ddcc70f975af1b5816e202f8b867de903e05a755174803e286a5e8d595edb1612b7b321f7fe21b405fb388b8bef155ece82cb4ccf
-DIST git-flow-completion-0.4.2.2.tar.gz 5421 SHA256
1e82d039596c0e73bfc8c59d945ded34e4fce777d9b9bb45c3586ee539048ab9 SHA512
609653b6eaedabc4f31bb19d93b50bc48746876a2c351f139b79b48599104d49ba281400e8708a83411610cf57ce08a9ae941b0611216c11d80f8c01e0fa8409
WHIRLPOOL
9d2f4ec100932c2e349924620a4dbe3a98e9b6d93fcfbeb0ee065e13873da74af8e059dae5acf158088c541bfdb3aa49446ee789576aab5532e8322ab9530c15
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
deleted file mode 100644
index 93ecb72..000
--- a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
- @echomake 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/git-flow/git-flow-0.4.1.ebuild
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
deleted file mode 100644
index 750407d..000
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-MY_PN=${PN/-/}
-COMP_PN=${PN}-completion
-COMP_PV=0.4.2.2
-COMP_P=${COMP_PN}-${COMP_PV}
-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/${MY_PN}/archive/${PV}.tar.gz - ${P}.tar.gz
-https://github.com/bobthecow/${COMP_PN}/archive/${COMP_PV}.tar.gz -
${COMP_P}.tar.gz
-
-LICENSE=BSD MIT
-SLOT=0
-KEYWORDS=~amd64 ~x86
-IUSE=
-
-DEPEND=
-RDEPEND=${DEPEND}
- dev-util/shflags
- dev-vcs/git
-
-
-DOCS=( AUTHORS Changes.mdown README.mdown )
-
-PATCHES=( ${FILESDIR}/${P}-unbundle-shflags.patch )
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
- [[ ${PATCHES[@]} ]] epatch ${PATCHES[@]}
- debug-print $FUNCNAME: applying user patches
- epatch_user
-}
-
-src_compile() {
- true
-}
-
-src_install() {
- emake prefix=${D}/usr install
-
- [[ ${DOCS[@]} ]] dodoc ${DOCS[@]}
-
- newbashcomp ${WORKDIR}/${COMP_P}/${COMP_PN}.bash ${PN}
-}
diff --git a/dev-vcs/git-flow/metadata.xml b/dev-vcs/git-flow/metadata.xml
deleted file mode 100644
index 4f5a42e..000
--- a/dev-vcs/git-flow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-?xml version=1.0 encoding=UTF-8?
-!DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
-pkgmetadata
- maintainer
- emailj...@gentoo.org/email
- nameJohannes Huber/name
- /maintainer
- upstream
- remote-id type=githubnvie/gitflow/remote-id
- /upstream
-/pkgmetadata
[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/, dev-vcs/git-flow/files/
commit: 316abb925691051864ca9d838fb5ff98b95bae2c
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon Mar 17 20:03:58 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Mar 17 20:03:58 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=316abb92
[dev-vcs/git-flow] Patch handling
* rename patch
* support PATCHES array
* support user patches via epatch_user
Package-Manager: portage-2.2.8-r1
---
...system-shflags.patch = git-flow-0.4.1-unbundle-shflags.patch} | 0
dev-vcs/git-flow/git-flow-0.4.1.ebuild| 8 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/git-flow/files/system-shflags.patch
b/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
similarity index 100%
rename from dev-vcs/git-flow/files/system-shflags.patch
rename to dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch
diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
index 55ceae3..e1262fe 100644
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
@@ -22,10 +22,14 @@ RDEPEND=${DEPEND}
DOCS=( AUTHORS Changes.mdown README.mdown )
+PATCHES=( ${FILESDIR}/${P}-unbundle-shflags.patch )
+
S=${WORKDIR}/nvie-gitflow-5b26edc
src_prepare() {
- epatch ${FILESDIR}/system-shflags.patch
+ [[ ${PATCHES[@]} ]] epatch ${PATCHES[@]}
+ debug-print $FUNCNAME: applying user patches
+ epatch_user
}
src_compile() {
@@ -35,7 +39,7 @@ src_compile() {
src_install() {
emake prefix=${D}/usr install
- dodoc ${DOCS[@]}
+ [[ ${DOCS[@]} ]] dodoc ${DOCS[@]}
newbashcomp
${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash
git-flow
}
[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/
commit: 3c9a7fbd013074aa071bd0a9374ab664f69be1f0
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon Mar 17 19:51:06 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Mar 17 19:51:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=3c9a7fbd
[dev-vcs/git-flow] Fix install location
Binaries were install to /bin instead of /usr/bin.
Package-Manager: portage-2.2.8-r1
---
dev-vcs/git-flow/git-flow-0.4.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
index 6949f44..55ceae3 100644
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
@@ -33,7 +33,7 @@ src_compile() {
}
src_install() {
- emake prefix=${D} install
+ emake prefix=${D}/usr install
dodoc ${DOCS[@]}
[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/
commit: 2d6bbc05fb77cebb77bd827b79fe31668be5cf60
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon Mar 17 21:26:11 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Mar 17 21:26:11 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=2d6bbc05
[dev-vcs/git-flow] Use more vars
Package-Manager: portage-2.2.8-r1
---
dev-vcs/git-flow/Manifest | 4 ++--
dev-vcs/git-flow/git-flow-0.4.1.ebuild | 14 --
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dev-vcs/git-flow/Manifest b/dev-vcs/git-flow/Manifest
index 55db3ec..16e9584 100644
--- a/dev-vcs/git-flow/Manifest
+++ b/dev-vcs/git-flow/Manifest
@@ -1,2 +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
+DIST git-flow-0.4.1.tar.gz 16732 SHA256
c1271b0ba2c6655e4ad4d79562f6a910c3b884f3d4e16985e227e67f8d95c180 SHA512
f86edb2867ed55127a34c711f5e6b11daeb6a738e92005fe27879c9ede40cb4130ff1de35e9f69560c4c845e063a8d2c1a76ad52eb5eacb7312a087f77d2698b
WHIRLPOOL
9ad859237cab91209acfa87ddcc70f975af1b5816e202f8b867de903e05a755174803e286a5e8d595edb1612b7b321f7fe21b405fb388b8bef155ece82cb4ccf
+DIST git-flow-completion-0.4.2.2.tar.gz 5421 SHA256
1e82d039596c0e73bfc8c59d945ded34e4fce777d9b9bb45c3586ee539048ab9 SHA512
609653b6eaedabc4f31bb19d93b50bc48746876a2c351f139b79b48599104d49ba281400e8708a83411610cf57ce08a9ae941b0611216c11d80f8c01e0fa8409
WHIRLPOOL
9d2f4ec100932c2e349924620a4dbe3a98e9b6d93fcfbeb0ee065e13873da74af8e059dae5acf158088c541bfdb3aa49446ee789576aab5532e8322ab9530c15
diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
index ab9eb59..ed33286 100644
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
@@ -4,14 +4,16 @@
EAPI=5
+MY_PN=${PN/-/}
+COMP_PV=0.4.2.2
inherit eutils bash-completion-r1
-DESCRIPTION=Git extensions to provide high-level repository operations for
Vincent Driessen's branching model.
+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
-https://github.com/bobthecow/git-flow-completion/tarball/0.4.1.0 -
${P}-completion.tar.gz
+SRC_URI=https://github.com/nvie/${MY_PN}/archive/${PV}.tar.gz - ${P}.tar.gz
+https://github.com/bobthecow/${PN}-completion/archive/${COMP_PV}.tar.gz -
${PN}-completion-${COMP_PV}.tar.gz
-LICENSE=BSD
+LICENSE=BSD MIT
SLOT=0
KEYWORDS=~amd64 ~x86
IUSE=
@@ -26,7 +28,7 @@ DOCS=( AUTHORS Changes.mdown README.mdown )
PATCHES=( ${FILESDIR}/${P}-unbundle-shflags.patch )
-S=${WORKDIR}/nvie-gitflow-5b26edc
+S=${WORKDIR}/${MY_PN}-${PV}
src_prepare() {
[[ ${PATCHES[@]} ]] epatch ${PATCHES[@]}
@@ -43,5 +45,5 @@ src_install() {
[[ ${DOCS[@]} ]] dodoc ${DOCS[@]}
- newbashcomp
${WORKDIR}/bobthecow-git-flow-completion-b399150/git-flow-completion.bash
git-flow
+ newbashcomp
${WORKDIR}/${PN}-completion-${COMP_PV}/${PN}-completion.bash ${PN}
}
[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/
commit: 550cc66e3a4170348500822f7f8a8a2dfadcc4fb
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon Mar 17 20:07:32 2014 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Mar 17 20:07:32 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=dev/johu.git;a=commit;h=550cc66e
[dev-vcs/git-flow] Move dev-util/shflags RDEPEND
* Not needed at compile time
Package-Manager: portage-2.2.8-r1
---
dev-vcs/git-flow/git-flow-0.4.1.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
index e1262fe..ab9eb59 100644
--- a/dev-vcs/git-flow/git-flow-0.4.1.ebuild
+++ b/dev-vcs/git-flow/git-flow-0.4.1.ebuild
@@ -16,9 +16,11 @@ SLOT=0
KEYWORDS=~amd64 ~x86
IUSE=
-DEPEND=dev-util/shflags
+DEPEND=
RDEPEND=${DEPEND}
- dev-vcs/git
+ dev-util/shflags
+ dev-vcs/git
+
DOCS=( AUTHORS Changes.mdown README.mdown )
