dev-vcs/git-cola: Fix for HEAD

Package-Manager: portage-2.2.7

4 files changed, 14 insertions, 49 deletions

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
index 423b6d3..9eb2e93 100644
--- a/dev-vcs/git-cola/ChangeLog
+++ b/dev-vcs/git-cola/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 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 $
 
+  11 Oct 2013; Justin Lecher <jlec@gentoo.org> git-cola-9999.ebuild,
+  -files/9999-disable-tests.patch, files/9999-system-ssh-askpass.patch:
+  Fix for HEAD
+
   29 Apr 2013; Justin Lecher <jlec@gentoo.org> git-cola-9999.ebuild:
   Always depend on app-text/asciidoc formanpage generation
 
diff --git a/dev-vcs/git-cola/files/9999-disable-tests.patch b/dev-vcs/git-cola/files/9999-disable-tests.patch
deleted file mode 100644
index 25462c2..0000000
--- a/dev-vcs/git-cola/files/9999-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py
---- cola-1.3.7.21.orig/test/test_cola_git.py	2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/test_cola_git.py	2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
-         version = self.git.version()
-         self.failUnless(version.startswith('git version'))
- 
--    def test_tag(self):
--        """Test running 'git tag'"""
--        tags = self.git.tag().splitlines()
--        self.failUnless( 'v1.0.0' in tags )
--
--    def test_show(self):
--        """Test running 'git show'"""
--        sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
--        contents = self.git.show(sha).splitlines()
--        self.failUnless(contents[0] == '/build')
--
-     def test_stdout(self):
-         """Test overflowing the stdout buffer"""
-         # Write to stdout only
diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
index b5133c0..0aa476f 100644
--- a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
+++ b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch
@@ -1,12 +1,8 @@
- cola/app.py | 4 ++--
- setup.py    | 4 ----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
 diff --git a/cola/app.py b/cola/app.py
-index d4351e3..9ec4ba8 100644
+index f9236de..4636c81 100644
 --- a/cola/app.py
 +++ b/cola/app.py
-@@ -69,9 +69,9 @@ def setup_environment():
+@@ -66,9 +66,9 @@ def setup_environment():
      elif ssh_askpass:
          askpass = ssh_askpass
      elif sys.platform == 'darwin':
@@ -16,20 +12,5 @@ index d4351e3..9ec4ba8 100644
 -        askpass = resources.share('bin', 'ssh-askpass')
 +        askpass = resources.prefix('bin', 'ssh-askpass')
  
-     os.environ['GIT_ASKPASS'] = askpass
-     os.putenv('GIT_ASKPASS', askpass)
-diff --git a/setup.py b/setup.py
-index e202edc..81765a1 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
- 
- 
+     compat.setenv('GIT_ASKPASS', askpass)
+     compat.setenv('SSH_ASKPASS', askpass)
diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
index d331989..e67fc25 100644
--- a/dev-vcs/git-cola/git-cola-9999.ebuild
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -32,15 +32,16 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-# tests currently broken due to unfinished translation framework
-RESTRICT="test"
-
 PATCHES=(
-	"${FILESDIR}"/${PV}-disable-tests.patch
 	"${FILESDIR}"/${PV}-system-ssh-askpass.patch
 	)
 
 python_prepare_all() {
+	rm share/git-cola/bin/*askpass* || die
+
+	# unfinished translate framework
+	rm test/test_cola_i18n.py || die
+
 	# don't install docs into wrong location
 	sed -i \
 		-e '/doc/d' \
@@ -65,7 +66,7 @@ python_compile_all() {
 }
 
 python_install_all() {
-	cd share/doc/${PN}/
+	cd share/doc/${PN}/ || die
 	emake \
 		DESTDIR="${D}" \
 		docdir="${EPREFIX}/usr/share/doc/${PF}" \