Install zsh-completions unconditionally; do not install broken bash-completions

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 36 insertions, 28 deletions

diff --git a/dev-vcs/hub/ChangeLog b/dev-vcs/hub/ChangeLog
index f365d0738c4a..f7eb38cefc77 100644
--- a/dev-vcs/hub/ChangeLog
+++ b/dev-vcs/hub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/hub
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/ChangeLog,v 1.15 2015/03/06 22:14:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/ChangeLog,v 1.16 2015/03/07 15:28:13 jlec Exp $
+
+  07 Mar 2015; Justin Lecher <jlec@gentoo.org> hub-2.2.0.ebuild:
+  Install zsh-completions unconditionally; do not install broken bash-
+  completions
 
 *hub-2.2.0 (06 Mar 2015)
 
diff --git a/dev-vcs/hub/Manifest b/dev-vcs/hub/Manifest
index 560c2f3c4137..b884dd8a8ba7 100644
--- a/dev-vcs/hub/Manifest
+++ b/dev-vcs/hub/Manifest
@@ -1,22 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST hub-1.12.2.tar.gz 76584 SHA256 e9c49a98a4d90202c33f57d63c6191cd28f0e1d9d7cf54d0e655d3d9d3765e84 SHA512 bbcfec1444c9bde3423a95a885840f790d2251a94d714657d4ddde10c9250b38d0797df36ad70790f2556f4900c10a23f0a496164ee79d4a4cd693b6bcefe25d WHIRLPOOL 97aaaa4914273161df41e78473e5a75c62c2815c8c75e7a27b967479f935f04c6a11735e34c73ad59b9ea870187d49fb6c6d6f06a3d49476de3c43f8032ddbda
 DIST hub-1.12.4.tar.gz 76798 SHA256 b7fe404d7dc5f60554f088bec12de5e80229331430ea0ced46d5bf89ecae5117 SHA512 3c80592954f6f9bd9406adf8faaaf3e307a5387b623b07f06f574e6841899a7e253b67429417ba37c78b53064ddd0188b9f37e3e24130d899207c23bad389618 WHIRLPOOL 46c0870101add366c83d12ea92cfd1d434e841df58101ef8b1250e040cb0fe92590245b3e092780213b837cc2f9d9ad9bd9bff37a110bc608d63cddd7bbf4898
 DIST hub-2.2.0.tar.gz 301460 SHA256 2da1351197eb5696c207f22c69a5422af052d74277b73d0b8661efb9ec1d0eb1 SHA512 ad65cfd2a81ab92ab69d31ff7a068cf2da1557ca1d2f6e1b97b7f939249e9955bb2cace42b8900ec2d5b98970fbca27435edcd503af7ee3c05a79462e7734d8a WHIRLPOOL 83ea1d3b1086d7cdcebed6cb604027763cd41dd3f101dd56827c469ec61034a9e3a7b4cbd1111b5b7820707a13679a558704d80d58fed125f07573fb983dff9a
 EBUILD hub-1.12.2-r1.ebuild 1225 SHA256 9c4d5c60b11cb6fed1edba6fcc598b8c653db255d639c906b92d7a1bba88655c SHA512 f67fa3d4c06b8e5cedbdfe5b3b7fe002ab805de66c2b29173aed0408103619a8519db41a9af91d49557bb1816c58e4e74571ad8da1bfe79704401e86e359451b WHIRLPOOL 0ee553321b8393d76c2e17157edb096f2a7c5c4f4a3d9f42b25d9b48e380d4a215f0d4c51640aecbb091a1135d23435796bbc2c9c3d27b555031298d16fccec4
 EBUILD hub-1.12.4.ebuild 1306 SHA256 5cd1851e273b0863b341d6963efda1dff35053f5b68c3ec7d74cfce4861b1244 SHA512 06e0aede0c3faab6976eb7d6e7959a6e5891578963f2d4477e791efe9610d931175b9e7b7b9764ebb9860557f9bc18ae5b818ca9fe6f0c82ebf7d6a7c45ecf53 WHIRLPOOL 8d5ca3d8d6b2ec57f2f0384124fe06e0d54516995ffa64f12d93f63b1c665af2f94da0d4581dd0566a33280064fff1d6bce85daf44506fc16817b727634f72e9
-EBUILD hub-2.2.0.ebuild 1018 SHA256 997b7d4c9eafb7a7b424a5c38900103160627cf463a11e5cf89a0c9ba9697c5d SHA512 f0aa2ee08385628a7d1000ab56cd84453a72c145661eceef374384198a8a208042bcae42f7b382dd9b7f2c92313689c57d811088d78543c1b6c809034a0ac9a3 WHIRLPOOL 262798e24df3ba37d069de01eb76292c073d69b94eb83a5cd065a7a776d49e27a0b0131bdacd0fa004f977485e55e3088ab62b1da5eb9ee6f7de047d7029650d
-MISC ChangeLog 2346 SHA256 90d8cc62372b43865e8b61b97407614c4d3a4c3b64168b8789705794a958a08c SHA512 73ac16bf9ff3ac56cd349fcd58762060e70e0ecc74ea7c44bb0086035ab358cad141ca01887777b03d2d63d735f1a0f9564e12fe730f7dfb56f15d89067dc319 WHIRLPOOL 4793914816b5d095dcf7a67f1ea291a08f67512f8d5f678f339440633abbd044653aa8fe7b4b35e5aca4559edd18845e005e746a2d7affb8b32d4e03de91f41a
+EBUILD hub-2.2.0.ebuild 980 SHA256 d862444173d9951a55a6eae1448f8561e0c40240927f65d819b38a1537870df3 SHA512 ff9b34688e150f5bade63892e34bb3bae99a2542c0fa6185c310cd2c0f1123ce91ec825164c7098143959963de19d0681a32ad64a34dbf53a8860d51306e6711 WHIRLPOOL 23a2c240b68af806f0970259530fcb1cb9025d080e587f401f8f2f8c2f580f1c57144953e550c849aeefab534ba3510a512e6665f60153b610479b56ae30c97d
+MISC ChangeLog 2495 SHA256 b54f96b364b59a515ce6a11321b6147e3fae514d323f13b9f83369e9025699fb SHA512 7179c0ddfc15c0f336a80d19686305530d5023188d14752626c03bb4dbb25451a468cbc8c5957c8d6249c3d5582c348ad27464bf0ecb7c287eec72f6f16c7c83 WHIRLPOOL 6d5f81f7e4a97e40e5bf30e6e28a9b30acfa555beeb4548757b7639049c5a75587c4dc62c759cb9fadf9eb34dccd4a5ec2fde584dbb1b8af5820369919b01778
 MISC metadata.xml 429 SHA256 bc866460364aeff9652dcb3566b714e0d8a765134729290471a048de6a9e7a4f SHA512 ae082422ef2df2a54cd867fd65d1160800498c0df0af7977fb602532dde59066a3749a42b80f0dcb197f76ae110a0bf7e8a34351d1189b796d35532fe24bc53e WHIRLPOOL fe57b40a351fe69809409dd232a08179ac5da481da320d8e86671af1fb34f58e726fff100fa5dfd4c100528d83e132f93f9391725cb18804ab3aefbc5fc57155
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJU+ibdAAoJEOeBhlrCAAWG45kH/RAqMjFsLQ6O6Xaeg7pqZtuz
-6NURyVuaPgtn+99pQn128/H5aVw6iduriFXpMBDBLunOPlvnGZQJzoasc0ygSxt/
-EnDGuIuu1CNseSLfpa1syD9AYHIyTw9ml+thu7ajXHR5JEn/3X957NQxge7AONJL
-XXPrDhUfSMsmM/IYv9L5DHgF3E9bfrHKCR0KF3yCJhJWTngXzikg5hm1VIG92czl
-tA66wDOmZ7r0n5uvD8GiAtykkyUb9DtXV3M5D3kBJdhHbzCaYS8JHPtxtVZjW5/A
-5/qn2TAaI0i1/l1chtf3d696VUDdYw1X7Cxa9nsH+uEaaCVkHW3PLKbrn0ASb9I=
-=XXMB
+iQJ8BAEBCgBmBQJU+xkVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir2pQP/3nSPDs6ypvzj997GfRyXZyT
+8ogXDjby6KiVO9yAU/wV2iYG7JEeKmLOQyhYa0dHAv66TH8PUDE0SN0Mp1bAx6vh
+H46trSmpO2fpaMW7LFtkA9d0cy5dTJ+L1y6olT6pyKfjmNi1DA739YkT33nsRRm2
+LdpIs8SnT1BqO94Ck/GS8ISRba0viTvdSCC7ZI+rJi/NwXkT5dUcdMhEQ9zwYCGM
+k4bI9+3PUciOq9QkUMYKaz+4a3vcZMjspACbc2DiDm3+XWSqxJ1S835kD8+vz2u1
+DXWtA2njOfH4TZXGspzY/42YT+ThcoS8e82Jagwypgh0HAQ1gRHcAf5wG7Em7Ymw
+t0q/XiVUpKovwFLn78FDaNBb1qnhgQa1lCMiDdeGw/89sf2Fk1NkT8b7L4BsBtoS
+3zOiLTb0cxFh2zl0kr3b8XjkmYkl9pviF213HrjE6201V2ZqPT6iBHr4+dOgzwV8
+cV4d6wy36AU1hdks2sQXHvYVJdUA3VfOozp76VGMtDnbGmNFWPLUDSzpEtwgfT+3
+S/5UZDFlARHNHC+tKENHD+1/Wb8ERTFBNB9lhn/FeURqQ3gnHAASqMHrZqBn+yTj
+llyZHBnoOFPA9xGndRBrVSMCopXYaQdHfmZ4ASfsnT8y8IUVFoAq42PzqAy/sKIB
+KoktQENm6VXyy1UGLr1U
+=V1kC
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/hub/hub-2.2.0.ebuild b/dev-vcs/hub/hub-2.2.0.ebuild
index bbfe8003c308..621ee9ba49c8 100644
--- a/dev-vcs/hub/hub-2.2.0.ebuild
+++ b/dev-vcs/hub/hub-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-2.2.0.ebuild,v 1.1 2015/03/06 22:14:51 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/hub/hub-2.2.0.ebuild,v 1.2 2015/03/07 15:28:13 jlec Exp $
 
 EAPI=5
 
@@ -13,14 +13,11 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="zsh-completion"
-DEPEND="
-	>=dev-lang/go-1.4
-"
-RDEPEND="
-	>=dev-vcs/git-1.7.3
-	zsh-completion? ( app-shells/zsh )
-"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.4"
+RDEPEND=">=dev-vcs/git-1.7.3"
+
 DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
 
 src_compile() {
@@ -30,16 +27,15 @@ src_compile() {
 src_install() {
 	readme.gentoo_create_doc
 
-	exeinto /usr/bin
-	doexe hub
+	dobin hub
 
 	doman man/${PN}.1
 	dodoc README.md
 
-	newbashcomp etc/${PN}.bash_completion.sh ${PN}
+	# Broken with autoloader
+	# https://github.com/github/hub/issues/592
+	# newbashcomp etc/${PN}.bash_completion.sh ${PN}
 
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		newins etc/hub.zsh_completion _${PN}
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
 }