Fix building with recent glibc wrt #333373 by Michael Weber.

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

4 files changed, 60 insertions, 14 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index db75463d9a93..a3a7902319b1 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.191 2010/08/12 09:11:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.192 2010/08/19 18:21:57 ssuominen Exp $
+
+  19 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  rhythmbox-0.12.8-r1.ebuild,
+  +files/rhythmbox-0.12.8-namespace-conflict.patch:
+  Fix building with recent glibc wrt #333373 by Michael Weber.
 
   12 Aug 2010; Markus Meier <maekke@gentoo.org> rhythmbox-0.12.8-r1.ebuild:
   amd64/x86 stable, bug #330773
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 3579d94601d6..d55d8782eeb7 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX rhythmbox-0.12-python-initialization.patch 5167 RMD160 cacae6274841d595a0d55ed92c42815793081176 SHA1 0b306455b027f8f9c73e185acdbbb1d041ce882d SHA256 54f3f492d4c3204b93a1fed3886ca76aa42d36737e66c6424426fc0116b25d3e
+AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 RMD160 2ed6fe3966c860845d0d12ca3e8023c78d7e1bdb SHA1 6e67ba7802d6dc1ff4131942d9aa1af91dec2586 SHA256 538b36af3824aa45b215b247d586c872ff1ee6cb174b8764e22a11410fd3a204
 DIST rhythmbox-0.12.6.tar.bz2 5202025 RMD160 cf860b1a42975d4dfea09b5c265bda297d18a7b9 SHA1 f1ba375329471ec47475a4b0ce3e8bba430a537b SHA256 ddffa5b7e0e0fe81044354998fd91a58d4ff526746b17a6b638e0e8ea1ac9684
 DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
 EBUILD rhythmbox-0.12.6-r1.ebuild 4603 RMD160 4eb3085ec12f936b9c8e43b103d7ba22f50c6f9d SHA1 957183f4c062605902a83e9b8e842d1c9e7c598e SHA256 5449789551fa032d8892df71bddbf5841ce0d6ca7e02e8579e1cd237a3f8fe9c
 EBUILD rhythmbox-0.12.6.ebuild 4345 RMD160 dd900b643e0a40ffa2d4d3400028f112c121db55 SHA1 04f9a63824dcb217c77f5678655d89fb855f51e4 SHA256 2cf511049ae9eb6a264d6c973b351966dcf32d74a6f739a928901972c4c10f7b
-EBUILD rhythmbox-0.12.8-r1.ebuild 4985 RMD160 6d2507c0134877356356c4a9986248dd8a711d9e SHA1 ed4872b78fbac8dd39512e0ab3f6402012a06baa SHA256 83a495b703279a47b3c799c94ea5844ac68e8401b8dd1baf31a9ac51cbd75bfe
+EBUILD rhythmbox-0.12.8-r1.ebuild 5041 RMD160 a4e73c6139e83612a39591a5dc6a2bd76a1140ff SHA1 97c2e0172006cb043a9250575efab3e9fe07098e SHA256 6f583eba682ac1a6e15cdd7610cdfebaca7b48bd70ac42c119cd1fd13f109870
 EBUILD rhythmbox-0.12.8.ebuild 4870 RMD160 e9a83d0885c291da08340fa43923665de1d269c4 SHA1 ffdb19fcfa01a967f623e2ef47fbf3571482c0e3 SHA256 0e1e5cdf2a6b7a7b82c6a7f850ea706bcdd514ff1661c27674b2319f6ab7e88c
-MISC ChangeLog 29546 RMD160 0265f8512437b900811f5b05696d90de1d10a33c SHA1 7fd40efd7077c28a957ed2beda7d2f7564d0cf14 SHA256 54ed073e23c69ed849eeece5993cef9ebe7920e6c5946605280200b1b233711f
+MISC ChangeLog 29749 RMD160 62d8e0bda9f525c10d1b64592480718553a46d24 SHA1 7049cbb850950fc8f01702886b870d5244d9df65 SHA256 33852d33444ad5dc89bafdbfe02bbb5dae5a2089c0a7d45fcc4537284e224e95
 MISC metadata.xml 560 RMD160 dae21b8f4a2b438dcdf41352bcf1aa139e817639 SHA1 276c4890cf3ff10633ea99cf4dfe15387c45f65c SHA256 0f000ca4586bf2af2d6e6cd1854d8ba67e4129d801d5a27afafaa4c25783f0f2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxjuk0ACgkQkKaRLQcq0GJzsACePpvWm9ZBlZtsrzQQanzjIO7v
-8mwAoIRdKLumLD+JhaFRGAsx+eSnrDoh
-=MWlF
------END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch b/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch
new file mode 100644
index 000000000000..b32614e2030b
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.12.8-namespace-conflict.patch
@@ -0,0 +1,48 @@
+From bd389d8e8a2b1f3a914dcd4bb17e75fb8837d78a Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 01 Jun 2010 00:55:27 +0000
+Subject: rb-client: rename 'pause' to avoid conflict with pause(2) (bug #620199)
+
+---
+diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
+index 648dd2f..5bb34a2 100644
+--- a/remote/dbus/rb-client.c
++++ b/remote/dbus/rb-client.c
+@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
+ static gboolean notify = FALSE;
+ 
+ static gboolean play = FALSE;
+-static gboolean pause = FALSE;
++static gboolean do_pause = FALSE;
+ static gboolean play_pause = FALSE;
+ static gboolean stop = FALSE;
+ 
+@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
+ 	{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
+ 
+ 	{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
+-	{ "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
++	{ "pause", 0, 0, G_OPTION_ARG_NONE, &do_pause, N_("Pause playback if currently playing"), NULL },
+ 	{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
+ /*	{ "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
+ 
+@@ -608,7 +608,7 @@ main (int argc, char **argv)
+ 	if (next || previous ||
+ 	    clear_queue ||
+ 	    play_uri || other_stuff ||
+-	    play || pause || play_pause || stop ||
++	    play || do_pause || play_pause || stop ||
+ 	    print_playing || print_playing_format || notify ||
+ 	    (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
+ 		no_present = TRUE;
+@@ -696,7 +696,7 @@ main (int argc, char **argv)
+ 	org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
+ 	if (!annoy (&error)) {
+ 		rb_debug ("playback state: %d", is_playing);
+-		if (play || pause || play_pause) {
++		if (play || do_pause || play_pause) {
+ 			if (is_playing != play || play_pause) {
+ 				rb_debug ("calling playPause to change playback state");
+ 				org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
+--
+cgit v0.8.3.1
diff --git a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
index bb5b1ce4d2d7..6d46551ed4e8 100644
--- a/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.4 2010/08/12 09:11:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.5 2010/08/19 18:21:57 ssuominen Exp $
 
 EAPI="2"
 
@@ -154,6 +154,8 @@ src_prepare() {
 
 	# Fix python initialization problems, bug #318333
 	epatch "${FILESDIR}/${PN}-0.12-python-initialization.patch"
+
+	epatch "${FILESDIR}"/${P}-namespace-conflict.patch
 }
 
 src_compile() {