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-libs/libcxx/
Date: Wed, 27 Apr 2022 12:27:20
Message-Id: 1651062422.b78451bfa3081d1cb129bd99668ff51c880d5895.mgorny@gentoo
1 commit: b78451bfa3081d1cb129bd99668ff51c880d5895
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 27 08:35:15 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 27 12:27:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b78451bf
7
8 sys-libs/libcxx: Modernize
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/libcxx/libcxx-15.0.0.9999.ebuild | 24 ++++++++++++++++--------
13 1 file changed, 16 insertions(+), 8 deletions(-)
14
15 diff --git a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild b/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
16 index 0562667b5a4b..dcdce79b90b2 100644
17 --- a/sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
18 +++ b/sys-libs/libcxx/libcxx-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 CMAKE_ECLASS=cmake
27 PYTHON_COMPAT=( python3_{8..10} )
28 @@ -14,25 +14,33 @@ LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
29 SLOT="0"
30 KEYWORDS=""
31 IUSE="+libcxxabi +libunwind static-libs test"
32 -REQUIRED_USE="libunwind? ( libcxxabi )"
33 RESTRICT="!test? ( test )"
34 +REQUIRED_USE="libunwind? ( libcxxabi )"
35
36 RDEPEND="
37 - libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
38 - !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
39 + libcxxabi? (
40 + ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}]
41 + )
42 + !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
43 +"
44 # llvm-6 for new lit options
45 # clang-3.9.0 installs necessary target symlinks unconditionally
46 # which removes the need for MULTILIB_USEDEP
47 -DEPEND="${RDEPEND}
48 - >=sys-devel/llvm-6"
49 +DEPEND="
50 + ${RDEPEND}
51 + >=sys-devel/llvm-6
52 +"
53 BDEPEND="
54 - ${PYTHON_DEPS}
55 + !test? (
56 + ${PYTHON_DEPS}
57 + )
58 test? (
59 >=dev-util/cmake-3.16
60 >=sys-devel/clang-3.9.0
61 sys-devel/gdb[python]
62 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
63 - )"
64 + )
65 +"
66
67 LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
68 LLVM_PATCHSET=9999-1