Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/
Date: Sun, 16 Aug 2020 20:06:13
Message-Id: 1597603835.35222236f21f5579e9493e240036d73fea26ed7d.asturm@gentoo
1 commit: 35222236f21f5579e9493e240036d73fea26ed7d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 16 18:50:35 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 16 18:50:35 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=35222236
7
8 cmake-utils.eclass: Inherit ninja-utils only in >=EAPI-7
9
10 It's kind of a hack, but there's no use for this in kde-sunset overlay anyway.
11
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 eclass/cmake-utils.eclass | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
18 index 30c6016b..989b1c5c 100644
19 --- a/eclass/cmake-utils.eclass
20 +++ b/eclass/cmake-utils.eclass
21 @@ -112,7 +112,7 @@ case ${EAPI} in
22 *) die "EAPI=${EAPI:-0} is not supported" ;;
23 esac
24
25 -inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
26 +inherit toolchain-funcs flag-o-matic multiprocessing xdg-utils
27
28 case ${EAPI} in
29 [3456])
30 @@ -121,6 +121,7 @@ case ${EAPI} in
31 ;;
32 *)
33 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
34 + inherit ninja-utils
35 ;;
36 esac