New version with bugfixes and plugin updates. Prune lots of old files

(Portage version: 2.1.2-r6)

17 files changed, 22 insertions, 655 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index d85d9f8ae8ee..3b0cfec2e573 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.88 2007/02/14 15:46:41 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.89 2007/02/24 21:16:41 joem Exp $
+
+*rhythmbox-0.9.8 (25 Feb 2007)
+
+  25 Feb 2007; Joe McCann <joem@gentoo.org>
+  -files/rhythmbox-0.9.2-dbus-0.60.patch,
+  -files/rhythmbox-0.9.4_p1-libnotify.patch,
+  -files/rhythmbox-0.9.5-dbus-0.90.patch, -rhythmbox-0.9.4.1.ebuild,
+  -rhythmbox-0.9.5.ebuild, -rhythmbox-0.9.6.ebuild, -rhythmbox-0.9.7.ebuild,
+  -rhythmbox-0.9.7-r1.ebuild, -rhythmbox-0.9.7-r2.ebuild,
+  +rhythmbox-0.9.8.ebuild:
+  New version with bugfixes and plugin updates. Add back ~ia64 keyword that got
+  lost for some reason. Prune lots of old files
 
 *rhythmbox-0.9.7-r3 (14 Feb 2007)
 
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4.1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4.1
deleted file mode 100644
index c2a29f9daff2..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d725eb7134d1997efe28285715ebc05e rhythmbox-0.9.4.1.tar.bz2 2155482
-RMD160 5ce11aeae6631650cc4edfdbf46a7a13162d246f rhythmbox-0.9.4.1.tar.bz2 2155482
-SHA256 2d2305d575c7cc3a366ea9075efcb23b215da49b82b5b81ad3f8649a6cca80f6 rhythmbox-0.9.4.1.tar.bz2 2155482
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.5 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.5
deleted file mode 100644
index e970a3fa72f5..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff55e1db114321b7bdd6e21df1879367 rhythmbox-0.9.5.tar.bz2 2429543
-RMD160 b51fd8800d00fd8a8ad16e1ab511cb40630fd4f1 rhythmbox-0.9.5.tar.bz2 2429543
-SHA256 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43 rhythmbox-0.9.5.tar.bz2 2429543
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.6 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.6
deleted file mode 100644
index ab10caeef08f..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 805459eafd670b18c663ba478ad2ebd4 rhythmbox-0.9.6.tar.bz2 3129839
-RMD160 ce6c711ab06e19ced45bce0b3c445643e351c841 rhythmbox-0.9.6.tar.bz2 3129839
-SHA256 fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973 rhythmbox-0.9.6.tar.bz2 3129839
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7
deleted file mode 100644
index 9b731a17d661..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ca989c655c5931ce056af7ff311885b rhythmbox-0.9.7.tar.bz2 3231718
-RMD160 547643b40b36e4e0c18b6d817c37426ce585119f rhythmbox-0.9.7.tar.bz2 3231718
-SHA256 2fac1912a15c19841d4ca3188df7aa8c7aaa37dbbffb279b24259cc1281ff995 rhythmbox-0.9.7.tar.bz2 3231718
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r1
deleted file mode 100644
index 9b731a17d661..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ca989c655c5931ce056af7ff311885b rhythmbox-0.9.7.tar.bz2 3231718
-RMD160 547643b40b36e4e0c18b6d817c37426ce585119f rhythmbox-0.9.7.tar.bz2 3231718
-SHA256 2fac1912a15c19841d4ca3188df7aa8c7aaa37dbbffb279b24259cc1281ff995 rhythmbox-0.9.7.tar.bz2 3231718
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r2 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r2
deleted file mode 100644
index 9b731a17d661..000000000000
--- a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ca989c655c5931ce056af7ff311885b rhythmbox-0.9.7.tar.bz2 3231718
-RMD160 547643b40b36e4e0c18b6d817c37426ce585119f rhythmbox-0.9.7.tar.bz2 3231718
-SHA256 2fac1912a15c19841d4ca3188df7aa8c7aaa37dbbffb279b24259cc1281ff995 rhythmbox-0.9.7.tar.bz2 3231718
diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.9.8 b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.8
new file mode 100644
index 000000000000..206612843690
--- /dev/null
+++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.9.8
@@ -0,0 +1,3 @@
+MD5 648400feb794538207b4fe95f0917d1f rhythmbox-0.9.8.tar.bz2 3374502
+RMD160 df3363fac7009842c4541688dd43671c55311523 rhythmbox-0.9.8.tar.bz2 3374502
+SHA256 7561b01ca27f901e7b9a14e5b8813510c8e96041496527a4568a3624237b5525 rhythmbox-0.9.8.tar.bz2 3374502
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
deleted file mode 100644
index 6ef613eddd91..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.9.2-dbus-0.60.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/files/rhythmbox-0.9.4_p1-libnotify.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.4_p1-libnotify.patch
deleted file mode 100644
index 2601fdd90a58..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.9.4_p1-libnotify.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rhythmbox-0.9.4-old/widgets/eggtrayicon.c   2006-04-29 19:37:20.000000000 +0100
-+++ rhythmbox-0.9.4/widgets/eggtrayicon.c       2006-04-29 19:11:50.000000000 +0100
-@@ -574,7 +574,7 @@
-
-   if (pixbuf)
-     {
--#if (LIBNOTIFY_VERSION_MICRO < 2)
-+#if (LIBNOTIFY_VERSION_MINOR < 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/media-sound/rhythmbox/files/rhythmbox-0.9.5-dbus-0.90.patch b/media-sound/rhythmbox/files/rhythmbox-0.9.5-dbus-0.90.patch
deleted file mode 100644
index 49bbf6463212..000000000000
--- a/media-sound/rhythmbox/files/rhythmbox-0.9.5-dbus-0.90.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-2006-07-20  Claudio Saavedra  <csaavedra@alumnos.utalca.cl>
-
-* metadata/rb-metadata-dbus-client.c: (kill_metadata_service):
-* metadata/rb-metadata-dbus-service.c: (main): Replace calls to 
-deprecated dbus_connection_disconnect () with dbus_connection_close ().
-Fixes #348098.
-
-Index: metadata/rb-metadata-dbus-service.c
-===================================================================
-RCS file: /cvs/gnome/rhythmbox/metadata/rb-metadata-dbus-service.c,v
-retrieving revision 1.10
-retrieving revision 1.11
-diff -u -r1.10 -r1.11
---- metadata/rb-metadata-dbus-service.c	14 Jul 2006 12:27:15 -0000	1.10
-+++ metadata/rb-metadata-dbus-service.c	21 Jul 2006 04:36:16 -0000	1.11
-@@ -501,7 +501,11 @@
- 	g_main_loop_run (svc.loop);
- 
- 	if (svc.connection) {
-+#ifdef WITH_OLD_DBUS
- 		dbus_connection_disconnect (svc.connection);
-+#else
-+		dbus_connection_close (svc.connection);
-+#endif
- 		dbus_connection_unref (svc.connection);
- 	}
- 
-Index: metadata/rb-metadata-dbus-client.c
-===================================================================
-RCS file: /cvs/gnome/rhythmbox/metadata/rb-metadata-dbus-client.c,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- metadata/rb-metadata-dbus-client.c	14 Jul 2006 12:27:15 -0000	1.7
-+++ metadata/rb-metadata-dbus-client.c	21 Jul 2006 04:36:16 -0000	1.8
-@@ -119,7 +119,11 @@
- 	if (dbus_connection) {
- 		if (dbus_connection_get_is_connected (dbus_connection)) {
- 			rb_debug ("closing dbus connection");
-+#ifdef WITH_OLD_DBUS
- 			dbus_connection_disconnect (dbus_connection);
-+#else
-+			dbus_connection_close (dbus_connection);
-+#endif
- 		} else {
- 			rb_debug ("dbus connection already closed");
- 		}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.4.1.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.4.1.ebuild
deleted file mode 100644
index 552f98f3df91..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.9.4.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.4.1.ebuild,v 1.5 2006/11/19 20:17:00 cardoe Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="hal vorbis flac aac mad ipod avahi howl daap dbus libnotify musicbrainz
-tagwriting python"
-#I want tagwriting to be on by default in the future. It is just a local flag
-#now because it is still considered experimental by upstream and doesn't work
-#well with all formats
-
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.5.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2.7.4
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/nautilus-cd-burner-2.9.0
-	>=media-video/totem-1.1.5
-	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2
-	hal? ( ipod? ( >=media-libs/libgpod-0.2.0
-			>=sys-apps/hal-0.5 ) )
-	avahi? ( >=net-dns/avahi-0.6 )
-	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	>=media-libs/gst-plugins-base-0.10
-	>=media-plugins/gst-plugins-gnomevfs-0.10
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
-				>=media-plugins/gst-plugins-ogg-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	python? ( >=dev-lang/python-2.4.2
-				>=dev-python/pygtk-2.6 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-
-	if ! use avahi && ! use howl; then
-		if use daap ; then
-		ewarn "Daap support requires either howl or avahi"
-		ewarn "to be installed. Please remerge with either"
-		ewarn "USE=avahi or USE=howl"
-		fi
-	fi
-	if use howl || use avahi ; then
-		G2CONF="${G2CONF} $(use_enable daap)"
-	fi
-
-	if use howl ; then
-		G2CONF="${G2CONF} --with-mdns=howl"
-	fi
-
-	if use avahi ; then
-		G2CONF="${G2CONF} --with-mdns=avahi"
-	fi
-
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_enable ipod) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	--with-playback=gstreamer-0-10 \
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--with-metadata-helper \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/rhythmbox-0.9.4_p1-libnotify.patch
-	}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild
deleted file mode 100644
index 0f0ea79e35da..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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.5.ebuild,v 1.5 2006/11/19 20:17:00 cardoe Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="vorbis flac aac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
-tagwriting python"
-#I want tagwriting to be on by default in the future. It is just a local flag
-#now because it is still considered experimental by upstream and doesn't work
-#well with all formats
-
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.5.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2.7.4
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/nautilus-cd-burner-2.9.0
-	>=media-video/totem-1.1.5
-	>=x11-libs/libsexy-0.1.5
-	>=gnome-extra/gnome-media-2.14.0
-	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2
-	hal? ( ipod? ( >=media-libs/libgpod-0.2.0 )
-			>=sys-apps/hal-0.5 )
-	avahi? ( >=net-dns/avahi-0.6 )
-	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	>=media-libs/gst-plugins-base-0.10
-	>=media-plugins/gst-plugins-gnomevfs-0.10
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
-				>=media-plugins/gst-plugins-ogg-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	aac? ( >=media-plugins/gst-plugins-faad-0.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	python? ( >=dev-lang/python-2.4.2
-				>=dev-python/pygtk-2.6 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if ! use avahi && ! use howl; then
-		if use daap ; then
-		ewarn "Daap support requires either howl or avahi"
-		ewarn "to be installed. Please remerge with either"
-		ewarn "USE=avahi or USE=howl"
-		fi
-	fi
-	if use howl || use avahi ; then
-		G2CONF="${G2CONF} $(use_enable daap)"
-	fi
-
-	if use howl ; then
-		G2CONF="${G2CONF} --with-mdns=howl"
-	fi
-
-	if use avahi ; then
-		G2CONF="${G2CONF} --with-mdns=avahi"
-	fi
-
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_with ipod) \
-	$(use_enable ipod ipod-writing) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	$(use_enable lirc) \
-	--with-playback=gstreamer-0-10 \
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--enable-track-transfer \
-	--with-metadata-helper \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${P}-dbus-0.90.patch"
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.6.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.6.ebuild
deleted file mode 100644
index 5baca72b75d7..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.9.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.6.ebuild,v 1.6 2007/01/23 04:17:40 joem Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc sparc ~x86"
-IUSE="vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
-tagwriting python"
-#I want tagwriting to be on by default in the future. It is just a local flag
-#now because it is still considered experimental by upstream and doesn't work
-#well with all formats
-
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.5.4
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2.7.4
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/nautilus-cd-burner-2.9.0
-	>=media-video/totem-1.1.5
-	>=x11-libs/libsexy-0.1.5
-	>=gnome-extra/gnome-media-2.14.0
-	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2
-	hal? ( ipod? ( >=media-libs/libgpod-0.2.0 )
-			>=sys-apps/hal-0.5 )
-	avahi? ( >=net-dns/avahi-0.6 )
-	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	>=media-libs/gst-plugins-base-0.10
-	>=media-plugins/gst-plugins-gnomevfs-0.10
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
-				>=media-plugins/gst-plugins-ogg-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	python? ( >=dev-lang/python-2.4.2
-				>=dev-python/pygtk-2.6
-				>=dev-python/gnome-python-2.12 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if ! use avahi && ! use howl; then
-		if use daap ; then
-		ewarn "Daap support requires either howl or avahi"
-		ewarn "to be installed. Please remerge with either"
-		ewarn "USE=avahi or USE=howl"
-		fi
-	fi
-	if use howl || use avahi ; then
-		G2CONF="${G2CONF} $(use_enable daap)"
-	fi
-
-	if use howl ; then
-		G2CONF="${G2CONF} --with-mdns=howl"
-	fi
-
-	if use avahi ; then
-		G2CONF="${G2CONF} --with-mdns=avahi"
-	fi
-
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_with ipod) \
-	$(use_enable ipod ipod-writing) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	$(use_enable lirc) \
-	--with-playback=gstreamer-0-10 \
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--enable-track-transfer \
-	--with-metadata-helper \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "The aac flag has been removed from rhythmbox."
-	elog "This is due to stabilization issues with any gst-bad plugins."
-	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
-	elog "See bug #159538 for more information"
-}
-
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild
deleted file mode 100644
index ca7e28c1e9b0..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.7-r1.ebuild,v 1.1 2007/02/02 21:50:32 joem Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
-tagwriting python keyring"
-#I want tagwriting to be on by default in the future. It is just a local flag
-#now because it is still considered experimental by upstream and doesn't work
-#well with all formats due to gstreamer limitation.
-
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2.7.4
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/nautilus-cd-burner-2.11.3
-	>=media-video/totem-1.1.5
-	>=x11-libs/libsexy-0.1.5
-	>=gnome-extra/gnome-media-2.14.0
-	>=media-plugins/gst-plugins-cdparanoia-0.10
-	keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2.99
-	hal? ( ipod? ( >=media-libs/libgpod-0.4 )
-			>=sys-apps/hal-0.5 )
-	avahi? ( >=net-dns/avahi-0.6 )
-	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	>=media-libs/gst-plugins-base-0.10
-	>=media-plugins/gst-plugins-gnomevfs-0.10
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
-				>=media-plugins/gst-plugins-ogg-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	python? ( >=dev-lang/python-2.4.2
-				>=dev-python/pygtk-2.8
-				>=dev-python/gnome-python-2.12 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if ! use avahi && ! use howl; then
-		if use daap ; then
-		ewarn "Daap support requires either howl or avahi"
-		ewarn "to be installed. Please remerge with either"
-		ewarn "USE=avahi or USE=howl"
-		fi
-	fi
-	if use howl || use avahi ; then
-		G2CONF="${G2CONF} $(use_enable daap)"
-	fi
-
-	if use howl ; then
-		G2CONF="${G2CONF} --with-mdns=howl"
-	fi
-
-	if use avahi ; then
-		G2CONF="${G2CONF} --with-mdns=avahi"
-	fi
-
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_with ipod) \
-	$(use_enable ipod ipod-writing) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	$(use_enable lirc) \
-	$(use_with keyring gnome-keyring)
-	--with-playback=gstreamer-0-10 \
-	--with-cd-burning
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--enable-track-transfer \
-	--with-metadata-helper \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-daap_fix.patch
-	gnome2_omf_fix
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "The aac flag has been removed from rhythmbox."
-	elog "This is due to stabilization issues with any gst-bad plugins."
-	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
-	elog "See bug #159538 for more information"
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild
deleted file mode 100644
index a8857401db1a..000000000000
--- a/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.7-r2.ebuild,v 1.1 2007/02/13 21:04:12 dang Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Music management and playback software for GNOME"
-HOMEPAGE="http://www.rhythmbox.org/"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
-tagwriting python keyring"
-#I want tagwriting to be on by default in the future. It is just a local flag
-#now because it is still considered experimental by upstream and doesn't work
-#well with all formats due to gstreamer limitation.
-
-SLOT="0"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2.7.4
-	>=gnome-base/libbonobo-2
-	>=gnome-extra/nautilus-cd-burner-2.11.3
-	>=media-video/totem-1.1.5
-	>=x11-libs/libsexy-0.1.5
-	>=gnome-extra/gnome-media-2.14.0
-	>=media-plugins/gst-plugins-cdparanoia-0.10
-	keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
-	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2.99
-	hal? ( ipod? ( >=media-libs/libgpod-0.4 )
-			>=sys-apps/hal-0.5 )
-	avahi? ( >=net-dns/avahi-0.6 )
-	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	>=media-libs/gst-plugins-base-0.10
-	>=media-plugins/gst-plugins-gnomevfs-0.10
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10
-				>=media-plugins/gst-plugins-ogg-0.10 )
-	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	python? ( >=dev-lang/python-2.4.2
-				>=dev-python/pygtk-2.8
-				>=dev-python/gnome-python-2.12 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	app-text/scrollkeeper"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-
-	if ! use avahi && ! use howl; then
-		if use daap ; then
-		ewarn "Daap support requires either howl or avahi"
-		ewarn "to be installed. Please remerge with either"
-		ewarn "USE=avahi or USE=howl"
-		fi
-	fi
-	if use howl || use avahi ; then
-		G2CONF="${G2CONF} $(use_enable daap)"
-	fi
-
-	if use howl ; then
-		G2CONF="${G2CONF} --with-mdns=howl"
-	fi
-
-	if use avahi ; then
-		G2CONF="${G2CONF} --with-mdns=avahi"
-	fi
-
-	G2CONF="${G2CONF} \
-	$(use_enable tagwriting tag-writing) \
-	$(use_with ipod) \
-	$(use_enable ipod ipod-writing) \
-	$(use_enable musicbrainz) \
-	$(use_with dbus) \
-	$(use_enable python) \
-	$(use_enable libnotify) \
-	$(use_enable lirc) \
-	$(use_with keyring gnome-keyring)
-	--with-playback=gstreamer-0-10 \
-	--with-cd-burning
-	--enable-mmkeys \
-	--enable-audioscrobbler \
-	--enable-track-transfer \
-	--with-metadata-helper \
-	--disable-schemas-install"
-
-DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \
-	  MAINTAINERS NEWS README README.iPod THANKS TODO"
-
-export GST_INSPECT=/bin/true
-USE_DESTDIR=1
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${P}-daap_fix.patch
-	epatch "${FILESDIR}"/${P}-excessive-notification.patch
-	gnome2_omf_fix
-}
-
-src_compile() {
-	addpredict "$(unset HOME; echo ~)/.gconf"
-	addpredict "$(unset HOME; echo ~)/.gconfd"
-	gnome2_src_compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "The aac flag has been removed from rhythmbox."
-	elog "This is due to stabilization issues with any gst-bad plugins."
-	elog "Please emerge gst-plugins-bad and gst-plugins-faad to be able to play m4a files"
-	elog "See bug #159538 for more information"
-}
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.7.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
index 478edf56f7e0..8f073c79ae0d 100644
--- a/media-sound/rhythmbox/rhythmbox-0.9.7.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.7.ebuild,v 1.4 2007/01/23 04:17:40 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.8.ebuild,v 1.1 2007/02/24 21:16:41 joem Exp $
 
 inherit gnome2 eutils
 
 DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc vorbis flac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
 tagwriting python keyring"
 #I want tagwriting to be on by default in the future. It is just a local flag
 #now because it is still considered experimental by upstream and doesn't work
@@ -25,9 +25,10 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=media-video/totem-1.1.5
 	>=x11-libs/libsexy-0.1.5
 	>=gnome-extra/gnome-media-2.14.0
+	>=media-plugins/gst-plugins-cdparanoia-0.10
 	keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
-	>=net-libs/libsoup-2.2
+	>=net-libs/libsoup-2.2.99
 	hal? ( ipod? ( >=media-libs/libgpod-0.4 )
 			>=sys-apps/hal-0.5 )
 	avahi? ( >=net-dns/avahi-0.6 )
@@ -47,7 +48,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
+	>=dev-util/intltool-0.35
 	app-text/scrollkeeper"
 
 MAKEOPTS="${MAKEOPTS} -j1"