Inform the user to install a ssh-askpass app, don't install the tk-based askpass, set the default askpass to be x11-ssh-askpass (bug #415297).

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 148 insertions, 7 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index aa9afc2ff091..fe0b4542b8f6 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/git-cola
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.2 2012/05/11 09:42:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/ChangeLog,v 1.3 2012/05/24 21:19:51 dev-zero Exp $
+
+*git-cola-1.7.7-r1 (24 May 2012)
+
+  24 May 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.7.7-system-ssh-askpass.patch, +git-cola-1.7.7-r1.ebuild,
+  metadata.xml:
+  Inform the user to install a ssh-askpass app, don't install the tk-based
+  askpass, set the default askpass to be x11-ssh-askpass (bug #415297).
 
 *git-cola-1.7.7 (11 May 2012)
 
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 51b909d300ac..7e7e3e44b2fd 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1.3.8-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636d SHA1 49daeb7442f7a859d9c37b58e525d6c3498760f4 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465
+AUX 1.7.7-system-ssh-askpass.patch 1231 RMD160 5e9d5acb2d2ef8fd375c48748e72d1813eb96a37 SHA1 d07aa3e417542b283c2a8360839851bfc88275da SHA256 2714fc6b0b5a5ed13b0c24a9c04d928c4aa2ac6f35f792fa5708c90e339e5f89
 AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60
 DIST cola-1.4.3.4.tar.gz 517209 RMD160 3e51ded13148b09f3c7a8145ec95ae569c1af4ac SHA1 15866ae4fbe21791d9291c51f302a9a1fd276393 SHA256 36e6a1870378a213a5f36a91ac3d38b612cf578822b72e3d97dadc65c79c935b
 DIST cola-1.4.3.5.tar.gz 518482 RMD160 af6e374ee6e17340951490aef514a11454e44ce3 SHA1 cc1258bce1d958a25283d91335b49964371fc008 SHA256 16651f8d17193cb69ae1dd71e455331817876875f84bb76176505ccd8d1b59ed
 DIST git-cola-1.7.7.tar.gz 340187 RMD160 294d247b803dcc46643ee5539434bbf93e93a852 SHA1 648b6fa31da585e12478e7a7076587c3c127ba9d SHA256 6e1db7ea6e3de90a612607bb598225fb4a09bfc75fd8d0d3f164f4e162823008
 EBUILD git-cola-1.4.3.4.ebuild 2232 RMD160 f67d02d1f3b02f9cd5b349388769e64263a9781d SHA1 a234d8e9902cbe786c294f6f983fb50879bc5a0d SHA256 e697e1f748c4ebf123f16c475d1e8cb9965bd60f8d8d532968ec8832188e9e0d
 EBUILD git-cola-1.4.3.5.ebuild 2232 RMD160 e6693c6de5a3b2e513e11e7bcb33bab4b8d62194 SHA1 ed3cd428f5ffc2df757df6c3b1f2d1534ae4a766 SHA256 960e0cf6f9660164bdd7677ed6f3cac006201a019c22c6b7c3f6a0d4feca8ec9
+EBUILD git-cola-1.7.7-r1.ebuild 2115 RMD160 bee203b94d37b9dbde8c6e3cfe57604b9e7125f7 SHA1 6a9d5c4f52512198ea917c23997518a67421b891 SHA256 2a45993c64a560c333b62714104507d1ff76f3c065f8ffd86acef60d99328384
 EBUILD git-cola-1.7.7.ebuild 1833 RMD160 b31af0936c0c8736d016888377bed807209cca04 SHA1 79201c2d3b60fcc32e23dfdb884188d99a729c8b SHA256 d33a16c01fc5ef6743c7f0a64b32c5071a908df962fc29ddcb5e422b19bb98c3
-MISC ChangeLog 3851 RMD160 1fdeb4f0a4a0872eae93a603b98e8c0ac6e464d4 SHA1 ef704203ec1c0f087865ee63c816a0fe71bd3528 SHA256 63cd4e92fef862c4e8909de2cf48d7d3d15650eb1e91f0d8efa4c8c5caddf823
-MISC metadata.xml 327 RMD160 bbcc6c45cde41ee3e186fb09024c487df2cf2aa0 SHA1 1aedaad61ffd291249e17d81b95ac2c3577a5b4e SHA256 58d6d26898968598d329ec34fc35da837fb8f6dab1271581091ba2c8b9b6fe21
+MISC ChangeLog 4174 RMD160 61701841277c59b7a0786a0de3fd1415a984eb4c SHA1 7b71b806f4e9a912086842688987cf52ed062fe2 SHA256 0ae3e40d1466114f38458c51326ff94a2b9ec956e906963a831bdce63729b64a
+MISC metadata.xml 460 RMD160 584a2265909bb5db1ae1c29c5742f2aab6b9be9c SHA1 8cd848b3b1e5901ad4e03c82128a5249c8f0cec3 SHA256 4aebcc51986a23ebbe22837aba99a5cf7ea061ebafc66ecedd291fc735c8b97d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk+s3vAACgkQgAnW8HDreRbtyQCfXS9W/N3G9CVchfWVsXU4ssHv
-bPYAni6iC47e50P5eIpKFNhENC4up9J1
-=FxtD
+iEYEARECAAYFAk++pf0ACgkQGwVqY66cHjAg4wCfcwVqZi2WUUganlfQ8paYOsOa
+JZEAn1OKBmQWZveC4CXe+ke0nePeRo+D
+=4Ix9
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-cola/files/1.7.7-system-ssh-askpass.patch b/dev-vcs/git-cola/files/1.7.7-system-ssh-askpass.patch
new file mode 100644
index 000000000000..665070d7acd1
--- /dev/null
+++ b/dev-vcs/git-cola/files/1.7.7-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-1.7.7-r1.ebuild b/dev-vcs/git-cola/git-cola-1.7.7-r1.ebuild
new file mode 100644
index 000000000000..54a4751f773e
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-1.7.7-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-cola/git-cola-1.7.7-r1.ebuild,v 1.1 2012/05/24 21:19:51 dev-zero Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="http://git-cola.github.com/"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jsonpickle
+	dev-python/pyinotify
+	dev-python/PyQt4
+	dev-vcs/git"
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		dev-python/sphinx
+		app-text/xmlto )
+	sys-devel/gettext
+	test? ( dev-python/nose )"
+
+# tests currently broken due to unfinished translation framework
+RESTRICT="test"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# don't install docs into wrong location
+	sed -i \
+		-e '/doc/d' \
+		setup.py || die "sed failed"
+
+	sed -i \
+		-e  "s|'doc', 'git-cola'|'doc', '${PF}', 'html'|" \
+		cola/resources.py || die "sed failed"
+
+	epatch \
+		"${FILESDIR}"/1.3.8-disable-tests.patch \
+		"${FILESDIR}"/1.7.7-system-ssh-askpass.patch
+
+	python_convert_shebangs 2 bin/git-cola bin/git-dag
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		cd share/doc/git-cola/
+		emake all
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	dodoc share/doc/git-cola/*.txt
+
+	if use doc ; then
+		dohtml -r _build/html/*
+		doman *.1
+	else
+		dohtml "${FILESDIR}/index.html"
+	fi
+}
+
+src_test() {
+	PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" nosetests \
+		--verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
+		|| die "running nosetests failed"
+}
+
+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() {
+	python_mod_cleanup /usr/share/git-cola/lib/cola
+}
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 8e67c9e7a8af..a0a3b9afe563 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -9,4 +9,7 @@
 		<email>jlec@gentoo.org</email>
 		<name>Justin Lecher</name>
 	</maintainer>
+	<use>
+		<flag name='ssh'>Make sure at least one dependency required for asking the user for a password is installed.</flag>
+	</use>
 </pkgmetadata>