+++ /dev/null
-diff --git a/cola/app.py b/cola/app.py
-index f9236de..4636c81 100644
---- a/cola/app.py
-+++ b/cola/app.py
-@@ -66,9 +66,9 @@ def setup_environment():
- elif ssh_askpass:
- askpass = ssh_askpass
- elif sys.platform == 'darwin':
-- askpass = resources.share('bin', 'ssh-askpass-darwin')
-+ askpass = resources.prefix('bin', 'ssh-askpass-darwin')
- else:
-- askpass = resources.share('bin', 'ssh-askpass')
-+ askpass = resources.prefix('bin', 'ssh-askpass')
-
- compat.setenv('GIT_ASKPASS', askpass)
- compat.setenv('SSH_ASKPASS', askpass)
+++ /dev/null
-diff -Naur cola-1.3.7.21.orig/test/git_test.py cola-1.3.7.21/test/git_test.py
---- cola-1.3.7.21.orig/test/git_test.py 2009-04-30 13:56:22.352319047 +0200
-+++ cola-1.3.7.21/test/git_test.py 2009-04-30 13:56:53.123149963 +0200
-@@ -24,17 +24,6 @@
- version = self.git.version()[STDOUT]
- self.failUnless(version.startswith('git version'))
-
-- def test_tag(self):
-- """Test running 'git tag'"""
-- tags = self.git.tag()[STDOUT].splitlines()
-- self.failUnless( 'v1.0.0' in tags )
--
-- def test_show(self):
-- """Test running 'git show'"""
-- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084'
-- contents = self.git.show(sha)[STDOUT].splitlines()
-- self.failUnless(contents[0] == '/build')
--
- def test_stdout(self):
- """Test overflowing the stdout buffer"""
- # Write to stdout only
+++ /dev/null
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 readme.gentoo virtualx
-
-DESCRIPTION="The highly caffeinated git GUI"
-HOMEPAGE="https://git-cola.github.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-REQUIRED_USE="doc? ( python_targets_python2_7 )"
-
-RDEPEND="
- dev-python/jsonpickle[${PYTHON_USEDEP}]
- dev-python/pyinotify[${PYTHON_USEDEP}]
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-vcs/git"
-DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
- sys-devel/gettext
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinxtogithub[$(python_gen_usedep 'python2*')]
- )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- sys-apps/net-tools
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.9.3-disable-tests.patch
- "${FILESDIR}"/${PN}-1.9.1-system-ssh-askpass.patch
- )
-
-pkg_pretend() {
- if use test && [[ -z "$(hostname -d)" ]] ; then
- die "Test will fail if no domain is set"
- fi
-}
-
-python_prepare_all() {
- rm share/git-cola/bin/*askpass* || die
-
- # unfinished translate framework
- rm test/i18n_test.py || die
-
- # 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}'|" \
- cola/resources.py || die "sed failed"
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- cd share/doc/${PN}/
- if use doc ; then
- emake all
- else
- sed \
- -e '/^install:/s:install-html::g' \
- -e '/^install:/s:install-man::g' \
- -i Makefile || die
- fi
-}
-
-python_test() {
- PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" LC_ALL="C" \
- VIRTUALX_COMMAND="nosetests --verbose \
- --with-id --with-doctest --exclude=sphinxtogithub" \
- virtualmake
-}
-
-src_install() {
- distutils-r1_src_install
-}
-
-python_install_all() {
- cd share/doc/${PN}/ || die
- emake \
- DESTDIR="${D}" \
- docdir="${EPREFIX}/usr/share/doc/${PF}" \
- prefix="${EPREFIX}/usr" \
- install
-
- python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase"
- python_optimize "${ED}/usr/share/git-cola/lib/cola"
-
- if ! use doc ; then
- HTML_DOCS=( "${FILESDIR}"/index.html )
- fi
-
- distutils-r1_python_install_all
- readme.gentoo_create_doc
- docompress /usr/share/doc/${PF}/git-cola.txt
-}