Add 7.0.2 beta nightly for 2008-05-30; Remove old versions

(Portage version: 2.1.4.4)

5 files changed, 29 insertions, 328 deletions

diff --git a/media-sound/squeezecenter/ChangeLog b/media-sound/squeezecenter/ChangeLog
index 805ca107063e..a77b04d8ae54 100644
--- a/media-sound/squeezecenter/ChangeLog
+++ b/media-sound/squeezecenter/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/squeezecenter
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.17 2008/05/26 00:18:36 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/ChangeLog,v 1.18 2008/06/03 21:22:02 lavajoe Exp $
+
+*squeezecenter-7.0.2_beta20080530 (03 Jun 2008)
+
+  03 Jun 2008; Joe Peterson <lavajoe@gentoo.org>
+  files/filepaths-7.0.2-gentoo.patch, files/squeezecenter-7.0.2.init.d,
+  -squeezecenter-7.0.1_beta20080501.ebuild,
+  -squeezecenter-7.0.2_beta20080524.ebuild,
+  +squeezecenter-7.0.2_beta20080530.ebuild:
+  Add 7.0.2 beta nightly for 2008-05-30; Remove old versions
 
 *squeezecenter-7.0.2_beta20080524 (26 May 2008)
 
diff --git a/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch b/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch
index ff8fb7918547..b500716abed9 100644
--- a/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch
+++ b/media-sound/squeezecenter/files/filepaths-7.0.2-gentoo.patch
@@ -1,5 +1,5 @@
 --- Slim/Utils/OSDetect.pm.old	2008-05-23 18:55:39.000000000 +0100
-+++ Slim/Utils/OSDetect.pm	2008-05-25 20:21:54.000000000 +0100
++++ Slim/Utils/OSDetect.pm	2008-05-26 15:56:10.000000000 +0100
 @@ -248,6 +248,58 @@
  			warn "dirsFor: Didn't find a match request: [$dir]\n";
  		}
@@ -100,18 +100,20 @@
  		unshift @INC, '/usr/share/squeezecenter';
  		unshift @INC, '/usr/share/squeezecenter/CPAN';
 --- Slim/Music/Import.pm.old	2008-05-23 21:57:18.000000000 +0100
-+++ Slim/Music/Import.pm	2008-05-23 21:57:59.000000000 +0100
-@@ -139,7 +139,7 @@
- 
- 		$command  = '/usr/libexec/squeezecenter-scanner';
- 
--	} elsif (Slim::Utils::OSDetect::isDebian()) {
-+	} elsif (Slim::Utils::OSDetect::isDebian() || Slim::Utils::OSDetect::isGentoo()) {
++++ Slim/Music/Import.pm	2008-05-30 12:29:57.000000000 +0100
+@@ -143,6 +143,10 @@
  
  		$command  = '/usr/sbin/squeezecenter-scanner';
  
++	} elsif (Slim::Utils::OSDetect::isGentoo()) {
++
++		$command  = '/usr/sbin/squeezecenter-scanner';
++
+ 	}
+ 
+ 	# Bug: 3530 - use the same version of perl we were started with.
 --- Slim/bootstrap.pm.old	2008-05-23 21:23:18.000000000 +0100
-+++ Slim/bootstrap.pm	2008-05-24 17:01:16.000000000 +0100
++++ Slim/bootstrap.pm	2008-05-26 15:54:12.000000000 +0100
 @@ -97,8 +97,9 @@
  
  	my @SlimINC = ();
@@ -140,7 +142,7 @@
  
  	# This works like 'use lib'
 --- Slim/Utils/MySQLHelper.pm.old	2008-05-24 13:21:24.000000000 +0100
-+++ Slim/Utils/MySQLHelper.pm	2008-05-24 17:01:16.000000000 +0100
++++ Slim/Utils/MySQLHelper.pm	2008-05-26 15:55:55.000000000 +0100
 @@ -152,7 +152,7 @@
  
  	# Because we use the system MySQL, we need to point to the right
diff --git a/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d b/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d
index e81616e9e183..9f3ee9de709f 100755
--- a/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d
+++ b/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d,v 1.1 2008/05/26 00:18:37 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/files/squeezecenter-7.0.2.init.d,v 1.2 2008/06/03 21:22:03 lavajoe Exp $
 
 # These fit the SqueezeCenter ebuild and so shouldn't need to be changed;
 # user-servicable parts go in /etc/conf.d/squeezecenter.
@@ -12,6 +12,7 @@ prefsdir=${varlibdir}/prefs
 cachedir=${varlibdir}/cache
 prefsfile=${prefsdir}/squeezecenter.prefs
 scuser=squeezecenter
+scname=squeezecenter-server
 
 depend() {
 	need net mysql
@@ -23,9 +24,8 @@ start() {
 	cd /
 	/usr/bin/nice --adjustment=${SC_NICENESS:-0} sudo -u ${scuser} \
 		start-stop-daemon \
-			--start --quiet \
-			--name slimserver.pl \
-			--exec /usr/sbin/squeezecenter-server -- \
+			--start --exec /usr/bin/perl /usr/sbin/${scname} \
+			-- \
 			--quiet --daemon \
 			--pidfile=${pidfile} \
 			--cachedir=${cachedir} \
@@ -41,6 +41,6 @@ start() {
 
 stop() {
 	ebegin "Stopping SqueezeCenter"
-	start-stop-daemon -o --stop --quiet --pidfile ${pidfile}
+	start-stop-daemon -o --stop --pidfile ${pidfile}
 	eend $? "Failed to stop SqueezeCenter"
 }
diff --git a/media-sound/squeezecenter/squeezecenter-7.0.1_beta20080501.ebuild b/media-sound/squeezecenter/squeezecenter-7.0.1_beta20080501.ebuild
deleted file mode 100644
index 32e75fd31302..000000000000
--- a/media-sound/squeezecenter/squeezecenter-7.0.1_beta20080501.ebuild
+++ /dev/null
@@ -1,310 +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.1_beta20080501.ebuild,v 1.3 2008/05/21 14:47:51 lavajoe Exp $
-
-inherit eutils
-
-SVN_VER="19294"
-MAJOR_VER="${PV:0:3}"
-MINOR_VER="${PV:4:1}"
-SRC_DIR="SqueezeCenter_trunk_v${PV:10:4}-${PV:14:2}-${PV:16:2}"
-MY_P="squeezecenter-${MAJOR_VER}.${MINOR_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/${SRC_DIR}/${MY_P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~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 "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}/" < "${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.2_beta20080524.ebuild b/media-sound/squeezecenter/squeezecenter-7.0.2_beta20080530.ebuild
index 78d0cc59534c..e60e9e8305e6 100644
--- a/media-sound/squeezecenter/squeezecenter-7.0.2_beta20080524.ebuild
+++ b/media-sound/squeezecenter/squeezecenter-7.0.2_beta20080530.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.2_beta20080524.ebuild,v 1.1 2008/05/26 00:18:36 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0.2_beta20080530.ebuild,v 1.1 2008/06/03 21:22:02 lavajoe Exp $
 
 inherit eutils
 
-SVN_VER="20137"
+SVN_VER="20324"
 MAJOR_VER="${PV:0:3}"
 MINOR_VER="${PV:4:1}"
 SRC_DIR="SqueezeCenter_7.0_v${PV:10:4}-${PV:14:2}-${PV:16:2}"