Version bump (bug #351580). Also solved: the installation of localization files (bug #348130), adaption to python eclass changes (bug #329473).

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

3 files changed, 107 insertions, 3 deletions

diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog
index ce068110f610..9a191cd23005 100644
--- a/dev-vcs/cola/ChangeLog
+++ b/dev-vcs/cola/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/cola
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.4 2010/06/09 19:47:29 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.5 2011/01/25 14:56:23 dev-zero Exp $
+
+*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.
diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest
index 123c80d21be3..8d1081e5af24 100644
--- a/dev-vcs/cola/Manifest
+++ b/dev-vcs/cola/Manifest
@@ -2,7 +2,9 @@ AUX 1.3.8-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636
 AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60
 DIST cola-1.4.1.2.tar.gz 495321 RMD160 fdc2cd25e99037b4932993ac3d326800ee0e00d1 SHA1 04fef64fc3ade812279dc36259917c251d63faec SHA256 643dc847b8b6df051e82243d9eb3ad6f88be21ff50c55468f39224dc1a5e66fc
 DIST cola-1.4.2.1.tar.gz 512911 RMD160 be54bdb3fae1e9907b1296bbf0d19016bc275e4e SHA1 ac825c9628c690e18d359b14b79672f494cfcc55 SHA256 1d099c0f3fdb8f1bb751a9e0eca00c559f21a5dbdc9cc80be5928df8ebd82a35
+DIST cola-1.4.3.tar.gz 512268 RMD160 da914a600114ebe80297ffde9d7988b95e97e1ee SHA1 6441dd0f14fb56ec7a820d9ef27f65be98e21769 SHA256 61455597385695053570e03efe95129e092d7ea0cf7d5e3b3cc2decc8b3f6a7e
 EBUILD cola-1.4.1.2.ebuild 1881 RMD160 4275af108a10d3c03f1f3bb186a20cb84b24ff60 SHA1 2119c149a087b0e2554e4336cff49d876fff4eda SHA256 7dc33fcdf551ea3bd53be9ae38a1db95bff531793dedfc3dcc65bd321c8af954
 EBUILD cola-1.4.2.1.ebuild 1886 RMD160 8664f621b2b7ca509b11b788708c2d4c45fca17d SHA1 cd4464d1c292229ba04b8255083c2e28681fe03f SHA256 f25f573e976be6435cff74d44ad88f8c89d0ff0bdfb2c2ab6839e1fd832e8a81
-MISC ChangeLog 1820 RMD160 b62958dba055e539ac046acf3d13fbb819a678e2 SHA1 01b45a01059a5fd1839bc3ac549c85f82fca016e SHA256 6916bc64ae705fc7a9955fecfc37f75ea30d2009d8d35fc3cef1b408139d3c78
+EBUILD cola-1.4.3.ebuild 2110 RMD160 8b3406f24aef4693a59a68f4bd7b5c54e1af1c65 SHA1 b65e79b0ef0d7e0ada3b39119967e5e3d1bb759a SHA256 3c6e12eff7fb808b4f7fcf8fe863b3f3ca1d71bb3c69f47a86dcce0084549f59
+MISC ChangeLog 2069 RMD160 f79fa5c5e570f577c51e972a679266abc8ff07ab SHA1 01602992237ac360a96fe11c92a89cbbf2e0ebd5 SHA256 521c0ef5cd2c0e11cc307a701e977feb51f706fdb22a30992ff30391c35b6e58
 MISC metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf SHA1 ebaf62e3133e26efd7eaac694e53d0398c2bc0de SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939
diff --git a/dev-vcs/cola/cola-1.4.3.ebuild b/dev-vcs/cola/cola-1.4.3.ebuild
new file mode 100644
index 000000000000..088e2ff431c6
--- /dev/null
+++ b/dev-vcs/cola/cola-1.4.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/01/25 14:56:23 dev-zero Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2"
+
+inherit distutils eutils
+
+DESCRIPTION="A sweet, carbonated git gui known for its sugary flavour and caffeine-inspired features."
+HOMEPAGE="http://cola.tuxfamily.org/"
+SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-python/PyQt4
+	>=dev-python/pyinotify-0.7.1
+	dev-python/jsonpickle
+	>=dev-vcs/git-1.6.3"
+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"
+
+
+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"
+
+	# don't prefix install path with homedir
+	rm setup.cfg
+
+	epatch "${FILESDIR}/1.3.8-disable-tests.patch"
+
+	python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc ; then
+		cd share/doc/git-cola/
+		emake all || die "building docs failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	# remove bundled libraries
+	rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson}
+
+	# remove wrong translation file
+	rm -rf "${D}/usr/share/locale/"
+
+	insinto /usr/share/locale
+	doins -r share/locale/*
+
+	cd share/doc/git-cola/
+	dodoc *.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
+}