Disable gpg-agent in favor of pinentry[gnome-keyring] (#547456)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 91 insertions, 5 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 2272b1d41453..bd3969886b2c 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.272 2015/06/09 15:42:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.273 2015/06/14 13:59:58 pacho Exp $
+
+*gnome-keyring-3.16.0-r1 (14 Jun 2015)
+
+  14 Jun 2015; Pacho Ramos <pacho@gentoo.org> +gnome-keyring-3.16.0-r1.ebuild:
+  Disable gpg-agent in favor of pinentry[gnome-keyring] (#547456)
 
 *gnome-keyring-3.16.0 (09 Jun 2015)
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index ee1d85486496..a983f9dafb85 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -6,13 +6,14 @@ DIST gnome-keyring-3.14.0.tar.xz 1172092 SHA256 c7059516cc47192e8bc5f1095e8e57cd
 DIST gnome-keyring-3.16.0.tar.xz 1179776 SHA256 15a3bb8c53855a4ff0dbbdfbe4ec3df206c32048f50bdc76a51f8e3e14ece1f5 SHA512 eeb5c614395dda0e046056899f9eb6f962253b48d6b668bb966328e75863010c1f653ba2d8f7ca60bdd8ff5c43f77604396f0e4c448236c5b010dd0c61ffa069 WHIRLPOOL dae5b7294b8274623cd0ccebd57b348b8b73e58bd88f32b12f982f1e0413a042e72adf69a36a21619c34c4726965031e1a5aec476d143f99315a4132bc19df8a
 EBUILD gnome-keyring-3.12.2-r1.ebuild 2517 SHA256 c955bb9aa4b62e56171ffb14847fd677ec1ea8b12795c1166da9b0311a4a0263 SHA512 0b6bdd7c457976eb15b85e37be85503b344e4b8863d050499396a9d9c1713e87715940836c1c9d93af03f4040b280bd3dc5ff276e7d1ae184e65774efea12078 WHIRLPOOL 1032e3ba62da5284ac0f2ecdfcef230605b82acf014a0ff4fe390c220f66ccba323c317b5d4a0440a7637fb9b9f67659e539e1111455f1e5d3c850d86087a5b0
 EBUILD gnome-keyring-3.14.0.ebuild 2033 SHA256 bf022e81c998f9a4fe4797d95b00e1d5a6639afc66075f011f5a79967fbac3e3 SHA512 048aec74d4ffa63ee2d0c4d48262c36cd0d30bcfac354803e940cd53a1385046ca261dfea47452609abff396cea524cebd829bf5f66f51096fadf5f23f4c9695 WHIRLPOOL 0a12d04f3c81f09132ed85205d5fb8eec8f6b64f0fe3fcb74d6200eb618d267593814a8a5f44218906e1ef305d85b4d745c21cd98d57eacf074415d456776e0a
+EBUILD gnome-keyring-3.16.0-r1.ebuild 2209 SHA256 15d1e0c91f24ed58b2501a65f3f1024d4092bddca1d75623d581fc87415c7d26 SHA512 892ad71246771c81fba3cea981fd6693a3d882b2033786685c979fb831aac9c536af78db6a5341320bf9110042ab7338545f4f05cf9a136e3d148cf3dee314fc WHIRLPOOL 713c328d7e1fca6cfe7d14106cb056b1224a130d5da0704cf9630926dfb230e312af896334f45da874ebaeb026ba93b5956de7ede36099877ce40bfe028c08ff
 EBUILD gnome-keyring-3.16.0.ebuild 2035 SHA256 b917948a68b27436835148bae2f8ed81e4b8a2aa79d1d0cd90d4a8b21ee8ee6f SHA512 f6ade210ae0466191e67635ba341cd79b3c70a2b171ba74e074ff220b9f86fe4718b657402de0e06937cff60f697b8c7f48344b5cbbf5c222062037c068d207a WHIRLPOOL 5f1c03eb7a28fb4de6e36a613d766f7dcb4b6c1602a3cdf30ce1e20ba2f4cc1e1ab10c440d4c53975d16965220419470a5bd3ba8fa318e796250c2f0210ca2d0
-MISC ChangeLog 39837 SHA256 cd7acb39d2e249de556cf2c6fcafd5ee8812af56db0a24a57d84cd10bd18e62f SHA512 854dd4eee009f9d394131741b11fc7a5b43f26514d9d0f1e2f692e8be0439f1475207e8e9f127d8d81ba044b24c0effdd50abd9b166e3ea4382da5e06e37581a WHIRLPOOL 42f407ec47ac8777dd9da818604293123b65569966246d4c9e44fc13e293832ba4d9f6738298c993bad04605846763b8aeeb75f1e8e2b1b80fa5514fe75f83cf
+MISC ChangeLog 40025 SHA256 6d66c09b5c4ba4774bbe0857cca137a4be5b92bba82c38d36016370a0bf706e0 SHA512 e54cb5eaa0ab997d89734ff6809b41716be33a41a6eb47b3f3413ef2804cab18c21db3e79387222415a0172329fb16e37c66fcda7860fd0997faefd1ee1bfb7f WHIRLPOOL 1b984677daf807f43fe672538ef79e2d69919b1184bf6082463b88fbe35b3573e298613ec0d4b776af4086224980dde6d0acb8b0ab79726cdaa50713c6162394
 MISC metadata.xml 789 SHA256 77bcb7e0dbc7721e5491732fb92fba7473e9ae9b17725842270c75fe12124e5c SHA512 802568250f4e486d06a5b724deee4bc1aeab25348d58df62a37ab82f61c56ef47d69fdd853bf7ad4fcd9ce4cd8cbf174c86c1f1f6f96dc145fa40a5aaf22d299 WHIRLPOOL 6af3afe8de8b38ff7ff6a14a0fad9bc89ba498164c112a1adcbdc721d41d7e2651ddaf94de11a072eed951255f55866f8d74c813cde0f2a0db18fb7e44f945a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlV3CYMACgkQ1fmVwcYIWAZ3dACfVjQjPaGwz329vHl3SWlUSybU
-CXcAn3+fdW5cK1TLyJUONzhX1bZ4Bt/0
-=8JRE
+iEYEAREIAAYFAlV9iN8ACgkQCaWpQKGI+9TQhQCcCwJnoRNRyDHtTU41NFMGUBbY
++uUAn0WVaKm3Q1lD7gin1CcuCKHVEMbK
+=4tnr
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
new file mode 100644
index 000000000000..9fc07a916aef
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 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.16.0-r1.ebuild,v 1.1 2015/06/14 13:59:58 pacho 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 test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
+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 )
+
+	app-crypt/pinentry[gnome-keyring]
+	>=app-crypt/gnupg-2.0.28
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( ${PYTHON_DEPS} )
+"
+
+pkg_setup() {
+	use test && 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
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --disable-gpg-agent, bug #547456
+	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 \
+		--disable-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
+}