fixed init and env stuff and removed previous ebuilds

8 files changed, 13 insertions, 124 deletions

diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 74fbebdad142..b11c1bfb8664 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,5 +1,5 @@
 MD5 7b52e105c2857fc04035cd20183d8ee2 metadata.xml 324
-MD5 48f02c71391ab073063b8ccfc25a5fa0 ChangeLog 859
-MD5 2cc1797ba3f098622bb517f60f29d316 edna-0.5-r3.ebuild 1445
+MD5 6e9177435646949679f023af8a3221ca ChangeLog 859
+MD5 5f14e9986b08c09fd4f8665145c9096e edna-0.5-r3.ebuild 1445
 MD5 4cebb18eae4b5f56b639e8418f677992 files/edna.gentoo 585
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r3 59
diff --git a/media-sound/edna/edna-0.5-r1.ebuild b/media-sound/edna/edna-0.5-r1.ebuild
deleted file mode 100644
index 58e1f69143d8..000000000000
--- a/media-sound/edna/edna-0.5-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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-r1.ebuild,v 1.2 2003/12/14 23:24:10 nerdboy Exp $
-
-# This is Greg Stein's streaming audio server
-
-IUSE="python ednad"
-
-
-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() {
-
-	if [ "`use ednad`" ]; then
-		einfo "Installing in daemon mode"
-		insinto /etc/init.d
-		insopts -m 755
-		newins ${FILESDIR}/edna.gentoo edna
-		exeinto /usr/bin ; doexe daemon/ednad
-	fi
-
-	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/*
-}
-
-pkg_postinst() {
-	ewarn
-	einfo "Edit edna.conf to suite before starting edna and test it."
-	einfo "Emerge with USE="ednad" if you want to install in daemon"
-	einfo "mode.  See edna.conf and the html docs for more info."
-	ewarn
-}
diff --git a/media-sound/edna/edna-0.5-r2.ebuild b/media-sound/edna/edna-0.5-r3.ebuild
index 052e6ab60d4f..bfd60c897276 100644
--- a/media-sound/edna/edna-0.5-r2.ebuild
+++ b/media-sound/edna/edna-0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r3.ebuild,v 1.1 2003/12/15 01:43:23 nerdboy Exp $
 
 # This is Greg Stein's streaming audio server
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
 
 DEPEND="dev-lang/python"
 
@@ -42,9 +42,6 @@ src_install() {
 
 	dodoc COPYING README ChangeLog
 	dohtml -r www/*
-
-	dodir /etc/env.d
-	echo "PYTHONPATH=/usr/lib/edna" > ${D}/etc/env.d/69edna
 }
 
 pkg_postinst() {
diff --git a/media-sound/edna/edna-0.5.ebuild b/media-sound/edna/edna-0.5.ebuild
deleted file mode 100644
index 38a0c03e9e2b..000000000000
--- a/media-sound/edna/edna-0.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.ebuild,v 1.2 2003/12/14 23:17:39 nerdboy Exp $
-
-# This is Greg Stein's streaming audio server
-
-IUSE="python ednad"
-
-
-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() {
-
-	if [ "`use ednad`" ]; then
-		einfo "Installing in daemon mode"
-		insinto /etc/init.d
-		insopts -m 755
-		newins ${FILESDIR}/edna.gentoo edna
-		exeinto /usr/bin ; doexe daemon/ednad
-	fi
-
-	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 templates /etc/edna/templates
-
-	dodoc COPYING README ChangeLog
-}
-
-pkg_postinst() {
-	ewarn
-	einfo "Edit edna.conf to suite before starting edna and test it."
-	einfo "Emerge with USE="ednad" if you want to install in daemon"
-	einfo "mode.  See edna.conf and the html docs for more info."
-	ewarn
-}
diff --git a/media-sound/edna/files/digest-edna-0.5-r1 b/media-sound/edna/files/digest-edna-0.5-r1
deleted file mode 100644
index 98bcede95ebc..000000000000
--- a/media-sound/edna/files/digest-edna-0.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec3d46b25fa582b78db7c32acf78da47 edna-0.5.tar.gz 85785
diff --git a/media-sound/edna/files/digest-edna-0.5-r2 b/media-sound/edna/files/digest-edna-0.5-r2
deleted file mode 100644
index 98bcede95ebc..000000000000
--- a/media-sound/edna/files/digest-edna-0.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec3d46b25fa582b78db7c32acf78da47 edna-0.5.tar.gz 85785
diff --git a/media-sound/edna/files/digest-edna-0.5 b/media-sound/edna/files/digest-edna-0.5-r3
index 98bcede95ebc..98bcede95ebc 100644
--- a/media-sound/edna/files/digest-edna-0.5
+++ b/media-sound/edna/files/digest-edna-0.5-r3
diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
index 72fc09b54945..cf46fc45398f 100644
--- a/media-sound/edna/files/edna.gentoo
+++ b/media-sound/edna/files/edna.gentoo
@@ -5,7 +5,12 @@
 # description: edna is a mini mp3 webserver
 # processname: python
 # pidfile: /var/run/ednad.pid
-# config: 
+# config:
+
+export PYTHONPATH=/usr/lib/edna
+EDNA=/usr/bin/edna
+EDNACONF=/etc/edna/edna.conf
+PIDFILE=/var/run/edna.pid
 
 depend() {
         need local
@@ -13,13 +18,13 @@ depend() {
 
 start() {
     ebegin "Starting ednad mp3 server"
-    start-stop-daemon -m --quiet --pidfile /var/run/ednad.pid --start --exec \
-	/usr/bin/edna -- --daemon /etc/edna/edna.conf
+    start-stop-daemon -m -b --start --quiet --pidfile $PIDFILE \
+    --exec $EDNA -- $EDNACONF
     eend $?
 }
 
 stop() {
     ebegin "Stopping ednad"
-    start-stop-daemon -o --quiet --stop --pidfile /var/run/ednad.pid
+    start-stop-daemon -o --quiet --stop --pidfile $PIDFILE
     eend $?
 }