summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2012-03-25 11:04:12 +0530
committerNirbheek Chauhan <nirbheek@gentoo.org>2012-03-26 13:49:37 +0530
commit3ffc23fa3db561a5c585185e2a19dec6eac71d34 (patch)
tree35d850d962341338b20e96d106a30c67cc7c64ce
parentapp-crypt/gcr: 3.3.5 → 3.3.92 (diff)
downloadgnome-3ffc23fa3db561a5c585185e2a19dec6eac71d34.tar.gz
gnome-3ffc23fa3db561a5c585185e2a19dec6eac71d34.tar.bz2
gnome-3ffc23fa3db561a5c585185e2a19dec6eac71d34.zip
gnome-base/gnome-keyring: 3.3.5 → 3.3.92
-rw-r--r--gnome-base/gnome-keyring/Manifest6
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild (renamed from gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild)10
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-9999.ebuild5
3 files changed, 15 insertions, 6 deletions
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 98ed5892..29d4eb04 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,3 @@
-DIST gnome-keyring-3.3.5.tar.xz 1087908 RMD160 e58f603a7e5761793acbfbd61cabd03d2b63404f SHA1 94fa7d71edaca65cf0d730b1c5b416f0ea71322f SHA256 25a6b87d10dbb34ea2b634f97aa018260cf1a4e75fe3ba663ce313f30698a419
-EBUILD gnome-keyring-3.3.5.ebuild 2830 RMD160 c4db100cf4a123fa811355e37f0074fd9ecc6249 SHA1 d7376d8bd56bc8149b87d3fdf331a4d658a2eb2f SHA256 e5250b615437cd929144874b59da3f4921e62070bea61e9b48d11268c18b4586
-EBUILD gnome-keyring-9999.ebuild 2930 RMD160 bff5a8b8aa15a2e265db030d8905a216ed035900 SHA1 e15a90c47b50b5b3dd96cfd0f9cd6564d7f2496e SHA256 5214d1cd7088a1159c171b1ca42f98eca5246319e62229bd941b08760e9ce55f
+DIST gnome-keyring-3.3.92.tar.xz 1101656 RMD160 d2e4f65a466ed4559e738ddd754354530e625300 SHA1 ffe473449c4a2fd9db37000484dfc83caef25880 SHA256 968bb7a099214259b333ed0e9f88960da59228b05e18817b7e679b6a8de48a2e
+EBUILD gnome-keyring-3.3.92.ebuild 3002 RMD160 5fb05563546b5d1d41ec992358742b185def3a92 SHA1 a796a03949936a30148997b429e2eaf11aa2536a SHA256 4d4fb42fadd5b0b7ccdbca1540e4d19eacd59c501629c475d32651a35d140e4f
+EBUILD gnome-keyring-9999.ebuild 3002 RMD160 5fb05563546b5d1d41ec992358742b185def3a92 SHA1 a796a03949936a30148997b429e2eaf11aa2536a SHA256 4d4fb42fadd5b0b7ccdbca1540e4d19eacd59c501629c475d32651a35d140e4f
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.3.5.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.3.92.ebuild
index d24922da..722708d9 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 66538283..722708d9 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"
}