oops, another version. this time we fix the amd64 patch as well

7 files changed, 33 insertions, 146 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 5b7f67826210..b56582ad3c23 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.31 2004/03/06 14:09:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.32 2004/03/06 16:06:37 liquidx Exp $
 
 *rhythmbox-0.6.8 (06 Mar 2004)
 
+  06 Mar 2004; Alastair Tse <liquidx@gentoo.org> rhythmbox-0.6.3.ebuild,
+  rhythmbox-0.6.4.ebuild, rhythmbox-0.6.5.ebuild, rhythmbox-0.6.7.ebuild:
+  this time we fix the amd64 patch as well.
+
   06 Mar 2004; foser <foser@gentoo.org> rhythmbox-0.6.8.ebuild :
   new release
 
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.3 b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.3
deleted file mode 100644
index 1dac99dd205e..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 24edcdae89367e6acd1b087f2970e3c2 rhythmbox-0.6.3.tar.bz2 1573249
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.4 b/media-sound/rhythmbox/files/digest-rhythmbox-0.6.4
deleted file mode 100644
index 6416fa42f92e..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.6.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8aa6809e065bc17fb1a0ef57eb058225 rhythmbox-0.6.4.tar.bz2 1579252
diff --git a/media-sound/rhythmbox/files/rhythmbox-0.6.8-amd64.patch b/media-sound/rhythmbox/files/rhythmbox-0.6.8-amd64.patch
new file mode 100644
index 000000000000..1d25131365a9
--- /dev/null
+++ b/media-sound/rhythmbox/files/rhythmbox-0.6.8-amd64.patch
@@ -0,0 +1,26 @@
+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/rhythmbox-0.6.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.3.ebuild
deleted file mode 100644
index 6fe8bc6a77de..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.6.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.3.ebuild,v 1.2 2004/02/12 17:01:22 leonardop Exp $
-
-inherit gnome2
-
-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.0b )
-	!xine? ( >=media-libs/gstreamer-0.6.3
-		>=media-libs/gst-plugins-0.6.3
-		>=media-plugins/gst-plugins-gnomevfs-0.6.3
-		flac? ( >=media-plugins/gst-plugins-flac-0.6.3 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )
-		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.6.3 )
-		)
-	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"
-use flac && G2CONF="${G2CONF} --enable-flac"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4 ) \
-	--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
-
-}
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README THANKS TODO"
-
-export GST_INSPECT=/bin/true
diff --git a/media-sound/rhythmbox/rhythmbox-0.6.4.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.4.ebuild
deleted file mode 100644
index 17979f6a1205..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.6.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.4.ebuild,v 1.1 2004/01/12 22:23:40 foser Exp $
-
-inherit gnome2
-
-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.0b )
-	!xine? ( >=media-libs/gstreamer-0.6.3
-		>=media-libs/gst-plugins-0.6.3
-		>=media-plugins/gst-plugins-gnomevfs-0.6.3
-		flac? ( >=media-plugins/gst-plugins-flac-0.6.3 )
-		mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )
-		oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.6.3 )
-		)
-	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"
-use flac && G2CONF="${G2CONF} --enable-flac"
-
-G2CONF="${G2CONF} \
-	$(use_enable oggvorbis vorbis) \
-	$(use_enable mad mp3) \
-	$(use_enable faad mp4 ) \
-	--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
-
-}
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README THANKS TODO"
-
-export GST_INSPECT=/bin/true
diff --git a/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild b/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
index 8de101145530..b4adcdc67976 100644
--- a/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.1 2004/03/06 14:09:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.6.8.ebuild,v 1.2 2004/03/06 16:06:37 liquidx Exp $
 
 inherit gnome2
 
@@ -63,10 +63,7 @@ src_unpack( ) {
 	gnome2_omf_fix ${S}/help/C/Makefile.in
 
 	epatch ${FILESDIR}/${PN}-0.6.5-gcc2_fix.patch
-
-	if [ "${ARCH}" == "amd64" ]; then
-		epatch ${FILESDIR}/${P}-amd64.patch
-	fi
+	epatch ${FILESDIR}/${PN}-0.6.8-amd64.patch
 }
 
 DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \