commit:     5f276eaebae13c45028ccd53eaf2a95bc19006e7
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 26 02:29:54 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 21:09:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f276eae

gnome-base/gnome-keyring: EAPI 7

This puts the eselect dependency in both RDEPEND and BDEPEND until
IDEPEND exists.

Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild 
b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
index c28cbcaedec..9315b7b2dab 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 
 inherit fcaps gnome2 pam python-any-r1 virtualx
@@ -19,16 +18,18 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 
sparc x86 ~amd64-linux ~x
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
 RDEPEND="
        >=app-crypt/gcr-3.27.90:=[gtk]
-       >=dev-libs/glib-2.44:2
+       >=app-crypt/gnupg-2.0.28:=
+       >=app-eselect/eselect-pinentry-0.5
        app-misc/ca-certificates
+       >=dev-libs/glib-2.44:2
        >=dev-libs/libgcrypt-1.2.2:0=
        caps? ( sys-libs/libcap-ng )
        pam? ( sys-libs/pam )
        selinux? ( sec-policy/selinux-gnome )
-       >=app-crypt/gnupg-2.0.28:=
        ssh-agent? ( net-misc/openssh )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
        >=app-eselect/eselect-pinentry-0.5
        app-text/docbook-xml-dtd:4.3
        dev-libs/libxslt

Reply via email to