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.

Package-Manager: portage-2.1-r2

3 files changed, 51 insertions, 17 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/Manifest b/media-sound/quodlibet/Manifest
index 4fafd438d4a6..c629a153fda4 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -18,18 +18,18 @@ EBUILD quodlibet-0.22.ebuild 2740 RMD160 b09c287420be55cc52875b2ea999a67d760eac3
 MD5 c82c1e5e4beff53d879f3e055c1ef9b5 quodlibet-0.22.ebuild 2740
 RMD160 b09c287420be55cc52875b2ea999a67d760eac30 quodlibet-0.22.ebuild 2740
 SHA256 4e341d4745584f4856473a864241bbfc0aa0adb325900c26e41cab75fa412bb4 quodlibet-0.22.ebuild 2740
-EBUILD quodlibet-0.23.1.ebuild 2742 RMD160 c23d4134cdbe4f2e97ddb8b8c68e294b10793911 SHA1 18da4d296545fc507172d8b0c5ba41a6665a6bb3 SHA256 9af0fb45865de9c012a7be836af43608f595b58512db01d011f06f17431c9871
-MD5 e437d9da6ceedf8f7aba3d5fcc04ec9b quodlibet-0.23.1.ebuild 2742
-RMD160 c23d4134cdbe4f2e97ddb8b8c68e294b10793911 quodlibet-0.23.1.ebuild 2742
-SHA256 9af0fb45865de9c012a7be836af43608f595b58512db01d011f06f17431c9871 quodlibet-0.23.1.ebuild 2742
+EBUILD quodlibet-0.23.1.ebuild 3851 RMD160 28fb99abf62cbe439f9af7746a99be9cda0e5f61 SHA1 8227aeceafd7f31acfed1487673f554a58a1438b SHA256 ce93a504083985061deb52bbd677e3ee071ccca03a29bd0924c16482e1cfb769
+MD5 4c5503f08a3c7cd49ac3ba22cd9ee0d7 quodlibet-0.23.1.ebuild 3851
+RMD160 28fb99abf62cbe439f9af7746a99be9cda0e5f61 quodlibet-0.23.1.ebuild 3851
+SHA256 ce93a504083985061deb52bbd677e3ee071ccca03a29bd0924c16482e1cfb769 quodlibet-0.23.1.ebuild 3851
 EBUILD quodlibet-0.23.ebuild 2740 RMD160 b3e82095339a83704d3069d4f848a3c3a821f833 SHA1 4a13225864c74b3153717426dbb37c90088f6663 SHA256 297a08651878e10c442784d50b45c14a52416096e54359a4ce87322f40c4f762
 MD5 c378392aeccf440f34bfe58835abf427 quodlibet-0.23.ebuild 2740
 RMD160 b3e82095339a83704d3069d4f848a3c3a821f833 quodlibet-0.23.ebuild 2740
 SHA256 297a08651878e10c442784d50b45c14a52416096e54359a4ce87322f40c4f762 quodlibet-0.23.ebuild 2740
-MISC ChangeLog 7334 RMD160 470e841e59dfe2462b2d5494c5ea374a4c78bb0c SHA1 b7c5428aba1f8b3f5bf53963d4cc7abd6ad204c2 SHA256 ce18b3eb2893a83d724245c2edbab295bf451119c89c991c4febdd3476c296ba
-MD5 cadef2efd456251d24894aa22fb14aaf ChangeLog 7334
-RMD160 470e841e59dfe2462b2d5494c5ea374a4c78bb0c ChangeLog 7334
-SHA256 ce18b3eb2893a83d724245c2edbab295bf451119c89c991c4febdd3476c296ba ChangeLog 7334
+MISC ChangeLog 7647 RMD160 b6f3a86b74a311901a4fcb68a84be88e74f525a3 SHA1 05c99b92024a7abbecd58cbc15f96b7c776ca917 SHA256 960c81116aecba2046843df53be9972573c2c38c01a49a0ca4ac10944662af2b
+MD5 aa839af07a78b671ee781e41dbe34bb1 ChangeLog 7647
+RMD160 b6f3a86b74a311901a4fcb68a84be88e74f525a3 ChangeLog 7647
+SHA256 960c81116aecba2046843df53be9972573c2c38c01a49a0ca4ac10944662af2b ChangeLog 7647
 MISC metadata.xml 744 RMD160 dc40c6015ca8f3069e0f2f58df8d1235b479756a SHA1 dd66baefd0ae6cfb7afa7f4f46f97dcc67f4c617 SHA256 f819f84833247761ab1f99f2a933eb9af9875daa971f69d87138a1fee381cd7b
 MD5 10a5efe7c3476d69729db9532e53b27e metadata.xml 744
 RMD160 dc40c6015ca8f3069e0f2f58df8d1235b479756a metadata.xml 744
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 ""