[gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/

["Justin Lecher" <jlec@gentoo.org>]

commit:     0f539a6c98c29c6bfe4800953a458f7342275634
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 14:02:22 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri May 25 14:02:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=0f539a6c

dev-vcs/git-cola: Import tree changes related to ssh_askpass handling

(Portage version: 2.2.0_alpha108/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 dev-vcs/git-cola/ChangeLog                         |    4 ++
 .../git-cola/files/9999-system-ssh-askpass.patch   |   32 ++++++++++++++++++++
 dev-vcs/git-cola/git-cola-9999.ebuild              |   11 +++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 5b8fcc3..aae5ee1 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
 
+  25 May 2012; Justin Lecher <jlec@gentoo.org>
+  +files/9999-system-ssh-askpass.patch, git-cola-9999.ebuild:
+  Import tree changes related to ssh_askpass handling
+
 *git-cola-9999 (11 May 2012)
 
   11 May 2012; Justin Lecher <jlec@gentoo.org> +files/9999-disable-tests.patch,

diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
new file mode 100644
index 0000000..665070d
--- /dev/null
+++ b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
@@ -0,0 +1,32 @@
+diff --git a/cola/app.py b/cola/app.py
+index a689fdb..9618c3e 100644
+--- a/cola/app.py
++++ b/cola/app.py
+@@ -52,10 +52,10 @@ def setup_environment():
+     # Provide an SSH_ASKPASS fallback
+     if sys.platform == 'darwin':
+         os.environ.setdefault('SSH_ASKPASS',
+-                              resources.share('bin', 'ssh-askpass-darwin'))
++                              resources.prefix('bin', 'ssh-askpass-darwin'))
+     else:
+         os.environ.setdefault('SSH_ASKPASS',
+-                              resources.share('bin', 'ssh-askpass'))
++                              resources.prefix('bin', 'x11-ssh-askpass'))
+ 
+     # Setup the path so that git finds us when we run 'git cola'
+     path_entries = os.environ.get('PATH').split(os.pathsep)
+diff --git a/setup.py b/setup.py
+index d639eda..90d5fd0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -101,10 +101,6 @@ def cola_data_files():
+     data.extend([_app_path(localedir, 'git-cola.mo')
+                  for localedir in glob('share/locale/*/LC_MESSAGES')])
+ 
+-    if sys.platform == 'darwin':
+-        data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
+-    else:
+-        data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
+     return data
+ 
+ 

diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
index dab8fb4..bbd4f21 100644
--- a/dev-vcs/git-cola/git-cola-9999.ebuild
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -20,6 +20,7 @@ KEYWORDS=""
 IUSE="doc test"
 
 RDEPEND="
+	dev-python/jsonpickle
 	dev-python/pyinotify
 	dev-python/PyQt4
 	dev-vcs/git"
@@ -49,9 +50,11 @@ src_prepare() {
 		-e  "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \
 		cola/resources.py || die "sed failed"
 
-	epatch "${FILESDIR}/9999-disable-tests.patch"
+	epatch \
+	"${FILESDIR}"/9999-disable-tests.patch \
+	"${FILESDIR}"/9999-system-ssh-askpass.patch
 
-	python_convert_shebangs 2 bin/git-cola bin/git-dag share/git-cola/bin/ssh-askpass
+	python_convert_shebangs 2 bin/git-cola bin/git-dag
 }
 
 src_compile() {
@@ -84,6 +87,10 @@ src_test() {
 
 pkg_postinst() {
 	python_mod_optimize /usr/share/git-cola/lib/cola
+
+	elog "Please make sure you have either a SSH key management installed and activated or"
+	elog "installed a SSH askpass app like net-misc/x11-ssh-askpass."
+	elog "Otherwise git-cola may hang when pushing/pulling from remote git repositories via SSH. "
 }
 
 pkg_postrm() {