pinentry is pure runtime dep (bug #547456, thanks to Brian Evans).

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

3 files changed, 29 insertions, 11 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index d210fd1b9b74..a722c2701088 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # 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.275 2015/06/20 10:45:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.276 2015/06/26 23:04:21 tetromino Exp $
+
+  26 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-keyring-3.16.0-r1.ebuild:
+  pinentry is pure runtime dep (bug #547456, thanks to Brian Evans).
 
   20 Jun 2015; Pacho Ramos <pacho@gentoo.org> gnome-keyring-3.16.0-r1.ebuild:
   Update DEPEND then
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index f937ba769a7d..29946349317b 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -6,14 +6,26 @@ 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 2439 SHA256 d33bb634dd9e5759c5c66eaafd86b91d7172d0d7efe8e9dd5f2ca475a561bebb SHA512 dbd343aa1d462611de85e563f7dff9b9c32ae6e7d803ec115bce03bddb3ebf4c5c17589e73ceb43c157d4a86c3311bf0901bdc906d9e0e9ccbb3314ac52b7785 WHIRLPOOL 954c96631f44af7801c68c4a134032fb292c88f62232c8092e55861cc36ec51dffd38986530704776b57722c005e7707f7661d59cceaa27ffbbe250435610162
+EBUILD gnome-keyring-3.16.0-r1.ebuild 2483 SHA256 9e76d5f26fa0316554ea4704bf1ad39f4176cd9029b323f9d18f1e6bfe109362 SHA512 9ca9febda1ebc1fc0e55fdd1d896e7543cd54f9dc857b47bdb3a0b550efad57f0b502edf8f13918927ef7887990fc8da17b91145f0da2b97907f544424ee64e4 WHIRLPOOL ea20903760545f3d1a3b42974a8dd978220e5cb6317ad78ea869dc5bc02fec34bee087fbccc08813c7434b32324e30a6d878d6e5ccbc8e8da976ad9f0843c3d5
 EBUILD gnome-keyring-3.16.0.ebuild 2035 SHA256 b917948a68b27436835148bae2f8ed81e4b8a2aa79d1d0cd90d4a8b21ee8ee6f SHA512 f6ade210ae0466191e67635ba341cd79b3c70a2b171ba74e074ff220b9f86fe4718b657402de0e06937cff60f697b8c7f48344b5cbbf5c222062037c068d207a WHIRLPOOL 5f1c03eb7a28fb4de6e36a613d766f7dcb4b6c1602a3cdf30ce1e20ba2f4cc1e1ab10c440d4c53975d16965220419470a5bd3ba8fa318e796250c2f0210ca2d0
-MISC ChangeLog 40283 SHA256 ef000cf0db200f0f9c9945cf90290d260e4676c0703258e76edc92d45b7ad4c8 SHA512 fff640dcdde2b4d1c8057ca3422e9c04dc8628bc49080c2e849ba18c9f1d717277a5c0596218bcb24634d0ba22885b364305225a69288f7902778c7411fa44a3 WHIRLPOOL 5411f796341a4c6d24ee3958b37a581a3c23a335d2561fb0c6a6607cd7be308fc06e8e7a9d6d962bf220df56214fb5c50d762a0dad625fb15d7ada9e320a4777
+MISC ChangeLog 40450 SHA256 46bcb79b82f36dbea9f9c49f906353b237a5c5f91d3ec9be75f67738ad02b621 SHA512 fda0bf6cef65587e936b50c9a47fa3623feb82ded062e54cbf297c314977acd5170063a53520107459b99b9cc6044f8bed967e15e2aed91ece50ece8d4ecc8c1 WHIRLPOOL 2bce97a93677bdd383732c777933769e7a35ec5b6c514c6c4ff65d39904e7ade20e29f1e4162734050b4f09f557276c259c2c234d9c791c0144463193c4268e0
 MISC metadata.xml 789 SHA256 77bcb7e0dbc7721e5491732fb92fba7473e9ae9b17725842270c75fe12124e5c SHA512 802568250f4e486d06a5b724deee4bc1aeab25348d58df62a37ab82f61c56ef47d69fdd853bf7ad4fcd9ce4cd8cbf174c86c1f1f6f96dc145fa40a5aaf22d299 WHIRLPOOL 6af3afe8de8b38ff7ff6a14a0fad9bc89ba498164c112a1adcbdc721d41d7e2651ddaf94de11a072eed951255f55866f8d74c813cde0f2a0db18fb7e44f945a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlWFRFYACgkQCaWpQKGI+9SqMACeLccyKIw275dYlPvw6i/9G3vv
-yXIAnRx8rt5TkwGNvfc+aYfOS1Cr5uh7
-=AhFq
+iQJ8BAEBCABmBQJVjdp8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN+QEQAIAyDOk0FEpxW2uAJZKYONh1
+cYe5voM1cPlZJje67LYIwsaO74hVjbBSX3kjDkYI0cw8O8UsMsHmJ6biuUos8c3x
+pkf9dlBqZUcwA0gMD4JDnPrwns3IqQWsIz6rI7qvewR7YP4KEBVFiE6AJcPIh4kY
+jlyKoZYcOn8F0+oWhvDicCcn3fNkCSlWFOUT1jdQfoGhjBDog3HOfhmOlTKfRpTj
+5nABbjYzkIyO6cR9UXMHfsemmwlFa25UzP0OpoiBZSftG80B2EMUtMEBeM9641R+
+ok7LuObZaS3H4s7iusLK7Tgh+H2yeRJKM/iiU9qWjhxg70IueB5VfZEuW5Fm+Djp
+OrclHu7LT/Mu+MZd8veZvYVbka4dXIr0LM0eP0K1CQTeCQbyflOuebK/HWFTfeCh
+jcRq0xh2PB4EqqCK88xGi7tru3cWpKRb0niedvVTnF0/jcZosyrEvQ5xe0ZWeT3V
+g2X0qiUogIRSSDb3FspMFjmdna/0JvRlMbqLbAho7rQWvtbG2xaDMNQ03XNbu45Z
+PO1PU0IEHFrNYwfsD4bO6Em+qAo2qay4l4sKJmWKEebcVvKKmnqdtk0n4uIIYJrw
+6u+QW/DtoU3UQ89brsQaoL9DyWzSSrJ+pTWpsjrIjZM3m76uy8Wn/IwgjGkzyPjA
+vhODu6H4R1nBo8Ck4c4e
+=E5fJ
 -----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
index a9fc8b5b9dbf..fccbe7ada091 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2015/06/20 10:45:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild,v 1.4 2015/06/26 23:04:21 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -18,7 +18,7 @@ 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="
+COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.3:=[gtk]
 	>=dev-libs/glib-2.38:2
 	app-misc/ca-certificates
@@ -27,10 +27,12 @@ RDEPEND="
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )
 
-	app-crypt/pinentry[gnome-keyring]
 	>=app-crypt/gnupg-2.0.28
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/pinentry[gnome-keyring]
+"
+DEPEND="${COMMON_DEPEND}
 	>=app-eselect/eselect-pinentry-0.5
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt