Pulled in changes from Joe's committed version

hickinbottoms · Apr 9, 2010 · f8850ea · f8850ea
1 parent 1bef4f3
commit f8850ea
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 70 deletions.
diff --git a/Changelog b/Changelog
diff --git a/Changelog b/Changelog
@@ -0,0 +1 @@
+files/Gentoo-detailed-changelog.txt
diff --git a/files/Gentoo-detailed-changelog.txt b/files/Gentoo-detailed-changelog.txt
@@ -0,0 +1,66 @@
+---- squeezeboxserver-7.4.2
+
+Updated for Squeezebox Server 7.4.2
+
+Bonjour/Avahi support removed (bug#307099)
+
+Class-XSAccessor-Array no longer required (bug#275520)
+
+Supports Perl 5.10.1 for bundled EV build (bug#287257)
+
+Fewer bundled Perl modules:
+	dev-perl/PAR (added through bug#275932)
+	dev-perl/Audio-Scan (added through bug#287264)
+	dev-perl/enum (added through bug#275931)
+	dev-perl/Text-Unidecode (added through bug#275939)
+	dev-perl/URI-Find (added through bug#275933)
+	dev-perl/Algorithm/C3 (added through bug#275529)
+	dev-perl/Net-UPnP (added through bug#275548)
+	dev-perl/File-BOM (added through bug#275530)
+	dev-perl/Proc-Background (added through bug#275940)
+	dev-perl/Tie-Cache-LRU (added through bug#275935)
+	dev-perl/Tie-Cache-LRU-Expires (added through bug#277335)
+	dev-perl/Data-Dump (added through bug#275942)
+	dev-perl/Data-URIEncode (added through bug#277332)
+	dev-perl/Tie-LLHash (added through bug#275936)
+	dev-perl/Tie-RegexpHash (added through bug#275938)
+	dev-perl/Class-XSAccessor
+	dev-perl/MRO-Compat
+	dev-perl/Data-Page
+	dev-perl/Data-UUID
+
+Utilises Data::UUID rather than UUID::Tidy
+	A patch is included to use Data::UUID since this is in
+	Portage (UUID::Tiny isn't)
+
+Removed redundant musepack USE flag
+
+Allow an external SQL server
+	A small tweak from jaervosz@gentoo.org (see bug#287257) to allow an
+	external MySQL server by only depending on it if it's installed.
+
+For Torsten: prefs in /etc rather than in /var/lib/squeezeboxserver/prefs
+
+For Torsten: Uses EAPI2 and use flag dependencies (a tidying up)
+
+Fixed build-modules with 'noexec' portage
+	Now copies the script into the source directory during the build process
+	to avoid trying to execute a script in the FILES directory - this fails
+	on Portage trees mounted 'noexec' (comment#25 in bug#287257).
+
+For Torsten: failure checks on newexe's
+
+For Torsten: EAPI2 and USE dependencies
+
+For Torsten: Fewer hardiwred paths in ebuild
+	Uses get_libdir and Perl installvendorlib
+
+The following Gentoo bugs should be able to be closed with this update:
+	bug#300051 (Perl 5.10)
+	bug#307099 (bogus USE flags)
+	bug#275520 (dev-perl/Class-XSAccessor-Array phaseout)
+	bug#307119 (Squeezebox Server 7.4.2 bump)
+	bug#287257 (another Squeezebox Server bump request)
+
+Added backported 7.6 patch for squeezeslave hang (Logitech bug#14740)
+	http://bugs.slimdevices.com/show_bug.cgi?id=14740#c32
diff --git a/squeezeboxserver-7.4.2.ebuild b/squeezeboxserver-7.4.2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
 
+EAPI="2"
+
 inherit eutils
 
 MAJOR_VER="${PV:0:3}"
@@ -17,7 +19,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lame wavpack alac ogg flac aac"
-EAPI="2"
 
 # Note: EV present because of bug#287857.
 SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
@@ -211,7 +212,8 @@ src_install() {
 	dodoc Changelog*.html
 	dodoc Installation.txt
 	dodoc License*.txt
-	newdoc "${FILESDIR}/Gentoo-plugins-README.txt" Gentoo-plugins-README.txt
+	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
+	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
 
 	# Configuration files and preferences
 	insinto "${ETCDIR}"
@@ -330,6 +332,15 @@ pkg_postinst() {
 	elog "plugins (if present)."
 
 	elog ""
+
+	ewarn "Note: If Squeezebox Server dies after the initial configuration"
+	ewarn "      after an upgrade from a previous installation, try removing"
+	ewarn "      /var/lib/squeezeboxserver and /etc/squeezeboxserver and"
+	ewarn "      then reinstalling the package (note that old preferences"
+	ewarn "      and plugins will be lost).  See bug #307119."
+
+	elog ""
+
 	sc_starting_instr
 }
 

diff --git a/stage/files/Gentoo-detailed-changelog.txt b/stage/files/Gentoo-detailed-changelog.txt
@@ -0,0 +1,66 @@
+---- squeezeboxserver-7.4.2
+
+Updated for Squeezebox Server 7.4.2
+
+Bonjour/Avahi support removed (bug#307099)
+
+Class-XSAccessor-Array no longer required (bug#275520)
+
+Supports Perl 5.10.1 for bundled EV build (bug#287257)
+
+Fewer bundled Perl modules:
+	dev-perl/PAR (added through bug#275932)
+	dev-perl/Audio-Scan (added through bug#287264)
+	dev-perl/enum (added through bug#275931)
+	dev-perl/Text-Unidecode (added through bug#275939)
+	dev-perl/URI-Find (added through bug#275933)
+	dev-perl/Algorithm/C3 (added through bug#275529)
+	dev-perl/Net-UPnP (added through bug#275548)
+	dev-perl/File-BOM (added through bug#275530)
+	dev-perl/Proc-Background (added through bug#275940)
+	dev-perl/Tie-Cache-LRU (added through bug#275935)
+	dev-perl/Tie-Cache-LRU-Expires (added through bug#277335)
+	dev-perl/Data-Dump (added through bug#275942)
+	dev-perl/Data-URIEncode (added through bug#277332)
+	dev-perl/Tie-LLHash (added through bug#275936)
+	dev-perl/Tie-RegexpHash (added through bug#275938)
+	dev-perl/Class-XSAccessor
+	dev-perl/MRO-Compat
+	dev-perl/Data-Page
+	dev-perl/Data-UUID
+
+Utilises Data::UUID rather than UUID::Tidy
+	A patch is included to use Data::UUID since this is in
+	Portage (UUID::Tiny isn't)
+
+Removed redundant musepack USE flag
+
+Allow an external SQL server
+	A small tweak from jaervosz@gentoo.org (see bug#287257) to allow an
+	external MySQL server by only depending on it if it's installed.
+
+For Torsten: prefs in /etc rather than in /var/lib/squeezeboxserver/prefs
+
+For Torsten: Uses EAPI2 and use flag dependencies (a tidying up)
+
+Fixed build-modules with 'noexec' portage
+	Now copies the script into the source directory during the build process
+	to avoid trying to execute a script in the FILES directory - this fails
+	on Portage trees mounted 'noexec' (comment#25 in bug#287257).
+
+For Torsten: failure checks on newexe's
+
+For Torsten: EAPI2 and USE dependencies
+
+For Torsten: Fewer hardiwred paths in ebuild
+	Uses get_libdir and Perl installvendorlib
+
+The following Gentoo bugs should be able to be closed with this update:
+	bug#300051 (Perl 5.10)
+	bug#307099 (bogus USE flags)
+	bug#275520 (dev-perl/Class-XSAccessor-Array phaseout)
+	bug#307119 (Squeezebox Server 7.4.2 bump)
+	bug#287257 (another Squeezebox Server bump request)
+
+Added backported 7.6 patch for squeezeslave hang (Logitech bug#14740)
+	http://bugs.slimdevices.com/show_bug.cgi?id=14740#c32
diff --git a/stage/squeezeboxserver-7.4.2.ebuild b/stage/squeezeboxserver-7.4.2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header$
 
+EAPI="2"
+
 inherit eutils
 
 MAJOR_VER="${PV:0:3}"
@@ -17,7 +19,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="lame wavpack alac ogg flac aac"
-EAPI="2"
 
 # Note: EV present because of bug#287857.
 SRC_URI="http://www.slimdevices.com/downloads/${SRC_DIR}/${MY_P}.tgz
@@ -211,7 +212,8 @@ src_install() {
 	dodoc Changelog*.html
 	dodoc Installation.txt
 	dodoc License*.txt
-	newdoc "${FILESDIR}/Gentoo-plugins-README.txt" Gentoo-plugins-README.txt
+	dodoc "${FILESDIR}/Gentoo-plugins-README.txt"
+	dodoc "${FILESDIR}/Gentoo-detailed-changelog.txt"
 
 	# Configuration files and preferences
 	insinto "${ETCDIR}"