Stable x86.

11 files changed, 11 insertions, 268 deletions

diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index b686a5193815..0d21ac51ebea 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/gnump3d
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.17 2004/04/24 22:46:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.18 2004/04/25 02:13:29 eradicator Exp $
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnump3d-2.2-r1.ebuild, gnump3d-2.6-r1.ebuild, gnump3d-2.7.ebuild,
+  files/gnump3d-2.2-gentoo.diff, files/gnump3d-2.2-initd,
+  files/gnump3d-2.6-gentoo.patch, files/gnump3d-2.6-initd:
+  Stable x86.
 
   24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.7.ebuild,
   files/gnump3d.conf.d, files/gnump3d.init.d:
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index 984c9f2d512f..475e3cf496c6 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,14 +1,6 @@
-MD5 4e00c88c455fa8a94b3e92ef7fdb6882 gnump3d-2.6-r1.ebuild 1973
-MD5 e05f21629a97bed5964bd26a92bca6fa gnump3d-2.2-r1.ebuild 1239
-MD5 7cee5ae85ed38012d4139f7d41a896c5 ChangeLog 2773
+MD5 ed203c8e6726915cbda8db83ba41b75a ChangeLog 3030
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 45d28ca69583fc50a573c7382f7fa4a0 gnump3d-2.7.ebuild 2051
-MD5 f71ad5ce431fdd95c03741a4fb32aac9 files/gnump3d-2.6-initd 525
+MD5 41bb69d51e9b9d38332b73c0fb277be2 gnump3d-2.7.ebuild 2050
 MD5 53ddcd88da020240ac2ec48f0100c4a9 files/gnump3d.conf.d 159
 MD5 f03461b03e58cad0be97f2adff169091 files/gnump3d.init.d 751
-MD5 ab3f67c159ab4936ce8e2a29a55c875b files/gnump3d-2.6-gentoo.patch 526
-MD5 ed2b7457b2cfbdbc3f20a448938c725a files/digest-gnump3d-2.2-r1 63
-MD5 d2ff0d8a3c4427010cc3c015d1f6b744 files/digest-gnump3d-2.6-r1 64
-MD5 bfd0291e96e61a22cd6efad70c2c7250 files/gnump3d-2.2-initd 523
 MD5 8abeea82e07f1fc9c96048b7ace64d68 files/digest-gnump3d-2.7 64
-MD5 29876cf89eef12bbe651b8f9bdbbdfc6 files/gnump3d-2.2-gentoo.diff 2101
diff --git a/media-sound/gnump3d/files/digest-gnump3d-2.2-r1 b/media-sound/gnump3d/files/digest-gnump3d-2.2-r1
deleted file mode 100644
index 532498c73dc0..000000000000
--- a/media-sound/gnump3d/files/digest-gnump3d-2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10849cbaaa2c4a1589ec69b30fd04e47 gnump3d-2.2.tar.gz 173740
diff --git a/media-sound/gnump3d/files/digest-gnump3d-2.6-r1 b/media-sound/gnump3d/files/digest-gnump3d-2.6-r1
deleted file mode 100644
index 13e935bf4619..000000000000
--- a/media-sound/gnump3d/files/digest-gnump3d-2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30c361ca60c4f01a81dc5b86fd949e6f gnump3d-2.6.tar.bz2 190567
diff --git a/media-sound/gnump3d/files/gnump3d-2.2-gentoo.diff b/media-sound/gnump3d/files/gnump3d-2.2-gentoo.diff
deleted file mode 100644
index 51b9f2e16261..000000000000
--- a/media-sound/gnump3d/files/gnump3d-2.2-gentoo.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ru gnump3d-2.2-orig/Makefile gnump3d-2.2/Makefile
---- gnump3d-2.2-orig/Makefile	2003-02-04 11:25:13.000000000 +0200
-+++ gnump3d-2.2/Makefile	2003-02-22 04:07:20.000000000 +0200
-@@ -26,12 +26,10 @@
- 	install -d $(PREFIX)/share/gnump3d
- 	install -d $(PREFIX)/bin
- 	install -d $(PREFIX)/man/man1
--	install -d /var/log/gnump3d
--	install -d /etc/gnump3d
- 	cp lib/gnump3d/*.pm $(LIBDIR)/gnump3d
- 	cp lib/gnump3d/plugins/*.pm $(LIBDIR)/gnump3d/plugins
- 	cp bin/gnump3d2 $(PREFIX)/bin/
--	-ln -s $(PREFIX)/bin/gnump3d2 $(PREFIX)/bin/gnump3d
-+	-ln -s gnump3d2 $(PREFIX)/bin/gnump3d
- 	cp bin/gnump3d-top $(PREFIX)/bin
- 	cp man/gnump3d-top.1 $(PREFIX)/man/man1
- 	cp man/gnump3d.1 $(PREFIX)/man/man1
-@@ -39,8 +37,6 @@
- 	cp -R templates/* $(PREFIX)/share/gnump3d
- 	chmod -R a+r $(PREFIX)/share/gnump3d/
- 	chmod +rx $(PREFIX)/share/gnump3d/*/
--	if [ ! -e /etc/gnump3d/gnump3d.conf ]; then cp etc/gnump3d.conf /etc/gnump3d ; fi
--	cp etc/mime.types /etc/gnump3d
- 
- uninstall:
- 	rm -f $(PREFIX)/bin/gnump3d-top
-diff -ru gnump3d-2.2-orig/bin/gnump3d2 gnump3d-2.2/bin/gnump3d2
---- gnump3d-2.2-orig/bin/gnump3d2	2003-02-04 11:25:13.000000000 +0200
-+++ gnump3d-2.2/bin/gnump3d2	2003-02-22 03:43:12.000000000 +0200
-@@ -280,6 +280,11 @@
- 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 );
- }
- 
- 
-diff -ru gnump3d-2.2-orig/etc/gnump3d.conf gnump3d-2.2/etc/gnump3d.conf
---- gnump3d-2.2-orig/etc/gnump3d.conf	2003-02-04 11:25:13.000000000 +0200
-+++ gnump3d-2.2/etc/gnump3d.conf	2003-02-22 02:34:42.000000000 +0200
-@@ -93,7 +93,7 @@
- #  If you're on a multi-user system its probably a good idea to
- # make the audio files readable to other users anyway...
- #
--root = /home/mp3   
-+# root = /home/mp3   
- 
- 
- #
-@@ -611,7 +611,7 @@
- #
- # plugin_directory = /usr/lib/perl5/gnump3d/plugins
- #
--
-+plugin_directory = /usr/lib/perl5/5.8.0/gnump3d/plugins
- 
- #
- #  By default all the plugins which are shipped with this server are
diff --git a/media-sound/gnump3d/files/gnump3d-2.2-initd b/media-sound/gnump3d/files/gnump3d-2.2-initd
deleted file mode 100644
index 874a8efb6666..000000000000
--- a/media-sound/gnump3d/files/gnump3d-2.2-initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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.2-initd,v 1.2 2004/03/04 18:50:29 vapier Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting gnump3d"
-	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 -- --background --quiet
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping gnump3d"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gnump3d.pid
-	eend $?
-}
-
diff --git a/media-sound/gnump3d/files/gnump3d-2.6-gentoo.patch b/media-sound/gnump3d/files/gnump3d-2.6-gentoo.patch
deleted file mode 100644
index ab4ed2abde60..000000000000
--- a/media-sound/gnump3d/files/gnump3d-2.6-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index bb19da539a21..000000000000
--- a/media-sound/gnump3d/files/gnump3d-2.6-initd
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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.3 2004/03/22 15:37:18 mkennedy Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting gnump3d"
-	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 -- --background --quiet
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping gnump3d"
-	start-stop-daemon --stop --quiet --pidfile /var/run/gnump3d.pid
-	eend $?
-}
-
diff --git a/media-sound/gnump3d/gnump3d-2.2-r1.ebuild b/media-sound/gnump3d/gnump3d-2.2-r1.ebuild
deleted file mode 100644
index 5b98276976db..000000000000
--- a/media-sound/gnump3d/gnump3d-2.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.2-r1.ebuild,v 1.6 2004/03/30 18:46:34 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
-HOMEPAGE="http://www.gnump3d.org/"
-SRC_URI="mirror://sourceforge/gnump3d/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.8.0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_install() {
-	make \
-		LIBDIR=${D}`perl bin/getlibdir` \
-		PREFIX=${D}/usr \
-		install || die
-
-	# init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gnump3d-2.2-initd gnump3d
-
-	# just to be sure..
-	dosym usr/bin/gnump3d2 gnump3d
-
-	# make directories
-	DIROPTIONS="--owner=nobody" dodir /var/log/gnump3d
-	dodir /etc/gnump3d
-
-	# copy config files
-	insinto /etc/gnump3d
-	doins etc/*
-
-	# docs
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
-}
-
-pkg_postinst() {
-	einfo
-	einfo "The default directory for shared mp3s is /home/mp3"
-	einfo "Please edit your /etc/gnump3d/gnump3d.conf before"
-	einfo "running /etc/init.d/gnump3d start"
-	einfo
-}
diff --git a/media-sound/gnump3d/gnump3d-2.6-r1.ebuild b/media-sound/gnump3d/gnump3d-2.6-r1.ebuild
deleted file mode 100644
index 700f45de0490..000000000000
--- a/media-sound/gnump3d/gnump3d-2.6-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.3 2004/03/30 18:46:34 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
-HOMEPAGE="http://www.gnump3d.org/"
-SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-IUSE=""
-
-DEPEND="sys-apps/sed"
-
-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
-}
diff --git a/media-sound/gnump3d/gnump3d-2.7.ebuild b/media-sound/gnump3d/gnump3d-2.7.ebuild
index e761fc7f223b..c8f306dc781c 100644
--- a/media-sound/gnump3d/gnump3d-2.7.ebuild
+++ b/media-sound/gnump3d/gnump3d-2.7.ebuild
@@ -1,6 +1,6 @@
 # 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.7.ebuild,v 1.3 2004/04/24 22:46:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.7.ebuild,v 1.4 2004/04/25 02:13:29 eradicator Exp $
 
 DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
 HOMEPAGE="http://www.gnump3d.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 IUSE=""