Add nightly for 2008-02-17; remove old January versions

Package-Manager: portage-2.1.3.19

6 files changed, 7 insertions, 1241 deletions

diff --git a/media-sound/squeezecenter/Manifest b/media-sound/squeezecenter/Manifest
index e3da1482ca4f..19c539789e7d 100644
--- a/media-sound/squeezecenter/Manifest
+++ b/media-sound/squeezecenter/Manifest
@@ -6,19 +6,11 @@ AUX squeezecenter-7.0.conf.d 903 RMD160 e3ef773ec921e47ddb749c56ea0c87b32d4399d7
 AUX squeezecenter-7.0.init.d 1268 RMD160 fe16cd3f1fea57a690df4cc2e303607645dc7980 SHA1 3e09c6bff96029cdd91617541163f3627ff510bf SHA256 145048bcd4bf9238bcbea723515e06e3e2aeda11ea21a3157578cf6fbd3f165b
 AUX squeezecenter-7.0.logrotate.d 411 RMD160 6ebb2d8ffca4934f94819096c818c264b1333c2d SHA1 4d13464d59a0f56ab741ccbd135fcebb56f934ea SHA256 8462d5721f29c551bd68886e8a637d22b5e5b1d07b5c51b5390e10c13169a4a2
 AUX squeezecenter-7.0.prefs 126 RMD160 b715267b10e2bc63eaa7da5aa9dd3177dc0e46ee SHA1 3354ce16a5dd453d71c475a8487b43fec34084c2 SHA256 19c74a3838f78c6a076220e749c236564d085c4ef095fa0f77bbb1be74532b2d
-DIST SqueezeCenter_trunk_v2008-01-02.no-cpan-arch.tar.gz 17338037 RMD160 78636e78ec1deeef14918f4f4d7d7e66a284181c SHA1 fff6613594afd3bdad6b8d4c63cc493f89e4ab19 SHA256 b52443fc4903e75b30302d869f8a12f6d43e7115d4ecfce82cb86cd50b216f5c
-DIST squeezecenter-7.0-16019-noCPAN.tgz 17885006 RMD160 8dd035dddf35bf87138dd1cb36ac25c152cacbdd SHA1 6ed8c03e766f991a5448f0b25a75b7dba67e06c0 SHA256 00197e0ff046d4416fcf3f594e569e860ef68c6a08ee404c780dd04c68f66f8f
-DIST squeezecenter-7.0-16284-noCPAN.tgz 17972471 RMD160 92f389f54fed54be3a11bdfb29d2224168a1477d SHA1 4775475f6d1cdf8719a6314e6f2caa8ef1634083 SHA256 cc79537311845e23910baf21d13c16cf7f3d35992de678f7c8e4bb652cbb23ed
-DIST squeezecenter-7.0-16473-noCPAN.tgz 18160732 RMD160 2e6ed6fce4bc3a93c5d49b2986f3abe8877ba987 SHA1 7f1d111279391a476977caaef5bfdd6f17275b0a SHA256 0d4591c41a633dbbb3ba5fb006fe0fd37079f7e0de72d42bb971dd2a8601e64c
-DIST squeezecenter-7.0-16779-noCPAN.tgz 18167740 RMD160 9d3b061d44a0570d0b559d98c0bcec8444bdcb83 SHA1 c5f49a3d4341d6e5d2c1cb3c3f85c11d5123186a SHA256 ad7e3769089c6c2763f8fe745f363a101ec5953211efcc1bf8dd69167d89c95c
 DIST squeezecenter-7.0-17126-noCPAN.tgz 18427888 RMD160 e1359825b540e3dddbac6a15d882e35541bec68c SHA1 3b80831a940879e60de28ccebc24bf12e048c1e7 SHA256 45954c769564018b4937c113880db3818ec2465717a5bbe22002ffd42846ae6d
 DIST squeezecenter-7.0-17379-noCPAN.tgz 18460808 RMD160 6099c7da31137eb53126bb98c462b8a108fb0066 SHA1 85f7b4551c07b5dac369bad766af878a125980c0 SHA256 8b54b125703f517075df2d31297b23c26c603b17eec8f17b44d723d40aa33812
-EBUILD squeezecenter-7.0_beta20080102.ebuild 11208 RMD160 1873bf01813dd997cf9ab5f3d268b02f8821b110 SHA1 ba7c73d03dbcd9d5c12f61bad3fb7a3674d61659 SHA256 9e6350db001e8c7523819095ee9ddb93ab41da63e44df09ca96a5e627eaf613a
-EBUILD squeezecenter-7.0_beta20080108.ebuild 11345 RMD160 b2f8211140ec810795d1eefcd4dfc86c11804941 SHA1 1cb75e2cb1c6b15a3b245740164ba64e6a2e706c SHA256 03ea35e978070670c97de86cc39237e6859b3fd54d1fe8bafe038e5a2aa07055
-EBUILD squeezecenter-7.0_beta20080115.ebuild 11345 RMD160 d52be118a6872f4699f10ae61ea78ab5f0f455be SHA1 cc0065102cb57d83ddfc67389a955eef877de2e2 SHA256 ea6fef507ecb0615d1e0dcffb842cfd92270eaa1872e4065df108460d5e8da0e
-EBUILD squeezecenter-7.0_beta20080119.ebuild 11345 RMD160 2b1b0371478210a85d0fddb88a38e8da45dbac98 SHA1 36702a99934e06e599708aa51c9898889feb858e SHA256 63a081ba22b681958ff39571a81dcd4e55d1c6d3e704696665265900e9516e9d
-EBUILD squeezecenter-7.0_beta20080126.ebuild 11460 RMD160 0b1b6dbd2b960015376932b092d294829068856b SHA1 6ee292cf10c8771ece1168536fde150cbbe6d879 SHA256 ab477bcb488208566c5aef910b3034c76a74aa2361254e9d834effb6331fa952
+DIST squeezecenter-7.0-17600-noCPAN.tgz 18462171 RMD160 d1c9eb9cd340f6f8f02ecb65c198d2301cf70d95 SHA1 b4fc8f6e634f231b4adc709d424f5437a18fea09 SHA256 0826ac1a6ad09adcac03f5921045124fc55a732fa8afc83420afc86f3189890e
 EBUILD squeezecenter-7.0_beta20080203.ebuild 11461 RMD160 c36937b0745aa6a1a9de710c41a11789d69b867d SHA1 70095eed48e0efe032d1ae89e0be999f69bcf101 SHA256 3e14aa3211aaabb3bface62453ba22d6a0e72d6c73209823f2ee889f9d890442
 EBUILD squeezecenter-7.0_beta20080210.ebuild 11461 RMD160 b61585021619704f9e20f7dd341313babcdc0938 SHA1 fd4c0159d08ce655df9ddabfe08352c80d99a012 SHA256 c745fba7cf04379ceaf55effa3c954b0960dbb24cc585a9fb12b5d012b7ac85b
+EBUILD squeezecenter-7.0_beta20080217.ebuild 11471 RMD160 c70b178d0e65d442057ef9bdc48c0742b6bd9ba8 SHA1 526eb15697137052dcfcb62d66a605a610573e01 SHA256 752f76568d31ee02dd19173a13c221e2a94ea0412e4e359f673221b97860e26e
 MISC ChangeLog 2114 RMD160 cdbf157d8b461d68d284fb990d579c8ab2886025 SHA1 b49a69d9785e3fa2b4e66d277ef88e62f45bded9 SHA256 33f7a0a0a998a7aae5a7fdc7f80db5d8d8fc444f718bc7b58a85fcb6250de4b1
 MISC metadata.xml 790 RMD160 c75ebb0eda5fdc93127d453d975acebc50bec589 SHA1 e9cd926018accadcd17691d24ae22ca2620e0c30 SHA256 d886ca6099eb5d1a95fa1f5cb833b91eac229c5c1df478f73e52f6d3b1a5e135
diff --git a/media-sound/squeezecenter/squeezecenter-7.0_beta20080102.ebuild b/media-sound/squeezecenter/squeezecenter-7.0_beta20080102.ebuild
deleted file mode 100644
index 752a0d4fe3a7..000000000000
--- a/media-sound/squeezecenter/squeezecenter-7.0_beta20080102.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0_beta20080102.ebuild,v 1.1 2008/01/07 19:26:59 lavajoe Exp $
-
-inherit eutils
-
-MY_PV="${PV:8:4}-${PV:12:2}-${PV:14:2}"
-MY_P="SqueezeCenter_trunk_v${MY_PV}"
-
-DESCRIPTION="Logitech SqueezeCenter music server"
-HOMEPAGE="http://www.slimdevices.com/pi_features.html"
-SRC_URI="http://www.slimdevices.com/downloads/nightly/SqueezeCenter_v${MY_PV}/${MY_P}.no-cpan-arch.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="lame wavpack musepack alac ogg bonjour flac avahi"
-
-# Note: dev-perl/module-build necessary because of SC bug#5882
-# (http://bugs.slimdevices.com/show_bug.cgi?id=5882).
-DEPEND="
-	dev-perl/File-Which
-	dev-perl/module-build
-	virtual/logger
-	virtual/mysql
-	avahi? ( net-dns/avahi )
-	ogg? ( media-sound/sox )
-	"
-# Note: dev-perl/GD necessary because of SC bug#6143
-# (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.8
-	>=dev-perl/GD-2.35
-	>=app-admin/sudo-1.6.8
-	alac? ( media-sound/alac_decoder )
-	lame? ( media-sound/lame )
-	wavpack? ( media-sound/wavpack )
-	bonjour? ( net-misc/mDNSResponder )
-	flac? ( media-libs/flac )
-	musepack? ( media-sound/musepack-tools )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTROOT="/opt"
-PREFS="/etc/squeezecenter.prefs"
-CACHED_PREFS="/var/cache/squeezecenter/prefs/server.prefs"
-DBUSER="squeezecenter"
-
-pkg_setup() {
-	# Sox has optional OGG support, so make sure it has been built that way
-	if use ogg; then
-		if ! built_with_use media-sound/sox ogg; then
-			eerror "media-sound/sox not built with USE=ogg"
-			die "media-sound/sox not built with USE=ogg"
-		fi
-	fi
-
-	# Create the user and group if not already present
-	enewgroup squeezecenter || die
-	enewuser squeezecenter -1 -1 "${INSTROOT}/squeezecenter" squeezecenter || die
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply patches
-	epatch "${FILESDIR}/mDNSResponder-7.0-gentoo.patch"
-
-	# Remove bundled binaries that are supplied by other ebuilds
-	einfo "Removing binaries provided by other ebuilds ..."
-	rm "${S}"/Bin/*/mDNSResponderPosix || die	# net-misc/mDNSResponder
-	rm "${S}"/Bin/*/alac || die					# media-sound/alac_decoder
-	rm "${S}"/Bin/*/flac || die					# media-libs/flac
-	rm "${S}"/Bin/*/sox || die					# media-sound/sox
-	rm "${S}"/Bin/*/wvunpack || die				# media-sound/wavpack
-	rm "${S}"/Bin/*/mppdec || die				# media-sound/musepack-tools
-
-	# Remove bundled MySQL as we depend on an external instance
-	einfo "Removing bundled MySQL ..."
-	rm -r "${S}"/MySQL || die
-	rm "${S}"/Bin/*/mysqld || die				# virtual/mysql
-}
-
-src_compile() {
-	einfo "Building required Perl modules (some warnings are normal here) ..."
-	mkdir "${T}/sc_compile"
-	echo -e "\n${S}\n${T}/sc_compile" | Bin/build-perl-modules.pl || die "Unable to build Perl modules"
-}
-
-src_install() {
-	# Copy all files.
-	dodir "${INSTROOT}/squeezecenter"
-	cp -r * "${D}/${INSTROOT}/squeezecenter"
-
-	# Install init scripts.
-	newconfd "${FILESDIR}/squeezecenter-7.0.conf.d" squeezecenter
-	newinitd "${FILESDIR}/squeezecenter-7.0.init.d" squeezecenter
-
-	# Install default preferences.
-	insinto /etc
-	newins "${FILESDIR}/squeezecenter-7.0.prefs" squeezecenter.prefs
-
-	# Install the SQL configuration scripts.
-	insinto "${INSTROOT}/squeezecenter/SQL/mysql"
-	doins "${FILESDIR}/dbdrop-7.0-gentoo.sql"
-	doins "${FILESDIR}/dbcreate-7.0-gentoo.sql"
-
-	# Initialize /var/{cache,run}.
-	keepdir /var/{cache,run}/squeezecenter
-	fowners squeezecenter:squeezecenter /var/{cache,run}/squeezecenter
-	fperms 770 /var/{cache,run}/squeezecenter
-
-	# Initialize /var/log.
-	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
-
-	# Install logrotate support.
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/squeezecenter-7.0.logrotate.d" squeezecenter
-
-	# Install Avahi support (if USE flag is set).
-	if use avahi; then
-		insinto /etc/avahi/services
-		newins "${FILESDIR}/avahi-7.0-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}${CACHED_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 "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 ""
-	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
-		mysql --user=root --password="${ROOT_PASSWD}" </dev/null >/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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbdrop-7.0-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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbcreate-7.0-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 "${CACHED_PREFS}" ] && sc_remove_db_prefs ${CACHED_PREFS}
-
-	# Insert the external MySQL configuration into the preferences.
-	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-	[ -f "${CACHED_PREFS}" ] && sc_update_prefs "${CACHED_PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-
-	# Phew - all done.
-	# Give some tips on what to do now.
-	einfo "Database configuration complete."
-	einfo ""
-	sc_starting_instr
-}
diff --git a/media-sound/squeezecenter/squeezecenter-7.0_beta20080108.ebuild b/media-sound/squeezecenter/squeezecenter-7.0_beta20080108.ebuild
deleted file mode 100644
index 962526b3e85d..000000000000
--- a/media-sound/squeezecenter/squeezecenter-7.0_beta20080108.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0_beta20080108.ebuild,v 1.1 2008/01/09 03:12:25 lavajoe Exp $
-
-inherit eutils
-
-SVN_VER="16019"
-MAJOR_VER="${PV:0:3}"
-MY_SRC_DIR="SqueezeCenter_v${PV:8:4}-${PV:12:2}-${PV:14:2}"
-MY_P="squeezecenter-${MAJOR_VER}-${SVN_VER}-noCPAN"
-
-DESCRIPTION="Logitech SqueezeCenter music server"
-HOMEPAGE="http://www.slimdevices.com/pi_features.html"
-SRC_URI="http://www.slimdevices.com/downloads/nightly/${MY_SRC_DIR}/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="lame wavpack musepack alac ogg bonjour flac avahi"
-
-# Note: dev-perl/module-build necessary because of SC bug#5882
-# (http://bugs.slimdevices.com/show_bug.cgi?id=5882).
-DEPEND="
-	dev-perl/File-Which
-	dev-perl/module-build
-	virtual/logger
-	virtual/mysql
-	avahi? ( net-dns/avahi )
-	ogg? ( media-sound/sox )
-	"
-# Note: dev-perl/GD necessary because of SC bug#6143
-# (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.8
-	>=dev-perl/GD-2.35
-	>=app-admin/sudo-1.6.8
-	alac? ( media-sound/alac_decoder )
-	lame? ( media-sound/lame )
-	wavpack? ( media-sound/wavpack )
-	bonjour? ( net-misc/mDNSResponder )
-	flac? ( media-libs/flac )
-	musepack? ( media-sound/musepack-tools )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTROOT="/opt"
-PREFS="/etc/squeezecenter.prefs"
-CACHED_PREFS="/var/cache/squeezecenter/prefs/server.prefs"
-DBUSER="squeezecenter"
-
-pkg_setup() {
-	# Sox has optional OGG support, so make sure it has been built that way
-	if use ogg; then
-		if ! built_with_use media-sound/sox ogg; then
-			eerror "media-sound/sox not built with USE=ogg"
-			die "media-sound/sox not built with USE=ogg"
-		fi
-	fi
-
-	# Create the user and group if not already present
-	enewgroup squeezecenter || die
-	enewuser squeezecenter -1 -1 "${INSTROOT}/squeezecenter" squeezecenter || die
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply patches
-	epatch "${FILESDIR}/mDNSResponder-${MAJOR_VER}-gentoo.patch"
-
-	# Remove bundled binaries that are supplied by other ebuilds
-	einfo "Removing binaries provided by other ebuilds ..."
-	rm "${S}"/Bin/*/mDNSResponderPosix || die	# net-misc/mDNSResponder
-	rm "${S}"/Bin/*/alac || die					# media-sound/alac_decoder
-	rm "${S}"/Bin/*/flac || die					# media-libs/flac
-	rm "${S}"/Bin/*/sox || die					# media-sound/sox
-	rm "${S}"/Bin/*/wvunpack || die				# media-sound/wavpack
-	rm "${S}"/Bin/*/mppdec || die				# media-sound/musepack-tools
-
-	# Remove bundled MySQL as we depend on an external instance
-	einfo "Removing bundled MySQL ..."
-	rm -r "${S}"/MySQL || die
-	rm "${S}"/Bin/*/mysqld || die				# virtual/mysql
-}
-
-src_compile() {
-	einfo "Building required Perl modules (some warnings are normal here) ..."
-	mkdir "${T}/sc_compile"
-	echo -e "\n${S}\n${T}/sc_compile" | Bin/build-perl-modules.pl || die "Unable to build Perl modules"
-}
-
-src_install() {
-	# Copy all files.
-	dodir "${INSTROOT}/squeezecenter"
-	cp -r * "${D}/${INSTROOT}/squeezecenter"
-
-	# Install init scripts.
-	newconfd "${FILESDIR}/squeezecenter-${MAJOR_VER}.conf.d" squeezecenter
-	newinitd "${FILESDIR}/squeezecenter-${MAJOR_VER}.init.d" squeezecenter
-
-	# Install default preferences.
-	insinto /etc
-	newins "${FILESDIR}/squeezecenter-${MAJOR_VER}.prefs" squeezecenter.prefs
-
-	# Install the SQL configuration scripts.
-	insinto "${INSTROOT}/squeezecenter/SQL/mysql"
-	doins "${FILESDIR}/dbdrop-${MAJOR_VER}-gentoo.sql"
-	doins "${FILESDIR}/dbcreate-${MAJOR_VER}-gentoo.sql"
-
-	# Initialize /var/{cache,run}.
-	keepdir /var/{cache,run}/squeezecenter
-	fowners squeezecenter:squeezecenter /var/{cache,run}/squeezecenter
-	fperms 770 /var/{cache,run}/squeezecenter
-
-	# Initialize /var/log.
-	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
-
-	# Install logrotate support.
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/squeezecenter-${MAJOR_VER}.logrotate.d" squeezecenter
-
-	# Install Avahi support (if USE flag is set).
-	if use avahi; then
-		insinto /etc/avahi/services
-		newins "${FILESDIR}/avahi-${MAJOR_VER}-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}${CACHED_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 "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 ""
-	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
-		mysql --user=root --password="${ROOT_PASSWD}" </dev/null >/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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbdrop-${MAJOR_VER}-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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbcreate-${MAJOR_VER}-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 "${CACHED_PREFS}" ] && sc_remove_db_prefs ${CACHED_PREFS}
-
-	# Insert the external MySQL configuration into the preferences.
-	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-	[ -f "${CACHED_PREFS}" ] && sc_update_prefs "${CACHED_PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-
-	# Phew - all done.
-	# Give some tips on what to do now.
-	einfo "Database configuration complete."
-	einfo ""
-	sc_starting_instr
-}
diff --git a/media-sound/squeezecenter/squeezecenter-7.0_beta20080115.ebuild b/media-sound/squeezecenter/squeezecenter-7.0_beta20080115.ebuild
deleted file mode 100644
index c19f6b5efa42..000000000000
--- a/media-sound/squeezecenter/squeezecenter-7.0_beta20080115.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0_beta20080115.ebuild,v 1.1 2008/01/16 18:04:44 lavajoe Exp $
-
-inherit eutils
-
-SVN_VER="16284"
-MAJOR_VER="${PV:0:3}"
-MY_SRC_DIR="SqueezeCenter_v${PV:8:4}-${PV:12:2}-${PV:14:2}"
-MY_P="squeezecenter-${MAJOR_VER}-${SVN_VER}-noCPAN"
-
-DESCRIPTION="Logitech SqueezeCenter music server"
-HOMEPAGE="http://www.slimdevices.com/pi_features.html"
-SRC_URI="http://www.slimdevices.com/downloads/nightly/${MY_SRC_DIR}/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="lame wavpack musepack alac ogg bonjour flac avahi"
-
-# Note: dev-perl/module-build necessary because of SC bug#5882
-# (http://bugs.slimdevices.com/show_bug.cgi?id=5882).
-DEPEND="
-	dev-perl/File-Which
-	dev-perl/module-build
-	virtual/logger
-	virtual/mysql
-	avahi? ( net-dns/avahi )
-	ogg? ( media-sound/sox )
-	"
-# Note: dev-perl/GD necessary because of SC bug#6143
-# (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.8
-	>=dev-perl/GD-2.35
-	>=app-admin/sudo-1.6.8
-	alac? ( media-sound/alac_decoder )
-	lame? ( media-sound/lame )
-	wavpack? ( media-sound/wavpack )
-	bonjour? ( net-misc/mDNSResponder )
-	flac? ( media-libs/flac )
-	musepack? ( media-sound/musepack-tools )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTROOT="/opt"
-PREFS="/etc/squeezecenter.prefs"
-CACHED_PREFS="/var/cache/squeezecenter/prefs/server.prefs"
-DBUSER="squeezecenter"
-
-pkg_setup() {
-	# Sox has optional OGG support, so make sure it has been built that way
-	if use ogg; then
-		if ! built_with_use media-sound/sox ogg; then
-			eerror "media-sound/sox not built with USE=ogg"
-			die "media-sound/sox not built with USE=ogg"
-		fi
-	fi
-
-	# Create the user and group if not already present
-	enewgroup squeezecenter || die
-	enewuser squeezecenter -1 -1 "${INSTROOT}/squeezecenter" squeezecenter || die
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply patches
-	epatch "${FILESDIR}/mDNSResponder-${MAJOR_VER}-gentoo.patch"
-
-	# Remove bundled binaries that are supplied by other ebuilds
-	einfo "Removing binaries provided by other ebuilds ..."
-	rm "${S}"/Bin/*/mDNSResponderPosix || die	# net-misc/mDNSResponder
-	rm "${S}"/Bin/*/alac || die					# media-sound/alac_decoder
-	rm "${S}"/Bin/*/flac || die					# media-libs/flac
-	rm "${S}"/Bin/*/sox || die					# media-sound/sox
-	rm "${S}"/Bin/*/wvunpack || die				# media-sound/wavpack
-	rm "${S}"/Bin/*/mppdec || die				# media-sound/musepack-tools
-
-	# Remove bundled MySQL as we depend on an external instance
-	einfo "Removing bundled MySQL ..."
-	rm -r "${S}"/MySQL || die
-	rm "${S}"/Bin/*/mysqld || die				# virtual/mysql
-}
-
-src_compile() {
-	einfo "Building required Perl modules (some warnings are normal here) ..."
-	mkdir "${T}/sc_compile"
-	echo -e "\n${S}\n${T}/sc_compile" | Bin/build-perl-modules.pl || die "Unable to build Perl modules"
-}
-
-src_install() {
-	# Copy all files.
-	dodir "${INSTROOT}/squeezecenter"
-	cp -r * "${D}/${INSTROOT}/squeezecenter"
-
-	# Install init scripts.
-	newconfd "${FILESDIR}/squeezecenter-${MAJOR_VER}.conf.d" squeezecenter
-	newinitd "${FILESDIR}/squeezecenter-${MAJOR_VER}.init.d" squeezecenter
-
-	# Install default preferences.
-	insinto /etc
-	newins "${FILESDIR}/squeezecenter-${MAJOR_VER}.prefs" squeezecenter.prefs
-
-	# Install the SQL configuration scripts.
-	insinto "${INSTROOT}/squeezecenter/SQL/mysql"
-	doins "${FILESDIR}/dbdrop-${MAJOR_VER}-gentoo.sql"
-	doins "${FILESDIR}/dbcreate-${MAJOR_VER}-gentoo.sql"
-
-	# Initialize /var/{cache,run}.
-	keepdir /var/{cache,run}/squeezecenter
-	fowners squeezecenter:squeezecenter /var/{cache,run}/squeezecenter
-	fperms 770 /var/{cache,run}/squeezecenter
-
-	# Initialize /var/log.
-	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
-
-	# Install logrotate support.
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/squeezecenter-${MAJOR_VER}.logrotate.d" squeezecenter
-
-	# Install Avahi support (if USE flag is set).
-	if use avahi; then
-		insinto /etc/avahi/services
-		newins "${FILESDIR}/avahi-${MAJOR_VER}-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}${CACHED_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 "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 ""
-	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
-		mysql --user=root --password="${ROOT_PASSWD}" </dev/null >/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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbdrop-${MAJOR_VER}-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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbcreate-${MAJOR_VER}-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 "${CACHED_PREFS}" ] && sc_remove_db_prefs ${CACHED_PREFS}
-
-	# Insert the external MySQL configuration into the preferences.
-	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-	[ -f "${CACHED_PREFS}" ] && sc_update_prefs "${CACHED_PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-
-	# Phew - all done.
-	# Give some tips on what to do now.
-	einfo "Database configuration complete."
-	einfo ""
-	sc_starting_instr
-}
diff --git a/media-sound/squeezecenter/squeezecenter-7.0_beta20080119.ebuild b/media-sound/squeezecenter/squeezecenter-7.0_beta20080119.ebuild
deleted file mode 100644
index c19fe6b4c51f..000000000000
--- a/media-sound/squeezecenter/squeezecenter-7.0_beta20080119.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0_beta20080119.ebuild,v 1.1 2008/01/21 04:49:24 lavajoe Exp $
-
-inherit eutils
-
-SVN_VER="16473"
-MAJOR_VER="${PV:0:3}"
-MY_SRC_DIR="SqueezeCenter_v${PV:8:4}-${PV:12:2}-${PV:14:2}"
-MY_P="squeezecenter-${MAJOR_VER}-${SVN_VER}-noCPAN"
-
-DESCRIPTION="Logitech SqueezeCenter music server"
-HOMEPAGE="http://www.slimdevices.com/pi_features.html"
-SRC_URI="http://www.slimdevices.com/downloads/nightly/${MY_SRC_DIR}/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="lame wavpack musepack alac ogg bonjour flac avahi"
-
-# Note: dev-perl/module-build necessary because of SC bug#5882
-# (http://bugs.slimdevices.com/show_bug.cgi?id=5882).
-DEPEND="
-	dev-perl/File-Which
-	dev-perl/module-build
-	virtual/logger
-	virtual/mysql
-	avahi? ( net-dns/avahi )
-	ogg? ( media-sound/sox )
-	"
-# Note: dev-perl/GD necessary because of SC bug#6143
-# (http://bugs.slimdevices.com/show_bug.cgi?id=6143).
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.8
-	>=dev-perl/GD-2.35
-	>=app-admin/sudo-1.6.8
-	alac? ( media-sound/alac_decoder )
-	lame? ( media-sound/lame )
-	wavpack? ( media-sound/wavpack )
-	bonjour? ( net-misc/mDNSResponder )
-	flac? ( media-libs/flac )
-	musepack? ( media-sound/musepack-tools )
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-INSTROOT="/opt"
-PREFS="/etc/squeezecenter.prefs"
-CACHED_PREFS="/var/cache/squeezecenter/prefs/server.prefs"
-DBUSER="squeezecenter"
-
-pkg_setup() {
-	# Sox has optional OGG support, so make sure it has been built that way
-	if use ogg; then
-		if ! built_with_use media-sound/sox ogg; then
-			eerror "media-sound/sox not built with USE=ogg"
-			die "media-sound/sox not built with USE=ogg"
-		fi
-	fi
-
-	# Create the user and group if not already present
-	enewgroup squeezecenter || die
-	enewuser squeezecenter -1 -1 "${INSTROOT}/squeezecenter" squeezecenter || die
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Apply patches
-	epatch "${FILESDIR}/mDNSResponder-${MAJOR_VER}-gentoo.patch"
-
-	# Remove bundled binaries that are supplied by other ebuilds
-	einfo "Removing binaries provided by other ebuilds ..."
-	rm "${S}"/Bin/*/mDNSResponderPosix || die	# net-misc/mDNSResponder
-	rm "${S}"/Bin/*/alac || die					# media-sound/alac_decoder
-	rm "${S}"/Bin/*/flac || die					# media-libs/flac
-	rm "${S}"/Bin/*/sox || die					# media-sound/sox
-	rm "${S}"/Bin/*/wvunpack || die				# media-sound/wavpack
-	rm "${S}"/Bin/*/mppdec || die				# media-sound/musepack-tools
-
-	# Remove bundled MySQL as we depend on an external instance
-	einfo "Removing bundled MySQL ..."
-	rm -r "${S}"/MySQL || die
-	rm "${S}"/Bin/*/mysqld || die				# virtual/mysql
-}
-
-src_compile() {
-	einfo "Building required Perl modules (some warnings are normal here) ..."
-	mkdir "${T}/sc_compile"
-	echo -e "\n${S}\n${T}/sc_compile" | Bin/build-perl-modules.pl || die "Unable to build Perl modules"
-}
-
-src_install() {
-	# Copy all files.
-	dodir "${INSTROOT}/squeezecenter"
-	cp -r * "${D}/${INSTROOT}/squeezecenter"
-
-	# Install init scripts.
-	newconfd "${FILESDIR}/squeezecenter-${MAJOR_VER}.conf.d" squeezecenter
-	newinitd "${FILESDIR}/squeezecenter-${MAJOR_VER}.init.d" squeezecenter
-
-	# Install default preferences.
-	insinto /etc
-	newins "${FILESDIR}/squeezecenter-${MAJOR_VER}.prefs" squeezecenter.prefs
-
-	# Install the SQL configuration scripts.
-	insinto "${INSTROOT}/squeezecenter/SQL/mysql"
-	doins "${FILESDIR}/dbdrop-${MAJOR_VER}-gentoo.sql"
-	doins "${FILESDIR}/dbcreate-${MAJOR_VER}-gentoo.sql"
-
-	# Initialize /var/{cache,run}.
-	keepdir /var/{cache,run}/squeezecenter
-	fowners squeezecenter:squeezecenter /var/{cache,run}/squeezecenter
-	fperms 770 /var/{cache,run}/squeezecenter
-
-	# Initialize /var/log.
-	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
-
-	# Install logrotate support.
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/squeezecenter-${MAJOR_VER}.logrotate.d" squeezecenter
-
-	# Install Avahi support (if USE flag is set).
-	if use avahi; then
-		insinto /etc/avahi/services
-		newins "${FILESDIR}/avahi-${MAJOR_VER}-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}${CACHED_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 "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 ""
-	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
-		mysql --user=root --password="${ROOT_PASSWD}" </dev/null >/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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbdrop-${MAJOR_VER}-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}/" < "${INSTROOT}/squeezecenter/SQL/mysql/dbcreate-${MAJOR_VER}-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 "${CACHED_PREFS}" ] && sc_remove_db_prefs ${CACHED_PREFS}
-
-	# Insert the external MySQL configuration into the preferences.
-	sc_update_prefs "${PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-	[ -f "${CACHED_PREFS}" ] && sc_update_prefs "${CACHED_PREFS}" "${DBUSER}" "${DBUSER_PASSWD}"
-
-	# Phew - all done.
-	# Give some tips on what to do now.
-	einfo "Database configuration complete."
-	einfo ""
-	sc_starting_instr
-}
diff --git a/media-sound/squeezecenter/squeezecenter-7.0_beta20080126.ebuild b/media-sound/squeezecenter/squeezecenter-7.0_beta20080217.ebuild
index 2e5126f8116a..7e8635dd046f 100644
--- a/media-sound/squeezecenter/squeezecenter-7.0_beta20080126.ebuild
+++ b/media-sound/squeezecenter/squeezecenter-7.0_beta20080217.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0_beta20080126.ebuild,v 1.1 2008/01/27 18:58:11 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0_beta20080217.ebuild,v 1.1 2008/02/19 03:43:15 lavajoe Exp $
 
 inherit eutils
 
-SVN_VER="16779"
+SVN_VER="17600"
 MAJOR_VER="${PV:0:3}"
 MY_SRC_DIR="SqueezeCenter_${MAJOR_VER}_v${PV:8:4}-${PV:12:2}-${PV:14:2}"
 MY_P="squeezecenter-${MAJOR_VER}-${SVN_VER}-noCPAN"
@@ -161,8 +161,8 @@ pkg_postinst() {
 	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 "or Transporter)."
+		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
@@ -256,7 +256,7 @@ pkg_config() {
 		read -p "MySQL root password: " ROOT_PASSWD; echo
 		stty echo
 		trap ":" EXIT
-		mysql --user=root --password="${ROOT_PASSWD}" </dev/null >/dev/null 2>&1 && DONE=1
+		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