dev-vcs/hub: fixed bashcomp

Package-Manager: portage-2.2.26

2 files changed, 79 insertions, 0 deletions

diff --git a/dev-vcs/hub/files/hub-2.2.3-bashcomp.patch b/dev-vcs/hub/files/hub-2.2.3-bashcomp.patch
new file mode 100644
index 000000000000..10dee203989c
--- /dev/null
+++ b/dev-vcs/hub/files/hub-2.2.3-bashcomp.patch
@@ -0,0 +1,28 @@
+From 57f1ff3981e2c1f9297f35a90e74dd12025a6fe9 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <ottxor@gentoo.org>
+Date: Fri, 4 Mar 2016 19:18:16 -0700
+Subject: [PATCH] bashcomp: try to load git comp first (fix #592)
+
+---
+ etc/hub.bash_completion.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/etc/hub.bash_completion.sh b/etc/hub.bash_completion.sh
+index f0b4f76..bd84d32 100755
+--- a/etc/hub.bash_completion.sh
++++ b/etc/hub.bash_completion.sh
+@@ -1,6 +1,11 @@
+ # hub tab-completion script for bash.
+ # This script complements the completion script that ships with git.
+ 
++# If there is no git tab completion, but we have the _completion loader try to load it
++if ! declare -F _git > /dev/null && declare -F _completion_loader > /dev/null; then
++  _completion_loader git
++fi
++
+ # Check that git tab completion is available
+ if declare -F _git > /dev/null; then
+   # Duplicate and rename the 'list_all_commands' function
+-- 
+2.4.10
+
diff --git a/dev-vcs/hub/hub-2.2.3-r1.ebuild b/dev-vcs/hub/hub-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..9e3c44b79b29
--- /dev/null
+++ b/dev-vcs/hub/hub-2.2.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 readme.gentoo-r1
+
+DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
+HOMEPAGE="https://github.com/github/hub"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.5.1:="
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+DOC_CONTENTS="You may want to add 'alias git=hub' to your .{csh,bash}rc"
+
+# https://github.com/github/hub/issues/592
+# https://github.com/github/hub/pull/1136	
+PATCHES=( "${FILESDIR}"/"${P}"-bashcomp.patch )
+
+src_compile() {
+	./script/build || die
+}
+
+#src_test() {
+#	./script/test || die
+#}
+
+src_install() {
+	readme.gentoo_create_doc
+
+	dobin hub
+
+	doman man/${PN}.1
+	dodoc README.md
+
+	newbashcomp etc/${PN}.bash_completion.sh ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/hub.zsh_completion _${PN}
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}