From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4128F13835B for ; Mon, 18 Jan 2021 21:10:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82715E087E; Mon, 18 Jan 2021 21:10:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D1BBE0884 for ; Mon, 18 Jan 2021 21:10:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F49F340CAA for ; Mon, 18 Jan 2021 21:10:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFE7C4A2 for ; Mon, 18 Jan 2021 21:10:10 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1611004194.5f276eaebae13c45028ccd53eaf2a95bc19006e7.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-keyring/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild X-VCS-Directories: gnome-base/gnome-keyring/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5f276eaebae13c45028ccd53eaf2a95bc19006e7 X-VCS-Branch: master Date: Mon, 18 Jan 2021 21:10:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9c8bec27-68ac-46f3-92a4-2d907df761c1 X-Archives-Hash: 420e59fc17bf8c47fce83bada6548681 commit: 5f276eaebae13c45028ccd53eaf2a95bc19006e7 Author: David Michael gmail com> AuthorDate: Sat Dec 26 02:29:54 2020 +0000 Commit: Matt Turner gentoo 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 gmail.com> Signed-off-by: Matt Turner 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