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 1FBE1138350 for ; Sun, 23 Feb 2020 19:32:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51987E0878; Sun, 23 Feb 2020 19:32:18 +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 37B74E0878 for ; Sun, 23 Feb 2020 19:32:18 +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 82F3D34EF8D for ; Sun, 23 Feb 2020 19:32:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 93FF4CF for ; Sun, 23 Feb 2020 19:32:14 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1582486307.55695032862b6e7209c376cf39d02ef1fb61493c.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/osinfo-db-tools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild X-VCS-Directories: sys-apps/osinfo-db-tools/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 55695032862b6e7209c376cf39d02ef1fb61493c X-VCS-Branch: master Date: Sun, 23 Feb 2020 19:32:14 +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: 8675c8dd-cc54-4336-9c8c-937ade474305 X-Archives-Hash: 0b3a864de04ba5f54fe5edf73c648a72 commit: 55695032862b6e7209c376cf39d02ef1fb61493c Author: Mart Raudsepp gentoo org> AuthorDate: Sun Feb 23 19:29:45 2020 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Sun Feb 23 19:31:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55695032 sys-apps/osinfo-db-tools: properly use python-any-r1 for the new test deps Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> ...s-1.6.0.ebuild => osinfo-db-tools-1.6.0-r1.ebuild} | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild similarity index 74% rename from sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild rename to sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild index e3002f6cee0..1d3a019cc34 100644 --- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild +++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 gnome2 +inherit python-any-r1 gnome2 DESCRIPTION="Tools for managing the osinfo database" HOMEPAGE="https://libosinfo.org/" @@ -16,7 +16,6 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="test" -REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" # Blocker on old libosinfo as osinfo-db-validate was part of it before @@ -35,14 +34,20 @@ DEPEND="${RDEPEND} virtual/pkgconfig >=sys-devel/gettext-0.19.8 dev-lang/perl - test? ( ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pytest[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] ') ) " +python_check_deps() { + use test && \ + has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \ + has_version "dev-python/requests[${PYTHON_USEDEP}]" +} + pkg_setup() { - use test && python-single-r1_pkg_setup + use test && python-any-r1_pkg_setup }