Bump to 0.12.1-r1. Patch from visualization plugin crash, bug #268477. Reorganize dependencies, add soup and libmms and remove gnome-vfs gst plugins, bug #263285. Raise gtk+ dependency so we can drop libsexy.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 211 insertions, 3 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 9036670157a0..d836807df992 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/rhythmbox
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.145 2009/05/02 11:48:27 eva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.146 2009/05/07 23:20:18 eva Exp $
+
+*rhythmbox-0.12.1-r1 (07 May 2009)
+
+  07 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +rhythmbox-0.12.1-r1.ebuild, +files/rhythmbox-0.12.1-visualization.patch:
+  Bump to 0.12.1-r1. Patch for visualization plugin crash, bug #268477.
+  Reorganize dependencies, add soup and libmms and remove gnome-vfs gst
+  plugins, bug #263285. Raise gtk+ dependency so we can drop libsexy.
 
   02 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
   rhythmbox-0.12.1.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 03e1b5d73ba5..0419c9496ebd 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rhythmbox-0.11.5-libmtp-0.3.0-API.patch 426 RMD160 f48440d266ba4209e5025c2e1525c606516db49e SHA1 9d4822b237d0434376e3f3c072ee8fb52ee11386 SHA256 3de9f0ecfbfac969a93a199da576cff4fd3d9f411ae5d2d71dfb6112f63a36b8
+AUX rhythmbox-0.12.1-visualization.patch 1208 RMD160 d7e91b5363f248aef0517ca11b52b1ec4209be3a SHA1 0c4d11f51daadba61a387497ade9628c7de85832 SHA256 733e1a582b38ae905e58fbc4939c0cc7a33c213a42c5e11d9c3e2ec1a789c92a
 DIST rhythmbox-0.10.1.tar.bz2 3408309 RMD160 b2fdfc48aba957623ca141d45e8e1291a556bbf7 SHA1 ed20d528c24c1447a2f4597f334cd74466139d2e SHA256 a303076477a9a7b6a226613a6f3b43f4641ce977357c9aa9652932dc0b9bbd16
 DIST rhythmbox-0.11.6.tar.bz2 4683400 RMD160 3fd6b8595705a91c779c458a26333575ba5e2233 SHA1 4364447bd4f6fb0e969039213cea37d6d3e4fb58 SHA256 687f566817a0c1c6a2c0e9cc462bb10cded39b8d22b224fa55be00ae1cbdc151
 DIST rhythmbox-0.12.0.tar.bz2 4925468 RMD160 d7bbf03b44d6b2ac22e4fb466122471e6368762e SHA1 b9c478099d9a1dc3a201d5d217d0b08b111f81b9 SHA256 797d0e0d542d4c4ddc436f1ea395f272ebcdaa46fff112226ec9ab244af5b7eb
@@ -6,6 +10,14 @@ DIST rhythmbox-0.12.1.tar.bz2 4859015 RMD160 72964294d2bd8353c86a0f57bde7d7f37db
 EBUILD rhythmbox-0.10.1-r1.ebuild 3150 RMD160 feb84a680bc82a9d36e254e1f4cba68bfd281307 SHA1 8ba1b11a4b80704cb19ca126c3d61805fec14f66 SHA256 47af87c8aaf7b5aa2a7a6570b603b0ade9846f8c4f544162650177a8b77dda49
 EBUILD rhythmbox-0.11.6-r1.ebuild 4625 RMD160 9eb196ebbbfbf5ac30ebb52b414e0fb798db603d SHA1 b6d4b77ba7cc270fbc99f36d1e2691f2147b3ad1 SHA256 ff350ee09b9aa4d9a6241c9319c5a5fc157061db750452e23d08891a36b321c8
 EBUILD rhythmbox-0.12.0.ebuild 3965 RMD160 88b79c16d07f536fd44edd7776058d23009fbe58 SHA1 a26fbabedc9017b2b9c40a384eb728d1d2d1f0fe SHA256 b15db5214c0b9f81664eb917a2e6c91ed309513c0e403a9c7d09efa5b7a280bd
+EBUILD rhythmbox-0.12.1-r1.ebuild 4259 RMD160 65be287f7cd3e3b32d55298923497babe60335de SHA1 0ecbc7869e15913a32a03cdee0ae711892e239ad SHA256 ea999bb16d06a0ab274c425403ff1a804d3bd539f0eae979d6e0452e1ff68dd0
 EBUILD rhythmbox-0.12.1.ebuild 4076 RMD160 898d0f66b27faecfe6869e23d823f108c4f8f8c3 SHA1 ede071a6c1ca661514ab6efe6fe81607e0d7148e SHA256 edb2df0fd8e6a036b982b468a03c9ab5368c22c73c0f2674de1e73f84927d61d
-MISC ChangeLog 20978 RMD160 ee57d370e4562d58c12ee1c96811e6fc6f27d165 SHA1 a78d04e3b51c6fd864944a052c945b93ff757965 SHA256 0d382e40fea97b789012ca3866ffc440bfcb1ea1d71d9e8cff082cf211456436
+MISC ChangeLog 21359 RMD160 1235ecec322b56115b54e059b6a2ebe3e18eadec SHA1 4fa6a4c7f1622396b45c2e37ac4d2a7e729f6d02 SHA256 fade8622891d85a25f2d9c9f714bfd023552d37186718c89966221074ba47eb5
 MISC metadata.xml 581 RMD160 26e759da4542e72558bfbbb60c857abe85e76235 SHA1 e374907c6f72800c69c40da74b5d5ca21a00a97b SHA256 d0b1d71b83f788af0f80bf50b9bcc5aa3ba5c345b2ae2d6fc629fc7012861074
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoDbMYACgkQ1fmVwcYIWAZNTACdHRw+2V13yrXobBjsC17Xf8Oj
+mgsAnRfWbSuZXp+cPyCEv7S6pT0OBu/7
+=8zJJ
+-----END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.1-visualization.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.1-visualization.patch
new file mode 100644
index 000000000000..3e00e6bf5f6a
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.12.1-visualization.patch
@@ -0,0 +1,29 @@
+From 3357c6a834a1a006a0189d4761b92ca522df8cc7 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Wed, 29 Apr 2009 17:06:59 +1000
+Subject: [PATCH] visualizer: direct output to fake window while changing modes
+
+This should stop it dying with X11 BadWindow errors most of the time.
+---
+ plugins/visualizer/rb-visualizer-plugin.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/visualizer/rb-visualizer-plugin.c b/plugins/visualizer/rb-visualizer-plugin.c
+index 151a9c3..c133114 100644
+--- a/plugins/visualizer/rb-visualizer-plugin.c
++++ b/plugins/visualizer/rb-visualizer-plugin.c
+@@ -1081,6 +1081,11 @@ update_window (RBVisualizerPlugin *plugin, VisualizerMode mode, int screen, int
+ 		gtk_box_pack_start (GTK_BOX (plugin->vis_box), plugin->play_control_widget, FALSE, FALSE, 6);
+ 		gtk_box_pack_end (GTK_BOX (plugin->vis_box), plugin->control_widget, FALSE, FALSE, 6);
+ 	} else {
++		if (plugin->xoverlay != NULL) {
++			gst_x_overlay_set_xwindow_id (plugin->xoverlay,
++						      GDK_WINDOW_XWINDOW (plugin->fake_window));
++		}
++
+ 		switch (plugin->mode) {
+ 		case EMBEDDED:
+ 			gtk_container_remove (GTK_CONTAINER (plugin->vis_shell),
+-- 
+1.6.2.3
+
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..2d96f902b181
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-0.12.1-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.1-r1.ebuild,v 1.1 2009/05/07 23:20:18 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2 python multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="http://www.rhythmbox.org/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+brasero cdr daap doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp nsplugin python test"
+
+# FIXME: double check what to do with fm-radio plugin
+
+SLOT="0"
+
+COMMON_DEPEND=">=dev-libs/glib-2.16.0
+	>=x11-libs/gtk+-2.16
+	>=dev-libs/dbus-glib-0.71
+	>=dev-libs/totem-pl-parser-2.26.0
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-extra/gnome-media-2.14.0
+	>=net-libs/libsoup-2.4:2.4
+
+	>=media-libs/gst-plugins-base-0.10.14
+
+	cdr? (
+		brasero? ( >=app-cdr/brasero-0.9.1 )
+		!brasero? ( >=gnome-extra/nautilus-cd-burner-2.21.6 ) )
+	daap? ( >=net-dns/avahi-0.6 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	hal? (
+		ipod? ( >=media-libs/libgpod-0.6 )
+		mtp? ( >=media-libs/libmtp-0.3.0 )
+		>=sys-apps/hal-0.5 )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	lirc? ( app-misc/lirc )
+	musicbrainz? ( media-libs/musicbrainz:3 )
+	python? (
+		>=dev-lang/python-2.4.2
+		|| (
+			>=dev-lang/python-2.5
+			dev-python/celementtree )
+		>=dev-python/pygtk-2.8
+		>=dev-python/gnome-vfs-python-2.22.0
+		>=dev-python/gconf-python-2.22.0
+		>=dev-python/libgnome-python-2.22.0
+		>=dev-python/gst-python-0.10.8 )"
+
+RDEPEND="${COMMON_DEPEND}
+	>=media-plugins/gst-plugins-soup-0.10
+	>=media-plugins/gst-plugins-libmms-0.10
+	|| (
+		>=media-plugins/gst-plugins-cdparanoia-0.10
+		>=media-plugins/gst-plugins-cdio-0.10 )
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-taglib-0.10.6
+	nsplugin? ( || (
+		net-libs/xulrunner
+		www-client/seamonkey
+		www-client/mozilla-firefox ) )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.40
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	test? ( dev-libs/check )"
+
+DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+	  MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+pkg_setup() {
+	if ! use hal && use ipod; then
+		ewarn "ipod support requires hal support.  Please"
+		ewarn "re-emerge with USE=hal to enable ipod support"
+	fi
+
+	if ! use hal && use mtp; then
+		ewarn "MTP support requires hal support.  Please"
+		ewarn "re-emerge with USE=hal to enable MTP support"
+	fi
+
+	if ! use cdr ; then
+		ewarn "You have cdr USE flag disabled."
+		ewarn "You will not be able to play audio CDs."
+	fi
+
+	if use brasero; then
+		G2CONF="${G2CONF} $(use_with cdr libbrasero-media) --without-libnautilus-burn"
+	else
+		G2CONF="${G2CONF} $(use_with cdr libnautilus-burn) --without-libbrasero-media"
+	fi
+
+	G2CONF="${G2CONF}
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins
+		$(use_with gnome-keyring)
+		$(use_with ipod)
+		$(use_enable libnotify)
+		$(use_enable lirc)
+		$(use_enable musicbrainz)
+		$(use_with mtp)
+		$(use_enable nsplugin browser-plugin)
+		$(use_enable python)
+		$(use_enable daap)
+		$(use_with daap mdns avahi)
+		--enable-mmkeys
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--disable-static
+		--disable-vala"
+
+	export GST_INSPECT=/bin/true
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+
+	# Fix crash when using fullscreen visualization plugin, bug #268477
+	epatch "${FILESDIR}/${P}-visualization.patch"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}
+
+src_compile() {
+	addpredict "$(unset HOME; echo ~)/.gconf"
+	addpredict "$(unset HOME; echo ~)/.gconfd"
+	gnome2_src_compile
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "test failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use python && python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins
+
+	ewarn
+	ewarn "If ${PN} doesn't play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+}