[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     3ffc23fa3db561a5c585185e2a19dec6eac71d34
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 05:34:12 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3ffc23fa

gnome-base/gnome-keyring: 3.3.5 → 3.3.92

---
 ...ng-3.3.5.ebuild => gnome-keyring-3.3.92.ebuild} |   10 +++++++++-
 gnome-base/gnome-keyring/gnome-keyring-9999.ebuild |    5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
similarity index 91%
rename from gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
rename to gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
index d24922d..722708d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
@@ -7,6 +7,9 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 pam versionator virtualx
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -14,7 +17,11 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 IUSE="+caps debug doc pam selinux"
-KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+fi
 
 RDEPEND=">=app-crypt/gcr-3.3.4
 	>=dev-libs/glib-2.28:2
@@ -47,6 +54,7 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		$(use_enable selinux)
 		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
 }

diff --git a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
index 6653828..722708d 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.32.1.ebuild,v 1.4 2011/01/02 21:32:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 multilib pam virtualx
+inherit gnome2 pam versionator virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -54,6 +54,7 @@ pkg_setup() {
 		$(use_with pam pam-dir $(getpam_mod_dir))
 		$(use_enable selinux)
 		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
 		--enable-ssh-agent
 		--enable-gpg-agent"
 }