From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-442520-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1SC5Au-00025Q-W6
for garchives@archives.gentoo.org; Mon, 26 Mar 2012 08:21:13 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B60BDE05A1;
Mon, 26 Mar 2012 08:20:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 74F02E058F
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Mar 2012 08:20:09 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B45E3643ED
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Mar 2012 08:20:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 4CB5DE542E
for <gentoo-commits@lists.gentoo.org>; Mon, 26 Mar 2012 08:20:06 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <1332749977.3ffc23fa3db561a5c585185e2a19dec6eac71d34.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-keyring/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild gnome-base/gnome-keyring/gnome-keyring-9999.ebuild
X-VCS-Directories: gnome-base/gnome-keyring/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 3ffc23fa3db561a5c585185e2a19dec6eac71d34
X-VCS-Branch: master
Date: Mon, 26 Mar 2012 08:20:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 2d033742-dfe0-4ae5-bc25-b5336fe41679
X-Archives-Hash: cd5e404b84d7fcc2fab08662f7dd53ed
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=3Dproj/gnome.git;a=3D=
commit;h=3D3ffc23fa
gnome-base/gnome-keyring: 3.3.5 =E2=86=92 3.3.92
---
...ng-3.3.5.ebuild =3D> 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=3D"no"
GNOME2_LA_PUNT=3D"yes"
=20
inherit gnome2 pam versionator virtualx
+if [[ ${PV} =3D 9999 ]]; then
+ inherit gnome2-live
+fi
=20
DESCRIPTION=3D"Password and keyring managing daemon"
HOMEPAGE=3D"http://www.gnome.org/"
@@ -14,7 +17,11 @@ HOMEPAGE=3D"http://www.gnome.org/"
LICENSE=3D"GPL-2 LGPL-2"
SLOT=3D"0"
IUSE=3D"+caps debug doc pam selinux"
-KEYWORDS=3D"~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris =
~x86-linux ~x86-solaris"
+if [[ ${PV} =3D 9999 ]]; then
+ KEYWORDS=3D""
+else
+ KEYWORDS=3D"~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris=
~x86-linux ~x86-solaris"
+fi
=20
RDEPEND=3D">=3Dapp-crypt/gcr-3.3.4
>=3Ddev-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=3D${EPREFIX}/etc/ssl/certs/
+ --with-ca-certificates=3D${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-b=
ase/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-keyrin=
g-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-keyrin=
g-3.2.2.ebuild,v 1.4 2011/11/18 04:41:30 tetromino Exp $
=20
EAPI=3D"4"
GCONF_DEBUG=3D"no"
GNOME2_LA_PUNT=3D"yes"
=20
-inherit gnome2 multilib pam virtualx
+inherit gnome2 pam versionator virtualx
if [[ ${PV} =3D 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=3D${EPREFIX}/etc/ssl/certs/
+ --with-ca-certificates=3D${EPREFIX}/etc/ssl/certs/ca-certificates.crt
--enable-ssh-agent
--enable-gpg-agent"
}