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)

4 files changed, 52 insertions, 7 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/Manifest b/dev-vcs/git-cola/Manifest
index f76d1bb..b3c94f5 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA512
 
 AUX 9999-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636d SHA1 49daeb7442f7a859d9c37b58e525d6c3498760f4 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465
+AUX 9999-system-ssh-askpass.patch 1231 RMD160 5e9d5acb2d2ef8fd375c48748e72d1813eb96a37 SHA1 d07aa3e417542b283c2a8360839851bfc88275da SHA256 2714fc6b0b5a5ed13b0c24a9c04d928c4aa2ac6f35f792fa5708c90e339e5f89
 AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60
-EBUILD git-cola-9999.ebuild 1789 RMD160 384d1934073ec010d956d4705d26063d56702306 SHA1 990a7cd8bb4cbb3b6d5044c90240478ec036c04f SHA256 569e05cc9038e60f185ea1d1cb8a59a17a6c5610acae5858235206f42acce3ff
-MISC ChangeLog 3070 RMD160 c4a94cc5efb06af104433cf8ec1c697732ff03d8 SHA1 d25754415866dd5a602387493bb3e094283c8f58 SHA256 353f498fd1a21fa4bd5813e5602a239c7bddf9dc367fcbcddba52bc814b0d9f0
+EBUILD git-cola-9999.ebuild 2084 RMD160 e34b6b955454950a6b09e54f0b6f9d7637df8aa0 SHA1 9e204bbf08d7b6465fdb02922e5a707c51eb58eb SHA256 c8355f2e24a05f3d7feff087bf09352a12d57073202f957476db07a8d6cc2054
+MISC ChangeLog 3234 RMD160 4c8a9489e93003a81dbc81abb99d48177a8ab5db SHA1 4c5fd54a9779cac9dfefc66e10c3d98a187c7a61 SHA256 77d1ba9625b2195ae8f6037fafe5394ca2fe63d8aeb2344be3b2160d7312d6c1
 MISC metadata.xml 327 RMD160 bbcc6c45cde41ee3e186fb09024c487df2cf2aa0 SHA1 1aedaad61ffd291249e17d81b95ac2c3577a5b4e SHA256 58d6d26898968598d329ec34fc35da837fb8f6dab1271581091ba2c8b9b6fe21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+s7bUACgkQgAnW8HDreRZPDwCfVAEVfMN+MBi1UoxUWRz8xVow
-eQwAoMxAxxOcSmzTboPuv2CUkkaL+nNX
-=DLxu
+iEYEAREKAAYFAk+/kO4ACgkQgAnW8HDreRaBfwCffdjrwaIbRM1hYOwUnephtTCr
+LGsAoJi0Bv+owd2kMgkcFAi63xByIJbN
+=243T
 -----END PGP SIGNATURE-----
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() {