Version bump, dropped old.

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

diff --git a/dev-vcs/cola/ChangeLog b/dev-vcs/cola/ChangeLog
index 5651f366ec2d4934fea3e38616fa0f781e519070..8c5a191de35fb70d54024b4de5b820e3fd9bee9b 100644 (file)
--- a/dev-vcs/cola/ChangeLog
+++ b/dev-vcs/cola/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for dev-util/cola
+# 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.2 2010/06/08 08:19:45 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.3 2010/06/08 12:43:50 dev-zero Exp $
+
+*cola-1.4.2.1 (08 Jun 2010)
+
+  08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> -cola-1.3.9.14.ebuild,
+  +cola-1.4.2.1.ebuild:
+  Version bump, dropped old.
 
   08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
   Moved from dev-util to dev-vcs.

diff --git a/dev-vcs/cola/Manifest b/dev-vcs/cola/Manifest
index bc11ef5c5606a79a71f0be4b5231ba5c4fcf817d..b4830db77415da3eeb243923b4866fd8ecd452a3 100644 (file)
--- a/dev-vcs/cola/Manifest
+++ b/dev-vcs/cola/Manifest
@@ -1,8 +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.9.14-src.tar.gz 467951 RMD160 181d06f079628ab18eca31ec21dbcfd1c7fb649d SHA1 384de8f995e81a128da0939659ae5350fb0a345f SHA256 720031f63a14dc894fb89bcb776d7efc5c9251afe6bf5e324a0709554f7ee633
 DIST cola-1.4.1.2.tar.gz 495321 RMD160 fdc2cd25e99037b4932993ac3d326800ee0e00d1 SHA1 04fef64fc3ade812279dc36259917c251d63faec SHA256 643dc847b8b6df051e82243d9eb3ad6f88be21ff50c55468f39224dc1a5e66fc
-EBUILD cola-1.3.9.14.ebuild 1656 RMD160 bff3dd2ca415a0e89eda1ddda01f5ad8ccdd3b2e SHA1 189e9c4b42f40844a9cad397968316bc704940f1 SHA256 7ac0048d3e3322a19c2b1c6b6ff335ed128d60c79370ff3d7ad333fa2f993072
+DIST cola-1.4.2.1.tar.gz 512911 RMD160 be54bdb3fae1e9907b1296bbf0d19016bc275e4e SHA1 ac825c9628c690e18d359b14b79672f494cfcc55 SHA256 1d099c0f3fdb8f1bb751a9e0eca00c559f21a5dbdc9cc80be5928df8ebd82a35
 EBUILD cola-1.4.1.2.ebuild 1881 RMD160 4275af108a10d3c03f1f3bb186a20cb84b24ff60 SHA1 2119c149a087b0e2554e4336cff49d876fff4eda SHA256 7dc33fcdf551ea3bd53be9ae38a1db95bff531793dedfc3dcc65bd321c8af954
-MISC ChangeLog 1571 RMD160 2bf4139f2f020bc55fc08ee9eee0a7fa6dcc3e8a SHA1 d7291efd561f1c005cccf45b461510af4a8e53e4 SHA256 27008d6dacc749652aad464d5b90e730090d75a87b6decd6863655f4b5b3ba1d
+EBUILD cola-1.4.2.1.ebuild 1785 RMD160 27d003d8aed7021c54c6e504afaf5bbdede95657 SHA1 7531b701f7a35d6f4516bfbc60b5ac43d3c1e017 SHA256 90ea593c4b037c0506f7e224c9c9fcbe751af7b3f411cea45c2a99ce3adb037e
+MISC ChangeLog 1729 RMD160 9336999d12c5ae0dd107d228943bab692f1d9826 SHA1 b71b17f9f1bd1b962ca58eb29c303e241fe0f6db SHA256 7d195f86fafb3a3d275f67b13b7a550cf00a3bcfd58eb6d63466a4387fefbd3a
 MISC metadata.xml 258 RMD160 f41059a7f29a2b5493ad80203a94a9a519bc5dcf SHA1 ebaf62e3133e26efd7eaac694e53d0398c2bc0de SHA256 79e17085ca01237995cedc73430ae1c4bbd3092968cffe18ea41237f7a2c1939

diff --git a/dev-vcs/cola/cola-1.3.9.14.ebuild b/dev-vcs/cola/cola-1.4.2.1.ebuild
similarity index 72%
rename from dev-vcs/cola/cola-1.3.9.14.ebuild
rename to dev-vcs/cola/cola-1.4.2.1.ebuild
index 55a1873cb23af1dc4460d3380567b03c0bb7f67e..e6115aae2898ad1b50a9ce61f8e20ac76fde0139 100644 (file)
--- a/dev-vcs/cola/cola-1.3.9.14.ebuild
+++ b/dev-vcs/cola/cola-1.4.2.1.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.3.9.14.ebuild,v 1.1 2010/06/08 08:15:04 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/cola-1.4.2.1.ebuild,v 1.1 2010/06/08 12:43:50 dev-zero Exp $
 
-EAPI="2"
+EAPI="3"
+
+PYTHON_DEPEND="2:2.6"
 
 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"
 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-vcs/git"
 DEPEND="${RDEPEND}
-       doc? ( app-text/asciidoc )
+       doc? ( app-text/asciidoc
+               dev-python/sphinx
+               app-text/xmlto )
        test? ( dev-python/nose )"
 
 src_prepare() {
@@ -28,6 +31,11 @@ src_prepare() {
        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
 
@@ -53,13 +61,15 @@ src_install() {
        dodoc *.txt
 
        if use doc ; then
-               dohtml *.html
+               dohtml -r _build/html/*
                doman *.1
+       else
+               dohtml "${FILESDIR}/index.html"
        fi
 }
 
 src_test() {
-       PYTHONPATH="$(pwd):$(pwd)/build/lib:${PYTHONPATH}" nosetests \
+       PYTHONPATH="${S}:${S}/build/lib:${PYTHONPATH}" nosetests \
                --verbose --with-doctest --with-id --exclude=jsonpickle --exclude=json \
                || die "running nosetests failed"
 }