Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 18 Jul 2021 16:55:44
Message-Id: 1626627324.ed5820b5009a75d18184f052005155579f8842e5.asturm@gentoo
1 commit: ed5820b5009a75d18184f052005155579f8842e5
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 18 10:40:16 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 18 16:55:24 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ed5820b5
7
8 cmake.eclass: Move supported EAPI check and EXPORT_FUNCTIONS on top
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/cmake.eclass | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15 diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
16 index 870e8dba5f..05556e49f1 100644
17 --- a/eclass/cmake.eclass
18 +++ b/eclass/cmake.eclass
19 @@ -17,6 +17,13 @@
20 # out-of-source builds (default), in-source builds and an implementation of the
21 # well-known use_enable function for CMake.
22
23 +case ${EAPI:-0} in
24 + 7) ;;
25 + *) die "EAPI=${EAPI:-0} is not supported" ;;
26 +esac
27 +
28 +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
29 +
30 if [[ -z ${_CMAKE_ECLASS} ]]; then
31 _CMAKE_ECLASS=1
32
33 @@ -97,15 +104,8 @@ _CMAKE_ECLASS=1
34 # a user flag and should under _no circumstances_ be set in the ebuild.
35 # Helps in improving QA of build systems that write to source tree.
36
37 -case ${EAPI} in
38 - 7) ;;
39 - *) die "EAPI=${EAPI:-0} is not supported" ;;
40 -esac
41 -
42 inherit toolchain-funcs ninja-utils flag-o-matic multiprocessing xdg-utils
43
44 -EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
45 -
46 [[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary, set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly"
47 [[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
48 [[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set CMAKE_REMOVE_MODULES_LIST=\"\" instead"