Bump to 3.2.1 from the gnome overlay. Now gtk3-only, and uses p11-kit. Drop alpha, arm, ia64, ppc, ppc64, sparc keywords due to p11-kit. Keywording bug will be filed for all of gnome-3.2.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

3 files changed, 129 insertions, 7 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index b28c5e295bb1..32ab884d2632 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.211 2011/10/28 19:59:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.212 2011/10/30 07:21:57 tetromino Exp $
+
+*gnome-keyring-3.2.1 (30 Oct 2011)
+
+  30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-keyring-3.2.1.ebuild:
+  Bump to 3.2.1 from the gnome overlay. Now gtk3-only, and uses p11-kit. Drop
+  alpha, arm, ia64, ppc, ppc64, sparc keywords due to p11-kit.
 
   28 Oct 2011; Markus Meier <maekke@gentoo.org> gnome-keyring-2.32.1-r1.ebuild:
   arm stable, bug #385699
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index 66e90e61347f..c3b6aedbc66c 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-keyring-2.32.1-fix-undefined.patch 783 RMD160 76c20ef4bf5aaa1ed4d7b06a48fb6951729fa375 SHA1 f15c02accedad0890fcbcd98c2125dac582d6296 SHA256 a7b0d99728960af4e81e97941fc1aa9f06e49b7ed06669ab17d72628cd05e408
 AUX gnome-keyring-3.0.2-automagic-libcap.patch 1953 RMD160 1f582e4f93eeeef9f2dfc37f322a5b24f46d248d SHA1 b9ec3b143e52f81f0b5b96433ac85ab197e421e3 SHA256 04ec9831f5c25773febb4c49189a15172c7de5b9c4a19db379efe61cb1e159e6
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 RMD160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec SHA1 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
 DIST gnome-keyring-3.0.3.tar.bz2 1911499 RMD160 0cd4d6fcf82763f3d9cf754717a4c6a03ed14524 SHA1 93bc31442d2e298f89e94f4d424192faccbf382d SHA256 a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e
+DIST gnome-keyring-3.2.1.tar.xz 1580488 RMD160 76d657a926efa077f3303251bd872dbb1fce3cfa SHA1 77b035c91d387bd4982170b13d1268899e84ece7 SHA256 49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2056 RMD160 509462a6134b9c347e9dcaa2cb430c7496bbac16 SHA1 d244ed0bdf5c2a93c6ac16c2de0661fd4bce926d SHA256 f64f30d2ef21cd6631416c13d46fd2c5c0c6b1a9976da5f40f146651a58638d7
 EBUILD gnome-keyring-2.32.1.ebuild 1977 RMD160 030a2705ce3022ca94e224a29eb5c10e42cc14c8 SHA1 220870dfcd9b733277925629184c16891ef437b7 SHA256 87e5e15e57d3212bb7cd84f79cf3519461e68dcb416a1abfb4e83de6f654c587
 EBUILD gnome-keyring-3.0.3-r200.ebuild 2079 RMD160 5664c57002c7426ea9a92a41090d9fc161ed4dd3 SHA1 26fec9bb277200ecc336a4b9d9c5906c904f5dc7 SHA256 c9f81221e0135b547b43b681474a53aa7cf69488890cd8968e2f904791bf01f3
 EBUILD gnome-keyring-3.0.3-r300.ebuild 2188 RMD160 33a3a0007874bbeb2387b3e3ac48b9909bf3f4c4 SHA1 ae25c3788f51400d450371e02e527c63606be794 SHA256 02c2611e56ce304b0eff66ca8e4f4191ca4af4e6ab49b5e5d85c0877c46e1b51
-MISC ChangeLog 29335 RMD160 047f80ec7dd9df9d5739690409f3b1a68637ad56 SHA1 10e21494172eb6d11621f51fe4cbb8ba31c42e73 SHA256 39ba98365c802d06d64b72cdc02a40e84d2d56c22c946e4b413da4a2454499bc
+EBUILD gnome-keyring-3.2.1.ebuild 3146 RMD160 4c3cf4720d467f6934bc62e2a97acfd50ae8dda9 SHA1 28f5a705948cb62972e848738518dc60438bb25f SHA256 94648b3595ed703084558c244bd282494f74a349fd927997a65fb12b2108d786
+MISC ChangeLog 29606 RMD160 00eda6108365874d6a8fff40e2ae12128baff0ef SHA1 fd7230c23010b1960a51484cc8b9cd5531128514 SHA256 8c8fa134da4c9b5e28c52095ca49acc7e885fe31203a9dbb6983aa433d7c66aa
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6rCgYACgkQkKaRLQcq0GLNhQCgtgUXmfD8YrNQXj/4ucLuNznh
-MNcAnA9aNRTZF9B/PAZIcdT+Pb5mIi3Z
-=u51r
+iF4EAREIAAYFAk6s+xsACgkQdjK8w9WeBnDrpAEAo1ycYUstsE73E6CYlwq9Ns1+
+jDMwnaEL++GRIY9RX90BAISPCLj76A0svFcF+KklWPZqDn5WaGhmo4vmUgMJg192
+=ZsoM
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
new file mode 100644
index 000000000000..49e3c820fb5d
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.2.1.ebuild,v 1.1 2011/10/30 07:21:57 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib pam virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam test"
+KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~sparc-solaris ~x86-linux ~x86-solaris"
+
+# USE=valgrind is probably not a good idea for the tree
+RDEPEND=">=dev-libs/glib-2.25:2
+	>=x11-libs/gtk+-2.90.0:3
+	>=app-crypt/p11-kit-0.6
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2
+	>=dev-libs/libtasn1-1
+	>=sys-apps/dbus-1.0
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+#	valgrind? ( dev-util/valgrind )
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests)
+		$(use_with caps libcap-ng)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=${EPREFIX}/etc/ssl/certs/
+		--enable-ssh-agent
+		--enable-gpg-agent
+		--disable-update-mime"
+#		$(use_enable valgrind)
+}
+
+src_prepare() {
+	# Disable gcr tests due to weirdness with opensc
+	# ** WARNING **: couldn't load PKCS#11 module: /usr/lib64/pkcs11/gnome-keyring-pkcs11.so: Couldn't initialize module: The device was removed or unplugged
+	sed -e 's/^\(SUBDIRS = \.\)\(.*\)/\1/' \
+		-i gcr/Makefile.* || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_test() {
+	# FIXME: /gkm/transaction/ tests fail
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "emake check failed!"
+}
+
+pkg_postinst() {
+	use caps && fcaps 0:0 755 cap_ipc_lock "${ROOT}"/usr/bin/gnome-keyring-daemon
+
+	gnome2_pkg_postinst
+}
+
+# borrowed from GSoC2010_Gentoo_Capabilities by constanze and Flameeyes
+# @FUNCTION: fcaps
+# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
+# @RETURN: 0 if all okay; non-zero if failure and fallback
+# @DESCRIPTION:
+# fcaps sets the specified capabilities in the effective and permitted set of
+# the given file. In case of failure fcaps sets the given file-mode.
+fcaps() {
+	local uid_gid=$1
+	local perms=$2
+	local capset=$3
+	local path=$4
+	local res
+
+	chmod $perms $path && \
+	chown $uid_gid $path
+	res=$?
+
+	use caps || return $res
+
+	#set the capability
+	setcap "$capset=ep" "$path" &> /dev/null
+	#check if the capabilitiy got set correctly
+	setcap -v "$capset=ep" "$path" &> /dev/null
+	res=$?
+
+	if [ $res -ne 0 ]; then
+		ewarn "Failed to set capabilities. Probable reason is missed kernel support."
+		ewarn "Kernel must have SECURITY_FILE_CAPABILITIES, and <FS>_FS_SECURITY"
+		ewarn "enabled (e.g. EXT3_FS_SECURITY) where <FS> is the filesystem to store"
+		ewarn "${path}"
+		ewarn
+		ewarn "Falling back to suid now..."
+		chmod u+s ${path}
+	fi
+	return $res
+}