Version bump; gcr library was split out into a separate package.

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

3 files changed, 123 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 393ed1ccf268..b55ad211e5a9 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.222 2012/05/09 16:08:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.223 2012/05/13 18:15:00 tetromino Exp $
+
+*gnome-keyring-3.4.1 (13 May 2012)
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-keyring-3.4.1.ebuild:
+  Version bump; gcr library was split out into a separate package.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> gnome-keyring-3.2.2.ebuild:
   keyword ~amd64-fbsd
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index dfcd162f2abb..b8e0a4f7366f 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -5,15 +5,21 @@ AUX gnome-keyring-2.32.1-fix-undefined.patch 783 RMD160 76c20ef4bf5aaa1ed4d7b06a
 AUX gnome-keyring-3.2.2-gold-glib-2.32.patch 1418 RMD160 0a58649d79d562c3913025f608a9814cf15e8085 SHA1 45f7a6c3f6f8946e86cf62189edd6cdbabe1d6e5 SHA256 523a2332dcc1db82f2897bf370c4c82b0e4ef3725ce06799b39554fe5ebe1587
 DIST gnome-keyring-2.32.1.tar.bz2 1619245 RMD160 cb72f171f5918ff26f40feb7bba90dc7e2e120ec SHA1 3d0ecc3e29f426ecfcaa488ea17d3e330fe34eb6 SHA256 31fecec1430a97f59a6159a5a2ea8d6a1b44287f1e9e595b3594df46bf7f18f9
 DIST gnome-keyring-3.2.2.tar.xz 1579860 RMD160 190391c13d2a988801c023c0293bb56953901f3f SHA1 5b4a7868266d11855dea8aa488b730a4eaec3838 SHA256 f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3
+DIST gnome-keyring-3.4.1.tar.xz 1107820 RMD160 982ed29670b9348cdfc309b0a8977ba1d9ca7afe SHA1 51c70f5c8d9e6776ab711dda8f1eecf676dbd1c9 SHA256 9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2045 RMD160 986bbaa3d89dab306bbea209aad8bf0dadaa9924 SHA1 c28d2a261421a8937299abd5618fa820e1630353 SHA256 f8faf53ba09ae9f81399407397888d324910ac167d5d0b08978bd82952cc5c1d
 EBUILD gnome-keyring-2.32.1.ebuild 1972 RMD160 2a1f3e5b78c90d68b1726b4042ca04701556955e SHA1 ac52a828fb1466609d0bd07630dc334cf9e4c309 SHA256 e4814e4778de56d491b7f15950b0614e64ef83f3e5298acd9e17de4ff8bc9d44
 EBUILD gnome-keyring-3.2.2.ebuild 3504 RMD160 d644238abee8b5e66c2dc8940a5cd43b90277945 SHA1 91e447571ca4c987f49cecd7a333279607b4d7ea SHA256 b2c685d1dfbc06e0bbbb8f39d43b7b9a43dc06652a82fbef41a511b9f0ab12fd
-MISC ChangeLog 31712 RMD160 e1a0422562a69bc02b0d2e9c7b003321380b27bb SHA1 9802b83a54c3171b8e12cbaaaa9203d043646a9a SHA256 678913d6cc72d2c5e90d1aa06349c62cce873a62c75a463d4ae5149a2f94200c
+EBUILD gnome-keyring-3.4.1.ebuild 2942 RMD160 c0813f9b8f7e9c87b9220aa72a09e69810d6d9ff SHA1 86de7edc54e295cabd9d7f9c1a09dd74853d601f SHA256 7dc06277f92e528556d9489244d9a33f547b52247adb5030c56a0d4aacae7e79
+MISC ChangeLog 31907 RMD160 9287fc5d2dba2ae855b74d518c37470dc1154e89 SHA1 5808c3caa4871852c15db1298d575d21cc624d39 SHA256 96be6c044b9b577606c7a77d756717ad0c9b7f2568ed3e27bd1fa68f39ad1e1c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+qlpkACgkQvFcC4BYPU0qyMwCfUwH9vV0QlgZayBpKDELqMnGq
-I7IAn37lUe1k7ZW+A/xVGQA0+8Exgawo
-=JYZG
+iQEcBAEBAgAGBQJPr/oqAAoJEJ0WA1zPCt1hhPUH/0AdJ7x5mkK7kR6PtMiskpgq
+7CBKduX10APcKfN5U9b9+OdP9UgbuNxaSUHgV8pDSCxDK39LCSAHolinqvkbs6lE
+3EmY0bSlJxEoKhPtACS3UrlEQRuLvpvZhRGgUGwNVdto1FjbngSn5Yb+5R46+xJ/
+pgS5j0s7WH34BLawfkZQWIukkj48qimbyhhSZlAuqT3kfQrdxjkBE4O5+j1iOtOO
+Bj4NAzPQ3Gn6/v8nn5YAD4SGAzQv19KbvbrWLDSG9PAVfKSheOqw2+gtJpBnYLjz
+iQpT8FODQoEYGC/wahN6wE9UarMPqT5nFMBEoW+wBrMESf8czDUSzj9FfbtPMAM=
+=kI7M
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild
new file mode 100644
index 000000000000..cb1d931a8e78
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.4.1.ebuild
@@ -0,0 +1,106 @@
+# 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-3.4.1.ebuild,v 1.1 2012/05/13 18:15:00 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 pam versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+IUSE="+caps debug doc pam selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND=">=app-crypt/gcr-3.3.4
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0:3
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2
+	>=sys-apps/dbus-1.0
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
+# eautoreconf needs:
+#	>=dev-util/gtk-doc-am-1.9
+
+# FIXME: tests are very flaky and write to /tmp (instead of TMPDIR)
+RESTRICT="test"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_with caps libcap-ng)
+		$(use_enable pam)
+		$(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"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check
+}
+
+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.
+# Requires versionator.eclass
+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 capability got set correctly
+	setcap -v "$capset=ep" "$path" &> /dev/null
+	res=$?
+
+	if [ $res -ne 0 ]; then
+		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
+		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
+		ewarn "where <FS> is the filesystem to store ${path}"
+		if ! version_is_at_least 2.6.33 "$(uname -r)"; then
+			ewarn "For kernel 2.6.32 or older, you will also need to enable"
+			ewarn "SECURITY_FILE_CAPABILITIES."
+		fi
+		ewarn
+		ewarn "Falling back to suid now..."
+		chmod u+s ${path}
+	fi
+	return $res
+}