Fix JSON-XS version issue (bug #263416)

Package-Manager: portage-2.1.6.10/cvs/Linux i686

4 files changed, 513 insertions, 2 deletions

diff --git a/media-sound/squeezecenter/ChangeLog b/media-sound/squeezecenter/ChangeLog
index 60467421015d..70dc70c03f1a 100644
--- a/media-sound/squeezecenter/ChangeLog
+++ b/media-sound/squeezecenter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/squeezecenter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.38 2009/03/18 11:53:26 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.39 2009/03/25 17:10:40 lavajoe Exp $
+
+*squeezecenter-7.3.2-r2 (25 Mar 2009)
+
+  25 Mar 2009; Joe Peterson <lavajoe@gentoo.org>
+  +files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch,
+  +squeezecenter-7.3.2-r2.ebuild:
+  Fix JSON-XS version issue (bug #263416)
 
 *squeezecenter-7.3.2-r1 (18 Mar 2009)
 
diff --git a/media-sound/squeezecenter/Manifest b/media-sound/squeezecenter/Manifest
index 8bae1a05e82c..e876751902c0 100644
--- a/media-sound/squeezecenter/Manifest
+++ b/media-sound/squeezecenter/Manifest
@@ -14,6 +14,7 @@ AUX squeezecenter-7.3.1-json-xs-gentoo.patch 506 RMD160 c489bd77c7ea2bb2db7c67e6
 AUX squeezecenter-7.3.2-aac-transcode-gentoo.patch 1302 RMD160 454e42c08eff939e61820692ba607a5e5400d7e6 SHA1 ef599099cda7a53f46fb4f8c38e3bd851a1b16d3 SHA256 76228bc3d95184e8f8eeb069bad72a17d924daecfef5880d9384a88628d42ac8
 AUX squeezecenter-7.3.2-build-perl-modules-gentoo.patch 2749 RMD160 6e38831b81ac200c40f7f7f8a5efaaab69e27d61 SHA1 f4c2e18591cee050f543b2aef51647d045b254af SHA256 d3c2ab3609e28676d34755ef673161b831abbc755b5f6e4b72403f1ca2ac4d01
 AUX squeezecenter-7.3.2-json-xs-gentoo.patch 506 RMD160 c489bd77c7ea2bb2db7c67e6f3a0686346bda36b SHA1 a305b87c3550bbf69456b7a7a57887d600529259 SHA256 db6db5e28afdbf36c938d3bd406997340b4ad7c718f26289fbfab0dee564116a
+AUX squeezecenter-7.3.2-r2-json-xs-gentoo.patch 1074 RMD160 919c87a58a698b3358bb5d7c2a3496063432fe33 SHA1 0edb069cf3da241d876946cd8f117c6231b332c1 SHA256 e4f5cba5a0ccac40072bf9c9acd9e093d010ee458bcda884a1e39639d9c0a757
 AUX squeezecenter.conf.d 1087 RMD160 e979e2bfe070024f46f7f0005de6e7ae11623bdb SHA1 ad69cfdf0f0ace7d44d479e7a7e1ad79a9f86be6 SHA256 7509d6cbc013ddb9c5cbdfe1fe2b81ae3a7f6eb1dc6e119b1ee37553a8f8a69f
 AUX squeezecenter.init.d 1338 RMD160 8d97de1146151cad44844146f390ac44edf4bc03 SHA1 c4dd848fbf2a0fba44bec7bcb8f92f4eaf278faf SHA256 32845b5669164930088c61ba422e2d4b5a128bbdc8d27aebe70f689ea06de1c2
 AUX squeezecenter.logrotate.d 407 RMD160 5a6045321cf1f180ee2ce671d5395cd08379accd SHA1 e1f4c03e9bae354ba44c7fdc59721696c643eb64 SHA256 a98dcb6a95d8711632d6913b7dab221decf35f70858618529b7ae8c103b20a01
@@ -45,5 +46,6 @@ EBUILD squeezecenter-7.2.1.ebuild 13953 RMD160 50f4112c1a6b0ff031f423ca7bc6129ba
 EBUILD squeezecenter-7.3.0.ebuild 14586 RMD160 a71e0f2aa15e1736fcc87419cab871796af02f55 SHA1 b70fef2ea3b64855a2f70dd62f7496ff1f639ea3 SHA256 ace2578c9388e017d3bc20bac735853dfceb15cf6462ae5ac43ad8768966b573
 EBUILD squeezecenter-7.3.1.ebuild 15750 RMD160 ef46c6f85adc61275c5090ada150fa969e922718 SHA1 c1e0fb5462960dfdd33d62203f502fdc12e76be9 SHA256 168c2fd9cb208e02cd1c59e412c3ec515b526bb5cc05224291a238dda11c6d88
 EBUILD squeezecenter-7.3.2-r1.ebuild 16038 RMD160 d5d8e2c1d329c63c3c82a9de25aada1dc3628395 SHA1 58c6981bba422c80db87fef4251c51c16164b3a2 SHA256 590ccfad8143137ec3746b5945630135e9f860c6503cd48bc1ff1861020f1794
-MISC ChangeLog 8240 RMD160 63eabf3a5eebaed402d84dd9fd33c94efaeb95f7 SHA1 cb907b434b2bcfdc715533c9cf81e8d91445c5dd SHA256 9fdfa7005c9b9b468c5f6b38cb90d4b9d4af7a48cda50883e3844d7a05a4bc24
+EBUILD squeezecenter-7.3.2-r2.ebuild 16039 RMD160 70b256f4b70877ee035aeac305d6071d47307efc SHA1 3bfd90e0c6e25ceddfc5848bf8e8415a5a845b23 SHA256 c6a7fac9eebb6f3c1d0b56b22399f1fddf5f9dd7624f80ed316ec6fc4ef1c96a
+MISC ChangeLog 8459 RMD160 d4036a8853ff8ca51938765f1ad6ef203d0e2aae SHA1 08a9ad199a75980e644de259e888f767395f353c SHA256 20789ba53759471deceed0597789c35ce568f376efc7d16a78fcebe85243579b
 MISC metadata.xml 1111 RMD160 09bbcc60edfa73e0b04a509c43a9e3a38396c9a5 SHA1 091e7172538d6f37f885752a2ab72d1cbf40334a SHA256 3f92fd179e06f52bd8af1caf6d160bacadb9b5ad90e3d34c98255379e075e1fe
diff --git a/media-sound/squeezecenter/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch b/media-sound/squeezecenter/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch
new file mode 100644
index 000000000000..1b9ae030201c
--- /dev/null
+++ b/media-sound/squeezecenter/files/squeezecenter-7.3.2-r2-json-xs-gentoo.patch
@@ -0,0 +1,33 @@
+--- Slim/Formats/XML.pm.old	2009-03-23 20:59:53.000000000 +0000
++++ Slim/Formats/XML.pm	2009-03-23 21:00:02.000000000 +0000
+@@ -13,7 +13,7 @@
+ use strict;
+ use File::Slurp;
+ use HTML::Entities;
+-use JSON::XS qw(from_json);
++use JSON::XS::VersionOneAndTwo;
+ use Scalar::Util qw(weaken);
+ use URI::Escape qw(uri_escape);
+ use XML::Simple;
+--- Slim/Plugin/LastFM/ProtocolHandler.pm.old	2009-03-23 20:54:42.000000000 +0000
++++ Slim/Plugin/LastFM/ProtocolHandler.pm	2009-03-23 20:55:15.000000000 +0000
+@@ -7,7 +7,7 @@
+ use strict;
+ use base qw(Slim::Player::Protocols::HTTP);
+ 
+-use JSON::XS qw(from_json);
++use JSON::XS::VersionOneAndTwo;
+ use URI::Escape qw(uri_escape_utf8);
+ 
+ use Slim::Player::Playlist;
+--- Slim/Plugin/Sirius/ProtocolHandler.pm.old	2009-03-23 20:55:21.000000000 +0000
++++ Slim/Plugin/Sirius/ProtocolHandler.pm	2009-03-23 20:55:34.000000000 +0000
+@@ -19,7 +19,7 @@
+ use Slim::Utils::Timers;
+ 
+ use HTTP::Request;
+-use JSON::XS qw(from_json);
++use JSON::XS::VersionOneAndTwo;
+ use URI::Escape qw(uri_escape);
+ 
+ my $log = Slim::Utils::Log->addLogCategory( {
diff --git a/media-sound/squeezecenter/squeezecenter-7.3.2-r2.ebuild b/media-sound/squeezecenter/squeezecenter-7.3.2-r2.ebuild
new file mode 100644
index 000000000000..664c0766222c
--- /dev/null
+++ b/media-sound/squeezecenter/squeezecenter-7.3.2-r2.ebuild
@@ -0,0 +1,469 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.3.2-r2.ebuild,v 1.1 2009/03/25 17:10:40 lavajoe Exp $
+
+inherit eutils
+
+MAJOR_VER="${PV:0:3}"
+MINOR_VER="${PV:4:1}"
+SRC_DIR="SqueezeCenter_v${MAJOR_VER}.${MINOR_VER}"
+MY_P="squeezecenter-${MAJOR_VER}.${MINOR_VER}-noCPAN"
+
+DESCRIPTION="Logitech SqueezeCenter music server"
+HOMEPAGE="http://www.slimdevices.com/pi_features.html"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="lame wavpack musepack alac ogg bonjour flac avahi aac"
+
+SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
+	mirror://gentoo/SqueezeCenter-AutoXS-Header-0.03.tar.gz
+	mirror://gentoo/SqueezeCenter-Class-XSAccessor-Array-0.05.tar.gz
+	mirror://gentoo/SqueezeCenter-POE-XS-Queue-Array-0.002.tar.gz"
+
+# Note: virtual/perl-Module-Build necessary because of SC bug#5882
+# (http://bugs.slimdevices.com/show_bug.cgi?id=5882).
+DEPEND="
+	dev-perl/File-Which
+	virtual/perl-Module-Build
+	virtual/logger
+	virtual/mysql
+	avahi? ( net-dns/avahi )
+	"
+# 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
+	avahi? ( net-dns/avahi )
+	>=dev-lang/perl-5.8.8
+	>=dev-perl/GD-2.35
+	>=virtual/perl-Compress-Zlib-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.22
+	>=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
+	lame? ( media-sound/lame )
+	alac? ( media-sound/alac_decoder )
+	wavpack? ( media-sound/wavpack )
+	bonjour? ( net-misc/mDNSResponder )
+	flac? (
+		media-libs/flac
+		media-sound/sox
+		)
+	musepack? ( media-sound/musepack-tools )
+	ogg? ( media-sound/sox )
+	aac? ( media-libs/faad2 )
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+# 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
+	POE/XS/Queue/Array.pm
+
+	JSON/XS/VersionOneAndTwo.pm
+	Class/Accessor/
+	Class/Accessor.pm
+	Class/C3.pm
+	Class/Data/Accessor.pm
+	Algorithm/C3.pm
+	Data/
+	DBIx/
+	File/BOM.pm
+	Net/UPnP/
+	Net/UPnP.pm
+	POE/Queue/Array.pm
+	Proc/Background/
+	Proc/Background.pm
+	Text/Unidecode/
+	Text/Unidecode.pm
+	Tie/Cache/LRU/
+	Tie/Cache/LRU.pm
+	Tie/LLHash.pm
+	Tie/RegexpHash.pm
+	URI/Find.pm
+	PAR/
+	PAR.pm
+	enum.pm
+	"
+
+PREFS="/var/lib/squeezecenter/prefs/squeezecenter.prefs"
+LIVE_PREFS="/var/lib/squeezecenter/prefs/server.prefs"
+DOCDIR="/usr/share/doc/squeezecenter-${PV}"
+SHAREDIR="/usr/share/squeezecenter"
+LIBDIR="/usr/lib/squeezecenter"
+DBUSER="squeezecenter"
+OLDPLUGINSDIR=/opt/squeezecenter/Plugins
+NEWPLUGINSDIR=/var/lib/squeezecenter/Plugins
+
+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 "SqueezeCenter 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 "SqueezeCenter needs media-sound/sox to be built with USE=flac"
+		fi
+	fi
+
+	# Create the user and group if not already present
+	enewgroup squeezecenter
+	enewuser squeezecenter -1 -1 "/dev/null" squeezecenter
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply patches
+	epatch "${FILESDIR}/mDNSResponder-gentoo.patch"
+	epatch "${FILESDIR}/${P}-build-perl-modules-gentoo.patch"
+	epatch "${FILESDIR}/${P}-aac-transcode-gentoo.patch"
+	epatch "${FILESDIR}/${PF}-json-xs-gentoo.patch"
+}
+
+src_compile() {
+	einfo "Building required Perl modules (some warnings are normal here) ..."
+	echo -e "\n${S}\n${WORKDIR}" | Bin/build-perl-modules.pl || die "Unable to build Perl modules"
+}
+
+src_install() {
+
+	# The main Perl executables
+	exeinto /usr/sbin
+	newexe slimserver.pl squeezecenter-server
+	newexe scanner.pl squeezecenter-scanner
+	newexe cleanup.pl squeezecenter-cleanup
+
+	# Get the Perl package name and version
+	eval `perl '-V:package'`
+	eval `perl '-V:version'`
+
+	# 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/squeezecenter/CPAN"
+	cp -r CPAN/arch "${D}/usr/lib/squeezecenter/CPAN" || die "Unable to install compiled CPAN modules"
+
+	# Preseve some of the SqueezeCenter-packaged CPAN modules that Gentoo
+	# doesn't provide ebuilds for.
+	for ITEM in ${CPANKEEP}; do
+		dodir "/usr/lib/squeezecenter/CPAN/$(dirname ${ITEM})"
+		cp -r "CPAN/${ITEM}" "${D}/usr/lib/squeezecenter/CPAN/${ITEM}" || die "Unable to preserve CPAN item ${ITEM}"
+	done
+
+	# 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"
+
+	# Strings and version identification
+	insinto "${SHAREDIR}"
+	doins strings.txt
+	doins revision.txt
+
+	# Documentation
+	dodoc Changelog*.html
+	dodoc Installation.txt
+	dodoc License*.txt
+	newdoc "${FILESDIR}/Gentoo-plugins-README.txt" Gentoo-plugins-README.txt
+
+	# Configuration files
+	insinto /etc/squeezecenter
+	doins convert.conf
+	doins types.conf
+	doins modules.conf
+
+	# Install init scripts
+	newconfd "${FILESDIR}/squeezecenter.conf.d" squeezecenter
+	newinitd "${FILESDIR}/squeezecenter.init.d" squeezecenter
+
+	# Install default preferences
+	insinto /var/lib/squeezecenter/prefs
+	newins "${FILESDIR}/squeezecenter.prefs" squeezecenter.prefs
+	fowners squeezecenter:squeezecenter /var/lib/squeezecenter/prefs
+	fperms 770 /var/lib/squeezecenter/prefs
+
+	# 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/squeezecenter
+	fowners squeezecenter:squeezecenter /var/run/squeezecenter
+	fperms 770 /var/run/squeezecenter
+
+	# Initialize server cache directory
+	dodir /var/lib/squeezecenter/cache
+	fowners squeezecenter:squeezecenter /var/lib/squeezecenter/cache
+	fperms 770 /var/lib/squeezecenter/cache
+
+	# Initialize the log directory
+	dodir /var/log/squeezecenter
+	fowners squeezecenter:squeezecenter /var/log/squeezecenter
+	fperms 770 /var/log/squeezecenter
+	touch "${D}/var/log/squeezecenter/server.log"
+	touch "${D}/var/log/squeezecenter/scanner.log"
+	touch "${D}/var/log/squeezecenter/perfmon.log"
+	fowners squeezecenter:squeezecenter /var/log/squeezecenter/server.log
+	fowners squeezecenter:squeezecenter /var/log/squeezecenter/scanner.log
+	fowners squeezecenter:squeezecenter /var/log/squeezecenter/perfmon.log
+
+	# Initialise the user-installed plugins directory
+	dodir "${NEWPLUGINSDIR}"
+
+	# Install logrotate support
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/squeezecenter.logrotate.d" squeezecenter
+
+	# Install Avahi support (if USE flag is set)
+	if use avahi; then
+		insinto /etc/avahi/services
+		newins "${FILESDIR}/avahi-squeezecenter.service" squeezecenter.service
+	fi
+}
+
+sc_starting_instr() {
+	elog "SqueezeCenter can be started with the following command:"
+	elog "\t/etc/init.d/squeezecenter start"
+	elog ""
+	elog "SqueezeCenter can be automatically started on each boot with the"
+	elog "following command:"
+	elog "\trc-update add squeezecenter default"
+	elog ""
+	elog "You might want to examine and modify the following configuration"
+	elog "file before starting SqueezeCenter:"
+	elog "\t/etc/conf.d/squeezecenter"
+	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 SqueezeCenter by browsing to:"
+	elog "\thttp://localhost:${httpport:-9000}/"
+}
+
+pkg_postinst() {
+	# FLAC and LAME are quite useful (but not essential) for SqueezeCenter -
+	# 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, 3,"
+		ewarn "Receiver or Transporter)."
+		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 ! 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
+		ewarn "For correct operation of album art through SqueezeCenter'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 SqueezeCenter 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}"
+
+	# 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 SqueezeCenter's web interface on a port other than 9000:"
+		elog "\t/etc/avahi/services/squeezecenter.service"
+	fi
+
+	elog ""
+	sc_starting_instr
+}
+
+sc_remove_db_prefs() {
+	MY_PREFS=$1
+
+	einfo "Configuring SqueezeCenter database preferences (${MY_PREFS}) ..."
+	TMPPREFS="${T}"/squeezecenter-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 squeezecenter:squeezecenter "${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 SqueezeCenter 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 SqueezeCenter 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 "SqueezeCenter 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 SqueezeCenter 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 SqueezeCenter 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 SqueezeCenter 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 SqueezeCenter user and database.
+	einfo "Creating SqueezeCenter 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"
+
+	# Remove the existing MySQL preferences from SqueezeCenter (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."
+	einfo ""
+	sc_starting_instr
+}
+
+pkg_preinst() {
+	# Warn the user if there are old plugins that he may need to migrate
+	if [ -d "${OLDPLUGINSDIR}" ]; then
+		if [ ! -z "$(ls ${OLDPLUGINSDIR})" ]; then
+			ewarn "Note: It appears that plugins are installed in the old location of:"
+			ewarn "${OLDPLUGINSDIR}"
+			ewarn "If these are to be used then they must be migrated to the new location:"
+			ewarn "${NEWPLUGINSDIR}"
+			ewarn ""
+		fi
+	fi
+}