Update to 0.9.5.

Obtained from:	FreeBSD ports tree


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6470 df743ca5-7f9a-e211-a948-0013205c9059

18 files changed, 144 insertions, 214 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 48f4f5d3a..ab0b2b1f0 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.60 2006/06/03 04:21:55 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.61 2006/06/14 04:54:00 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.4.1
-PORTREVISION=	7
+PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -35,6 +35,7 @@ WANT_GNOME=	yes
 USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-nautilus-menu --with-playback=gstreamer-0-10
+INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	LIBS="-lm" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 1cbc52dd8..8b33c6d1a 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.4.1.tar.bz2) = d725eb7134d1997efe28285715ebc05e
-SHA256 (gnome2/rhythmbox-0.9.4.1.tar.bz2) = 2d2305d575c7cc3a366ea9075efcb23b215da49b82b5b81ad3f8649a6cca80f6
-SIZE (gnome2/rhythmbox-0.9.4.1.tar.bz2) = 2155482
+MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
+SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
+SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
diff --git a/audio/rhythmbox-devel/files/patch-configure b/audio/rhythmbox-devel/files/patch-configure
deleted file mode 100644
index 197d077b6..000000000
--- a/audio/rhythmbox-devel/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Apr 25 17:51:39 2006
-+++ configure	Tue Apr 25 17:51:45 2006
-@@ -22468,7 +22468,7 @@ _ACEOF
-    { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5
- echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;}
- 
--   if test x$have_avahi_06 == xyes; then
-+   if test x$have_avahi_06 = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_AVAHI_0_6 1
diff --git a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c
deleted file mode 100644
index f12bc25fc..000000000
--- a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-gst.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/rb-metadata-gst.c.orig	Sat Jun  3 00:21:25 2006
-+++ metadata/rb-metadata-gst.c	Sat Jun  3 00:21:34 2006
-@@ -1068,7 +1068,7 @@ rb_metadata_load (RBMetaData *md,
- 			g_set_error (error,
- 				     RB_METADATA_ERROR,
- 				     RB_METADATA_ERROR_NOT_AUDIO_IGNORE,
--				     NULL);
-+				     " ");
- 		}
- 	} else {
- 		/* yay, it worked */
diff --git a/audio/rhythmbox-devel/files/patch-remote_bonobo_Makefile.in b/audio/rhythmbox-devel/files/patch-remote_bonobo_Makefile.in
deleted file mode 100644
index c19ec530e..000000000
--- a/audio/rhythmbox-devel/files/patch-remote_bonobo_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- remote/bonobo/Makefile.in.orig	Wed Aug 27 04:19:40 2003
-+++ remote/bonobo/Makefile.in	Wed Aug 27 04:19:56 2003
-@@ -237,7 +237,7 @@
- 
- noinst_HEADERS = Rhythmbox.h
- 
--idldir = $(prefix)/share/idl
-+idldir = $(datadir)/idl
- idl_DATA = Rhythmbox.idl
- 
- CLEAN_FILES = $(rhythmbox_interface_idl_sources)
diff --git a/audio/rhythmbox-devel/files/patch-sources_rb-ipod-source.c b/audio/rhythmbox-devel/files/patch-sources_rb-ipod-source.c
deleted file mode 100644
index 61fbb19a5..000000000
--- a/audio/rhythmbox-devel/files/patch-sources_rb-ipod-source.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- sources/rb-ipod-source.c.orig	Sun Sep 19 17:05:37 2004
-+++ sources/rb-ipod-source.c	Sun Sep 19 17:05:49 2004
-@@ -234,6 +234,7 @@
- 		}
- 
- 		/* Set disc number */
-+		/*
- 		if (song->cd_nr != 0) {
- 			GValue value = {0, };
- 			g_value_init (&value, G_TYPE_ULONG);
-@@ -243,6 +244,7 @@
- 					    &value);
- 			g_value_unset (&value);
- 		}
-+		*/
- 		
- 		/* Set bitrate */
- 		if (song->bitrate != 0) {
diff --git a/audio/rhythmbox-devel/files/patch-widges_eggtrayicon.c b/audio/rhythmbox-devel/files/patch-widges_eggtrayicon.c
deleted file mode 100644
index bb9d982e2..000000000
--- a/audio/rhythmbox-devel/files/patch-widges_eggtrayicon.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- widgets/eggtrayicon.c.orig	Wed Jun 14 12:25:10 2006
-+++ widgets/eggtrayicon.c	Wed Jun 14 12:26:41 2006
-@@ -571,7 +571,7 @@
- 
-   if (pixbuf)
-     {
--#if (LIBNOTIFY_VERSION_MICRO < 2)
-+#if ((LIBNOTIFY_VERSION_MINOR <= 3) && (LIBNOTIFY_VERSION_MICRO < 2))
-       notify_notification_set_icon_data_from_pixbuf (icon->notify->handle, pixbuf);
- #else
-       notify_notification_set_icon_from_pixbuf (icon->notify->handle, pixbuf);
diff --git a/audio/rhythmbox-devel/files/patch-widgets_rb-song-info.c b/audio/rhythmbox-devel/files/patch-widgets_rb-song-info.c
deleted file mode 100644
index e7a9db557..000000000
--- a/audio/rhythmbox-devel/files/patch-widgets_rb-song-info.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- widgets/rb-song-info.c.orig	Mon Apr 17 03:10:40 2006
-+++ widgets/rb-song-info.c	Mon Apr 17 03:11:42 2006
-@@ -750,7 +750,7 @@ rb_song_info_populate_dialog (RBSongInfo
- {
- 	const char *text;
- 	char *tmp;
--	ulong num;
-+	gulong num;
- 	
- 	g_assert (song_info->priv->current_entry);
- 
-@@ -1063,7 +1063,7 @@ rb_song_info_update_rating (RBSongInfo *
- static void
- rb_song_info_update_year (RBSongInfo *song_info)
- {
--	ulong year;
-+	gulong year;
- 	char *text;
- 
- 	year = rhythmdb_entry_get_ulong (song_info->priv->current_entry, RHYTHMDB_PROP_YEAR);
-@@ -1183,7 +1183,7 @@ rb_song_info_sync_entries_multiple (RBSo
- 		g_value_set_ulong (&val, discn);
- 
- 		for (tem = dialog->priv->selected_entries; tem; tem = tem->next) {
--			ulong entry_disc_num;
-+			gulong entry_disc_num;
- 			
- 			entry = (RhythmDBEntry *)tem->data;
- 			entry_disc_num = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 8a16fb325..6a4564ee7 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,18 +1,37 @@
 bin/rhythmbox
-lib/bonobo/librb-nautilus-context-menu.a
-lib/bonobo/librb-nautilus-context-menu.la
-lib/bonobo/librb-nautilus-context-menu.so
+bin/rhythmbox-client
+%%PYTHON%%lib/rhythmbox/plugins/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
 lib/rhythmbox/plugins/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/generic-player.rb-plugin
 lib/rhythmbox/plugins/libaudioscrobbler.a
 lib/rhythmbox/plugins/libaudioscrobbler.la
 lib/rhythmbox/plugins/libaudioscrobbler.so
+lib/rhythmbox/plugins/libgeneric-player.a
+lib/rhythmbox/plugins/libgeneric-player.la
+lib/rhythmbox/plugins/libgeneric-player.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
-libdata/bonobo/servers/GNOME_Rhythmbox.server
-libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
-libdata/pkgconfig/rhythmbox.pc
 libexec/rhythmbox-metadata
 share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/ch01.html
@@ -151,13 +170,41 @@ share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/ru/figures/rb-window-small.png
 share/gnome/help/rhythmbox/ru/figures/rb-window.png
 share/gnome/help/rhythmbox/ru/rhythmbox.xml
-share/gnome/idl/Rhythmbox.idl
+share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/sv/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/sv/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/sv/figures/rb-window-small.png
+share/gnome/help/rhythmbox/sv/figures/rb-window.png
+share/gnome/help/rhythmbox/sv/rhythmbox.xml
+share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
+share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
 share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
 share/gnome/omf/rhythmbox/rhythmbox-es.omf
 share/gnome/omf/rhythmbox/rhythmbox-fr.omf
 share/gnome/omf/rhythmbox/rhythmbox-ru.omf
-share/gnome/pixmaps/rhythmbox.png
+share/gnome/omf/rhythmbox/rhythmbox-sv.omf
+share/gnome/omf/rhythmbox/rhythmbox-zh_CN.omf
 share/gnome/rhythmbox/art/about-logo.png
 share/gnome/rhythmbox/art/media-eject.png
 share/gnome/rhythmbox/art/rhythmbox-no-star.png
@@ -165,13 +212,15 @@ share/gnome/rhythmbox/art/rhythmbox-podcast.png
 share/gnome/rhythmbox/art/rhythmbox-set-star.png
 share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
 share/gnome/rhythmbox/art/rhythmbox-unset-star.png
+share/gnome/rhythmbox/daap-ui.xml
+share/gnome/rhythmbox/generic-player-ui.xml
 share/gnome/rhythmbox/glade/audioscrobbler-prefs.glade
 share/gnome/rhythmbox/glade/create-playlist.glade
 share/gnome/rhythmbox/glade/daap-prefs.glade
 share/gnome/rhythmbox/glade/druid.glade
 share/gnome/rhythmbox/glade/general-prefs.glade
 share/gnome/rhythmbox/glade/library-prefs.glade
-share/gnome/rhythmbox/glade/load-failure.glade
+share/gnome/rhythmbox/glade/playlist-save.glade
 share/gnome/rhythmbox/glade/plugins.glade
 share/gnome/rhythmbox/glade/podcast-feed-properties.glade
 share/gnome/rhythmbox/glade/podcast-new.glade
@@ -183,9 +232,11 @@ share/gnome/rhythmbox/glade/song-info.glade
 share/gnome/rhythmbox/glade/station-new.glade
 share/gnome/rhythmbox/glade/station-properties.glade
 share/gnome/rhythmbox/glade/uri.glade
+share/gnome/rhythmbox/ipod-ui.xml
 share/gnome/rhythmbox/iradio-initial.pls
 share/gnome/rhythmbox/playlists.xml
 share/gnome/rhythmbox/rhythmbox-ui.xml
+share/icons/hicolor/48x48/apps/rhythmbox.png
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
@@ -223,7 +274,6 @@ share/locale/ms/LC_MESSAGES/rhythmbox.mo
 share/locale/nb/LC_MESSAGES/rhythmbox.mo
 share/locale/ne/LC_MESSAGES/rhythmbox.mo
 share/locale/nl/LC_MESSAGES/rhythmbox.mo
-share/locale/no/LC_MESSAGES/rhythmbox.mo
 share/locale/pa/LC_MESSAGES/rhythmbox.mo
 share/locale/pl/LC_MESSAGES/rhythmbox.mo
 share/locale/pt/LC_MESSAGES/rhythmbox.mo
@@ -248,6 +298,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/rhythmbox/art
 @dirrm share/gnome/rhythmbox
 @dirrm share/gnome/omf/rhythmbox
+@dirrm share/gnome/help/rhythmbox/zh_CN/figures
+@dirrm share/gnome/help/rhythmbox/zh_CN
+@dirrm share/gnome/help/rhythmbox/sv/figures
+@dirrm share/gnome/help/rhythmbox/sv
 @dirrm share/gnome/help/rhythmbox/ru/figures
 @dirrm share/gnome/help/rhythmbox/ru
 @dirrm share/gnome/help/rhythmbox/fr/figures
@@ -258,5 +312,6 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
 @dirrm %%DOCSDIR%%
+@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 48f4f5d3a..ab0b2b1f0 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.60 2006/06/03 04:21:55 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.61 2006/06/14 04:54:00 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.4.1
-PORTREVISION=	7
+PORTVERSION=	0.9.5
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -35,6 +35,7 @@ WANT_GNOME=	yes
 USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-nautilus-menu --with-playback=gstreamer-0-10
+INSTALLS_ICONS=	yes
 CONFIGURE_ENV=	LIBS="-lm" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 1cbc52dd8..8b33c6d1a 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.4.1.tar.bz2) = d725eb7134d1997efe28285715ebc05e
-SHA256 (gnome2/rhythmbox-0.9.4.1.tar.bz2) = 2d2305d575c7cc3a366ea9075efcb23b215da49b82b5b81ad3f8649a6cca80f6
-SIZE (gnome2/rhythmbox-0.9.4.1.tar.bz2) = 2155482
+MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
+SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
+SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
diff --git a/audio/rhythmbox/files/patch-configure b/audio/rhythmbox/files/patch-configure
deleted file mode 100644
index 197d077b6..000000000
--- a/audio/rhythmbox/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Apr 25 17:51:39 2006
-+++ configure	Tue Apr 25 17:51:45 2006
-@@ -22468,7 +22468,7 @@ _ACEOF
-    { echo "$as_me:$LINENO: Using Avahi for mDNS/DNS-SD" >&5
- echo "$as_me: Using Avahi for mDNS/DNS-SD" >&6;}
- 
--   if test x$have_avahi_06 == xyes; then
-+   if test x$have_avahi_06 = xyes; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_AVAHI_0_6 1
diff --git a/audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c b/audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c
deleted file mode 100644
index f12bc25fc..000000000
--- a/audio/rhythmbox/files/patch-metadata_rb-metadata-gst.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/rb-metadata-gst.c.orig	Sat Jun  3 00:21:25 2006
-+++ metadata/rb-metadata-gst.c	Sat Jun  3 00:21:34 2006
-@@ -1068,7 +1068,7 @@ rb_metadata_load (RBMetaData *md,
- 			g_set_error (error,
- 				     RB_METADATA_ERROR,
- 				     RB_METADATA_ERROR_NOT_AUDIO_IGNORE,
--				     NULL);
-+				     " ");
- 		}
- 	} else {
- 		/* yay, it worked */
diff --git a/audio/rhythmbox/files/patch-remote_bonobo_Makefile.in b/audio/rhythmbox/files/patch-remote_bonobo_Makefile.in
deleted file mode 100644
index c19ec530e..000000000
--- a/audio/rhythmbox/files/patch-remote_bonobo_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- remote/bonobo/Makefile.in.orig	Wed Aug 27 04:19:40 2003
-+++ remote/bonobo/Makefile.in	Wed Aug 27 04:19:56 2003
-@@ -237,7 +237,7 @@
- 
- noinst_HEADERS = Rhythmbox.h
- 
--idldir = $(prefix)/share/idl
-+idldir = $(datadir)/idl
- idl_DATA = Rhythmbox.idl
- 
- CLEAN_FILES = $(rhythmbox_interface_idl_sources)
diff --git a/audio/rhythmbox/files/patch-sources_rb-ipod-source.c b/audio/rhythmbox/files/patch-sources_rb-ipod-source.c
deleted file mode 100644
index 61fbb19a5..000000000
--- a/audio/rhythmbox/files/patch-sources_rb-ipod-source.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- sources/rb-ipod-source.c.orig	Sun Sep 19 17:05:37 2004
-+++ sources/rb-ipod-source.c	Sun Sep 19 17:05:49 2004
-@@ -234,6 +234,7 @@
- 		}
- 
- 		/* Set disc number */
-+		/*
- 		if (song->cd_nr != 0) {
- 			GValue value = {0, };
- 			g_value_init (&value, G_TYPE_ULONG);
-@@ -243,6 +244,7 @@
- 					    &value);
- 			g_value_unset (&value);
- 		}
-+		*/
- 		
- 		/* Set bitrate */
- 		if (song->bitrate != 0) {
diff --git a/audio/rhythmbox/files/patch-widges_eggtrayicon.c b/audio/rhythmbox/files/patch-widges_eggtrayicon.c
deleted file mode 100644
index bb9d982e2..000000000
--- a/audio/rhythmbox/files/patch-widges_eggtrayicon.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- widgets/eggtrayicon.c.orig	Wed Jun 14 12:25:10 2006
-+++ widgets/eggtrayicon.c	Wed Jun 14 12:26:41 2006
-@@ -571,7 +571,7 @@
- 
-   if (pixbuf)
-     {
--#if (LIBNOTIFY_VERSION_MICRO < 2)
-+#if ((LIBNOTIFY_VERSION_MINOR <= 3) && (LIBNOTIFY_VERSION_MICRO < 2))
-       notify_notification_set_icon_data_from_pixbuf (icon->notify->handle, pixbuf);
- #else
-       notify_notification_set_icon_from_pixbuf (icon->notify->handle, pixbuf);
diff --git a/audio/rhythmbox/files/patch-widgets_rb-song-info.c b/audio/rhythmbox/files/patch-widgets_rb-song-info.c
deleted file mode 100644
index e7a9db557..000000000
--- a/audio/rhythmbox/files/patch-widgets_rb-song-info.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- widgets/rb-song-info.c.orig	Mon Apr 17 03:10:40 2006
-+++ widgets/rb-song-info.c	Mon Apr 17 03:11:42 2006
-@@ -750,7 +750,7 @@ rb_song_info_populate_dialog (RBSongInfo
- {
- 	const char *text;
- 	char *tmp;
--	ulong num;
-+	gulong num;
- 	
- 	g_assert (song_info->priv->current_entry);
- 
-@@ -1063,7 +1063,7 @@ rb_song_info_update_rating (RBSongInfo *
- static void
- rb_song_info_update_year (RBSongInfo *song_info)
- {
--	ulong year;
-+	gulong year;
- 	char *text;
- 
- 	year = rhythmdb_entry_get_ulong (song_info->priv->current_entry, RHYTHMDB_PROP_YEAR);
-@@ -1183,7 +1183,7 @@ rb_song_info_sync_entries_multiple (RBSo
- 		g_value_set_ulong (&val, discn);
- 
- 		for (tem = dialog->priv->selected_entries; tem; tem = tem->next) {
--			ulong entry_disc_num;
-+			gulong entry_disc_num;
- 			
- 			entry = (RhythmDBEntry *)tem->data;
- 			entry_disc_num = rhythmdb_entry_get_ulong (entry, RHYTHMDB_PROP_DISC_NUMBER);
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 8a16fb325..6a4564ee7 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,18 +1,37 @@
 bin/rhythmbox
-lib/bonobo/librb-nautilus-context-menu.a
-lib/bonobo/librb-nautilus-context-menu.la
-lib/bonobo/librb-nautilus-context-menu.so
+bin/rhythmbox-client
+%%PYTHON%%lib/rhythmbox/plugins/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
 lib/rhythmbox/plugins/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/generic-player.rb-plugin
 lib/rhythmbox/plugins/libaudioscrobbler.a
 lib/rhythmbox/plugins/libaudioscrobbler.la
 lib/rhythmbox/plugins/libaudioscrobbler.so
+lib/rhythmbox/plugins/libgeneric-player.a
+lib/rhythmbox/plugins/libgeneric-player.la
+lib/rhythmbox/plugins/libgeneric-player.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
 %%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
-libdata/bonobo/servers/GNOME_Rhythmbox.server
-libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
-libdata/pkgconfig/rhythmbox.pc
 libexec/rhythmbox-metadata
 share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/ch01.html
@@ -151,13 +170,41 @@ share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/ru/figures/rb-window-small.png
 share/gnome/help/rhythmbox/ru/figures/rb-window.png
 share/gnome/help/rhythmbox/ru/rhythmbox.xml
-share/gnome/idl/Rhythmbox.idl
+share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/sv/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/sv/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/sv/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/sv/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/sv/figures/rb-window-small.png
+share/gnome/help/rhythmbox/sv/figures/rb-window.png
+share/gnome/help/rhythmbox/sv/rhythmbox.xml
+share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
+share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
+share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
 share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
 share/gnome/omf/rhythmbox/rhythmbox-es.omf
 share/gnome/omf/rhythmbox/rhythmbox-fr.omf
 share/gnome/omf/rhythmbox/rhythmbox-ru.omf
-share/gnome/pixmaps/rhythmbox.png
+share/gnome/omf/rhythmbox/rhythmbox-sv.omf
+share/gnome/omf/rhythmbox/rhythmbox-zh_CN.omf
 share/gnome/rhythmbox/art/about-logo.png
 share/gnome/rhythmbox/art/media-eject.png
 share/gnome/rhythmbox/art/rhythmbox-no-star.png
@@ -165,13 +212,15 @@ share/gnome/rhythmbox/art/rhythmbox-podcast.png
 share/gnome/rhythmbox/art/rhythmbox-set-star.png
 share/gnome/rhythmbox/art/rhythmbox-tray-icon.png
 share/gnome/rhythmbox/art/rhythmbox-unset-star.png
+share/gnome/rhythmbox/daap-ui.xml
+share/gnome/rhythmbox/generic-player-ui.xml
 share/gnome/rhythmbox/glade/audioscrobbler-prefs.glade
 share/gnome/rhythmbox/glade/create-playlist.glade
 share/gnome/rhythmbox/glade/daap-prefs.glade
 share/gnome/rhythmbox/glade/druid.glade
 share/gnome/rhythmbox/glade/general-prefs.glade
 share/gnome/rhythmbox/glade/library-prefs.glade
-share/gnome/rhythmbox/glade/load-failure.glade
+share/gnome/rhythmbox/glade/playlist-save.glade
 share/gnome/rhythmbox/glade/plugins.glade
 share/gnome/rhythmbox/glade/podcast-feed-properties.glade
 share/gnome/rhythmbox/glade/podcast-new.glade
@@ -183,9 +232,11 @@ share/gnome/rhythmbox/glade/song-info.glade
 share/gnome/rhythmbox/glade/station-new.glade
 share/gnome/rhythmbox/glade/station-properties.glade
 share/gnome/rhythmbox/glade/uri.glade
+share/gnome/rhythmbox/ipod-ui.xml
 share/gnome/rhythmbox/iradio-initial.pls
 share/gnome/rhythmbox/playlists.xml
 share/gnome/rhythmbox/rhythmbox-ui.xml
+share/icons/hicolor/48x48/apps/rhythmbox.png
 share/locale/am/LC_MESSAGES/rhythmbox.mo
 share/locale/ar/LC_MESSAGES/rhythmbox.mo
 share/locale/az/LC_MESSAGES/rhythmbox.mo
@@ -223,7 +274,6 @@ share/locale/ms/LC_MESSAGES/rhythmbox.mo
 share/locale/nb/LC_MESSAGES/rhythmbox.mo
 share/locale/ne/LC_MESSAGES/rhythmbox.mo
 share/locale/nl/LC_MESSAGES/rhythmbox.mo
-share/locale/no/LC_MESSAGES/rhythmbox.mo
 share/locale/pa/LC_MESSAGES/rhythmbox.mo
 share/locale/pl/LC_MESSAGES/rhythmbox.mo
 share/locale/pt/LC_MESSAGES/rhythmbox.mo
@@ -248,6 +298,10 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/rhythmbox/art
 @dirrm share/gnome/rhythmbox
 @dirrm share/gnome/omf/rhythmbox
+@dirrm share/gnome/help/rhythmbox/zh_CN/figures
+@dirrm share/gnome/help/rhythmbox/zh_CN
+@dirrm share/gnome/help/rhythmbox/sv/figures
+@dirrm share/gnome/help/rhythmbox/sv
 @dirrm share/gnome/help/rhythmbox/ru/figures
 @dirrm share/gnome/help/rhythmbox/ru
 @dirrm share/gnome/help/rhythmbox/fr/figures
@@ -258,5 +312,6 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
 @dirrm %%DOCSDIR%%
+@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox