Add new version 7.5.2; remove old versions

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

15 files changed, 121 insertions, 1746 deletions

diff --git a/media-sound/squeezeboxserver/ChangeLog b/media-sound/squeezeboxserver/ChangeLog
index 46ca804c21b9..9a556b4296e7 100644
--- a/media-sound/squeezeboxserver/ChangeLog
+++ b/media-sound/squeezeboxserver/ChangeLog
@@ -1,6 +1,25 @@
 # 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.11 2010/09/19 14:47:02 lavajoe Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/ChangeLog,v 1.12 2011/01/05 19:53:27 lavajoe Exp $
+
+*squeezeboxserver-7.5.2 (05 Jan 2011)
+
+  05 Jan 2011; Joe Peterson <lavajoe@gentoo.org>
+  -squeezeboxserver-7.4.2-r2.ebuild,
+  -files/squeezeboxserver-7.4.2-build-perl-modules-gentoo.patch,
+  -files/squeezeboxserver-7.4.2-squeezeslave.patch,
+  -files/squeezeboxserver-7.4.2-uuid-gentoo.patch,
+  -squeezeboxserver-7.5.0-r1.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,
+  -squeezeboxserver-7.5.1.ebuild, -files/build-modules-7.5.1.sh,
+  +squeezeboxserver-7.5.2.ebuild,
+  +files/squeezeboxserver-7.5.2-build-perl-modules-gentoo.patch,
+  +files/squeezeboxserver-7.5.2-squeezeslave.patch,
+  +files/squeezeboxserver-7.5.2-uuid-gentoo.patch,
+  +files/build-modules-7.5.2.sh, files/squeezeboxserver.init.d, metadata.xml:
+  Add new version 7.5.2; remove old versions
 
 *squeezeboxserver-7.5.1-r1 (19 Sep 2010)
 
diff --git a/media-sound/squeezeboxserver/Manifest b/media-sound/squeezeboxserver/Manifest
index 86eecef87548..9b5c9de51c74 100644
--- a/media-sound/squeezeboxserver/Manifest
+++ b/media-sound/squeezeboxserver/Manifest
@@ -2,31 +2,25 @@ AUX Gentoo-detailed-changelog.txt 85 RMD160 efbbea26fc3d3b52d44e14af5167579f3bd1
 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-7.5.1-r1.sh 1237 RMD160 4e97a7ce8cbb02b42f002877e36de608be7b5ba6 SHA1 8d00cfd0ee1deaa331d0e6cdf0bd12a3f108b8c3 SHA256 30fef2e87c8aad58d36dd7506251a42f0679717da8adf23db78d520199c4ed0b
-AUX build-modules-7.5.1.sh 19982 RMD160 385707ae70b55614ba99ad5672931d3f781b01f1 SHA1 df2b2e5def408543e5cf389438bf8cb61c60f701 SHA256 ef87e14ec31eec3f2dbd048a8cf9a44770049a9dfa4d43cb9e6516872759a450
+AUX build-modules-7.5.2.sh 1234 RMD160 49bc61856a683d7dd8535b948ef93d1c69d1a33d SHA1 b0a282ae43f5a011f06cf636efc92e1d0e348cd4 SHA256 62b67cfa3df2041478757dc329dfa04306dc7c20ad55382ef11c54f392fa0cc4
 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 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-7.5.1-build-perl-modules-gentoo.patch 860 RMD160 9c3f1aaea83c6d2374997775fed58e363c23885c SHA1 a99b20e00078c6f780fd954c66eb59070f27fe24 SHA256 d96c4f6b154ea56134636d9ee81a37bea83ba3ccdbf648797061ffeccaf22b33
 AUX squeezeboxserver-7.5.1-squeezeslave.patch 642 RMD160 3a4caa3e625930d99e975e0bf05a0678f83af0a0 SHA1 0930fbb2b68f9bcef3a4ee44bf989c0dde525a26 SHA256 9d52ce93f308ae0a97d67808f833d44d78048cd32b74a81d2370c15486abf0a5
 AUX squeezeboxserver-7.5.1-uuid-gentoo.patch 535 RMD160 c18d20678510af04dd2f3cc964c52e6b9bce66cb SHA1 8b5c3d728e8a51e65b923db2490f1d401c2eb8d6 SHA256 ba89bda0e2b3ae5590a5d5139539ff3b233720bded7f912b6d332175984ebb34
+AUX squeezeboxserver-7.5.2-build-perl-modules-gentoo.patch 860 RMD160 3b7a613316decdf1fccfe645af3a2de6b43763cc SHA1 d577b1ac9cb4a9eb3b2aa5dad45d839338e6cc2a SHA256 387d0895c4b465a3983657907f5e2f31ced0bff7f02aab428881808e8bc65e56
+AUX squeezeboxserver-7.5.2-squeezeslave.patch 642 RMD160 ffe4ab0a063947443af1a6d41f335667676d9993 SHA1 3a08049b09814457aa25b1feb9fc6f132679439d SHA256 60289802b2c874fcfea355c686020d4b3db9ce0de957bfa54a8b85dc7d286e11
+AUX squeezeboxserver-7.5.2-uuid-gentoo.patch 535 RMD160 e5ab55f53ecc96efa02ff5cf5575586f88a38e9e SHA1 6eed76837095f562d0d45e11f01007393feeb161 SHA256 dc4bcad0b1a77ccfdf95d435d0db6356ba5b92fddd4d8563ee8550abf5ec1fab
 AUX squeezeboxserver.conf.d 1106 RMD160 39ca36903c4b67e40b5e24c06bc62057e932bbf1 SHA1 0d84ec59e828d6eec7bdd64f7b414748eb2a558a SHA256 4ac6df07ae3b74d44ae410e0879ea2ad2d948383c32fdd750a443717c8648df0
-AUX squeezeboxserver.init.d 1370 RMD160 fb93e1a5e9c085854479ba473b74b732efac7fca SHA1 761cb4d8ed5b657f81b89c7c98a85eb2996c3b52 SHA256 4f38348e9ae12c176da18e97b4b0af981aa2769a044bd155cfc28eb7fe63a1de
+AUX squeezeboxserver.init.d 1387 RMD160 42008cf4cf87eeedd14b4e34e4cc5a7647b43d65 SHA1 0d4ed6d200e08ca5ce4e08b2bb4035828e72352a SHA256 8fdc4b38a2bf9e9587d2f35df671e2bbb355092624f7c48e9b730bc5ea754211
 AUX squeezeboxserver.logrotate.d 422 RMD160 694fdc002fee090f503ec757873b838d73bebb65 SHA1 98606d8dd8323d67a6a45339ec64d793224afbf2 SHA256 0eef63753f1072b20ad0418fc33a47b08412eb901283c7d3a984293f64ae3a8d
 AUX squeezeboxserver.prefs 132 RMD160 194039dc2ef4b0c579ed13096ff6151fbbd27c02 SHA1 242e1211e1432704b5350a7acbb5be8fbcd2a815 SHA256 8f114c520f2eec360c68861159fb0824733748189836781f22513da6050f669e
 DIST SqueezeboxServer-EV-3.8.tar.gz 151268 RMD160 0bb514debdb615b37f5c16164a47c5934aacbdd9 SHA1 a205192861aa5a668592468833d0e99749274aeb SHA256 3be30c896026fe1a873ac16eac9473f80f62c164da88e3815ed6eee56e229345
-DIST squeezeboxserver-7.4.2-noCPAN.tgz 22197375 RMD160 a52088edcb01d8114d02e80eb35c2eaacdca215f SHA1 0d59db03cd4162f5162f75443e46fef2963f5ba4 SHA256 6f2555c53f0514477935593526e027eb35e9f8735283fe996ecfcfdf0d563b8b
-DIST squeezeboxserver-7.5.0-noCPAN.tgz 20701362 RMD160 a2758d2a0340851bdf860a26d7bdcb227de987a2 SHA1 8519061735cc61b690fe96d883e2094ffd06b458 SHA256 a92116e702809087fa12c8e2386375101a9ead4c8bc42452f0be979e39c67a9f
 DIST squeezeboxserver-7.5.1-noCPAN.tgz 20719890 RMD160 f042feab287da2835905b50b9b08e197c9746d9e SHA1 ff6bdffa4f421d066ef4cce86b8963cb67f3cac2 SHA256 bab313b1bf68c4e4825d821352ce6d59a0eaa883ae487cd273a9cd9b4a5245ff
-EBUILD squeezeboxserver-7.4.2-r2.ebuild 17500 RMD160 b47006c712b2c2d83ab2eea993d5d6e0fd301b93 SHA1 71fc48054b151cea1c932e3b6a4178b0378f9aed SHA256 0d22f21de44a171611c910f0fa4340fce545f35818a034fdb250a44682690dd6
-EBUILD squeezeboxserver-7.5.0-r1.ebuild 17629 RMD160 9f758f6853f785185a90499bffbdb80159f9674d SHA1 a47050dc07fe5a7c4789f5c9d61b0c00524e04b0 SHA256 7989f18e831c003197b508a5e1135331072208e67baec73f68d4a345f3f41d98
+DIST squeezeboxserver-7.5.2-noCPAN.tgz 20710880 RMD160 65af9cba6205e6599d23a4b807ff7e8fe285de91 SHA1 6e58af796603833da706df32bf1c8e495eab0b76 SHA256 1d63fbdfa21a6a0532e4bc83a4f498c08dda37b2d68b9d40f963eca1d445386b
 EBUILD squeezeboxserver-7.5.1-r1.ebuild 17649 RMD160 4acb5da0a803fa0ee8f90db962de78cf722e0bb4 SHA1 b1f66cdab6cc894dd9d5ca9162c6e37a3de04190 SHA256 e4c4e04c66f9ce090fb9121f478b1bafcb6a95e8b85c776b8a23464594b7faa6
-EBUILD squeezeboxserver-7.5.1.ebuild 17580 RMD160 4174267b5d136dad87cd0e42db0b6e4cf9c5a0a6 SHA1 89701ae2ee7e96fe3613e7d75cc887e7c437c0f3 SHA256 ec0b21d4fee0d93363d60d7f2c7f53e50ee856758ad307b12cc990905367e286
-MISC ChangeLog 3633 RMD160 618cc1e1396fb8e4d1275f0b04a2da93442a1bf2 SHA1 d03f43c5f4c427429f703f91353b50ff46defa9b SHA256 4f2c7a6d5a4ea44b0dddadcf3bdf93b2b836bf7bdee430c55677ad17e30dd8d0
-MISC metadata.xml 935 RMD160 bed42783ef261d072900ba296052be0e67143d6e SHA1 13567e24801ecf74fe91c6bc2bc2d1202c3fac49 SHA256 6e17e84756f35acb251d9134fac66ba08b41a78861edadc523f065a9eb1016d6
+EBUILD squeezeboxserver-7.5.2.ebuild 17674 RMD160 ab19b996ec8bab0be0361ad4f9bdc90072be5a3d SHA1 4ba044a27090c886a0b6fb07715c8a6b549f5742 SHA256 d516a0054ffcb2b4d4eb5421c3c8d66feb6e29cc9812e575cb8df84cd5bb39e1
+MISC ChangeLog 4522 RMD160 aff2e9777cf5d496bee7b653a0b7e5061b38ba8c SHA1 603e2e0b308e6bc7b78409e2f8fa79d080deb6c9 SHA256 adc94d338f58d92664d11dd97cd9321013e8e6ba6623c11c5413f15d69526c0a
+MISC metadata.xml 882 RMD160 deeff72ea79ab9bcefb7df319070bbab09385c71 SHA1 04b1813b2728609fceac3ab811743a7d4fac7ea0 SHA256 abfc064756a68b29c51dccaa77be5ba64fdfe662aa8a36aa1456a1442a59362a
diff --git a/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh b/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh
deleted file mode 100755
index 0efc82f2b8c7..000000000000
--- a/media-sound/squeezeboxserver/files/build-modules-7.5.1.sh
+++ /dev/null
@@ -1,675 +0,0 @@
-#!/bin/bash
-#
-# $Id: build-modules-7.5.1.sh,v 1.1 2010/07/24 16:29:14 lavajoe Exp $
-#
-# This script builds all binary Perl modules required by Squeezebox Server.
-# 
-# Supported OSes:
-#
-# Linux (Perl 5.8.8 & 5.10.0 & 5.12.1)
-#   i386/x86_64 Linux
-#   ARM Linux
-#   PowerPC Linux
-# Mac OSX 10.5, 10.6, (Perl 5.8.8 & 5.10.0)
-#   Under 10.5, builds Universal Binaries for i386/ppc
-#   Under 10.6, builds Universal Binaries for i386/x86_64
-# FreeBSD 7.2 (Perl 5.8.9)
-
-DISTDIR="$1"; shift
-
-OS=`uname`
-
-# get system arch, stripping out extra -gnu on Linux
-ARCH=`/usr/bin/perl -MConfig -le 'print $Config{archname}' | sed 's/gnu-//' | sed 's/^i[3456]86-/i386-/' `
-
-if [ $OS = "Linux" -o $OS = "Darwin" -o $OS = "FreeBSD" ]; then
-    echo "Building for $OS / $ARCH"
-else
-    echo "Unsupported platform: $OS, please submit a patch or provide us with access to a development system."
-    exit
-fi
-
-# Build dir
-BUILD=$PWD
-
-# Path to Perl 5.8.x
-if [ -x "/usr/bin/perl5.8.8" ]; then
-    PERL_58=/usr/bin/perl5.8.8
-elif [ -x "/usr/local/bin/perl5.8.8" ]; then
-    PERL_58=/usr/local/bin/perl5.8.8
-elif [ -x "/usr/local/bin/perl5.8.9" ]; then # FreeBSD 7.2
-    PERL_58=/usr/local/bin/perl5.8.9
-fi
-
-if [ $PERL_58 ]; then
-    echo "Building with Perl 5.8.x at $PERL_58"
-fi
-
-# Install dir for 5.8
-BASE_58=$BUILD/5.8
-
-# Path to Perl 5.10.x
-if [ -x "/usr/bin/perl5.10.0" ]; then
-    PERL_510=/usr/bin/perl5.10.0
-elif [ -x "/usr/local/bin/perl5.10.0" ]; then
-    PERL_510=/usr/local/bin/perl5.10.0
-elif [ -x "/usr/bin/perl5.10.1" ]; then
-	PERL_510=/usr/bin/perl5.10.1
-elif [ -x "/usr/local/bin/perl5.10.1" ]; then
-	PERL_510=/usr/local/bin/perl5.10.1
-fi
-
-if [ $PERL_510 ]; then
-    echo "Building with Perl 5.10 at $PERL_510"
-fi
-
-# Install dir for 5.10
-BASE_510=$BUILD/5.10
-
-# Path to Perl 5.12.1
-if [ -x "/usr/bin/perl5.12.1" ]; then
-    PERL_512=/usr/bin/perl5.12.1
-elif [ -x "/usr/local/bin/perl5.12.1" ]; then
-    PERL_512=/usr/local/bin/perl5.12.1
-fi
-
-if [ $PERL_512 ]; then
-    echo "Building with Perl 5.12 at $PERL_512"
-fi
-
-# Install dir for 5.12
-BASE_512=$BUILD/5.12
-
-if [ ! "$PERL_58" -a ! "$PERL_510" -a ! "$PERL_512" ]; then
-	echo
-	echo "*** ERROR: Could not find Perl!"
-	echo
-	exit 1
-fi
-
-# Require modules to pass tests
-RUN_TESTS=1
-
-FLAGS=""
-# Mac-specific flags
-if [ $OS = "Darwin" ]; then
-    if [ $PERL_58 ]; then
-        # build 32-bit version 
-        FLAGS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.3"
-    elif [ $PERL_510 ]; then
-        # Build 64-bit version    
-        FLAGS="-arch x86_64 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5"
-    fi
-fi
-
-# FreeBSD's make sucks
-if [ $OS = "FreeBSD" ]; then
-    if [ !-x /usr/local/bin/gmake ]; then
-        echo "ERROR: Please install GNU make (gmake)"
-        exit
-    fi
-    export GNUMAKE=/usr/local/bin/gmake
-    export MAKE=/usr/local/bin/gmake
-else
-    export MAKE=/usr/bin/make
-fi
-
-# Clean up
-# XXX command-line flag to skip cleanup
-#rm -rf $BUILD
-
-#mkdir $BUILD
-
-# $1 = module to build
-# $2 = Makefile.PL arg(s)
-function build_module {
-    tar zxvf $DISTDIR/SqueezeboxServer-$1.tar.gz || exit 1
-    cd $1
-#    cp -R ../hints .
-    if [ $PERL_58 ]; then
-        # Running 5.8
-        export PERL5LIB=$BASE_58/lib/perl5
-        
-        $PERL_58 Makefile.PL PREFIX=$BASE_58 $2
-        if [ $RUN_TESTS -eq 1 ]; then
-            make test
-        else
-            make
-        fi
-        if [ $? != 0 ]; then
-            if [ $RUN_TESTS -eq 1 ]; then
-                echo "make test failed, aborting"
-            else
-                echo "make failed, aborting"
-            fi
-            exit $?
-        fi
-        make install || exit 1
-        make clean || exit 1
-    fi
-    if [ $PERL_510 ]; then
-        # Running 5.10
-        export PERL5LIB=$BASE_510/lib/perl5
-        
-        $PERL_510 Makefile.PL PREFIX=$BASE_510 $2
-        if [ $RUN_TESTS -eq 1 ]; then
-            make test
-        else
-            make
-        fi
-        if [ $? != 0 ]; then
-            if [ $RUN_TESTS -eq 1 ]; then
-                echo "make test failed, aborting"
-            else
-                echo "make failed, aborting"
-            fi
-            exit $?
-        fi
-        make install || exit 1
-    fi
-	if [ $PERL_512 ]; then
-        # Running 5.12
-        export PERL5LIB=$BASE_512/lib/perl5
-        
-        $PERL_512 Makefile.PL PREFIX=$BASE_512 $2
-        if [ $RUN_TESTS -eq 1 ]; then
-            make test
-        else
-            make
-        fi
-        if [ $? != 0 ]; then
-            if [ $RUN_TESTS -eq 1 ]; then
-                echo "make test failed, aborting"
-            else
-                echo "make failed, aborting"
-            fi
-            exit $?
-        fi
-        make install || exit 1
-    fi
-    cd ..
-    rm -rf $1
-}
-
-function build_all {
-#    build Audio::Scan
-#    build AutoXS::Header
-#    build Class::C3::XS
-#    build Class::XSAccessor
-#    build Class::XSAccessor::Array
-#    build Compress::Raw::Zlib
-#    build DBI
-#    build DBD::mysql
-#    build Digest::SHA1
-    build EV
-#    build Encode::Detect
-#    build GD
-#    build HTML::Parser
-#    build JSON::XS
-#    build Locale::Hebrew
-#    build Sub::Name
-#    build Template
-#    build XML::Parser
-#    build YAML::Syck
-}
-
-function build {
-    case "$1" in
-        AutoXS::Header)
-            # AutoXS::Header support module
-            build_module AutoXS-Header-1.02
-            ;;
-            
-        Class::C3::XS)
-            if [ $PERL_58 ]; then
-                build_module Class-C3-XS-0.11
-            fi
-            ;;
-        
-        Class::XSAccessor)
-            build_module Class-XSAccessor-1.03
-            ;;
-        
-        Class::XSAccessor::Array)
-            build_module Class-XSAccessor-Array-1.04
-            ;;
-        
-        Compress::Raw::Zlib)
-            build_module Compress-Raw-Zlib-2.017
-            ;;
-        
-        DBI)
-            build_module DBI-1.608
-            ;;
-        
-        Digest::SHA1)
-            build_module Digest-SHA1-2.11
-            ;;
-        
-        EV)
-#            build_module common-sense-2.0
-
-            export PERL_MM_USE_DEFAULT=1
-            RUN_TESTS=0
-            build_module EV-3.8
-            RUN_TESTS=1
-            export PERL_MM_USE_DEFAULT=
-            ;;
-        
-        Encode::Detect)
-            build_module Data-Dump-1.15
-            build_module ExtUtils-CBuilder-0.260301
-            RUN_TESTS=0
-            build_module Module-Build-0.35
-            RUN_TESTS=1
-            build_module Encode-Detect-1.00
-            ;;
-        
-        HTML::Parser)
-            build_module HTML-Tagset-3.20
-            build_module HTML-Parser-3.60
-            ;;
-        
-        JSON::XS)
-            build_module JSON-XS-2.232
-            ;;
-        
-        Locale::Hebrew)
-            build_module Locale-Hebrew-1.04
-            ;;
-        
-        Sub::Name)
-            build_module Sub-Name-0.04
-            ;;
-        
-        YAML::Syck)
-            build_module YAML-Syck-1.05
-            ;;
-        
-        Audio::Scan)
-            build_module Audio-Scan-0.45
-            ;;
-        
-        Template)
-            # Template, custom build due to 2 Makefile.PL's
-            tar zxvf Template-Toolkit-2.21.tar.gz
-            cd Template-Toolkit-2.21
-            cp -R ../hints .
-            cp -R ../hints ./xs
-            if [ $PERL_58 ]; then
-                # Running 5.8
-                $PERL_58 Makefile.PL PREFIX=$BASE_58 TT_ACCEPT=y TT_EXAMPLES=n TT_EXTRAS=n
-                make # minor test failure, so don't test
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-                make clean
-            fi
-            if [ $PERL_510 ]; then
-                # Running 5.10
-                $PERL_510 Makefile.PL PREFIX=$BASE_510 TT_ACCEPT=y TT_EXAMPLES=n TT_EXTRAS=n
-                make # minor test failure, so don't test
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-			if [ $PERL_512 ]; then
-                # Running 5.12
-                $PERL_512 Makefile.PL PREFIX=$BASE_512 TT_ACCEPT=y TT_EXAMPLES=n TT_EXTRAS=n
-                make # minor test failure, so don't test
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-            cd ..
-            rm -rf Template-Toolkit-2.21
-            ;;
-        
-        DBD::mysql)
-            # Build libmysqlclient
-            tar jxvf mysql-5.1.37.tar.bz2
-            cd mysql-5.1.37
-            CC=gcc CXX=gcc \
-            CFLAGS="-O3 -fno-omit-frame-pointer $FLAGS" \
-            CXXFLAGS="-O3 -fno-omit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti $FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking \
-                --enable-thread-safe-client \
-                --without-server --disable-shared --without-docs --without-man
-            make
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install
-            cd ..
-            rm -rf mysql-5.1.37
-
-            # DBD::mysql custom, statically linked with libmysqlclient
-            tar zxvf DBD-mysql-3.0002.tar.gz
-            cd DBD-mysql-3.0002
-            cp -R ../hints .
-            mkdir mysql-static
-            cp $BUILD/lib/mysql/libmysqlclient.a mysql-static
-            if [ $PERL_58 ]; then
-                # Running 5.8
-                export PERL5LIB=$BASE_58/lib/perl5
-                
-                $PERL_58 Makefile.PL --mysql_config=$BUILD/bin/mysql_config --libs="-Lmysql-static -lmysqlclient -lz -lm" PREFIX=$BASE_58 
-                make
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-                make clean
-            fi
-            if [ $PERL_510 ]; then
-                # Running 5.10
-                export PERL5LIB=$BASE_510/lib/perl5
-                
-                $PERL_510 Makefile.PL --mysql_config=$BUILD/bin/mysql_config --libs="-Lmysql-static -lmysqlclient -lz -lm" PREFIX=$BASE_510
-                make
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-			if [ $PERL_512 ]; then
-                # Running 5.12
-                export PERL5LIB=$BASE_512/lib/perl5
-                
-                $PERL_512 Makefile.PL --mysql_config=$BUILD/bin/mysql_config --libs="-Lmysql-static -lmysqlclient -lz -lm" PREFIX=$BASE_512
-                make
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-
-            cd ..
-            rm -rf DBD-mysql-3.0002
-            ;;
-        
-        XML::Parser)
-            # build expat
-            tar zxvf expat-2.0.1.tar.gz
-            cd expat-2.0.1
-            CFLAGS="$FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking
-            make
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install
-            cd ..
-
-            # Symlink static versions of libraries to avoid OSX linker choosing dynamic versions
-            cd build/lib
-            ln -sf libexpat.a libexpat_s.a
-            cd ../..
-
-            # XML::Parser custom, built against expat
-            tar zxvf XML-Parser-2.36.tar.gz
-            cd XML-Parser-2.36
-            cp -R ../hints .
-            cp -R ../hints ./Expat # needed for second Makefile.PL
-            patch -p0 < ../XML-Parser-Expat-Makefile.patch
-            if [ $PERL_58 ]; then
-                # Running 5.8
-                $PERL_58 Makefile.PL PREFIX=$BASE_58 EXPATLIBPATH=$BUILD/lib EXPATINCPATH=$BUILD/include
-                make test
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-                make clean
-            fi
-            if [ $PERL_510 ]; then
-                # Running 5.10
-                $PERL_510 Makefile.PL PREFIX=$BASE_510 EXPATLIBPATH=$BUILD/lib EXPATINCPATH=$BUILD/include
-                make test
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-			if [ $PERL_512 ]; then
-                # Running 5.12
-                $PERL_512 Makefile.PL PREFIX=$BASE_512 EXPATLIBPATH=$BUILD/lib EXPATINCPATH=$BUILD/include
-                make test
-                if [ $? != 0 ]; then
-                    echo "make failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-
-            cd ..
-            rm -rf XML-Parser-2.36
-            rm -rf expat-2.0.1
-            ;;
-        
-        GD)
-            # build libjpeg
-            # Makefile doesn't create directories properly, so make sure they exist
-            # Note none of these directories are deleted until GD is built
-            mkdir -p build/bin build/lib build/include build/man/man1
-            tar zxvf jpegsrc.v6b.tar.gz
-            cd jpeg-6b
-            CFLAGS="$FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking
-            make && make test
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install-lib
-            cd ..
-
-            # build libpng
-            tar zxvf libpng-1.2.39.tar.gz
-            cd libpng-1.2.39
-            CFLAGS="$FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking
-            make && make test
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install
-            cd ..
-
-            # build freetype
-            tar zxvf freetype-2.3.9.tar.gz
-            cd freetype-2.3.9
-            CFLAGS="$FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking
-            patch -p0 < ../freetype-arm-asm.patch # patch to fix ARM asm
-            $MAKE
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            $MAKE install
-            cd ..
-
-            # build expat
-            tar zxvf expat-2.0.1.tar.gz
-            cd expat-2.0.1
-            CFLAGS="$FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking
-            make
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install
-            cd ..
-
-            # build fontconfig
-            tar zxvf fontconfig-2.6.0.tar.gz
-            cd fontconfig-2.6.0
-            CFLAGS="$FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking --disable-docs \
-                --with-expat-includes=$BUILD/include --with-expat-lib=$BUILD/lib \
-                --with-freetype-config=$BUILD/bin/freetype-config
-            make
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install
-            cd ..
-
-            # build gd
-            tar zxvf gd-2.0.35.tar.gz
-            cd gd-2.0.35
-            # gd's configure is really dumb, adjust PATH so it can find the correct libpng config scripts
-            # and need to manually specify include dir
-            PATH="$BUILD/bin:$PATH" \
-            CFLAGS="-I$BUILD/include $FLAGS" \
-            LDFLAGS="$FLAGS" \
-                ./configure --prefix=$BUILD \
-                --disable-dependency-tracking --without-xpm --without-x \
-                --with-libiconv-prefix=/usr \
-                --with-jpeg=$BUILD \
-                --with-png=$BUILD \
-                --with-freetype=$BUILD \
-                --with-fontconfig=$BUILD
-            make
-            if [ $? != 0 ]; then
-                echo "make failed"
-                exit $?
-            fi
-            make install
-            cd ..
-
-            # Symlink static versions of libraries to avoid OSX linker choosing dynamic versions
-            cd build/lib
-            ln -sf libexpat.a libexpat_s.a
-            ln -sf libjpeg.a libjpeg_s.a
-            ln -sf libpng12.a libpng12_s.a
-            ln -sf libgd.a libgd_s.a
-            ln -sf libfontconfig.a libfontconfig_s.a
-            ln -sf libfreetype.a libfreetype_s.a
-            cd ../..
-
-            # GD
-            tar zxvf GD-2.41.tar.gz
-            cd GD-2.41
-            patch -p0 < ../GD-Makefile.patch # patch to build statically
-            cp -R ../hints .
-            if [ $PERL_58 ]; then
-                # Running 5.8
-                PATH="$BUILD/bin:$PATH" \
-                    $PERL_58 Makefile.PL PREFIX=$BASE_58
-
-                make test
-                if [ $? != 0 ]; then
-                    echo "make test failed, aborting"
-                    exit $?
-                fi
-                make install
-                make clean
-            fi
-            if [ $PERL_510 ]; then
-                # Running 5.10
-                PATH="$BUILD/bin:$PATH" \
-                    $PERL_510 Makefile.PL PREFIX=$BASE_510
-
-                make test
-                if [ $? != 0 ]; then
-                    echo "make test failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-			if [ $PERL_512 ]; then
-                # Running 5.12
-                PATH="$BUILD/bin:$PATH" \
-                    $PERL_512 Makefile.PL PREFIX=$BASE_512
-
-                make test
-                if [ $? != 0 ]; then
-                    echo "make test failed, aborting"
-                    exit $?
-                fi
-                make install
-            fi
-
-
-            cd ..
-            rm -rf GD-2.41
-            rm -rf gd-2.0.35
-            rm -rf fontconfig-2.6.0
-            rm -rf expat-2.0.1
-            rm -rf freetype-2.3.9
-            rm -rf libpng-1.2.39
-            rm -rf jpeg-6b
-            ;;
-    esac
-}
-
-# Build a single module if requested, or all
-if [ $1 ]; then
-    build $1
-else
-    build_all
-fi
-
-# Reset PERL5LIB
-export PERL5LIB=
-
-# clean out useless .bs/.packlist files, etc
-find $BUILD -name '*.bs' -exec rm -f {} \;
-find $BUILD -name '*.packlist' -exec rm -f {} \;
-
-# create our directory structure
-# XXX there is still some crap left in here by some modules such as DBI, GD
-if [ $PERL_58 ]; then
-    mkdir -p $BUILD/CPAN-arch/5.8/$ARCH
-    mkdir -p $BUILD/CPAN-pm
-    mv $BASE_58/lib*/perl5/site_perl/*/*/auto $BUILD/CPAN-arch/5.8/$ARCH/
-    mv $BASE_58/lib*/perl5/site_perl/*/*/* $BUILD/CPAN-pm
-fi
-if [ $PERL_510 ]; then
-    mkdir -p $BUILD/CPAN-arch/5.10/$ARCH
-    mkdir -p $BUILD/CPAN-pm
-    mv $BASE_510/lib*/perl5/site_perl/*/*/auto $BUILD/CPAN-arch/5.10/$ARCH/
-    mv $BASE_510/lib*/perl5/site_perl/*/*/* $BUILD/CPAN-pm
-fi
-if [ $PERL_512 ]; then
-    mkdir -p $BUILD/CPAN-arch/5.12/$ARCH
-    mkdir -p $BUILD/CPAN-pm
-    mv $BASE_512/lib*/perl5/site_perl/*/*/auto $BUILD/CPAN-arch/5.12/$ARCH/
-    mv $BASE_512/lib*/perl5/site_perl/*/*/* $BUILD/CPAN-pm
-fi
-
-# could remove rest of build data, but let's leave it around in case
-#rm -rf $BASE_58
-#rm -rf $BASE_510
-#rm -rf $BUILD/bin $BUILD/etc $BUILD/include $BUILD/lib $BUILD/man $BUILD/share $BUILD/var
diff --git a/media-sound/squeezeboxserver/files/build-modules-7.5.2.sh b/media-sound/squeezeboxserver/files/build-modules-7.5.2.sh
new file mode 100755
index 000000000000..533c3a245c24
--- /dev/null
+++ b/media-sound/squeezeboxserver/files/build-modules-7.5.2.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# $Id: build-modules-7.5.2.sh,v 1.1 2011/01/05 19:53:27 lavajoe Exp $
+#
+# This script builds all binary Perl modules required by Squeezebox Server.
+
+DISTDIR="$1"; shift
+D="$1"; shift
+
+# Build dir
+BUILD=$PWD
+
+# Require modules to pass tests
+RUN_TESTS=1
+
+FLAGS=""
+
+# $1 = module to build
+# $2 = Makefile.PL arg(s)
+function build_module {
+    tar zxvf $DISTDIR/SqueezeboxServer-$1.tar.gz || exit 1
+    cd $1
+        
+    perl Makefile.PL PREFIX=$D $2
+    if [ $RUN_TESTS -eq 1 ]; then
+        make test
+    else
+        make
+    fi
+    if [ $? != 0 ]; then
+        if [ $RUN_TESTS -eq 1 ]; then
+            echo "make test failed, aborting"
+        else
+            echo "make failed, aborting"
+        fi
+        exit $?
+    fi
+    make install || exit 1
+    make clean || exit 1
+
+    cd ..
+    rm -rf $1
+}
+
+function build_all {
+    export PERL_MM_USE_DEFAULT=1
+    RUN_TESTS=0
+    build_module EV-3.8
+    RUN_TESTS=1
+    export PERL_MM_USE_DEFAULT=
+}
+
+# Build a single module if requested, or all
+if [ $1 ]; then
+    build $1
+else
+    build_all
+fi
+
+# Reset PERL5LIB
+export PERL5LIB=
+
+# clean out useless .bs/.packlist files, etc
+find $BUILD -name '*.bs' -exec rm -f {} \;
+find $BUILD -name '*.packlist' -exec rm -f {} \;
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-build-perl-modules-gentoo.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-build-perl-modules-gentoo.patch
deleted file mode 100644
index 9138dec2b201..000000000000
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-build-perl-modules-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- Slim/bootstrap.pm.old	2010-03-29 23:50:00.000000000 +0100
-+++ Slim/bootstrap.pm	2010-03-29 23:48:07.000000000 +0100
-@@ -193,22 +193,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";
- 		}
--		else {
--			print qq{
--*******
--
--NOTE:
--
--Please use the buildme.sh script located here:
--http://svn.slimdevices.com/repos/slim/7.4/trunk/vendor/CPAN/
--
--If 7.4 is outdated by the time you read this, Replace "7.4" with the major version
--of Squeezebox Server you are running.
--
--*******
--
--			\n};
--		}
- 		
- 		print "Exiting..\n";
- 
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-squeezeslave.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-squeezeslave.patch
deleted file mode 100644
index 4601778d2eb7..000000000000
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-squeezeslave.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Slim/Web/HTTP.pm.old	2010-04-08 22:01:10.000000000 +0100
-+++ Slim/Web/HTTP.pm	2010-04-08 22:26:25.000000000 +0100
-@@ -2199,9 +2199,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.4.2-uuid-gentoo.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-uuid-gentoo.patch
deleted file mode 100644
index c5333a47694f..000000000000
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.4.2-uuid-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- slimserver.pl.old	2010-03-29 23:37:17.000000000 +0100
-+++ slimserver.pl	2010-03-29 23:37:17.000000000 +0100
-@@ -391,8 +391,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-7.5.0-build-perl-modules-gentoo.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.2-build-perl-modules-gentoo.patch
index 32821acf5cc8..1b1009c7feb5 100644
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-build-perl-modules-gentoo.patch
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.2-build-perl-modules-gentoo.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- Slim/bootstrap.pm.old	2010-07-06 08:30:49.267542493 +0100
++++ Slim/bootstrap.pm	2010-07-06 08:30:49.255502095 +0100
+@@ -192,27 +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";
  		}
@@ -10,9 +10,14 @@
 -
 -NOTE:
 -
--Please use the buildme.sh script located here:
+-If you're running some unsupported Linux/Unix platform, please use the buildme.sh 
+-script located here:
+-
 -http://svn.slimdevices.com/repos/slim/7.5/trunk/vendor/CPAN/
 -
+-You should never need to do this if you're on Windows or Mac OSX. If the installers
+-don't work for you, ask for help and/or report a bug.
+-
 -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.2-squeezeslave.patch
index bf8d19a1101e..25003c2702bd 100644
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-squeezeslave.patch
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.2-squeezeslave.patch
@@ -1,5 +1,5 @@
---- 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
+--- Slim/Web/HTTP.pm.old	2010-07-06 08:30:49.243499965 +0100
++++ Slim/Web/HTTP.pm	2010-07-06 08:30:49.243499965 +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.
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-uuid-gentoo.patch b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.2-uuid-gentoo.patch
index 51572f451855..070807bf4612 100644
--- a/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.0-uuid-gentoo.patch
+++ b/media-sound/squeezeboxserver/files/squeezeboxserver-7.5.2-uuid-gentoo.patch
@@ -1,5 +1,5 @@
---- slimserver.pl.old	2010-04-12 12:56:18.000000000 +0100
-+++ slimserver.pl	2010-04-12 12:58:28.000000000 +0100
+--- slimserver.pl.old	2010-07-06 08:30:49.267542493 +0100
++++ slimserver.pl	2010-07-06 08:30:49.267542493 +0100
 @@ -397,8 +397,9 @@
  	
  	# Generate a UUID for this SC instance on first-run
diff --git a/media-sound/squeezeboxserver/files/squeezeboxserver.init.d b/media-sound/squeezeboxserver/files/squeezeboxserver.init.d
index 9188aa837857..a4f1f2e60429 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
+# Copyright 1999-2011 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.3 2010/04/25 22:26:28 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/files/squeezeboxserver.init.d,v 1.4 2011/01/05 19:53:27 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.
@@ -44,6 +44,6 @@ start() {
 
 stop() {
 	ebegin "Stopping Squeezebox Server"
-	start-stop-daemon -o --stop --pidfile ${pidfile}
+	start-stop-daemon --oknodo --retry 10 --stop --pidfile ${pidfile}
 	eend $? "Failed to stop Squeezebox Server"
 }
diff --git a/media-sound/squeezeboxserver/metadata.xml b/media-sound/squeezeboxserver/metadata.xml
index d7496306b46d..bf94fb43911a 100644
--- a/media-sound/squeezeboxserver/metadata.xml
+++ b/media-sound/squeezeboxserver/metadata.xml
@@ -19,6 +19,5 @@
   </longdescription>
   <use>
     <flag name='aac'>Enable playback support for AAC (.m4a) encoded files</flag>
-    <flag name='alac'>Enable support for alac</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.4.2-r2.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.4.2-r2.ebuild
deleted file mode 100644
index a18a5d1f1df1..000000000000
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.4.2-r2.ebuild
+++ /dev/null
@@ -1,490 +0,0 @@
-# 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.2-r2.ebuild,v 1.2 2010/07/23 23:03:05 lavajoe Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MAJOR_VER="${PV:0:3}"
-MINOR_VER="${PV:4:1}"
-BUILD_NUM="30215"
-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"
-
-DESCRIPTION="Logitech SqueezeboxServer music server"
-HOMEPAGE="http://www.mysqueezebox.com/download"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lame wavpack alac ogg flac aac"
-
-# Note: EV present because of bug#287857.
-SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
-	mirror://gentoo/SqueezeboxServer-EV-3.8.tar.gz"
-
-# Note: common-sense currently required due to bundled EV (Gentoo bug#287257)
-DEPEND="
-	!media-sound/squeezecenter
-	virtual/logger
-	virtual/mysql
-	>=dev-perl/common-sense-2.01
-	"
-# Note: dev-perl/GD necessary because of SC bug#6143
-# (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="
-	dev-perl/File-Which
-	virtual/logger
-	virtual/mysql
-	>=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
-	>=dev-perl/DBD-mysql-4.00.5
-	>=dev-perl/DBI-1.607
-	>=dev-perl/Digest-SHA1-2.11
-	>=dev-perl/Encode-Detect-1.01
-	>=dev-perl/HTML-Parser-3.56
-	>=dev-perl/JSON-XS-2.2.3.1
-	>=dev-perl/Template-Toolkit-2.19
-	>=virtual/perl-Time-HiRes-1.97.15
-	>=dev-perl/XML-Parser-2.36
-	>=dev-perl/Cache-Cache-1.04
-	>=dev-perl/Class-Data-Inheritable-0.08
-	>=dev-perl/Class-Inspector-1.23
-	>=dev-perl/File-Next-1.02
-	>=virtual/perl-File-Temp-0.20
-	>=dev-perl/File-Which-0.05
-	>=perl-core/i18n-langtags-0.35
-	>=dev-perl/IO-String-1.08
-	>=dev-perl/Log-Log4perl-1.13
-	>=dev-perl/libwww-perl-5.805
-	>=perl-core/CGI-3.29
-	>=dev-perl/TimeDate-1.16
-	>=dev-perl/Math-VecStat-0.08
-	>=dev-perl/Net-DNS-0.63
-	>=dev-perl/Net-IP-1.25
-	>=dev-perl/Path-Class-0.16
-	>=dev-perl/SQL-Abstract-1.56
-	>=dev-perl/SQL-Abstract-Limit-0.12
-	>=dev-perl/URI-1.35
-	>=dev-perl/XML-Simple-2.18
-	>=perl-core/version-0.76
-	>=dev-perl/Carp-Clan-5.9
-	>=dev-perl/Readonly-1.03
-	>=dev-perl/Carp-Assert-0.20
-	>=dev-perl/Class-Virtual-0.06
-	>=dev-perl/File-Slurp-9999.13
-	>=dev-perl/Exporter-Lite-0.02
-	>=dev-perl/Tie-IxHash-1.21
-	>=virtual/perl-Module-Pluggable-3.6
-	>=dev-perl/Archive-Zip-1.23
-	>=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
-	>=dev-perl/Class-C3-XS-0.13
-	>=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 )
-	flac? (
-		media-libs/flac
-		media-sound/sox[flac]
-		)
-	ogg? ( media-sound/sox[ogg] )
-	aac? ( media-libs/faad2 )
-	"
-
-S="${WORKDIR}/${MY_P_BUILD_NUM}"
-
-ETCDIR="/etc/squeezeboxserver"
-PREFS="${ETCDIR}/squeezeboxserver.prefs"
-PREFSDIR="${ETCDIR}/prefs"
-DOCDIR="/usr/share/doc/squeezeboxserver-${PV}"
-SHAREDIR="/usr/share/squeezeboxserver"
-LIBDIR="/usr/$(get_libdir)/squeezeboxserver"
-OLDDBUSER="squeezecenter"
-DBUSER="squeezeboxserver"
-VARLIBSBS="/var/lib/squeezeboxserver"
-PLUGINSDIR="${VARLIBSBS}/Plugins"
-
-# To support Migration
-OLDETCDIR="/etc/squeezecenter"
-OLDPREFSDIR="/var/lib/squeezecenter/prefs"
-OLDPREFSFILE="${OLDPREFSDIR}/server.prefs"
-OLDPLUGINSDIR="/var/lib/squeezecenter/Plugins"
-MIGMARKER=".migrated"
-
-pkg_setup() {
-	# Create the user and group if not already present
-	enewgroup squeezeboxserver
-	enewuser squeezeboxserver -1 -1 "/dev/null" squeezeboxserver
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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
-}
-
-# Building of EV present because of bug#287857.
-src_compile() {
-	einfo "Building bundled Perl modules (some warnings are normal here)..."
-	"./build-modules.sh" "${DISTDIR}" || die "Unable to build Perl modules"
-}
-
-src_install() {
-
-	# The main Perl executables
-	exeinto /usr/sbin
-	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
-	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}"
-	cp -r Firmware "${D}/${SHAREDIR}"	|| die "Unable to install firmware"
-	cp -r Graphics "${D}/${SHAREDIR}"	|| die "Unable to install Graphics"
-	cp -r HTML "${D}/${SHAREDIR}"		|| die "Unable to install HTML"
-	cp -r IR "${D}/${SHAREDIR}"			|| die "Unable to install IR"
-	cp -r SQL "${D}/${SHAREDIR}"		|| die "Unable to install SQL"
-
-	# Architecture-dependent static files
-	dodir "${LIBDIR}"
-	cp -r lib/* "${D}${LIBDIR}" || die "Unable to install architecture-dependent files"
-
-	# 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}"
-	doins strings.txt
-	doins revision.txt
-
-	# Documentation
-	dodoc Changelog*.html
-	dodoc Installation.txt
-	dodoc License*.txt
-	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
-	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
-
-	# 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 the SQL configuration scripts
-	insinto "${SHAREDIR}/SQL/mysql"
-	doins "${FILESDIR}/dbdrop-gentoo.sql"
-	doins "${FILESDIR}/dbcreate-gentoo.sql"
-
-	# Initialize run directory (where the PID file lives)
-	dodir /var/run/squeezeboxserver
-	fowners squeezeboxserver:squeezeboxserver /var/run/squeezeboxserver
-	fperms 770 /var/run/squeezeboxserver
-
-	# Initialize server cache directory
-	dodir /var/lib/squeezeboxserver/cache
-	fowners squeezeboxserver:squeezeboxserver /var/lib/squeezeboxserver/cache
-	fperms 770 /var/lib/squeezeboxserver/cache
-
-	# Initialize the log directory
-	dodir /var/log/squeezeboxserver
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver
-	fperms 770 /var/log/squeezeboxserver
-	touch "${D}/var/log/squeezeboxserver/server.log"
-	touch "${D}/var/log/squeezeboxserver/scanner.log"
-	touch "${D}/var/log/squeezeboxserver/perfmon.log"
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver/server.log
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver/scanner.log
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver/perfmon.log
-
-	# Initialise the user-installed plugins directory
-	dodir "${PLUGINSDIR}"
-	fowners squeezeboxserver:squeezeboxserver "${PLUGINSDIR}"
-	fperms 770 "${PLUGINSDIR}"
-
-	# Install logrotate support
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/squeezeboxserver.logrotate.d" squeezeboxserver
-}
-
-sc_starting_instr() {
-	elog "Squeezebox Server can be started with the following command:"
-	elog "\t/etc/init.d/squeezeboxserver start"
-	elog ""
-	elog "Squeezebox Server can be automatically started on each boot with the"
-	elog "following command:"
-	elog "\trc-update add squeezeboxserver default"
-	elog ""
-	elog "You might want to examine and modify the following configuration"
-	elog "file before starting Squeezebox Server:"
-	elog "\t/etc/conf.d/squeezeboxserver"
-	elog ""
-
-	# Discover the port number from the preferences, but if it isn't there
-	# then report the standard one.
-	httpport=$(gawk '$1 == "httpport:" { print $2 }' "${ROOT}${LIVE_PREFS}" 2>/dev/null)
-	elog "You may access and configure Squeezebox Server by browsing to:"
-	elog "\thttp://localhost:${httpport:-9000}/"
-}
-
-pkg_postinst() {
-	# FLAC and LAME are quite useful (but not essential) for Squeezebox Server -
-	# if they're not enabled then make sure the user understands that.
-	if ! use flac; then
-		ewarn "'flac' USE flag is not set.  Although not essential, FLAC is required"
-		ewarn "for playing lossless WAV and FLAC (for Squeezebox 1), and for"
-		ewarn "playing other less common file types (if you have a Squeezebox 2 or newer)."
-		ewarn "For maximum flexibility you are recommended to set the 'flac' USE flag".
-		ewarn ""
-	fi
-	if ! use lame; then
-		ewarn "'lame' USE flag is not set.  Although not essential, LAME is"
-		ewarn "required if you want to limit the bandwidth your Squeezebox or"
-		ewarn "Transporter uses when streaming audio."
-		ewarn "For maximum flexibility you are recommended to set the 'lame' USE flag".
-		ewarn ""
-	fi
-
-	# 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 ! 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"
-		ewarn "to the file /etc/portage/package.use:"
-		ewarn "\tdev-perl/GD jpeg png"
-		ewarn "\tmedia-libs/gd jpeg png"
-		ewarn "And then rebuild those packages with:"
-		ewarn "\temerge --newuse dev-perl/GD media-libs/gd"
-		ewarn ""
-	fi
-
-	# Point user to database configuration step
-	elog "If this is a new installation of Squeezebox Server then the database"
-	elog "must be configured prior to use.  This can be done by running the"
-	elog "following command:"
-	elog "\temerge --config =${CATEGORY}/${PF}"
-	elog "This command will also migrate old SqueezeCenter preferences and"
-	elog "plugins (if present)."
-
-	elog ""
-
-	ewarn "Note: If squeezeboxserver 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
-}
-
-sc_remove_db_prefs() {
-	MY_PREFS=$1
-
-	einfo "Configuring Squeezebox Server database preferences (${MY_PREFS}) ..."
-	TMPPREFS="${T}"/squeezeboxserver-prefs-$$
-	touch "${ROOT}${MY_PREFS}"
-	sed -e '/^dbusername:/d' -e '/^dbpassword:/d' -e '/^dbsource:/d' < "${ROOT}${MY_PREFS}" > "${TMPPREFS}"
-	mv "${TMPPREFS}" "${ROOT}${MY_PREFS}"
-	chown squeezeboxserver:squeezeboxserver "${ROOT}${MY_PREFS}"
-	chmod 660 "${ROOT}${MY_PREFS}"
-}
-
-sc_update_prefs() {
-	MY_PREFS=$1
-	MY_DBUSER=$2
-	MY_DBUSER_PASSWD=$3
-
-	echo "dbusername: ${MY_DBUSER}" >> "${ROOT}${MY_PREFS}"
-	echo "dbpassword: ${MY_DBUSER_PASSWD}" >> "${ROOT}${MY_PREFS}"
-	echo "dbsource: dbi:mysql:database=${MY_DBUSER};mysql_socket=/var/run/mysqld/mysqld.sock" >> "${ROOT}${MY_PREFS}"
-}
-
-pkg_config() {
-	einfo "Press ENTER to create the Squeezebox Server database and set proper"
-	einfo "permissions on it.  You will be prompted for the MySQL 'root' user's"
-	einfo "password during this process (note that the MySQL 'root' user is"
-	einfo "independent of the Linux 'root' user and so may have a different"
-	einfo "password)."
-	einfo ""
-	einfo "If you already have a Squeezebox Server database set up then this"
-	einfo "process will clear the existing database (your music files will not,"
-	einfo "however, be affected)."
-	einfo ""
-	einfo "Alternatively, press Control-C to abort now..."
-	read
-
-	# Get the MySQL root password from the user (not echoed to the terminal)
-	einfo "The MySQL 'root' user password is required to create the"
-	einfo "Squeezebox Server user and database."
-	DONE=0
-	while [ $DONE -eq 0 ]; do
-		trap "stty echo; echo" EXIT
-		stty -echo
-		read -p "MySQL root password: " ROOT_PASSWD; echo
-		stty echo
-		trap ":" EXIT
-		echo quit | mysql --user=root --password="${ROOT_PASSWD}" >/dev/null 2>&1 && DONE=1
-		if [ $DONE -eq 0 ]; then
-			eerror "Incorrect MySQL root password, or MySQL is not running"
-		fi
-	done
-
-	# Get the new password for the Squeezebox Server MySQL database user, and
-	# have it re-entered to confirm it.  We should trivially check it's not
-	# the same as the MySQL root password.
-	einfo "A new MySQL user will be added to own the Squeezebox Server database."
-	einfo "Please enter the password for this new user (${DBUSER})."
-	DONE=0
-	while [ $DONE -eq 0 ]; do
-		trap "stty echo; echo" EXIT
-		stty -echo
-		read -p "MySQL ${DBUSER} password: " DBUSER_PASSWD; echo
-		stty echo
-		trap ":" EXIT
-		if [ -z "$DBUSER_PASSWD" ]; then
-			eerror "The password should not be blank; try again."
-		elif [ "$DBUSER_PASSWD" == "$ROOT_PASSWD" ]; then
-			eerror "The ${DBUSER} password should be different to the root password"
-		else
-			DONE=1
-		fi
-	done
-
-	# Drop the existing database and user - note we don't care about errors
-	# from this as it probably just indicates that the database wasn't
-	# yet present.
-	einfo "Dropping old Squeezebox Server database and user ..."
-	sed -e "s/__DATABASE__/${DBUSER}/" -e "s/__DBUSER__/${DBUSER}/" < "${SHAREDIR}/SQL/mysql/dbdrop-gentoo.sql" | mysql --user=root --password="${ROOT_PASSWD}" >/dev/null 2>&1
-
-	# Drop and create the Squeezebox Server user and database.
-	einfo "Creating Squeezebox Server MySQL user and database (${DBUSER}) ..."
-	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 "${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${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
-	fi
-
-	# Migrate old plugins, if present.
-	if [ -d "${OLDPLUGINSDIR}" ]; then
-		if [ -f "${PLUGINSDIR}/${MIGMARKER}" ]; then
-			einfo ""
-			einfo "Old plugins 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${PLUGINSDIR}/${MIGMARKER}"
-		else
-			einfo "Migrating old SqueezeCenter plugins"
-			cp -r "${OLDPLUGINSDIR}" "${VARLIBSBS}"
-			chown -R squeezeboxserver:squeezeboxserver "${PLUGINSDIR}"
-			touch "${PLUGINSDIR}/${MIGMARKER}"
-		fi
-	fi
-
-	# Remove the existing MySQL preferences from Squeezebox Server (if any).
-	sc_remove_db_prefs "${PREFS}"
-
-	# Insert the external MySQL configuration into the preferences.
-	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-
-	# Phew - all done. Give some tips on what to do now.
-	einfo "Database configuration complete."
-	einfo ""
-	sc_starting_instr
-}
-
-pkg_preinst() {
-	# Warn the user if there are old preferences that may need migrating.
-	if [ -d "${OLDPREFSDIR}" -a ! -f "${PREFSDIR}/${MIGMARKER}" ]; then
-		if [ ! -z "$(ls ${OLDPREFSDIR})" ]; then
-			ewarn "Note: It appears that old SqueezeCenter preferences are
-installed at:"
-			ewarn "\t${OLDPREFSDIR}"
-			ewarn "These may be migrated by running the following command:"
-			ewarn "\temerge --config =${CATEGORY}/${PF}"
-			ewarn "(Please note that this will require your music collection to
-be rescanned.)"
-			ewarn ""
-		fi
-	fi
-}
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild
deleted file mode 100644
index 0523c2f4eb3f..000000000000
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.5.0-r1.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# 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.5.0-r1.ebuild,v 1.2 2010/07/23 23:03:05 lavajoe Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MAJOR_VER="${PV:0:3}"
-MINOR_VER="${PV:4:1}"
-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"
-
-DESCRIPTION="Logitech SqueezeboxServer music server"
-HOMEPAGE="http://www.mysqueezebox.com/download"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lame wavpack alac ogg flac aac"
-
-# Note: EV present because of bug#287857.
-SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
-	mirror://gentoo/SqueezeboxServer-EV-3.8.tar.gz"
-
-# Note: common-sense currently required due to bundled EV (Gentoo bug#287257)
-DEPEND="
-	!media-sound/squeezecenter
-	virtual/logger
-	virtual/mysql
-	>=dev-perl/common-sense-2.01
-	"
-# Note: dev-perl/GD necessary because of SC bug#6143
-# (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="
-	dev-perl/File-Which
-	virtual/logger
-	virtual/mysql
-	>=dev-lang/perl-5.8.8
-	~dev-perl/Audio-Scan-0.62
-	>=dev-perl/GD-2.41
-	>=virtual/perl-IO-Compress-2.015
-	>=dev-perl/YAML-Syck-1.05
-	>=dev-perl/DBD-mysql-4.00.5
-	>=dev-perl/DBI-1.607
-	>=dev-perl/Digest-SHA1-2.11
-	>=dev-perl/Encode-Detect-1.01
-	>=dev-perl/HTML-Parser-3.56
-	>=dev-perl/JSON-XS-2.2.3.1
-	>=dev-perl/Template-Toolkit-2.19
-	>=virtual/perl-Time-HiRes-1.97.15
-	>=dev-perl/XML-Parser-2.36
-	>=dev-perl/Cache-Cache-1.04
-	>=dev-perl/Class-Data-Inheritable-0.08
-	>=dev-perl/Class-Inspector-1.23
-	>=dev-perl/File-Next-1.02
-	>=virtual/perl-File-Temp-0.20
-	>=dev-perl/File-Which-0.05
-	>=perl-core/i18n-langtags-0.35
-	>=dev-perl/IO-String-1.08
-	>=dev-perl/Log-Log4perl-1.13
-	>=dev-perl/libwww-perl-5.805
-	>=perl-core/CGI-3.29
-	>=dev-perl/TimeDate-1.16
-	>=dev-perl/Math-VecStat-0.08
-	>=dev-perl/Net-DNS-0.63
-	>=dev-perl/Net-IP-1.25
-	>=dev-perl/Path-Class-0.16
-	>=dev-perl/SQL-Abstract-1.56
-	>=dev-perl/SQL-Abstract-Limit-0.12
-	>=dev-perl/URI-1.35
-	>=dev-perl/XML-Simple-2.18
-	>=perl-core/version-0.76
-	>=dev-perl/Carp-Clan-5.9
-	>=dev-perl/Readonly-1.03
-	>=dev-perl/Carp-Assert-0.20
-	>=dev-perl/Class-Virtual-0.06
-	>=dev-perl/File-Slurp-9999.13
-	>=dev-perl/Exporter-Lite-0.02
-	>=dev-perl/Tie-IxHash-1.21
-	>=virtual/perl-Module-Pluggable-3.6
-	>=dev-perl/Archive-Zip-1.23
-	>=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
-	>=dev-perl/Class-C3-XS-0.13
-	>=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 )
-	flac? (
-		media-libs/flac
-		media-sound/sox[flac]
-		)
-	ogg? ( media-sound/sox[ogg] )
-	aac? ( media-libs/faad2 )
-	"
-
-S="${WORKDIR}/${MY_P_BUILD_NUM}"
-
-ETCDIR="/etc/squeezeboxserver"
-PREFS="${ETCDIR}/squeezeboxserver.prefs"
-PREFSDIR="${ETCDIR}/prefs"
-DOCDIR="/usr/share/doc/squeezeboxserver-${PV}"
-SHAREDIR="/usr/share/squeezeboxserver"
-LIBDIR="/usr/$(get_libdir)/squeezeboxserver"
-OLDDBUSER="squeezecenter"
-DBUSER="squeezeboxserver"
-VARLIBSBS="/var/lib/squeezeboxserver"
-PLUGINSDIR="${VARLIBSBS}/Plugins"
-
-# To support Migration
-OLDETCDIR="/etc/squeezecenter"
-OLDPREFSDIR="/var/lib/squeezecenter/prefs"
-OLDPREFSFILE="${OLDPREFSDIR}/server.prefs"
-OLDPLUGINSDIR="/var/lib/squeezecenter/Plugins"
-MIGMARKER=".migrated"
-
-pkg_setup() {
-	# Create the user and group if not already present
-	enewgroup squeezeboxserver
-	enewuser squeezeboxserver -1 -1 "/dev/null" squeezeboxserver
-}
-
-src_prepare() {
-	# 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
-}
-
-# Building of EV present because of bug#287857.
-src_compile() {
-	einfo "Building bundled Perl modules (some warnings are normal here)..."
-	"./build-modules.sh" "${DISTDIR}" || die "Unable to build Perl modules"
-}
-
-src_install() {
-
-	# The main Perl executables
-	exeinto /usr/sbin
-	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
-	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}"
-	cp -r Firmware "${D}/${SHAREDIR}"	|| die "Unable to install firmware"
-	cp -r Graphics "${D}/${SHAREDIR}"	|| die "Unable to install Graphics"
-	cp -r HTML "${D}/${SHAREDIR}"		|| die "Unable to install HTML"
-	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"
-
-	# 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}"
-	doins strings.txt
-	doins revision.txt
-
-	# Documentation
-	dodoc Changelog*.html
-	dodoc Installation.txt
-	dodoc License*.txt
-	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
-	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
-
-	# 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 the SQL configuration scripts
-	insinto "${SHAREDIR}/SQL/mysql"
-	doins "${FILESDIR}/dbdrop-gentoo.sql"
-	doins "${FILESDIR}/dbcreate-gentoo.sql"
-
-	# Initialize run directory (where the PID file lives)
-	dodir /var/run/squeezeboxserver
-	fowners squeezeboxserver:squeezeboxserver /var/run/squeezeboxserver
-	fperms 770 /var/run/squeezeboxserver
-
-	# Initialize server cache directory
-	dodir /var/lib/squeezeboxserver/cache
-	fowners squeezeboxserver:squeezeboxserver /var/lib/squeezeboxserver/cache
-	fperms 770 /var/lib/squeezeboxserver/cache
-
-	# Initialize the log directory
-	dodir /var/log/squeezeboxserver
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver
-	fperms 770 /var/log/squeezeboxserver
-	touch "${D}/var/log/squeezeboxserver/server.log"
-	touch "${D}/var/log/squeezeboxserver/scanner.log"
-	touch "${D}/var/log/squeezeboxserver/perfmon.log"
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver/server.log
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver/scanner.log
-	fowners squeezeboxserver:squeezeboxserver /var/log/squeezeboxserver/perfmon.log
-
-	# Initialise the user-installed plugins directory
-	dodir "${PLUGINSDIR}"
-	fowners squeezeboxserver:squeezeboxserver "${PLUGINSDIR}"
-	fperms 770 "${PLUGINSDIR}"
-
-	# Install logrotate support
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/squeezeboxserver.logrotate.d" squeezeboxserver
-}
-
-sc_starting_instr() {
-	elog "Squeezebox Server can be started with the following command:"
-	elog "\t/etc/init.d/squeezeboxserver start"
-	elog ""
-	elog "Squeezebox Server can be automatically started on each boot with the"
-	elog "following command:"
-	elog "\trc-update add squeezeboxserver default"
-	elog ""
-	elog "You might want to examine and modify the following configuration"
-	elog "file before starting Squeezebox Server:"
-	elog "\t/etc/conf.d/squeezeboxserver"
-	elog ""
-
-	# Discover the port number from the preferences, but if it isn't there
-	# then report the standard one.
-	httpport=$(gawk '$1 == "httpport:" { print $2 }' "${ROOT}${LIVE_PREFS}" 2>/dev/null)
-	elog "You may access and configure Squeezebox Server by browsing to:"
-	elog "\thttp://localhost:${httpport:-9000}/"
-}
-
-pkg_postinst() {
-	# FLAC and LAME are quite useful (but not essential) for Squeezebox Server -
-	# if they're not enabled then make sure the user understands that.
-	if ! use flac; then
-		ewarn "'flac' USE flag is not set.  Although not essential, FLAC is required"
-		ewarn "for playing lossless WAV and FLAC (for Squeezebox 1), and for"
-		ewarn "playing other less common file types (if you have a Squeezebox 2 or newer)."
-		ewarn "For maximum flexibility you are recommended to set the 'flac' USE flag".
-		ewarn ""
-	fi
-	if ! use lame; then
-		ewarn "'lame' USE flag is not set.  Although not essential, LAME is"
-		ewarn "required if you want to limit the bandwidth your Squeezebox or"
-		ewarn "Transporter uses when streaming audio."
-		ewarn "For maximum flexibility you are recommended to set the 'lame' USE flag".
-		ewarn ""
-	fi
-
-	# 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 ! 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"
-		ewarn "to the file /etc/portage/package.use:"
-		ewarn "\tdev-perl/GD jpeg png"
-		ewarn "\tmedia-libs/gd jpeg png"
-		ewarn "And then rebuild those packages with:"
-		ewarn "\temerge --newuse dev-perl/GD media-libs/gd"
-		ewarn ""
-	fi
-
-	# Point user to database configuration step
-	elog "If this is a new installation of Squeezebox Server then the database"
-	elog "must be configured prior to use.  This can be done by running the"
-	elog "following command:"
-	elog "\temerge --config =${CATEGORY}/${PF}"
-	elog "This command will also migrate old SqueezeCenter preferences and"
-	elog "plugins (if present)."
-
-	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
-}
-
-sc_remove_db_prefs() {
-	MY_PREFS=$1
-
-	einfo "Configuring Squeezebox Server database preferences (${MY_PREFS}) ..."
-	TMPPREFS="${T}"/squeezeboxserver-prefs-$$
-	touch "${ROOT}${MY_PREFS}"
-	sed -e '/^dbusername:/d' -e '/^dbpassword:/d' -e '/^dbsource:/d' < "${ROOT}${MY_PREFS}" > "${TMPPREFS}"
-	mv "${TMPPREFS}" "${ROOT}${MY_PREFS}"
-	chown squeezeboxserver:squeezeboxserver "${ROOT}${MY_PREFS}"
-	chmod 660 "${ROOT}${MY_PREFS}"
-}
-
-sc_update_prefs() {
-	MY_PREFS=$1
-	MY_DBUSER=$2
-	MY_DBUSER_PASSWD=$3
-
-	echo "dbusername: ${MY_DBUSER}" >> "${ROOT}${MY_PREFS}"
-	echo "dbpassword: ${MY_DBUSER_PASSWD}" >> "${ROOT}${MY_PREFS}"
-	echo "dbsource: dbi:mysql:database=${MY_DBUSER};mysql_socket=/var/run/mysqld/mysqld.sock" >> "${ROOT}${MY_PREFS}"
-}
-
-pkg_config() {
-	einfo "Press ENTER to create the Squeezebox Server database and set proper"
-	einfo "permissions on it.  You will be prompted for the MySQL 'root' user's"
-	einfo "password during this process (note that the MySQL 'root' user is"
-	einfo "independent of the Linux 'root' user and so may have a different"
-	einfo "password)."
-	einfo ""
-	einfo "If you already have a Squeezebox Server database set up then this"
-	einfo "process will clear the existing database (your music files will not,"
-	einfo "however, be affected)."
-	einfo ""
-	einfo "Alternatively, press Control-C to abort now..."
-	read
-
-	# Get the MySQL root password from the user (not echoed to the terminal)
-	einfo "The MySQL 'root' user password is required to create the"
-	einfo "Squeezebox Server user and database."
-	DONE=0
-	while [ $DONE -eq 0 ]; do
-		trap "stty echo; echo" EXIT
-		stty -echo
-		read -p "MySQL root password: " ROOT_PASSWD; echo
-		stty echo
-		trap ":" EXIT
-		echo quit | mysql --user=root --password="${ROOT_PASSWD}" >/dev/null 2>&1 && DONE=1
-		if [ $DONE -eq 0 ]; then
-			eerror "Incorrect MySQL root password, or MySQL is not running"
-		fi
-	done
-
-	# Get the new password for the Squeezebox Server MySQL database user, and
-	# have it re-entered to confirm it.  We should trivially check it's not
-	# the same as the MySQL root password.
-	einfo "A new MySQL user will be added to own the Squeezebox Server database."
-	einfo "Please enter the password for this new user (${DBUSER})."
-	DONE=0
-	while [ $DONE -eq 0 ]; do
-		trap "stty echo; echo" EXIT
-		stty -echo
-		read -p "MySQL ${DBUSER} password: " DBUSER_PASSWD; echo
-		stty echo
-		trap ":" EXIT
-		if [ -z "$DBUSER_PASSWD" ]; then
-			eerror "The password should not be blank; try again."
-		elif [ "$DBUSER_PASSWD" == "$ROOT_PASSWD" ]; then
-			eerror "The ${DBUSER} password should be different to the root password"
-		else
-			DONE=1
-		fi
-	done
-
-	# Drop the existing database and user - note we don't care about errors
-	# from this as it probably just indicates that the database wasn't
-	# yet present.
-	einfo "Dropping old Squeezebox Server database and user ..."
-	sed -e "s/__DATABASE__/${DBUSER}/" -e "s/__DBUSER__/${DBUSER}/" < "${SHAREDIR}/SQL/mysql/dbdrop-gentoo.sql" | mysql --user=root --password="${ROOT_PASSWD}" >/dev/null 2>&1
-
-	# Drop and create the Squeezebox Server user and database.
-	einfo "Creating Squeezebox Server MySQL user and database (${DBUSER}) ..."
-	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 "${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${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
-	fi
-
-	# Migrate old plugins, if present.
-	if [ -d "${OLDPLUGINSDIR}" ]; then
-		if [ -f "${PLUGINSDIR}/${MIGMARKER}" ]; then
-			einfo ""
-			einfo "Old plugins 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${PLUGINSDIR}/${MIGMARKER}"
-		else
-			einfo "Migrating old SqueezeCenter plugins"
-			cp -r "${OLDPLUGINSDIR}" "${VARLIBSBS}"
-			chown -R squeezeboxserver:squeezeboxserver "${PLUGINSDIR}"
-			touch "${PLUGINSDIR}/${MIGMARKER}"
-		fi
-	fi
-
-	# Remove the existing MySQL preferences from Squeezebox Server (if any).
-	sc_remove_db_prefs "${PREFS}"
-
-	# Insert the external MySQL configuration into the preferences.
-	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-
-	# Phew - all done. Give some tips on what to do now.
-	einfo "Database configuration complete."
-	einfo ""
-	sc_starting_instr
-}
-
-pkg_preinst() {
-	# Warn the user if there are old preferences that may need migrating.
-	if [ -d "${OLDPREFSDIR}" -a ! -f "${PREFSDIR}/${MIGMARKER}" ]; then
-		if [ ! -z "$(ls ${OLDPREFSDIR})" ]; then
-			ewarn "Note: It appears that old SqueezeCenter preferences are
-installed at:"
-			ewarn "\t${OLDPREFSDIR}"
-			ewarn "These may be migrated by running the following command:"
-			ewarn "\temerge --config =${CATEGORY}/${PF}"
-			ewarn "(Please note that this will require your music collection to
-be rescanned.)"
-			ewarn ""
-		fi
-	fi
-}
diff --git a/media-sound/squeezeboxserver/squeezeboxserver-7.5.1.ebuild b/media-sound/squeezeboxserver/squeezeboxserver-7.5.2.ebuild
index 086b2eac50a6..2443ecd542cc 100644
--- a/media-sound/squeezeboxserver/squeezeboxserver-7.5.1.ebuild
+++ b/media-sound/squeezeboxserver/squeezeboxserver-7.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.1.ebuild,v 1.3 2010/07/24 16:29:15 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeboxserver/squeezeboxserver-7.5.2.ebuild,v 1.1 2011/01/05 19:53:27 lavajoe Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit eutils
 
 MAJOR_VER="${PV:0:3}"
 MINOR_VER="${PV:4:1}"
-BUILD_NUM="30836"
+BUILD_NUM="31632"
 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"
@@ -110,6 +110,7 @@ RDEPEND="
 	>=dev-perl/Tie-LLHash-1.003
 	>=dev-perl/Tie-RegexpHash-0.15
 	>=dev-perl/Data-UUID-1.202
+	>=perl-core/Class-ISA-0.36
 	lame? ( media-sound/lame )
 	wavpack? ( media-sound/wavpack )
 	flac? (
@@ -125,6 +126,7 @@ S="${WORKDIR}/${MY_P_BUILD_NUM}"
 ETCDIR="/etc/squeezeboxserver"
 PREFS="${ETCDIR}/squeezeboxserver.prefs"
 PREFSDIR="${ETCDIR}/prefs"
+PREFS2="${PREFSDIR}/server.prefs"
 DOCDIR="/usr/share/doc/squeezeboxserver-${PV}"
 SHAREDIR="/usr/share/squeezeboxserver"
 LIBDIR="/usr/$(get_libdir)/squeezeboxserver"
@@ -154,14 +156,14 @@ src_prepare() {
 
 	# Copy in the module builder - can't run it from the files directory in case
 	# Portage is mounted 'noexec'.
-	cp "${FILESDIR}/build-modules-${PV}.sh" "${S}/build-modules.sh"	|| die
+	cp "${FILESDIR}/build-modules-${PVR}.sh" "${S}/build-modules.sh"	|| die
 	chmod 555 "${S}/build-modules.sh"			|| die
 }
 
 # Building of EV present because of bug#287857.
 src_compile() {
 	einfo "Building bundled Perl modules (some warnings are normal here)..."
-	"./build-modules.sh" "${DISTDIR}" || die "Unable to build Perl modules"
+	"./build-modules.sh" "${DISTDIR}" "${S}/perl-modules" || die "Unable to build Perl modules"
 }
 
 src_install() {
@@ -198,8 +200,7 @@ src_install() {
 
 	# 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"
+	mv perl-modules/*/*/*/* "${D}${LIBDIR}/CPAN/arch" || die "Unable to install compiled CPAN modules"
 
 	# Strings and version identification
 	insinto "${SHAREDIR}"
@@ -462,9 +463,11 @@ pkg_config() {
 
 	# Remove the existing MySQL preferences from Squeezebox Server (if any).
 	sc_remove_db_prefs "${PREFS}"
+	sc_remove_db_prefs "${PREFS2}"
 
 	# Insert the external MySQL configuration into the preferences.
 	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
+	sc_update_prefs "${PREFS2}" "${DBUSER}" "${DBUSER_PASSWD}"
 
 	# Phew - all done. Give some tips on what to do now.
 	einfo "Database configuration complete."