keyring to gnome-keyring

(Portage version: 2.1.4.4)

4 files changed, 17 insertions, 13 deletions

diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog
index a69daaef1747..347a5944dbd6 100644
--- a/media-sound/rhythmbox/ChangeLog
+++ b/media-sound/rhythmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rhythmbox
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.121 2008/04/20 15:50:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.122 2008/04/21 17:17:50 welp Exp $
+
+  21 Apr 2008; <welp@gentoo.org> rhythmbox-0.10.1-r1.ebuild,
+  rhythmbox-0.11.2-r1.ebuild, rhythmbox-0.11.5.ebuild:
+  keyring to gnome-keyring
 
   20 Apr 2008; Raúl Porcel <armin76@gentoo.org> rhythmbox-0.10.1-r1.ebuild,
   rhythmbox-0.11.2-r1.ebuild:
diff --git a/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
index 8103fd86abc8..ce77ec45c2a9 100644
--- a/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild,v 1.9 2008/04/20 15:50:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.10.1-r1.ebuild,v 1.10 2008/04/21 17:17:50 welp Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -9,7 +9,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python keyring"
+IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python gnome-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.
@@ -26,7 +26,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=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 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	musicbrainz? ( >=media-libs/musicbrainz-2.1 )
 	>=net-libs/libsoup-2.2.99:2.2
 	lirc? ( app-misc/lirc )
@@ -72,7 +72,7 @@ pkg_setup() {
 	$(use_enable python) \
 	$(use_enable libnotify) \
 	$(use_enable lirc) \
-	$(use_with keyring gnome-keyring)
+	$(use_with gnome-keyring)
 	--with-playback=gstreamer-0-10 \
 	--with-cd-burning
 	--enable-mmkeys \
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
index e13122444c56..265dc5e676c3 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild,v 1.6 2008/04/20 15:50:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.2-r1.ebuild,v 1.7 2008/04/21 17:17:50 welp Exp $
 
 EAPI="1"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python keyring"
+IUSE="doc vorbis flac mad ipod hal daap dbus libnotify lirc musicbrainz tagwriting python gnome-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.
@@ -29,7 +29,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	>=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 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	musicbrainz? ( >=media-libs/musicbrainz-2.1:1 )
 	>=net-libs/libsoup-2.2.99:2.2
 	lirc? ( app-misc/lirc )
@@ -75,7 +75,7 @@ pkg_setup() {
 		$(use_enable python)
 		$(use_enable libnotify)
 		$(use_enable lirc)
-		$(use_with keyring gnome-keyring)
+		$(use_with gnome-keyring)
 		--with-playback=gstreamer-0-10
 		--with-cd-burning
 		--enable-mmkeys
diff --git a/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild b/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild
index d61ee20f23c3..5fdda5a20b45 100644
--- a/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild,v 1.3 2008/04/15 01:33:08 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.11.5.ebuild,v 1.4 2008/04/21 17:17:50 welp Exp $
 
 EAPI="1"
 
@@ -10,7 +10,7 @@ DESCRIPTION="Music management and playback software for GNOME"
 HOMEPAGE="http://www.rhythmbox.org/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="daap dbus doc hal ipod keyring libnotify lirc musicbrainz mtp python tagwriting"
+IUSE="daap dbus doc hal ipod gnome-keyring libnotify lirc musicbrainz mtp python 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
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	>=gnome-extra/nautilus-cd-burner-2.13
 	>=x11-libs/libsexy-0.1.5
 	>=gnome-extra/gnome-media-2.14.0
-	keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-0.4.9 )
 	musicbrainz? ( >=media-libs/musicbrainz-2.1:1 )
 	>=net-libs/libsoup-2.4:2.4
 	lirc? ( app-misc/lirc )
@@ -91,7 +91,7 @@ pkg_setup() {
 		$(use_enable python)
 		$(use_enable libnotify)
 		$(use_enable lirc)
-		$(use_with keyring gnome-keyring)
+		$(use_with gnome-keyring)
 		--with-playback=gstreamer-0-10
 		--with-cd-burning
 		--enable-mmkeys