reverting init script change (seems to be a baselayout _pre issue)

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index 9bd1b81fb679aa252ebc5594a24033f9e5ccc193..a98659396079a96e7593cc4b9fcca9a848a02b7d 100644 (file)
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/edna
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.22 2005/09/09 04:59:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.23 2005/09/09 22:04:04 nerdboy Exp $
+
+  09 Sep 2005; Steve Arnold <nerdboy@gentoo.org> files/edna.gentoo:
+  reverting init script change (seems to be a baselayout _pre issue)
 
 *edna-0.5-r5 (09 Sep 2005)
 

diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 7e9633cda1025a46105977988e8a8bb72d4de7e4..50ce9c77852ddad35af8609161016072aa3b6744 100644 (file)
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,8 +1,8 @@
-MD5 126094a476a140c7d6ef073951ae40a5 ChangeLog 2781
+MD5 813fdb72cc01b8fa270b1fa5b8b4249c ChangeLog 2919
 MD5 9f4c35eb3808bcc8cf3b3d7c06700924 edna-0.5-r5.ebuild 1775
 MD5 8221e3990883569e1f24440fbd48e25b metadata.xml 330
 MD5 753b41a8e34abb2e2fbffa0788e0ee5c edna-0.5-r4.ebuild 1615
 MD5 6f8bb1ccb9018d0196cea623e4e01998 files/edna-0.5-pep-0263.patch 317
-MD5 163e5e1aca301e2faeac5ffc69cd6323 files/edna.gentoo 710
+MD5 4cebb18eae4b5f56b639e8418f677992 files/edna.gentoo 585
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r4 59
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r5 59

diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
index 1d96de7c56dbbd5e1b3ec7e1e18f185ae440e69c..cf46fc45398f75013164f851bb7448ba8409e046 100644 (file)
--- a/media-sound/edna/files/edna.gentoo
+++ b/media-sound/edna/files/edna.gentoo
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 #
-# Startup script for the edna audio server 
+# Startup script for the edna mp3 mini server 
 #
-# description: edna is a mini mp3/ogg webserver
+# description: edna is a mini mp3 webserver
 # processname: python
 # pidfile: /var/run/ednad.pid
-# config: /etc/edna/edna.conf
+# config:
 
 export PYTHONPATH=/usr/lib/edna
 EDNA=/usr/bin/edna
@@ -13,22 +13,18 @@ EDNACONF=/etc/edna/edna.conf
 PIDFILE=/var/run/edna.pid
 
 depend() {
-        use net
-       need local
+        need local
 }
 
 start() {
-    ebegin "Starting edna mp3 server"
-    start-stop-daemon --quiet --pidfile $PIDFILE
-    $EDNA --daemon $EDNACONF
-    eend $? "Failed to start edna"
+    ebegin "Starting ednad mp3 server"
+    start-stop-daemon -m -b --start --quiet --pidfile $PIDFILE \
+    --exec $EDNA -- $EDNACONF
+    eend $?
 }
 
 stop() {
-    ebegin "Stopping edna mp3 server"
-    start-stop-daemon --stop -o --quiet --pidfile $PIDFILE
-    local ret=$?
-    eend ${ret} "Failed to stop edna"
-    rm -f $PIDFILE
-    return ${ret}
+    ebegin "Stopping ednad"
+    start-stop-daemon -o --quiet --stop --pidfile $PIDFILE
+    eend $?
 }