Revbump and remove old. Update and rename init script.

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

7 files changed, 37 insertions, 40 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/Manifest b/net-analyzer/sinfo/Manifest
index 7062ac6afc72..4369dd4e964c 100644
--- a/net-analyzer/sinfo/Manifest
+++ b/net-analyzer/sinfo/Manifest
@@ -3,20 +3,20 @@ Hash: SHA512
 
 AUX sinfo-0.0.43-librpc-linking.patch 397 RMD160 8aafabb40ac04545853c27771d67e9cf9a0032f4 SHA1 fbef24a88db1f48cf76df8fe2ea7647f96869f87 SHA256 f8f832677b04b69e564bdc765e9fa3fe0c8b09f83bc3d14132f4ad64c9fe8123
 AUX sinfo-0.0.43-ncurses-m4.patch 3860 RMD160 e8d1b93eb93575b28ad009441f2480f298e342ca SHA1 e882cd597f271afaa07a9116540678fc0a56f620 SHA256 171f42277baabd9f8758e8e35e581214efb4837e0911582aa49d5e22683bf866
-AUX sinfo.confd 102 RMD160 ccbd1edb4bc81ca161e31a39384a5ac2551f5aab SHA1 eeb1c0bb90c34c001d32d896d6584236f5bee039 SHA256 769b8db7b504abfd1414b77e52f6f830e976f340a7b166eb5cefb2e04178bda8
-AUX sinfo.initd 529 RMD160 13c36377231d8bb727bae5f6fe05b51d9e3f7b13 SHA1 5fe0ea173c6605d2df84e153063d845be180b469 SHA256 1c13bc82c794c782ec0c7f3ca5b2e89ef90f1db7429fce7ed5a9996296c262b0
+AUX sinfod.confd 105 RMD160 be8d803f45dc81feeb1dddfc914ccf2d0d703fc0 SHA1 de3ed1b81c4277f2aca3fdc4d773e76cff1e209b SHA256 1dac559754a56bc0c306bca8afccdc1623c32ed5a09288657f1527e4ff8535d1
+AUX sinfod.initd 326 RMD160 aa41305d9fa55b71af50bafd8c0c7b1fdfd15bf2 SHA1 19913cb4cc25eb68f5e8bace894cf5203c95dee8 SHA256 79cfa3506f9ffa9605314a1d3fe4e53fbc4a3ebda41915e2fc15bb5d2e942cb4
 DIST sinfo-0.0.43.tar.gz 657004 RMD160 faaf30bd4296e07df39a3c411d7b4ec918334cb3 SHA1 536b654f89c7b36643b6a8a44e585d21833d7a9b SHA256 06ad5b654dcd01d57646efe5f3b186b36ba7042b4d92e5fc23e85092e0a5fa48
-EBUILD sinfo-0.0.43.ebuild 1011 RMD160 4b040f62fd583026d00eafbc4c50584fd39f6405 SHA1 fbb44e55582e581a83026279e04c5ec866b07814 SHA256 6b490b61b9bc99434a6f71eb34f2a78a858f1e30b96e216eb13c22c9f7e2ab8f
-MISC ChangeLog 814 RMD160 b5f3210c0d4ef9a4d743985da440f3e6d0131c13 SHA1 c798dca95b47d4c3735e6bd6ce4428720a85dd9e SHA256 90abbb4cfb55bce79ad2bfdf83f5ebfbba6c393603986ff1fdf32ebec4a6531a
+EBUILD sinfo-0.0.43-r1.ebuild 1018 RMD160 5975e24f46b2db7bc8130efa27a15ea78ad54028 SHA1 6203c03ec8354f94383e235122cd9d8742bef9e6 SHA256 90271f8d86d196312fcff982f193020be4493c0144986770b223e9abb091b6ef
+MISC ChangeLog 1086 RMD160 31c21055788a5ea7384da8426c760672011ea396 SHA1 762ce87dd0f56495c8047b44c86e611acde89939 SHA256 fa3253a8530ca3383086db1b29f01dbd8354e17fbde1d5342f929d4b263845f5
 MISC metadata.xml 253 RMD160 5f299b90e560b41c9adccb61ef29455bd0b3b025 SHA1 e23195cbdf72b64e6ec14158e85580317651990a SHA256 79bb6d11490801e4aa3b1330f7ec9fee4bdeb3a22f6d88e4cdb4862b91a2ad64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO0l46AAoJEEqz6FtPBkyjkqgH/1fCYBLtFvIgadWy7yotoPc1
-zSsje3h0CUN/Ig4qH6ZKsqOTyl6Ya0L4JKQizqEHY3fsw0khZd51Z1YMQoWMIUDM
-HLH/K+v7p+DdppobxTN6BAzPW4QNdHIBBKsnx1ImeRYEmvBfcY77IKWDBMZi8NxT
-CO24BFOO/PTuMfCpjvoj6xtrROk1wOFxxeJoof9/MiGCdi9/+iPgo5GO0JVHPMuH
-B6Hib/hPz8OWqDYsF8l9MSt4UUtbs2CcbJItY9XGXlZUjHodw/IPNbPQ4pKkupv4
-kBuPr//CorlI4tlpJW6ESppJcsGc8nXniNAof7W8zyXyVCLGzM3f2C+/HuGqhbg=
-=gCDN
+iQEcBAEBCgAGBQJO1AkxAAoJEEqz6FtPBkyjJ5cIAIW+P5FQxkBzhkZaY9VSOkwb
+wsnJZ6JC69Q+TXSHFJDNOzXbSqqdEuQDm7TcVe4oejP89MMHqUmL9rs844yBCef6
+OADVOJV0aod69jAZ3r2DZe6EF6lB9GGw6z5ruD1xUrY270qED7Xh/JRstZ++PCj7
+3aF+fnK2EMr1U+IFxSwLNh788+KAwTN5PDRvM0UkoP0s/MAMYES1RsZ9zX2jlyEJ
+YGoQ0rtIj5wMfEymafrPqhBlRj3h5pYYnArp+qJLFMmS2RkrQGd7XZYOh5xaztQX
+VRo6BYIpbAlTu2Qm/39afdXLza6wgq2yYeyHDfjvanDdK0BF0BNV7y0+siRswRQ=
+=xnaZ
 -----END PGP SIGNATURE-----
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
 }