keyring to gnome-keyring

(Portage version: 2.1.4.4)

4 files changed, 17 insertions, 13 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 042193d5a41c..957e78d81c46 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.7 2008/04/15 02:47:41 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.8 2008/04/21 17:08:49 welp Exp $
+
+  21 Apr 2008; <welp@gentoo.org> gvfs-0.2.1.ebuild, gvfs-0.2.2.ebuild,
+  gvfs-0.2.3.ebuild:
+  keyring to gnome-keyring
 
   15 Apr 2008; Daniel Gryniewicz <dang@gentoo.org> gvfs-0.2.3.ebuild:
   Check for minimal use flag in libcdio; bug #217385
diff --git a/gnome-base/gvfs/gvfs-0.2.1.ebuild b/gnome-base/gvfs/gvfs-0.2.1.ebuild
index 5ddbe969c5b2..28b00a7f3574 100644
--- a/gnome-base/gvfs/gvfs-0.2.1.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.1.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/gnome-base/gvfs/gvfs-0.2.1.ebuild,v 1.4 2008/04/12 13:44:26 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.1.ebuild,v 1.5 2008/04/21 17:08:49 welp Exp $
 
 inherit autotools gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal keyring samba"
+IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
 
 RDEPEND=">=dev-libs/glib-2.16
 		 >=sys-apps/dbus-1.0
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16
 			dev-libs/expat
 			)
 		 gphoto2? ( >=media-libs/libgphoto2-2.4 )
-		 keyring? ( >=gnome-base/gnome-keyring-1.0 )
+		 gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
 		 samba? ( >=net-fs/samba-3 )"
 DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.35
@@ -50,6 +50,6 @@ pkg_setup() {
 			$(use_enable gnome gconf)
 			$(use_enable gphoto2)
 			$(use_enable hal)
-			$(use_enable keyring)
+			$(use_enable gnome-keyring keyring)
 			$(use_enable samba)"
 }
diff --git a/gnome-base/gvfs/gvfs-0.2.2.ebuild b/gnome-base/gvfs/gvfs-0.2.2.ebuild
index 92b0b264c038..a980af42f746 100644
--- a/gnome-base/gvfs/gvfs-0.2.2.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.2.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/gnome-base/gvfs/gvfs-0.2.2.ebuild,v 1.3 2008/04/12 13:44:26 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.2.ebuild,v 1.4 2008/04/21 17:08:49 welp Exp $
 
 inherit autotools gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal keyring samba"
+IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
 
 RDEPEND=">=dev-libs/glib-2.16
 		 >=sys-apps/dbus-1.0
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16
 			dev-libs/expat
 			)
 		 gphoto2? ( >=media-libs/libgphoto2-2.4 )
-		 keyring? ( >=gnome-base/gnome-keyring-1.0 )
+		 gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
 		 samba? ( >=net-fs/samba-3 )"
 DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.35
@@ -50,6 +50,6 @@ pkg_setup() {
 			$(use_enable gnome gconf)
 			$(use_enable gphoto2)
 			$(use_enable hal)
-			$(use_enable keyring)
+			$(use_enable gnome-keyring keyring)
 			$(use_enable samba)"
 }
diff --git a/gnome-base/gvfs/gvfs-0.2.3.ebuild b/gnome-base/gvfs/gvfs-0.2.3.ebuild
index ab280c574dfb..8879e5ff9793 100644
--- a/gnome-base/gvfs/gvfs-0.2.3.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.3.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/gnome-base/gvfs/gvfs-0.2.3.ebuild,v 1.3 2008/04/15 02:47:41 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.3.ebuild,v 1.4 2008/04/21 17:08:49 welp Exp $
 
 inherit autotools gnome2 eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal keyring samba"
+IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
 
 RDEPEND=">=dev-libs/glib-2.16
 		 >=sys-apps/dbus-1.0
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16
 			dev-libs/expat
 			)
 		 gphoto2? ( >=media-libs/libgphoto2-2.4 )
-		 keyring? ( >=gnome-base/gnome-keyring-1.0 )
+		 gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
 		 samba? ( >=net-fs/samba-3 )"
 DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.35
@@ -50,7 +50,7 @@ pkg_setup() {
 			$(use_enable gnome gconf)
 			$(use_enable gphoto2)
 			$(use_enable hal)
-			$(use_enable keyring)
+			$(use_enable gnome-keyring keyring)
 			$(use_enable samba)"
 
 	if use cdda && built_with_use dev-libs/libcdio minimal; then