[gentoo-commits] gentoo-x86 commit in media-sound/squeezecenter/files: mDNSResponder-7.1-gentoo.patch avahi-squeezecenter.service squeezecenter.logrotate.d dbcreate-gentoo.sql filepaths-7.1-gentoo.patch dbdrop-gentoo.sql squeezecenter.init.d squeezecenter.conf.d squeezecenter.prefs Gentoo-plugins-README.txt

[Joe Peterson (lavajoe)]

lavajoe     08/08/03 04:35:30

  Added:                mDNSResponder-7.1-gentoo.patch
                        avahi-squeezecenter.service
                        squeezecenter.logrotate.d dbcreate-gentoo.sql
                        filepaths-7.1-gentoo.patch dbdrop-gentoo.sql
                        squeezecenter.init.d squeezecenter.conf.d
                        squeezecenter.prefs Gentoo-plugins-README.txt
  Log:
  Add version 7.1.0; remove old versions
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  media-sound/squeezecenter/files/mDNSResponder-7.1-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/mDNSResponder-7.1-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/mDNSResponder-7.1-gentoo.patch?rev=1.1&content-type=text/plain

Index: mDNSResponder-7.1-gentoo.patch
===================================================================
--- 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
@@ -131,11 +131,10 @@
 
 		my ($name, $port) = @$data;
 
+		print CONF "\n";
 		print CONF "$name\n";
 		print CONF "$service\n";
-		print CONF "TXT\n";
 		print CONF "$port\n";
-		print CONF "\n";
 	}
 
 	close(CONF);



1.1                  media-sound/squeezecenter/files/avahi-squeezecenter.service

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/avahi-squeezecenter.service?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/avahi-squeezecenter.service?rev=1.1&content-type=text/plain

Index: avahi-squeezecenter.service
===================================================================
<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
<!DOCTYPE service-group SYSTEM "avahi-service.dtd">

<service-group>

  <name>SqueezeCenter</name>

  <service>
    <type>_http._tcp</type>
    <port>9000</port>
  </service>

  <service>
    <type>_slimhttp._tcp</type>
    <port>9000</port>
  </service>

</service-group>



1.1                  media-sound/squeezecenter/files/squeezecenter.logrotate.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.logrotate.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.logrotate.d?rev=1.1&content-type=text/plain

Index: squeezecenter.logrotate.d
===================================================================
# 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.logrotate.d,v 1.1 2008/08/03 04:35:29 lavajoe Exp $

/var/log/squeezecenter/scanner.log /var/log/squeezecenter/server.log /var/log/squeezecenter/perfmon.log {
	missingok
	notifempty
	copytruncate
	rotate 5
	size 100k
}



1.1                  media-sound/squeezecenter/files/dbcreate-gentoo.sql

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/dbcreate-gentoo.sql?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/dbcreate-gentoo.sql?rev=1.1&content-type=text/plain

Index: dbcreate-gentoo.sql
===================================================================
CREATE DATABASE __DATABASE__;

GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER
	ON *.*
	TO '__DBUSER__'@'localhost'
	IDENTIFIED BY '__DBPASSWORD__'



1.1                  media-sound/squeezecenter/files/filepaths-7.1-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/filepaths-7.1-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/filepaths-7.1-gentoo.patch?rev=1.1&content-type=text/plain

Index: filepaths-7.1-gentoo.patch
===================================================================
--- Slim/Utils/OSDetect.pm.old	2008-07-22 12:25:34.000000000 +0100
+++ Slim/Utils/OSDetect.pm	2008-07-22 12:27:06.000000000 +0100
@@ -253,6 +253,58 @@
 			warn "dirsFor: Didn't find a match request: [$dir]\n";
 		}
 
+	} elsif (isGentoo()) {
+
+		if ($dir =~ /^(?:Firmware|Graphics|HTML|IR|MySQL|SQL)$/) {
+
+			push @dirs, "/usr/share/squeezecenter/$dir";
+
+		} elsif ($dir =~ /^(?:lib)$/) {
+
+			push @dirs, "/usr/lib/squeezecenter";
+
+		} elsif ($dir eq 'UserPluginRoot') {
+			
+			push @dirs, "/var/lib/squeezecenter";
+		
+		} elsif ($dir eq 'Plugins') {
+			
+			push @dirs, "/var/lib/squeezecenter/Plugins";
+			push @dirs, "/usr/lib/" . $Config{'package'} . "/vendor_perl/" . $Config{'version'} . "/Slim/Plugin"
+		
+		} elsif ($dir eq 'strings' || $dir eq 'revision') {
+
+			push @dirs, "/usr/share/squeezecenter";
+
+		} elsif ($dir =~ /^(?:types|convert)$/) {
+
+			push @dirs, "/etc/squeezecenter";
+
+		} elsif ($dir =~ /^(?:prefs)$/) {
+
+			push @dirs, "/var/lib/squeezecenter/prefs";
+
+		} elsif ($dir eq 'log') {
+
+			push @dirs, "/var/log/squeezecenter";
+
+		} elsif ($dir eq 'cache') {
+
+			push @dirs, "/var/lib/squeezecenter/cache";
+
+		} elsif ($dir eq 'MySQL') {
+
+			# Do nothing - use the depended upon MySQL install.
+
+		} elsif ($dir =~ /^(?:music|playlists)$/) {
+
+			push @dirs, '';
+
+		} else {
+
+			warn "dirsFor: Didn't find a match request: [$dir]\n";
+		}
+
 	# Red Hat/Fedora/SUSE RPM specific paths.
 	} elsif (isRHorSUSE()) {
 
@@ -465,6 +517,19 @@
 	return isReadyNAS();
 }
 
+sub isGentoo {
+
+	# Initialize
+	my $OS      = OS();
+	my $details = details();
+
+	if ($details->{'osName'} eq 'Gentoo') {
+		return 1;
+	}
+
+	return 0;
+}
+
 sub isRHorSUSE {
 
 	# Initialize
@@ -586,6 +651,10 @@
 
 		$osDetails{'osName'} = 'Debian';
 
+	} elsif (-f '/etc/gentoo-release') {
+
+		$osDetails{'osName'} = 'Gentoo';
+
 	} elsif (-f '/etc/redhat_release' || -f '/etc/redhat-release') {
 
 		$osDetails{'osName'} = 'Red Hat';
@@ -603,7 +672,7 @@
 	$osDetails{'osArch'} = $Config{'myarchname'};
 
 	# package specific addition to @INC to cater for plugin locations
-	if (isDebian()) {
+	if (isDebian() || isGentoo()) {
 
 		unshift @INC, '/usr/share/squeezecenter';
 		unshift @INC, '/usr/share/squeezecenter/CPAN';
--- Slim/Music/Import.pm.old	2008-07-22 12:24:32.000000000 +0100
+++ Slim/Music/Import.pm	2008-07-22 12:27:06.000000000 +0100
@@ -128,7 +128,7 @@
 
 		$command  = '/usr/libexec/squeezecenter-scanner';
 
-	} elsif (Slim::Utils::OSDetect::isDebian()) {
+	} elsif (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isGentoo()) {
 
 		$command  = '/usr/sbin/squeezecenter-scanner';
 
--- Slim/bootstrap.pm.old	2008-07-22 12:24:09.000000000 +0100
+++ Slim/bootstrap.pm	2008-07-22 12:27:06.000000000 +0100
@@ -97,8 +97,9 @@
 
 	my @SlimINC = ();
 	
-	if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) {
-		# On Debian, RH and SUSE, our CPAN directory is located in the same dir as strings.txt
+	if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) {
+		# On Debian, Gentoo, RH and SUSE, our CPAN directory is located in the
+		# same dir as strings.txt
 		$libPath = Slim::Utils::OSDetect::dirsFor('strings');
 	}
 
@@ -125,6 +126,14 @@
 		$libPath,
 	);
 
+	if (Slim::Utils::OSDetect::isGentoo()) {
+		# On Gentoo, the lib directory is located separately to the CPAN
+		# directory as it's not architecture-independent, and make sure we
+		# also look at the separate user plugins directory.
+		push @SlimINC, Slim::Utils::OSDetect::dirsFor('lib');
+		push @SlimINC, Slim::Utils::OSDetect::dirsFor('UserPluginRoot');
+	}
+
 	$d_startup && printf("Got \@INC containing:\n%s\n\n", join("\n", @INC));
 
 	# This works like 'use lib'
--- Slim/Utils/MySQLHelper.pm.old	2008-07-22 12:25:31.000000000 +0100
+++ Slim/Utils/MySQLHelper.pm	2008-07-22 12:27:06.000000000 +0100
@@ -152,7 +152,7 @@
 
 	# Because we use the system MySQL, we need to point to the right
 	# directory for the errmsg. files. Default to english.
-	if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE()) {
+	if (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isRHorSUSE() || Slim::Utils::OSDetect::isGentoo()) {
 
 		$config{'language'} = '/usr/share/mysql/english';
 	}



1.1                  media-sound/squeezecenter/files/dbdrop-gentoo.sql

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/dbdrop-gentoo.sql?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/dbdrop-gentoo.sql?rev=1.1&content-type=text/plain

Index: dbdrop-gentoo.sql
===================================================================
DROP DATABASE __DATABASE__;
DROP USER '__DBUSER__'@'localhost';



1.1                  media-sound/squeezecenter/files/squeezecenter.init.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.init.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.init.d?rev=1.1&content-type=text/plain

Index: squeezecenter.init.d
===================================================================
#!/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.1 2008/08/03 04:35:29 lavajoe Exp $

# These fit the SqueezeCenter ebuild and so shouldn't need to be changed;
# user-servicable parts go in /etc/conf.d/squeezecenter.
pidfile=/var/run/squeezecenter/squeezecenter.pid
logdir=/var/log/squeezecenter
varlibdir=/var/lib/squeezecenter
prefsdir=${varlibdir}/prefs
cachedir=${varlibdir}/cache
prefsfile=${prefsdir}/squeezecenter.prefs
scuser=squeezecenter
scname=squeezecenter-server

depend() {
	need net mysql
}

start() {
	ebegin "Starting SqueezeCenter"

	cd /
	/usr/bin/nice --adjustment=${SC_NICENESS:-0} sudo -u ${scuser} \
		start-stop-daemon \
			--start --exec /usr/bin/perl /usr/sbin/${scname} \
			-- \
			--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"
}

stop() {
	ebegin "Stopping SqueezeCenter"
	start-stop-daemon -o --stop --pidfile ${pidfile}
	eend $? "Failed to stop SqueezeCenter"
}



1.1                  media-sound/squeezecenter/files/squeezecenter.conf.d

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.conf.d?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.conf.d?rev=1.1&content-type=text/plain

Index: squeezecenter.conf.d
===================================================================
# /etc/conf.d/squeezecenter

# 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):
#SC_NICENESS=-10

# Default path of your music library and playlists. You can leave these
# undefined and configure them through the web interface instead.
#SC_MUSIC_DIR=/mnt/media/Music
#SC_PLAYLISTS_DIR=/mnt/media/Playlists

# 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.
#
# See "squeezecenter.pl --help" for a full list of possible options, but note
# that many of them are supplied by /etc/init.d/squeezecenter and so don't need
# to be present here.
#SC_OPTS="--noupnp"



1.1                  media-sound/squeezecenter/files/squeezecenter.prefs

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.prefs?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/squeezecenter.prefs?rev=1.1&content-type=text/plain

Index: squeezecenter.prefs
===================================================================
dbusername: squeezecenter
dbpassword: TBA
dbsource: dbi:mysql:database=squeezecenter;mysql_socket=/var/run/mysqld/mysqld.sock



1.1                  media-sound/squeezecenter/files/Gentoo-plugins-README.txt

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/Gentoo-plugins-README.txt?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/squeezecenter/files/Gentoo-plugins-README.txt?rev=1.1&content-type=text/plain

Index: Gentoo-plugins-README.txt
===================================================================
# 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-plugins-README.txt,v 1.1 2008/08/03 04:35:29 lavajoe Exp $

The standard SqueezeCenter package is installed differently on Gentoo in order
that the installation complies with Gentoo's filesystem layout. These notes
are provided to give guidance for installing plugins within this modified
layout.

INSTALLING PLUGINS

The installation instructions of plugins should be followed but with the
following Gentoo specifics:

* Plugins should be installed into the directory:
  /var/lib/squeezecenter/Plugins
* Extension binaries (which sometimes accompany plugins) should be installed
  into the directory:
  /usr/lib/squeezecenter/Bin

BACKGROUND

Those interested can refer to the following for details of Gentoo's filesystem
standard:
http://devmanual.gentoo.org/general-concepts/filesystem/index.html