removed local USE flag and changed init script

4 files changed, 62 insertions, 4 deletions

diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 401f6c28b48d..b78d36044fe2 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,8 +1,8 @@
 MD5 92a49e04d726cb4475afe83f38b9270a edna-0.5.ebuild 1439
 MD5 7b52e105c2857fc04035cd20183d8ee2 metadata.xml 324
-MD5 77b220dc1b2669aeb45066a5eac84315 ChangeLog 713
+MD5 6a8feab1ec60897aac80314b13bf43aa ChangeLog 713
 MD5 8dba94c198cf50d15a3201bc0478068c edna-0.5-r1.ebuild 1473
-MD5 9ff4fd926bc864fe96a4530bdbb5c4c2 edna-0.5-r2.ebuild 1522
+MD5 8813f3d54d5a83f51a084000c292ed02 edna-0.5-r2.ebuild 1522
 MD5 219c99a2e356a9178f75e88630b592ff files/edna.gentoo 520
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5 59
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r1 59
diff --git a/media-sound/edna/edna-0.5-r2.ebuild b/media-sound/edna/edna-0.5-r2.ebuild
new file mode 100644
index 000000000000..052e6ab60d4f
--- /dev/null
+++ b/media-sound/edna/edna-0.5-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r2.ebuild,v 1.1 2003/12/15 00:36:43 nerdboy Exp $
+
+# This is Greg Stein's streaming audio server
+
+IUSE="python"
+
+
+DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
+HOMEPAGE="http://edna.sourceforge.net/"
+#SRC_URI="http://edna.sourceforge.net/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+
+DEPEND="dev-lang/python"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+
+	einfo "Installing in daemon mode"
+	insinto /etc/init.d
+	insopts -m 755
+	newins ${FILESDIR}/edna.gentoo edna
+
+	dodir /usr/bin /usr/lib/edna /usr/lib/edna/templates
+	exeinto /usr/bin ; newexe edna.py edna
+	exeinto /usr/lib/edna ; doexe ezt.py
+	exeinto /usr/lib/edna ; doexe MP3Info.py
+	insinto /usr/lib/edna/templates
+	insopts -m 644
+	doins templates/*
+
+	insinto /etc/edna
+	insopts -m 644
+	doins edna.conf
+	dosym /usr/lib/edna/templates /etc/edna/templates
+
+	dodoc COPYING README ChangeLog
+	dohtml -r www/*
+
+	dodir /etc/env.d
+	echo "PYTHONPATH=/usr/lib/edna" > ${D}/etc/env.d/69edna
+}
+
+pkg_postinst() {
+	ewarn
+	einfo "Edit edna.conf to suite before starting; test ednad from"
+	einfo "a shell prompt until you have it configured properly,"
+	einfo "then add edna to the default runlevel when you're ready."
+	einfo "See edna.conf and the html docs for more info."
+	ewarn
+}
diff --git a/media-sound/edna/files/digest-edna-0.5-r2 b/media-sound/edna/files/digest-edna-0.5-r2
new file mode 100644
index 000000000000..98bcede95ebc
--- /dev/null
+++ b/media-sound/edna/files/digest-edna-0.5-r2
@@ -0,0 +1 @@
+MD5 ec3d46b25fa582b78db7c32acf78da47 edna-0.5.tar.gz 85785
diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
index 9199e00764b8..72fc09b54945 100644
--- a/media-sound/edna/files/edna.gentoo
+++ b/media-sound/edna/files/edna.gentoo
@@ -13,8 +13,8 @@ depend() {
 
 start() {
     ebegin "Starting ednad mp3 server"
-    start-stop-daemon -b -m --quiet --start --exec /usr/bin/ednad \
-	--pidfile /var/run/ednad.pid
+    start-stop-daemon -m --quiet --pidfile /var/run/ednad.pid --start --exec \
+	/usr/bin/edna -- --daemon /etc/edna/edna.conf
     eend $?
 }