added USE flag for oggvorbis support, updated einfo, metadata, comments

7 files changed, 80 insertions, 25 deletions

diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index 36c5297b5f0a..b909a68e397d 100644
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/edna
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.12 2004/10/15 16:59:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.13 2004/10/26 16:25:13 nerdboy Exp $
+
+  26 Oct 2004; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
+  files/edna.gentoo, edna-0.5-r3.ebuild, edna-0.5-r4.ebuild:
+  added USE flag for oggvorbis support, update comments and einfo
 
   15 Oct 2004; Sven Wegener <swegener@gentoo.org> edna-0.5-r3.ebuild:
   Added inherit eutils for get_libdir. Thanks to Thomas Kirchner
@@ -23,7 +27,7 @@
 
 *edna-0.5-r3 (14 Dec 2003)
 
-  14 Dec 2003; <sarnold@gentoo.org> edna-0.5-r3.ebuild, files/edna.gentoo:
+  14 Dec 2003; <nerdboy@gentoo.org> edna-0.5-r3.ebuild, files/edna.gentoo:
   finally fixed init script and env stuff
 
 *edna-0.5-r2 (14 Dec 2003)
diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 66d1aff444e3..c59b023e0a5a 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 28742691e51d936dbe4403067a336110 ChangeLog 1528
-MD5 583b1213925da96378a867cf73da3aaa edna-0.5-r3.ebuild 1439
-MD5 c428564369ae642a40adff1387e750d6 metadata.xml 332
+MD5 56389f86d3b524839be7800abe39bec7 ChangeLog 1718
+MD5 a8649e90775e931dc92fe01f6d8e6798 edna-0.5-r3.ebuild 1450
+MD5 8221e3990883569e1f24440fbd48e25b metadata.xml 330
+MD5 5d6b674c1a7b295713841307317c535a edna-0.5-r4.ebuild 1604
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r3 59
-MD5 4cebb18eae4b5f56b639e8418f677992 files/edna.gentoo 585
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBcAIFI1lqEGTUzyQRAvQfAKDRkfa/ECR3aBqqHPcIqWO+jvp8MwCfTnAv
-T71J+EJ6SvHNmWlZZZk1S+4=
-=2GGI
------END PGP SIGNATURE-----
+MD5 3ebeae755eeebd30c84867f96b8fb8ce files/edna.gentoo 606
+MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r4 59
diff --git a/media-sound/edna/edna-0.5-r3.ebuild b/media-sound/edna/edna-0.5-r3.ebuild
index 2ac93199f6e6..34ef1555b1dc 100644
--- a/media-sound/edna/edna-0.5-r3.ebuild
+++ b/media-sound/edna/edna-0.5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r3.ebuild,v 1.10 2004/10/15 16:59:39 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r3.ebuild,v 1.11 2004/10/26 16:25:13 nerdboy Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ IUSE=""
 
 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"
@@ -43,9 +43,11 @@ src_install() {
 
 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 "Edit edna.conf to taste before starting (multiple source"
+	einfo "directories are allowed).  Test ednad from a shell prompt"
+	einfo "until you have it configured properly, then add edna to"
+	einfo "the default runlevel when you're ready."
+	einfo ""
 	einfo "See edna.conf and the html docs for more info."
 	ewarn
 }
diff --git a/media-sound/edna/edna-0.5-r4.ebuild b/media-sound/edna/edna-0.5-r4.ebuild
new file mode 100644
index 000000000000..d83650dc4f6c
--- /dev/null
+++ b/media-sound/edna/edna-0.5-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.1 2004/10/26 16:25:13 nerdboy Exp $
+
+inherit eutils
+
+IUSE="oggvorbis"
+
+DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
+HOMEPAGE="http://edna.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64"
+
+DEPEND="dev-lang/python
+	oggvorbis? ( dev-python/pyogg )
+	oggvorbis? ( dev-python/pyvorbis )"
+
+src_install() {
+
+	einfo "Installing in daemon mode"
+	insinto /etc/init.d
+	insopts -m 755
+	newins ${FILESDIR}/edna.gentoo edna
+
+	dodir /usr/bin /usr/$(get_libdir)/edna /usr/$(get_libdir)/edna/templates
+	exeinto /usr/bin ; newexe edna.py edna
+	exeinto /usr/$(get_libdir)/edna ; doexe ezt.py
+	exeinto /usr/$(get_libdir)/edna ; doexe MP3Info.py
+	insinto /usr/$(get_libdir)/edna/templates
+	insopts -m 644
+	doins templates/*
+
+	insinto /etc/edna
+	insopts -m 644
+	doins edna.conf
+	dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates
+
+	dodoc COPYING README ChangeLog
+	dohtml -r www/*
+}
+
+pkg_postinst() {
+	ewarn
+	einfo "Edit edna.conf to taste before starting (multiple source"
+	einfo "directories are allowed).  Test ednad from a shell prompt"
+	einfo "until you have it configured properly, then add edna to"
+	einfo "the default runlevel when you're ready.  Add the USE flag"
+	einfo "oggvorbis if you want edna to serve ogg files."
+	einfo ""
+	einfo "See edna.conf and the html docs for more info."
+	ewarn
+}
diff --git a/media-sound/edna/files/digest-edna-0.5-r4 b/media-sound/edna/files/digest-edna-0.5-r4
new file mode 100644
index 000000000000..98bcede95ebc
--- /dev/null
+++ b/media-sound/edna/files/digest-edna-0.5-r4
@@ -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 cf46fc45398f..63fa426a4b30 100644
--- 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 mp3 mini server 
+# Startup script for the edna audio server 
 #
-# description: edna is a mini mp3 webserver
+# description: edna is a mini mp3/ogg webserver
 # processname: python
 # pidfile: /var/run/ednad.pid
-# config:
+# config: /etc/edna/edna.conf
 
 export PYTHONPATH=/usr/lib/edna
 EDNA=/usr/bin/edna
diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml
index 2b5cc5b7e74c..855babe4c7c7 100644
--- a/media-sound/edna/metadata.xml
+++ b/media-sound/edna/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>sound</herd>
 <maintainer>
-  <email>nerdboy@gentoo.org</email>
+  <email>sound@gentoo.org</email>
 </maintainer>
 <longdescription>
   Edna is Greg Stein's http streaming audio server for mp3 and ogg files.