[gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/

["Justin Lecher" <jlec@gentoo.org>]

commit:     e97e52c4df9c015a4d5c4c60ad073dad9e25de02
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 10:45:09 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri May 11 10:45:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=e97e52c4

dev-vcs/git-cola: Fix to latest Head

(Portage version: 2.2.0_alpha103/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 dev-vcs/git-cola/ChangeLog                      |   93 +++++++++++++++++++++++
 dev-vcs/git-cola/files/9999-disable-tests.patch |   21 +++++
 dev-vcs/git-cola/files/index.html               |   15 ++++
 dev-vcs/git-cola/git-cola-9999.ebuild           |   91 ++++++++++++++++++++++
 dev-vcs/git-cola/metadata.xml                   |   12 +++
 5 files changed, 232 insertions(+), 0 deletions(-)

diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog
new file mode 100644
index 0000000..5b8fcc3
--- /dev/null
+++ b/dev-vcs/git-cola/ChangeLog
@@ -0,0 +1,93 @@
+# ChangeLog for dev-vcs/git-cola
+# 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 $
+
+*git-cola-9999 (11 May 2012)
+
+  11 May 2012; Justin Lecher <jlec@gentoo.org> +files/9999-disable-tests.patch,
+  +git-cola-9999.ebuild, +files/index.html, +metadata.xml:
+  Fix to latest Head
+
+  27 Oct 2011; Justin Lecher <jlec@gentoo.org> cola-9999.ebuild, metadata.xml:
+  Removed no-herd from herd tag in metadata.xml
+
+  27 Oct 2011; Justin Lecher <jlec@gentoo.org> cola-9999.ebuild:
+  Bump git.eclass to git-2.eclass
+
+*cola-9999 (15 Apr 2011)
+
+  15 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/9999-disable-tests.patch,
+  +cola-9999.ebuild, +files/index.html, +metadata.xml:
+  Added live ebuild for dev-vcs/cola
+
+*cola-1.4.3.2 (13 Apr 2011)
+
+  13 Apr 2011; Justin Lecher <jlec@gentoo.org> +cola-1.4.3.2.ebuild:
+  Non-Maintainer Version Bump
+
+*cola-1.4.3.1 (30 Mar 2011)
+
+  30 Mar 2011; Justin Lecher <jlec@gentoo.org> +cola-1.4.3.1.ebuild:
+  Non maintainer Version Bump
+
+  25 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cola-1.4.3.ebuild:
+  Use Python 2 (bug #329473).
+
+*cola-1.4.3 (25 Jan 2011)
+
+  25 Jan 2011; Tiziano Müller <dev-zero@gentoo.org> +cola-1.4.3.ebuild:
+  Version bump (bug #351580). Also solved: the installation of localization
+  files (bug #348130), adaption to python eclass changes (bug #329473).
+
+  09 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> cola-1.4.2.1.ebuild:
+  Version bump.
+
+*cola-1.4.2.1 (08 Jun 2010)
+
+  08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> -cola-1.3.9.14.ebuild,
+  +cola-1.4.2.1.ebuild:
+  Version bump, dropped old.
+
+  08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Moved from dev-util to dev-vcs.
+
+  17 Mar 2010; Sebastian Pipping <sping@gentoo.org> cola-1.3.9.14.ebuild,
+  cola-1.4.1.2.ebuild:
+  Propagate move of dev-util/git to dev-vcs/git
+
+*cola-1.4.1.2 (18 Jan 2010)
+
+  18 Jan 2010; Tiziano Müller <dev-zero@gentoo.org> -cola-1.3.8.ebuild,
+  -cola-1.4.0.1.ebuild, -cola-1.4.1.1.ebuild, +cola-1.4.1.2.ebuild:
+  Version bump. Removed old.
+
+*cola-1.4.1.1 (16 Dec 2009)
+
+  16 Dec 2009; Tiziano Müller <dev-zero@gentoo.org> +cola-1.4.1.1.ebuild:
+  Version bump.
+
+*cola-1.4.0.1 (03 Nov 2009)
+
+  03 Nov 2009; Tiziano Müller <dev-zero@gentoo.org> +cola-1.4.0.1.ebuild,
+  +files/index.html:
+  Version bump, fixed doc deps and doc installation ^Cug #291439, thanks to
+  Man Shankar).
+
+*cola-1.3.9.14 (26 Aug 2009)
+
+  26 Aug 2009; Tiziano Müller <dev-zero@gentoo.org> +cola-1.3.9.14.ebuild:
+  Version bump.
+
+  30 Jun 2009; Christian Faulhammer <fauli@gentoo.org> cola-1.3.8.ebuild:
+  keyworded ~arch for x86, bug 275353
+
+  19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org> cola-1.3.8.ebuild:
+  Require pyinotify >=0.7.1 (thanks to a.peyser).
+
+*cola-1.3.8 (19 Jun 2009)
+
+  19 Jun 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.3.8-disable-tests.patch, +cola-1.3.8.ebuild, +metadata.xml:
+  Initial commit, moved over from my overlay (as requested in bug #274621).
+

diff --git a/dev-vcs/git-cola/files/9999-disable-tests.patch b/dev-vcs/git-cola/files/9999-disable-tests.patch
new file mode 100644
index 0000000..25462c2
--- /dev/null
+++ b/dev-vcs/git-cola/files/9999-disable-tests.patch
@@ -0,0 +1,21 @@
+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/index.html b/dev-vcs/git-cola/files/index.html
new file mode 100644
index 0000000..7f1e814
--- /dev/null
+++ b/dev-vcs/git-cola/files/index.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+	<title>Missing documentation</title>
+</head>
+<body>
+<div style="border: 4px double red; padding: 2em; margin: 4em; top: 4em; width: 20em;">
+	This documentation is missing. Please reinstall dev-util/cola with the 'doc' useflag enabled.
+
+	<p style="text-align: right;">
+	Sincerely,<br/>
+	your package maintainer.
+	</p>
+</div>
+</body>
+</html>

diff --git a/dev-vcs/git-cola/git-cola-9999.ebuild b/dev-vcs/git-cola/git-cola-9999.ebuild
new file mode 100644
index 0000000..dab8fb4
--- /dev/null
+++ b/dev-vcs/git-cola/git-cola-9999.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2.ebuild,v 1.1 2011/04/13 19:00:02 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+EGIT_REPO_URI="git://github.com/davvid/git-cola.git"
+
+inherit distutils eutils git-2
+
+DESCRIPTION="The highly caffeinated git GUI"
+HOMEPAGE="http://git-cola.github.com/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc test"
+
+RDEPEND="
+	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}/9999-disable-tests.patch"
+
+	python_convert_shebangs 2 bin/git-cola bin/git-dag share/git-cola/bin/ssh-askpass
+}
+
+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
+}
+
+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
new file mode 100644
index 0000000..8e67c9e
--- /dev/null
+++ b/dev-vcs/git-cola/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>dev-zero@gentoo.org</email>
+		<name>Tiziano Müller</name>
+	</maintainer>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+</pkgmetadata>