1 |
cmake-utils.eclass was dropped on 2022-08-01 in commit 3e744f5a. |
2 |
|
3 |
See also: https://github.com/gentoo/gentoo/pull/26858 |
4 |
|
5 |
--- |
6 |
eclass/cmake-multilib.eclass | 30 ++++++++++-------------------- |
7 |
1 file changed, 10 insertions(+), 20 deletions(-) |
8 |
|
9 |
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass |
10 |
index 61bacd3d60e3..7e4a86d56756 100644 |
11 |
--- a/eclass/cmake-multilib.eclass |
12 |
+++ b/eclass/cmake-multilib.eclass |
13 |
@@ -1,4 +1,4 @@ |
14 |
-# Copyright 1999-2021 Gentoo Authors |
15 |
+# Copyright 1999-2022 Gentoo Authors |
16 |
# Distributed under the terms of the GNU General Public License v2 |
17 |
|
18 |
# @ECLASS: cmake-multilib.eclass |
19 |
@@ -7,7 +7,7 @@ |
20 |
# @AUTHOR: |
21 |
# Author: Michał Górny <mgorny@g.o> |
22 |
# @SUPPORTED_EAPIS: 7 8 |
23 |
-# @PROVIDES: cmake cmake-utils multilib-minimal |
24 |
+# @PROVIDES: cmake multilib-minimal |
25 |
# @BLURB: cmake wrapper for multilib builds |
26 |
# @DESCRIPTION: |
27 |
# The cmake-multilib.eclass provides a glue between cmake.eclass(5) |
28 |
@@ -20,31 +20,21 @@ |
29 |
# in multilib-minimal, yet they ought to call appropriate cmake |
30 |
# phase rather than 'default'. |
31 |
|
32 |
-[[ ${EAPI} == 7 ]] && : ${CMAKE_ECLASS:=cmake-utils} |
33 |
# @ECLASS_VARIABLE: CMAKE_ECLASS |
34 |
-# @PRE_INHERIT |
35 |
+# @DEPRECATED |
36 |
# @DESCRIPTION: |
37 |
-# Only "cmake" is supported in EAPI-8 and later. |
38 |
-# In EAPI-7, default is "cmake-utils" for compatibility. Specify "cmake" for |
39 |
-# ebuilds that ported to cmake.eclass already. |
40 |
+# Only "cmake" is supported. |
41 |
: ${CMAKE_ECLASS:=cmake} |
42 |
|
43 |
-# @ECLASS_VARIABLE: _CMAKE_ECLASS_IMPL |
44 |
-# @INTERNAL |
45 |
-# @DESCRIPTION: |
46 |
-# TODO: Cleanup once EAPI-7 support is gone. |
47 |
-_CMAKE_ECLASS_IMPL=cmake |
48 |
- |
49 |
case ${EAPI} in |
50 |
7|8) |
51 |
case ${CMAKE_ECLASS} in |
52 |
- cmake-utils|cmake) ;; |
53 |
+ cmake) ;; |
54 |
*) |
55 |
eerror "Unknown value for \$ |
56 |
{CMAKE_ECLASS}" |
57 |
die "Value ${CMAKE_ECLASS} is not |
58 |
supported" |
59 |
;; |
60 |
esac |
61 |
- _CMAKE_ECLASS_IMPL=${CMAKE_ECLASS} |
62 |
;; |
63 |
*) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;; |
64 |
esac |
65 |
@@ -56,7 +46,7 @@ fi |
66 |
if [[ -z ${_CMAKE_MULTILIB_ECLASS} ]]; then |
67 |
_CMAKE_MULTILIB_ECLASS=1 |
68 |
|
69 |
-inherit ${_CMAKE_ECLASS_IMPL} multilib-minimal |
70 |
+inherit cmake multilib-minimal |
71 |
|
72 |
cmake-multilib_src_configure() { |
73 |
local _cmake_args=( "${@}" ) |
74 |
@@ -65,7 +55,7 @@ cmake-multilib_src_configure() { |
75 |
} |
76 |
|
77 |
multilib_src_configure() { |
78 |
- ${_CMAKE_ECLASS_IMPL}_src_configure "${_cmake_args[@]}" |
79 |
+ cmake_src_configure "${_cmake_args[@]}" |
80 |
} |
81 |
|
82 |
cmake-multilib_src_compile() { |
83 |
@@ -75,7 +65,7 @@ cmake-multilib_src_compile() { |
84 |
} |
85 |
|
86 |
multilib_src_compile() { |
87 |
- ${_CMAKE_ECLASS_IMPL}_src_compile "${_cmake_args[@]}" |
88 |
+ cmake_src_compile "${_cmake_args[@]}" |
89 |
} |
90 |
|
91 |
cmake-multilib_src_test() { |
92 |
@@ -85,7 +75,7 @@ cmake-multilib_src_test() { |
93 |
} |
94 |
|
95 |
multilib_src_test() { |
96 |
- ${_CMAKE_ECLASS_IMPL}_src_test "${_cmake_args[@]}" |
97 |
+ cmake_src_test "${_cmake_args[@]}" |
98 |
} |
99 |
|
100 |
cmake-multilib_src_install() { |
101 |
@@ -95,7 +85,7 @@ cmake-multilib_src_install() { |
102 |
} |
103 |
|
104 |
multilib_src_install() { |
105 |
- ${_CMAKE_ECLASS_IMPL}_src_install "${_cmake_args[@]}" |
106 |
+ cmake_src_install "${_cmake_args[@]}" |
107 |
} |
108 |
|
109 |
fi |
110 |
-- |
111 |
2.37.2 |