Version Bump, Reordering the ebuild layout

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

6 files changed, 142 insertions, 25 deletions

diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog
index 1daecb6adb9e..04a9a4a55010 100644
--- a/dev-vcs/cola/ChangeLog
+++ b/dev-vcs/cola/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2011/04/16 10:08:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.10 2011/04/23 07:05:25 jlec Exp $
+
+*cola-1.4.3.3 (23 Apr 2011)
+
+  23 Apr 2011; Justin Lecher <jlec@gentoo.org> cola-1.4.3.1.ebuild,
+  cola-1.4.3.2.ebuild, cola-1.4.3.2-r1.ebuild, +cola-1.4.3.3.ebuild:
+  Version Bump, Reordering the ebuild layout
 
 *cola-1.4.3.2-r1 (16 Apr 2011)
 
diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest
index ec2334f5002f..a850f73688c0 100644
--- a/dev-vcs/cola/Manifest
+++ b/dev-vcs/cola/Manifest
@@ -6,15 +6,17 @@ AUX 1.4.3.2-backport.patch 10708 RMD160 908eb792fe0f18ff166ffa7d80415fa40d98c688
 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
-EBUILD cola-1.4.3.2-r1.ebuild 2218 RMD160 db7a5db6a2eba849d033044e8f6e9a449f1d71da SHA1 2206c6881945cd77222493d6f92fede8eba92749 SHA256 97a447c03422172139b2ff78387638612be8ddec29fa598c15cfd43a5b93aa13
-EBUILD cola-1.4.3.2.ebuild 2172 RMD160 53bccc22f2b6d84c9c8866c79470248932737bc6 SHA1 78dc0a5cf24b1a02426c1fdc17ac23d999bb9155 SHA256 9bfe2a79f83eda858988db85c7c49a4add461abdb269d620a5c92ceff1d7662f
-MISC ChangeLog 2758 RMD160 66c0e2c90754d0786dafd5410b0109f0a4247f02 SHA1 2df8f09f2f8e0bb84478f2bad2beccf90605d404 SHA256 bd8fa163cb317ebf7f112d90330a9164488a8dbe80522a51c0d8772dd95fa215
+DIST cola-1.4.3.3.tar.gz 516703 RMD160 4d8c5675689d7d50fa5ec08f47db779162b80707 SHA1 9f686fec54e30d992e67c70ee627fff8aa92bd3f SHA256 dbc37472910016bd7052f937689fcc0563df1152b13ffa928cffeffb77b97434
+EBUILD cola-1.4.3.1.ebuild 2160 RMD160 5d711f96200bc2589a76d2151ea0aeed9b4a41b7 SHA1 cc35e095bf8f3583373b47c4e1dd7bfb44ad49dc SHA256 75211aa4d28375861dd3e08fe8acc7cce7bcb0c6e7ab422becd6ebc0c18c5ab7
+EBUILD cola-1.4.3.2-r1.ebuild 2206 RMD160 2c3116046974cfa33b739616c35a26241a6b9cfe SHA1 9fb311c5f78a34022cbc5771b996b634b93a8855 SHA256 265202a47081918b54ada905f06fd72bbb8c905151b7c9cd990b957e4f302959
+EBUILD cola-1.4.3.2.ebuild 2160 RMD160 db7cf2e5f90d34279e72050b1836b03ed500c09a SHA1 d09ec00f6a172436dd3ba19da19d75c7099df3e6 SHA256 1236d21650039b0ae1ef40bb9d0d066aae712ebaefde5cc4f1b5e2e3199a4c0c
+EBUILD cola-1.4.3.3.ebuild 2160 RMD160 862d2519698f9e9cfdab5e247b4ee683ed448234 SHA1 09e520375a46b918a1f95411f703b3e989fed060 SHA256 59d36e9b0dd13dc3621f67679c24c722ed97f6ede4b001d468f19bfafd23775b
+MISC ChangeLog 2971 RMD160 9e13439b4b0e7a9178a6ae4810cbf64998471f64 SHA1 7cc67c73bbda411e8faced6b1ffa692fe73ad904 SHA256 cd6025cee69e436eda50350dfd84764d26a8ebf529cca383832c10af85178c4f
 MISC metadata.xml 349 RMD160 fb4a1597979caa3a909efe57889cb4c1a7dcee94 SHA1 2efefb689ae86be8a7356a62b570bf1fe697ad4c SHA256 9f53dcb4b3e14a9635ffceb50fde105f010db8fcbc02310cc98ec28847fa33a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2pap0ACgkQgAnW8HDreRYDsgCfU6twYMD2unWcd3TSsy3YfYTi
-tucAn1i3O4KNt8mN3BLNM5u1+KDxtT/o
-=Ht8U
+iEYEARECAAYFAk2yejsACgkQgAnW8HDreRZ5iwCfXonClspwBZ5zhtg0J0CbLftG
+9eIAn2cskprxdbVR+l8l3Jj9mb6YUDuw
+=xogU
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/cola/cola-1.4.3.1.ebuild b/dev-vcs/cola/cola-1.4.3.1.ebuild
index 84af4a12be26..681dc2179de2 100644
--- a/dev-vcs/cola/cola-1.4.3.1.ebuild
+++ b/dev-vcs/cola/cola-1.4.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2011/03/30 08:55:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.1.ebuild,v 1.2 2011/04/23 07:05:25 jlec Exp $
 
 EAPI="3"
 
@@ -17,12 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="dev-python/PyQt4
-	>=dev-python/pyinotify-0.7.1
+RDEPEND="
 	dev-python/jsonpickle
-	>=dev-vcs/git-1.6.3"
+	dev-python/pyinotify
+	dev-python/PyQt4
+	dev-vcs/git"
 DEPEND="${RDEPEND}
-	doc? ( app-text/asciidoc
+	doc? (
+		app-text/asciidoc
 		dev-python/sphinx
 		app-text/xmlto )
 	sys-devel/gettext
@@ -49,7 +51,7 @@ src_prepare() {
 	# don't prefix install path with homedir
 	rm setup.cfg
 
-	epatch "${FILESDIR}/1.3.8-disable-tests.patch"
+	epatch "${FILESDIR}"/1.3.8-disable-tests.patch
 
 	python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass
 }
diff --git a/dev-vcs/cola/cola-1.4.3.2-r1.ebuild b/dev-vcs/cola/cola-1.4.3.2-r1.ebuild
index 8ed7bd1a4293..9e4a885997d0 100644
--- a/dev-vcs/cola/cola-1.4.3.2-r1.ebuild
+++ b/dev-vcs/cola/cola-1.4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2011/04/16 10:08:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2-r1.ebuild,v 1.2 2011/04/23 07:05:25 jlec Exp $
 
 EAPI="3"
 
@@ -17,12 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="dev-python/PyQt4
-	>=dev-python/pyinotify-0.7.1
+RDEPEND="
 	dev-python/jsonpickle
-	>=dev-vcs/git-1.6.3"
+	dev-python/pyinotify
+	dev-python/PyQt4
+	dev-vcs/git"
 DEPEND="${RDEPEND}
-	doc? ( app-text/asciidoc
+	doc? (
+		app-text/asciidoc
 		dev-python/sphinx
 		app-text/xmlto )
 	sys-devel/gettext
diff --git a/dev-vcs/cola/cola-1.4.3.2.ebuild b/dev-vcs/cola/cola-1.4.3.2.ebuild
index 259ec365c16b..523e8ed7b586 100644
--- a/dev-vcs/cola/cola-1.4.3.2.ebuild
+++ b/dev-vcs/cola/cola-1.4.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.3.2.ebuild,v 1.2 2011/04/23 07:05:25 jlec Exp $
 
 EAPI="3"
 
@@ -17,12 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="dev-python/PyQt4
-	>=dev-python/pyinotify-0.7.1
+RDEPEND="
 	dev-python/jsonpickle
-	>=dev-vcs/git-1.6.3"
+	dev-python/pyinotify
+	dev-python/PyQt4
+	dev-vcs/git"
 DEPEND="${RDEPEND}
-	doc? ( app-text/asciidoc
+	doc? (
+		app-text/asciidoc
 		dev-python/sphinx
 		app-text/xmlto )
 	sys-devel/gettext
@@ -49,7 +51,7 @@ src_prepare() {
 	# don't prefix install path with homedir
 	rm setup.cfg
 
-	epatch "${FILESDIR}/1.3.8-disable-tests.patch"
+	epatch "${FILESDIR}"/1.3.8-disable-tests.patch
 
 	python_convert_shebangs 2 bin/git-cola share/git-cola/bin/ssh-askpass
 }
diff --git a/dev-vcs/cola/cola-1.4.3.3.ebuild b/dev-vcs/cola/cola-1.4.3.3.ebuild
new file mode 100644
index 000000000000..4e4019d2144f
--- /dev/null
+++ b/dev-vcs/cola/cola-1.4.3.3.ebuild
@@ -0,0 +1,103 @@
+# 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.3.ebuild,v 1.1 2011/04/23 07:05:25 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/jsonpickle
+	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"
+
+	# 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
+}