Apply cap_ipc_lock only if USE=caps, and never install gnome-keyring-daemon as suid root since that breaks dbus activation (bug #513870, thanks to Francesco Turco). Remove ancient libgnome-keyring pdepend, shouldn't be needed now (bug #502434, thanks to Yaroslav Isakov).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 112 insertions, 18 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index dbb88080fabc..43c50a31fd93 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.253 2014/06/07 19:06:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.254 2014/06/23 04:06:56 tetromino Exp $
+
+*gnome-keyring-3.12.2-r1 (23 Jun 2014)
+
+  23 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-keyring-3.10.1.ebuild, gnome-keyring-3.12.0.ebuild,
+  gnome-keyring-3.12.2.ebuild, +gnome-keyring-3.12.2-r1.ebuild:
+  Apply cap_ipc_lock only if USE=caps, and never install gnome-keyring-daemon
+  as suid root since that breaks dbus activation (bug #513870, thanks to
+  Francesco Turco). Remove ancient libgnome-keyring pdepend, shouldn't be
+  needed now (bug #502434, thanks to Yaroslav Isakov).
 
   07 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-keyring-3.12.2.ebuild, metadata.xml:
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index cba1492e1896..7d60d4c6a401 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -8,19 +8,20 @@ DIST gnome-keyring-3.10.1.tar.xz 1141960 SHA256 18001fa94c6d92e476b76423fe585dbf
 DIST gnome-keyring-3.12.0.tar.xz 1162892 SHA256 92695ed4d78a576ae77a9ac6faa8fe59db14358ec46b073199e70d537e29ec5f SHA512 2eeb19b9a9361dfae3627f2e292d7b23f298bc7c77b9c1bcd275baf2ff91ac002bf9897d3ef6d9ebe3e343f31be4813b00c014b2659b2f16748ba3b87ee57938 WHIRLPOOL 71e67ab2802bbe3ef32b6edebf9a075d265130510e21b05485ad3ff556bb2e3698962c95e32d34d2bf3768ed9b5f2af0ef8ad2e8c15c7209be7097efa314f6f6
 DIST gnome-keyring-3.12.2.tar.xz 1170560 SHA256 3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c SHA512 e8e095904e63f589cdc30818ecab7938e42750054880f1fc01dfbb39375ae56a4497158309717b726594e54ad2604eaeedd8a8ed73697b4c348185f32af17457 WHIRLPOOL cb5b0dcff8d5d5d1e7633f835f242cad2c1f4a383717dd75fdf5e5d9e22c8e0b4966a50e2cb34c5fff39d50a42a92b7647335263677dd277bbf9fbfeccb7ca16
 EBUILD gnome-keyring-2.32.1-r1.ebuild 2049 SHA256 0612aa59a77710f1e5438213184f40243e36edd831dd2e22454a236a6469367b SHA512 fa86ef0001d0083e5ca44a16ba53e747b0d9c969c386ba3e9cd98d6d3437dab73a2219318bd4c67511701074ed5e8d87f4a0805097890837cf1ea00a1a0293a7 WHIRLPOOL 3b035dc1317011d2611bd5d7fb9ecd89f49f8387a71c8138c3a9321f4fbf8a60de96c2605ef687ad1e1360194b3c362228560259742350557a3b59bc72f11314
-EBUILD gnome-keyring-3.10.1.ebuild 2367 SHA256 602ad146c803d828e64954899e6cb658bc596e9d15df9b94c276a2432267e465 SHA512 f07e9c5a4ce60b2defc5b165578d0c6fe092605398a8ff430ad2cd86eb44f223b71e53784300470e1474741b58ba6499c2b75df3c70904795098eebbfe318619 WHIRLPOOL baaca416658bef3471d3020f94ffb8f7eaa6d7ecf0f897e7f17969f6ed0d5926de37a38a4c8bd1e8c5b9207d9a97b468d8e6cfca902999086872183320f1f002
-EBUILD gnome-keyring-3.12.0.ebuild 2436 SHA256 b975a553b9d460fb241b2003da9c43b03fe17282dd0b75dffa4c4ae30957aab5 SHA512 2a3d69dc1fdb71b825106d14ad7658a0292a847e3235dba2660d0111d8a751dd391a289eed9c9f3f72d60da3d1e2a79aac86f6811987f9e4ece834367438fd61 WHIRLPOOL a3e192c8125dfc0da0d3c6b0c77c2399227032fa077e1d167360e6ea2bce6af598f67ef25fca54775ef544c1eebb0fe364c262758c04c30100ba23f0a7abf46f
-EBUILD gnome-keyring-3.12.2.ebuild 2420 SHA256 a078c4d4b87b83d138b84bb2e461097cb812803e675efb92f3bb75af85ab7c32 SHA512 4a2b5d2aea5355f89d920a96763db45fbaaf29bed22151c4d2ee5d986fea24f79d88004fa42616691d9cc6f7f1b8c2d1ca0fcba4395990d52441b692e72eb518 WHIRLPOOL 9e88bac96cc8de539d2ed610c9375ad9e43dc2a5132e2b71308c226df6e04e81e81a3d29160612147b9f4e850cf654085c5b89f173c8ac5737623d6820aa1d8c
-MISC ChangeLog 37029 SHA256 80b1735c9a8737a8f284c267ab76abd13cd1f509119c8cc2d910c79b7cb976f1 SHA512 5675cfefab11e6a3c9f0e1486d5b2f17f11cfe33fd535c080270aa11b3a344bad86e170a8615aa57cfc78bd7884e6d094a0bcb1d83a02dd6f50718aa5d769a2b WHIRLPOOL ea783ed842510cd145cab308521501a1435fa9742f1f6d76c17b49a6ca84728a3759896956d5de303db8d9a3c19b9c60f69140df57f456e1b4e661b31942edc5
+EBUILD gnome-keyring-3.10.1.ebuild 2326 SHA256 6a5cd2e398b21512a1b62cf6c2fd90630029dfd8642402892df1c73a3767419b SHA512 d689ac9bdf76115083c2a3cad528a728b26070b3b1064df918c91d324bb61bc3d8ba7066457b5ec06105cafc87ed19d713fbf297ffd717ce4d108c280dda7ca1 WHIRLPOOL 41ed2174b3871cdb8bd860ccefa43f7df4670cdb775614d1cefdc5d020033cfab6b7486ae135efb8d19172bdb521f3fae71b2990946c009392111bf28939eaf9
+EBUILD gnome-keyring-3.12.0.ebuild 2395 SHA256 857362cd0e360726dea4aa5bdbfbf2e8db72f17f968da4234c091a16b8f0bbaa SHA512 741adbd705609688941f761801029c91efc136b3d9fba95bd99018122f5bf576cf2eb5bad24d294f14b2cc202482cd3682027ba63a1b2a6f373a20bcfa862fc2 WHIRLPOOL a1b05922c7c5ff318e666f027239ed45f512f0061e0a06c749241f0d7952998f9c7c3c98311de525bee62445be2b8800b91d60ba66fd39e16991ed2a1d6775e6
+EBUILD gnome-keyring-3.12.2-r1.ebuild 2528 SHA256 8a1e3e9131cb7595bf117abd6f1af7835f2736c74ae748b12303d30050dd90ab SHA512 e79bdf021e153143c794019a0854f840c72b42c9818b04ca7b2ff241fd0ed740c8ce053403b1af5d561dac6e531fb4ae5f29d9f9d3c56a1d36ec121121ca91bc WHIRLPOOL c75fbbba16bf1f7ff6b66262168bca0ff7e11492ac94763ed374f55e123b8874c0cc49c998210653bc25b0a9f38365b089b4718a864356cfb559d4acb94e44c2
+EBUILD gnome-keyring-3.12.2.ebuild 2373 SHA256 20b25a79f487c80a0db1da135da88c6030f08c45b15a4491ec88e605e69f4906 SHA512 0fd4307de5c9a926fc06d8618e91bef3d1b7b3cd831626c9cf11a7f61d65a02b59d3af0614f6ba1e0de2a8fcc759cce24721c707a37fcb1816c35f62db42c8d7 WHIRLPOOL 648e77e23fc5adc8cfd2b71399cf0630faf9e87aa13c0ae3de27601afaa8dc885ce6c1a04ca7248465a52a899c85b73a8c33245bc4476ff893dc3f3ad836bf75
+MISC ChangeLog 37533 SHA256 ce68f4d5d6c9c8059a7f7fc8484ad93f7c2dbb86494ac06c98c968c3f3ec3f15 SHA512 88269b7de0a6ae4b61585ea76c4e6cbc45685d63a13c751cc556699bdb5c605bb49f698ef0a2e07bc2c5e675b8359854a5b19a31d44e942d71181a321f610644 WHIRLPOOL d07a2c84cbac3a9313217f3a04c72015724c4da8f2ce905fd40ae83b302642317cef2797b014a2b64f539fa35f1fc5060cbaae671e5ab75bf23f8a327caf244d
 MISC metadata.xml 789 SHA256 77bcb7e0dbc7721e5491732fb92fba7473e9ae9b17725842270c75fe12124e5c SHA512 802568250f4e486d06a5b724deee4bc1aeab25348d58df62a37ab82f61c56ef47d69fdd853bf7ad4fcd9ce4cd8cbf174c86c1f1f6f96dc145fa40a5aaf22d299 WHIRLPOOL 6af3afe8de8b38ff7ff6a14a0fad9bc89ba498164c112a1adcbdc721d41d7e2651ddaf94de11a072eed951255f55866f8d74c813cde0f2a0db18fb7e44f945a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTk2KUAAoJEJ0WA1zPCt1hrQkH/3dvynCMNMEuxqw3YOovHXj8
-NVI2RQQr9kZp+B+W8FkePltm/lWDc5cGOWJztoQgGmq2rDtlyRei8GVTKeW3EYR3
-yRAHjOCqeUG188Lw4Dh/JIdETOCHXFncLT5Sz6z/knes+XqMeA8JZsANelEjII1q
-rR9Mu8RZOXfPLm7whxl/H4WHK8o9aX432ZoQCUMI/9kxZfIrEjMP3+p0Sj3AeA3d
-3Cc1HubOS3sGf2aqFfKCKl4xJ68OG/VLtrfU1CBTee1PU2SnTaFWD0DXH+dw/EKq
-H8udpwt6PxdFYIRr16kyOuQqQ4b4tRFuyLdL1Yzf8rO5TxdpDr4n3GBpBKcYYl0=
-=WOvc
+iQEcBAEBCAAGBQJTp6ecAAoJEJ0WA1zPCt1hhewH/0YLhEghzELE5TYWnsZEgLnc
+DGjcc6sG8lkz1pV3DcwIRv03uRpZ2JPpC4lbsm30pSJI2xkTqqIpJNeP5VFSX8iI
+apcfji3zTYiJDbYpIFeVPO4FoaRSiiVILb0DpA9rxfrQ8e9V71r8trNUEYQLvNgW
++TN8DLnAy2ZKg4bplsBlj26jYJN90uZuVfJXnyeiJ4o6NM8geQPDbwDVAk7tPd0D
+fs/BK6ZuNjz3xFGA3bZg2ZAFa6R4Sz02sk3xeLQJMaaFnn/PXtV7jSf3aw49R4TQ
+2BiYPG68yX+cCNi++rjlg9k9ZcmlSrnfrp8G/Rwd+SeIKzNQr4LMblQ9bO1CuhQ=
+=Bc3g
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
index 2265e173aa55..d57fa58e5028 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.1.ebuild,v 1.12 2014/04/21 10:29:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.10.1.ebuild,v 1.13 2014/06/23 04:06:56 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -32,7 +32,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
 src_prepare() {
 	# Disable stupid CFLAGS
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
index 2f04c033c3d7..9232fe2d4fe6 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.0.ebuild,v 1.1 2014/04/27 16:53:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.0.ebuild,v 1.2 2014/06/23 04:06:56 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -34,7 +34,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
 pkg_setup() {
 	python-any-r1_pkg_setup
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..58915cd4745b
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.12.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 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.12.2-r1.ebuild,v 1.1 2014/06/23 04:06:56 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes" # Not gnome macro but similar
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit fcaps gnome2 pam python-any-r1 versionator virtualx
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+caps debug pam selinux +ssh-agent"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=app-crypt/gcr-3.5.3:=[gtk]
+	>=dev-libs/glib-2.38:2
+	app-misc/ca-certificates
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=sys-apps/dbus-1.1.1
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Disable stupid CFLAGS
+	sed -e 's/CFLAGS="$CFLAGS -g"//' \
+		-e 's/CFLAGS="$CFLAGS -O0"//' \
+		-i configure.ac configure || die
+
+	# FIXME: some tests write to /tmp (instead of TMPDIR)
+	# Disable failing tests
+	sed -e 's|\(g_test_add.*/gkm/data-asn1/integers.*;\)|/*\1*/|' \
+		-i "${S}"/pkcs11/gkm/test-data-asn1.c || die
+	sed -e 's|\(g_test_add.*/gkm/timer/cancel.*;\)|/*\1*/|' \
+		-i "${S}"/pkcs11/gkm/test-timer.c || die
+	# For some reason all pam tests make the testsuite retun 77
+	# which is considered an error but the test framework,
+	# but all tests are successful, upstream bug #731030
+	sed -e '558,595 d' -i "${S}"/pam/test-pam.c || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_with caps libcap-ng) \
+		$(use_enable pam) \
+		$(use_with pam pam-dir $(getpam_mod_dir)) \
+		$(use_enable selinux) \
+		$(use_enable ssh-agent) \
+		--enable-doc \
+		--enable-gpg-agent
+}
+
+src_test() {
+	 # FIXME: this should be handled at eclass level
+	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
+
+	 unset DBUS_SESSION_BUS_ADDRESS
+	 GSETTINGS_SCHEMA_DIR="${S}/schema" Xemake check
+}
+
+pkg_postinst() {
+	# cap_ipc_lock only needed if building --with-libcap-ng
+	# Never install as suid root, this breaks dbus activation, see bug #513870
+	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
+	gnome2_pkg_postinst
+}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild
index fad3a9b57f61..96e3d30b8200 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.2.ebuild,v 1.2 2014/06/07 19:06:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.12.2.ebuild,v 1.3 2014/06/23 04:06:56 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -34,7 +34,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-PDEPEND=">=gnome-base/libgnome-keyring-3.1.92"
 
 pkg_setup() {
 	python-any-r1_pkg_setup