Change pda useflag to ipod since it now brings in new deps such as hal which don't work well on some archs. This makes it easier for archs to use.mask this feature. Suggested by gustavoz.

Package-Manager: portage-2.0.53_rc7

3 files changed, 12 insertions, 7 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index 21e3775b3939..04a483f1929f 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.58 2005/11/29 05:07:00 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.59 2005/11/29 18:29:50 joem Exp $
+
+  29 Nov 2005; Joe McCann <joem@gentoo.org> rhythmbox-0.9.2.ebuild:
+  Change pda useflag to ipod since it now brings in new deps such as hal which
+  don't work well on some archs. This makes it easier for archs to use.mask
+  this feature. Suggested by gustavoz.
 
 *rhythmbox-0.9.2 (29 Nov 2005)
 
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 7b486e92502f..6fee4826c5b1 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,4 +1,4 @@
-MD5 75c913055e8f2d8cce2b84a5df300d4c ChangeLog 6797
+MD5 e07b6635904539b9707fdf40ec79bac1 ChangeLog 7060
 MD5 44a42f72ca8c0f3136fded12f1aa7172 files/digest-rhythmbox-0.8.8-r1 69
 MD5 518953859231ab23eec13b7d8a004fdc files/digest-rhythmbox-0.9.2 69
 MD5 7c49ce1b3d4a78dc9adba805fd3b82fb files/rhythmbox-0.8.7-gst_shn_support.patch 665
@@ -6,4 +6,4 @@ MD5 a3ff016aec5eec7277e2598ad013b80a files/rhythmbox-0.8.8-empty-xlib.patch 496
 MD5 9f5bc9bf255b78cc67342f9fc9423ef6 files/rhythmbox-0.8.8-ipod.patch 809
 MD5 e854b7f54a4de6256186cbdcaabbc1ec metadata.xml 200
 MD5 ff60c2d320a8e0e8e55bfac395f77eb3 rhythmbox-0.8.8-r1.ebuild 2636
-MD5 76b37bbc0a6d49860e80a1a84289d987 rhythmbox-0.9.2.ebuild 2461
+MD5 3dc10bf05eafbf9b4b8db51c3630a0ec rhythmbox-0.9.2.ebuild 2459
diff --git a/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild b/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild
index 6d81d8d07b7e..2e90c81c3e65 100644
--- a/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild,v 1.3 2005/11/29 05:54:46 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.9.2.ebuild,v 1.4 2005/11/29 18:29:50 joem Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 
 KEYWORDS="~x86"
-IUSE="vorbis flac aac mad pda avahi howl daap dbus musicbrainz tagwriting"
+IUSE="vorbis flac aac mad ipod avahi howl daap dbus musicbrainz tagwriting"
 #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
@@ -25,7 +25,7 @@ RDEPEND=">=x11-libs/gtk+-2.5.4
 	>=media-video/totem-1.1.5
 	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
 	>=net-libs/libsoup-2.2
-	pda? ( >=media-libs/libgpod-0.2.0
+	ipod? ( >=media-libs/libgpod-0.2.0
 			>=sys-apps/hal-0.5 )
 	avahi? ( >=net-dns/avahi-0.5 )
 	!avahi? ( howl? ( >=net-misc/howl-0.9.8 ) )
@@ -67,7 +67,7 @@ pkg_setup() {
 	fi
 
 	G2CONF="${G2CONF} \
-	$(use_enable pda ipod) \
+	$(use_enable ipod) \
 	$(use_enable musicbrainz) \
 	$(use_with dbus) \
 	$(use_enable tagwriting tag-writing) \