Non-Maintainer Version Bump

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

3 files changed, 113 insertions, 15 deletions

diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog
index 0c7730e35152..3f6581c450e9 100644
--- a/dev-vcs/cola/ChangeLog
+++ b/dev-vcs/cola/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/cola
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.7 2011/03/30 08:55:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $
+
+*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)
 
diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest
index 0225013e23e7..4810719b1d01 100644
--- a/dev-vcs/cola/Manifest
+++ b/dev-vcs/cola/Manifest
@@ -4,23 +4,15 @@ Hash: SHA1
 AUX 1.3.8-disable-tests.patch 855 RMD160 0c356e7f28ad1436a1d7d58af1de6b0071e3636d SHA1 49daeb7442f7a859d9c37b58e525d6c3498760f4 SHA256 cb0d81baa5385d1f394b756b9bf21a2ee9b35bb3765ae5a47216519a1e1b6465
 AUX index.html 355 RMD160 f01c51559321acd610cfa38e6ebdaa80a96be8fa SHA1 f08daa85670af655ad92e41026008cb2c1f2d0ef SHA256 9b092445f2da302365c22fae670ad75f8d0a57ca64b4c99bf5662b9999869a60
 DIST cola-1.4.3.1.tar.gz 515571 RMD160 83fe1488705683f812af2ccd9206c67e9f1f3ec0 SHA1 a3fb22f2387cda069559441e11a8f52aa16f381c SHA256 3695e0c86c73c77909988e43c043f33c7394762c44e795996c9214d7edaa732a
+DIST cola-1.4.3.2.tar.gz 515937 RMD160 b387039a7e6945c9cffad41926fc9fed0e39d4c6 SHA1 72fd84839e3c4f9e5e877a92e39a3d7fdd9fecaf SHA256 8a28786e51a5a5ca5aea10a58b5bd0f2dfce6bfa6cbc3a4a1d9395092548063d
 EBUILD cola-1.4.3.1.ebuild 2172 RMD160 1a1d510d7b6dc99b9251ab7c5b0c004d3b9a707b SHA1 208c733214d3b549f9b399fb151eeda15f5ed167 SHA256 627ec6795964cb353dff4567b609f1a45c102d3ee8dd8a5a91c76fc9e61fd459
-MISC ChangeLog 2319 RMD160 cc7263ecfaf4fd4c9161c755ead3d98353951161 SHA1 83debb13a72e1a1b8963021e6523c4a069a58b4f SHA256 60decbc9990a7adcce016fc6b7c96b1250f6d5dc1121b21272e51390bca5bc5a
+EBUILD cola-1.4.3.2.ebuild 2172 RMD160 53bccc22f2b6d84c9c8866c79470248932737bc6 SHA1 78dc0a5cf24b1a02426c1fdc17ac23d999bb9155 SHA256 9bfe2a79f83eda858988db85c7c49a4add461abdb269d620a5c92ceff1d7662f
+MISC ChangeLog 2448 RMD160 49be12f9df208638ac5b9c408ba35d615deb98cb SHA1 5be68b4dd25eb3ddbe109d72295d2e531e6a7916 SHA256 76b0e2f93c8e08cf7e3aad0d66e47286de36c247ded2f9c951ea3c0cfdb4e0ca
 MISC metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf SHA1 ebaf62e3133e26efd7eaac694e53d0398c2bc0de SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNnLbpAAoJENgZr6v6gHY0JWMP/jXi1NGBxANOripqbTy4AEQ/
-sju9uWbFrw5FCUrUWZiYB8q2FakJ0H+JLtXvSLN2Oc9+0fivR+PkTKAqcDe2Zx2S
-nPsgdaLlgzEF5NYCVe/OGpcIgtBNsyGar9FVnmynyT+iQb7laXl90bZxDWc5GQTU
-BbHmK74/0vBNjcuJMap/vqyy8tfxy3kJSyCVkkjJQkyEWSMHcGRQEG2ImBRS/6Ug
-mz2xlww0l8lNKMq+aZP19Lkm/P+onuNy9L+XzcnJ5CEfr/rUTR1H6OTsT2n+7udW
-oaU/7DEayeZB2BG2CSnOaCgvQAgjD2wVYZmxd5G8JWdqIqNFDFKwFdEzmxHVbBB1
-MI/c/MKebIjgfVzhKfs4IVXJza5X/yHTKqx1b4OSxFw6D31AhMpzeUTO0p+3rsMz
-4NOuUm6oyvgrLqRzRIaSLmoW9xTEUIimQal+vIf1GVCpuYt1Ru+ujkTJ6VEkNfv/
-HDOObQlzqYLM0LTNpL/+n/MUZARZloXMTTYZRpIT2p7mmb30CXhMt+tmhxNuOdOm
-xmBCpDYxxFzdOYtZ94XUl1YPLcbXRJJaTz/EHZXYEVOVSwdYIjOV12KKTjz5Chrk
-QKYhncDQjf1Mg0pD67SfwHk6TsCAm+B4SGejt6QlXye/JjqMEVQlyqJHbMWi3Dis
-ol9kbmPCHUO+6P14BL5u
-=AjUI
+iEYEARECAAYFAk2l8rgACgkQgAnW8HDreRauPgCgseyCvaasAqLein7bG0jyXnEc
+3XgAoJ4wE3upEOIrctM75QwDQIXUjujh
+=0Qjb
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/cola/cola-1.4.3.2.ebuild b/dev-vcs/cola/cola-1.4.3.2.ebuild
new file mode 100644
index 000000000000..259ec365c16b
--- /dev/null
+++ b/dev-vcs/cola/cola-1.4.3.2.ebuild
@@ -0,0 +1,101 @@
+# 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.2.ebuild,v 1.1 2011/04/13 19:00:02 jlec 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"
+
+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"
+
+	# 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
+}