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 8CDE4138350 for ; Thu, 30 Apr 2020 15:53:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E355E08BF; Thu, 30 Apr 2020 15:53:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 84CEBE08BF for ; Thu, 30 Apr 2020 15:53:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 3DBB834EF06 for ; Thu, 30 Apr 2020 15:53:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E110626 for ; Thu, 30 Apr 2020 15:53:20 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1588261992.62baf9140884a7191bce2b6eb2f48947bbbde195.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/libgnome-keyring/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild X-VCS-Directories: gnome-base/libgnome-keyring/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 62baf9140884a7191bce2b6eb2f48947bbbde195 X-VCS-Branch: master Date: Thu, 30 Apr 2020 15:53:20 +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: 71b9ed94-2c5b-49cf-8055-3f67d04bc466 X-Archives-Hash: 64ac68879bd6af82c3082b66b0400349 commit: 62baf9140884a7191bce2b6eb2f48947bbbde195 Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 30 14:41:35 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 30 15:53:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62baf914 gnome-base/libgnome-keyring: fix python-any-r1 eclass usage Closes: https://bugs.gentoo.org/708574 Closes: https://bugs.gentoo.org/720128 Signed-off-by: Mike Gilbert gentoo.org> .../libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild index f8384173ee0..30c0398c00e 100644 --- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild +++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild @@ -32,12 +32,23 @@ DEPEND="${RDEPEND} >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig - test? ( $(python_gen_any_dep ' + test? ( ${PYTHON_DEPS} $(python_gen_any_dep ' dev-python/pygobject:2[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}]') ) vala? ( $(vala_depend) ) " +python_check_deps() { + if use test; then + has_version "dev-python/pygobject:2[${PYTHON_USEDEP}]" && + has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + src_prepare() { epatch "${FILESDIR}"/${PV}-vala-0.42-compat.patch use vala && vala_src_prepare