Make the gst-plugins-gconf dep optional (with USE='gnome') to solve Bug #146728. Add logic to guess and set the default pipeline when USE='-gnome'. Use sed to fix multilib-strict instead of using the patch. Update the elog messages.

(Portage version: 2.1-r2)

2 files changed, 43 insertions, 9 deletions

diff --git a/media-sound/quodlibet/ChangeLog b/media-sound/quodlibet/ChangeLog
index 9a2207463113..efab4997d21a 100644
--- a/media-sound/quodlibet/ChangeLog
+++ b/media-sound/quodlibet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/quodlibet
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.40 2006/08/31 15:35:01 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/ChangeLog,v 1.41 2006/09/09 00:26:51 tcort Exp $
+
+  09 Sep 2006; Thomas Cort <tcort@gentoo.org> quodlibet-0.23.1.ebuild:
+  Make the gst-plugins-gconf dep optional (with USE='gnome') to solve Bug
+  #146728. Add logic to guess and set the default pipeline when USE='-gnome'.
+  Use sed to fix multilib-strict instead of using the patch. Update the elog
+  messages.
 
 *quodlibet-0.23.1 (31 Aug 2006)
 
diff --git a/media-sound/quodlibet/quodlibet-0.23.1.ebuild b/media-sound/quodlibet/quodlibet-0.23.1.ebuild
index 58df81b17eab..d2b401e8d3aa 100644
--- a/media-sound/quodlibet/quodlibet-0.23.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-0.23.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.23.1.ebuild,v 1.1 2006/08/31 15:35:01 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/quodlibet/quodlibet-0.23.1.ebuild,v 1.2 2006/09/09 00:26:51 tcort Exp $
 
 inherit eutils python
 
@@ -22,7 +22,6 @@ RDEPEND="${DEPEND}
 	>=media-libs/mutagen-1.6
 	>=media-libs/gst-plugins-good-0.10.2
 	>=dev-python/gst-python-0.10.2
-	>=media-plugins/gst-plugins-gconf-0.10.3
 	mad? ( >=media-plugins/gst-plugins-mad-0.10.2 )
 	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.2
 		>=media-plugins/gst-plugins-ogg-0.10.2 )
@@ -35,6 +34,7 @@ RDEPEND="${DEPEND}
 	oss? ( >=media-plugins/gst-plugins-oss-0.10.2 )
 	esd? ( >=media-plugins/gst-plugins-esd-0.10.2 )
 	gnome? ( dev-python/gnome-python-extras
+		>=media-plugins/gst-plugins-gconf-0.10.3
 		>=media-plugins/gst-plugins-gnomevfs-0.10.2
 		dev-python/feedparser )
 	dbus? ( >=sys-apps/dbus-0.62 )"
@@ -53,21 +53,35 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${FILESDIR}"/${PN}-0.17.1-multilibfix.patch
+	# multilib fix
+	sed -i -e "s,^TODEP = lib/quodlibet,TODEP = \$(libdir)/quodlibet," Makefile
+
+	# no gst-plugins-gconf, attempt to guess the proper pipeline value. Bug #133043, #146728.
+	if ! use gnome; then
+		local sinktype="alsasink"
+
+		use esd  && sinktype="esdsink"
+		use oss  && sinktype="osssink"
+		use alsa && sinktype="alsasink"
+
+		elog "Setting the default pipeline to ${sinktype}"
+
+		sed -i -e "s,^          \"pipeline\": \"\",          \"pipeline\": \"${sinktype}\"," config.py
+	fi
 }
 
 src_compile() {
 	if use trayicon ; then
 		emake _trayicon.so || die "emake _trayicon.so failed"
 	fi
+
 	if use mmkeys ; then
 		emake _mmkeys.so   || die "emake _mmkeys.so failed"
 	fi
 }
 
 src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" libdir="$(get_libdir)" install ||
-		die "install failed"
+	emake PREFIX=/usr DESTDIR="${D}" libdir="$(get_libdir)" install || die "install failed"
 	dodoc README NEWS
 }
 
@@ -76,9 +90,23 @@ pkg_postinst() {
 
 	if ! use mad; then
 		elog ""
-		elog "MAD decoding library is disabled."
-		elog "This means that playing mp3 will not be possible."
-		elog "For mp3 playback, please add the mad USE flag."
+		elog "You do not have the 'mad' USE flag enabled."
+		elog "gst-plugins-mad, which is required for mp3 playback, may"
+		elog "not be installed. For mp3 support, enable the 'mad'"
+		elog "USE flag and emerge =media-sound/${P}."
+	fi
+
+	if ! use gnome; then
+		elog ""
+		elog "You do not have the 'gnome' USE flag enabled."
+		elog "media-plugins/gst-plugins-gnomevfs may not be installed,"
+		elog "so the proper pipeline won't be automatically selected."
+		elog "We've tried to select the proper pipeline based on your"
+		elog "USE flags, but if we guessed wrong you may have to set"
+		elog "'pipeline = ' in your ~/.quodlibet/config file to one"
+		elog "of the following: alsasink, osssink, esdsink. To enable"
+		elog "automatic selection of the proper pipeline, enable the"
+		elog "'gnome' USE flag and emerge =media-sound/${P}."
 	fi
 
 	elog ""