keyring to gnome-keyring

(Portage version: 2.1.4.4)

5 files changed, 22 insertions, 17 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index ef9a641aedaa..79dd5c458bf6 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.176 2008/04/07 21:02:16 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.177 2008/04/21 17:13:30 welp Exp $
+
+  21 Apr 2008; <welp@gentoo.org> evolution-data-server-1.12.1.ebuild,
+  evolution-data-server-1.12.3.ebuild, evolution-data-server-2.22.0.ebuild,
+  evolution-data-server-2.22.1.ebuild:
+  keyring to gnome-keyring
 
 *evolution-data-server-2.22.1 (07 Apr 2008)
 
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild
index 11a5d4e7a16b..aae183bd74be 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.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-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild,v 1.10 2008/01/29 16:54:15 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.1.ebuild,v 1.11 2008/04/21 17:13:30 welp Exp $
 EAPI="1"
 
 inherit db-use eutils flag-o-matic gnome2 autotools
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
 
 RDEPEND=">=x11-libs/gtk+-2.10
 	>=gnome-base/orbit-2.9.8
@@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=dev-libs/libxml2-2
-	keyring? ( gnome-base/gnome-keyring )
+	gnome-keyring? ( gnome-base/gnome-keyring )
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
@@ -47,7 +47,7 @@ pkg_setup() {
 		$(use_enable ssl nss)               \
 		$(use_enable ssl smime)             \
 		$(use_enable ipv6)                  \
-		$(use_enable keyring gnome-keyring) \
+		$(use_enable gnome-keyring) \
 		--with-libdb=/usr/$(get_libdir)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild
index e2edcefdb663..c2d077237e81 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.12.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-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.11 2008/04/20 02:10:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.3.ebuild,v 1.12 2008/04/21 17:13:30 welp Exp $
 EAPI="1"
 
 inherit db-use eutils flag-o-matic gnome2 autotools
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
 
 RDEPEND=">=x11-libs/gtk+-2.10
 	>=gnome-base/orbit-2.9.8
@@ -21,7 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=dev-libs/libxml2-2
-	keyring? ( gnome-base/gnome-keyring )
+	gnome-keyring? ( gnome-base/gnome-keyring )
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
@@ -47,7 +47,7 @@ pkg_setup() {
 		$(use_enable ssl nss)               \
 		$(use_enable ssl smime)             \
 		$(use_enable ipv6)                  \
-		$(use_enable keyring gnome-keyring) \
+		$(use_enable gnome-keyring) \
 		--with-libdb=/usr/$(get_libdir)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.22.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.22.0.ebuild
index 556d72e406f0..f3cb765fe599 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.22.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.22.0.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-extra/evolution-data-server/evolution-data-server-2.22.0.ebuild,v 1.3 2008/03/25 16:13:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.22.0.ebuild,v 1.4 2008/04/21 17:13:30 welp Exp $
 
 inherit db-use eutils flag-o-matic gnome2 autotools
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
 
 RDEPEND=">=dev-libs/glib-2.15.3
 	>=x11-libs/gtk+-2.10
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.15.3
 	>=gnome-base/libgnome-2
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.4
-	keyring? ( >=gnome-base/gnome-keyring-2.20 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
@@ -49,7 +49,7 @@ pkg_setup() {
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable ipv6)
-		$(use_enable keyring gnome-keyring)
+		$(use_enable gnome-keyring)
 		--with-libdb=/usr/$(get_libdir)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.ebuild
index df7804520dd6..6bb2131374ce 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.22.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-extra/evolution-data-server/evolution-data-server-2.22.1.ebuild,v 1.1 2008/04/07 21:02:16 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.22.1.ebuild,v 1.2 2008/04/21 17:13:30 welp Exp $
 
 inherit db-use eutils flag-o-matic gnome2 autotools
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/projects/evolution/"
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl"
 
 RDEPEND=">=dev-libs/glib-2.15.3
 	>=x11-libs/gtk+-2.10
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.15.3
 	>=gnome-base/libgnome-2
 	>=dev-libs/libxml2-2
 	>=net-libs/libsoup-2.4
-	keyring? ( >=gnome-base/gnome-keyring-2.20 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
 	ssl? (
 		>=dev-libs/nspr-4.4
 		>=dev-libs/nss-3.9 )
@@ -49,7 +49,7 @@ pkg_setup() {
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
 		$(use_enable ipv6)
-		$(use_enable keyring gnome-keyring)
+		$(use_enable gnome-keyring)
 		--with-libdb=/usr/$(get_libdir)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then