summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-06-26 23:04:21 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-06-26 23:04:21 +0000
commit84b940d48be26573f0e0dbc9917fa732ce0c118f (patch)
tree5fa1a88737a4f1dc30a604d705de34144261089c /gnome-base
parentNew dependency on dev-qt/qtconcurrent:5, thanks Felix Leif Keppmann <felix.le... (diff)
downloadgentoo-2-84b940d48be26573f0e0dbc9917fa732ce0c118f.tar.gz
gentoo-2-84b940d48be26573f0e0dbc9917fa732ce0c118f.tar.bz2
gentoo-2-84b940d48be26573f0e0dbc9917fa732ce0c118f.zip
pinentry is pure runtime dep (bug #547456, thanks to Brian Evans).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-keyring/ChangeLog6
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild10
2 files changed, 11 insertions, 5 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/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