1 |
commit: be0ab352405aa2d5d968a8c3905557b914df9626 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 19:12:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Dec 31 18:42:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0ab352 |
7 |
|
8 |
*/*: Switch proxy-maint to cmake.eclass |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
app-editors/neovim/neovim-0.3.8.ebuild | 8 ++++---- |
13 |
app-editors/neovim/neovim-0.4.2.ebuild | 8 ++++---- |
14 |
app-editors/neovim/neovim-0.4.3.ebuild | 8 ++++---- |
15 |
app-editors/neovim/neovim-9999.ebuild | 8 ++++---- |
16 |
app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild | 2 +- |
17 |
app-misc/vcontrold/vcontrold-0.98.8.ebuild | 8 ++++---- |
18 |
app-mobilephone/gammu/gammu-1.40.0.ebuild | 9 ++++----- |
19 |
app-mobilephone/gammu/gammu-1.41.0.ebuild | 9 ++++----- |
20 |
dev-cpp/gtest/gtest-1.10.0.ebuild | 6 +++--- |
21 |
dev-cpp/gtest/gtest-1.8.1-r1.ebuild | 6 +++--- |
22 |
dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild | 6 +++--- |
23 |
dev-cpp/gtest/gtest-9999.ebuild | 5 +++-- |
24 |
dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild | 6 +++--- |
25 |
dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild | 4 ++-- |
26 |
dev-libs/criterion/criterion-2.3.3.ebuild | 10 +++++----- |
27 |
dev-lua/luv/luv-1.32.0.0.ebuild | 6 +++--- |
28 |
games-action/minetest/minetest-5.1.0-r1.ebuild | 12 ++++++------ |
29 |
games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild | 6 +++--- |
30 |
games-emulation/pcsx2/pcsx2-9999.ebuild | 6 +++--- |
31 |
games-engines/odamex/odamex-0.8.1-r1.ebuild | 10 +++++----- |
32 |
games-fps/gzdoom/gzdoom-4.2.4.ebuild | 8 ++++---- |
33 |
media-gfx/qimgv/qimgv-0.8.5.ebuild | 6 +++--- |
34 |
media-gfx/qimgv/qimgv-0.8.8.ebuild | 6 +++--- |
35 |
media-libs/Field3D/Field3D-1.7.2.ebuild | 6 +++--- |
36 |
media-libs/osl/osl-1.10.5.ebuild | 5 ++--- |
37 |
media-libs/partio/partio-1.5.4.ebuild | 6 +++--- |
38 |
media-libs/partio/partio-9999.ebuild | 6 +++--- |
39 |
media-libs/ptex/ptex-2.3.2.ebuild | 6 +++--- |
40 |
media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild | 4 ++-- |
41 |
media-video/qmplay2/qmplay2-19.12.19.ebuild | 6 +++--- |
42 |
media-video/qmplay2/qmplay2-9999.ebuild | 6 +++--- |
43 |
net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild | 4 ++-- |
44 |
net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild | 4 ++-- |
45 |
net-libs/qxmpp/qxmpp-1.0.1.ebuild | 6 +++--- |
46 |
net-misc/seafile-client/seafile-client-6.2.11.ebuild | 6 +++--- |
47 |
net-misc/seafile-client/seafile-client-7.0.2.ebuild | 6 +++--- |
48 |
net-misc/seafile-client/seafile-client-7.0.4.ebuild | 6 +++--- |
49 |
net-proxy/trojan/trojan-1.12.3.ebuild | 9 ++++----- |
50 |
net-proxy/trojan/trojan-1.13.0.ebuild | 9 ++++----- |
51 |
net-vpn/i2pd/i2pd-2.27.0.ebuild | 6 +++--- |
52 |
net-vpn/i2pd/i2pd-2.28.0.ebuild | 6 +++--- |
53 |
net-vpn/i2pd/i2pd-2.29.0.ebuild | 6 +++--- |
54 |
sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild | 8 ++++---- |
55 |
sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild | 8 ++++---- |
56 |
sci-physics/geant-vmc/geant-vmc-9999.ebuild | 8 ++++---- |
57 |
sci-physics/vgm/vgm-4.4-r1.ebuild | 8 ++++---- |
58 |
sci-physics/vgm/vgm-4.5.ebuild | 8 ++++---- |
59 |
sci-physics/vgm/vgm-9999.ebuild | 8 ++++---- |
60 |
.../thunderbolt-software-user-space-0.9.3-r1.ebuild | 6 +++--- |
61 |
x11-apps/copyq/copyq-3.8.0.ebuild | 4 ++-- |
62 |
x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild | 8 +++++--- |
63 |
x11-misc/virtualgl/virtualgl-9999.ebuild | 8 +++++--- |
64 |
52 files changed, 175 insertions(+), 175 deletions(-) |
65 |
|
66 |
diff --git a/app-editors/neovim/neovim-0.3.8.ebuild b/app-editors/neovim/neovim-0.3.8.ebuild |
67 |
index b22a6a5ca7c..52b26cd51f4 100644 |
68 |
--- a/app-editors/neovim/neovim-0.3.8.ebuild |
69 |
+++ b/app-editors/neovim/neovim-0.3.8.ebuild |
70 |
@@ -3,7 +3,7 @@ |
71 |
|
72 |
EAPI=7 |
73 |
|
74 |
-inherit cmake-utils xdg-utils |
75 |
+inherit cmake xdg-utils |
76 |
|
77 |
DESCRIPTION="Vim-fork focused on extensibility and agility" |
78 |
HOMEPAGE="https://neovim.io" |
79 |
@@ -62,7 +62,7 @@ src_prepare() { |
80 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
81 |
-i src/nvim/globals.h || die |
82 |
|
83 |
- cmake-utils_src_prepare |
84 |
+ cmake_src_prepare |
85 |
} |
86 |
|
87 |
src_configure() { |
88 |
@@ -71,11 +71,11 @@ src_configure() { |
89 |
-DENABLE_JEMALLOC=$(usex jemalloc) |
90 |
-DPREFER_LUA=$(usex luajit no yes) |
91 |
) |
92 |
- cmake-utils_src_configure |
93 |
+ cmake_src_configure |
94 |
} |
95 |
|
96 |
src_install() { |
97 |
- cmake-utils_src_install |
98 |
+ cmake_src_install |
99 |
|
100 |
# install a default configuration file |
101 |
insinto /etc/vim |
102 |
|
103 |
diff --git a/app-editors/neovim/neovim-0.4.2.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild |
104 |
index cf111db0b07..525ec586a27 100644 |
105 |
--- a/app-editors/neovim/neovim-0.4.2.ebuild |
106 |
+++ b/app-editors/neovim/neovim-0.4.2.ebuild |
107 |
@@ -3,7 +3,7 @@ |
108 |
|
109 |
EAPI=7 |
110 |
|
111 |
-inherit cmake-utils eutils xdg |
112 |
+inherit cmake eutils xdg |
113 |
|
114 |
DESCRIPTION="Vim-fork focused on extensibility and agility." |
115 |
HOMEPAGE="https://neovim.io" |
116 |
@@ -58,7 +58,7 @@ src_prepare() { |
117 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
118 |
-i src/nvim/globals.h || die |
119 |
|
120 |
- cmake-utils_src_prepare |
121 |
+ cmake_src_prepare |
122 |
} |
123 |
|
124 |
src_configure() { |
125 |
@@ -66,11 +66,11 @@ src_configure() { |
126 |
-DFEAT_TUI=$(usex tui) |
127 |
-DPREFER_LUA=$(usex luajit no yes) |
128 |
) |
129 |
- cmake-utils_src_configure |
130 |
+ cmake_src_configure |
131 |
} |
132 |
|
133 |
src_install() { |
134 |
- cmake-utils_src_install |
135 |
+ cmake_src_install |
136 |
|
137 |
# install a default configuration file |
138 |
insinto /etc/vim |
139 |
|
140 |
diff --git a/app-editors/neovim/neovim-0.4.3.ebuild b/app-editors/neovim/neovim-0.4.3.ebuild |
141 |
index d59da973037..6f27a67c108 100644 |
142 |
--- a/app-editors/neovim/neovim-0.4.3.ebuild |
143 |
+++ b/app-editors/neovim/neovim-0.4.3.ebuild |
144 |
@@ -3,7 +3,7 @@ |
145 |
|
146 |
EAPI=7 |
147 |
|
148 |
-inherit cmake-utils eutils xdg |
149 |
+inherit cmake eutils xdg |
150 |
|
151 |
DESCRIPTION="Vim-fork focused on extensibility and agility." |
152 |
HOMEPAGE="https://neovim.io" |
153 |
@@ -58,7 +58,7 @@ src_prepare() { |
154 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
155 |
-i src/nvim/globals.h || die |
156 |
|
157 |
- cmake-utils_src_prepare |
158 |
+ cmake_src_prepare |
159 |
} |
160 |
|
161 |
src_configure() { |
162 |
@@ -66,11 +66,11 @@ src_configure() { |
163 |
-DFEAT_TUI=$(usex tui) |
164 |
-DPREFER_LUA=$(usex luajit no yes) |
165 |
) |
166 |
- cmake-utils_src_configure |
167 |
+ cmake_src_configure |
168 |
} |
169 |
|
170 |
src_install() { |
171 |
- cmake-utils_src_install |
172 |
+ cmake_src_install |
173 |
|
174 |
# install a default configuration file |
175 |
insinto /etc/vim |
176 |
|
177 |
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild |
178 |
index 97f2f678904..6647b38da75 100644 |
179 |
--- a/app-editors/neovim/neovim-9999.ebuild |
180 |
+++ b/app-editors/neovim/neovim-9999.ebuild |
181 |
@@ -3,7 +3,7 @@ |
182 |
|
183 |
EAPI=7 |
184 |
|
185 |
-inherit cmake-utils eutils xdg |
186 |
+inherit cmake eutils xdg |
187 |
|
188 |
DESCRIPTION="Vim-fork focused on extensibility and agility." |
189 |
HOMEPAGE="https://neovim.io" |
190 |
@@ -59,7 +59,7 @@ src_prepare() { |
191 |
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ |
192 |
-i src/nvim/globals.h || die |
193 |
|
194 |
- cmake-utils_src_prepare |
195 |
+ cmake_src_prepare |
196 |
} |
197 |
|
198 |
src_configure() { |
199 |
@@ -67,11 +67,11 @@ src_configure() { |
200 |
-DFEAT_TUI=$(usex tui) |
201 |
-DPREFER_LUA=$(usex luajit no yes) |
202 |
) |
203 |
- cmake-utils_src_configure |
204 |
+ cmake_src_configure |
205 |
} |
206 |
|
207 |
src_install() { |
208 |
- cmake-utils_src_install |
209 |
+ cmake_src_install |
210 |
|
211 |
# install a default configuration file |
212 |
insinto /etc/vim |
213 |
|
214 |
diff --git a/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild b/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild |
215 |
index 5bed8dd43ff..a80f72b52c9 100644 |
216 |
--- a/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild |
217 |
+++ b/app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild |
218 |
@@ -7,7 +7,7 @@ DESCRIPTION="Shared library to be used by the Laretz sync server and its clients |
219 |
HOMEPAGE="https://leechcraft.org" |
220 |
SRC_URI="https://github.com/0xd34df00d/${PN#lib}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
221 |
|
222 |
-inherit cmake-utils |
223 |
+inherit cmake |
224 |
|
225 |
LICENSE="Boost-1.0" |
226 |
SLOT="0" |
227 |
|
228 |
diff --git a/app-misc/vcontrold/vcontrold-0.98.8.ebuild b/app-misc/vcontrold/vcontrold-0.98.8.ebuild |
229 |
index 67b70f6ed21..2e6f68c2c7e 100644 |
230 |
--- a/app-misc/vcontrold/vcontrold-0.98.8.ebuild |
231 |
+++ b/app-misc/vcontrold/vcontrold-0.98.8.ebuild |
232 |
@@ -3,7 +3,7 @@ |
233 |
|
234 |
EAPI=7 |
235 |
|
236 |
-inherit cmake-utils |
237 |
+inherit cmake |
238 |
|
239 |
DESCRIPTION="Daemon for communication with Viessmann Vito heatings" |
240 |
HOMEPAGE="https://github.com/openv/vcontrold/" |
241 |
@@ -22,7 +22,7 @@ src_prepare() { |
242 |
sed "s/@VERSION@/${PV}/" "src/version.h.in" \ |
243 |
> "src/version.h" || die "Setting version failed" |
244 |
|
245 |
- cmake-utils_src_prepare |
246 |
+ cmake_src_prepare |
247 |
} |
248 |
|
249 |
src_configure() { |
250 |
@@ -32,11 +32,11 @@ src_configure() { |
251 |
-DVSIM="$(usex vsim)" |
252 |
) |
253 |
|
254 |
- cmake-utils_src_configure |
255 |
+ cmake_src_configure |
256 |
} |
257 |
|
258 |
src_install() { |
259 |
- cmake-utils_src_install |
260 |
+ cmake_src_install |
261 |
doinitd "${FILESDIR}/vcontrold" |
262 |
insinto /etc/vcontrold/ |
263 |
doins -r xml |
264 |
|
265 |
diff --git a/app-mobilephone/gammu/gammu-1.40.0.ebuild b/app-mobilephone/gammu/gammu-1.40.0.ebuild |
266 |
index 24180c0286c..d91ec569eed 100644 |
267 |
--- a/app-mobilephone/gammu/gammu-1.40.0.ebuild |
268 |
+++ b/app-mobilephone/gammu/gammu-1.40.0.ebuild |
269 |
@@ -3,7 +3,7 @@ |
270 |
|
271 |
EAPI=7 |
272 |
|
273 |
-inherit cmake-utils |
274 |
+inherit cmake |
275 |
|
276 |
DESCRIPTION="A tool to handle your cellular phone" |
277 |
HOMEPAGE="https://wammu.eu/gammu/" |
278 |
@@ -47,18 +47,17 @@ src_configure() { |
279 |
-DWITH_ODBC=$(usex odbc) |
280 |
-DWITH_Postgres=$(usex postgres) |
281 |
-DWITH_USB=$(usex usb) |
282 |
- -DBUILD_SHARED_LIBS=ON |
283 |
-DINSTALL_DOC_DIR="share/doc/${PF}" |
284 |
) |
285 |
- cmake-utils_src_configure |
286 |
+ cmake_src_configure |
287 |
} |
288 |
|
289 |
src_test() { |
290 |
addwrite "/run/lock/LCK..bar" |
291 |
- LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1 |
292 |
+ LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1 |
293 |
} |
294 |
|
295 |
src_install() { |
296 |
- cmake-utils_src_install |
297 |
+ cmake_src_install |
298 |
docompress -x /usr/share/doc/${PF}/examples/ |
299 |
} |
300 |
|
301 |
diff --git a/app-mobilephone/gammu/gammu-1.41.0.ebuild b/app-mobilephone/gammu/gammu-1.41.0.ebuild |
302 |
index 8be8100b03e..2af395f2532 100644 |
303 |
--- a/app-mobilephone/gammu/gammu-1.41.0.ebuild |
304 |
+++ b/app-mobilephone/gammu/gammu-1.41.0.ebuild |
305 |
@@ -3,7 +3,7 @@ |
306 |
|
307 |
EAPI=7 |
308 |
|
309 |
-inherit cmake-utils |
310 |
+inherit cmake |
311 |
|
312 |
DESCRIPTION="A tool to handle your cellular phone" |
313 |
HOMEPAGE="https://wammu.eu/gammu/" |
314 |
@@ -45,18 +45,17 @@ src_configure() { |
315 |
-DWITH_ODBC=$(usex odbc) |
316 |
-DWITH_Postgres=$(usex postgres) |
317 |
-DWITH_USB=$(usex usb) |
318 |
- -DBUILD_SHARED_LIBS=ON |
319 |
-DINSTALL_DOC_DIR="share/doc/${PF}" |
320 |
) |
321 |
- cmake-utils_src_configure |
322 |
+ cmake_src_configure |
323 |
} |
324 |
|
325 |
src_test() { |
326 |
addwrite "/run/lock/LCK..bar" |
327 |
- LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1 |
328 |
+ LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1 |
329 |
} |
330 |
|
331 |
src_install() { |
332 |
- cmake-utils_src_install |
333 |
+ cmake_src_install |
334 |
docompress -x /usr/share/doc/${PF}/examples/ |
335 |
} |
336 |
|
337 |
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0.ebuild |
338 |
index 98d67d92032..ea624a4fe89 100644 |
339 |
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild |
340 |
+++ b/dev-cpp/gtest/gtest-1.10.0.ebuild |
341 |
@@ -5,7 +5,7 @@ EAPI=7 |
342 |
|
343 |
# Python is required for tests and some build tasks. |
344 |
PYTHON_COMPAT=( python2_7 pypy ) |
345 |
- |
346 |
+CMAKE_ECLASS=cmake |
347 |
inherit cmake-multilib python-any-r1 |
348 |
|
349 |
MY_PV=1.10.x |
350 |
@@ -44,7 +44,7 @@ pkg_setup() { |
351 |
} |
352 |
|
353 |
src_prepare() { |
354 |
- cmake-utils_src_prepare |
355 |
+ cmake_src_prepare |
356 |
|
357 |
sed -i -e '/set(cxx_base_flags /s:-Werror::' \ |
358 |
googletest/cmake/internal_utils.cmake || die "sed failed!" |
359 |
@@ -60,7 +60,7 @@ multilib_src_configure() { |
360 |
-Dgtest_build_tests=$(usex test) |
361 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
362 |
) |
363 |
- cmake-utils_src_configure |
364 |
+ cmake_src_configure |
365 |
} |
366 |
|
367 |
multilib_src_install_all() { |
368 |
|
369 |
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild |
370 |
index 771468eb8b6..b610bde2ba4 100644 |
371 |
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild |
372 |
+++ b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild |
373 |
@@ -5,7 +5,7 @@ EAPI=7 |
374 |
|
375 |
# Python is required for tests and some build tasks. |
376 |
PYTHON_COMPAT=( python2_7 pypy ) |
377 |
- |
378 |
+CMAKE_ECLASS=cmake |
379 |
inherit cmake-multilib python-any-r1 |
380 |
|
381 |
if [[ ${PV} == "9999" ]]; then |
382 |
@@ -38,7 +38,7 @@ pkg_setup() { |
383 |
} |
384 |
|
385 |
src_prepare() { |
386 |
- cmake-utils_src_prepare |
387 |
+ cmake_src_prepare |
388 |
|
389 |
sed -i -e '/set(cxx_base_flags /s:-Werror::' \ |
390 |
googletest/cmake/internal_utils.cmake || die "sed failed!" |
391 |
@@ -54,7 +54,7 @@ multilib_src_configure() { |
392 |
-Dgtest_build_tests=$(usex test) |
393 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
394 |
) |
395 |
- cmake-utils_src_configure |
396 |
+ cmake_src_configure |
397 |
} |
398 |
|
399 |
multilib_src_install_all() { |
400 |
|
401 |
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild |
402 |
index 9a6cb10a49f..a5860df6cad 100644 |
403 |
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild |
404 |
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild |
405 |
@@ -6,8 +6,8 @@ EAPI=7 |
406 |
# Python is required for tests and some build tasks. |
407 |
PYTHON_COMPAT=( python2_7 pypy ) |
408 |
|
409 |
+CMAKE_ECLASS=cmake |
410 |
GOOGLETEST_COMMIT=da10da05c262af0a9e8fa91789a272a3dec67655 |
411 |
- |
412 |
inherit cmake-multilib python-any-r1 |
413 |
|
414 |
if [[ ${PV} == "9999" ]]; then |
415 |
@@ -44,7 +44,7 @@ pkg_setup() { |
416 |
} |
417 |
|
418 |
src_prepare() { |
419 |
- cmake-utils_src_prepare |
420 |
+ cmake_src_prepare |
421 |
|
422 |
sed -i -e '/set(cxx_base_flags /s:-Werror::' \ |
423 |
googletest/cmake/internal_utils.cmake || die "sed failed!" |
424 |
@@ -60,7 +60,7 @@ multilib_src_configure() { |
425 |
-Dgtest_build_tests=$(usex test) |
426 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
427 |
) |
428 |
- cmake-utils_src_configure |
429 |
+ cmake_src_configure |
430 |
} |
431 |
|
432 |
multilib_src_install_all() { |
433 |
|
434 |
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild |
435 |
index 2fdd8d6bb36..2224f1eedf4 100644 |
436 |
--- a/dev-cpp/gtest/gtest-9999.ebuild |
437 |
+++ b/dev-cpp/gtest/gtest-9999.ebuild |
438 |
@@ -6,6 +6,7 @@ EAPI=7 |
439 |
# Python is required for tests and some build tasks. |
440 |
PYTHON_COMPAT=( python2_7 pypy ) |
441 |
|
442 |
+CMAKE_ECLASS=cmake |
443 |
inherit cmake-multilib python-any-r1 |
444 |
|
445 |
if [[ ${PV} == "9999" ]]; then |
446 |
@@ -42,7 +43,7 @@ pkg_setup() { |
447 |
} |
448 |
|
449 |
src_prepare() { |
450 |
- cmake-utils_src_prepare |
451 |
+ cmake_src_prepare |
452 |
|
453 |
sed -i -e '/set(cxx_base_flags /s:-Werror::' \ |
454 |
googletest/cmake/internal_utils.cmake || die "sed failed!" |
455 |
@@ -58,7 +59,7 @@ multilib_src_configure() { |
456 |
-Dgtest_build_tests=$(usex test) |
457 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
458 |
) |
459 |
- cmake-utils_src_configure |
460 |
+ cmake_src_configure |
461 |
} |
462 |
|
463 |
multilib_src_install_all() { |
464 |
|
465 |
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild |
466 |
index 2ca76ece9d8..9e800bfb475 100644 |
467 |
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild |
468 |
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild |
469 |
@@ -5,7 +5,7 @@ EAPI="7" |
470 |
|
471 |
CMAKE_MAKEFILE_GENERATOR="emake" |
472 |
|
473 |
-inherit cmake-utils flag-o-matic |
474 |
+inherit cmake flag-o-matic |
475 |
|
476 |
DESCRIPTION="Hot backup utility for MySQL based servers" |
477 |
HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup" |
478 |
@@ -40,7 +40,7 @@ PATCHES=( |
479 |
) |
480 |
|
481 |
src_prepare() { |
482 |
- cmake-utils_src_prepare |
483 |
+ cmake_src_prepare |
484 |
|
485 |
# remove bundled libedit, libevent, zlib |
486 |
# just to be safe... |
487 |
@@ -65,7 +65,7 @@ src_configure() { |
488 |
) |
489 |
|
490 |
local CMAKE_BUILD_TYPE="Release" |
491 |
- cmake-utils_src_configure |
492 |
+ cmake_src_configure |
493 |
} |
494 |
|
495 |
src_install() { |
496 |
|
497 |
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild |
498 |
index af0018e27b3..3776aa32ffd 100644 |
499 |
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild |
500 |
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild |
501 |
@@ -5,7 +5,7 @@ EAPI="7" |
502 |
|
503 |
CMAKE_MAKEFILE_GENERATOR="emake" |
504 |
|
505 |
-inherit cmake-utils flag-o-matic |
506 |
+inherit cmake flag-o-matic |
507 |
|
508 |
BOOST_VER="1_69_0" |
509 |
MY_PV="$(ver_rs 2 '-')" |
510 |
@@ -50,7 +50,7 @@ src_configure() { |
511 |
-DWITH_SYSTEM_LIBS=ON |
512 |
) |
513 |
local CMAKE_BUILD_TYPE="Release" |
514 |
- cmake-utils_src_configure |
515 |
+ cmake_src_configure |
516 |
} |
517 |
|
518 |
src_install() { |
519 |
|
520 |
diff --git a/dev-libs/criterion/criterion-2.3.3.ebuild b/dev-libs/criterion/criterion-2.3.3.ebuild |
521 |
index 27a2a9ae8b0..e0b34016c62 100644 |
522 |
--- a/dev-libs/criterion/criterion-2.3.3.ebuild |
523 |
+++ b/dev-libs/criterion/criterion-2.3.3.ebuild |
524 |
@@ -4,7 +4,7 @@ |
525 |
EAPI=7 |
526 |
|
527 |
CMAKE_MAKEFILE_GENERATOR="emake" |
528 |
-inherit cmake-utils |
529 |
+inherit cmake |
530 |
|
531 |
DESCRIPTION="Cross platform unit testing framework for C and C++" |
532 |
HOMEPAGE="https://github.com/Snaipe/Criterion" |
533 |
@@ -30,19 +30,19 @@ src_configure() { |
534 |
-DCTESTS="$(usex test ON OFF)" |
535 |
) |
536 |
|
537 |
- cmake-utils_src_configure |
538 |
+ cmake_src_configure |
539 |
} |
540 |
|
541 |
src_compile() { |
542 |
- cmake-utils_src_compile |
543 |
+ cmake_src_compile |
544 |
|
545 |
if use test; then |
546 |
- cmake-utils_src_make criterion_tests |
547 |
+ cmake_build criterion_tests |
548 |
fi |
549 |
} |
550 |
|
551 |
src_install() { |
552 |
- cmake-utils_src_install |
553 |
+ cmake_src_install |
554 |
|
555 |
if [[ "/usr/lib" != "/usr/$(get_libdir)" ]]; then |
556 |
mkdir -p "${D}/usr/$(get_libdir)" || die |
557 |
|
558 |
diff --git a/dev-lua/luv/luv-1.32.0.0.ebuild b/dev-lua/luv/luv-1.32.0.0.ebuild |
559 |
index 41098ce6bbc..3d5ee15c180 100644 |
560 |
--- a/dev-lua/luv/luv-1.32.0.0.ebuild |
561 |
+++ b/dev-lua/luv/luv-1.32.0.0.ebuild |
562 |
@@ -3,7 +3,7 @@ |
563 |
|
564 |
EAPI=7 |
565 |
|
566 |
-inherit cmake-utils unpacker |
567 |
+inherit cmake unpacker |
568 |
|
569 |
# e.g. MY_PV = a.b.c-d |
570 |
MY_PV="$(ver_rs 3 -)" |
571 |
@@ -38,7 +38,7 @@ src_prepare() { |
572 |
# Fix libdir |
573 |
# Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir |
574 |
sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt" |
575 |
- cmake-utils_src_prepare |
576 |
+ cmake_src_prepare |
577 |
} |
578 |
|
579 |
src_configure() { |
580 |
@@ -50,7 +50,7 @@ src_configure() { |
581 |
-DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua) |
582 |
-DWITH_SHARED_LIBUV=ON |
583 |
) |
584 |
- cmake-utils_src_configure |
585 |
+ cmake_src_configure |
586 |
} |
587 |
|
588 |
src_test() { |
589 |
|
590 |
diff --git a/games-action/minetest/minetest-5.1.0-r1.ebuild b/games-action/minetest/minetest-5.1.0-r1.ebuild |
591 |
index 30beb3bfeb1..018526a2e71 100644 |
592 |
--- a/games-action/minetest/minetest-5.1.0-r1.ebuild |
593 |
+++ b/games-action/minetest/minetest-5.1.0-r1.ebuild |
594 |
@@ -3,7 +3,7 @@ |
595 |
|
596 |
EAPI=7 |
597 |
|
598 |
-inherit cmake-utils xdg |
599 |
+inherit cmake xdg |
600 |
|
601 |
DESCRIPTION="A free open-source voxel game engine with easy modding and game creation" |
602 |
HOMEPAGE="https://www.minetest.net" |
603 |
@@ -58,7 +58,7 @@ BDEPEND=" |
604 |
PATCHES="${FILESDIR}/${PV}-FindJson.patch" |
605 |
|
606 |
src_prepare() { |
607 |
- cmake-utils_src_prepare |
608 |
+ cmake_src_prepare |
609 |
# set paths |
610 |
sed \ |
611 |
-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \ |
612 |
@@ -98,20 +98,20 @@ src_configure() { |
613 |
-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" |
614 |
) |
615 |
|
616 |
- cmake-utils_src_configure |
617 |
+ cmake_src_configure |
618 |
} |
619 |
|
620 |
src_compile() { |
621 |
- cmake-utils_src_compile |
622 |
+ cmake_src_compile |
623 |
|
624 |
if use doc ; then |
625 |
- cmake-utils_src_compile doc |
626 |
+ cmake_src_compile doc |
627 |
HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) |
628 |
fi |
629 |
} |
630 |
|
631 |
src_install() { |
632 |
- cmake-utils_src_install |
633 |
+ cmake_src_install |
634 |
|
635 |
if use server ; then |
636 |
keepdir /var/log/minetest |
637 |
|
638 |
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild |
639 |
index d31cad3370a..11e3f7bd7c9 100644 |
640 |
--- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild |
641 |
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild |
642 |
@@ -4,7 +4,7 @@ |
643 |
EAPI=7 |
644 |
MY_PV="${PV/_/-}" |
645 |
|
646 |
-inherit cmake-utils multilib wxwidgets |
647 |
+inherit cmake multilib wxwidgets |
648 |
|
649 |
DESCRIPTION="A PlayStation 2 emulator" |
650 |
HOMEPAGE="https://www.pcsx2.net" |
651 |
@@ -77,11 +77,11 @@ src_configure() { |
652 |
) |
653 |
|
654 |
WX_GTK_VER="3.0" setup-wxwidgets |
655 |
- cmake-utils_src_configure |
656 |
+ cmake_src_configure |
657 |
} |
658 |
|
659 |
src_install() { |
660 |
# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 |
661 |
QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2" |
662 |
- cmake-utils_src_install |
663 |
+ cmake_src_install |
664 |
} |
665 |
|
666 |
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild |
667 |
index c0a277f41a0..f5e4931ead1 100644 |
668 |
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild |
669 |
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild |
670 |
@@ -3,7 +3,7 @@ |
671 |
|
672 |
EAPI=7 |
673 |
|
674 |
-inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets |
675 |
+inherit cmake git-r3 multilib toolchain-funcs wxwidgets |
676 |
|
677 |
DESCRIPTION="A PlayStation 2 emulator" |
678 |
HOMEPAGE="https://www.pcsx2.net" |
679 |
@@ -83,7 +83,7 @@ src_configure() { |
680 |
) |
681 |
|
682 |
WX_GTK_VER="3.0-gtk3" setup-wxwidgets |
683 |
- cmake-utils_src_configure |
684 |
+ cmake_src_configure |
685 |
} |
686 |
|
687 |
src_install() { |
688 |
@@ -92,5 +92,5 @@ src_install() { |
689 |
# https://github.com/PCSX2/pcsx2/issues/3077 |
690 |
QA_EXECSTACK="usr/bin/PCSX2" |
691 |
QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2" |
692 |
- cmake-utils_src_install |
693 |
+ cmake_src_install |
694 |
} |
695 |
|
696 |
diff --git a/games-engines/odamex/odamex-0.8.1-r1.ebuild b/games-engines/odamex/odamex-0.8.1-r1.ebuild |
697 |
index c823dedd980..43af64e7752 100644 |
698 |
--- a/games-engines/odamex/odamex-0.8.1-r1.ebuild |
699 |
+++ b/games-engines/odamex/odamex-0.8.1-r1.ebuild |
700 |
@@ -4,7 +4,7 @@ |
701 |
EAPI=7 |
702 |
|
703 |
WX_GTK_VER="3.0-gtk3" |
704 |
-inherit cmake-utils desktop prefix wxwidgets xdg |
705 |
+inherit cmake desktop prefix wxwidgets xdg |
706 |
|
707 |
DESCRIPTION="Online multiplayer free software engine for DOOM" |
708 |
HOMEPAGE="https://odamex.net/" |
709 |
@@ -44,7 +44,7 @@ src_prepare() { |
710 |
|
711 |
use odalaunch && setup-wxwidgets |
712 |
|
713 |
- cmake-utils_src_prepare |
714 |
+ cmake_src_prepare |
715 |
} |
716 |
|
717 |
src_configure() { |
718 |
@@ -57,11 +57,11 @@ src_configure() { |
719 |
-DUSE_MINIUPNP=$(usex upnp) |
720 |
) |
721 |
|
722 |
- cmake-utils_src_configure |
723 |
+ cmake_src_configure |
724 |
} |
725 |
|
726 |
src_compile() { |
727 |
- cmake-utils_src_compile |
728 |
+ cmake_src_compile |
729 |
|
730 |
# Build odamex.wad |
731 |
cd wad || die "cd failed" |
732 |
@@ -79,5 +79,5 @@ src_install() { |
733 |
fi |
734 |
fi |
735 |
|
736 |
- cmake-utils_src_install |
737 |
+ cmake_src_install |
738 |
} |
739 |
|
740 |
diff --git a/games-fps/gzdoom/gzdoom-4.2.4.ebuild b/games-fps/gzdoom/gzdoom-4.2.4.ebuild |
741 |
index da843dc71ad..f6844ab0cf1 100644 |
742 |
--- a/games-fps/gzdoom/gzdoom-4.2.4.ebuild |
743 |
+++ b/games-fps/gzdoom/gzdoom-4.2.4.ebuild |
744 |
@@ -3,7 +3,7 @@ |
745 |
|
746 |
EAPI=7 |
747 |
|
748 |
-inherit cmake-utils desktop xdg |
749 |
+inherit cmake desktop xdg |
750 |
|
751 |
DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine" |
752 |
HOMEPAGE="https://zdoom.org" |
753 |
@@ -42,7 +42,7 @@ src_prepare() { |
754 |
rm -rf wadsrc_bm wadsrc_extra || die |
755 |
fi |
756 |
|
757 |
- cmake-utils_src_prepare |
758 |
+ cmake_src_prepare |
759 |
} |
760 |
|
761 |
src_configure() { |
762 |
@@ -59,13 +59,13 @@ src_configure() { |
763 |
-DNO_OPENMP="$(usex !openmp)" |
764 |
-DBUILD_NONFREE="$(usex nonfree)" |
765 |
) |
766 |
- cmake-utils_src_configure |
767 |
+ cmake_src_configure |
768 |
} |
769 |
|
770 |
src_install() { |
771 |
newicon src/posix/zdoom.xpm "${PN}.xpm" |
772 |
make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame" |
773 |
- cmake-utils_src_install |
774 |
+ cmake_src_install |
775 |
} |
776 |
|
777 |
pkg_postinst() { |
778 |
|
779 |
diff --git a/media-gfx/qimgv/qimgv-0.8.5.ebuild b/media-gfx/qimgv/qimgv-0.8.5.ebuild |
780 |
index 81ac18fca86..71f3879d118 100644 |
781 |
--- a/media-gfx/qimgv/qimgv-0.8.5.ebuild |
782 |
+++ b/media-gfx/qimgv/qimgv-0.8.5.ebuild |
783 |
@@ -3,7 +3,7 @@ |
784 |
|
785 |
EAPI=7 |
786 |
|
787 |
-inherit cmake-utils xdg-utils |
788 |
+inherit cmake xdg-utils |
789 |
|
790 |
DESCRIPTION="A cross-platform image viewer with webm support, written in qt5" |
791 |
HOMEPAGE="https://github.com/easymodo/qimgv" |
792 |
@@ -31,7 +31,7 @@ RDEPEND=" |
793 |
" |
794 |
|
795 |
src_prepare() { |
796 |
- cmake-utils_src_prepare |
797 |
+ cmake_src_prepare |
798 |
# respect make.conf CXXFLAGS |
799 |
sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die |
800 |
} |
801 |
@@ -42,7 +42,7 @@ src_configure() { |
802 |
-DKDE_SUPPORT=$(usex kde) |
803 |
-DVIDEO_SUPPORT=$(usex video) |
804 |
) |
805 |
- cmake-utils_src_configure |
806 |
+ cmake_src_configure |
807 |
} |
808 |
|
809 |
pkg_postinst() { |
810 |
|
811 |
diff --git a/media-gfx/qimgv/qimgv-0.8.8.ebuild b/media-gfx/qimgv/qimgv-0.8.8.ebuild |
812 |
index e605fa5db2f..b5ebae29234 100644 |
813 |
--- a/media-gfx/qimgv/qimgv-0.8.8.ebuild |
814 |
+++ b/media-gfx/qimgv/qimgv-0.8.8.ebuild |
815 |
@@ -3,7 +3,7 @@ |
816 |
|
817 |
EAPI=7 |
818 |
|
819 |
-inherit cmake-utils xdg-utils |
820 |
+inherit cmake xdg-utils |
821 |
|
822 |
DESCRIPTION="A cross-platform image viewer with webm support, written in qt5" |
823 |
HOMEPAGE="https://github.com/easymodo/qimgv" |
824 |
@@ -31,7 +31,7 @@ RDEPEND=" |
825 |
" |
826 |
|
827 |
src_prepare() { |
828 |
- cmake-utils_src_prepare |
829 |
+ cmake_src_prepare |
830 |
# respect make.conf CXXFLAGS |
831 |
sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die |
832 |
} |
833 |
@@ -42,7 +42,7 @@ src_configure() { |
834 |
-DKDE_SUPPORT=$(usex kde) |
835 |
-DVIDEO_SUPPORT=$(usex video) |
836 |
) |
837 |
- cmake-utils_src_configure |
838 |
+ cmake_src_configure |
839 |
} |
840 |
|
841 |
pkg_postinst() { |
842 |
|
843 |
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild |
844 |
index 4fe5e045774..4cbf036f966 100644 |
845 |
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild |
846 |
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild |
847 |
@@ -3,7 +3,7 @@ |
848 |
|
849 |
EAPI=7 |
850 |
|
851 |
-inherit cmake-utils |
852 |
+inherit cmake |
853 |
|
854 |
DESCRIPTION="A library for storing voxel data" |
855 |
HOMEPAGE="http://opensource.imageworks.com/?p=field3d" |
856 |
@@ -29,7 +29,7 @@ src_configure() { |
857 |
local mycmakeargs=( |
858 |
-DINSTALL_DOCS=OFF # Docs are not finished yet. |
859 |
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON |
860 |
- $(cmake-utils_use_find_package mpi MPI) |
861 |
+ $(cmake_use_find_package mpi MPI) |
862 |
) |
863 |
- cmake-utils_src_configure |
864 |
+ cmake_src_configure |
865 |
} |
866 |
|
867 |
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild |
868 |
index c5326986b7a..190989d2cc9 100644 |
869 |
--- a/media-libs/osl/osl-1.10.5.ebuild |
870 |
+++ b/media-libs/osl/osl-1.10.5.ebuild |
871 |
@@ -2,7 +2,7 @@ |
872 |
# Distributed under the terms of the GNU General Public License v2 |
873 |
|
874 |
EAPI=7 |
875 |
-inherit cmake-utils llvm toolchain-funcs |
876 |
+inherit cmake llvm toolchain-funcs |
877 |
|
878 |
# check this on updates |
879 |
LLVM_MAX_SLOT=8 |
880 |
@@ -73,7 +73,6 @@ src_configure() { |
881 |
local gcc=$(tc-getCC) |
882 |
# LLVM needs CPP11. Do not disable. |
883 |
local mycmakeargs=( |
884 |
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
885 |
-DENABLERTTI=OFF |
886 |
-DINSTALL_DOCS=$(usex doc) |
887 |
-DLLVM_STATIC=ON |
888 |
@@ -84,5 +83,5 @@ src_configure() { |
889 |
-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")" |
890 |
) |
891 |
|
892 |
- cmake-utils_src_configure |
893 |
+ cmake_src_configure |
894 |
} |
895 |
|
896 |
diff --git a/media-libs/partio/partio-1.5.4.ebuild b/media-libs/partio/partio-1.5.4.ebuild |
897 |
index 84a16405729..b582c0e424c 100644 |
898 |
--- a/media-libs/partio/partio-1.5.4.ebuild |
899 |
+++ b/media-libs/partio/partio-1.5.4.ebuild |
900 |
@@ -4,7 +4,7 @@ |
901 |
EAPI=7 |
902 |
|
903 |
PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
904 |
-inherit cmake-utils python-single-r1 |
905 |
+inherit cmake python-single-r1 |
906 |
|
907 |
if [[ ${PV} == *9999 ]]; then |
908 |
inherit git-r3 |
909 |
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}" |
910 |
|
911 |
src_configure() { |
912 |
local mycmakeargs=( |
913 |
- $(cmake-utils_use_find_package doc Doxygen) |
914 |
+ $(cmake_use_find_package doc Doxygen) |
915 |
) |
916 |
- cmake-utils_src_configure |
917 |
+ cmake_src_configure |
918 |
} |
919 |
|
920 |
diff --git a/media-libs/partio/partio-9999.ebuild b/media-libs/partio/partio-9999.ebuild |
921 |
index 1b109fd6da7..5404d30fd50 100644 |
922 |
--- a/media-libs/partio/partio-9999.ebuild |
923 |
+++ b/media-libs/partio/partio-9999.ebuild |
924 |
@@ -4,7 +4,7 @@ |
925 |
EAPI=7 |
926 |
|
927 |
PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
928 |
-inherit cmake-utils python-single-r1 |
929 |
+inherit cmake python-single-r1 |
930 |
|
931 |
if [[ ${PV} == *9999 ]]; then |
932 |
inherit git-r3 |
933 |
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}" |
934 |
|
935 |
src_configure() { |
936 |
local mycmakeargs=( |
937 |
- $(cmake-utils_use_find_package doc Doxygen) |
938 |
+ $(cmake_use_find_package doc Doxygen) |
939 |
) |
940 |
- cmake-utils_src_configure |
941 |
+ cmake_src_configure |
942 |
} |
943 |
|
944 |
diff --git a/media-libs/ptex/ptex-2.3.2.ebuild b/media-libs/ptex/ptex-2.3.2.ebuild |
945 |
index 48580481fd2..20e552cd344 100644 |
946 |
--- a/media-libs/ptex/ptex-2.3.2.ebuild |
947 |
+++ b/media-libs/ptex/ptex-2.3.2.ebuild |
948 |
@@ -3,7 +3,7 @@ |
949 |
|
950 |
EAPI=7 |
951 |
|
952 |
-inherit cmake-utils |
953 |
+inherit cmake |
954 |
|
955 |
DESCRIPTION="Per-Face Texture Mapping for Production Rendering" |
956 |
HOMEPAGE="http://ptex.us/" |
957 |
@@ -27,7 +27,7 @@ src_prepare() { |
958 |
cat <<-EOF > version || die |
959 |
${PV} |
960 |
EOF |
961 |
- cmake-utils_src_prepare |
962 |
+ cmake_src_prepare |
963 |
} |
964 |
|
965 |
src_configure() { |
966 |
@@ -35,5 +35,5 @@ src_configure() { |
967 |
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html" |
968 |
-DPTEX_BUILD_STATIC_LIBS=$(usex static-libs) |
969 |
) |
970 |
- cmake-utils_src_configure |
971 |
+ cmake_src_configure |
972 |
} |
973 |
|
974 |
diff --git a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild b/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild |
975 |
index 745430f452c..190a657b915 100644 |
976 |
--- a/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild |
977 |
+++ b/media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild |
978 |
@@ -3,7 +3,7 @@ |
979 |
|
980 |
EAPI=7 |
981 |
|
982 |
-inherit cmake-utils |
983 |
+inherit cmake |
984 |
|
985 |
DESCRIPTION="Morse-code tutor using the Koch method" |
986 |
HOMEPAGE="https://github.com/hmatuschek/kochmorse" |
987 |
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}" |
988 |
S="${WORKDIR}/kochmorse-${PV}" |
989 |
|
990 |
src_prepare() { |
991 |
- cmake-utils_src_prepare |
992 |
+ cmake_src_prepare |
993 |
# Upstream uses a non-standard category in release 3.4.0. I submitted |
994 |
# a fix which has been accepted, but not yet released. |
995 |
sed -i -e 's/Teaching;/X-Teaching;/' shared/kochmorse.desktop || die |
996 |
|
997 |
diff --git a/media-video/qmplay2/qmplay2-19.12.19.ebuild b/media-video/qmplay2/qmplay2-19.12.19.ebuild |
998 |
index 4d0ece7c31c..d77ba82ead2 100644 |
999 |
--- a/media-video/qmplay2/qmplay2-19.12.19.ebuild |
1000 |
+++ b/media-video/qmplay2/qmplay2-19.12.19.ebuild |
1001 |
@@ -3,7 +3,7 @@ |
1002 |
|
1003 |
EAPI=7 |
1004 |
|
1005 |
-inherit cmake-utils xdg-utils |
1006 |
+inherit cmake xdg-utils |
1007 |
|
1008 |
DESCRIPTION="A Qt-based video player, which can play most formats and codecs" |
1009 |
HOMEPAGE="https://github.com/zaps166/QMPlay2" |
1010 |
@@ -73,7 +73,7 @@ src_prepare() { |
1011 |
-e 's/(install.+QMPlay2\.1)\.gz/\1/' \ |
1012 |
-i src/gui/CMakeLists.txt || die |
1013 |
|
1014 |
- cmake-utils_src_prepare |
1015 |
+ cmake_src_prepare |
1016 |
} |
1017 |
|
1018 |
src_configure() { |
1019 |
@@ -125,7 +125,7 @@ src_configure() { |
1020 |
mycmakeargs+=( USE_GIT_VERSION=OFF ) |
1021 |
fi |
1022 |
|
1023 |
- cmake-utils_src_configure |
1024 |
+ cmake_src_configure |
1025 |
} |
1026 |
|
1027 |
pkg_postinst() { |
1028 |
|
1029 |
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild |
1030 |
index 4d0ece7c31c..d77ba82ead2 100644 |
1031 |
--- a/media-video/qmplay2/qmplay2-9999.ebuild |
1032 |
+++ b/media-video/qmplay2/qmplay2-9999.ebuild |
1033 |
@@ -3,7 +3,7 @@ |
1034 |
|
1035 |
EAPI=7 |
1036 |
|
1037 |
-inherit cmake-utils xdg-utils |
1038 |
+inherit cmake xdg-utils |
1039 |
|
1040 |
DESCRIPTION="A Qt-based video player, which can play most formats and codecs" |
1041 |
HOMEPAGE="https://github.com/zaps166/QMPlay2" |
1042 |
@@ -73,7 +73,7 @@ src_prepare() { |
1043 |
-e 's/(install.+QMPlay2\.1)\.gz/\1/' \ |
1044 |
-i src/gui/CMakeLists.txt || die |
1045 |
|
1046 |
- cmake-utils_src_prepare |
1047 |
+ cmake_src_prepare |
1048 |
} |
1049 |
|
1050 |
src_configure() { |
1051 |
@@ -125,7 +125,7 @@ src_configure() { |
1052 |
mycmakeargs+=( USE_GIT_VERSION=OFF ) |
1053 |
fi |
1054 |
|
1055 |
- cmake-utils_src_configure |
1056 |
+ cmake_src_configure |
1057 |
} |
1058 |
|
1059 |
pkg_postinst() { |
1060 |
|
1061 |
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild |
1062 |
index e25b35dcf37..373269e6e34 100644 |
1063 |
--- a/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild |
1064 |
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild |
1065 |
@@ -3,7 +3,7 @@ |
1066 |
|
1067 |
EAPI=7 |
1068 |
|
1069 |
-inherit cmake-utils |
1070 |
+inherit cmake |
1071 |
|
1072 |
MY_P="LibVNCServer-${PV}" |
1073 |
DESCRIPTION="library for creating vnc servers" |
1074 |
@@ -65,5 +65,5 @@ src_configure() { |
1075 |
-DWITH_IPv6=$(usex ipv6 ON OFF) |
1076 |
-DWITH_SASL=$(usex sasl ON OFF) |
1077 |
) |
1078 |
- cmake-utils_src_configure |
1079 |
+ cmake_src_configure |
1080 |
} |
1081 |
|
1082 |
diff --git a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild |
1083 |
index cedaa4a52fe..9661224c2a1 100644 |
1084 |
--- a/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild |
1085 |
+++ b/net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild |
1086 |
@@ -3,7 +3,7 @@ |
1087 |
|
1088 |
EAPI=7 |
1089 |
|
1090 |
-inherit cmake-utils |
1091 |
+inherit cmake |
1092 |
|
1093 |
MY_P="LibVNCServer-${PV}" |
1094 |
DESCRIPTION="library for creating vnc servers" |
1095 |
@@ -69,5 +69,5 @@ src_configure() { |
1096 |
-DWITH_IPv6=$(usex ipv6 ON OFF) |
1097 |
-DWITH_SASL=$(usex sasl ON OFF) |
1098 |
) |
1099 |
- cmake-utils_src_configure |
1100 |
+ cmake_src_configure |
1101 |
} |
1102 |
|
1103 |
diff --git a/net-libs/qxmpp/qxmpp-1.0.1.ebuild b/net-libs/qxmpp/qxmpp-1.0.1.ebuild |
1104 |
index 3085ee7a374..e56ca1cc2f4 100644 |
1105 |
--- a/net-libs/qxmpp/qxmpp-1.0.1.ebuild |
1106 |
+++ b/net-libs/qxmpp/qxmpp-1.0.1.ebuild |
1107 |
@@ -3,7 +3,7 @@ |
1108 |
|
1109 |
EAPI=7 |
1110 |
|
1111 |
-inherit cmake-utils |
1112 |
+inherit cmake |
1113 |
|
1114 |
DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework" |
1115 |
HOMEPAGE="https://github.com/qxmpp-project/qxmpp/" |
1116 |
@@ -40,7 +40,7 @@ src_prepare() { |
1117 |
sed -e "/qxmpptransfermanager/d" \ |
1118 |
-i tests/CMakeLists.txt || die "failed to drop single test" |
1119 |
|
1120 |
- cmake-utils_src_prepare |
1121 |
+ cmake_src_prepare |
1122 |
} |
1123 |
|
1124 |
src_configure() { |
1125 |
@@ -54,5 +54,5 @@ src_configure() { |
1126 |
-DWITH_VPX=$(usex vpx) |
1127 |
) |
1128 |
|
1129 |
- cmake-utils_src_configure |
1130 |
+ cmake_src_configure |
1131 |
} |
1132 |
|
1133 |
diff --git a/net-misc/seafile-client/seafile-client-6.2.11.ebuild b/net-misc/seafile-client/seafile-client-6.2.11.ebuild |
1134 |
index 311ec1fd77c..77928c94909 100644 |
1135 |
--- a/net-misc/seafile-client/seafile-client-6.2.11.ebuild |
1136 |
+++ b/net-misc/seafile-client/seafile-client-6.2.11.ebuild |
1137 |
@@ -2,7 +2,7 @@ |
1138 |
# Distributed under the terms of the GNU General Public License v2 |
1139 |
|
1140 |
EAPI=7 |
1141 |
-inherit cmake-utils xdg-utils |
1142 |
+inherit cmake xdg-utils |
1143 |
|
1144 |
DESCRIPTION="Seafile desktop client" |
1145 |
HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" |
1146 |
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND} |
1147 |
|
1148 |
src_prepare() { |
1149 |
eapply "${FILESDIR}/${PN}-select-qt5.patch" |
1150 |
- cmake-utils_src_prepare |
1151 |
+ cmake_src_prepare |
1152 |
} |
1153 |
|
1154 |
src_configure() { |
1155 |
@@ -40,7 +40,7 @@ src_configure() { |
1156 |
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" |
1157 |
-DBUILD_TESTING="$(usex test)" |
1158 |
) |
1159 |
- cmake-utils_src_configure |
1160 |
+ cmake_src_configure |
1161 |
} |
1162 |
|
1163 |
pkg_postinst() { |
1164 |
|
1165 |
diff --git a/net-misc/seafile-client/seafile-client-7.0.2.ebuild b/net-misc/seafile-client/seafile-client-7.0.2.ebuild |
1166 |
index 972e54b95f8..fa31e1e217d 100644 |
1167 |
--- a/net-misc/seafile-client/seafile-client-7.0.2.ebuild |
1168 |
+++ b/net-misc/seafile-client/seafile-client-7.0.2.ebuild |
1169 |
@@ -3,7 +3,7 @@ |
1170 |
|
1171 |
EAPI=7 |
1172 |
|
1173 |
-inherit cmake-utils xdg-utils |
1174 |
+inherit cmake xdg-utils |
1175 |
|
1176 |
DESCRIPTION="Seafile desktop client" |
1177 |
HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" |
1178 |
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5" |
1179 |
|
1180 |
src_prepare() { |
1181 |
eapply "${FILESDIR}/${PN}-select-qt5.patch" |
1182 |
- cmake-utils_src_prepare |
1183 |
+ cmake_src_prepare |
1184 |
} |
1185 |
|
1186 |
src_configure() { |
1187 |
@@ -41,7 +41,7 @@ src_configure() { |
1188 |
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" |
1189 |
-DBUILD_TESTING="$(usex test)" |
1190 |
) |
1191 |
- cmake-utils_src_configure |
1192 |
+ cmake_src_configure |
1193 |
} |
1194 |
|
1195 |
pkg_postinst() { |
1196 |
|
1197 |
diff --git a/net-misc/seafile-client/seafile-client-7.0.4.ebuild b/net-misc/seafile-client/seafile-client-7.0.4.ebuild |
1198 |
index 972e54b95f8..fa31e1e217d 100644 |
1199 |
--- a/net-misc/seafile-client/seafile-client-7.0.4.ebuild |
1200 |
+++ b/net-misc/seafile-client/seafile-client-7.0.4.ebuild |
1201 |
@@ -3,7 +3,7 @@ |
1202 |
|
1203 |
EAPI=7 |
1204 |
|
1205 |
-inherit cmake-utils xdg-utils |
1206 |
+inherit cmake xdg-utils |
1207 |
|
1208 |
DESCRIPTION="Seafile desktop client" |
1209 |
HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/" |
1210 |
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5" |
1211 |
|
1212 |
src_prepare() { |
1213 |
eapply "${FILESDIR}/${PN}-select-qt5.patch" |
1214 |
- cmake-utils_src_prepare |
1215 |
+ cmake_src_prepare |
1216 |
} |
1217 |
|
1218 |
src_configure() { |
1219 |
@@ -41,7 +41,7 @@ src_configure() { |
1220 |
-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)" |
1221 |
-DBUILD_TESTING="$(usex test)" |
1222 |
) |
1223 |
- cmake-utils_src_configure |
1224 |
+ cmake_src_configure |
1225 |
} |
1226 |
|
1227 |
pkg_postinst() { |
1228 |
|
1229 |
diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild b/net-proxy/trojan/trojan-1.12.3.ebuild |
1230 |
index e394deff72a..012870955ef 100644 |
1231 |
--- a/net-proxy/trojan/trojan-1.12.3.ebuild |
1232 |
+++ b/net-proxy/trojan/trojan-1.12.3.ebuild |
1233 |
@@ -5,7 +5,7 @@ EAPI=7 |
1234 |
|
1235 |
PYTHON_COMPAT=( python{3_5,3_6,3_7} ) |
1236 |
|
1237 |
-inherit cmake-utils python-any-r1 systemd |
1238 |
+inherit cmake python-any-r1 systemd |
1239 |
|
1240 |
DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" |
1241 |
HOMEPAGE="https://github.com/trojan-gfw/${PN}" |
1242 |
@@ -32,16 +32,15 @@ src_configure() { |
1243 |
-DENABLE_MYSQL=$(usex mysql) |
1244 |
-DSYSTEMD_SERVICE=ON |
1245 |
-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) |
1246 |
- -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
1247 |
) |
1248 |
- cmake-utils_src_configure |
1249 |
+ cmake_src_configure |
1250 |
} |
1251 |
|
1252 |
src_install() { |
1253 |
- cmake-utils_src_install |
1254 |
+ cmake_src_install |
1255 |
newinitd "${FILESDIR}/trojan.initd" trojan |
1256 |
} |
1257 |
|
1258 |
src_test() { |
1259 |
- cmake-utils_src_test -j1 |
1260 |
+ cmake_src_test -j1 |
1261 |
} |
1262 |
|
1263 |
diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild b/net-proxy/trojan/trojan-1.13.0.ebuild |
1264 |
index 64ae3879792..b1e47112485 100644 |
1265 |
--- a/net-proxy/trojan/trojan-1.13.0.ebuild |
1266 |
+++ b/net-proxy/trojan/trojan-1.13.0.ebuild |
1267 |
@@ -5,7 +5,7 @@ EAPI=7 |
1268 |
|
1269 |
PYTHON_COMPAT=( python{3_5,3_6,3_7} ) |
1270 |
|
1271 |
-inherit cmake-utils python-any-r1 systemd |
1272 |
+inherit cmake python-any-r1 systemd |
1273 |
|
1274 |
DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" |
1275 |
HOMEPAGE="https://github.com/trojan-gfw/trojan" |
1276 |
@@ -33,16 +33,15 @@ src_configure() { |
1277 |
-DENABLE_MYSQL=$(usex mysql) |
1278 |
-DSYSTEMD_SERVICE=ON |
1279 |
-DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) |
1280 |
- -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |
1281 |
) |
1282 |
- cmake-utils_src_configure |
1283 |
+ cmake_src_configure |
1284 |
} |
1285 |
|
1286 |
src_install() { |
1287 |
- cmake-utils_src_install |
1288 |
+ cmake_src_install |
1289 |
newinitd "${FILESDIR}/trojan.initd" trojan |
1290 |
} |
1291 |
|
1292 |
src_test() { |
1293 |
- cmake-utils_src_test -j1 |
1294 |
+ cmake_src_test -j1 |
1295 |
} |
1296 |
|
1297 |
diff --git a/net-vpn/i2pd/i2pd-2.27.0.ebuild b/net-vpn/i2pd/i2pd-2.27.0.ebuild |
1298 |
index 099b9151f16..a24bc8dd650 100644 |
1299 |
--- a/net-vpn/i2pd/i2pd-2.27.0.ebuild |
1300 |
+++ b/net-vpn/i2pd/i2pd-2.27.0.ebuild |
1301 |
@@ -2,7 +2,7 @@ |
1302 |
# Distributed under the terms of the GNU General Public License v2 |
1303 |
|
1304 |
EAPI=7 |
1305 |
-inherit systemd cmake-utils toolchain-funcs |
1306 |
+inherit systemd cmake toolchain-funcs |
1307 |
|
1308 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
1309 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
1310 |
@@ -67,11 +67,11 @@ src_configure() { |
1311 |
-DWITH_LIBRARY=ON |
1312 |
-DWITH_BINARY=ON |
1313 |
) |
1314 |
- cmake-utils_src_configure |
1315 |
+ cmake_src_configure |
1316 |
} |
1317 |
|
1318 |
src_install() { |
1319 |
- cmake-utils_src_install |
1320 |
+ cmake_src_install |
1321 |
|
1322 |
# config |
1323 |
insinto /etc/i2pd |
1324 |
|
1325 |
diff --git a/net-vpn/i2pd/i2pd-2.28.0.ebuild b/net-vpn/i2pd/i2pd-2.28.0.ebuild |
1326 |
index 099b9151f16..a24bc8dd650 100644 |
1327 |
--- a/net-vpn/i2pd/i2pd-2.28.0.ebuild |
1328 |
+++ b/net-vpn/i2pd/i2pd-2.28.0.ebuild |
1329 |
@@ -2,7 +2,7 @@ |
1330 |
# Distributed under the terms of the GNU General Public License v2 |
1331 |
|
1332 |
EAPI=7 |
1333 |
-inherit systemd cmake-utils toolchain-funcs |
1334 |
+inherit systemd cmake toolchain-funcs |
1335 |
|
1336 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
1337 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
1338 |
@@ -67,11 +67,11 @@ src_configure() { |
1339 |
-DWITH_LIBRARY=ON |
1340 |
-DWITH_BINARY=ON |
1341 |
) |
1342 |
- cmake-utils_src_configure |
1343 |
+ cmake_src_configure |
1344 |
} |
1345 |
|
1346 |
src_install() { |
1347 |
- cmake-utils_src_install |
1348 |
+ cmake_src_install |
1349 |
|
1350 |
# config |
1351 |
insinto /etc/i2pd |
1352 |
|
1353 |
diff --git a/net-vpn/i2pd/i2pd-2.29.0.ebuild b/net-vpn/i2pd/i2pd-2.29.0.ebuild |
1354 |
index 5982e199dbc..06d8abe7e50 100644 |
1355 |
--- a/net-vpn/i2pd/i2pd-2.29.0.ebuild |
1356 |
+++ b/net-vpn/i2pd/i2pd-2.29.0.ebuild |
1357 |
@@ -3,7 +3,7 @@ |
1358 |
|
1359 |
EAPI=7 |
1360 |
|
1361 |
-inherit systemd cmake-utils toolchain-funcs |
1362 |
+inherit systemd cmake toolchain-funcs |
1363 |
|
1364 |
DESCRIPTION="A C++ daemon for accessing the I2P anonymous network" |
1365 |
HOMEPAGE="https://github.com/PurpleI2P/i2pd" |
1366 |
@@ -65,11 +65,11 @@ src_configure() { |
1367 |
-DWITH_LIBRARY=ON |
1368 |
-DWITH_BINARY=ON |
1369 |
) |
1370 |
- cmake-utils_src_configure |
1371 |
+ cmake_src_configure |
1372 |
} |
1373 |
|
1374 |
src_install() { |
1375 |
- cmake-utils_src_install |
1376 |
+ cmake_src_install |
1377 |
|
1378 |
# config |
1379 |
insinto /etc/i2pd |
1380 |
|
1381 |
diff --git a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild |
1382 |
index b92483ba721..585f02e1660 100644 |
1383 |
--- a/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild |
1384 |
+++ b/sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild |
1385 |
@@ -3,7 +3,7 @@ |
1386 |
|
1387 |
EAPI=7 |
1388 |
|
1389 |
-inherit cmake-utils |
1390 |
+inherit cmake |
1391 |
|
1392 |
if [[ ${PV} == *9999* ]]; then |
1393 |
inherit git-r3 |
1394 |
@@ -52,11 +52,11 @@ src_configure() { |
1395 |
-DGeant4VMC_BUILD_EXAMPLES="$(usex test)" |
1396 |
-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" |
1397 |
) |
1398 |
- cmake-utils_src_configure |
1399 |
+ cmake_src_configure |
1400 |
} |
1401 |
|
1402 |
src_compile() { |
1403 |
- cmake-utils_src_compile |
1404 |
+ cmake_src_compile |
1405 |
if use doc ; then |
1406 |
local dirs=( |
1407 |
source |
1408 |
@@ -83,7 +83,7 @@ src_test() { |
1409 |
} |
1410 |
|
1411 |
src_install() { |
1412 |
- cmake-utils_src_install |
1413 |
+ cmake_src_install |
1414 |
use doc && local HTML_DOCS=(doc/.) |
1415 |
einstalldocs |
1416 |
} |
1417 |
|
1418 |
diff --git a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild |
1419 |
index 0f091fe6412..fb2e982ebfd 100644 |
1420 |
--- a/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild |
1421 |
+++ b/sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild |
1422 |
@@ -3,7 +3,7 @@ |
1423 |
|
1424 |
EAPI=7 |
1425 |
|
1426 |
-inherit cmake-utils |
1427 |
+inherit cmake |
1428 |
|
1429 |
if [[ ${PV} == *9999* ]]; then |
1430 |
inherit git-r3 |
1431 |
@@ -55,11 +55,11 @@ src_configure() { |
1432 |
-DGeant4VMC_BUILD_EXAMPLES="$(usex test)" |
1433 |
-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" |
1434 |
) |
1435 |
- cmake-utils_src_configure |
1436 |
+ cmake_src_configure |
1437 |
} |
1438 |
|
1439 |
src_compile() { |
1440 |
- cmake-utils_src_compile |
1441 |
+ cmake_src_compile |
1442 |
if use doc ; then |
1443 |
local dirs=( |
1444 |
source |
1445 |
@@ -90,7 +90,7 @@ src_test() { |
1446 |
} |
1447 |
|
1448 |
src_install() { |
1449 |
- cmake-utils_src_install |
1450 |
+ cmake_src_install |
1451 |
use doc && local HTML_DOCS=(doc/.) |
1452 |
einstalldocs |
1453 |
} |
1454 |
|
1455 |
diff --git a/sci-physics/geant-vmc/geant-vmc-9999.ebuild b/sci-physics/geant-vmc/geant-vmc-9999.ebuild |
1456 |
index ffc8e7dc874..9c27c2d98ef 100644 |
1457 |
--- a/sci-physics/geant-vmc/geant-vmc-9999.ebuild |
1458 |
+++ b/sci-physics/geant-vmc/geant-vmc-9999.ebuild |
1459 |
@@ -3,7 +3,7 @@ |
1460 |
|
1461 |
EAPI=7 |
1462 |
|
1463 |
-inherit cmake-utils |
1464 |
+inherit cmake |
1465 |
|
1466 |
if [[ ${PV} == *9999* ]]; then |
1467 |
inherit git-r3 |
1468 |
@@ -52,11 +52,11 @@ src_configure() { |
1469 |
-DGeant4VMC_BUILD_EXAMPLES="$(usex test)" |
1470 |
-DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)" |
1471 |
) |
1472 |
- cmake-utils_src_configure |
1473 |
+ cmake_src_configure |
1474 |
} |
1475 |
|
1476 |
src_compile() { |
1477 |
- cmake-utils_src_compile |
1478 |
+ cmake_src_compile |
1479 |
if use doc ; then |
1480 |
local dirs=( |
1481 |
source |
1482 |
@@ -83,7 +83,7 @@ src_test() { |
1483 |
} |
1484 |
|
1485 |
src_install() { |
1486 |
- cmake-utils_src_install |
1487 |
+ cmake_src_install |
1488 |
use doc && local HTML_DOCS=(doc/.) |
1489 |
einstalldocs |
1490 |
} |
1491 |
|
1492 |
diff --git a/sci-physics/vgm/vgm-4.4-r1.ebuild b/sci-physics/vgm/vgm-4.4-r1.ebuild |
1493 |
index ccda066630d..1ef3af47246 100644 |
1494 |
--- a/sci-physics/vgm/vgm-4.4-r1.ebuild |
1495 |
+++ b/sci-physics/vgm/vgm-4.4-r1.ebuild |
1496 |
@@ -3,7 +3,7 @@ |
1497 |
|
1498 |
EAPI=7 |
1499 |
|
1500 |
-inherit cmake-utils |
1501 |
+inherit cmake |
1502 |
|
1503 |
if [[ ${PV} == *9999* ]]; then |
1504 |
inherit git-r3 |
1505 |
@@ -59,11 +59,11 @@ src_configure() { |
1506 |
else |
1507 |
mycmakeargs+=( -DWITH_G4ROOT=no ) |
1508 |
fi |
1509 |
- cmake-utils_src_configure |
1510 |
+ cmake_src_configure |
1511 |
} |
1512 |
|
1513 |
src_compile() { |
1514 |
- cmake-utils_src_compile |
1515 |
+ cmake_src_compile |
1516 |
if use doc; then |
1517 |
cd packages |
1518 |
doxygen || die |
1519 |
@@ -76,7 +76,7 @@ src_test() { |
1520 |
} |
1521 |
|
1522 |
src_install() { |
1523 |
- cmake-utils_src_install |
1524 |
+ cmake_src_install |
1525 |
use doc && local HTML_DOCS=( doc/html/. ) |
1526 |
einstalldocs |
1527 |
} |
1528 |
|
1529 |
diff --git a/sci-physics/vgm/vgm-4.5.ebuild b/sci-physics/vgm/vgm-4.5.ebuild |
1530 |
index 16c08cfb932..66433421fc4 100644 |
1531 |
--- a/sci-physics/vgm/vgm-4.5.ebuild |
1532 |
+++ b/sci-physics/vgm/vgm-4.5.ebuild |
1533 |
@@ -3,7 +3,7 @@ |
1534 |
|
1535 |
EAPI=7 |
1536 |
|
1537 |
-inherit cmake-utils |
1538 |
+inherit cmake |
1539 |
|
1540 |
if [[ ${PV} == *9999* ]]; then |
1541 |
inherit git-r3 |
1542 |
@@ -59,11 +59,11 @@ src_configure() { |
1543 |
else |
1544 |
mycmakeargs+=( -DWITH_G4ROOT=no ) |
1545 |
fi |
1546 |
- cmake-utils_src_configure |
1547 |
+ cmake_src_configure |
1548 |
} |
1549 |
|
1550 |
src_compile() { |
1551 |
- cmake-utils_src_compile |
1552 |
+ cmake_src_compile |
1553 |
if use doc; then |
1554 |
cd packages |
1555 |
doxygen || die |
1556 |
@@ -76,7 +76,7 @@ src_test() { |
1557 |
} |
1558 |
|
1559 |
src_install() { |
1560 |
- cmake-utils_src_install |
1561 |
+ cmake_src_install |
1562 |
use doc && local HTML_DOCS=( doc/html/. ) |
1563 |
einstalldocs |
1564 |
} |
1565 |
|
1566 |
diff --git a/sci-physics/vgm/vgm-9999.ebuild b/sci-physics/vgm/vgm-9999.ebuild |
1567 |
index 8443bf3f67a..675c07b071b 100644 |
1568 |
--- a/sci-physics/vgm/vgm-9999.ebuild |
1569 |
+++ b/sci-physics/vgm/vgm-9999.ebuild |
1570 |
@@ -3,7 +3,7 @@ |
1571 |
|
1572 |
EAPI=7 |
1573 |
|
1574 |
-inherit cmake-utils |
1575 |
+inherit cmake |
1576 |
|
1577 |
if [[ ${PV} == *9999* ]]; then |
1578 |
inherit git-r3 |
1579 |
@@ -56,11 +56,11 @@ src_configure() { |
1580 |
else |
1581 |
mycmakeargs+=( -DWITH_G4ROOT=no ) |
1582 |
fi |
1583 |
- cmake-utils_src_configure |
1584 |
+ cmake_src_configure |
1585 |
} |
1586 |
|
1587 |
src_compile() { |
1588 |
- cmake-utils_src_compile |
1589 |
+ cmake_src_compile |
1590 |
if use doc; then |
1591 |
cd packages |
1592 |
doxygen || die |
1593 |
@@ -73,7 +73,7 @@ src_test() { |
1594 |
} |
1595 |
|
1596 |
src_install() { |
1597 |
- cmake-utils_src_install |
1598 |
+ cmake_src_install |
1599 |
use doc && local HTML_DOCS=( doc/html/. ) |
1600 |
einstalldocs |
1601 |
} |
1602 |
|
1603 |
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild |
1604 |
index a1d2016e4d4..96a4641a9fb 100644 |
1605 |
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild |
1606 |
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild |
1607 |
@@ -3,7 +3,7 @@ |
1608 |
|
1609 |
EAPI=7 |
1610 |
|
1611 |
-inherit cmake-utils linux-info |
1612 |
+inherit cmake linux-info |
1613 |
|
1614 |
DESCRIPTION="Thunderbolt(TM) user-space components" |
1615 |
HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space" |
1616 |
@@ -30,11 +30,11 @@ pkg_pretend() { |
1617 |
} |
1618 |
|
1619 |
src_prepare() { |
1620 |
- cmake-utils_src_prepare |
1621 |
+ cmake_src_prepare |
1622 |
cmake_comment_add_subdirectory docs |
1623 |
} |
1624 |
|
1625 |
src_install() { |
1626 |
- cmake-utils_src_install |
1627 |
+ cmake_src_install |
1628 |
doman tbtadm.1 |
1629 |
} |
1630 |
|
1631 |
diff --git a/x11-apps/copyq/copyq-3.8.0.ebuild b/x11-apps/copyq/copyq-3.8.0.ebuild |
1632 |
index 7139966cb74..9f5c1deeaa8 100644 |
1633 |
--- a/x11-apps/copyq/copyq-3.8.0.ebuild |
1634 |
+++ b/x11-apps/copyq/copyq-3.8.0.ebuild |
1635 |
@@ -3,7 +3,7 @@ |
1636 |
|
1637 |
EAPI=7 |
1638 |
|
1639 |
-inherit cmake-utils gnome2-utils |
1640 |
+inherit cmake gnome2-utils |
1641 |
|
1642 |
MY_P=CopyQ-${PV} |
1643 |
|
1644 |
@@ -46,7 +46,7 @@ src_configure() { |
1645 |
-DWITH_WEBKIT=$(usex webkit) |
1646 |
-DCMAKE_INSTALL_MANDIR="share/man" |
1647 |
) |
1648 |
- cmake-utils_src_configure |
1649 |
+ cmake_src_configure |
1650 |
} |
1651 |
|
1652 |
pkg_postinst() { |
1653 |
|
1654 |
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |
1655 |
index 90a64046885..15a2ad641c5 100644 |
1656 |
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |
1657 |
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild |
1658 |
@@ -2,7 +2,9 @@ |
1659 |
# Distributed under the terms of the GNU General Public License v2 |
1660 |
|
1661 |
EAPI=7 |
1662 |
-inherit cmake-multilib flag-o-matic multilib systemd |
1663 |
+ |
1664 |
+CMAKE_ECLASS=cmake |
1665 |
+inherit cmake-multilib flag-o-matic systemd |
1666 |
|
1667 |
if [[ ${PV} == *9999 ]] ; then |
1668 |
EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" |
1669 |
@@ -51,7 +53,7 @@ src_prepare() { |
1670 |
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ |
1671 |
server/vglrun.in server/vglgenkey server/vglserver_config || die |
1672 |
|
1673 |
- cmake-utils_src_prepare |
1674 |
+ cmake_src_prepare |
1675 |
} |
1676 |
|
1677 |
src_configure() { |
1678 |
@@ -68,7 +70,7 @@ src_configure() { |
1679 |
-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so |
1680 |
-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) |
1681 |
) |
1682 |
- cmake-utils_src_configure |
1683 |
+ cmake_src_configure |
1684 |
} |
1685 |
multilib_parallel_foreach_abi abi_configure |
1686 |
} |
1687 |
|
1688 |
diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild b/x11-misc/virtualgl/virtualgl-9999.ebuild |
1689 |
index baca3aa9453..b1f2ed56343 100644 |
1690 |
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild |
1691 |
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild |
1692 |
@@ -2,7 +2,9 @@ |
1693 |
# Distributed under the terms of the GNU General Public License v2 |
1694 |
|
1695 |
EAPI=7 |
1696 |
-inherit cmake-multilib flag-o-matic multilib systemd |
1697 |
+ |
1698 |
+CMAKE_ECLASS=cmake |
1699 |
+inherit cmake-multilib flag-o-matic systemd |
1700 |
|
1701 |
if [[ ${PV} == *9999 ]] ; then |
1702 |
EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" |
1703 |
@@ -51,7 +53,7 @@ src_prepare() { |
1704 |
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ |
1705 |
server/vglrun.in server/vglgenkey server/vglserver_config || die |
1706 |
|
1707 |
- cmake-utils_src_prepare |
1708 |
+ cmake_src_prepare |
1709 |
} |
1710 |
|
1711 |
src_configure() { |
1712 |
@@ -68,7 +70,7 @@ src_configure() { |
1713 |
-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so |
1714 |
-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) |
1715 |
) |
1716 |
- cmake-utils_src_configure |
1717 |
+ cmake_src_configure |
1718 |
} |
1719 |
multilib_parallel_foreach_abi abi_configure |
1720 |
} |