fixed some new baselayout and python issues; init script and pep0263 patch

(Portage version: 2.0.51.22-r2)

7 files changed, 59 insertions, 37 deletions

diff --git a/media-sound/edna/ChangeLog b/media-sound/edna/ChangeLog
index fe982a3376ed..15ac408d722c 100644
--- a/media-sound/edna/ChangeLog
+++ b/media-sound/edna/ChangeLog
@@ -1,6 +1,14 @@
 # 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.20 2005/08/24 16:32:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/ChangeLog,v 1.21 2005/09/09 04:51:11 nerdboy Exp $
+
+*edna-0.5-r5 (09 Sep 2005)
+
+  09 Sep 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/edna-0.5-pep-0263.patch, files/edna.gentoo, -edna-0.5-r3.ebuild,
+  +edna-0.5-r5.ebuild:
+  fixed some new baselayout and python issues; init script and pep0263 patch
+  amd64 needed a stable bump
 
   24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> edna-0.5-r4.ebuild:
   Cleaned up dependency variables, use newinitd to install init.d file, don't
diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest
index 52aee19a81ee..64e8d5bdce65 100644
--- a/media-sound/edna/Manifest
+++ b/media-sound/edna/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c2166fdb6841e60920cc18b266beb1c2 edna-0.5-r3.ebuild 1447
-MD5 c3e3ef564b50a5c8bcaea55ebe4abb89 edna-0.5-r4.ebuild 1547
-MD5 5a99a024541e4ffb4e5aa6b7c225c206 ChangeLog 2454
+MD5 b2037136dc88a4a9c42067fb2b003ead ChangeLog 2735
+MD5 1c2a210ab4f3242c090bffdc9dc70b09 edna-0.5-r5.ebuild 1707
 MD5 8221e3990883569e1f24440fbd48e25b metadata.xml 330
-MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r3 59
-MD5 3ebeae755eeebd30c84867f96b8fb8ce files/edna.gentoo 606
+MD5 b241b7a5dd4d7ffc6677dc1ac74d876f edna-0.5-r4.ebuild 1546
+MD5 6f8bb1ccb9018d0196cea623e4e01998 files/edna-0.5-pep-0263.patch 317
+MD5 163e5e1aca301e2faeac5ffc69cd6323 files/edna.gentoo 710
 MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r4 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDDKE+j5H05b2HAEkRAs+xAJ9gmCkmgdmkE30I90nhwfVsWqvIQgCfYzMG
-szE2MM1JyfJSyErmSywIBZM=
-=bgeK
------END PGP SIGNATURE-----
+MD5 0afeb0ec9a434506f2b38f2e66dbb0e3 files/digest-edna-0.5-r5 59
diff --git a/media-sound/edna/edna-0.5-r4.ebuild b/media-sound/edna/edna-0.5-r4.ebuild
index 1482b6e5d358..bff68a6b6483 100644
--- a/media-sound/edna/edna-0.5-r4.ebuild
+++ b/media-sound/edna/edna-0.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.8 2005/08/24 16:32:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r4.ebuild,v 1.9 2005/09/09 04:51:11 nerdboy Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/edna/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/python
 	oggvorbis? ( dev-python/pyogg
diff --git a/media-sound/edna/edna-0.5-r3.ebuild b/media-sound/edna/edna-0.5-r5.ebuild
index f62bf98d254d..57311eedad1a 100644
--- a/media-sound/edna/edna-0.5-r3.ebuild
+++ b/media-sound/edna/edna-0.5-r5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 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.13 2005/07/09 19:17:49 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/edna/edna-0.5-r5.ebuild,v 1.1 2005/09/09 04:51:11 nerdboy Exp $
 
 inherit eutils
 
-IUSE=""
+IUSE="oggvorbis"
 
 DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use"
 HOMEPAGE="http://edna.sourceforge.net/"
@@ -13,16 +13,23 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-lang/python
+	oggvorbis? ( dev-python/pyogg
+		dev-python/pyvorbis )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if has_version '>=dev-lang/python-2.3' ; then
+		epatch ${FILESDIR}/${P}-pep-0263.patch || die "epatch failed"
+	fi
+}
 
 src_install() {
-
 	einfo "Installing in daemon mode"
-	insinto /etc/init.d
-	insopts -m 755
-	newins ${FILESDIR}/edna.gentoo edna
+	newinitd ${FILESDIR}/edna.gentoo edna
 
 	dodir /usr/bin /usr/$(get_libdir)/edna /usr/$(get_libdir)/edna/templates
 	exeinto /usr/bin ; newexe edna.py edna
@@ -37,7 +44,7 @@ src_install() {
 	doins edna.conf
 	dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates
 
-	dodoc COPYING README ChangeLog
+	dodoc README ChangeLog
 	dohtml -r www/*
 }
 
@@ -46,7 +53,8 @@ pkg_postinst() {
 	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 "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-r3 b/media-sound/edna/files/digest-edna-0.5-r5
index 98bcede95ebc..98bcede95ebc 100644
--- a/media-sound/edna/files/digest-edna-0.5-r3
+++ b/media-sound/edna/files/digest-edna-0.5-r5
diff --git a/media-sound/edna/files/edna-0.5-pep-0263.patch b/media-sound/edna/files/edna-0.5-pep-0263.patch
new file mode 100644
index 000000000000..70294d9b1c23
--- /dev/null
+++ b/media-sound/edna/files/edna-0.5-pep-0263.patch
@@ -0,0 +1,11 @@
+--- edna.py.orig	2003-04-19 17:08:40.000000000 -0700
++++ edna.py	2005-09-08 19:29:28.000000000 -0700
+@@ -1,4 +1,8 @@
+ #!/usr/bin/env python
++# -*- coding: UTF-8 -*-
++#
++# the line above is to prevent a warning in python 2.3 or later; see:
++# http://www.python.org/peps/pep-0263.html
+ #
+ # edna.py -- an MP3 server
+ #
diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo
index 63fa426a4b30..1d96de7c56db 100644
--- a/media-sound/edna/files/edna.gentoo
+++ b/media-sound/edna/files/edna.gentoo
@@ -13,18 +13,22 @@ EDNACONF=/etc/edna/edna.conf
 PIDFILE=/var/run/edna.pid
 
 depend() {
-        need local
+        use net
+	need local
 }
 
 start() {
-    ebegin "Starting ednad mp3 server"
-    start-stop-daemon -m -b --start --quiet --pidfile $PIDFILE \
-    --exec $EDNA -- $EDNACONF
-    eend $?
+    ebegin "Starting edna mp3 server"
+    start-stop-daemon --quiet --pidfile $PIDFILE
+    $EDNA --daemon $EDNACONF
+    eend $? "Failed to start edna"
 }
 
 stop() {
-    ebegin "Stopping ednad"
-    start-stop-daemon -o --quiet --stop --pidfile $PIDFILE
-    eend $?
+    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}
 }