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 6274C158092 for ; Sun, 19 Sep 2021 03:25:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6347CE0942; Sun, 19 Sep 2021 03:25:29 +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-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E49FE0940 for ; Sun, 19 Sep 2021 03:25:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF6BE342E49 for ; Sun, 19 Sep 2021 03:25:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44DBD90 for ; Sun, 19 Sep 2021 03:25:25 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1632021101.f336e8bc9cb902d61882358e57531f9269c206e6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/sparse/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/sparse/sparse-0.6.4.ebuild sys-devel/sparse/sparse-9999.ebuild X-VCS-Directories: sys-devel/sparse/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f336e8bc9cb902d61882358e57531f9269c206e6 X-VCS-Branch: master Date: Sun, 19 Sep 2021 03:25:25 +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: c9305da1-dcd5-43c6-ad02-85e600f0d608 X-Archives-Hash: ce04c494e108fb374b76b74ef53f4614 commit: f336e8bc9cb902d61882358e57531f9269c206e6 Author: Sam James gentoo org> AuthorDate: Sun Sep 19 03:11:41 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 19 03:11:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f336e8bc sys-devel/sparse: improve llvm_check_deps logic Bug: https://bugs.gentoo.org/812551 Signed-off-by: Sam James gentoo.org> sys-devel/sparse/sparse-0.6.4.ebuild | 5 ++--- sys-devel/sparse/sparse-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys-devel/sparse/sparse-0.6.4.ebuild b/sys-devel/sparse/sparse-0.6.4.ebuild index 8e6b268ec5b..6fbcc28e155 100644 --- a/sys-devel/sparse/sparse-0.6.4.ebuild +++ b/sys-devel/sparse/sparse-0.6.4.ebuild @@ -31,9 +31,8 @@ BDEPEND="gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" llvm_check_deps() { - has_version "sys-devel/llvm:${LLVM_MAX_SLOT}" || \ - has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 1))" \ - has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 2))" + has_version "sys-devel/llvm:${LLVM_SLOT}" && \ + has_version -r "sys-devel/llvm:${LLVM_SLOT}" } pkg_setup() { diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild index 8e6b268ec5b..6fbcc28e155 100644 --- a/sys-devel/sparse/sparse-9999.ebuild +++ b/sys-devel/sparse/sparse-9999.ebuild @@ -31,9 +31,8 @@ BDEPEND="gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" llvm_check_deps() { - has_version "sys-devel/llvm:${LLVM_MAX_SLOT}" || \ - has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 1))" \ - has_version "sys-devel/llvm:$((${LLVM_MAX_SLOT} - 2))" + has_version "sys-devel/llvm:${LLVM_SLOT}" && \ + has_version -r "sys-devel/llvm:${LLVM_SLOT}" } pkg_setup() {