Version bump.

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

4 files changed, 78 insertions, 6 deletions

diff --git a/sys-apps/collectl/ChangeLog b/sys-apps/collectl/ChangeLog
index 4709c95a81cf..7dfdcb681891 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.9 2010/01/08 12:42:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.10 2010/07/17 19:17:45 vapier Exp $
+
+*collectl-3.4.1 (17 Jul 2010)
+
+  17 Jul 2010; Mike Frysinger <vapier@gentoo.org> +collectl-3.4.1.ebuild,
+  +files/collectl-3.4.1-install.patch:
+  Version bump.
 
   08 Jan 2010; Mike Frysinger <vapier@gentoo.org> files/collectl.initd:
   Add a "flush" init.d operation #292864#18 by Mark Seger.
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 1e61c9aeb688..aa2e87490eaf 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA256
 
 AUX collectl-3.4.0-install.patch 1572 RMD160 08687f1039362ea79dc0357e597245da11489e1a SHA1 655a332a138690942191c464d86d638f0e4be382 SHA256 098af63394b89f4590eb7b6e51a0371a2289e1d1ac3741765b3fe1ce5552a47e
+AUX collectl-3.4.1-install.patch 602 RMD160 779c340905385364be526baf847e6a79b4b8093b SHA1 9f7f28e24784edf942588fcd0a1c0b3f9df1ca67 SHA256 90f7d951df448c6a91d94e2c2032eb81c7a2e8aa7d77248c9a7ce3d9b388d7fa
 AUX collectl.initd 649 RMD160 2f1aaa615288240e0a4de00b9cb88c0d8292f35d SHA1 8ec813b7b889e77ba06c9d2c8da9265526f00caa SHA256 1abc161c4149c77386586939dcb92d1e488b4d2b44c0a665f5ef6b46f993c3f6
 DIST collectl-3.4.0.src.tar.gz 381963 RMD160 3d1c08a7609d9a31ec7bfafe805fadf9195143a4 SHA1 009d31cc4f013839b3a7e5052d45c00bdeb292a5 SHA256 1b0f7b57257fa3f8edc4734205ee38075db09ad6ebb1811f3c8eae5e4d995071
+DIST collectl-3.4.1.src.tar.gz 384944 RMD160 b12281d085088d006eaae3f8c6ac1fd695e02244 SHA1 551deecfebf827e2840cf827751c079ecdfa92e8 SHA256 9e41b83c7697f423fc30259edc4b35c7ddf5d7af0a87d92e7bad78c596192b5a
 EBUILD collectl-3.4.0.ebuild 1067 RMD160 8ff531c07e8b08694f4ab4a43bf6861a65ba9d08 SHA1 9111bcda186479d87b0002849ca5d96ac9c3c993 SHA256 93a858f3b2e3363c1c827286bd904825a0f083042202444597b58a7496187714
-MISC ChangeLog 1442 RMD160 bb31ee34e12f04e2f42c793f91cdc40b0baad994 SHA1 dee16fb812bc9b3f70cf432a587426422d1eabda SHA256 d0847c2f7f9d2d2fc50984aed0943508674c844d080684daca4cb73b1c8f7e28
+EBUILD collectl-3.4.1.ebuild 1061 RMD160 e264a3b20f6d160cced4e600444b2f023bb15693 SHA1 0f37f4915220f3cb85ccfed61684a2f142d44ed8 SHA256 73d8dca318727c02dad4d17ec7a9be6fa018017b59167b412956a0fd2ff259d7
+MISC ChangeLog 1604 RMD160 08c39c47cf04f6408a0e4a78a4fd79b8f9debde4 SHA1 2e484a5f4caa4f46d02eb2f01499f7943bc10795 SHA256 5bfd997bc8d117930860c70a589eebac82f4448d31bd264c636b08836a7dc620
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAktHLlYACgkQTwhj9JtAlp777AD+KiNIJj81FZtmUln7Oqs8k0Pz
-peD7nbf6DGOd63MFQuAA/3fnyFqc/py+yXpNOsaPXTmGCa6CoK34UDnJRpXLjQwq
-=yIFd
+iF4EAREIAAYFAkxCAS8ACgkQTwhj9JtAlp4kQQEAgTPnmU6idOZt1mf6M334e4RU
++1sEQkflRgcs5u3NC+8A/iQsXs00E4YxA7lUnZX6xg2ZGJOGuAtF8SrT/FptPlDA
+=p66B
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/collectl/collectl-3.4.1.ebuild b/sys-apps/collectl/collectl-3.4.1.ebuild
new file mode 100644
index 000000000000..e1a1049a640e
--- /dev/null
+++ b/sys-apps/collectl/collectl-3.4.1.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.1.ebuild,v 1.1 2010/07/17 19:17:45 vapier Exp $
+
+EAPI="2"
+
+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_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4.1-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.1-install.patch b/sys-apps/collectl/files/collectl-3.4.1-install.patch
new file mode 100644
index 000000000000..2d230513b719
--- /dev/null
+++ b/sys-apps/collectl/files/collectl-3.4.1-install.patch
@@ -0,0 +1,22 @@
+DESTDIR doesnt require clean up of things outside of DESTDIR
+
+--- INSTALL
++++ INSTALL
+@@ -7,7 +7,7 @@
+ SHRDIR=$DESTDIR/usr/share/collectl
+ MANDIR=$DESTDIR/usr/share/man/man1
+ ETCDIR=$DESTDIR/etc
+-INITDIR=$DESTDIR/$ETCDIR/init.d
++INITDIR=$ETCDIR/init.d
+ 
+ mkdir -p $BINDIR
+ mkdir -p $DOCDIR
+@@ -46,6 +46,8 @@
+ chmod 755 $SHRDIR/util/*
+ chmod 444 $SHRDIR/formatit.ph $SHRDIR/*expr.ph $SHRDIR/vmstat.ph
+ 
++[[ ${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