bump

21 files changed, 40 insertions, 639 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index f4a2171cb322..8557bebc777e 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.49 2004/10/12 15:38:51 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.50 2004/11/03 14:42:20 foser Exp $
+
+*rhythmbox-0.8.8-r1 (03 Nov 2004)
+
+  03 Nov 2004; foser <foser@gentoo.org> rhythmbox-0.8.8-r1.ebuild :
+  Add ipod crasher fix (#68651)
 
 *rhythmbox-0.8.8 (12 Oct 2004)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index c1d6c1165523..af305a896fef 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,6 +1,6 @@
-MD5 615f309285ec65549f12b757940b423d rhythmbox-0.8.8.ebuild 2582
 MD5 c542437c49d29e44d4bc978ac5504ffd rhythmbox-0.8.3.ebuild 2570
 MD5 62143cb4d66c9b5a6d6bf3b54286d06b rhythmbox-0.8.5.ebuild 2459
+MD5 ffab46fe0486ac2f2ec202a4fc28fa11 rhythmbox-0.8.8-r1.ebuild 2638
 MD5 b8cd19ccf9f490f2bfa854aaf917f9f5 rhythmbox-0.8.7.ebuild 2465
 MD5 439dd617dc149cb42ee1853d84b4d8d9 rhythmbox-0.8.0-r1.ebuild 2053
 MD5 eddbc790a41f613d3e27ad2fbc0373fa rhythmbox-0.6.8.ebuild 2430
@@ -20,4 +20,6 @@ MD5 7eba43d939d371b937ef3bf3428338e8 files/rhythmbox-0.6-fix_flac_test.patch 139
 MD5 5680d5f2fa4f98cf505fe60818d91e66 files/digest-rhythmbox-0.6.1-r1 69
 MD5 6c5001723b759bda9528d5ebc03b470e files/rhythmbox-0.6.5-gcc2_fix.patch 637
 MD5 3605cdb3536723e6994ffcaee8288b51 files/digest-rhythmbox-0.8.0-r1 69
+MD5 44a42f72ca8c0f3136fded12f1aa7172 files/digest-rhythmbox-0.8.8-r1 69
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
+MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.1-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.1-r1
deleted file mode 100644
index 18e90aacd946..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5791f9fb69c9a855d84e1e666b2e86a9 rhythmbox-0.6.1.tar.bz2 1538735
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.8 b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.8
deleted file mode 100644
index 10ec292ef95c..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7940fa4e56a66a19476a959385b79b1 rhythmbox-0.6.8.tar.bz2 1580541
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1
deleted file mode 100644
index ebd89cc0aa5c..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e8572dbd8e33024ea5d8beb4dec314c6 rhythmbox-0.8.0.tar.bz2 1776804
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.1
deleted file mode 100644
index c13855e66bdb..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c42581010928a9c472562d1a08cad756 rhythmbox-0.8.1.tar.bz2 1769708
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.3 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.3
deleted file mode 100644
index 8c122ea46fc2..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbdaafb0607b8092821d86db3488d945 rhythmbox-0.8.3.tar.bz2 1778132
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.7 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.7
deleted file mode 100644
index 0abf1d33c6d9..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ea5f7cd44f79b64721ce60f1fc1c2b7 rhythmbox-0.8.7.tar.bz2 2433859
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.8 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.8-r1
index 2226680f98ed..2226680f98ed 100644
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.8
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.8-r1
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.6-fix_flac_test.patch b/media-sound/rhythmbox/files/rhythmbox-0.6-fix_flac_test.patch
deleted file mode 100644
index 8a044cfccd78..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.6-fix_flac_test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -uNr rhythmbox-0.6.8/configure.ac rhythmbox-0.6.8.patched/configure.ac
---- rhythmbox-0.6.8/configure.ac	2004-03-05 20:06:16.000000000 +0100
-+++ rhythmbox-0.6.8.patched/configure.ac	2004-03-06 18:03:59.314696456 +0100
-@@ -272,7 +272,7 @@
-   VORBISKEYS=
- fi
- AC_SUBST(VORBISKEYS)
--if test "x$enable_vorbis" = "xyes"; then
-+if test x"$enable_vorbis" = "xyes"; then
-    AC_DEFINE(HAVE_VORBIS,,[Define if we have Ogg Vorbis support])
- fi
- AM_CONDITIONAL(HAVE_VORBIS,test "x$enable_vorbis" = "xyes")
-@@ -284,18 +284,18 @@
- if test x"$enable_flac" = xyes && test x"$enable_mp3" != xyes; then
-   AC_MSG_ERROR([libid3tag is required for FLAC support])  
- fi
--if test "$xenable_flac" != "xno" && test x"$enable_mp3" = xyes; then
-+if test x"$enable_flac" != "xno" && test x"$enable_mp3" = xyes; then
-   AC_CHECK_HEADER(FLAC/all.h,[enable_flac=yes],)
- fi
--if test "x$enable_flac" = "xyes"; then
-+if test x"$enable_flac" = "xyes"; then
-   LIBS="$LIBS -lFLAC"
-   FLACKEYS=",application/x-flac,audio/x-flac"
- fi  
- AC_SUBST(FLACKEYS)
--if test "x$enable_flac" = "xyes"; then
-+if test x"$enable_flac" = "xyes"; then
-    AC_DEFINE(HAVE_FLAC,,[Define if we have FLAC support])
- fi
--AM_CONDITIONAL(HAVE_FLAC,test "x$enable_flac" = "xyes")
-+AM_CONDITIONAL(HAVE_FLAC,test x"$enable_flac" = "xyes")
- 
- CFLAGS="$CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS"
- LIBS="$LIBS $OGG_LIBS $VORBIS_LIBS $VORBISFILE_LIBS $FLAC_LIBS"
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.6.5-amd64.patch b/media-sound/rhythmbox/files/rhythmbox-0.6.5-amd64.patch
deleted file mode 100644
index 8b451e38f40f..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.6.5-amd64.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Only in rhythmbox-0.6.5/help/C: authors.xml
-diff -ur rhythmbox-0.6.5/lib/rb-util.c rhythmbox-0.6.5-patched/lib/rb-util.c
---- rhythmbox-0.6.5/lib/rb-util.c	2004-01-18 03:57:40.000000000 +0100
-+++ rhythmbox-0.6.5-patched/lib/rb-util.c	2004-02-13 22:52:14.000000000 +0100
-@@ -22,13 +22,13 @@
- #include "rb-util.h"
- 
- gboolean
--rb_true_function (gpointer dummy, ...)
-+rb_true_function (gpointer dummy)
- {
- 	return TRUE;
- }
- 
- gboolean
--rb_false_function (gpointer dummy, ...)
-+rb_false_function (gpointer dummy)
- {
- 	return FALSE;
- }
-diff -ur rhythmbox-0.6.5/lib/rb-util.h rhythmbox-0.6.5-patched/lib/rb-util.h
---- rhythmbox-0.6.5/lib/rb-util.h	2004-01-18 03:57:40.000000000 +0100
-+++ rhythmbox-0.6.5-patched/lib/rb-util.h	2004-02-13 22:51:45.000000000 +0100
-@@ -28,8 +28,8 @@
- 
- G_BEGIN_DECLS
- 
--gboolean rb_true_function (gpointer dummy, ...);
--gboolean rb_false_function (gpointer dummy, ...);
-+gboolean rb_true_function (gpointer dummy);
-+gboolean rb_false_function (gpointer dummy);
- 
- gboolean rb_gvalue_compare (GValue *a, GValue *b);
- 
-Only in rhythmbox-0.6.5/monkey-media: monkey-media-includes.h
-Only in rhythmbox-0.6.5/monkey-media: monkey-media-marshal.c
-Only in rhythmbox-0.6.5/monkey-media: monkey-media-marshal.h
-diff -ur rhythmbox-0.6.5/monkey-media/monkey-media-player-gst-tmp.c rhythmbox-0.6.5-patched/monkey-media/monkey-media-player-gst-tmp.c
---- rhythmbox-0.6.5/monkey-media/monkey-media-player-gst-tmp.c	2004-01-18 03:57:40.000000000 +0100
-+++ rhythmbox-0.6.5-patched/monkey-media/monkey-media-player-gst-tmp.c	2004-02-13 21:12:12.000000000 +0100
-@@ -347,7 +347,7 @@
- {
- 	char *ret = NULL, *cset;
- 	va_list args;
--	int bytes_read, bytes_written;
-+	gsize bytes_read, bytes_written;
- 
- 	if (g_utf8_validate (str, len, NULL))
- 		return g_strndup (str, len >= 0 ? len : strlen (str));
-@@ -356,10 +356,10 @@
- 	while ((cset = va_arg (args, char *)) != NULL)
- 	{
- 		if (!strcmp (cset, "locale"))
--			ret = g_locale_to_utf8 (str, len, &bytes_read,
-+			ret = g_locale_to_utf8 (str, (gsize) len, &bytes_read,
- 						&bytes_written, NULL);
- 		else
--			ret = g_convert (str, len, "UTF-8", cset,
-+			ret = g_convert (str, (gsize) len, "UTF-8", cset,
- 					 &bytes_read, &bytes_written, NULL);
- 		if (ret)
- 			break;
-Only in rhythmbox-0.6.5-patched: readme
-Only in rhythmbox-0.6.5: rhythmbox.spec
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.6.5-gcc2_fix.patch b/media-sound/rhythmbox/files/rhythmbox-0.6.5-gcc2_fix.patch
deleted file mode 100644
index 0492f0765545..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.6.5-gcc2_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -NurB rhythmbox-0.6.5-orig/shell/rb-shell.c rhythmbox-0.6.5/shell/rb-shell.c
---- rhythmbox-0.6.5-orig/shell/rb-shell.c	2004-02-12 11:34:12.000000000 -0500
-+++ rhythmbox-0.6.5/shell/rb-shell.c	2004-02-12 11:34:45.000000000 -0500
-@@ -608,12 +608,13 @@
- 			    const CORBA_char *uri,
- 			    CORBA_Environment *ev)
- {
-+	GnomeVFSURI *vfsuri;
- 	RBShell *shell = RB_SHELL (bonobo_object (_servant));
- 	RBPlaylist *parser;
- 
- 	rb_debug ("handling uri: %s", uri);
- 
--	GnomeVFSURI *vfsuri = gnome_vfs_uri_new (uri);
-+	vfsuri = gnome_vfs_uri_new (uri);
- 	if (!vfsuri) {
- 		rb_error_dialog (_("Unable to parse URI \"%s\"\n"), uri);
- 		return;
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.6.8-amd64.patch b/media-sound/rhythmbox/files/rhythmbox-0.6.8-amd64.patch
deleted file mode 100644
index 1d25131365a9..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.6.8-amd64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur rhythmbox-0.6.5/monkey-media/monkey-media-player-gst-tmp.c rhythmbox-0.6.5-patched/monkey-media/monkey-media-player-gst-tmp.c
---- rhythmbox-0.6.5/monkey-media/monkey-media-player-gst-tmp.c	2004-01-18 03:57:40.000000000 +0100
-+++ rhythmbox-0.6.5-patched/monkey-media/monkey-media-player-gst-tmp.c	2004-02-13 21:12:12.000000000 +0100
-@@ -347,7 +347,7 @@
- {
- 	char *ret = NULL, *cset;
- 	va_list args;
--	int bytes_read, bytes_written;
-+	gsize bytes_read, bytes_written;
- 
- 	if (g_utf8_validate (str, len, NULL))
- 		return g_strndup (str, len >= 0 ? len : strlen (str));
-@@ -356,10 +356,10 @@
- 	while ((cset = va_arg (args, char *)) != NULL)
- 	{
- 		if (!strcmp (cset, "locale"))
--			ret = g_locale_to_utf8 (str, len, &bytes_read,
-+			ret = g_locale_to_utf8 (str, (gsize) len, &bytes_read,
- 						&bytes_written, NULL);
- 		else
--			ret = g_convert (str, len, "UTF-8", cset,
-+			ret = g_convert (str, (gsize) len, "UTF-8", cset,
- 					 &bytes_read, &bytes_written, NULL);
- 		if (ret)
- 			break;
-
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.8.8-ipod.patch b/media-sound/rhythmbox/files/rhythmbox-0.8.8-ipod.patch
new file mode 100644
index 000000000000..c09f0e499838
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.8.8-ipod.patch
@@ -0,0 +1,28 @@
+* looking for rhythmbox-devel@gnome.org--2004/rhythmbox--main--0.8--patch-133 to compare with
+* comparing to rhythmbox-devel@gnome.org--2004/rhythmbox--main--0.8--patch-133
+M  sources/rb-ipod-source.c
+
+* modified files
+
+--- orig/sources/rb-ipod-source.c
++++ mod/sources/rb-ipod-source.c
+@@ -236,11 +236,11 @@
+ 		/* Set disc number */
+ 		if (song->cd_nr != 0) {
+ 			GValue value = {0, };
+-			g_value_init (&value, G_TYPE_ULONG);
+-			g_value_set_ulong (&value, song->cd_nr);
+-			rhythmdb_entry_set (RHYTHMDB (ctxt->db), entry, 
+-					    RHYTHMDB_PROP_DISC_NUMBER, 
+-					    &value);
++			g_value_init (&value, G_TYPE_INT);
++			g_value_set_int (&value, song->cd_nr);
++			entry_set_locked (RHYTHMDB (ctxt->db), entry, 
++					  RHYTHMDB_PROP_DISC_NUMBER, 
++					  &value);
+ 			g_value_unset (&value);
+ 		}
+ 		
+
+
+
diff --git a/media-sound/rhythmbox/rhythmbox-0.6.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.1-r1.ebuild
deleted file mode 100644
index 6c96b5d905fa..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.1-r1.ebuild,v 1.7 2004/09/03 14:03:03 pvdabeel Exp $
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://web.rhythmbox.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="oggvorbis mad xine flac faad"
-
-RDEPEND=">=x11-libs/gtk+-2.2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	>=media-libs/musicbrainz-2
-	faad? ( >=media-libs/faad2-2.0_rc3 )
-	flac? ( >=media-libs/flac-1 )
-	oggvorbis? ( >=media-libs/libvorbis-1 )
-	mad? ( >=media-libs/libid3tag-0.15 )
-	!xine? ( =media-libs/gstreamer-0.6*
-		=media-libs/gst-plugins-0.6*
-		=media-plugins/gst-plugins-gnomevfs-0.6*
-		flac? ( =media-plugins/gst-plugins-flac-0.6* )
-		mad? ( =media-plugins/gst-plugins-mad-0.6* )
-		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.6* )
-		)
-	xine? ( >=media-libs/xine-lib-1_rc0 )"
-
-# REMIND : should we really force flac ?
-# I want to drop flac deps when rb get proper gst only/non monkey-media
-# flac support. Made it a local USE flag for now
-# <foser@gentoo.org> 06 Oct 2003
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-use xine && G2CONF="${G2CONF} --enable-xine"
-use flac && G2CONF="${G2CONF} --enable-flac"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4 ) \
-	--disable-schemas-install"
-
-src_unpack( ) {
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-}
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_compile() {
-	filter-flags "-ffast-math"
-	gnome2_src_compile
-}
-
-
diff --git a/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
deleted file mode 100644
index fa909fa046c2..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild,v 1.10 2004/09/03 14:03:03 pvdabeel Exp $
-
-inherit gnome2 flag-o-matic eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://web.rhythmbox.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86 ppc ~amd64"
-IUSE="oggvorbis mad xine flac faad"
-
-RDEPEND=">=x11-libs/gtk+-2.2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	>=media-libs/musicbrainz-2
-	faad? ( >=media-libs/faad2-2.0_rc3 )
-	flac? ( >=media-libs/flac-1
-		>=media-libs/libid3tag-0.15.0b )
-	oggvorbis? ( >=media-libs/libvorbis-1 )
-	mad? ( >=media-libs/libid3tag-0.15.0b )
-	!xine? ( =media-libs/gstreamer-0.6*
-		=media-libs/gst-plugins-0.6*
-		=media-plugins/gst-plugins-gnomevfs-0.6*
-		flac? ( =media-plugins/gst-plugins-flac-0.6* )
-		mad? ( =media-plugins/gst-plugins-mad-0.6* )
-		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.6* )
-		)
-	xine? ( >=media-libs/xine-lib-1_rc3 )"
-
-# REMIND : should we really force flac ?
-# I want to drop flac deps when rb get proper gst only/non monkey-media
-# flac support. Made it a local USE flag for now
-# <foser@gentoo.org> 06 Oct 2003
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-use xine && G2CONF="${G2CONF} --enable-xine"
-
-# flac support needs both flac & mp3 support enabled
-use flac || use mad \
-	&& G2CONF="${G2CONF} --enable-mp3" \
-	|| G2CONF="${G2CONF} --disable-mp3"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable faad mp4 ) \
-	$(use_enable flac) \
-	--enable-mmkeys \
-	--enable-audiocd \
-	--disable-schemas-install"
-
-src_unpack( ) {
-
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-	epatch ${FILESDIR}/${PN}-0.6.5-gcc2_fix.patch
-	epatch ${FILESDIR}/${PN}-0.6.8-amd64.patch
-
-	# fix configure.ac to make flac switch work correctly
-	epatch ${FILESDIR}/${PN}-0.6-fix_flac_test.patch
-
-	# rerun autoconf for the flac fix
-	autoconf || die
-
-}
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_compile() {
-	filter-flags "-ffast-math"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	insinto /etc/gconf/schemas
-	doins data/rhythmbox.schemas
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild
deleted file mode 100644
index 844909d45316..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild,v 1.4 2004/09/03 14:03:03 pvdabeel Exp $
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86 ppc ~amd64"
-IUSE="oggvorbis xine flac faad mad pda"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	!xine? ( >=media-libs/gst-plugins-0.8.0
-		 >=media-plugins/gst-plugins-gnomevfs-0.8.0
-		 oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0
-		              >=media-plugins/gst-plugins-ogg-0.8.0 )
-		 mad? ( >=media-plugins/gst-plugins-mad-0.8.0 )
-		 flac? ( >=gst-plugins-flac-0.8.0 ) )
-	xine? ( faad? ( >=media-libs/faad2-2.0_rc3 )
-		flac? ( >=media-libs/flac-1
-			>=media-libs/libid3tag-0.15.0b )
-		oggvorbis? ( >=media-libs/libvorbis-1 )
-		mad? ( >=media-libs/libid3tag-0.15.0b )
-		>=media-libs/xine-lib-1_rc3 )"
-
-# REMIND : should we really force flac ?
-# I want to drop flac deps when rb get proper gst only/non monkey-media
-# flac support. Made it a local USE flag for now
-# <foser@gentoo.org> 06 Oct 2003
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-use xine &&\
-	G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\
-	G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable flac) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4) \
-	$(use_enable pda ipod) \
-	--enable-mmkeys \
-	--enable-audiocd \
-	--disable-dashboard \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_unpack( ) {
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.1.ebuild
deleted file mode 100644
index 7b09c0d62eb2..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.8.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.1.ebuild,v 1.3 2004/09/03 14:03:03 pvdabeel Exp $
-
-inherit gnome2
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-
-KEYWORDS="~x86 ppc ~amd64"
-#IUSE="oggvorbis xine flac faad mad pda"
-IUSE="oggvorbis flac faad mad pda"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	=media-libs/gst-plugins-0.8*
-	=media-plugins/gst-plugins-gnomevfs-0.8*
-	oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
-	             =media-plugins/gst-plugins-ogg-0.8* )
-	mad? ( =media-plugins/gst-plugins-mad-0.8* )
-	flac? ( =media-plugins/gst-plugins-flac-0.8* )
-	faad? ( =media-plugins/gst-plugins-faad-0.8* )"
-
-#	!xine? ( =media-libs/gst-plugins-0.8*
-#		=media-plugins/gst-plugins-gnomevfs-0.8*
-#		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
-#		             =media-plugins/gst-plugins-ogg-0.8* )
-#		mad? ( =media-plugins/gst-plugins-mad-0.8* )
-#		flac? ( =media-plugins/gst-plugins-flac-0.8* ) 
-#		faad? ( =media-plugins/gst-plugins-faad-0.8* ) )
-#	xine? ( faad? ( >=media-libs/faad2-2.0_rc3 )
-#		flac? ( >=media-libs/flac-1
-#			>=media-libs/libid3tag-0.15.0b )
-#		oggvorbis? ( >=media-libs/libvorbis-1 )
-#		mad? ( >=media-libs/libid3tag-0.15.0b )
-#		>=media-libs/xine-lib-1_rc3 )"
-
-# REMIND : should we really force flac ?
-# I want to drop flac deps when rb get proper gst only/non monkey-media
-# flac support. Made it a local USE flag for now
-# <foser@gentoo.org> 06 Oct 2003
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-#use xine &&\
-#	G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\
-#	G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable flac) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4) \
-	$(use_enable pda ipod) \
-	--enable-mmkeys \
-	--enable-audiocd \
-	--disable-dashboard \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_unpack( ) {
-
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.3.ebuild
deleted file mode 100644
index ff97d6ccf2c5..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.8.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.3.ebuild,v 1.4 2004/09/03 14:03:03 pvdabeel Exp $
-
-inherit gnome2
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-
-KEYWORDS="x86 ppc ~amd64"
-#IUSE="oggvorbis xine flac faad mad pda"
-IUSE="oggvorbis flac faad mad pda"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	>=media-libs/gst-plugins-0.8.1
-	>=media-plugins/gst-plugins-gnomevfs-0.8.1
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.1
-	             >=media-plugins/gst-plugins-ogg-0.8.1 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.8.1 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.8.1 )
-	faad? ( >=media-plugins/gst-plugins-faad-0.8.1 )"
-
-#	!xine? ( =media-libs/gst-plugins-0.8*
-#		=media-plugins/gst-plugins-gnomevfs-0.8*
-#		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
-#		             =media-plugins/gst-plugins-ogg-0.8* )
-#		mad? ( =media-plugins/gst-plugins-mad-0.8* )
-#		flac? ( =media-plugins/gst-plugins-flac-0.8* ) 
-#		faad? ( =media-plugins/gst-plugins-faad-0.8* ) )
-#	xine? ( faad? ( >=media-libs/faad2-2.0_rc3 )
-#		flac? ( >=media-libs/flac-1
-#			>=media-libs/libid3tag-0.15.0b )
-#		oggvorbis? ( >=media-libs/libvorbis-1 )
-#		mad? ( >=media-libs/libid3tag-0.15.0b )
-#		>=media-libs/xine-lib-1_rc3 )"
-
-# REMIND : should we really force flac ?
-# I want to drop flac deps when rb get proper gst only/non monkey-media
-# flac support. Made it a local USE flag for now
-# <foser@gentoo.org> 06 Oct 2003
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-#use xine &&\
-#	G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\
-#	G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable flac) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4) \
-	$(use_enable pda ipod) \
-	--enable-mmkeys \
-	--enable-audiocd \
-	--disable-dashboard \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_unpack( ) {
-
-	unpack ${A}
-
-	cd ${S}
-	# sandbox errors work around
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.7.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.7.ebuild
deleted file mode 100644
index c3542b1f0bd7..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.8.7.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.7.ebuild,v 1.2 2004/10/02 17:59:18 khai Exp $
-
-inherit gnome2
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-
-#-sparc: 0.8.5: Fails with "Illegal Instruction" when you try playing a file.
-KEYWORDS="~x86 ~ppc ~amd64 -sparc"
-#IUSE="oggvorbis xine flac faad mad pda"
-IUSE="oggvorbis flac faad mad pda"
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libbonobo-2
-	>=media-libs/gst-plugins-0.8.2
-	>=media-plugins/gst-plugins-gnomevfs-0.8.2
-	oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.2
-	             >=media-plugins/gst-plugins-ogg-0.8.2 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.8.2 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.8.2 )
-	faad? ( >=media-plugins/gst-plugins-faad-0.8.2 )"
-
-#	!xine? ( =media-libs/gst-plugins-0.8*
-#		=media-plugins/gst-plugins-gnomevfs-0.8*
-#		oggvorbis? ( =media-plugins/gst-plugins-vorbis-0.8*
-#		             =media-plugins/gst-plugins-ogg-0.8* )
-#		mad? ( =media-plugins/gst-plugins-mad-0.8* )
-#		flac? ( =media-plugins/gst-plugins-flac-0.8* ) 
-#		faad? ( =media-plugins/gst-plugins-faad-0.8* ) )
-#	xine? ( faad? ( >=media-libs/faad2-2.0_rc3 )
-#		flac? ( >=media-libs/flac-1
-#			>=media-libs/libid3tag-0.15.0b )
-#		oggvorbis? ( >=media-libs/libvorbis-1 )
-#		mad? ( >=media-libs/libid3tag-0.15.0b )
-#		>=media-libs/xine-lib-1_rc3 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-#use xine &&\
-#	G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\
-#	G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable flac) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4) \
-	$(use_enable pda ipod) \
-	--enable-mmkeys \
-	--enable-audiocd \
-	--disable-dashboard \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-
-src_unpack()
-{
-	unpack ${A}
-	cd ${S}
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-	gnome2_omf_fix ${S}/help/ja/Makefile.in
-}
-
diff --git a/media-sound/rhythmbox/rhythmbox-0.8.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
index 4e71976a3ad0..31393e2e77fe 100644
--- a/media-sound/rhythmbox/rhythmbox-0.8.8.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8.ebuild,v 1.1 2004/10/12 15:38:51 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.8-r1.ebuild,v 1.1 2004/11/03 14:42:20 foser Exp $
 
 inherit gnome2 eutils
 
@@ -80,5 +80,7 @@ src_unpack()
 
 	# Make it possible for gst rb to load shorten files
 	epatch ${FILESDIR}/${PN}-0.8.7-gst_shn_support.patch
+	# fix ipod crasher
+	epatch ${FILESDIR}/${P}-ipod.patch
 
 }