Add new version 7.3.0

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r4 i686

5 files changed, 163 insertions, 23 deletions

diff --git a/media-sound/squeezecenter/files/build-perl-modules-gentoo.patch b/media-sound/squeezecenter/files/build-perl-modules-gentoo.patch
index 94997d56782d..6ae452f8604d 100644
--- a/media-sound/squeezecenter/files/build-perl-modules-gentoo.patch
+++ b/media-sound/squeezecenter/files/build-perl-modules-gentoo.patch
@@ -1,18 +1,24 @@
---- Bin/build-perl-modules.pl.old	2008-10-25 13:59:42.000000000 +0100
-+++ Bin/build-perl-modules.pl	2008-10-25 19:28:25.000000000 +0100
-@@ -21,7 +21,6 @@
+--- Bin/build-perl-modules.pl.old	2008-11-18 19:07:45.000000000 +0000
++++ Bin/build-perl-modules.pl	2008-11-18 19:42:04.000000000 +0000
+@@ -21,13 +21,11 @@
  
  # NOTE: If you change this in a future version of SC, create a new
  # versioned directory under vendor/src for all files for that version
--my $SOURCE = 'http://svn.slimdevices.com/repos/slim/vendor/src/7.2';
+-my $SOURCE = 'http://svn.slimdevices.com/repos/slim/vendor/src/7.3';
  my $dlext  = $Config{'dlext'};
  
  # The list of all the packages needed.
-@@ -197,36 +197,16 @@
+ my %packages = (
+ 	'Class::XSAccessor::Array' => 'Class-XSAccessor-Array-0.05.tar.gz',
+-	'Class::C3::XS'            => 'Class-C3-XS-0.08.tar.gz',
+ 	'Compress::Zlib'           => 'Compress-Zlib-1.41.tar.gz',
+ 	'DBI'                      => 'DBI-1.604.tar.gz',
+ 	'DBD::mysql'               => 'DBD-mysql-3.0002.tar.gz',
+@@ -197,36 +195,16 @@
  		}
  	}
  
-+	# Extract AutoXS::Header as we need that to support the following builds.
++	# Utilise AutoXS::Header as we need that to support the following builds.
 +	chdir($pwd) or die "Couldn't change to $pwd : $!";
 +	# Include this when performing the following builds.
 +	$ENV{'PERL5LIB'} = cwd() . "/AutoXS-Header-0.03/lib";
@@ -51,3 +57,13 @@
  
  		# Just the directory name.
  		my ($packageDir) = ($package =~ /(\S+?)\.tar\.gz/);
+--- Slim/bootstrap.pm.old	2008-11-22 15:14:07.000000000 +0000
++++ Slim/bootstrap.pm	2008-11-22 15:14:30.000000000 +0000
+@@ -176,7 +176,6 @@
+ 
+ 		print "The following modules failed to load: $failed\n\n";
+ 
+-		print "To download and compile them, please run: $libPath/Bin/build-perl-modules.pl $failed\n\n";
+ 		print "Exiting..\n";
+ 
+ 		exit;
diff --git a/media-sound/squeezecenter/files/gentoo-filepaths.pm b/media-sound/squeezecenter/files/gentoo-filepaths.pm
new file mode 100644
index 000000000000..1a0564b6ad25
--- /dev/null
+++ b/media-sound/squeezecenter/files/gentoo-filepaths.pm
@@ -0,0 +1,120 @@
+# 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/gentoo-filepaths.pm,v 1.1 2008/12/20 01:24:43 lavajoe Exp $
+
+# This file contains a custom OS package to provide information on the
+# installation structure on Gentoo. It is based on the Debian OS equivalent
+# that is built into SqueezeCenter.
+
+package Slim::Utils::OS::Custom;
+
+use strict;
+use File::Spec::Functions qw(:ALL);
+use FindBin qw($Bin);
+use Config;
+
+use base qw(Slim::Utils::OS::Linux);
+
+sub initDetails {
+	my $class = shift;
+
+	$class->{osDetails} = $class->SUPER::initDetails();
+
+	$class->{osDetails}->{isGentoo} = 1 ;
+
+	# Make sure we can find any CPAN modules packaged with SqueezeCenter.
+	unshift @INC, '/usr/share/squeezecenter/CPAN';
+
+	# Make sure plugin files are found.
+	push @INC, '/var/lib/squeezecenter';
+	
+	return $class->{osDetails};
+}
+
+=head2 dirsFor( $dir )
+
+Return OS Specific directories.
+
+Argument $dir is a string to indicate which of the SqueezeCenter directories we
+need information for.
+
+=cut
+
+sub dirsFor {
+	my ($class, $dir) = @_;
+
+	my @dirs = ();
+	
+	if ($dir eq 'oldprefs') {
+
+		push @dirs, $class->SUPER::dirsFor($dir);
+
+	} elsif ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL|lib|Bin)$/) {
+
+		push @dirs, "/usr/share/squeezecenter/$dir";
+
+	} elsif ($dir eq 'Plugins') {
+			
+		push @dirs, $class->SUPER::dirsFor($dir);
+		push @dirs, "/var/lib/squeezecenter/Plugins", "/usr/lib/" . $Config{'package'} . "/vendor_perl/" . $Config{'version'} . "/Slim/Plugin";
+		
+	} elsif ($dir =~ /^(?:strings|revision)$/) {
+
+		push @dirs, "/usr/share/squeezecenter";
+
+	} elsif ($dir eq 'libpath') {
+
+		push @dirs, "/usr/lib/squeezecenter";
+
+	# Because we use the system MySQL, we need to point to the right
+	# directory for the errmsg. files. Default to english.
+	} elsif ($dir eq 'mysql-language') {
+
+		push @dirs, "/usr/share/mysql/english";
+
+	} elsif ($dir =~ /^(?:types|convert)$/) {
+
+		push @dirs, "/etc/squeezecenter";
+
+	} elsif ($dir =~ /^(?:prefs)$/) {
+
+		push @dirs, $::prefsdir || "/var/lib/squeezecenter/prefs";
+
+	} elsif ($dir eq 'log') {
+
+		push @dirs, $::logdir || "/var/log/squeezecenter";
+
+	} elsif ($dir eq 'cache') {
+
+		push @dirs, $::cachedir || "/var/lib/squeezecenter/cache";
+
+	} elsif ($dir =~ /^(?:music|playlists)$/) {
+
+		push @dirs, '';
+
+	} else {
+
+		warn "dirsFor: Didn't find a match request: [$dir]\n";
+	}
+
+	return wantarray() ? @dirs : $dirs[0];
+}
+
+# Bug 9488, always decode on Ubuntu/Debian
+sub decodeExternalHelperPath {
+	return Slim::Utils::Unicode::utf8decode_locale($_[1]);
+}
+
+sub scanner {
+	return '/usr/sbin/squeezecenter-scanner';
+}
+
+
+1;
+
+
+
+
+1;
+
+__END__
diff --git a/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch b/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch
index 8a3559ed1ee8..daa2a4ea8bb8 100644
--- a/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch
+++ b/media-sound/squeezecenter/files/mDNSResponder-gentoo.patch
@@ -1,5 +1,5 @@
---- Slim/Networking/mDNS.pm.old	2008-07-22 12:25:06.000000000 +0100
-+++ Slim/Networking/mDNS.pm	2008-07-22 12:26:38.000000000 +0100
+--- Slim/Networking/mDNS.pm.old	2008-10-27 08:09:02.000000000 +0000
++++ Slim/Networking/mDNS.pm	2008-10-27 08:09:02.000000000 +0000
 @@ -131,11 +131,10 @@
  
  		my ($name, $port) = @$data;
diff --git a/media-sound/squeezecenter/files/squeezecenter.conf.d b/media-sound/squeezecenter/files/squeezecenter.conf.d
index 535323a60087..4faca2bf422d 100644
--- a/media-sound/squeezecenter/files/squeezecenter.conf.d
+++ b/media-sound/squeezecenter/files/squeezecenter.conf.d
@@ -1,6 +1,6 @@
 # /etc/conf.d/squeezecenter
 
-# Niceness level for the SqueezeCenter process. If not specified then the
+# Niceness level for the SqueezeCenter process.  If not specified then the
 # default is to run at standard priority.  Uncomment the following to run at a
 # high priority (in order to try to minimise drop-outs due to audio starvation
 # of the players).  Note that this requires "OpenRC", which will become the
@@ -15,7 +15,7 @@
 
 # The following contains any other options you want to specify, such as default
 # logging options.  The example below will prevent the discovery and display of
-# UPNP devices within your players.
+# UPnP devices within your players.
 #
 # See "squeezecenter-server --help" for a full list of possible options,
 # but note that many of them are supplied by /etc/init.d/squeezecenter
diff --git a/media-sound/squeezecenter/files/squeezecenter.init.d b/media-sound/squeezecenter/files/squeezecenter.init.d
index d6cdd90e4da5..7082830bcb86 100755
--- a/media-sound/squeezecenter/files/squeezecenter.init.d
+++ b/media-sound/squeezecenter/files/squeezecenter.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.init.d,v 1.2 2008/11/11 14:03:15 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.init.d,v 1.3 2008/12/20 01:24:43 lavajoe Exp $
 
 # These fit the SqueezeCenter ebuild and so shouldn't need to be changed;
 # user-servicable parts go in /etc/conf.d/squeezecenter.
@@ -21,20 +21,24 @@ depend() {
 start() {
 	ebegin "Starting SqueezeCenter"
 
-        export SSD_NICELEVEL=${SC_NICENESS}
+	export SSD_NICELEVEL=${SC_NICENESS}
 	cd /
 	start-stop-daemon \
-	    --start --exec /usr/bin/perl /usr/sbin/${scname} --chuid ${scuser} \
-	    -- \
-	    --quiet --daemon \
-	    --pidfile=${pidfile} \
-	    --cachedir=${cachedir} \
-	    --prefsfile=${prefsfile} \
-	    --prefsdir=${prefsdir} \
-	    --logdir=${logdir} \
-	    --audiodir=${SC_MUSIC_DIR} \
-	    --playlistdir=${SC_PLAYLISTS_DIR} \
-	    ${SC_OPTS}
+		--start --exec /usr/bin/perl /usr/sbin/${scname} \
+		--pidfile ${pidfile} \
+		--startas /usr/sbin/${scname} \
+		--chuid ${scuser} \
+		-- \
+		--quiet --daemon \
+		--pidfile=${pidfile} \
+		--cachedir=${cachedir} \
+		--prefsfile=${prefsfile} \
+		--prefsdir=${prefsdir} \
+		--logdir=${logdir} \
+		--audiodir=${SC_MUSIC_DIR} \
+		--playlistdir=${SC_PLAYLISTS_DIR} \
+		${SC_OPTS}
+
 
 	eend $? "Failed to start SqueezeCenter"
 }