--- /usr/portage/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild	2006-10-16 06:06:05.000000000 +0200
+++ rhythmbox/rhythmbox-0.9.6.ebuild	2006-10-30 12:11:13.580673500 +0100
@@ -1,15 +1,15 @@
 # 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.4 2006/10/16 03:41:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.5.ebuild,v 1.2 2006/06/27 13:28:34 joem Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="vorbis flac aac mad ipod avahi hal howl daap dbus libnotify lirc musicbrainz
-tagwriting python"
+tagwriting python cdr gnome"
 #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
@@ -24,7 +24,8 @@
 	>=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
+	gnome? ( >=gnome-extra/gnome-media-2.14.0
+				>=gnome-base/gnome-keyring-0.4.9 )
 	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
 	>=net-libs/libsoup-2.2
 	hal? ( ipod? ( >=media-libs/libgpod-0.2.0 )
@@ -50,6 +51,13 @@
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${PN}-0.9.6-audiocd-musicbrainz-symbols.patch
+	eautomake
+}
+
 pkg_setup() {
 
 	if ! use avahi && ! use howl; then
@@ -72,6 +80,10 @@
 	fi
 
 	G2CONF="${G2CONF} \
+	$(use_with cdr cd-burning ) \
+	$(use_with hal) \
+	$(use_with gnome gnome-keyring) \
+	$(use_enable gnome track-transfer) \
 	$(use_enable tagwriting tag-writing) \
 	$(use_with ipod) \
 	$(use_enable ipod ipod-writing) \
@@ -83,7 +95,6 @@
 	--with-playback=gstreamer-0-10 \
 	--enable-mmkeys \
 	--enable-audioscrobbler \
-	--enable-track-transfer \
 	--with-metadata-helper \
 	--disable-schemas-install"
 
@@ -94,12 +105,6 @@
 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"