Version bump. Removed old.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 14 insertions, 168 deletions

diff --git a/dev-util/cola/ChangeLog b/dev-util/cola/ChangeLog
index 710f69f4e4a5..9af4422a5df8 100644
--- a/dev-util/cola/ChangeLog
+++ b/dev-util/cola/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/cola
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cola/ChangeLog,v 1.6 2009/12/16 20:08:49 dev-zero Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cola/ChangeLog,v 1.7 2010/01/18 21:17:45 dev-zero Exp $
+
+*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)
 
diff --git a/dev-util/cola/Manifest b/dev-util/cola/Manifest
index 6baa1888c616..678627689100 100644
--- a/dev-util/cola/Manifest
+++ b/dev-util/cola/Manifest
@@ -1,12 +1,8 @@
 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.3.8-src.tar.gz 446293 RMD160 40ae91596013ae58e6d9d6f62b95fe034b61833a SHA1 5c43db92112f5133c48d7087e5591bdcbbaf9716 SHA256 c261cda0fd9d1d2440821aaf7e1094ea144bfaa230a3c4d20fa2361c00542be9
 DIST cola-1.3.9.14-src.tar.gz 467951 RMD160 181d06f079628ab18eca31ec21dbcfd1c7fb649d SHA1 384de8f995e81a128da0939659ae5350fb0a345f SHA256 720031f63a14dc894fb89bcb776d7efc5c9251afe6bf5e324a0709554f7ee633
-DIST cola-1.4.0.1-src.tar.gz 497767 RMD160 fda17c08b5cb0ac35ac491944d4d2453e9d04eeb SHA1 d7727648cdc5aa8be3af61b498a3d6480630f7ef SHA256 8e2cc11f91016f324eaacca1d6d3db7aa0949bbb1dc5e3434d48ad7818d4ec20
-DIST cola-1.4.1.1-src.tar.gz 514716 RMD160 cb3c2869bf3c596b057956d1ba249430d6df50d3 SHA1 f7981c2af5c125fa8f7ed8260c8b156898e2e813 SHA256 87041f403be7cdcf8fabf587be4afda12a65e1bfae59ae94e4daf07c3852028c
-EBUILD cola-1.3.8.ebuild 1648 RMD160 084374ba36fd6720643f0e56f5abcc2682e0ca52 SHA1 144eaaff105d9db142257029ffca446582a5541d SHA256 430dccd1145ef43f97960f9b057abdbc5ac268a2c833d1a1e01311b8f62f5918
+DIST cola-1.4.1.2.tar.gz 495321 RMD160 fdc2cd25e99037b4932993ac3d326800ee0e00d1 SHA1 04fef64fc3ade812279dc36259917c251d63faec SHA256 643dc847b8b6df051e82243d9eb3ad6f88be21ff50c55468f39224dc1a5e66fc
 EBUILD cola-1.3.9.14.ebuild 1658 RMD160 a845c084f3d19749d76c6f76a090d3929e508f88 SHA1 2dc1d4d9e7e90dc70cef351a5cd5397afac7b118 SHA256 b91b331737693f558fff22273e0c412779948d9990bcbb678819011cf3460d1a
-EBUILD cola-1.4.0.1.ebuild 1887 RMD160 56d9d663601960eb88cd71656139509e028e2f69 SHA1 1e5bc3ba346c29bc7bc5bcb8e3b8aea00c0a126f SHA256 ac692e5564619327100b354d969d1b2f9057c885e759d6d5ee73f8f2871d51fd
-EBUILD cola-1.4.1.1.ebuild 1887 RMD160 365ebb01489c0d83b22d5c2cacee2f211361c993 SHA1 6b4936144c3c675608cb3277ce294e0e124c4323 SHA256 7f84954a880c769d42ca8fae5b347bf992edb1bec9e7c8c42dd368e0dc0c89b5
-MISC ChangeLog 1127 RMD160 4280c3467ebc5a6b9f852070d9b3af6f0e878961 SHA1 ba93e09a03813a3e571eb3952cd25f3797662b39 SHA256 90608510aebe7e35241836cc21b6be1233accf406422949fb6692a0fb4188170
+EBUILD cola-1.4.1.2.ebuild 1883 RMD160 f3ca0c719b47143d7d91cd8c0e8b99336ec40317 SHA1 96c32790fa03aba663f99ab1e698939165ebba28 SHA256 3cb207cffd2f2df846beb8da42565c88d890960540010024d4def304e39cd40d
+MISC ChangeLog 1327 RMD160 774d2e70432be2a1ee6732222ad2bf3874ae8197 SHA1 55f3b157110788d90b734dab8a18fa53299a2c2e SHA256 990f26a0723f7279ebb9695e1407dbb76de32eba98503441e37a75f56580a76e
 MISC metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf SHA1 ebaf62e3133e26efd7eaac694e53d0398c2bc0de SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939
diff --git a/dev-util/cola/cola-1.3.8.ebuild b/dev-util/cola/cola-1.3.8.ebuild
deleted file mode 100644
index 5e8b5ebd42ce..000000000000
--- a/dev-util/cola/cola-1.3.8.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cola/cola-1.3.8.ebuild,v 1.3 2009/06/30 20:47:46 fauli Exp $
-
-EAPI="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}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/PyQt4
-	|| ( >=dev-lang/python-2.6 ( =dev-lang/python-2.5* dev-python/simplejson ) )
-	>=dev-python/pyinotify-0.7.1
-	dev-python/jsonpickle
-	dev-util/git"
-DEPEND="${RDEPEND}
-	doc? ( app-text/asciidoc )
-	test? ( dev-python/nose )"
-
-src_prepare() {
-	# don't install docs into wrong location
-	sed -i \
-		-e '/doc/d' \
-		setup.py || die "sed failed"
-	# don't prefix install path with homedir
-	rm setup.cfg
-
-	epatch "${FILESDIR}/${PV}-disable-tests.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc ; then
-		cd share/doc/git-cola/
-		emake || die "building docs failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	# remove bundled libraries
-	rm -rf "${D}"/usr/share/git-cola/lib/{jsonpickle,simplejson}
-
-	cd share/doc/git-cola/
-	dodoc *.txt
-
-	if use doc ; then
-		dohtml *.html
-		doman *.1
-	fi
-}
-
-src_test() {
-	PYTHONPATH="$(pwd):$(pwd)/build/lib:${PYTHONPATH}" nosetests \
-		--verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
-		|| die "running nosetests failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/git-cola
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/git-cola
-}
diff --git a/dev-util/cola/cola-1.4.1.1.ebuild b/dev-util/cola/cola-1.4.1.1.ebuild
deleted file mode 100644
index b518713a964c..000000000000
--- a/dev-util/cola/cola-1.4.1.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cola/cola-1.4.1.1.ebuild,v 1.1 2009/12/16 20:08:49 dev-zero Exp $
-
-EAPI="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}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-python/PyQt4
-	|| ( >=dev-lang/python-2.6 ( =dev-lang/python-2.5* dev-python/simplejson ) )
-	>=dev-python/pyinotify-0.7.1
-	dev-python/jsonpickle
-	dev-util/git"
-DEPEND="${RDEPEND}
-	doc? ( app-text/asciidoc
-		dev-python/sphinx
-		app-text/xmlto )
-	test? ( dev-python/nose )"
-
-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'|" \
-		-e 's|git-cola.html|index.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"
-}
-
-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}
-
-	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="$(pwd):$(pwd)/build/lib:${PYTHONPATH}" nosetests \
-		--verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
-		|| die "running nosetests failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/git-cola
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/git-cola
-}
diff --git a/dev-util/cola/cola-1.4.0.1.ebuild b/dev-util/cola/cola-1.4.1.2.ebuild
index e9e59802f0ec..87c389fd440a 100644
--- a/dev-util/cola/cola-1.4.0.1.ebuild
+++ b/dev-util/cola/cola-1.4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cola/cola-1.4.0.1.ebuild,v 1.1 2009/11/03 09:04:27 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cola/cola-1.4.1.2.ebuild,v 1.1 2010/01/18 21:17:45 dev-zero Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ 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}-src.tar.gz"
+SRC_URI="http://cola.tuxfamily.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"