Version bump. Removed old.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

4 files changed, 11 insertions, 161 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/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"