Add 7.0.2 beta nightly for 2008-05-30; Remove old versions

(Portage version: 2.1.4.4)

2 files changed, 17 insertions, 15 deletions

diff --git a/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch b/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch
index ff8fb7918547..b500716abed9 100644
--- a/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch
+++ b/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch
@@ -1,5 +1,5 @@
 --- Slim/Utils/OSDetect.pm.old	2008-05-23 18:55:39.000000000 +0100
-+++ Slim/Utils/OSDetect.pm	2008-05-25 20:21:54.000000000 +0100
++++ Slim/Utils/OSDetect.pm	2008-05-26 15:56:10.000000000 +0100
 @@ -248,6 +248,58 @@
  			warn "dirsFor: Didn't find a match request: [$dir]\n";
  		}
@@ -100,18 +100,20 @@
  		unshift @INC, '/usr/share/squeezecenter';
  		unshift @INC, '/usr/share/squeezecenter/CPAN';
 --- Slim/Music/Import.pm.old	2008-05-23 21:57:18.000000000 +0100
-+++ Slim/Music/Import.pm	2008-05-23 21:57:59.000000000 +0100
-@@ -139,7 +139,7 @@
- 
- 		$command  = '/usr/libexec/squeezecenter-scanner';
- 
--	} elsif (Slim::Utils::OSDetect::isDebian()) {
-+	} elsif (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isGentoo()) {
++++ Slim/Music/Import.pm	2008-05-30 12:29:57.000000000 +0100
+@@ -143,6 +143,10 @@
  
  		$command  = '/usr/sbin/squeezecenter-scanner';
  
++	} elsif (Slim::Utils::OSDetect::isGentoo()) {
++
++		$command  = '/usr/sbin/squeezecenter-scanner';
++
+ 	}
+ 
+ 	# Bug: 3530 - use the same version of perl we were started with.
 --- Slim/bootstrap.pm.old	2008-05-23 21:23:18.000000000 +0100
-+++ Slim/bootstrap.pm	2008-05-24 17:01:16.000000000 +0100
++++ Slim/bootstrap.pm	2008-05-26 15:54:12.000000000 +0100
 @@ -97,8 +97,9 @@
  
  	my @SlimINC = ();
@@ -140,7 +142,7 @@
  
  	# This works like 'use lib'
 --- Slim/Utils/MySQLHelper.pm.old	2008-05-24 13:21:24.000000000 +0100
-+++ Slim/Utils/MySQLHelper.pm	2008-05-24 17:01:16.000000000 +0100
++++ Slim/Utils/MySQLHelper.pm	2008-05-26 15:55:55.000000000 +0100
 @@ -152,7 +152,7 @@
  
  	# Because we use the system MySQL, we need to point to the right
diff --git a/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d b/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d
index e81616e9e183..9f3ee9de709f 100755
--- a/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d
+++ b/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d,v 1.1 2008/05/26 00:18:37 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d,v 1.2 2008/06/03 21:22:03 lavajoe Exp $
 
 # These fit the SqueezeCenter ebuild and so shouldn't need to be changed;
 # user-servicable parts go in /etc/conf.d/squeezecenter.
@@ -12,6 +12,7 @@ prefsdir=${varlibdir}/prefs
 cachedir=${varlibdir}/cache
 prefsfile=${prefsdir}/squeezecenter.prefs
 scuser=squeezecenter
+scname=squeezecenter-server
 
 depend() {
 	need net mysql
@@ -23,9 +24,8 @@ start() {
 	cd /
 	/usr/bin/nice --adjustment=${SC_NICENESS:-0} sudo -u ${scuser} \
 		start-stop-daemon \
-			--start --quiet \
-			--name slimserver.pl \
-			--exec /usr/sbin/squeezecenter-server -- \
+			--start --exec /usr/bin/perl /usr/sbin/${scname} \
+			-- \
 			--quiet --daemon \
 			--pidfile=${pidfile} \
 			--cachedir=${cachedir} \
@@ -41,6 +41,6 @@ start() {
 
 stop() {
 	ebegin "Stopping SqueezeCenter"
-	start-stop-daemon -o --stop --quiet --pidfile ${pidfile}
+	start-stop-daemon -o --stop --pidfile ${pidfile}
 	eend $? "Failed to stop SqueezeCenter"
 }