Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-gfx/luminance-hdr/, media-gfx/rawtherapee/, ...
Date: Tue, 31 Dec 2019 17:19:40
Message-Id: 1577812761.d7500b6e39eb8b24bd63a8cc2daebb7f2078b7ae.asturm@gentoo
1 commit: d7500b6e39eb8b24bd63a8cc2daebb7f2078b7ae
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 30 18:22:57 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 17:19:21 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7500b6e
7
8 */*: Switch graphics proj packages to cmake.eclass
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 media-gfx/darktable/darktable-2.6.2.ebuild | 8 +++----
13 media-gfx/darktable/darktable-2.6.3.ebuild | 8 +++----
14 media-gfx/darktable/darktable-3.0.0.ebuild | 8 +++----
15 media-gfx/darktable/darktable-9999.ebuild | 8 +++----
16 .../enblend/enblend-4.2.0_p20161007-r1.ebuild | 8 +++----
17 media-gfx/gmic/gmic-2.7.0.ebuild | 26 ++++++++++------------
18 media-gfx/gmic/gmic-2.7.1.ebuild | 26 ++++++++++------------
19 media-gfx/gmic/gmic-2.7.2.ebuild | 26 ++++++++++------------
20 media-gfx/inkscape/inkscape-1.0_beta2.ebuild | 8 +++----
21 media-gfx/inkscape/inkscape-9999.ebuild | 8 +++----
22 media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild | 6 ++---
23 media-gfx/rawtherapee/rawtherapee-5.6.ebuild | 4 ++--
24 media-gfx/rawtherapee/rawtherapee-5.7.ebuild | 4 ++--
25 .../scantailor-advanced-1.0.16.ebuild | 6 ++---
26 media-libs/libharu/libharu-2.3.0-r2.ebuild | 6 ++---
27 .../libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild | 9 ++++----
28 media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild | 7 +++---
29 .../openimageio/openimageio-1.8.17-r1.ebuild | 6 ++---
30 media-libs/openjpeg/openjpeg-2.3.1.ebuild | 5 +++--
31 19 files changed, 91 insertions(+), 96 deletions(-)
32
33 diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild
34 index 45b7d5db3ef..ee670e71838 100644
35 --- a/media-gfx/darktable/darktable-2.6.2.ebuild
36 +++ b/media-gfx/darktable/darktable-2.6.2.ebuild
37 @@ -3,7 +3,7 @@
38
39 EAPI=7
40
41 -inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
42 +inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
43
44 DOC_PV="2.6.0"
45 MY_PV="${PV/_/}"
46 @@ -86,7 +86,7 @@ pkg_pretend() {
47 src_prepare() {
48 use cpu_flags_x86_sse3 && append-flags -msse3
49
50 - cmake-utils_src_prepare
51 + cmake_src_prepare
52 }
53
54 src_configure() {
55 @@ -109,11 +109,11 @@ src_configure() {
56 -DUSE_WEBP=$(usex webp)
57 )
58 CMAKE_BUILD_TYPE="RELWITHDEBINFO"
59 - cmake-utils_src_configure
60 + cmake_src_configure
61 }
62
63 src_install() {
64 - cmake-utils_src_install
65 + cmake_src_install
66 use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
67
68 if use nls ; then
69
70 diff --git a/media-gfx/darktable/darktable-2.6.3.ebuild b/media-gfx/darktable/darktable-2.6.3.ebuild
71 index fcc4a9f8ffa..b08753b8353 100644
72 --- a/media-gfx/darktable/darktable-2.6.3.ebuild
73 +++ b/media-gfx/darktable/darktable-2.6.3.ebuild
74 @@ -3,7 +3,7 @@
75
76 EAPI=7
77
78 -inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
79 +inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
80
81 DOC_PV="2.6.0"
82 MY_PV="${PV/_/}"
83 @@ -84,7 +84,7 @@ pkg_pretend() {
84 src_prepare() {
85 use cpu_flags_x86_sse3 && append-flags -msse3
86
87 - cmake-utils_src_prepare
88 + cmake_src_prepare
89 }
90
91 src_configure() {
92 @@ -107,11 +107,11 @@ src_configure() {
93 -DUSE_WEBP=$(usex webp)
94 )
95 CMAKE_BUILD_TYPE="RELWITHDEBINFO"
96 - cmake-utils_src_configure
97 + cmake_src_configure
98 }
99
100 src_install() {
101 - cmake-utils_src_install
102 + cmake_src_install
103 use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
104
105 if use nls ; then
106
107 diff --git a/media-gfx/darktable/darktable-3.0.0.ebuild b/media-gfx/darktable/darktable-3.0.0.ebuild
108 index ae5f3039daa..c91fabeb3ab 100644
109 --- a/media-gfx/darktable/darktable-3.0.0.ebuild
110 +++ b/media-gfx/darktable/darktable-3.0.0.ebuild
111 @@ -3,7 +3,7 @@
112
113 EAPI=7
114
115 -inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg
116 +inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
117
118 DOC_PV="2.6.0"
119 MY_PV="${PV/_/}"
120 @@ -84,7 +84,7 @@ pkg_pretend() {
121 src_prepare() {
122 use cpu_flags_x86_sse3 && append-flags -msse3
123
124 - cmake-utils_src_prepare
125 + cmake_src_prepare
126 }
127
128 src_configure() {
129 @@ -107,11 +107,11 @@ src_configure() {
130 -DUSE_WEBP=$(usex webp)
131 )
132 CMAKE_BUILD_TYPE="RELWITHDEBINFO"
133 - cmake-utils_src_configure
134 + cmake_src_configure
135 }
136
137 src_install() {
138 - cmake-utils_src_install
139 + cmake_src_install
140 use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
141
142 if use nls ; then
143
144 diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
145 index 6357db9016d..111dc666f46 100644
146 --- a/media-gfx/darktable/darktable-9999.ebuild
147 +++ b/media-gfx/darktable/darktable-9999.ebuild
148 @@ -3,7 +3,7 @@
149
150 EAPI=7
151
152 -inherit cmake-utils flag-o-matic git-r3 pax-utils toolchain-funcs xdg
153 +inherit cmake flag-o-matic git-r3 pax-utils toolchain-funcs xdg
154
155 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
156
157 @@ -73,7 +73,7 @@ pkg_pretend() {
158 src_prepare() {
159 use cpu_flags_x86_sse3 && append-flags -msse3
160
161 - cmake-utils_src_prepare
162 + cmake_src_prepare
163 }
164
165 src_configure() {
166 @@ -96,11 +96,11 @@ src_configure() {
167 -DUSE_WEBP=$(usex webp)
168 )
169 CMAKE_BUILD_TYPE="RELWITHDEBINFO"
170 - cmake-utils_src_configure
171 + cmake_src_configure
172 }
173
174 src_install() {
175 - cmake-utils_src_install
176 + cmake_src_install
177 use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
178
179 if use nls ; then
180
181 diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
182 index 51f0c069d6e..9049ae5c5e7 100644
183 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
184 +++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
185 @@ -3,7 +3,7 @@
186
187 EAPI=7
188
189 -inherit cmake-utils
190 +inherit cmake
191
192 DESCRIPTION="Image Blending with Multiresolution Splines"
193 HOMEPAGE="http://enblend.sourceforge.net/"
194 @@ -52,7 +52,7 @@ PATCHES=(
195 )
196
197 src_prepare() {
198 - cmake-utils_src_prepare
199 + cmake_src_prepare
200
201 sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
202 }
203 @@ -70,7 +70,7 @@ src_configure() {
204 -DINSTALL_PDF_DOC=ON
205 fi
206
207 - cmake-utils_src_configure
208 + cmake_src_configure
209 }
210
211 src_compile() {
212 @@ -81,5 +81,5 @@ src_compile() {
213 export VARTEXFONTS="${T}/fonts"
214
215 # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
216 - cmake-utils_src_compile -j1
217 + cmake_src_compile -j1
218 }
219
220 diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
221 index d4bacf38744..a96eb924674 100644
222 --- a/media-gfx/gmic/gmic-2.7.0.ebuild
223 +++ b/media-gfx/gmic/gmic-2.7.0.ebuild
224 @@ -4,9 +4,7 @@
225 EAPI=7
226
227 CMAKE_BUILD_TYPE=Release
228 -CMAKE_MIN_VERSION=3.9
229 -
230 -inherit cmake-utils bash-completion-r1
231 +inherit cmake bash-completion-r1
232
233 if [[ ${PV} == "9999" ]]; then
234 EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
235 @@ -81,14 +79,14 @@ pkg_pretend() {
236
237 src_prepare() {
238 local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
239 - cmake-utils_src_prepare
240 + cmake_src_prepare
241 sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
242
243 if use gimp || use krita || use qt5; then
244 sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
245 local S="${S}/gmic-qt"
246 PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
247 - cmake-utils_src_prepare
248 + cmake_src_prepare
249 fi
250 }
251
252 @@ -115,7 +113,7 @@ src_configure() {
253 -DENABLE_DYNAMIC_LINKING=ON
254 )
255
256 - cmake-utils_src_configure
257 + cmake_src_configure
258
259 # configure gmic-qt frontends
260 local CMAKE_USE_DIR="${S}/gmic-qt"
261 @@ -128,32 +126,32 @@ src_configure() {
262
263 if use gimp; then
264 mycmakeargs+=( -DGMIC_QT_HOST=gimp )
265 - BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
266 + BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
267 fi
268
269 if use krita; then
270 mycmakeargs+=( -DGMIC_QT_HOST=krita )
271 - BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
272 + BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
273 fi
274
275 if use qt5; then
276 mycmakeargs+=( -DGMIC_QT_HOST=none )
277 - BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
278 + BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
279 fi
280 }
281
282 src_compile() {
283 - cmake-utils_src_compile
284 + cmake_src_compile
285
286 # build gmic-qt frontends
287 local S="${S}/gmic-qt"
288 - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
289 - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
290 - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
291 + use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
292 + use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
293 + use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
294 }
295
296 src_install() {
297 - cmake-utils_src_install
298 + cmake_src_install
299 dodoc README
300 use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
301
302
303 diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
304 index bd8a5d1a186..81708eba2f7 100644
305 --- a/media-gfx/gmic/gmic-2.7.1.ebuild
306 +++ b/media-gfx/gmic/gmic-2.7.1.ebuild
307 @@ -4,9 +4,7 @@
308 EAPI=7
309
310 CMAKE_BUILD_TYPE=Release
311 -CMAKE_MIN_VERSION=3.9
312 -
313 -inherit cmake-utils bash-completion-r1
314 +inherit cmake bash-completion-r1
315
316 if [[ ${PV} == "9999" ]]; then
317 EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
318 @@ -81,14 +79,14 @@ pkg_pretend() {
319
320 src_prepare() {
321 local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
322 - cmake-utils_src_prepare
323 + cmake_src_prepare
324 sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
325
326 if use gimp || use krita || use qt5; then
327 sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
328 local S="${S}/gmic-qt"
329 PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
330 - cmake-utils_src_prepare
331 + cmake_src_prepare
332 fi
333 }
334
335 @@ -115,7 +113,7 @@ src_configure() {
336 -DENABLE_DYNAMIC_LINKING=ON
337 )
338
339 - cmake-utils_src_configure
340 + cmake_src_configure
341
342 # configure gmic-qt frontends
343 local CMAKE_USE_DIR="${S}/gmic-qt"
344 @@ -128,32 +126,32 @@ src_configure() {
345
346 if use gimp; then
347 mycmakeargs+=( -DGMIC_QT_HOST=gimp )
348 - BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
349 + BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
350 fi
351
352 if use krita; then
353 mycmakeargs+=( -DGMIC_QT_HOST=krita )
354 - BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
355 + BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
356 fi
357
358 if use qt5; then
359 mycmakeargs+=( -DGMIC_QT_HOST=none )
360 - BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
361 + BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
362 fi
363 }
364
365 src_compile() {
366 - cmake-utils_src_compile
367 + cmake_src_compile
368
369 # build gmic-qt frontends
370 local S="${S}/gmic-qt"
371 - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
372 - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
373 - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
374 + use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
375 + use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
376 + use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
377 }
378
379 src_install() {
380 - cmake-utils_src_install
381 + cmake_src_install
382 dodoc README
383 use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
384
385
386 diff --git a/media-gfx/gmic/gmic-2.7.2.ebuild b/media-gfx/gmic/gmic-2.7.2.ebuild
387 index bd8a5d1a186..81708eba2f7 100644
388 --- a/media-gfx/gmic/gmic-2.7.2.ebuild
389 +++ b/media-gfx/gmic/gmic-2.7.2.ebuild
390 @@ -4,9 +4,7 @@
391 EAPI=7
392
393 CMAKE_BUILD_TYPE=Release
394 -CMAKE_MIN_VERSION=3.9
395 -
396 -inherit cmake-utils bash-completion-r1
397 +inherit cmake bash-completion-r1
398
399 if [[ ${PV} == "9999" ]]; then
400 EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
401 @@ -81,14 +79,14 @@ pkg_pretend() {
402
403 src_prepare() {
404 local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
405 - cmake-utils_src_prepare
406 + cmake_src_prepare
407 sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
408
409 if use gimp || use krita || use qt5; then
410 sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
411 local S="${S}/gmic-qt"
412 PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
413 - cmake-utils_src_prepare
414 + cmake_src_prepare
415 fi
416 }
417
418 @@ -115,7 +113,7 @@ src_configure() {
419 -DENABLE_DYNAMIC_LINKING=ON
420 )
421
422 - cmake-utils_src_configure
423 + cmake_src_configure
424
425 # configure gmic-qt frontends
426 local CMAKE_USE_DIR="${S}/gmic-qt"
427 @@ -128,32 +126,32 @@ src_configure() {
428
429 if use gimp; then
430 mycmakeargs+=( -DGMIC_QT_HOST=gimp )
431 - BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
432 + BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
433 fi
434
435 if use krita; then
436 mycmakeargs+=( -DGMIC_QT_HOST=krita )
437 - BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
438 + BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
439 fi
440
441 if use qt5; then
442 mycmakeargs+=( -DGMIC_QT_HOST=none )
443 - BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
444 + BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
445 fi
446 }
447
448 src_compile() {
449 - cmake-utils_src_compile
450 + cmake_src_compile
451
452 # build gmic-qt frontends
453 local S="${S}/gmic-qt"
454 - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
455 - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
456 - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
457 + use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
458 + use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
459 + use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
460 }
461
462 src_install() {
463 - cmake-utils_src_install
464 + cmake_src_install
465 dodoc README
466 use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
467
468
469 diff --git a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
470 index d88a546fcfb..df86aac246d 100644
471 --- a/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
472 +++ b/media-gfx/inkscape/inkscape-1.0_beta2.ebuild
473 @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{5,6,7} )
474 PYTHON_REQ_USE="xml"
475 MY_P="${P/_/}"
476 RELEASE_SUFFIX="_2019-12-03_2b71d25d45"
477 -inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1
478 +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
479
480 DESCRIPTION="SVG based generic vector-drawing program"
481 HOMEPAGE="https://inkscape.org/"
482 @@ -109,7 +109,7 @@ pkg_pretend() {
483 }
484
485 src_prepare() {
486 - cmake-utils_src_prepare
487 + cmake_src_prepare
488 sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
489 }
490
491 @@ -136,11 +136,11 @@ src_configure() {
492 -DWITH_LIBWPG=$(usex wpg)
493 )
494
495 - cmake-utils_src_configure
496 + cmake_src_configure
497 }
498
499 src_install() {
500 - cmake-utils_src_install
501 + cmake_src_install
502
503 find "${ED}" -type f -name "*.la" -delete || die
504
505
506 diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
507 index b088e553b3f..6226f7b5b65 100644
508 --- a/media-gfx/inkscape/inkscape-9999.ebuild
509 +++ b/media-gfx/inkscape/inkscape-9999.ebuild
510 @@ -6,7 +6,7 @@ EAPI=7
511 PYTHON_COMPAT=( python3_{5,6,7} )
512 PYTHON_REQ_USE="xml"
513 MY_P="${P/_/}"
514 -inherit cmake-utils flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
515 +inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
516
517 DESCRIPTION="SVG based generic vector-drawing program"
518 HOMEPAGE="https://inkscape.org/"
519 @@ -108,7 +108,7 @@ pkg_pretend() {
520 }
521
522 src_prepare() {
523 - cmake-utils_src_prepare
524 + cmake_src_prepare
525 sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
526 }
527
528 @@ -135,11 +135,11 @@ src_configure() {
529 -DWITH_LIBWPG=$(usex wpg)
530 )
531
532 - cmake-utils_src_configure
533 + cmake_src_configure
534 }
535
536 src_install() {
537 - cmake-utils_src_install
538 + cmake_src_install
539
540 find "${ED}" -type f -name "*.la" -delete || die
541
542
543 diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
544 index 6d4b458a876..0ba1f7bd103 100644
545 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
546 +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.0.ebuild
547 @@ -3,7 +3,7 @@
548
549 EAPI=7
550
551 -inherit cmake-utils toolchain-funcs flag-o-matic xdg-utils
552 +inherit cmake toolchain-funcs flag-o-matic xdg-utils
553
554 DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging"
555 HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR"
556 @@ -70,10 +70,10 @@ pkg_pretend() {
557
558 src_configure() {
559 local mycmakeargs=(
560 - $(cmake-utils_use_find_package fits CFITSIO)
561 + $(cmake_use_find_package fits CFITSIO)
562 -DUSE_OPENMP="$(usex openmp)"
563 )
564 - cmake-utils_src_configure
565 + cmake_src_configure
566 }
567
568 pkg_postinst() {
569
570 diff --git a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
571 index e59d05f213b..8af21b12f82 100644
572 --- a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
573 +++ b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
574 @@ -4,7 +4,7 @@
575 EAPI=7
576
577 MY_P=${P/_rc/-rc}
578 -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
579 +inherit cmake flag-o-matic toolchain-funcs xdg-utils
580
581 DESCRIPTION="A powerful cross-platform raw image processing program"
582 HOMEPAGE="https://www.rawtherapee.com/"
583 @@ -58,7 +58,7 @@ src_configure() {
584 -DCACHE_NAME_SUFFIX=""
585 -DWITH_SYSTEM_KLT="off"
586 )
587 - cmake-utils_src_configure
588 + cmake_src_configure
589 }
590
591 pkg_postinst() {
592
593 diff --git a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild b/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
594 index 48b8dca754d..b51ffe1ca52 100644
595 --- a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
596 +++ b/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
597 @@ -4,7 +4,7 @@
598 EAPI=7
599
600 MY_P=${P/_rc/-rc}
601 -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
602 +inherit cmake flag-o-matic toolchain-funcs xdg-utils
603
604 DESCRIPTION="A powerful cross-platform raw image processing program"
605 HOMEPAGE="https://www.rawtherapee.com/"
606 @@ -58,7 +58,7 @@ src_configure() {
607 -DCACHE_NAME_SUFFIX=""
608 -DWITH_SYSTEM_KLT="off"
609 )
610 - cmake-utils_src_configure
611 + cmake_src_configure
612 }
613
614 pkg_postinst() {
615
616 diff --git a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
617 index 13b68abef36..be247dca96b 100644
618 --- a/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
619 +++ b/media-gfx/scantailor-advanced/scantailor-advanced-1.0.16.ebuild
620 @@ -3,7 +3,7 @@
621
622 EAPI=7
623
624 -inherit cmake-utils desktop virtualx
625 +inherit cmake desktop virtualx
626
627 DESCRIPTION="Interactive post-processing tool for scanned pages"
628 HOMEPAGE="http://scantailor.org/ https://github.com/4lex4/scantailor-advanced"
629 @@ -37,11 +37,11 @@ PATCHES=( "${FILESDIR}"/${P}-tests.patch )
630
631 src_test() {
632 cd "${CMAKE_BUILD_DIR}" || die
633 - virtx cmake-utils_src_test
634 + virtx cmake_src_test
635 }
636
637 src_install() {
638 - cmake-utils_src_install
639 + cmake_src_install
640
641 newicon resources/appicon.svg ${PN}.svg
642 make_desktop_entry ${PN} "Scan Tailor Advanced"
643
644 diff --git a/media-libs/libharu/libharu-2.3.0-r2.ebuild b/media-libs/libharu/libharu-2.3.0-r2.ebuild
645 index 0d2427edfda..0a5c2ae4ad1 100644
646 --- a/media-libs/libharu/libharu-2.3.0-r2.ebuild
647 +++ b/media-libs/libharu/libharu-2.3.0-r2.ebuild
648 @@ -3,9 +3,9 @@
649
650 EAPI=7
651
652 -inherit cmake-multilib
653 -
654 +CMAKE_ECLASS=cmake
655 MYP=RELEASE_${PV//./_}
656 +inherit cmake-multilib
657
658 DESCRIPTION="C/C++ library for PDF generation"
659 HOMEPAGE="http://www.libharu.org/"
660 @@ -36,5 +36,5 @@ multilib_src_configure() {
661 -DLIBHPDF_EXAMPLES=NO # Doesn't work
662 -DLIBHPDF_STATIC=NO
663 )
664 - cmake-utils_src_configure
665 + cmake_src_configure
666 }
667
668 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
669 index 2371b0b89b5..57630393fa9 100644
670 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
671 +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
672 @@ -3,6 +3,7 @@
673
674 EAPI=7
675
676 +CMAKE_ECLASS=cmake
677 inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
678
679 DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
680 @@ -37,7 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
681 src_prepare() {
682 default
683
684 - cmake-utils_src_prepare
685 + cmake_src_prepare
686 java-pkg-opt-2_src_prepare
687 }
688
689 @@ -54,11 +55,11 @@ multilib_src_configure() {
690 -DWITH_MEM_SRCDST=ON
691 )
692 [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
693 - cmake-utils_src_configure
694 + cmake_src_configure
695 }
696
697 multilib_src_compile() {
698 - cmake-utils_src_compile
699 + cmake_src_compile
700
701 if multilib_is_native_abi ; then
702 pushd "${WORKDIR}/debian/extra" &>/dev/null || die
703 @@ -68,7 +69,7 @@ multilib_src_compile() {
704 }
705
706 multilib_src_install() {
707 - cmake-utils_src_install
708 + cmake_src_install
709
710 if multilib_is_native_abi ; then
711 pushd "${WORKDIR}/debian/extra" &>/dev/null || die
712
713 diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
714 index df5ac185621..4b6cff224e4 100644
715 --- a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
716 +++ b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
717 @@ -5,7 +5,7 @@ EAPI=7
718
719 PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
720
721 -inherit cmake-utils flag-o-matic python-single-r1
722 +inherit cmake flag-o-matic python-single-r1
723
724 DESCRIPTION="A color management framework for visual effects and animation"
725 HOMEPAGE="http://opencolorio.org/"
726 @@ -57,7 +57,7 @@ pkg_setup() {
727 }
728
729 src_prepare() {
730 - cmake-utils_src_prepare
731 + cmake_src_prepare
732
733 use python && python_fix_shebang .
734 }
735 @@ -84,8 +84,7 @@ src_configure() {
736 -DOCIO_BUILD_PYGLUE=$(usex python)
737 -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
738 -DOCIO_BUILD_TESTS=$(usex test)
739 - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
740 -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
741 )
742 - cmake-utils_src_configure
743 + cmake_src_configure
744 }
745
746 diff --git a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
747 index 0ce713b21a9..300337e4729 100644
748 --- a/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
749 +++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild
750 @@ -4,7 +4,7 @@
751 EAPI=7
752
753 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
754 -inherit cmake-utils python-single-r1
755 +inherit cmake python-single-r1
756
757 DESCRIPTION="A library for reading and writing images"
758 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
759 @@ -81,7 +81,7 @@ pkg_setup() {
760 }
761
762 src_prepare() {
763 - cmake-utils_src_prepare
764 + cmake_src_prepare
765 cmake_comment_add_subdirectory src/fonts
766 }
767
768 @@ -121,5 +121,5 @@ src_configure() {
769 -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
770 )
771
772 - cmake-utils_src_configure
773 + cmake_src_configure
774 }
775
776 diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
777 index ff710267180..28d53f909b2 100644
778 --- a/media-libs/openjpeg/openjpeg-2.3.1.ebuild
779 +++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild
780 @@ -3,6 +3,7 @@
781
782 EAPI=7
783
784 +CMAKE_ECLASS=cmake
785 inherit cmake-multilib
786
787 # Make sure that test data are not newer than release;
788 @@ -41,7 +42,7 @@ src_prepare() {
789 die "Failed to rename test data"
790 fi
791
792 - cmake-utils_src_prepare
793 + cmake_src_prepare
794 }
795
796 multilib_src_configure() {
797 @@ -53,7 +54,7 @@ multilib_src_configure() {
798 -DBUILD_STATIC_LIBS=$(usex static-libs)
799 )
800
801 - cmake-utils_src_configure
802 + cmake_src_configure
803 }
804
805 multilib_src_test() {