Add new version 7.5.0 (bug #314073); remove old

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

13 files changed, 161 insertions, 211 deletions

diff --git a/media-sound/squeezeboxserver/ChangeLog b/media-sound/squeezeboxserver/ChangeLog
index 1eac05a49640..bdecbc21cbcf 100644
--- a/media-sound/squeezeboxserver/ChangeLog
+++ b/media-sound/squeezeboxserver/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-sound/squeezeboxserver
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.4 2010/04/21 15:45:36 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.5 2010/04/25 22:26:28 lavajoe Exp $
+
+*squeezeboxserver-7.5.0 (25 Apr 2010)
+
+  25 Apr 2010; Joe Peterson <lavajoe@gentoo.org>
+  -squeezeboxserver-7.4.1.ebuild,
+  -files/squeezeboxserver-7.4.1-build-perl-modules-gentoo.patch,
+  +squeezeboxserver-7.5.0.ebuild,
+  +files/squeezeboxserver-7.5.0-build-perl-modules-gentoo.patch,
+  +files/squeezeboxserver-7.5.0-squeezeslave.patch,
+  +files/squeezeboxserver-7.5.0-uuid-gentoo.patch,
+  files/Gentoo-detailed-changelog.txt, files/Gentoo-plugins-README.txt,
+  files/build-modules.sh, files/gentoo-filepaths.pm,
+  files/squeezeboxserver.init.d, files/squeezeboxserver.logrotate.d,
+  metadata.xml:
+  Add new version 7.5.0 (bug #314073); remove old
 
 *squeezeboxserver-7.4.2-r1 (21 Apr 2010)
 
diff --git a/media-sound/squeezeboxserver/Manifest b/media-sound/squeezeboxserver/Manifest
index 60938af5911a..c6e435a67922 100644
--- a/media-sound/squeezeboxserver/Manifest
+++ b/media-sound/squeezeboxserver/Manifest
@@ -1,23 +1,24 @@
-AUX Gentoo-detailed-changelog.txt 2222 RMD160 3cf45c1ba094144e2b45f4b20dfc16b778bc2b99 SHA1 0937e9ef4b25e728123c700d8e7b1ed281d70232 SHA256 85aacf0ce17f3bdddd8bd2fcc2e78d3947a83e0398a718301f0e453938a7212c
-AUX Gentoo-plugins-README.txt 994 RMD160 06fedd6365829cf4c5d06ced0ed80a50dfa51862 SHA1 75586e70194f6cb2c682c50628bf35237a085e07 SHA256 9ff1db5112d2d322fce636d8669d278f297c2ddacc5706b68014a5865ea4993e
+AUX Gentoo-detailed-changelog.txt 85 RMD160 efbbea26fc3d3b52d44e14af5167579f3bd1c18c SHA1 bc98023680b8991ee65a9357b86abdf43160b191 SHA256 87cf5296a364f86519b30679963325bcdaa871dd9529c2054158f57b1c853417
+AUX Gentoo-plugins-README.txt 994 RMD160 9307fc3b9488d2b6a74aaa0b0e531132ea5822b2 SHA1 b4a33a10504c0a4813c22a1f392b1d93b9876f2e SHA256 32e8512120e30fcae273300474685547b6daaf21722b65ffc85d0a894a150e73
 AUX avahi-squeezeboxserver.service 330 RMD160 47b5b26f788dfe048f7a40763e45ba3ac9134d7e SHA1 c1cba7d50675c4f890c7b9d55c2c558d3ab1f665 SHA256 a4b16989459ecb02d035b3a120d2c2b6d9d3368c06b7aecf5f0497f1bb1c9e17
-AUX build-modules.sh 17315 RMD160 6f1583c3ab85aa60cf6cd72e00f45e0a95eec220 SHA1 ae25d9d445902b3e980c630b90495b35a85dec9c SHA256 31423cdbb8915c0023f3bc2ca0d9e8a4ffeedaa0b116584cdb17c9ed2fb04647
+AUX build-modules.sh 17315 RMD160 b6d567cbf22aa2f6895ef1fd6a9da1494933450e SHA1 f603d14f422af0cdd1ba275c0ab0f1bf11887cce SHA256 4db895dea2fa12dbd2365ee613c358d3e5a65a731ac1c1cdef19b2ce4aee7915
 AUX dbcreate-gentoo.sql 165 RMD160 36fe87c398aee02890710f970245032488b857bb SHA1 e86a26c73addb4b74c345ec70155f2b9d079075b SHA256 d8cf85879e74dc1e429251f5bd4ae7f99e2a460fa668c0abde2c2725b90f10a1
 AUX dbdrop-gentoo.sql 64 RMD160 bc60b46ea56642c28ffbd8731e120722e42b66a9 SHA1 a02eab2a62e67d81ff2ad3d3700cd7695f6d31c1 SHA256 0c8e1f3cddd54d6659a014dbcefa928f6d8b9174860cb07d53e01fe9940e8aba
-AUX gentoo-filepaths.pm 2746 RMD160 ae9611b7dc3d86851ccac9160cf5243a87cdbf93 SHA1 20cf74b56edb53ae9c2f054aeb217bdaab6c4955 SHA256 679ac0b4c9c84974380ba330d2b388013466d9d1e6ab10ea7266ececb5b593a3
-AUX squeezeboxserver-7.4.1-build-perl-modules-gentoo.patch 673 RMD160 921c336042cb0dc93ce8cb3cd86fa263b8ab1cf6 SHA1 5071b47c9e8b8e2f3d7eaa5f04a6a2709c626c96 SHA256 74678dc596f58556d64c68892ce59b28028cb1e0b9ae7980df36f019c94e6491
+AUX gentoo-filepaths.pm 2746 RMD160 719d26494d2c13d391a7f49755ac821df0c975a0 SHA1 b50c02a18213218430a63ff015dc2b3f0b500881 SHA256 263ef7c0f1688c1ff7f840bd3ec6ed8beaacea7a48f0e5f11267ffac0281f056
 AUX squeezeboxserver-7.4.2-build-perl-modules-gentoo.patch 658 RMD160 7a2587b0db7bb98a57949cd452b7d4aa1552ca30 SHA1 14bc1e6c3a41943a12307dfe84431f3720d2ab03 SHA256 28253e4831e0b9253edaaa93c59c34b4f2ed00459deba177bf1d6331958de214
 AUX squeezeboxserver-7.4.2-squeezeslave.patch 642 RMD160 ed4c4704df0ec6bd1d76903ba8d17b37205d5b9c SHA1 a1d3ef690eedcf50a558ee198763fa187152a70e SHA256 96bdda8d26d4f4f977ee19804b855a16b82bd47386e488ab30170d43b0b43d0d
 AUX squeezeboxserver-7.4.2-uuid-gentoo.patch 535 RMD160 398d952efb3a14e5096605f8bda984c1f35d3464 SHA1 df3e341bb1bf6dfe4f983dc1d3393cb9341184be SHA256 b83eaccec972c34df4c80440406947247d9bdb3d90449daf03c413d5bc71b4bf
+AUX squeezeboxserver-7.5.0-build-perl-modules-gentoo.patch 658 RMD160 58f87148754189c5ca67ae8e045126a6f50e0381 SHA1 4a740b4f07e1d2134b4fe23b67fda2239f67dd47 SHA256 75146e7beaa647ce98a0617894c4d398a87216b4842afb63cb718bf0b0276a38
+AUX squeezeboxserver-7.5.0-squeezeslave.patch 642 RMD160 ba95cdf24bc662a38c4265553a07ade5d2567ddd SHA1 07d7436cfa963084d378e78c016679b7a6f471bf SHA256 73dd7f05abe5458d4a9d5438abcee5a4135567d9c855246935a2afd9055175d3
+AUX squeezeboxserver-7.5.0-uuid-gentoo.patch 535 RMD160 3675cfbd5a732fe515e714ab9ccc8de7ebcec9f4 SHA1 1741c3e44526a2b6497811f20c22f38f3329d8ef SHA256 db2780c16cdb36e365c2e1ca6e2e19af8f846168c101ce735836d06d2ba0feed
 AUX squeezeboxserver.conf.d 1106 RMD160 39ca36903c4b67e40b5e24c06bc62057e932bbf1 SHA1 0d84ec59e828d6eec7bdd64f7b414748eb2a558a SHA256 4ac6df07ae3b74d44ae410e0879ea2ad2d948383c32fdd750a443717c8648df0
-AUX squeezeboxserver.init.d 1370 RMD160 c44cef0dd5c39ab43af61edc156283aebc01ac63 SHA1 deaffe5405ca2a3c9b93b21349845f57b3dc07a1 SHA256 191a3f98fb419243ab3713581b9e6043e3fda953a370828c5de172aebbd74f74
-AUX squeezeboxserver.logrotate.d 422 RMD160 a5499fc683738cd8b7f3f0f8a377cf39a76d9b53 SHA1 45c61293538ce6c93fd35c53cbcccfa85bd41619 SHA256 f8dd4bc6b80527d74c32fd0aab5a589f0c123babe08a7536f9f73a57af473670
+AUX squeezeboxserver.init.d 1370 RMD160 fb93e1a5e9c085854479ba473b74b732efac7fca SHA1 761cb4d8ed5b657f81b89c7c98a85eb2996c3b52 SHA256 4f38348e9ae12c176da18e97b4b0af981aa2769a044bd155cfc28eb7fe63a1de
+AUX squeezeboxserver.logrotate.d 422 RMD160 694fdc002fee090f503ec757873b838d73bebb65 SHA1 98606d8dd8323d67a6a45339ec64d793224afbf2 SHA256 0eef63753f1072b20ad0418fc33a47b08412eb901283c7d3a984293f64ae3a8d
 AUX squeezeboxserver.prefs 132 RMD160 194039dc2ef4b0c579ed13096ff6151fbbd27c02 SHA1 242e1211e1432704b5350a7acbb5be8fbcd2a815 SHA256 8f114c520f2eec360c68861159fb0824733748189836781f22513da6050f669e
-DIST SqueezeboxServer-Audio-Scan-0.45.tar.gz 2561724 RMD160 4e0b66b4c953304d755aebba96fc96793a702ce1 SHA1 71d957f41c0224880bbd3849346cffc1adba9018 SHA256 aec8e223d2ac5231182233c4cabe46e8d48d1dfac8ca6698f7c6835a83c76b87
 DIST SqueezeboxServer-EV-3.8.tar.gz 151268 RMD160 0bb514debdb615b37f5c16164a47c5934aacbdd9 SHA1 a205192861aa5a668592468833d0e99749274aeb SHA256 3be30c896026fe1a873ac16eac9473f80f62c164da88e3815ed6eee56e229345
-DIST squeezeboxserver-7.4.1-noCPAN.tgz 22145277 RMD160 eb0384ab0dc3673854b3d908cd8aa9fed238086e SHA1 85b72c26165eeabf113c1595bb9e72cfa5d56a72 SHA256 8236bcc3acf802bd4fc0fa2761930f1f14d4b578460057e7d3d8c7b4b7e8910c
 DIST squeezeboxserver-7.4.2-noCPAN.tgz 22197375 RMD160 a52088edcb01d8114d02e80eb35c2eaacdca215f SHA1 0d59db03cd4162f5162f75443e46fef2963f5ba4 SHA256 6f2555c53f0514477935593526e027eb35e9f8735283fe996ecfcfdf0d563b8b
-EBUILD squeezeboxserver-7.4.1.ebuild 18593 RMD160 be6e85d12bb56593e5c685079d2506bcb38b7c05 SHA1 9e05eea706ddc4a0c90adc50f4c18e4bafd01981 SHA256 fd0911698f922582b7347854ff02110ba3a25a9f6533dacdb880ab3b9b856cd1
+DIST squeezeboxserver-7.5.0-noCPAN.tgz 20701362 RMD160 a2758d2a0340851bdf860a26d7bdcb227de987a2 SHA1 8519061735cc61b690fe96d883e2094ffd06b458 SHA256 a92116e702809087fa12c8e2386375101a9ead4c8bc42452f0be979e39c67a9f
 EBUILD squeezeboxserver-7.4.2-r1.ebuild 17538 RMD160 d1a7c83fc905f3006a78df8435492e832cb86587 SHA1 41b94e41adf4921be433906e0aa92920119acfdc SHA256 172c751108eaf014dc0e266dc4e8bb6edf6f180494d37e3737b446693780d6bd
-MISC ChangeLog 1728 RMD160 660358ba3de2037f939d8370c01c3afe02b0b775 SHA1 6d128fab836c5d1218c8581796cf0d4cd1b1d459 SHA256 0cc727229ad601f5b61b9c9573d01dff8c58d379fc8412e4e7d78073a99bb53e
-MISC metadata.xml 994 RMD160 7bf433bb5e8524dd9877dfbcfb24e9195c009217 SHA1 2d5e19068ba2503090ea41385644a9a4cf196df9 SHA256 b0973f4295a822a2cab3f3d22be15d90a9289c537c37c214a71e590c81d93833
+EBUILD squeezeboxserver-7.5.0.ebuild 17688 RMD160 f10116ba163873149ee7a65c9d9b5815d0a33823 SHA1 465ccb73a0af8470f02db799ac35413f4b914651 SHA256 05203d681dcf951c206d249cc4cd80c2663dcb967097a02414da637c19c5aed6
+MISC ChangeLog 2378 RMD160 134369972d24d12b49b04c7d23272c1e0a2c2339 SHA1 76613220f28808a809898d54a96bf7fd5359ca7c SHA256 2d96dd0e685c40189588eb2102ca45d45ffa53ce29fb1160a853dc937ba27b31
+MISC metadata.xml 935 RMD160 bed42783ef261d072900ba296052be0e67143d6e SHA1 13567e24801ecf74fe91c6bc2bc2d1202c3fac49 SHA256 6e17e84756f35acb251d9134fac66ba08b41a78861edadc523f065a9eb1016d6
diff --git a/media-sound/squeezeboxserver/files/Gentoo-detailed-changelog.txt b/media-sound/squeezeboxserver/files/Gentoo-detailed-changelog.txt
index d9e515eb0c2e..0d24b438d582 100644
--- a/media-sound/squeezeboxserver/files/Gentoo-detailed-changelog.txt
+++ b/media-sound/squeezeboxserver/files/Gentoo-detailed-changelog.txt
@@ -1,60 +1,3 @@
-Updated for Squeezebox Server 7.4.2

-

-Bonjour/Avahi support removed (bug#307099)

-

-Class-XSAccessor-Array no longer required (bug#275520)

-

-Supports Perl 5.10.1 for bundled EV build (bug#287257)

-

-Fewer bundled Perl modules:

-	dev-perl/PAR (added through bug#275932)

-	dev-perl/Audio-Scan (added through bug#287264)

-	dev-perl/enum (added through bug#275931)

-	dev-perl/Text-Unidecode (added through bug#275939)

-	dev-perl/URI-Find (added through bug#275933)

-	dev-perl/Algorithm/C3 (added through bug#275529)

-	dev-perl/Net-UPnP (added through bug#275548)

-	dev-perl/File-BOM (added through bug#275530)

-	dev-perl/Proc-Background (added through bug#275940)

-	dev-perl/Tie-Cache-LRU (added through bug#275935)

-	dev-perl/Tie-Cache-LRU-Expires (added through bug#277335)

-	dev-perl/Data-Dump (added through bug#275942)

-	dev-perl/Data-URIEncode (added through bug#277332)

-	dev-perl/Tie-LLHash (added through bug#275936)

-	dev-perl/Tie-RegexpHash (added through bug#275938)

-	dev-perl/Class-XSAccessor

-	dev-perl/MRO-Compat

-	dev-perl/Data-Page

-	dev-perl/Data-UUID

-

-Utilises Data::UUID rather than UUID::Tidy

-	A patch is included to use Data::UUID since this is in

-	Portage (UUID::Tiny isn't)

-

-Removed redundant musepack USE flag

-

-Allow an external SQL server

-	A small tweak from jaervosz@gentoo.org (see bug#287257) to allow an

-	external MySQL server by only depending on it if it's installed.

-

-For Torsten: prefs in /etc rather than in /var/lib/squeezeboxserver/prefs

-

-For Torsten: Uses EAPI2 and use flag dependencies (a tidying up)

-

-Fixed build-modules with 'noexec' portage

-	Now copies the script into the source directory during the build process

-	to avoid trying to execute a script in the FILES directory - this fails

-	on Portage trees mounted 'noexec' (comment#25 in bug#287257).

-

-For Torsten: failure checks on newexe's

-

-For Torsten: EAPI2 and USE dependencies

-

-For Torsten: Fewer hardiwred paths in ebuild

-	Uses get_libdir and Perl installvendorlib

-

-The following Gentoo bugs should be able to be closed with this update:

-	bug#300051 (Perl 5.10)

-	bug#307099 (bogus USE flags)

-	bug#275520 (dev-perl/Class-XSAccessor-Array phaseout)

-	bug#307119 (Squeezebox Server 7.4.2 bump)

+---- squeezeboxserver-7.5.0
+
+Updated for Squeezebox Server 7.5.0 (Gentoo bug#314073)
diff --git a/media-sound/squeezeboxserver/files/Gentoo-plugins-README.txt b/media-sound/squeezeboxserver/files/Gentoo-plugins-README.txt
index defa835a8ae4..5d48645365ee 100644
--- a/media-sound/squeezeboxserver/files/Gentoo-plugins-README.txt
+++ b/media-sound/squeezeboxserver/files/Gentoo-plugins-README.txt
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/Gentoo-plugins-README.txt,v 1.2 2010/04/09 04:17:59 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/Gentoo-plugins-README.txt,v 1.3 2010/04/25 22:26:28 lavajoe Exp $
 
 The standard Squeezebox Server package is installed differently on Gentoo in
 order that the installation complies with Gentoo's filesystem layout. These
diff --git a/media-sound/squeezeboxserver/files/build-modules.sh b/media-sound/squeezeboxserver/files/build-modules.sh
index ae17953e7734..757743e7eecf 100755
--- a/media-sound/squeezeboxserver/files/build-modules.sh
+++ b/media-sound/squeezeboxserver/files/build-modules.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# $Id: build-modules.sh,v 1.2 2010/04/09 04:17:59 lavajoe Exp $
+# $Id: build-modules.sh,v 1.3 2010/04/25 22:26:28 lavajoe Exp $
 #
 # This script builds all binary Perl modules required by Squeezebox Server.
 # 
diff --git a/media-sound/squeezeboxserver/files/gentoo-filepaths.pm b/media-sound/squeezeboxserver/files/gentoo-filepaths.pm
index d3b86bf3b598..e407b404d583 100644
--- a/media-sound/squeezeboxserver/files/gentoo-filepaths.pm
+++ b/media-sound/squeezeboxserver/files/gentoo-filepaths.pm
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/gentoo-filepaths.pm,v 1.2 2010/04/09 04:17:59 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/gentoo-filepaths.pm,v 1.3 2010/04/25 22:26:28 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
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.1-build-perl-modules-gentoo.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-build-perl-modules-gentoo.patch
index 8f763c75df71..32821acf5cc8 100644
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.1-build-perl-modules-gentoo.patch
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-build-perl-modules-gentoo.patch
@@ -1,6 +1,6 @@
---- Slim/bootstrap.pm~	2009-10-20 08:56:41.000000000 -0600
-+++ Slim/bootstrap.pm	2009-11-25 15:36:14.000000000 -0700
-@@ -193,22 +193,6 @@ sub loadModules {
+--- Slim/bootstrap.pm.old	2010-04-12 12:59:41.000000000 +0100
++++ Slim/bootstrap.pm	2010-04-12 13:00:17.000000000 +0100
+@@ -192,22 +192,6 @@
  			print "To run from source on Windows, please install ActivePerl 5.10.  ActivePerl 5.8.8 is no longer supported.\n";
  			print "http://www.activestate.com/activeperl/\n\n";
  		}
@@ -11,9 +11,9 @@
 -NOTE:
 -
 -Please use the buildme.sh script located here:
--http://svn.slimdevices.com/repos/slim/7.4/trunk/vendor/CPAN/
+-http://svn.slimdevices.com/repos/slim/7.5/trunk/vendor/CPAN/
 -
--If 7.4 is outdated by the time you read this, Replace "7.4" with the major version
+-If 7.5 is outdated by the time you read this, Replace "7.5" with the major version
 -of Squeezebox Server you are running.
 -
 -*******
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-squeezeslave.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-squeezeslave.patch
new file mode 100644
index 000000000000..bf8d19a1101e
--- /dev/null
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-squeezeslave.patch
@@ -0,0 +1,15 @@
+--- Slim/Web/HTTP.pm.old	2010-04-24 19:00:42.583003395 +0100
++++ Slim/Web/HTTP.pm	2010-04-24 19:00:42.075710393 +0100
+@@ -2214,9 +2214,10 @@
+ 		# only kill the timer if we were called for the active streaming connection;
+ 		# otherwise we might kill the timer related to the next connection too.
+ 		Slim::Utils::Timers::killTimers($client, \&tryStreamingLater);
+-		
+-		Slim::Networking::Select::addWrite($httpClient, \&sendStreamingResponse, 1);
+ 	}
++
++	# Bug 14740 - always call sendStreamingResponse so we ensure the socket gets closed
++	Slim::Networking::Select::addWrite($httpClient, \&sendStreamingResponse, 1);
+ }
+ 
+ sub forgetClient {
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-uuid-gentoo.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-uuid-gentoo.patch
new file mode 100644
index 000000000000..51572f451855
--- /dev/null
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-uuid-gentoo.patch
@@ -0,0 +1,14 @@
+--- slimserver.pl.old	2010-04-12 12:56:18.000000000 +0100
++++ slimserver.pl	2010-04-12 12:58:28.000000000 +0100
+@@ -397,8 +397,9 @@
+ 	
+ 	# Generate a UUID for this SC instance on first-run
+ 	if ( !$prefs->get('server_uuid') ) {
+-		require UUID::Tiny;
+-		$prefs->set( server_uuid => UUID::Tiny::create_UUID_as_string( UUID::Tiny::UUID_V4() ) );
++		require Data::UUID;
++		my $ug = new Data::UUID;
++		$prefs->set( server_uuid => lc $ug->create_str() );
+ 	}
+ 
+ 	main::INFOLOG && $log->info("Squeezebox Server binary search path init...");
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
index 289b0b6fdfc6..9188aa837857 100755
--- a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.2 2010/04/09 04:17:59 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.3 2010/04/25 22:26:28 lavajoe Exp $
 
 # These fit the Squeezebox Server ebuild and so shouldn't need to be changed;
 # user-servicable parts go in /etc/conf.d/squeezeboxserver.
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.logrotate.d b/media-sound/squeezeboxserver/files/squeezeboxserver.logrotate.d
index c2ab070276d9..626cdf31c300 100644
--- a/media-sound/squeezeboxserver/files/squeezeboxserver.logrotate.d
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver.logrotate.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.logrotate.d,v 1.2 2010/04/09 04:17:59 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.logrotate.d,v 1.3 2010/04/25 22:26:28 lavajoe Exp $
 
 /var/log/squeezeboxserver/scanner.log /var/log/squeezeboxserver/server.log /var/log/squeezeboxserver/perfmon.log {
 	missingok
diff --git a/media-sound/squeezeboxserver/metadata.xml b/media-sound/squeezeboxserver/metadata.xml
index fd1a4f9283bc..d7496306b46d 100644
--- a/media-sound/squeezeboxserver/metadata.xml
+++ b/media-sound/squeezeboxserver/metadata.xml
@@ -20,6 +20,5 @@
   <use>
     <flag name='aac'>Enable playback support for AAC (.m4a) encoded files</flag>
     <flag name='alac'>Enable support for alac</flag>
-    <flag name='bonjour'>Enable support for bonjour</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.4.1.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild
index a0d8875f3721..905866401ace 100644
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.4.1.ebuild
+++ b/media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.4.1.ebuild,v 1.2 2009/12/02 23:31:35 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.0.ebuild,v 1.1 2010/04/25 22:26:28 lavajoe Exp $
+
+EAPI="2"
 
 inherit eutils
 
 MAJOR_VER="${PV:0:3}"
 MINOR_VER="${PV:4:1}"
-BUILD_NUM="28947"
+BUILD_NUM="30464"
 SRC_DIR="SqueezeboxServer_v${MAJOR_VER}.${MINOR_VER}"
 MY_P="squeezeboxserver-${MAJOR_VER}.${MINOR_VER}-noCPAN"
 MY_P_BUILD_NUM="squeezeboxserver-${MAJOR_VER}.${MINOR_VER}-${BUILD_NUM}-noCPAN"
@@ -16,11 +18,10 @@ HOMEPAGE="http://www.logitechsqueezebox.com/support/download-squeezebox-server.h
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="lame wavpack musepack alac ogg flac avahi aac bonjour"
+IUSE="lame wavpack alac ogg flac aac"
 
-# Note: Audio::Scan and EV present because of bug#287264 and bug#287857.
+# Note: EV present because of bug#287857.
 SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
-	mirror://gentoo/SqueezeboxServer-Audio-Scan-0.45.tar.gz
 	mirror://gentoo/SqueezeboxServer-EV-3.8.tar.gz"
 
 # Note: common-sense currently required due to bundled EV (Gentoo bug#287257)
@@ -28,7 +29,6 @@ DEPEND="
 	!media-sound/squeezecenter
 	virtual/logger
 	virtual/mysql
-	avahi? ( net-dns/avahi )
 	>=dev-perl/common-sense-2.01
 	"
 # Note: dev-perl/GD necessary because of SC bug#6143
@@ -37,8 +37,8 @@ RDEPEND="
 	dev-perl/File-Which
 	virtual/logger
 	virtual/mysql
-	avahi? ( net-dns/avahi )
 	>=dev-lang/perl-5.8.8
+	>=dev-perl/Audio-Scan-0.59
 	>=dev-perl/GD-2.41
 	>=virtual/perl-IO-Compress-2.015
 	>=dev-perl/YAML-Syck-1.05
@@ -84,6 +84,7 @@ RDEPEND="
 	>=dev-perl/AnyEvent-5.2
 	>=dev-perl/Sub-Name-0.04
 	>=dev-perl/Module-Find-0.08
+	>=dev-perl/Class-Accessor-0.31
 	>=dev-perl/Class-XSAccessor-1.05
 	>=dev-perl/AutoXS-Header-1.02
 	>=dev-perl/Scope-Guard-0.03
@@ -91,85 +92,57 @@ RDEPEND="
 	>=dev-perl/Class-C3-0.21
 	>=dev-perl/Class-C3-Componentised-1.0006
 	>=dev-perl/File-ReadBackwards-1.04
+	~dev-perl/DBIx-Class-0.08120
+	>=dev-perl/JSON-XS-VersionOneAndTwo-0.31
+	>=dev-perl/MRO-Compat-0.11
+	>=dev-perl/PAR-0.994
+	>=dev-perl/enum-1.016
+	>=dev-perl/URI-Find-20100211
+	>=dev-perl/Algorithm-C3-0.08
+	>=dev-perl/Text-Unidecode-0.04
+	>=dev-perl/Net-UPnP-1.4.2
+	>=dev-perl/File-BOM-0.14
+	>=dev-perl/Proc-Background-1.10
+	>=dev-perl/Tie-Cache-LRU-20081023.2116
+	>=dev-perl/Tie-Cache-LRU-Expires-0.54
+	>=dev-perl/Data-Dump-1.15
+	>=dev-perl/Data-Page-2.02
+	>=dev-perl/Data-URIEncode-0.11
+	>=dev-perl/Tie-LLHash-1.003
+	>=dev-perl/Tie-RegexpHash-0.15
+	>=dev-perl/Data-UUID-1.202
 	lame? ( media-sound/lame )
 	alac? ( media-sound/alac_decoder )
 	wavpack? ( media-sound/wavpack )
-	bonjour? ( net-misc/mDNSResponder )
 	flac? (
 		media-libs/flac
-		media-sound/sox
+		media-sound/sox[flac]
 		)
-	ogg? ( media-sound/sox )
+	ogg? ( media-sound/sox[ogg] )
 	aac? ( media-libs/faad2 )
 	"
 
 S="${WORKDIR}/${MY_P_BUILD_NUM}"
 
-# Selected contents of SqueezeCenter's local CPAN collection that we include
-# in the installation. This removes duplication of CPAN modules. (See Gentoo
-# bug #251494).
-CPANKEEP="
-	Class/XSAccessor/Array.pm
-
-	JSON/XS/VersionOneAndTwo.pm
-	Class/Accessor/
-	Class/Accessor.pm
-	MRO/Compat.pm
-	Algorithm/C3.pm
-	Data/
-	DBIx/
-	File/BOM.pm
-	Net/UPnP/
-	Net/UPnP.pm
-	Proc/Background/
-	Proc/Background.pm
-	Text/Unidecode/
-	Text/Unidecode.pm
-	Tie/Cache/LRU/
-	Tie/Cache/LRU.pm
-	Tie/LLHash.pm
-	Tie/RegexpHash.pm
-	UUID/Tiny.pm
-	URI/Find.pm
-	PAR/
-	PAR.pm
-	enum.pm
-	"
-
-VARLIBSBS="/var/lib/squeezeboxserver"
-PREFSDIR="${VARLIBSBS}/prefs"
-PREFS="${PREFSDIR}/squeezeboxserver.prefs"
-LIVE_PREFS="${PREFSDIR}/server.prefs"
+ETCDIR="/etc/squeezeboxserver"
+PREFS="${ETCDIR}/squeezeboxserver.prefs"
+PREFSDIR="${ETCDIR}/prefs"
 DOCDIR="/usr/share/doc/squeezeboxserver-${PV}"
 SHAREDIR="/usr/share/squeezeboxserver"
-LIBDIR="/usr/lib/squeezeboxserver"
+LIBDIR="/usr/$(get_libdir)/squeezeboxserver"
 OLDDBUSER="squeezecenter"
 DBUSER="squeezeboxserver"
+VARLIBSBS="/var/lib/squeezeboxserver"
 PLUGINSDIR="${VARLIBSBS}/Plugins"
-ETCDIR=/etc/squeezecenter
 
 # To support Migration
-OLDETCDIR=/etc/squeezecenter
-OLDPREFSDIR=/var/lib/squeezecenter/prefs
-OLDPLUGINSDIR=/var/lib/squeezecenter/Plugins
-MIGMARKER=.migrated
+OLDETCDIR="/etc/squeezecenter"
+OLDPREFSDIR="/var/lib/squeezecenter/prefs"
+OLDPREFSFILE="${OLDPREFSDIR}/server.prefs"
+OLDPLUGINSDIR="/var/lib/squeezecenter/Plugins"
+MIGMARKER=".migrated"
 
 pkg_setup() {
-	# Sox has optional OGG and FLAC support, so make sure it has that included
-	# if required
-	if use ogg; then
-		if ! built_with_use media-sound/sox ogg; then
-			eerror "media-sound/sox not built with USE=ogg"
-			die "Squeezebox Server needs media-sound/sox to be built with USE=ogg"
-		fi
-	fi
-	if use flac; then
-		if ! built_with_use media-sound/sox flac; then
-			eerror "media-sound/sox not built with USE=flac"
-			die "Squeezebox Server needs media-sound/sox to be built with USE=flac"
-		fi
-	fi
-
 	# Create the user and group if not already present
 	enewgroup squeezeboxserver
 	enewuser squeezeboxserver -1 -1 "/dev/null" squeezeboxserver
@@ -181,43 +154,37 @@ src_unpack() {
 
 	# Apply patches
 	epatch "${FILESDIR}/${P}-build-perl-modules-gentoo.patch"
+	epatch "${FILESDIR}/${P}-uuid-gentoo.patch"
+	epatch "${FILESDIR}/${P}-squeezeslave.patch"
+
+	# Copy in the module builder - can't run it from the files directory in case
+	# Portage is mounted 'noexec'.
+	cp "${FILESDIR}/build-modules.sh" "${S}"	|| die
+	chmod 555 "${S}/build-modules.sh"			|| die
 }
 
-# Build Audio::Scan and EV present because of bug#287264 and bug#287857.
+# Building of EV present because of bug#287857.
 src_compile() {
 	einfo "Building bundled Perl modules (some warnings are normal here)..."
-	"${FILESDIR}/build-modules.sh" "${DISTDIR}" || die "Unable to build Perl modules"
+	"./build-modules.sh" "${DISTDIR}" || die "Unable to build Perl modules"
 }
 
 src_install() {
 
 	# The main Perl executables
 	exeinto /usr/sbin
-	newexe slimserver.pl squeezeboxserver
-	newexe scanner.pl squeezeboxserver-scanner
-	newexe cleanup.pl squeezeboxserver-cleanup
-
-	# Get the Perl package name and version
-	eval `perl '-V:package'`
-	eval `perl '-V:version'`
+	newexe slimserver.pl squeezeboxserver		|| die "Failed to install server executable"
+	newexe scanner.pl squeezeboxserver-scanner	|| die "Failed to install scanner executable"
+	newexe cleanup.pl squeezeboxserver-cleanup	|| die "Failed to install cleanup executable"
 
 	# The custom OS module for Gentoo - provides OS-specific path details
 	cp "${FILESDIR}/gentoo-filepaths.pm" "Slim/Utils/OS/Custom.pm" || die "Unable to install Gentoo custom OS module"
 
 	# The server Perl modules
-	dodir "/usr/lib/${package}/vendor_perl/${version}"
-	cp -r Slim "${D}/usr/lib/${package}/vendor_perl/${version}" || die "Unable to install server Perl modules"
-
-	# Compiled CPAN module go under lib as they are arch-specific
-	dodir "/usr/lib/squeezeboxserver/CPAN"
-	cp -r CPAN/arch "${D}/usr/lib/squeezeboxserver/CPAN" || die "Unable to install compiled CPAN modules"
-
-	# Preseve some of the Squeezebox Server-packaged CPAN modules that Gentoo
-	# doesn't provide ebuilds for.
-	for ITEM in ${CPANKEEP}; do
-		dodir "/usr/share/squeezeboxserver/CPAN/$(dirname ${ITEM})"
-		cp -r "CPAN/${ITEM}" "${D}/usr/share/squeezeboxserver/CPAN/${ITEM}" || die "Unable to preserve CPAN item ${ITEM}"
-	done
+	local installvendorlib
+	eval `perl '-V:installvendorlib'`
+	dodir "${installvendorlib}"
+	cp -r Slim "${D}${installvendorlib}" || die "Unable to install server Perl modules"
 
 	# Various directories of architecture-independent static files
 	dodir "${SHAREDIR}"
@@ -227,14 +194,17 @@ src_install() {
 	cp -r IR "${D}/${SHAREDIR}"			|| die "Unable to install IR"
 	cp -r SQL "${D}/${SHAREDIR}"		|| die "Unable to install SQL"
 
+	# Remove bundled modified AnyEvent - we depend on a newer version now
+	rm -r lib/AnyEvent.pm lib/AnyEvent || die "Unable to remove bundled AnyEvent"
+
 	# Architecture-dependent static files
 	dodir "${LIBDIR}"
-	cp -r lib/* "${D}/${LIBDIR}" || die "Unable to install architecture-dependent files"
+	cp -r lib/* "${D}${LIBDIR}" || die "Unable to install architecture-dependent files"
 
-	# Install compiled Perl modules because of bug#287264 and bug#287857.
-	dodir "/usr/lib/squeezeboxserver/CPAN/arch"
-	cp -r CPAN-arch/* "${D}/usr/lib/squeezeboxserver/CPAN/arch" || die "Unable to install compiled CPAN modules"
-	cp -r CPAN-pm/* "${D}/usr/share/squeezeboxserver/CPAN" || die "Unable to install compiled CPAN modules"
+	# Install compiled Perl modules because of bug#287857.
+	dodir "${LIBDIR}/CPAN/arch"
+	cp -r CPAN-arch/* "${D}${LIBDIR}/CPAN/arch" || die "Unable to install compiled CPAN modules"
+	cp -r CPAN-pm/* "${D}${LIBDIR}/CPAN" || die "Unable to install compiled CPAN modules"
 
 	# Strings and version identification
 	insinto "${SHAREDIR}"
@@ -245,26 +215,25 @@ src_install() {
 	dodoc Changelog*.html
 	dodoc Installation.txt
 	dodoc License*.txt
-	newdoc "${FILESDIR}/Gentoo-plugins-README.txt" Gentoo-plugins-README.txt
+	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
+	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
 
-	# Configuration files
-	insinto /etc/squeezeboxserver
+	# Configuration files and preferences
+	insinto "${ETCDIR}"
 	doins convert.conf
 	doins types.conf
 	doins modules.conf
+	newins "${FILESDIR}/squeezeboxserver.prefs" squeezeboxserver.prefs
+
+	# Preferences directory
+	dodir "${PREFSDIR}"
+	fowners squeezeboxserver:squeezeboxserver "${PREFSDIR}"
+	fperms 770 "${PREFSDIR}"
 
 	# Install init scripts
 	newconfd "${FILESDIR}/squeezeboxserver.conf.d" squeezeboxserver
 	newinitd "${FILESDIR}/squeezeboxserver.init.d" squeezeboxserver
 
-	# Install preferences
-	insinto "${PREFSDIR}"
-	if [ ! -f "${PREFSDIR}/squeezeboxserver.prefs" ]; then
-		newins "${FILESDIR}/squeezeboxserver.prefs" squeezeboxserver.prefs
-	fi
-	fowners squeezeboxserver:squeezeboxserver "${PREFSDIR}"
-	fperms 770 "${PREFSDIR}"
-
 	# Install the SQL configuration scripts
 	insinto "${SHAREDIR}/SQL/mysql"
 	doins "${FILESDIR}/dbdrop-gentoo.sql"
@@ -299,12 +268,6 @@ src_install() {
 	# Install logrotate support
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/squeezeboxserver.logrotate.d" squeezeboxserver
-
-	# Install Avahi support (if USE flag is set)
-	if use avahi; then
-		insinto /etc/avahi/services
-		newins "${FILESDIR}/avahi-squeezeboxserver.service" squeezeboxserver.service
-	fi
 }
 
 sc_starting_instr() {
@@ -348,10 +311,10 @@ pkg_postinst() {
 	# Album art requires PNG and JPEG support from GD, so if it's not there
 	# then warn the user.  It's not mandatory as the user may not be using
 	# album art.
-	if ! built_with_use dev-perl/GD jpeg || \
-	   ! built_with_use dev-perl/GD png || \
-	   ! built_with_use media-libs/gd jpeg || \
-	   ! built_with_use media-libs/gd png; then
+	if ! has_version dev-perl/GD[jpeg] || \
+	   ! has_version dev-perl/GD[png] || \
+	   ! has_version media-libs/gd[jpeg] || \
+	   ! has_version media-libs/gd[png]; then
 		ewarn "For correct operation of album art through Squeezebox Server's web"
 		ewarn "interface the GD library and Perl module must be built with PNG"
 		ewarn "and JPEG support.  If necessary you can add the following lines"
@@ -371,15 +334,16 @@ pkg_postinst() {
 	elog "This command will also migrate old SqueezeCenter preferences and"
 	elog "plugins (if present)."
 
-	# Remind user to configure Avahi if necessary
-	if use avahi; then
-		elog ""
-		elog "Avahi support installed.  Remember to edit the folowing file if"
-		elog "you run Squeezebox Server's web interface on a port other than 9000:"
-		elog "\t/etc/avahi/services/squeezeboxserver.service"
-	fi
+	elog ""
+
+	ewarn "Note: If Squeezebox Server dies after the initial configuration"
+	ewarn "      after an upgrade from a previous installation, try removing"
+	ewarn "      /var/lib/squeezeboxserver and /etc/squeezeboxserver and"
+	ewarn "      then reinstalling the package (note that old preferences"
+	ewarn "      and plugins will be lost).  See bug #307119."
 
 	elog ""
+
 	sc_starting_instr
 }
 
@@ -467,17 +431,18 @@ pkg_config() {
 	sed -e "s/__DATABASE__/${DBUSER}/" -e "s/__DBUSER__/${DBUSER}/" -e "s/__DBPASSWORD__/${DBUSER_PASSWD}/" < "${SHAREDIR}/SQL/mysql/dbcreate-gentoo.sql" | mysql --user=root --password="${ROOT_PASSWD}" || die "Unable to create MySQL database and user"
 
 	# Migrate old preferences, if present.
-	if [ -d "${OLDPREFSDIR}" ]; then
-		if [ -f "${PREFSDIR}/${MIGMARKER}" ]; then
+	if [ -d "${OLDPREFSFILE}" ]; then
+		if [ -f "${ETCDIR}/${MIGMARKER}" ]; then
 			einfo ""
 			einfo "Old preferences are present, but they appear to have been"
 			einfo "migrated before. If you would like to re-migrate the old"
 			einfo "SqueezeCenter preferences remove the following file, and"
 			einfo "then restart the configuration."
-			einfo "\t${PREFSDIR}/${MIGMARKER}"
+			einfo "\t${ETCDIR}/${MIGMARKER}"
 		else
 			einfo "Migrating old SqueezeCenter preferences"
 			cp -r "${OLDPREFSDIR}" "${VARLIBSBS}"
+			mv "${VARLIBSBS}/prefs/server.prefs" "/etc/squeezeboxserver/squeezeboxserver.prefs"
 			chown -R squeezeboxserver:squeezeboxserver "${PREFSDIR}"
 			touch "${PREFSDIR}/${MIGMARKER}"
 		fi
@@ -502,11 +467,9 @@ pkg_config() {
 
 	# Remove the existing MySQL preferences from Squeezebox Server (if any).
 	sc_remove_db_prefs "${PREFS}"
-	[ -f "${LIVE_PREFS}" ] && sc_remove_db_prefs ${LIVE_PREFS}
 
 	# Insert the external MySQL configuration into the preferences.
 	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-	[ -f "${LIVE_PREFS}" ] && sc_update_prefs "${LIVE_PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
 
 	# Phew - all done. Give some tips on what to do now.
 	einfo "Database configuration complete."