Revbump and remove old. Update and rename init script.

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

6 files changed, 26 insertions, 29 deletions

diff --git a/net-analyzer/sinfo/ChangeLog b/net-analyzer/sinfo/ChangeLog
index a8ac9169895e..aeaac8365bee 100644
--- a/net-analyzer/sinfo/ChangeLog
+++ b/net-analyzer/sinfo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/sinfo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/ChangeLog,v 1.4 2011/11/27 15:58:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/ChangeLog,v 1.5 2011/11/28 22:20:23 radhermit Exp $
+
+*sinfo-0.0.43-r1 (28 Nov 2011)
+
+  28 Nov 2011; Tim Harder <radhermit@gentoo.org> -sinfo-0.0.43.ebuild,
+  +sinfo-0.0.43-r1.ebuild, +files/sinfod.confd, +files/sinfod.initd,
+  -files/sinfo.confd, -files/sinfo.initd:
+  Revbump and remove old. Update and rename init script.
 
   27 Nov 2011; Tim Harder <radhermit@gentoo.org> sinfo-0.0.43.ebuild:
   Remove multiple static-libs settings.
diff --git a/net-analyzer/sinfo/files/sinfo.confd b/net-analyzer/sinfo/files/sinfo.confd
deleted file mode 100644
index da6e60405be8..000000000000
--- a/net-analyzer/sinfo/files/sinfo.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/sinfo: config file for /etc/init.d/sinfo
-
-# Various sinfod options
-SINFO_OPTS="--quiet"
diff --git a/net-analyzer/sinfo/files/sinfo.initd b/net-analyzer/sinfo/files/sinfo.initd
deleted file mode 100644
index f4140353b0ed..000000000000
--- a/net-analyzer/sinfo/files/sinfo.initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/files/sinfo.initd,v 1.1 2011/11/26 11:18:39 radhermit Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting sinfod"
-	start-stop-daemon --start --exec /usr/sbin/sinfod -- \
-		${SINFO_OPTS}
-	eend $? "Failed to start sinfod"
-}
-
-stop() {
-	ebegin "Stopping sinfod"
-	start-stop-daemon --stop --exec /usr/sbin/sinfod
-	eend $? "Failed to stop sinfod"
-}
diff --git a/net-analyzer/sinfo/files/sinfod.confd b/net-analyzer/sinfo/files/sinfod.confd
new file mode 100644
index 000000000000..c3b210b743dd
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfod.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/sinfod: config file for /etc/init.d/sinfod
+
+# Various sinfod options
+SINFOD_OPTS="--quiet"
diff --git a/net-analyzer/sinfo/files/sinfod.initd b/net-analyzer/sinfo/files/sinfod.initd
new file mode 100644
index 000000000000..9c8dd6868137
--- /dev/null
+++ b/net-analyzer/sinfo/files/sinfod.initd
@@ -0,0 +1,11 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/files/sinfod.initd,v 1.1 2011/11/28 22:20:22 radhermit Exp $
+
+command="/usr/sbin/${SVCNAME}"
+command_args="${SINFOD_OPTS}"
+
+depend() {
+	need net
+}
diff --git a/net-analyzer/sinfo/sinfo-0.0.43.ebuild b/net-analyzer/sinfo/sinfo-0.0.43-r1.ebuild
index f0df8afa9ec4..8f066ef01894 100644
--- a/net-analyzer/sinfo/sinfo-0.0.43.ebuild
+++ b/net-analyzer/sinfo/sinfo-0.0.43-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/sinfo-0.0.43.ebuild,v 1.4 2011/11/27 15:58:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sinfo/sinfo-0.0.43-r1.ebuild,v 1.1 2011/11/28 22:20:23 radhermit Exp $
 
 EAPI=4
 
@@ -42,6 +42,6 @@ src_configure() {
 src_install() {
 	autotools-utils_src_install
 
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/sinfod.confd sinfod
+	newinitd "${FILESDIR}"/sinfod.initd sinfod
 }