Version bump #292864 by Mark Seger.

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

4 files changed, 113 insertions, 8 deletions

diff --git a/sys-apps/collectl/ChangeLog b/sys-apps/collectl/ChangeLog
index fc5d90327702..d6515be8d19b 100644
--- a/sys-apps/collectl/ChangeLog
+++ b/sys-apps/collectl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/collectl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.7 2009/11/15 01:29:22 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.8 2010/01/08 02:30:29 vapier Exp $
+
+*collectl-3.4.0 (08 Jan 2010)
+
+  08 Jan 2010; Mike Frysinger <vapier@gentoo.org> +collectl-3.4.0.ebuild,
+  +files/collectl-3.4.0-install.patch:
+  Version bump #292864 by Mark Seger.
 
   15 Nov 2009; Mike Frysinger <vapier@gentoo.org> files/collectl.initd:
   Fix path to collectl #292864 by DBautell.
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 66ba42b7415f..94909ca998a6 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX collectl-3.4.0-install.patch 1572 RMD160 08687f1039362ea79dc0357e597245da11489e1a SHA1 655a332a138690942191c464d86d638f0e4be382 SHA256 098af63394b89f4590eb7b6e51a0371a2289e1d1ac3741765b3fe1ce5552a47e
 AUX collectl.initd 497 RMD160 64ad3b43dc0d4903f17423389f2ec5d5a003dc8c SHA1 f29bc54372512c51744ef1e77c9f12af6fff57a9 SHA256 032f057b2d69304f130126d84de6c0c0c575238a094fffe50c822adc5252cbd2
 DIST collectl-3.2.1.src.tar.gz 301877 RMD160 37e7e6b8135fa143caa73a7467c83c940af14f2b SHA1 ddc2f54132172f11c767d8628193ed55c4b173d3 SHA256 2cb4e9e87090e3227a99bd07dacb3bc5568af33ba1f9d38ec89a3357435b7f0d
+DIST collectl-3.4.0.src.tar.gz 381963 RMD160 3d1c08a7609d9a31ec7bfafe805fadf9195143a4 SHA1 009d31cc4f013839b3a7e5052d45c00bdeb292a5 SHA256 1b0f7b57257fa3f8edc4734205ee38075db09ad6ebb1811f3c8eae5e4d995071
 EBUILD collectl-3.2.1.ebuild 1049 RMD160 3039fff178b32da524b05c613cde85b8f5498acf SHA1 572093acd8c7c19f13cd20cdb3b311dca80dbe2d SHA256 e47df6c3864f3029f6b0710e1b91876595974e61e870970c532d63e68471b599
-MISC ChangeLog 1127 RMD160 004372aaac57c83300f35565244e460e84bf8d7a SHA1 ea1c95d2799ddae4f0fb25bdf0c60fb75616e197 SHA256 5c873d514d64f0c3e65454d3daf847473eccca8d0c7b7e298a1abb515fedbf8d
+EBUILD collectl-3.4.0.ebuild 1067 RMD160 8ff531c07e8b08694f4ab4a43bf6861a65ba9d08 SHA1 9111bcda186479d87b0002849ca5d96ac9c3c993 SHA256 93a858f3b2e3363c1c827286bd904825a0f083042202444597b58a7496187714
+MISC ChangeLog 1310 RMD160 4ec1cafe33240b2d1b3689c472b6986095893930 SHA1 e8c681f4925b05d37f95b8e88dc4ac2dc8dc14cc SHA256 3bc03cb20e28575cdfbb8f5933a38103b3de0ef660e25ee86f4c3ed9a4025316
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkr/WhUACgkQlPl3HsVfCDr3SwCffUJbJdFDSGfiHS2Fg/qcF28p
-FzAAn26AL2e4mRxQPqOkSgSZLeGYGdyM
-=EbmC
+iF4EAREIAAYFAktGmNEACgkQTwhj9JtAlp4p3gD/bDG5z0UCacg2gxxIkGenqQ5M
+cQ7v4/u9TgPozZH5mNoBAJqt+iBeMA1JJ90yKHLvh2UmsdxFL04PsHWmuRjsJpcl
+=+wal
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/collectl/collectl-3.4.0.ebuild b/sys-apps/collectl/collectl-3.4.0.ebuild
new file mode 100644
index 000000000000..70c62fd27256
--- /dev/null
+++ b/sys-apps/collectl/collectl-3.4.0.ebuild
@@ -0,0 +1,41 @@
+# 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/files/collectl-3.4.0-install.patch b/sys-apps/collectl/files/collectl-3.4.0-install.patch
new file mode 100644
index 000000000000..647059c01553
--- /dev/null
+++ b/sys-apps/collectl/files/collectl-3.4.0-install.patch
@@ -0,0 +1,55 @@
+add DESTDIR support
+
+--- INSTALL
++++ INSTALL
+@@ -1,18 +1,22 @@
+ #!/bin/bash
+ 
+-BINDIR=/usr/bin
+-DOCDIR=/usr/share/doc/collectl
+-SHRDIR=/usr/share/collectl
++#DESTDIR=
++BINDIR=$DESTDIR/usr/bin
++DOCDIR=$DESTDIR/usr/share/doc/collectl
++SHRDIR=$DESTDIR/usr/share/collectl
+ 
++mkdir -p $BINDIR
+ mkdir -p $DOCDIR
+ mkdir -p $SHRDIR
+ mkdir -p $SHRDIR/util
+-mkdir -p /var/log/collectl
++mkdir -p $DESTDIR/etc/init.d
++mkdir -p $DESTDIR/usr/share/man/man1
++mkdir -p $DESTDIR/var/log/collectl
+ 
+ cp collectl.pl           $BINDIR/collectl
+-cp collectl.conf         /etc
+-cp initd/*               /etc/init.d
+-cp man1/*                /usr/share/man/man1
++cp collectl.conf         $DESTDIR/etc
++cp initd/*               $DESTDIR/etc/init.d
++cp man1/*                $DESTDIR/usr/share/man/man1
+ 
+ cp docs/*                $DOCDIR
+ cp GPL ARTISTIC COPYING  $DOCDIR
+@@ -28,15 +32,17 @@
+ cp col2tlviz.pl          $SHRDIR/util
+ 
+ # Force in case redoing the install and files already zipped
+-gzip -f /usr/share/man/man1/collectl*
++gzip -f $DESTDIR/usr/share/man/man1/collectl*
+ 
+-chmod 755 /etc/init.d/collectl*
+-chmod 444 /etc/collectl.conf
++chmod 755 $DESTDIR/etc/init.d/collectl*
++chmod 444 $DESTDIR/etc/collectl.conf
+ chmod 755 $BINDIR/collectl
+ chmod 444 $DOCDIR/ARTISTIC $DOCDIR/COPYING $DOCDIR/GPL
+ chmod 755 $SHRDIR/util/*
+ chmod 444 $SHRDIR/formatit.ph $SHRDIR/*expr.ph $SHRDIR/vmstat.ph
+ 
++[[ -n $DESTDIR ]] && exit 0
++
+ # remove any stale versions in case the names/numbers used have changed.
+ # on new ROCKS installion 'rm' isn't there yet!  [thanks roy]
+ if [ -x /bin/rm ] ; then