Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
Date: Wed, 27 Apr 2022 12:27:17
Message-Id: 1651062412.2ddf3651bc4415afa4c22c5d66367270bca10ff3.mgorny@gentoo
1 commit: 2ddf3651bc4415afa4c22c5d66367270bca10ff3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 08:35:00 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 12:26:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddf3651
7
8 sys-devel/llvm: Modernize
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/llvm/llvm-15.0.0.9999.ebuild | 26 +++++++++++++++++---------
13 1 file changed, 17 insertions(+), 9 deletions(-)
14
15 diff --git a/sys-devel/llvm/llvm-15.0.0.9999.ebuild b/sys-devel/llvm/llvm-15.0.0.9999.ebuild
16 index 98e506114f39..8d3abaa4540a 100644
17 --- a/sys-devel/llvm/llvm-15.0.0.9999.ebuild
18 +++ b/sys-devel/llvm/llvm-15.0.0.9999.ebuild
19 @@ -1,7 +1,7 @@
20 # Copyright 1999-2022 Gentoo Authors
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=7
24 +EAPI=8
25
26 PYTHON_COMPAT=( python3_{8..10} )
27 inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
28 @@ -31,10 +31,14 @@ RDEPEND="
29 ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
30 xar? ( app-arch/xar )
31 xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
32 - z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
33 -DEPEND="${RDEPEND}
34 - binutils-plugin? ( sys-libs/binutils-libs )"
35 + z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
36 +"
37 +DEPEND="
38 + ${RDEPEND}
39 + binutils-plugin? ( sys-libs/binutils-libs )
40 +"
41 BDEPEND="
42 + ${PYTHON_DEPS}
43 dev-lang/perl
44 >=dev-util/cmake-3.16
45 sys-devel/gnuconfig
46 @@ -47,13 +51,17 @@ BDEPEND="
47 dev-python/sphinx[${PYTHON_USEDEP}]
48 ') )
49 libffi? ( virtual/pkgconfig )
50 - ${PYTHON_DEPS}"
51 +"
52 # There are no file collisions between these versions but having :0
53 # installed means llvm-config there will take precedence.
54 -RDEPEND="${RDEPEND}
55 - !sys-devel/llvm:0"
56 -PDEPEND="sys-devel/llvm-common
57 - binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )"
58 +RDEPEND="
59 + ${RDEPEND}
60 + !sys-devel/llvm:0
61 +"
62 +PDEPEND="
63 + sys-devel/llvm-common
64 + binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
65 +"
66
67 LLVM_COMPONENTS=( llvm cmake third-party )
68 LLVM_MANPAGES=build