add dbus-0.60 patch, remove blocker

(Portage version: 2.1_pre1)

4 files changed, 22 insertions, 5 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 825de4189198..faae4633b6cb 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.62 2006/01/02 07:28:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.63 2006/01/04 17:24:52 joem Exp $
+
+  04 Jan 2006; Joe McCann <joem@gentoo.org>
+  +files/rhythmbox-0.9.2-dbus-0.60.patch, rhythmbox-0.9.2.ebuild:
+  add dbus-0.60 patch, remove blocker
 
   02 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   rhythmbox-0.9.2.ebuild:
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 0bfe66440b1a..d240a2cf8876 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -4,6 +4,7 @@ MD5 518953859231ab23eec13b7d8a004fdc files/digest-rhythmbox-0.9.2 69
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
 MD5 a3ff016aec5eec7277e2598ad013b80a files/rhythmbox-0.8.8-empty-xlib.patch 496
 MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
+MD5 ff8e0703a12aeaa2724bd8b9299556d2 files/rhythmbox-0.9.2-dbus-0.60.patch 342
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 MD5 afaf09dad8a37b524662268bea3b9fb7 rhythmbox-0.8.8-r1.ebuild 2625
-MD5 27612723e8937bfb8392ed8acd04c42c rhythmbox-0.9.2.ebuild 2478
+MD5 3a6665098060d5ac5cfcf0e3f726e6f6 rhythmbox-0.9.2.ebuild 2496
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.9.2-dbus-0.60.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.2-dbus-0.60.patch
new file mode 100644
index 000000000000..6ef613eddd91
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.9.2-dbus-0.60.patch
@@ -0,0 +1,12 @@
+--- shell/main.c	2005-12-04 12:56:47.000000000 -0600
++++ shell/main.c	2005-12-04 12:57:00.000000000 -0600
+@@ -266,7 +266,7 @@
+ 					G_TYPE_STRING,
+ 					"org.gnome.Rhythmbox",
+ 					G_TYPE_UINT,
+-					DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++					DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ 					G_TYPE_INVALID,
+ 					G_TYPE_UINT,
+ 					&request_name_reply,
+
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild
index 1e75d521b64c..f04ccd574441 100644
--- a/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.2.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/rhythmbox/rhythmbox-0.9.2.ebuild,v 1.7 2006/01/02 07:28:15 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild,v 1.8 2006/01/04 17:24:52 joem Exp $
 
 inherit gnome2 eutils
 
@@ -29,7 +29,7 @@ RDEPEND=">=x11-libs/gtk+-2.5.4
 			>=sys-apps/hal-0.5 )
 	avahi? ( >=net-dns/avahi-0.5 )
 	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
-	dbus? ( >=sys-apps/dbus-0.35 !>=sys-apps/dbus-0.60 )
+	dbus? ( >=sys-apps/dbus-0.35 )
 	=media-libs/gst-plugins-0.8*
 	=media-plugins/gst-plugins-gnomevfs-0.8*
 	vorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
@@ -88,5 +88,5 @@ src_unpack()
 	cd ${S}
 	gnome2_omf_fix ${S}/help/C/Makefile.in
 	gnome2_omf_fix ${S}/help/ja/Makefile.in
-
+	epatch ${FILESDIR}/${P}-dbus-0.60.patch
 }