Version bump. Removed old

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

3 files changed, 13 insertions, 34 deletions

diff --git a/sys-apps/collectl/ChangeLog b/sys-apps/collectl/ChangeLog
index 2ebe07fffd52..267724973e61 100644
--- a/sys-apps/collectl/ChangeLog
+++ b/sys-apps/collectl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/collectl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.20 2014/08/27 18:15:30 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/ChangeLog,v 1.21 2014/09/15 06:24:38 polynomial-c Exp $
+
+*collectl-3.7.4 (15 Sep 2014)
+
+  15 Sep 2014; Lars Wendler <polynomial-c@gentoo.org> -collectl-3.6.9.ebuild,
+  +collectl-3.7.4.ebuild, -files/collectl.initd:
+  Version bump. Removed old.
 
   27 Aug 2014; Richard Yao <ryao@gentoo.org> collectl-3.7.3.ebuild:
   Stabilize sys-apps/collectl-3.7.3: Okay by WilliamH; bugzilla down, so no bug
diff --git a/sys-apps/collectl/collectl-3.6.9.ebuild b/sys-apps/collectl/collectl-3.7.4.ebuild
index f5331f97aa8a..30c1cf0991f7 100644
--- a/sys-apps/collectl/collectl-3.6.9.ebuild
+++ b/sys-apps/collectl/collectl-3.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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.9.ebuild,v 1.1 2013/10/20 21:21:25 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/collectl-3.7.4.ebuild,v 1.1 2014/09/15 06:24:38 polynomial-c Exp $
 
 EAPI="4"
 
@@ -27,9 +27,11 @@ 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
+
+	rm "${D}"/usr/share/${PN}/UNINSTALL || die
 
 	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 b/sys-apps/collectl/files/collectl.initd
deleted file mode 100755
index c55f14a221bb..000000000000
--- a/sys-apps/collectl/files/collectl.initd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/collectl/files/collectl.initd,v 1.3 2010/01/08 12:42:24 vapier Exp $
-
-opts="flush"
-
-pidfile="/var/run/collectl.pid"
-
-start() {
-	ebegin "Starting collectl"
-	start-stop-daemon \
-		--start \
-		--pidfile ${pidfile} \
-		--exec /usr/bin/collectl -- -D
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping collectl"
-	start-stop-daemon --stop --pidfile ${pidfile}
-	eend $?
-}
-
-flush() {
-	einfo "Flushing collectl buffers"
-	start-stop-daemon --oknodo --stop --signal USR1 --pidfile ${pidfile}
-	eend $?
-}