From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXv7E-00025P-7G for garchives@archives.gentoo.org; Fri, 25 May 2012 14:03:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A764BE08FE; Fri, 25 May 2012 14:02:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 67178E089E for ; Fri, 25 May 2012 14:02:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1B751B4025 for ; Fri, 25 May 2012 14:02:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A042DE542D for ; Fri, 25 May 2012 14:02:55 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1337954542.0f539a6c98c29c6bfe4800953a458f7342275634.jlec@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/ X-VCS-Repository: proj/betagarden X-VCS-Files: dev-vcs/git-cola/ChangeLog dev-vcs/git-cola/files/9999-system-ssh-askpass.patch dev-vcs/git-cola/git-cola-9999.ebuild X-VCS-Directories: dev-vcs/git-cola/files/ dev-vcs/git-cola/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 0f539a6c98c29c6bfe4800953a458f7342275634 X-VCS-Branch: master Date: Fri, 25 May 2012 14:02:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 71c78465-5b5e-4b8f-b4c7-a72e5700177d X-Archives-Hash: a37bd03dad84e1faba5ca188fe2c7833 commit: 0f539a6c98c29c6bfe4800953a458f7342275634 Author: Justin Lecher gentoo org> AuthorDate: Fri May 25 14:02:22 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Fri May 25 14:02:22 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/betagarden.gi= t;a=3Dcommit;h=3D0f539a6c 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 $ =20 + 25 May 2012; Justin Lecher + +files/9999-system-ssh-askpass.patch, git-cola-9999.ebuild: + Import tree changes related to ssh_askpass handling + *git-cola-9999 (11 May 2012) =20 11 May 2012; Justin Lecher +files/9999-disable-tests= .patch, diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-v= cs/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 =3D=3D 'darwin': + os.environ.setdefault('SSH_ASKPASS', +- resources.share('bin', 'ssh-askpass-darwi= n')) ++ resources.prefix('bin', 'ssh-askpass-darw= in')) + else: + os.environ.setdefault('SSH_ASKPASS', +- resources.share('bin', 'ssh-askpass')) ++ resources.prefix('bin', 'x11-ssh-askpass'= )) +=20 + # Setup the path so that git finds us when we run 'git cola' + path_entries =3D 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')]) +=20 +- if sys.platform =3D=3D '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 +=20 +=20 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=3D"" IUSE=3D"doc test" =20 RDEPEND=3D" + 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" =20 - epatch "${FILESDIR}/9999-disable-tests.patch" + epatch \ + "${FILESDIR}"/9999-disable-tests.patch \ + "${FILESDIR}"/9999-system-ssh-askpass.patch =20 - python_convert_shebangs 2 bin/git-cola bin/git-dag share/git-cola/bin/s= sh-askpass + python_convert_shebangs 2 bin/git-cola bin/git-dag } =20 src_compile() { @@ -84,6 +87,10 @@ src_test() { =20 pkg_postinst() { python_mod_optimize /usr/share/git-cola/lib/cola + + elog "Please make sure you have either a SSH key management installed a= nd 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. " } =20 pkg_postrm() {