1 |
commit: 6f9549ca8ae59e7c6d38d686ce356f04f91e9318 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 18 20:29:29 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 25 19:41:41 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6f9549ca |
7 |
|
8 |
*.eclass: @ECLASS-VARIABLE renamed to @ECLASS_VARIABLE |
9 |
|
10 |
Bug: https://bugs.gentoo.org/835396 |
11 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
eclass/cmake.eclass | 22 +++++++++++----------- |
15 |
eclass/ecm.eclass | 28 ++++++++++++++-------------- |
16 |
eclass/kde.org.eclass | 20 ++++++++++---------- |
17 |
3 files changed, 35 insertions(+), 35 deletions(-) |
18 |
|
19 |
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass |
20 |
index f0a59a2ac4..29f973794b 100644 |
21 |
--- a/eclass/cmake.eclass |
22 |
+++ b/eclass/cmake.eclass |
23 |
@@ -28,7 +28,7 @@ _CMAKE_ECLASS=1 |
24 |
|
25 |
inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils |
26 |
|
27 |
-# @ECLASS-VARIABLE: BUILD_DIR |
28 |
+# @ECLASS_VARIABLE: BUILD_DIR |
29 |
# @DEFAULT_UNSET |
30 |
# @DESCRIPTION: |
31 |
# Build directory where all cmake processed files should be generated. |
32 |
@@ -38,13 +38,13 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils |
33 |
[[ ${EAPI} == 7 ]] && : ${BUILD_DIR:=${WORKDIR}/${P}_build} |
34 |
# EAPI-8: set inside _cmake_check_build_dir |
35 |
|
36 |
-# @ECLASS-VARIABLE: CMAKE_BINARY |
37 |
+# @ECLASS_VARIABLE: CMAKE_BINARY |
38 |
# @DESCRIPTION: |
39 |
# Eclass can use different cmake binary than the one provided in by system. |
40 |
: ${CMAKE_BINARY:=cmake} |
41 |
|
42 |
[[ ${EAPI} == 7 ]] && : ${CMAKE_BUILD_TYPE:=Gentoo} |
43 |
-# @ECLASS-VARIABLE: CMAKE_BUILD_TYPE |
44 |
+# @ECLASS_VARIABLE: CMAKE_BUILD_TYPE |
45 |
# @DESCRIPTION: |
46 |
# Set to override default CMAKE_BUILD_TYPE. Only useful for packages |
47 |
# known to make use of "if (CMAKE_BUILD_TYPE MATCHES xxx)". |
48 |
@@ -57,12 +57,12 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils |
49 |
# In EAPI 7, the default was non-standard build type of Gentoo. |
50 |
: ${CMAKE_BUILD_TYPE:=RelWithDebInfo} |
51 |
|
52 |
-# @ECLASS-VARIABLE: CMAKE_IN_SOURCE_BUILD |
53 |
+# @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD |
54 |
# @DEFAULT_UNSET |
55 |
# @DESCRIPTION: |
56 |
# Set to enable in-source build. |
57 |
|
58 |
-# @ECLASS-VARIABLE: CMAKE_MAKEFILE_GENERATOR |
59 |
+# @ECLASS_VARIABLE: CMAKE_MAKEFILE_GENERATOR |
60 |
# @PRE_INHERIT |
61 |
# @DEFAULT_UNSET |
62 |
# @DESCRIPTION: |
63 |
@@ -71,7 +71,7 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils |
64 |
# The default is set to "ninja". |
65 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
66 |
|
67 |
-# @ECLASS-VARIABLE: CMAKE_REMOVE_MODULES_LIST |
68 |
+# @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST |
69 |
# @PRE_INHERIT |
70 |
# @DEFAULT_UNSET |
71 |
# @DESCRIPTION: |
72 |
@@ -90,25 +90,25 @@ else |
73 |
fi |
74 |
fi |
75 |
|
76 |
-# @ECLASS-VARIABLE: CMAKE_USE_DIR |
77 |
+# @ECLASS_VARIABLE: CMAKE_USE_DIR |
78 |
# @DESCRIPTION: |
79 |
# Sets the directory where we are working with cmake, for example when |
80 |
# application uses autotools and only one plugin needs to be done by cmake. |
81 |
# By default it uses current working directory (in EAPI-7: ${S}). |
82 |
|
83 |
-# @ECLASS-VARIABLE: CMAKE_VERBOSE |
84 |
+# @ECLASS_VARIABLE: CMAKE_VERBOSE |
85 |
# @DESCRIPTION: |
86 |
# Set to OFF to disable verbose messages during compilation |
87 |
: ${CMAKE_VERBOSE:=ON} |
88 |
|
89 |
-# @ECLASS-VARIABLE: CMAKE_WARN_UNUSED_CLI |
90 |
+# @ECLASS_VARIABLE: CMAKE_WARN_UNUSED_CLI |
91 |
# @DESCRIPTION: |
92 |
# Warn about variables that are declared on the command line |
93 |
# but not used. Might give false-positives. |
94 |
# "no" to disable (default) or anything else to enable. |
95 |
: ${CMAKE_WARN_UNUSED_CLI:=yes} |
96 |
|
97 |
-# @ECLASS-VARIABLE: CMAKE_EXTRA_CACHE_FILE |
98 |
+# @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE |
99 |
# @USER_VARIABLE |
100 |
# @DEFAULT_UNSET |
101 |
# @DESCRIPTION: |
102 |
@@ -116,7 +116,7 @@ fi |
103 |
# for econf and is needed to pass TRY_RUN results when cross-compiling. |
104 |
# Should be set by user in a per-package basis in /etc/portage/package.env. |
105 |
|
106 |
-# @ECLASS-VARIABLE: CMAKE_QA_SRC_DIR_READONLY |
107 |
+# @ECLASS_VARIABLE: CMAKE_QA_SRC_DIR_READONLY |
108 |
# @USER_VARIABLE |
109 |
# @DEFAULT_UNSET |
110 |
# @DESCRIPTION: |
111 |
|
112 |
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass |
113 |
index a0ba4090ce..042280b77f 100644 |
114 |
--- a/eclass/ecm.eclass |
115 |
+++ b/eclass/ecm.eclass |
116 |
@@ -29,7 +29,7 @@ esac |
117 |
if [[ -z ${_ECM_ECLASS} ]]; then |
118 |
_ECM_ECLASS=1 |
119 |
|
120 |
-# @ECLASS-VARIABLE: VIRTUALX_REQUIRED |
121 |
+# @ECLASS_VARIABLE: VIRTUALX_REQUIRED |
122 |
# @DESCRIPTION: |
123 |
# For proper description see virtualx.eclass manpage. |
124 |
# Here we redefine default value to be manual, if your package needs virtualx |
125 |
@@ -38,7 +38,7 @@ _ECM_ECLASS=1 |
126 |
|
127 |
inherit cmake flag-o-matic toolchain-funcs virtualx |
128 |
|
129 |
-# @ECLASS-VARIABLE: ECM_NONGUI |
130 |
+# @ECLASS_VARIABLE: ECM_NONGUI |
131 |
# @DEFAULT_UNSET |
132 |
# @DESCRIPTION: |
133 |
# By default, for all CATEGORIES except kde-frameworks, assume we are building |
134 |
@@ -54,31 +54,31 @@ if [[ ${ECM_NONGUI} = false ]] ; then |
135 |
inherit xdg |
136 |
fi |
137 |
|
138 |
-# @ECLASS-VARIABLE: ECM_KDEINSTALLDIRS |
139 |
+# @ECLASS_VARIABLE: ECM_KDEINSTALLDIRS |
140 |
# @DESCRIPTION: |
141 |
# Assume the package is using KDEInstallDirs macro and switch |
142 |
# KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing. |
143 |
: ${ECM_KDEINSTALLDIRS:=true} |
144 |
|
145 |
-# @ECLASS-VARIABLE: ECM_DEBUG |
146 |
+# @ECLASS_VARIABLE: ECM_DEBUG |
147 |
# @DESCRIPTION: |
148 |
# Add "debug" to IUSE. If !debug, add -DQT_NO_DEBUG to CPPFLAGS. If set to |
149 |
# "false", do nothing. |
150 |
: ${ECM_DEBUG:=true} |
151 |
|
152 |
-# @ECLASS-VARIABLE: ECM_DESIGNERPLUGIN |
153 |
+# @ECLASS_VARIABLE: ECM_DESIGNERPLUGIN |
154 |
# @DESCRIPTION: |
155 |
# If set to "true", add "designer" to IUSE to toggle build of designer plugins |
156 |
# and add the necessary BDEPEND. If set to "false", do nothing. |
157 |
: ${ECM_DESIGNERPLUGIN:=false} |
158 |
|
159 |
-# @ECLASS-VARIABLE: ECM_EXAMPLES |
160 |
+# @ECLASS_VARIABLE: ECM_EXAMPLES |
161 |
# @DESCRIPTION: |
162 |
# By default unconditionally ignore a top-level examples subdirectory. |
163 |
# If set to "true", add "examples" to IUSE to toggle adding that subdirectory. |
164 |
: ${ECM_EXAMPLES:=false} |
165 |
|
166 |
-# @ECLASS-VARIABLE: ECM_HANDBOOK |
167 |
+# @ECLASS_VARIABLE: ECM_HANDBOOK |
168 |
# @DESCRIPTION: |
169 |
# Will accept "true", "false", "optional", "forceoptional". If set to "false", |
170 |
# do nothing. |
171 |
@@ -92,20 +92,20 @@ fi |
172 |
# CMakeLists.txt in addition to the above. |
173 |
: ${ECM_HANDBOOK:=false} |
174 |
|
175 |
-# @ECLASS-VARIABLE: ECM_HANDBOOK_DIR |
176 |
+# @ECLASS_VARIABLE: ECM_HANDBOOK_DIR |
177 |
# @DESCRIPTION: |
178 |
# Specifies the directory containing the docbook file(s) relative to ${S} to |
179 |
# be processed by KF5DocTools (kdoctools_install). |
180 |
: ${ECM_HANDBOOK_DIR:=doc} |
181 |
|
182 |
-# @ECLASS-VARIABLE: ECM_PO_DIRS |
183 |
+# @ECLASS_VARIABLE: ECM_PO_DIRS |
184 |
# @DESCRIPTION: |
185 |
# Specifies directories of l10n files relative to ${S} to be processed by |
186 |
# KF5I18n (ki18n_install). If IUSE nls exists and is disabled then disable |
187 |
# build of these directories in CMakeLists.txt. |
188 |
: ${ECM_PO_DIRS:="po poqm"} |
189 |
|
190 |
-# @ECLASS-VARIABLE: ECM_QTHELP |
191 |
+# @ECLASS_VARIABLE: ECM_QTHELP |
192 |
# @DEFAULT_UNSET |
193 |
# @DESCRIPTION: |
194 |
# Default value for all CATEGORIES except kde-frameworks is "false". |
195 |
@@ -117,7 +117,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then |
196 |
fi |
197 |
: ${ECM_QTHELP:=false} |
198 |
|
199 |
-# @ECLASS-VARIABLE: ECM_TEST |
200 |
+# @ECLASS_VARIABLE: ECM_TEST |
201 |
# @DEFAULT_UNSET |
202 |
# @DESCRIPTION: |
203 |
# Will accept "true", "false", "optional", "forceoptional", |
204 |
@@ -139,7 +139,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then |
205 |
fi |
206 |
: ${ECM_TEST:=false} |
207 |
|
208 |
-# @ECLASS-VARIABLE: KFMIN |
209 |
+# @ECLASS_VARIABLE: KFMIN |
210 |
# @DEFAULT_UNSET |
211 |
# @DESCRIPTION: |
212 |
# Minimum version of Frameworks to require. Default value for kde-frameworks |
213 |
@@ -151,7 +151,7 @@ if [[ ${CATEGORY} = kde-frameworks ]]; then |
214 |
fi |
215 |
: ${KFMIN:=5.82.0} |
216 |
|
217 |
-# @ECLASS-VARIABLE: KFSLOT |
218 |
+# @ECLASS_VARIABLE: KFSLOT |
219 |
# @INTERNAL |
220 |
# @DESCRIPTION: |
221 |
# KDE Frameworks and Qt slot dependency, implied by KFMIN version. |
222 |
@@ -255,7 +255,7 @@ DEPEND+=" ${COMMONDEPEND}" |
223 |
RDEPEND+=" ${COMMONDEPEND}" |
224 |
unset COMMONDEPEND |
225 |
|
226 |
-# @ECLASS-VARIABLE: KDE_GCC_MINIMAL |
227 |
+# @ECLASS_VARIABLE: KDE_GCC_MINIMAL |
228 |
# @DEFAULT_UNSET |
229 |
# @DESCRIPTION: |
230 |
# Minimum version of active GCC to require. This is checked in |
231 |
|
232 |
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass |
233 |
index 2ddde6a865..e4bde18bfb 100644 |
234 |
--- a/eclass/kde.org.eclass |
235 |
+++ b/eclass/kde.org.eclass |
236 |
@@ -23,7 +23,7 @@ esac |
237 |
if [[ -z ${_KDE_ORG_ECLASS} ]]; then |
238 |
_KDE_ORG_ECLASS=1 |
239 |
|
240 |
-# @ECLASS-VARIABLE: KDE_BUILD_TYPE |
241 |
+# @ECLASS_VARIABLE: KDE_BUILD_TYPE |
242 |
# @DESCRIPTION: |
243 |
# If PV matches "*9999*", this is automatically set to "live". |
244 |
# Otherwise, this is automatically set to "release". |
245 |
@@ -37,7 +37,7 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then |
246 |
inherit git-r3 |
247 |
fi |
248 |
|
249 |
-# @ECLASS-VARIABLE: KDE_ORG_CATEGORIES |
250 |
+# @ECLASS_VARIABLE: KDE_ORG_CATEGORIES |
251 |
# @INTERNAL |
252 |
# @DESCRIPTION: |
253 |
# Map of ${CATEGORY}=<upstream category> key-value pairs. |
254 |
@@ -79,14 +79,14 @@ declare -A KDE_ORG_CATEGORIES=( |
255 |
) |
256 |
readonly KDE_ORG_CATEGORIES |
257 |
|
258 |
-# @ECLASS-VARIABLE: KDE_ORG_CATEGORY |
259 |
+# @ECLASS_VARIABLE: KDE_ORG_CATEGORY |
260 |
# @PRE_INHERIT |
261 |
# @DESCRIPTION: |
262 |
# If unset, default value is mapped from ${CATEGORY} to corresponding upstream |
263 |
# category on invent.kde.org, with "kde" as fallback value. |
264 |
: ${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}} |
265 |
|
266 |
-# @ECLASS-VARIABLE: KDE_ORG_COMMIT |
267 |
+# @ECLASS_VARIABLE: KDE_ORG_COMMIT |
268 |
# @PRE_INHERIT |
269 |
# @DEFAULT_UNSET |
270 |
# @DESCRIPTION: |
271 |
@@ -94,14 +94,14 @@ readonly KDE_ORG_CATEGORIES |
272 |
# invent.kde.org repository identified by KDE_ORG_CATEGORY and KDE_ORG_NAME |
273 |
# at the desired COMMIT ID. |
274 |
|
275 |
-# @ECLASS-VARIABLE: KDE_ORG_NAME |
276 |
+# @ECLASS_VARIABLE: KDE_ORG_NAME |
277 |
# @PRE_INHERIT |
278 |
# @DESCRIPTION: |
279 |
# If unset, default value is set to ${PN}. |
280 |
# Name of the package as hosted on kde.org mirrors. |
281 |
: ${KDE_ORG_NAME:=$PN} |
282 |
|
283 |
-# @ECLASS-VARIABLE: KDE_GEAR |
284 |
+# @ECLASS_VARIABLE: KDE_GEAR |
285 |
# @PRE_INHERIT |
286 |
# @DESCRIPTION: |
287 |
# Mark package is being part of KDE Gear release schedule. |
288 |
@@ -113,7 +113,7 @@ if [[ ${CATEGORY} == kde-apps ]]; then |
289 |
KDE_GEAR=true |
290 |
fi |
291 |
|
292 |
-# @ECLASS-VARIABLE: KDE_SELINUX_MODULE |
293 |
+# @ECLASS_VARIABLE: KDE_SELINUX_MODULE |
294 |
# @PRE_INHERIT |
295 |
# @DESCRIPTION: |
296 |
# If set to "none", do nothing. |
297 |
@@ -129,7 +129,7 @@ case ${KDE_SELINUX_MODULE} in |
298 |
;; |
299 |
esac |
300 |
|
301 |
-# @ECLASS-VARIABLE: KDE_UNRELEASED |
302 |
+# @ECLASS_VARIABLE: KDE_UNRELEASED |
303 |
# @INTERNAL |
304 |
# @DESCRIPTION: |
305 |
# An array of $CATEGORY-$PV pairs of packages that are unreleased upstream. |
306 |
@@ -248,7 +248,7 @@ _kde.org_calculate_live_repo() { |
307 |
|
308 |
SRC_URI="" |
309 |
|
310 |
- # @ECLASS-VARIABLE: EGIT_MIRROR |
311 |
+ # @ECLASS_VARIABLE: EGIT_MIRROR |
312 |
# @DESCRIPTION: |
313 |
# This variable allows easy overriding of default kde mirror service |
314 |
# (anongit) with anything else you might want to use. |
315 |
@@ -266,7 +266,7 @@ _kde.org_calculate_live_repo() { |
316 |
EGIT_BRANCH="Plasma/$(ver_cut 1-2)" |
317 |
fi |
318 |
|
319 |
- # @ECLASS-VARIABLE: EGIT_REPONAME |
320 |
+ # @ECLASS_VARIABLE: EGIT_REPONAME |
321 |
# @DESCRIPTION: |
322 |
# This variable allows overriding of default repository |
323 |
# name. Specify only if this differs from PN and KDE_ORG_NAME. |