[gentoo-commits] dev/johu:master commit in: dev-vcs/git-flow/

[Johannes Huber]

commit:     2d6bbc05fb77cebb77bd827b79fe31668be5cf60
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 21:26:11 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 21:26:11 2014 +0000
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}
 }