Add nightly beta 2008-05-01; remove comment about svn ver from 7.0

Package-Manager: portage-2.1.4.4

3 files changed, 314 insertions, 4 deletions

diff --git a/media-sound/squeezecenter/Manifest b/media-sound/squeezecenter/Manifest
index ad20952f8d7d..bf82c0b5aaff 100644
--- a/media-sound/squeezecenter/Manifest
+++ b/media-sound/squeezecenter/Manifest
@@ -7,7 +7,9 @@ AUX squeezecenter-7.0.init.d 1294 RMD160 d62389c8deaea434c60c756d24744a4e983abfc
 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-7.0-noCPAN.tgz 18464419 RMD160 dfb51cde6250223610023907e570597ffde67ac2 SHA1 5e09017ae51a9a0229a117fc97145ead8213436f SHA256 78bbb0c0e296b1d19dee1f5c9d88f996f7cd43808f8798f2baded6dd2c334df7
-EBUILD squeezecenter-7.0-r1.ebuild 11583 RMD160 e127874e5c9c21ec6743fb2ece61914aed00949b SHA1 5918a38b7374a41cef9beec13f31b3cc3938104b SHA256 d320f958424910197d01056148a94e0fb1b650bf1249da021994f2d2e1f700ed
+DIST squeezecenter-7.0.1-19294-noCPAN.tgz 18522421 RMD160 0369e2f67854415879dd0486fc8e543e19692c52 SHA1 2bfd71a0f2a5b20ebeb2a167cd7ca15db5122c2c SHA256 72fc369ebc968be5a9f76d1767eb6d4b6e60f0bf20c53c32cfd40be20c39fbaf
+EBUILD squeezecenter-7.0-r1.ebuild 11478 RMD160 c9ffa0569f01c22093b63b3a3ca997e3311faf29 SHA1 8357d9ad2bcd9ec32562835639efaf0926517bf4 SHA256 025c75e808250af17e0cb650ea15c800f5d446d8cd6ebb044176548f3c7fcf71
+EBUILD squeezecenter-7.0.1_beta20080501.ebuild 11508 RMD160 6483b22b4d453e07980b96da77f3cfb954cc6a62 SHA1 6ed880ad0a418eeae9ff019837c0e658dc68ab0c SHA256 1d7b099841de5ff4018a51e84748f871f69d723e1e288b8d69af474add64dc6f
 EBUILD squeezecenter-7.0.ebuild 11579 RMD160 8ffb5dda92413cd2a6466283afcd6792a31c77d9 SHA1 17c63b5ae4dfc28a5c024ec2caf45aeeb5f6df5b SHA256 23f32bf95a46d4f3fbb919bc4b43a76f4719f3424f9bb502fcbf21f486d34fd4
 MISC ChangeLog 2810 RMD160 e8bf50876a2fd66a049fb606980e8d2a5f7d59e3 SHA1 d445a0f989b03ac9996769fbc8a337443158f9ec SHA256 a5b38bc85113d30fe274531de20b8be56ad93ae47c7d748078f3bec72e2a6ec7
 MISC metadata.xml 790 RMD160 c75ebb0eda5fdc93127d453d975acebc50bec589 SHA1 e9cd926018accadcd17691d24ae22ca2620e0c30 SHA256 d886ca6099eb5d1a95fa1f5cb833b91eac229c5c1df478f73e52f6d3b1a5e135
diff --git a/media-sound/squeezecenter/squeezecenter-7.0-r1.ebuild b/media-sound/squeezecenter/squeezecenter-7.0-r1.ebuild
index 15a919dbed31..ee6a3c61099c 100644
--- a/media-sound/squeezecenter/squeezecenter-7.0-r1.ebuild
+++ b/media-sound/squeezecenter/squeezecenter-7.0-r1.ebuild
@@ -1,11 +1,9 @@
 # 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-r1.ebuild,v 1.1 2008/04/20 17:27:12 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezecenter/squeezecenter-7.0-r1.ebuild,v 1.2 2008/05/01 13:05:29 lavajoe Exp $
 
 inherit eutils
 
-# Although the svn version isn't in the filename, it is in the directory tree
-# of the expanded tarball.
 SVN_VER="17793"
 MAJOR_VER="${PV:0:3}"
 SRC_DIR="SqueezeCenter_v${MAJOR_VER}.0"
diff --git a/media-sound/squeezecenter/squeezecenter-7.0.1_beta20080501.ebuild b/media-sound/squeezecenter/squeezecenter-7.0.1_beta20080501.ebuild
new file mode 100644
index 000000000000..e34a06c33690
--- /dev/null
+++ b/media-sound/squeezecenter/squeezecenter-7.0.1_beta20080501.ebuild
@@ -0,0 +1,310 @@
+# 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.1 2008/05/01 13:05:29 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
+}