*** empty log message ***

5 files changed, 96 insertions, 11 deletions

diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index 72e56159771a..7e1f40bc35c8 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gnump3d
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.12 2003/11/24 08:05:24 mkennedy Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.13 2004/03/22 15:37:16 mkennedy Exp $
+
+*gnump3d-2.6-r1 (22 Mar 2004)
+
+  22 Mar 2004; <mkennedy@gentoo.org> gnump3d-2.6-r1.ebuild,
+  files/gnump3d-2.6-gentoo.patch, files/gnump3d-2.6-initd:
+  Corrected boot-time failure to load problem
 
 *gnump3d-2.6 (24 Nov 2003)
 
diff --git a/media-sound/gnump3d/files/digest-gnump3d-2.6-r1 b/media-sound/gnump3d/files/digest-gnump3d-2.6-r1
new file mode 100644
index 000000000000..13e935bf4619
--- /dev/null
+++ b/media-sound/gnump3d/files/digest-gnump3d-2.6-r1
@@ -0,0 +1 @@
+MD5 30c361ca60c4f01a81dc5b86fd949e6f gnump3d-2.6.tar.bz2 190567
diff --git a/media-sound/gnump3d/files/gnump3d-2.6-gentoo.patch b/media-sound/gnump3d/files/gnump3d-2.6-gentoo.patch
new file mode 100644
index 000000000000..ab4ed2abde60
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d-2.6-gentoo.patch
@@ -0,0 +1,18 @@
+diff -ur gnump3d-2.6.original/bin/gnump3d2 gnump3d-2.6/bin/gnump3d2
+--- gnump3d-2.6.original/bin/gnump3d2	2003-10-16 09:21:20.000000000 -0500
++++ gnump3d-2.6/bin/gnump3d2	2004-01-23 16:34:11.425553072 -0600
+@@ -393,6 +393,13 @@
+ if ( ( not $DEBUG ) and ( $BACKGROUND ) )
+ {
+     fork() && exit;
++
++    # 2003-02-22 Jyrki Muukkonen
++    # we need a pidfile for /etc/init.d/gnump3d script
++    open( PIDFILE, ">/var/run/gnump3d.pid" );
++    print PIDFILE $PID;
++    close( PIDFILE );
++
+ }
+ 
+ 
+Only in gnump3d-2.6/bin: gnump3d2~
diff --git a/media-sound/gnump3d/files/gnump3d-2.6-initd b/media-sound/gnump3d/files/gnump3d-2.6-initd
index b094bb72d2bf..bb19da539a21 100644
--- a/media-sound/gnump3d/files/gnump3d-2.6-initd
+++ b/media-sound/gnump3d/files/gnump3d-2.6-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/files/gnump3d-2.6-initd,v 1.2 2004/03/04 18:50:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/files/gnump3d-2.6-initd,v 1.3 2004/03/22 15:37:18 mkennedy Exp $
 
 depend() {
 	need net
@@ -9,9 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting gnump3d"
-	start-stop-daemon --start --quiet  --make-pidfile \
-		--background --pidfile /var/run/gnump3d.pid \
-		--exec /usr/bin/gnump3d2 -- --quiet
+	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 -- --background --quiet
 	eend $?
 }
 
@@ -21,8 +19,3 @@ stop() {
 	eend $?
 }
 
-# Local Variables: ***
-# mode: shell-script ***
-# indent-tabs-mode: t ***
-# tab-width: 4 ***
-# End: ***
diff --git a/media-sound/gnump3d/gnump3d-2.6-r1.ebuild b/media-sound/gnump3d/gnump3d-2.6-r1.ebuild
new file mode 100644
index 000000000000..a83fc0263c21
--- /dev/null
+++ b/media-sound/gnump3d/gnump3d-2.6-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.6-r1.ebuild,v 1.1 2004/03/22 15:37:16 mkennedy Exp $
+
+DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
+SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gnump3d.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+RDEPEND=">=dev-lang/perl-5.8.0"
+
+LIBDIR=/usr/lib/gnump3d
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	cd ${S}/bin
+	for binary in gnump3d-index gnump3d2; do
+		sed -i "s,#!/usr/bin/perl,#!/usr/bin/perl -I${LIBDIR},g" $binary
+	done
+}
+
+src_install() {
+	insinto ${LIBDIR}/gnump3d; doins lib/gnump3d/*.pm
+	insinto ${LIBDIR}/gnump3d/plugins; doins lib/gnump3d/plugins/*.pm
+	insinto ${LIBDIR}/gnump3d/lang; doins lib/gnump3d/lang/*.pm
+	dobin bin/gnump3d2 bin/gnump3d-top bin/gnump3d-index
+	dosym /usr/bin/gnump3d2 /usr/bin/gnump3d
+	doman man/*.1
+	dodir /usr/share/gnump3d; cp -R templates/* ${D}/usr/share/gnump3d/
+	insinto /etc/gnump3d
+	doins etc/mime.types
+	sed -e "s,PLUGINDIR,${LIBDIR},g" \
+		-e 's,^user *= *\(.*\)$,user = gnump3d,g' \
+		etc/gnump3d.conf >${D}/etc/gnump3d/gnump3d.conf
+
+	dodoc AUTHORS ChangeLog README COPYING TODO
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/${P}-initd gnump3d
+	dodir /etc/env.d
+	cat >${D}/etc/env.d/50gnump3d <<EOF
+# PERL5LIB="${LIBDIR}"
+EOF
+	dodir /var/log/gnump3d
+	dodir /var/cache/gnump3d/serving
+
+	keepdir /var/log/gnump3d
+	keepdir /var/cache/gnump3d/serving
+
+	touch ${D}/var/cache/gnump3d/song.tags
+	touch ${D}/var/cache/gnump3d/serving/.keep
+}
+
+pkg_postinst() {
+	enewuser gnump3d '' '' '' nogroup
+	chown -R gnump3d /var/log/gnump3d
+	chown -R gnump3d /var/cache/gnump3d
+	while read line; do einfo "${line}"; done <<EOF
+
+Please edit your /etc/gnump3d/gnump3d.conf before running
+/etc/init.d/gnump3d start
+
+EOF
+}