Do mp3 indexing in init file. Closes bug #48828.

5 files changed, 33 insertions, 11 deletions

diff --git a/media-sound/gnump3d/ChangeLog b/media-sound/gnump3d/ChangeLog
index ba01d4a56595..b686a5193815 100644
--- a/media-sound/gnump3d/ChangeLog
+++ b/media-sound/gnump3d/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2004/03/31 22:44:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/ChangeLog,v 1.17 2004/04/24 22:46:34 eradicator Exp $
+
+  24 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> gnump3d-2.7.ebuild,
+  files/gnump3d.conf.d, files/gnump3d.init.d:
+  Do mp3 indexing in init file.  Closes bug #48828.
 
   01 Apr 2004; David Holm <dholm@gentoo.org> gnump3d-2.7.ebuild:
   Added to ~ppc.
diff --git a/media-sound/gnump3d/Manifest b/media-sound/gnump3d/Manifest
index a2702a9289ea..984c9f2d512f 100644
--- a/media-sound/gnump3d/Manifest
+++ b/media-sound/gnump3d/Manifest
@@ -1,13 +1,14 @@
-MD5 fab45611e9e68f73ad2f2887282d2990 ChangeLog 2592
-MD5 e44ce253ccbe1162934938c4a174cab5 gnump3d-2.7.ebuild 1982
+MD5 4e00c88c455fa8a94b3e92ef7fdb6882 gnump3d-2.6-r1.ebuild 1973
 MD5 e05f21629a97bed5964bd26a92bca6fa gnump3d-2.2-r1.ebuild 1239
+MD5 7cee5ae85ed38012d4139f7d41a896c5 ChangeLog 2773
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 4e00c88c455fa8a94b3e92ef7fdb6882 gnump3d-2.6-r1.ebuild 1973
-MD5 8abeea82e07f1fc9c96048b7ace64d68 files/digest-gnump3d-2.7 64
+MD5 45d28ca69583fc50a573c7382f7fa4a0 gnump3d-2.7.ebuild 2051
 MD5 f71ad5ce431fdd95c03741a4fb32aac9 files/gnump3d-2.6-initd 525
-MD5 d2ff0d8a3c4427010cc3c015d1f6b744 files/digest-gnump3d-2.6-r1 64
-MD5 ed2b7457b2cfbdbc3f20a448938c725a files/digest-gnump3d-2.2-r1 63
+MD5 53ddcd88da020240ac2ec48f0100c4a9 files/gnump3d.conf.d 159
+MD5 f03461b03e58cad0be97f2adff169091 files/gnump3d.init.d 751
 MD5 ab3f67c159ab4936ce8e2a29a55c875b files/gnump3d-2.6-gentoo.patch 526
-MD5 2ff5507f92952ca18798978c8d19f536 files/gnump3d.init.d 574
-MD5 29876cf89eef12bbe651b8f9bdbbdfc6 files/gnump3d-2.2-gentoo.diff 2101
+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/gnump3d.conf.d b/media-sound/gnump3d/files/gnump3d.conf.d
new file mode 100644
index 000000000000..9fe7523c1200
--- /dev/null
+++ b/media-sound/gnump3d/files/gnump3d.conf.d
@@ -0,0 +1,5 @@
+# Set this to 0 to stop the init script from indexing your mp3s.
+# It takes the longest on the first time, but after that, it only does
+# updates.
+
+DO_INDEX=1
diff --git a/media-sound/gnump3d/files/gnump3d.init.d b/media-sound/gnump3d/files/gnump3d.init.d
index d20da60d369d..d28b4b470da2 100644
--- a/media-sound/gnump3d/files/gnump3d.init.d
+++ b/media-sound/gnump3d/files/gnump3d.init.d
@@ -1,14 +1,22 @@
 #!/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.init.d,v 1.1 2004/03/30 18:46:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/files/gnump3d.init.d,v 1.2 2004/04/24 22:46:34 eradicator Exp $
 
 depend() {
 	need net
+	after netmount nfsmount
 }
 
 start() {
 	ebegin "Starting gnump3d"
+
+	if [ ${DO_INDEX} -eq 1 ]; then
+		ebegin "Updating index of music files (may take a while for the first time)"
+		/usr/bin/gnump3d-index
+		eend $?
+	fi
+
 	start-stop-daemon --start --quiet --exec /usr/bin/gnump3d2 --make-pidfile \
 		--pidfile /var/run/gnump3d.pid --background -- --quiet
 	eend $?
diff --git a/media-sound/gnump3d/gnump3d-2.7.ebuild b/media-sound/gnump3d/gnump3d-2.7.ebuild
index 8db76f0d714e..e761fc7f223b 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.2 2004/03/31 22:44:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-2.7.ebuild,v 1.3 2004/04/24 22:46:34 eradicator Exp $
 
 DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
 HOMEPAGE="http://www.gnump3d.org/"
@@ -48,6 +48,10 @@ src_install() {
 
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/${PN}.init.d gnump3d
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PN}.conf.d gnump3d
+
 	dodir /etc/env.d
 	cat >${D}/etc/env.d/50gnump3d <<EOF
 # PERL5LIB="${LIBDIR}"