Fixed gkrellmd init script and config (Bug #247068)

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

6 files changed, 21 insertions, 14 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index 04562acc9e3d..8205df8782b7 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.161 2008/11/05 18:18:10 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.162 2008/11/17 21:27:32 lack Exp $
+
+  17 Nov 2008; Jim Ramsay <lack@gentoo.org> files/gkrellmd,
+  files/gkrellmd.conf, gkrellm-2.3.1.ebuild, gkrellm-2.3.2.ebuild:
+  Fixed gkrellmd init script and config (Bug #247068)
 
 *gkrellm-2.3.2 (05 Nov 2008)
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 6223996b449d..95c1b0d46e46 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,11 +1,11 @@
 AUX gkrellm-2.3-Makefile.patch 424 RMD160 dc1ebf789dcc3942c1e39d6167d532d2e2506cb3 SHA1 6b42bfa24540433f5cc16d3e1b36d9be33c7b056 SHA256 4c87410cb2ef50b3b490a97fef525d4138446e02d8c60d0f4f7a13b58a575085
 AUX gkrellm-2.3-build.patch 1191 RMD160 05550436111e308152889b7c21d66215a40e0bf1 SHA1 1052f00ea6ea44960445edeb8861d1cf6bfa96ac SHA256 e69131b0cc82def1c055baf0d6c075f6894dd7eb91cec62a85ab112acca4d74a
 AUX gkrellm-2.3-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
-AUX gkrellmd 636 RMD160 7b2f43f8dc826f3da487d779c47220df9019a530 SHA1 38dfc92a6f7f6eada6d7bf52e70e7b6b70eac3a8 SHA256 f830ab66d71490572f206ce36beefcef29f937a6a2808e2618f672d0a2c65305
-AUX gkrellmd.conf 166 RMD160 dfd23d203baab2ff89dbe157b5615aeecc7e188b SHA1 baeccfb3f398d7dfc28fcf1582c9855d9067937a SHA256 14d1b3f11b30fd83976825d1af2c2923fd552b2073a2c0c1c228b2ca2348fcbe
+AUX gkrellmd 637 RMD160 3e1e034dd0de2be7960f121937d71d4fb2695941 SHA1 7009e94493907a376de0519a78a0832ba5030ca8 SHA256 79606289eedcf16fd52f132088bd9ae0bd476bd4ecdb2fcb4703bed1b64bb67c
+AUX gkrellmd.conf 250 RMD160 4bef31a2562432515dfeb0c05acbba66863aa3b9 SHA1 e7374680680bc587c3bd8a8dba57fa619f20db45 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935
 DIST gkrellm-2.3.1.tar.bz2 744132 RMD160 40f4aa5349be42d01a1f8ff7b4f2e83986be0e62 SHA1 f5e8206aeee93f5b3a6afff9cc55c58e9d511f56 SHA256 1a2a7e3ee9d1f2d7305da0d33d9be71ffe5d1903ed6a9c69cf77ffe10fc95b4d
 DIST gkrellm-2.3.2.tar.bz2 747697 RMD160 0aacc0d0783cff5bb2fd8c6736553a3ce8874ad9 SHA1 fe94996c4fe084c28bf7a7fbc3f8d4fd64724ac0 SHA256 a102e681cbcc45f8cb225ca0a321b62772106d6f0bb372eaa026b5a2da840873
-EBUILD gkrellm-2.3.1.ebuild 3049 RMD160 28674db777af681c15b1fa5eb91bfe7d57e112fb SHA1 4354a576273eb3f0ccb43d48069e4efcaddcdc50 SHA256 e077b5fc09027271ecb35a11067bc195f4e97e0f1c936869c9a37cb6dc578d3e
-EBUILD gkrellm-2.3.2.ebuild 3112 RMD160 4c476b9fb6889842abda742b4a737e621b351d2e SHA1 973d7ce00717d2bff80852e07ee169ab336c7f82 SHA256 763c1e44dd1b91801fc7f4b27c142a705d3a8567c00dfbc1df28c547d47809e0
-MISC ChangeLog 22313 RMD160 64c0b189345f1de2b90952211cf01bde98eb44b6 SHA1 ceaa877323a8a3ab56e6a8cf29ef00fdfc3bc37d SHA256 3cd275835898673f5bdf2c40e4f9ce5d66c15d8ff5063f81c428306bd635a634
+EBUILD gkrellm-2.3.1.ebuild 3057 RMD160 189426696ed2f996fda7f1e0846d6a7048e958b7 SHA1 4470a66786bb05660904aea403b740ffc5e5d756 SHA256 8df809c8c415d86a69972db8c7ae339cd88bb358db74ab6e20cc6fcd03c7aca5
+EBUILD gkrellm-2.3.2.ebuild 3123 RMD160 38ca8698f73dda7b4ca6c32ac8259014c9568988 SHA1 a6368ea75c667a07d395cd10ccdedea7782f28d6 SHA256 db5158419663eea21823e46f75d12d27fcda6cccb9136617c52b731cd08da57f
+MISC ChangeLog 22495 RMD160 8e532a07ac64b35d5e678d016cb956fbdbf5b77b SHA1 80411a5311ceddfdf505ff0516ebd3af172a62a7 SHA256 a1ac67f3754e2762fd7432e1f5a54fd35b0555bba61fbfcbf4102cbf641ceefd
 MISC metadata.xml 940 RMD160 e85c2b39ba9e3d4fcdf2b314e9357b17e9b2aad2 SHA1 989f5eaebb57c3d432c9b1a9ae8cdee0f0729f5a SHA256 000169e157ad6f8af0d7506f288212f54640b849a4229467bccad41e924c6324
diff --git a/app-admin/gkrellm/files/gkrellmd b/app-admin/gkrellm/files/gkrellmd
index f7f90a24ab1c..d6e8f2841a64 100644
--- a/app-admin/gkrellm/files/gkrellmd
+++ b/app-admin/gkrellm/files/gkrellmd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.7 2008/02/28 15:17:04 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/files/gkrellmd,v 1.8 2008/11/17 21:27:55 lack Exp $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting GNU Krell Monitor daemon"
-	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd ${GKRELLM_OPTS}
+	start-stop-daemon --start --quiet --background --pidfile /var/run/gkrellmd.pid --make-pidfile --exec /usr/bin/gkrellmd ${GKRELLMD_OPTS}
 	eend $?
 }
 
diff --git a/app-admin/gkrellm/files/gkrellmd.conf b/app-admin/gkrellm/files/gkrellmd.conf
index 1388801ccbd8..6b0d90df1092 100644
--- a/app-admin/gkrellm/files/gkrellmd.conf
+++ b/app-admin/gkrellm/files/gkrellmd.conf
@@ -1,5 +1,8 @@
-# Config file for gkrellmd
+# Config file for gkrellmd init script
 
 # If you need to pass extra options to gkrellmd, you may set them here.
 # See 'gkrellmd --help' for a list of options.
-# GKRELLMD_OPTS=""
+#
+# Note: Many options can be configured in /etc/gkrellmd.conf as well
+#
+#GKRELLMD_OPTS=""
diff --git a/app-admin/gkrellm/gkrellm-2.3.1.ebuild b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
index 0ac1e3883362..bacf2e65729e 100644
--- a/app-admin/gkrellm/gkrellm-2.3.1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.1.ebuild,v 1.8 2008/09/27 16:29:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.1.ebuild,v 1.9 2008/11/17 21:27:32 lack Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -93,7 +93,7 @@ src_install() {
 	fi
 
 	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
 
 	insinto /etc
 	doins server/gkrellmd.conf || die "doins failed"
diff --git a/app-admin/gkrellm/gkrellm-2.3.2.ebuild b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
index eb05ac017dc7..286a4204f002 100644
--- a/app-admin/gkrellm/gkrellm-2.3.2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.1 2008/11/05 18:18:10 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.2.ebuild,v 1.2 2008/11/17 21:27:32 lack Exp $
 
 EAPI=2
 
@@ -105,7 +105,7 @@ src_install() {
 	fi
 
 	doinitd "${FILESDIR}"/gkrellmd || die "doinitd failed"
-	doconfd "${FILESDIR}"/gkrellmd.conf || die "doconfd failed"
+	newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd || die "newconfd failed"
 
 	insinto /etc
 	doins server/gkrellmd.conf || die "doins failed"