From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1432563-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 847E7158011
for <garchives@archives.gentoo.org>; Wed, 31 Aug 2022 21:49:06 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B1D8CE0833;
Wed, 31 Aug 2022 21:49:05 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9C79FE0833
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Aug 2022 21:49:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 8D68934116A
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Aug 2022 21:49:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BF2F1596
for <gentoo-commits@lists.gentoo.org>; Wed, 31 Aug 2022 21:49:02 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
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" <sam@gentoo.org>
Message-ID: <1661982524.aa9d13ef6a2f77c7a7e7e16d0723d378b6c3eafe.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/ghc/ghc-9.0.2.ebuild
X-VCS-Directories: dev-lang/ghc/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: aa9d13ef6a2f77c7a7e7e16d0723d378b6c3eafe
X-VCS-Branch: master
Date: Wed, 31 Aug 2022 21:49:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1a38b5a5-f77c-4c18-88b6-57d3e01b013b
X-Archives-Hash: b42738c192b4979dc5a16dcf462ee695
commit: aa9d13ef6a2f77c7a7e7e16d0723d378b6c3eafe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 21:48:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 21:48:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9d13ef
dev-lang/ghc: cleanup obsolete LLVM slots; conditionalise llvm_pkg_setup call
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ghc/ghc-9.0.2.ebuild | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dev-lang/ghc/ghc-9.0.2.ebuild b/dev-lang/ghc/ghc-9.0.2.ebuild
index d3bdecd30539..dc0d530b0785 100644
--- a/dev-lang/ghc/ghc-9.0.2.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2.ebuild
@@ -90,12 +90,8 @@ RDEPEND="
!ghcmakebinary? ( dev-libs/libffi:= )
numa? ( sys-process/numactl )
llvm? (
- <sys-devel/llvm-$(("${LLVM_MAX_SLOT}" + 1)):=
+ <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
|| (
- sys-devel/llvm:9
- sys-devel/llvm:10
- sys-devel/llvm:11
- sys-devel/llvm:12
sys-devel/llvm:13
)
)
@@ -406,7 +402,7 @@ pkg_setup() {
python-any-r1_pkg_setup
fi
- llvm_pkg_setup
+ use llvm && llvm_pkg_setup
}
src_unpack() {