Version bump. Removed old. Added rewritten init script

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 29 insertions, 76 deletions

diff --git a/sys-apps/collectl/ChangeLog b/sys-apps/collectl/ChangeLog
index 293a73807b29..6afa2d0b14e6 100644
--- a/sys-apps/collectl/ChangeLog
+++ b/sys-apps/collectl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/collectl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.18 2013/10/20 21:21:25 chainsaw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.19 2014/05/28 09:45:44 polynomial-c Exp $
+
+*collectl-3.7.3 (28 May 2014)
+
+  28 May 2014; Lars Wendler <polynomial-c@gentoo.org> -collectl-3.6.0.ebuild,
+  -collectl-3.6.1.ebuild, -collectl-3.6.5.ebuild, +collectl-3.7.3.ebuild,
+  +files/collectl.initd-2:
+  Version bump. Removed old. Added rewritten init script.
 
 *collectl-3.6.9 (20 Oct 2013)
 
diff --git a/sys-apps/collectl/collectl-3.6.0.ebuild b/sys-apps/collectl/collectl-3.6.0.ebuild
deleted file mode 100644
index 1eaf024c233f..000000000000
--- a/sys-apps/collectl/collectl-3.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.6.0.ebuild,v 1.2 2012/02/23 07:44:16 radhermit Exp $
-
-EAPI="4"
-
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and 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() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || 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 *
-	rm -f ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-3.6.5.ebuild b/sys-apps/collectl/collectl-3.6.5.ebuild
deleted file mode 100644
index 02af926febb1..000000000000
--- a/sys-apps/collectl/collectl-3.6.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.6.5.ebuild,v 1.1 2013/01/06 18:18:29 vapier Exp $
-
-EAPI="4"
-
-DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and 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() {
-	sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || 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} || die
-	dohtml *
-	rm -f ARTISTIC GPL COPYING *.html *.jpg *.css || die
-}
diff --git a/sys-apps/collectl/collectl-3.6.1.ebuild b/sys-apps/collectl/collectl-3.7.3.ebuild
index bf1b42c302cc..9a1174124459 100644
--- a/sys-apps/collectl/collectl-3.6.1.ebuild
+++ b/sys-apps/collectl/collectl-3.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.6.1.ebuild,v 1.2 2012/02/23 07:44:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.7.3.ebuild,v 1.1 2014/05/28 09:45:44 polynomial-c Exp $
 
 EAPI="4"
 
@@ -27,9 +27,9 @@ src_install() {
 	DESTDIR="${D}" bash -ex ./INSTALL || die
 
 	rm "${D}"/etc/init.d/* || die
-	newinitd "${FILESDIR}"/collectl.initd collectl
+	newinitd "${FILESDIR}"/collectl.initd-2 collectl
 
 	cd "${D}"/usr/share/doc/${PF} || die
 	dohtml *
-	rm -f ARTISTIC GPL COPYING *.html *.jpg *.css || die
+	rm ARTISTIC GPL COPYING *.html *.jpg *.css || die
 }
diff --git a/sys-apps/collectl/files/collectl.initd-2 b/sys-apps/collectl/files/collectl.initd-2
new file mode 100755
index 000000000000..c271c7a6a20e
--- /dev/null
+++ b/sys-apps/collectl/files/collectl.initd-2
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/files/collectl.initd-2,v 1.1 2014/05/28 09:45:44 polynomial-c Exp $
+
+extra_started_commands="flush"
+
+pidfile="/var/run/collectl.pid"
+command="/usr/bin/collectl"
+command_args="-D"
+
+flush() {
+	einfo "Flushing collectl buffers"
+	start-stop-daemon --signal USR1 --pidfile ${pidfile}
+	eend $?
+}