Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/
Date: Wed, 31 Aug 2022 21:49:06
Message-Id: 1661982524.aa9d13ef6a2f77c7a7e7e16d0723d378b6c3eafe.sam@gentoo
1 commit: aa9d13ef6a2f77c7a7e7e16d0723d378b6c3eafe
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 31 21:48:09 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 31 21:48:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa9d13ef
7
8 dev-lang/ghc: cleanup obsolete LLVM slots; conditionalise llvm_pkg_setup call
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-lang/ghc/ghc-9.0.2.ebuild | 8 ++------
13 1 file changed, 2 insertions(+), 6 deletions(-)
14
15 diff --git a/dev-lang/ghc/ghc-9.0.2.ebuild b/dev-lang/ghc/ghc-9.0.2.ebuild
16 index d3bdecd30539..dc0d530b0785 100644
17 --- a/dev-lang/ghc/ghc-9.0.2.ebuild
18 +++ b/dev-lang/ghc/ghc-9.0.2.ebuild
19 @@ -90,12 +90,8 @@ RDEPEND="
20 !ghcmakebinary? ( dev-libs/libffi:= )
21 numa? ( sys-process/numactl )
22 llvm? (
23 - <sys-devel/llvm-$(("${LLVM_MAX_SLOT}" + 1)):=
24 + <sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
25 || (
26 - sys-devel/llvm:9
27 - sys-devel/llvm:10
28 - sys-devel/llvm:11
29 - sys-devel/llvm:12
30 sys-devel/llvm:13
31 )
32 )
33 @@ -406,7 +402,7 @@ pkg_setup() {
34 python-any-r1_pkg_setup
35 fi
36
37 - llvm_pkg_setup
38 + use llvm && llvm_pkg_setup
39 }
40
41 src_unpack() {