Version bump.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

3 files changed, 12 insertions, 50 deletions

diff --git a/sys-apps/collectl/ChangeLog b/sys-apps/collectl/ChangeLog
index 403bb44a518f..9338217d913b 100644
--- a/sys-apps/collectl/ChangeLog
+++ b/sys-apps/collectl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/collectl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.11 2010/07/21 13:29:30 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.12 2011/06/15 03:15:51 jer Exp $
+
+*collectl-3.5.1 (15 Jun 2011)
+
+  15 Jun 2011; Jeroen Roovers <jer@gentoo.org> -collectl-3.4.0.ebuild,
+  -collectl-3.4.1.ebuild, +collectl-3.5.1.ebuild:
+  Version bump.
 
 *collectl-3.4.2 (21 Jul 2010)
 
diff --git a/sys-apps/collectl/collectl-3.4.0.ebuild b/sys-apps/collectl/collectl-3.4.0.ebuild
deleted file mode 100644
index 70c62fd27256..000000000000
--- a/sys-apps/collectl/collectl-3.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.4.0.ebuild,v 1.1 2010/01/08 02:30:29 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively as well as logging to disk"
-HOMEPAGE="http://collectl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
-
-LICENSE="GPL-2 Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.8
-	virtual/perl-Time-HiRes
-	>=dev-perl/Archive-Zip-1.20
-	sys-apps/ethtool
-	sys-apps/pciutils"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
-	sed -i \
-		-e "/^DOCDIR/s:doc/collectl:doc/${PF}:" \
-		INSTALL || die
-}
-
-src_install() {
-	DESTDIR=${D} bash -ex ./INSTALL || die
-
-	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd collectl
-
-	cd "${D}"/usr/share/doc/${PF}
-	dohtml * || die
-	rm -f ARTISTIC GPL COPYING *.html *.jpg *.css || die
-	prepalldocs
-}
diff --git a/sys-apps/collectl/collectl-3.4.1.ebuild b/sys-apps/collectl/collectl-3.5.1.ebuild
index e1a1049a640e..069cf85d14c5 100644
--- a/sys-apps/collectl/collectl-3.4.1.ebuild
+++ b/sys-apps/collectl/collectl-3.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.4.1.ebuild,v 1.1 2010/07/17 19:17:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.5.1.ebuild,v 1.1 2011/06/15 03:15:51 jer Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils
 
@@ -22,10 +22,7 @@ RDEPEND=">=dev-lang/perl-5.8.8
 	sys-apps/pciutils"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.4.1-install.patch
-	sed -i \
-		-e "/^DOCDIR/s:doc/collectl:doc/${PF}:" \
-		INSTALL || die
+	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die
 }
 
 src_install() {