Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/quiche/, media-plugins/kodi-audioencoder-lame/, ...
Date: Sat, 04 Jan 2020 09:38:01
Message-Id: 1578130644.31e21551da418ddc7a177c7c869070e9acca817c.asturm@gentoo
1 commit: 31e21551da418ddc7a177c7c869070e9acca817c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 3 20:01:46 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 4 09:37:24 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e21551
7
8 */*: Switch candrews' packages to cmake.eclass
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 app-arch/brotli/brotli-1.0.7.ebuild | 12 ++++++------
13 app-arch/brotli/brotli-9999.ebuild | 12 ++++++------
14 dev-cpp/waylandpp/waylandpp-0.2.4.ebuild | 5 ++---
15 dev-cpp/waylandpp/waylandpp-0.2.5.ebuild | 5 ++---
16 dev-cpp/waylandpp/waylandpp-0.2.6.ebuild | 5 ++---
17 dev-cpp/waylandpp/waylandpp-0.2.7.ebuild | 5 ++---
18 dev-cpp/waylandpp/waylandpp-9999.ebuild | 5 ++---
19 dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild | 6 +++---
20 dev-libs/rapidjson/rapidjson-9999.ebuild | 6 +++---
21 dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild | 7 +++----
22 dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild | 5 ++---
23 dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild | 5 ++---
24 dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild | 9 +--------
25 dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild | 7 +++----
26 .../rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild | 7 +++----
27 dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild | 4 ++--
28 dev-libs/rocr-runtime/rocr-runtime-9999.ebuild | 4 ++--
29 .../roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild | 1 -
30 .../roct-thunk-interface/roct-thunk-interface-9999.ebuild | 1 -
31 dev-util/rocm-cmake/rocm-cmake-0.2.ebuild | 4 ++--
32 dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild | 4 ++--
33 dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild | 4 ++--
34 dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild | 4 ++--
35 dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild | 4 ++--
36 dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild | 4 ++--
37 dev-util/rocm-cmake/rocm-cmake-9999.ebuild | 4 ++--
38 dev-util/rocminfo/rocminfo-2.10.0.ebuild | 4 ++--
39 dev-util/rocminfo/rocminfo-2.6.0.ebuild | 4 ++--
40 dev-util/rocminfo/rocminfo-2.7.0.ebuild | 4 ++--
41 dev-util/rocminfo/rocminfo-2.8.0.ebuild | 4 ++--
42 dev-util/rocminfo/rocminfo-2.9.0.ebuild | 4 ++--
43 dev-util/rocminfo/rocminfo-3.0.0.ebuild | 4 ++--
44 dev-util/rocminfo/rocminfo-9999.ebuild | 4 ++--
45 .../kodi-platform/kodi-platform-18.0_pre20190429.ebuild | 2 +-
46 media-libs/kodi-platform/kodi-platform-9999.ebuild | 2 +-
47 media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild | 1 +
48 media-libs/vidstab/vidstab-1.1.0-r2.ebuild | 9 ++++-----
49 media-libs/vidstab/vidstab-9999.ebuild | 9 ++++-----
50 .../kodi-audiodecoder-modplug-2.0.2.ebuild | 2 +-
51 .../kodi-audiodecoder-modplug-9999.ebuild | 2 +-
52 .../kodi-audiodecoder-nosefart-2.0.1.ebuild | 2 +-
53 .../kodi-audiodecoder-nosefart-9999.ebuild | 2 +-
54 .../kodi-audiodecoder-sidplay-1.2.0.ebuild | 4 ++--
55 .../kodi-audiodecoder-sidplay-1.2.1.ebuild | 4 ++--
56 .../kodi-audiodecoder-sidplay-9999.ebuild | 4 ++--
57 .../kodi-audiodecoder-snesapu-2.0.1.ebuild | 2 +-
58 .../kodi-audiodecoder-snesapu-9999.ebuild | 2 +-
59 .../kodi-audiodecoder-stsound-9999.ebuild | 2 +-
60 .../kodi-audiodecoder-timidity-9999.ebuild | 2 +-
61 .../kodi-audiodecoder-vgmstream-1.1.4.ebuild | 2 +-
62 .../kodi-audiodecoder-vgmstream-9999.ebuild | 2 +-
63 .../kodi-audioencoder-flac-2.0.2.ebuild | 4 ++--
64 .../kodi-audioencoder-flac-2.0.3.ebuild | 4 ++--
65 .../kodi-audioencoder-flac-2.0.4.ebuild | 4 ++--
66 .../kodi-audioencoder-flac-2.0.5.ebuild | 4 ++--
67 .../kodi-audioencoder-flac-9999.ebuild | 4 ++--
68 .../kodi-audioencoder-lame-2.0.2.ebuild | 4 ++--
69 .../kodi-audioencoder-lame-9999.ebuild | 4 ++--
70 .../kodi-audioencoder-vorbis-2.0.3.ebuild | 4 ++--
71 .../kodi-audioencoder-vorbis-9999.ebuild | 4 ++--
72 .../kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild | 2 +-
73 .../kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild | 2 +-
74 .../kodi-game-libretro-bnes-9999.ebuild | 4 ++--
75 .../kodi-game-libretro-dosbox-9999.ebuild | 4 ++--
76 .../kodi-game-libretro-fceumm-9999.ebuild | 4 ++--
77 .../kodi-game-libretro-nestopia-9999.ebuild | 4 ++--
78 .../kodi-game-libretro-snes9x-9999.ebuild | 4 ++--
79 .../kodi-game-libretro-twentyfortyeight-9999.ebuild | 4 ++--
80 .../kodi-game-libretro/kodi-game-libretro-9999.ebuild | 2 +-
81 .../kodi-inputstream-adaptive-9999.ebuild | 4 ++--
82 .../kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild | 4 ++--
83 .../kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild | 4 ++--
84 .../kodi-peripheral-joystick-9999.ebuild | 2 +-
85 .../kodi-peripheral-steamcontroller-9999.ebuild | 2 +-
86 media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild | 2 +-
87 media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild | 2 +-
88 media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild | 2 +-
89 media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild | 2 +-
90 .../kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild | 2 +-
91 media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild | 2 +-
92 media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild | 2 +-
93 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild | 2 +-
94 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild | 2 +-
95 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild | 2 +-
96 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild | 4 ++--
97 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild | 4 ++--
98 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild | 4 ++--
99 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild | 4 ++--
100 .../kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild | 4 ++--
101 .../kodi-pvr-mediaportal-tvserver-9999.ebuild | 2 +-
102 media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild | 2 +-
103 media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild | 2 +-
104 media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild | 2 +-
105 media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild | 2 +-
106 media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild | 2 +-
107 media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild | 2 +-
108 media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild | 2 +-
109 media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild | 2 +-
110 media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild | 2 +-
111 media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild | 2 +-
112 .../kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild | 4 ++--
113 media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild | 4 ++--
114 media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild | 2 +-
115 media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild | 2 +-
116 media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild | 2 +-
117 media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild | 2 +-
118 .../kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild | 2 +-
119 .../kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild | 2 +-
120 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild | 2 +-
121 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild | 4 ++--
122 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild | 4 ++--
123 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild | 4 ++--
124 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild | 4 ++--
125 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild | 4 ++--
126 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild | 4 ++--
127 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild | 4 ++--
128 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild | 4 ++--
129 media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild | 4 ++--
130 media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild | 2 +-
131 media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild | 2 +-
132 .../kodi-screensaver-asteroids-9999.ebuild | 2 +-
133 .../kodi-screensaver-biogenesis-9999.ebuild | 2 +-
134 .../kodi-screensaver-crystalmorph-9999.ebuild | 2 +-
135 .../kodi-screensaver-greynetic-9999.ebuild | 2 +-
136 .../kodi-screensaver-pingpong-9999.ebuild | 2 +-
137 .../kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild | 2 +-
138 .../kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild | 2 +-
139 .../kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild | 2 +-
140 media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild | 2 +-
141 media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild | 2 +-
142 media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild | 4 ++--
143 media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild | 4 ++--
144 .../kodi-visualization-fishbmc-5.1.1.ebuild | 4 ++--
145 .../kodi-visualization-fishbmc-5.1.2.ebuild | 4 ++--
146 .../kodi-visualization-fishbmc-9999.ebuild | 4 ++--
147 .../kodi-visualization-goom-2.1.0.ebuild | 2 +-
148 .../kodi-visualization-goom-9999.ebuild | 2 +-
149 .../kodi-visualization-nastyfft-9999.ebuild | 2 +-
150 .../kodi-visualization-projectm-2.3.4.ebuild | 4 ++--
151 .../kodi-visualization-projectm-9999.ebuild | 4 ++--
152 .../kodi-visualization-shadertoy-1.2.1.ebuild | 4 ++--
153 .../kodi-visualization-shadertoy-1.2.2.ebuild | 4 ++--
154 .../kodi-visualization-shadertoy-1.2.3.ebuild | 4 ++--
155 .../kodi-visualization-shadertoy-9999.ebuild | 4 ++--
156 .../kodi-visualization-spectrum-3.0.0.ebuild | 4 ++--
157 .../kodi-visualization-spectrum-3.0.1.ebuild | 4 ++--
158 .../kodi-visualization-spectrum-3.0.2.ebuild | 4 ++--
159 .../kodi-visualization-spectrum-9999.ebuild | 4 ++--
160 .../kodi-visualization-starburst-2.0.0.ebuild | 2 +-
161 .../kodi-visualization-starburst-2.0.1.ebuild | 4 ++--
162 .../kodi-visualization-starburst-2.0.2.ebuild | 4 ++--
163 .../kodi-visualization-starburst-9999.ebuild | 4 ++--
164 .../kodi-visualization-waveform-3.0.2.ebuild | 4 ++--
165 .../kodi-visualization-waveform-3.1.0.ebuild | 4 ++--
166 .../kodi-visualization-waveform-3.1.1.ebuild | 4 ++--
167 .../kodi-visualization-waveform-9999.ebuild | 4 ++--
168 media-tv/kodi/kodi-18.3-r1.ebuild | 12 ++++++------
169 media-tv/kodi/kodi-18.4.ebuild | 12 ++++++------
170 media-tv/kodi/kodi-18.5-r1.ebuild | 12 ++++++------
171 media-tv/kodi/kodi-9999.ebuild | 12 ++++++------
172 net-libs/nghttp3/nghttp3-0_pre20190912.ebuild | 5 +++--
173 net-libs/nghttp3/nghttp3-9999.ebuild | 5 +++--
174 net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild | 5 +++--
175 net-libs/ngtcp2/ngtcp2-9999.ebuild | 5 +++--
176 net-libs/quiche/quiche-0.1.0-r1.ebuild | 8 ++++----
177 net-libs/quiche/quiche-9999.ebuild | 8 ++++----
178 net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild | 8 ++++----
179 net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild | 8 ++++----
180 net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild | 8 ++++----
181 net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild | 8 ++++----
182 net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild | 8 ++++----
183 net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild | 8 ++++----
184 net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild | 8 ++++----
185 net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild | 8 ++++----
186 net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild | 8 ++++----
187 net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild | 8 ++++----
188 net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild | 8 ++++----
189 net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild | 8 ++++----
190 net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild | 8 ++++----
191 net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild | 8 ++++----
192 net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild | 8 ++++----
193 net-p2p/xmr-stak/xmr-stak-9999.ebuild | 8 ++++----
194 sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild | 6 +++---
195 sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild | 6 +++---
196 sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild | 6 +++---
197 sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild | 6 +++---
198 sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild | 6 +++---
199 sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild | 8 ++++----
200 188 files changed, 389 insertions(+), 405 deletions(-)
201
202 diff --git a/app-arch/brotli/brotli-1.0.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
203 index 29e0dde0f37..fec4aa455a7 100644
204 --- a/app-arch/brotli/brotli-1.0.7.ebuild
205 +++ b/app-arch/brotli/brotli-1.0.7.ebuild
206 @@ -6,7 +6,7 @@ EAPI=7
207 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
208 DISTUTILS_OPTIONAL="1"
209 DISTUTILS_IN_SOURCE_BUILD="1"
210 -
211 +CMAKE_ECLASS=cmake
212 inherit cmake-multilib distutils-r1
213
214 DESCRIPTION="Generic-purpose lossless compression algorithm"
215 @@ -37,14 +37,14 @@ RESTRICT="!test? ( test )"
216
217 src_prepare() {
218 use python && distutils-r1_src_prepare
219 - cmake-utils_src_prepare
220 + cmake_src_prepare
221 }
222
223 multilib_src_configure() {
224 local mycmakeargs=(
225 -DBUILD_TESTING="$(usex test)"
226 )
227 - cmake-utils_src_configure
228 + cmake_src_configure
229 }
230 src_configure() {
231 cmake-multilib_src_configure
232 @@ -52,7 +52,7 @@ src_configure() {
233 }
234
235 multilib_src_compile() {
236 - cmake-utils_src_compile
237 + cmake_src_compile
238 }
239 src_compile() {
240 cmake-multilib_src_compile
241 @@ -64,7 +64,7 @@ python_test(){
242 }
243
244 multilib_src_test() {
245 - cmake-utils_src_test
246 + cmake_src_test
247 }
248 src_test() {
249 cmake-multilib_src_test
250 @@ -72,7 +72,7 @@ src_test() {
251 }
252
253 multilib_src_install() {
254 - cmake-utils_src_install
255 + cmake_src_install
256 }
257 multilib_src_install_all() {
258 use python && distutils-r1_src_install
259
260 diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
261 index f71b9e53de5..26f80b64ecb 100644
262 --- a/app-arch/brotli/brotli-9999.ebuild
263 +++ b/app-arch/brotli/brotli-9999.ebuild
264 @@ -6,7 +6,7 @@ EAPI=7
265 PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
266 DISTUTILS_OPTIONAL="1"
267 DISTUTILS_IN_SOURCE_BUILD="1"
268 -
269 +CMAKE_ECLASS=cmake
270 inherit cmake-multilib distutils-r1
271
272 DESCRIPTION="Generic-purpose lossless compression algorithm"
273 @@ -37,14 +37,14 @@ RESTRICT="!test? ( test )"
274
275 src_prepare() {
276 use python && distutils-r1_src_prepare
277 - cmake-utils_src_prepare
278 + cmake_src_prepare
279 }
280
281 multilib_src_configure() {
282 local mycmakeargs=(
283 -DBUILD_TESTING="$(usex test)"
284 )
285 - cmake-utils_src_configure
286 + cmake_src_configure
287 }
288 src_configure() {
289 cmake-multilib_src_configure
290 @@ -52,7 +52,7 @@ src_configure() {
291 }
292
293 multilib_src_compile() {
294 - cmake-utils_src_compile
295 + cmake_src_compile
296 }
297 src_compile() {
298 cmake-multilib_src_compile
299 @@ -64,7 +64,7 @@ python_test(){
300 }
301
302 multilib_src_test() {
303 - cmake-utils_src_test
304 + cmake_src_test
305 }
306 src_test() {
307 cmake-multilib_src_test
308 @@ -72,7 +72,7 @@ src_test() {
309 }
310
311 multilib_src_install() {
312 - cmake-utils_src_install
313 + cmake_src_install
314 }
315 multilib_src_install_all() {
316 use python && distutils-r1_src_install
317
318 diff --git a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
319 index c176d851c87..5f2963921d9 100644
320 --- a/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
321 +++ b/dev-cpp/waylandpp/waylandpp-0.2.4.ebuild
322 @@ -3,7 +3,7 @@
323
324 EAPI=7
325
326 -inherit cmake-utils
327 +inherit cmake
328
329 DESCRIPTION="Wayland C++ bindings"
330 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
331 @@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
332 src_configure() {
333 local mycmakeargs=(
334 -DBUILD_DOCUMENTATION=$(usex doc)
335 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
336 )
337
338 - cmake-utils_src_configure
339 + cmake_src_configure
340 }
341
342 diff --git a/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
343 index ea9a34e1e54..582d9582390 100644
344 --- a/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
345 +++ b/dev-cpp/waylandpp/waylandpp-0.2.5.ebuild
346 @@ -3,7 +3,7 @@
347
348 EAPI=7
349
350 -inherit cmake-utils
351 +inherit cmake
352
353 DESCRIPTION="Wayland C++ bindings"
354 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
355 @@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
356 src_configure() {
357 local mycmakeargs=(
358 -DBUILD_DOCUMENTATION=$(usex doc)
359 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
360 )
361
362 - cmake-utils_src_configure
363 + cmake_src_configure
364 }
365
366 diff --git a/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
367 index ea9a34e1e54..582d9582390 100644
368 --- a/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
369 +++ b/dev-cpp/waylandpp/waylandpp-0.2.6.ebuild
370 @@ -3,7 +3,7 @@
371
372 EAPI=7
373
374 -inherit cmake-utils
375 +inherit cmake
376
377 DESCRIPTION="Wayland C++ bindings"
378 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
379 @@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
380 src_configure() {
381 local mycmakeargs=(
382 -DBUILD_DOCUMENTATION=$(usex doc)
383 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
384 )
385
386 - cmake-utils_src_configure
387 + cmake_src_configure
388 }
389
390 diff --git a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
391 index ea9a34e1e54..582d9582390 100644
392 --- a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
393 +++ b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
394 @@ -3,7 +3,7 @@
395
396 EAPI=7
397
398 -inherit cmake-utils
399 +inherit cmake
400
401 DESCRIPTION="Wayland C++ bindings"
402 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
403 @@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
404 src_configure() {
405 local mycmakeargs=(
406 -DBUILD_DOCUMENTATION=$(usex doc)
407 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
408 )
409
410 - cmake-utils_src_configure
411 + cmake_src_configure
412 }
413
414 diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild
415 index ea9a34e1e54..582d9582390 100644
416 --- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
417 +++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
418 @@ -3,7 +3,7 @@
419
420 EAPI=7
421
422 -inherit cmake-utils
423 +inherit cmake
424
425 DESCRIPTION="Wayland C++ bindings"
426 HOMEPAGE="https://github.com/NilsBrause/waylandpp"
427 @@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
428 src_configure() {
429 local mycmakeargs=(
430 -DBUILD_DOCUMENTATION=$(usex doc)
431 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
432 )
433
434 - cmake-utils_src_configure
435 + cmake_src_configure
436 }
437
438 diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
439 index f2c70a5e361..d777625e036 100644
440 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
441 +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
442 @@ -3,7 +3,7 @@
443
444 EAPI=7
445
446 -inherit cmake-utils
447 +inherit cmake
448
449 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
450 HOMEPAGE="https://rapidjson.org/"
451 @@ -35,7 +35,7 @@ PATCHES=(
452 )
453
454 src_prepare() {
455 - cmake-utils_src_prepare
456 + cmake_src_prepare
457
458 sed -i -e 's|-Werror||g' CMakeLists.txt || die
459 sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
460 @@ -50,5 +50,5 @@ src_configure() {
461 -DRAPIDJSON_BUILD_TESTS=$(usex test)
462 -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
463 )
464 - cmake-utils_src_configure
465 + cmake_src_configure
466 }
467
468 diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
469 index 34b5854db22..c8f3d6d0ff7 100644
470 --- a/dev-libs/rapidjson/rapidjson-9999.ebuild
471 +++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
472 @@ -3,7 +3,7 @@
473
474 EAPI=7
475
476 -inherit cmake-utils
477 +inherit cmake
478
479 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
480 HOMEPAGE="https://rapidjson.org/"
481 @@ -32,7 +32,7 @@ DEPEND="
482 RDEPEND=""
483
484 src_prepare() {
485 - cmake-utils_src_prepare
486 + cmake_src_prepare
487
488 sed -i -e 's|-Werror||g' CMakeLists.txt || die
489 sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
490 @@ -47,5 +47,5 @@ src_configure() {
491 -DRAPIDJSON_BUILD_TESTS=$(usex test)
492 -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
493 )
494 - cmake-utils_src_configure
495 + cmake_src_configure
496 }
497
498 diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
499 index ff0ede91ae2..ca7dc037fe3 100644
500 --- a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
501 +++ b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
502 @@ -3,7 +3,7 @@
503
504 EAPI=7
505
506 -inherit cmake-utils
507 +inherit cmake
508
509 if [[ ${PV} == *9999 ]] ; then
510 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
511 @@ -30,13 +30,12 @@ RDEPEND=">=dev-libs/rocm-device-libs-${PV}
512 DEPEND="${RDEPEND}"
513
514 src_prepare() {
515 - cmake-utils_src_prepare
516 + cmake_src_prepare
517 }
518
519 src_configure() {
520 local mycmakeargs=(
521 -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
522 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
523 )
524 - cmake-utils_src_configure
525 + cmake_src_configure
526 }
527
528 diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
529 index e0264de7479..92ef9a203b0 100644
530 --- a/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
531 +++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
532 @@ -3,7 +3,7 @@
533
534 EAPI=7
535
536 -inherit cmake-utils
537 +inherit cmake
538
539 if [[ ${PV} == *9999 ]] ; then
540 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
541 @@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
542 src_configure() {
543 local mycmakeargs=(
544 -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
545 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
546 )
547 - cmake-utils_src_configure
548 + cmake_src_configure
549 }
550
551 diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
552 index 91d53a41976..6a15eba4fee 100644
553 --- a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
554 +++ b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
555 @@ -3,7 +3,7 @@
556
557 EAPI=7
558
559 -inherit cmake-utils
560 +inherit cmake
561
562 if [[ ${PV} == *9999 ]] ; then
563 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
564 @@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
565 src_configure() {
566 local mycmakeargs=(
567 -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
568 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
569 )
570 - cmake-utils_src_configure
571 + cmake_src_configure
572 }
573
574 diff --git a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
575 index 848a8f3a540..d758811b478 100644
576 --- a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
577 +++ b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
578 @@ -3,7 +3,7 @@
579
580 EAPI=7
581
582 -inherit cmake-utils
583 +inherit cmake
584
585 if [[ ${PV} == *9999 ]] ; then
586 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
587 @@ -25,10 +25,3 @@ SLOT="0/$(ver_cut 1-2)"
588
589 RDEPEND="dev-libs/rocr-runtime"
590 DEPEND="${RDEPEND}"
591 -
592 -src_configure() {
593 - local mycmakeargs=(
594 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
595 - )
596 - cmake-utils_src_configure
597 -}
598
599 diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
600 index 7d1b111fda2..1afe25e122a 100644
601 --- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
602 +++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
603 @@ -3,7 +3,7 @@
604
605 EAPI=7
606
607 -inherit cmake-utils
608 +inherit cmake
609
610 if [[ ${PV} == *9999 ]] ; then
611 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
612 @@ -30,13 +30,12 @@ src_prepare() {
613 # remove unittest, because it downloads additional file from github.com
614 sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
615
616 - cmake-utils_src_prepare
617 + cmake_src_prepare
618 }
619
620 src_configure() {
621 local mycmakeargs=(
622 -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
623 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
624 )
625 - cmake-utils_src_configure
626 + cmake_src_configure
627 }
628
629 diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
630 index b57b49b6965..74ef3eeac92 100644
631 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
632 +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
633 @@ -3,7 +3,7 @@
634
635 EAPI=7
636
637 -inherit cmake-utils
638 +inherit cmake
639
640 OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
641 SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
642 @@ -44,7 +44,7 @@ src_prepare() {
643 mkdir -p "${S}"/api/opencl/khronos/ || die
644 mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
645 [ -d tools/clinfo ] && rm -rf tools/clinfo || die
646 - cmake-utils_src_prepare
647 + cmake_src_prepare
648 }
649
650 src_configure() {
651 @@ -52,7 +52,6 @@ src_configure() {
652 -DUSE_COMGR_LIBRARY=yes
653 -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
654 -DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
655 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
656 )
657 - cmake-utils_src_configure
658 + cmake_src_configure
659 }
660
661 diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
662 index a0096a72495..8e95ac72ed0 100644
663 --- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
664 +++ b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
665 @@ -3,7 +3,7 @@
666
667 EAPI=7
668
669 -inherit cmake-utils
670 +inherit cmake
671
672 if [[ ${PV} == *9999 ]] ; then
673 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
674 @@ -33,5 +33,5 @@ DEPEND="${COMMON_DEPEND}
675
676 src_prepare() {
677 sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
678 - cmake-utils_src_prepare
679 + cmake_src_prepare
680 }
681
682 diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
683 index 6a89ca2901e..cc439a3d6b6 100644
684 --- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
685 +++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
686 @@ -3,7 +3,7 @@
687
688 EAPI=7
689
690 -inherit cmake-utils
691 +inherit cmake
692
693 if [[ ${PV} == *9999 ]] ; then
694 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
695 @@ -30,5 +30,5 @@ DEPEND="${COMMON_DEPEND}
696
697 src_prepare() {
698 sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
699 - cmake-utils_src_prepare
700 + cmake_src_prepare
701 }
702
703 diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
704 index f3191cff1c2..e67d364f42f 100644
705 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
706 +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
707 @@ -30,7 +30,6 @@ src_prepare() {
708 }
709 src_configure() {
710 local mycmakeargs=(
711 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
712 -DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
713 )
714 cmake_src_configure
715
716 diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
717 index f3191cff1c2..e67d364f42f 100644
718 --- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
719 +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
720 @@ -30,7 +30,6 @@ src_prepare() {
721 }
722 src_configure() {
723 local mycmakeargs=(
724 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
725 -DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
726 )
727 cmake_src_configure
728
729 diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
730 index eee840d3674..64d281c7f8b 100644
731 --- a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
732 +++ b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
733 @@ -3,7 +3,7 @@
734
735 EAPI=7
736
737 -inherit cmake-utils
738 +inherit cmake
739
740 if [[ ${PV} == *9999 ]] ; then
741 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
742 @@ -21,5 +21,5 @@ RESTRICT="test"
743
744 src_prepare() {
745 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
746 - cmake-utils_src_prepare
747 + cmake_src_prepare
748 }
749
750 diff --git a/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
751 index d6c02fff0fd..727e9410336 100644
752 --- a/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
753 +++ b/dev-util/rocm-cmake/rocm-cmake-2.10.0.ebuild
754 @@ -3,7 +3,7 @@
755
756 EAPI=7
757
758 -inherit cmake-utils
759 +inherit cmake
760
761 if [[ ${PV} == *9999 ]] ; then
762 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
763 @@ -22,5 +22,5 @@ RESTRICT="test"
764
765 src_prepare() {
766 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
767 - cmake-utils_src_prepare
768 + cmake_src_prepare
769 }
770
771 diff --git a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
772 index d6c02fff0fd..727e9410336 100644
773 --- a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
774 +++ b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
775 @@ -3,7 +3,7 @@
776
777 EAPI=7
778
779 -inherit cmake-utils
780 +inherit cmake
781
782 if [[ ${PV} == *9999 ]] ; then
783 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
784 @@ -22,5 +22,5 @@ RESTRICT="test"
785
786 src_prepare() {
787 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
788 - cmake-utils_src_prepare
789 + cmake_src_prepare
790 }
791
792 diff --git a/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
793 index d6c02fff0fd..727e9410336 100644
794 --- a/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
795 +++ b/dev-util/rocm-cmake/rocm-cmake-2.8.0.ebuild
796 @@ -3,7 +3,7 @@
797
798 EAPI=7
799
800 -inherit cmake-utils
801 +inherit cmake
802
803 if [[ ${PV} == *9999 ]] ; then
804 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
805 @@ -22,5 +22,5 @@ RESTRICT="test"
806
807 src_prepare() {
808 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
809 - cmake-utils_src_prepare
810 + cmake_src_prepare
811 }
812
813 diff --git a/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
814 index d6c02fff0fd..727e9410336 100644
815 --- a/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
816 +++ b/dev-util/rocm-cmake/rocm-cmake-2.9.0.ebuild
817 @@ -3,7 +3,7 @@
818
819 EAPI=7
820
821 -inherit cmake-utils
822 +inherit cmake
823
824 if [[ ${PV} == *9999 ]] ; then
825 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
826 @@ -22,5 +22,5 @@ RESTRICT="test"
827
828 src_prepare() {
829 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
830 - cmake-utils_src_prepare
831 + cmake_src_prepare
832 }
833
834 diff --git a/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild
835 index d6c02fff0fd..727e9410336 100644
836 --- a/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild
837 +++ b/dev-util/rocm-cmake/rocm-cmake-3.0.0.ebuild
838 @@ -3,7 +3,7 @@
839
840 EAPI=7
841
842 -inherit cmake-utils
843 +inherit cmake
844
845 if [[ ${PV} == *9999 ]] ; then
846 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
847 @@ -22,5 +22,5 @@ RESTRICT="test"
848
849 src_prepare() {
850 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
851 - cmake-utils_src_prepare
852 + cmake_src_prepare
853 }
854
855 diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
856 index d6c02fff0fd..727e9410336 100644
857 --- a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
858 +++ b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
859 @@ -3,7 +3,7 @@
860
861 EAPI=7
862
863 -inherit cmake-utils
864 +inherit cmake
865
866 if [[ ${PV} == *9999 ]] ; then
867 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
868 @@ -22,5 +22,5 @@ RESTRICT="test"
869
870 src_prepare() {
871 sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
872 - cmake-utils_src_prepare
873 + cmake_src_prepare
874 }
875
876 diff --git a/dev-util/rocminfo/rocminfo-2.10.0.ebuild b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
877 index cf2e52c9247..9a0ed95e0f8 100644
878 --- a/dev-util/rocminfo/rocminfo-2.10.0.ebuild
879 +++ b/dev-util/rocminfo/rocminfo-2.10.0.ebuild
880 @@ -3,7 +3,7 @@
881
882 EAPI=7
883
884 -inherit cmake-utils
885 +inherit cmake
886
887 if [[ ${PV} == *9999 ]] ; then
888 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
889 @@ -28,5 +28,5 @@ src_configure() {
890 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
891 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
892 )
893 - cmake-utils_src_configure
894 + cmake_src_configure
895 }
896
897 diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
898 index 31ca101fc69..d8f13e6406b 100644
899 --- a/dev-util/rocminfo/rocminfo-2.6.0.ebuild
900 +++ b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
901 @@ -3,7 +3,7 @@
902
903 EAPI=7
904
905 -inherit cmake-utils
906 +inherit cmake
907
908 if [[ ${PV} == *9999 ]] ; then
909 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
910 @@ -32,5 +32,5 @@ src_configure() {
911 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
912 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
913 )
914 - cmake-utils_src_configure
915 + cmake_src_configure
916 }
917
918 diff --git a/dev-util/rocminfo/rocminfo-2.7.0.ebuild b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
919 index 6a46a0806b1..74fb8d24fe3 100644
920 --- a/dev-util/rocminfo/rocminfo-2.7.0.ebuild
921 +++ b/dev-util/rocminfo/rocminfo-2.7.0.ebuild
922 @@ -3,7 +3,7 @@
923
924 EAPI=7
925
926 -inherit cmake-utils
927 +inherit cmake
928
929 if [[ ${PV} == *9999 ]] ; then
930 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
931 @@ -33,5 +33,5 @@ src_configure() {
932 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
933 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
934 )
935 - cmake-utils_src_configure
936 + cmake_src_configure
937 }
938
939 diff --git a/dev-util/rocminfo/rocminfo-2.8.0.ebuild b/dev-util/rocminfo/rocminfo-2.8.0.ebuild
940 index cf2e52c9247..9a0ed95e0f8 100644
941 --- a/dev-util/rocminfo/rocminfo-2.8.0.ebuild
942 +++ b/dev-util/rocminfo/rocminfo-2.8.0.ebuild
943 @@ -3,7 +3,7 @@
944
945 EAPI=7
946
947 -inherit cmake-utils
948 +inherit cmake
949
950 if [[ ${PV} == *9999 ]] ; then
951 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
952 @@ -28,5 +28,5 @@ src_configure() {
953 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
954 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
955 )
956 - cmake-utils_src_configure
957 + cmake_src_configure
958 }
959
960 diff --git a/dev-util/rocminfo/rocminfo-2.9.0.ebuild b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
961 index cf2e52c9247..9a0ed95e0f8 100644
962 --- a/dev-util/rocminfo/rocminfo-2.9.0.ebuild
963 +++ b/dev-util/rocminfo/rocminfo-2.9.0.ebuild
964 @@ -3,7 +3,7 @@
965
966 EAPI=7
967
968 -inherit cmake-utils
969 +inherit cmake
970
971 if [[ ${PV} == *9999 ]] ; then
972 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
973 @@ -28,5 +28,5 @@ src_configure() {
974 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
975 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
976 )
977 - cmake-utils_src_configure
978 + cmake_src_configure
979 }
980
981 diff --git a/dev-util/rocminfo/rocminfo-3.0.0.ebuild b/dev-util/rocminfo/rocminfo-3.0.0.ebuild
982 index cf2e52c9247..9a0ed95e0f8 100644
983 --- a/dev-util/rocminfo/rocminfo-3.0.0.ebuild
984 +++ b/dev-util/rocminfo/rocminfo-3.0.0.ebuild
985 @@ -3,7 +3,7 @@
986
987 EAPI=7
988
989 -inherit cmake-utils
990 +inherit cmake
991
992 if [[ ${PV} == *9999 ]] ; then
993 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
994 @@ -28,5 +28,5 @@ src_configure() {
995 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
996 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
997 )
998 - cmake-utils_src_configure
999 + cmake_src_configure
1000 }
1001
1002 diff --git a/dev-util/rocminfo/rocminfo-9999.ebuild b/dev-util/rocminfo/rocminfo-9999.ebuild
1003 index cf2e52c9247..9a0ed95e0f8 100644
1004 --- a/dev-util/rocminfo/rocminfo-9999.ebuild
1005 +++ b/dev-util/rocminfo/rocminfo-9999.ebuild
1006 @@ -3,7 +3,7 @@
1007
1008 EAPI=7
1009
1010 -inherit cmake-utils
1011 +inherit cmake
1012
1013 if [[ ${PV} == *9999 ]] ; then
1014 EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
1015 @@ -28,5 +28,5 @@ src_configure() {
1016 -DROCR_INC_DIR="${ESYSROOT}/usr/include"
1017 -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
1018 )
1019 - cmake-utils_src_configure
1020 + cmake_src_configure
1021 }
1022
1023 diff --git a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
1024 index 88901d491fe..25b8068f12c 100644
1025 --- a/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
1026 +++ b/media-libs/kodi-platform/kodi-platform-18.0_pre20190429.ebuild
1027 @@ -3,7 +3,7 @@
1028
1029 EAPI=7
1030
1031 -inherit cmake-utils
1032 +inherit cmake
1033
1034 if [[ ${PV} == *9999 ]]; then
1035 SRC_URI=""
1036
1037 diff --git a/media-libs/kodi-platform/kodi-platform-9999.ebuild b/media-libs/kodi-platform/kodi-platform-9999.ebuild
1038 index df88789daf7..b8ac6aa32eb 100644
1039 --- a/media-libs/kodi-platform/kodi-platform-9999.ebuild
1040 +++ b/media-libs/kodi-platform/kodi-platform-9999.ebuild
1041 @@ -3,7 +3,7 @@
1042
1043 EAPI=7
1044
1045 -inherit cmake-utils
1046 +inherit cmake
1047
1048 if [[ ${PV} == *9999 ]]; then
1049 SRC_URI=""
1050
1051 diff --git a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
1052 index a519c81c044..4280521822e 100644
1053 --- a/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
1054 +++ b/media-libs/libopenglrecorder/libopenglrecorder-0.1.0.ebuild
1055 @@ -3,6 +3,7 @@
1056
1057 EAPI=7
1058
1059 +CMAKE_ECLASS=cmake
1060 inherit cmake-multilib
1061
1062 DESCRIPTION="Library for asynchronous OpenGL recording with audio"
1063
1064 diff --git a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
1065 index 7f3c294a36f..cae1d960c4b 100644
1066 --- a/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
1067 +++ b/media-libs/vidstab/vidstab-1.1.0-r2.ebuild
1068 @@ -3,8 +3,7 @@
1069
1070 EAPI=7
1071
1072 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
1073 -
1074 +CMAKE_ECLASS=cmake
1075 inherit cmake-multilib toolchain-funcs
1076
1077 DESCRIPTION="Video stabilization library"
1078 @@ -36,7 +35,7 @@ src_prepare() {
1079 sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
1080 sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
1081 done
1082 - cmake-utils_src_prepare
1083 + cmake_src_prepare
1084 }
1085
1086 src_configure() {
1087 @@ -55,7 +54,7 @@ multilib_src_test() {
1088 )
1089 local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
1090 local BUILD_DIR="${BUILD_DIR}/tests"
1091 - cmake-utils_src_configure
1092 - cmake-utils_src_make
1093 + cmake_src_configure
1094 + cmake_build
1095 "${BUILD_DIR}"/tests || die
1096 }
1097
1098 diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
1099 index f4bd05f4520..333dd3d6be2 100644
1100 --- a/media-libs/vidstab/vidstab-9999.ebuild
1101 +++ b/media-libs/vidstab/vidstab-9999.ebuild
1102 @@ -3,8 +3,7 @@
1103
1104 EAPI=7
1105
1106 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
1107 -
1108 +CMAKE_ECLASS=cmake
1109 inherit cmake-multilib toolchain-funcs
1110
1111 DESCRIPTION="Video stabilization library"
1112 @@ -31,7 +30,7 @@ src_prepare() {
1113 sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
1114 sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
1115 done
1116 - cmake-utils_src_prepare
1117 + cmake_src_prepare
1118 }
1119
1120 src_configure() {
1121 @@ -50,7 +49,7 @@ multilib_src_test() {
1122 )
1123 local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
1124 local BUILD_DIR="${BUILD_DIR}/tests"
1125 - cmake-utils_src_configure
1126 - cmake-utils_src_make
1127 + cmake_src_configure
1128 + cmake_build
1129 "${BUILD_DIR}"/tests || die
1130 }
1131
1132 diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
1133 index 02ccb581ef6..19032c25f16 100644
1134 --- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
1135 +++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-2.0.2.ebuild
1136 @@ -3,7 +3,7 @@
1137
1138 EAPI=7
1139
1140 -inherit cmake-utils kodi-addon
1141 +inherit cmake kodi-addon
1142
1143 DESCRIPTION="Modplug decoder addon for Kodi"
1144 HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
1145
1146 diff --git a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
1147 index 37aa417f277..9e3db34f088 100644
1148 --- a/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
1149 +++ b/media-plugins/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug-9999.ebuild
1150 @@ -3,7 +3,7 @@
1151
1152 EAPI=7
1153
1154 -inherit cmake-utils kodi-addon
1155 +inherit cmake kodi-addon
1156
1157 DESCRIPTION="Modplug decoder addon for Kodi"
1158 HOMEPAGE="https://github.com/notspiff/audiodecoder.modplug"
1159
1160 diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild
1161 index abec4e0e09a..bd2a0a87bfe 100644
1162 --- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild
1163 +++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-2.0.1.ebuild
1164 @@ -3,7 +3,7 @@
1165
1166 EAPI=7
1167
1168 -inherit cmake-utils kodi-addon
1169 +inherit cmake kodi-addon
1170
1171 DESCRIPTION="Nosefart decoder addon for Kodi"
1172 HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
1173
1174 diff --git a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
1175 index b9bf148c43e..70ed76a8f63 100644
1176 --- a/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
1177 +++ b/media-plugins/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart-9999.ebuild
1178 @@ -3,7 +3,7 @@
1179
1180 EAPI=7
1181
1182 -inherit cmake-utils kodi-addon
1183 +inherit cmake kodi-addon
1184
1185 DESCRIPTION="Nosefart decoder addon for Kodi"
1186 HOMEPAGE="https://github.com/notspiff/audiodecoder.nosefart"
1187
1188 diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
1189 index e81e5bf4b20..c84cba0c332 100644
1190 --- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
1191 +++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.0.ebuild
1192 @@ -3,7 +3,7 @@
1193
1194 EAPI=7
1195
1196 -inherit cmake-utils kodi-addon
1197 +inherit cmake kodi-addon
1198
1199 DESCRIPTION="SidPlay decoder addon for Kodi"
1200 HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
1201 @@ -37,5 +37,5 @@ RDEPEND="
1202
1203 src_prepare(){
1204 [ -d depends ] && rm -rf depends || die
1205 - cmake-utils_src_prepare
1206 + cmake_src_prepare
1207 }
1208
1209 diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
1210 index e81e5bf4b20..c84cba0c332 100644
1211 --- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
1212 +++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-1.2.1.ebuild
1213 @@ -3,7 +3,7 @@
1214
1215 EAPI=7
1216
1217 -inherit cmake-utils kodi-addon
1218 +inherit cmake kodi-addon
1219
1220 DESCRIPTION="SidPlay decoder addon for Kodi"
1221 HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
1222 @@ -37,5 +37,5 @@ RDEPEND="
1223
1224 src_prepare(){
1225 [ -d depends ] && rm -rf depends || die
1226 - cmake-utils_src_prepare
1227 + cmake_src_prepare
1228 }
1229
1230 diff --git a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
1231 index ba6f78a64c2..5a8094d6f09 100644
1232 --- a/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
1233 +++ b/media-plugins/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay-9999.ebuild
1234 @@ -3,7 +3,7 @@
1235
1236 EAPI=7
1237
1238 -inherit cmake-utils kodi-addon
1239 +inherit cmake kodi-addon
1240
1241 DESCRIPTION="SidPlay decoder addon for Kodi"
1242 HOMEPAGE="https://github.com/notspiff/audiodecoder.sidplay"
1243 @@ -37,5 +37,5 @@ RDEPEND="
1244
1245 src_prepare(){
1246 [ -d depends ] && rm -rf depends || die
1247 - cmake-utils_src_prepare
1248 + cmake_src_prepare
1249 }
1250
1251 diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
1252 index 24aa470973c..7ff598911be 100644
1253 --- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
1254 +++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-2.0.1.ebuild
1255 @@ -3,7 +3,7 @@
1256
1257 EAPI=7
1258
1259 -inherit cmake-utils kodi-addon
1260 +inherit cmake kodi-addon
1261
1262 DESCRIPTION="SPC decoder addon for Kodi"
1263 HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
1264
1265 diff --git a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
1266 index 7ac620590bb..21ae6a860b1 100644
1267 --- a/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
1268 +++ b/media-plugins/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu-9999.ebuild
1269 @@ -3,7 +3,7 @@
1270
1271 EAPI=7
1272
1273 -inherit cmake-utils kodi-addon
1274 +inherit cmake kodi-addon
1275
1276 DESCRIPTION="SPC decoder addon for Kodi"
1277 HOMEPAGE="https://github.com/notspiff/audiodecoder.snesapu"
1278
1279 diff --git a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
1280 index 76e4f54dcc1..935394c682e 100644
1281 --- a/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
1282 +++ b/media-plugins/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound-9999.ebuild
1283 @@ -3,7 +3,7 @@
1284
1285 EAPI=7
1286
1287 -inherit cmake-utils kodi-addon
1288 +inherit cmake kodi-addon
1289
1290 DESCRIPTION="SPC decoder addon for Kodi"
1291 HOMEPAGE="https://github.com/notspiff/audiodecoder.stsound"
1292
1293 diff --git a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
1294 index 59bf5e8d03d..5e3d9e6ad46 100644
1295 --- a/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
1296 +++ b/media-plugins/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity-9999.ebuild
1297 @@ -3,7 +3,7 @@
1298
1299 EAPI=7
1300
1301 -inherit cmake-utils kodi-addon
1302 +inherit cmake kodi-addon
1303
1304 DESCRIPTION="Timidity decoder addon for Kodi"
1305 HOMEPAGE="https://github.com/notspiff/audiodecoder.timidity"
1306
1307 diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
1308 index 21fad2e624d..0e5e571ab28 100644
1309 --- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
1310 +++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-1.1.4.ebuild
1311 @@ -3,7 +3,7 @@
1312
1313 EAPI=7
1314
1315 -inherit cmake-utils kodi-addon
1316 +inherit cmake kodi-addon
1317
1318 DESCRIPTION="vgmstream decoder addon for Kodi"
1319 HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
1320
1321 diff --git a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
1322 index 495eeea2756..e3cee920303 100644
1323 --- a/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
1324 +++ b/media-plugins/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream-9999.ebuild
1325 @@ -3,7 +3,7 @@
1326
1327 EAPI=7
1328
1329 -inherit cmake-utils kodi-addon
1330 +inherit cmake kodi-addon
1331
1332 DESCRIPTION="vgmstream decoder addon for Kodi"
1333 HOMEPAGE="https://github.com/notspiff/audiodecoder.vgmstream"
1334
1335 diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
1336 index 56ae7911e97..15673bd09c9 100644
1337 --- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
1338 +++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.2.ebuild
1339 @@ -3,7 +3,7 @@
1340
1341 EAPI=7
1342
1343 -inherit cmake-utils kodi-addon
1344 +inherit cmake kodi-addon
1345
1346 DESCRIPTION="Flac encoder addon for Kodi"
1347 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
1348 @@ -38,5 +38,5 @@ RDEPEND="
1349
1350 src_prepare(){
1351 [ -d depends ] && rm -rf depends || die
1352 - cmake-utils_src_prepare
1353 + cmake_src_prepare
1354 }
1355
1356 diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
1357 index 56ae7911e97..15673bd09c9 100644
1358 --- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
1359 +++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.3.ebuild
1360 @@ -3,7 +3,7 @@
1361
1362 EAPI=7
1363
1364 -inherit cmake-utils kodi-addon
1365 +inherit cmake kodi-addon
1366
1367 DESCRIPTION="Flac encoder addon for Kodi"
1368 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
1369 @@ -38,5 +38,5 @@ RDEPEND="
1370
1371 src_prepare(){
1372 [ -d depends ] && rm -rf depends || die
1373 - cmake-utils_src_prepare
1374 + cmake_src_prepare
1375 }
1376
1377 diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
1378 index 56ae7911e97..15673bd09c9 100644
1379 --- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
1380 +++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.4.ebuild
1381 @@ -3,7 +3,7 @@
1382
1383 EAPI=7
1384
1385 -inherit cmake-utils kodi-addon
1386 +inherit cmake kodi-addon
1387
1388 DESCRIPTION="Flac encoder addon for Kodi"
1389 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
1390 @@ -38,5 +38,5 @@ RDEPEND="
1391
1392 src_prepare(){
1393 [ -d depends ] && rm -rf depends || die
1394 - cmake-utils_src_prepare
1395 + cmake_src_prepare
1396 }
1397
1398 diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
1399 index 56ae7911e97..15673bd09c9 100644
1400 --- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
1401 +++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-2.0.5.ebuild
1402 @@ -3,7 +3,7 @@
1403
1404 EAPI=7
1405
1406 -inherit cmake-utils kodi-addon
1407 +inherit cmake kodi-addon
1408
1409 DESCRIPTION="Flac encoder addon for Kodi"
1410 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
1411 @@ -38,5 +38,5 @@ RDEPEND="
1412
1413 src_prepare(){
1414 [ -d depends ] && rm -rf depends || die
1415 - cmake-utils_src_prepare
1416 + cmake_src_prepare
1417 }
1418
1419 diff --git a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
1420 index e57669742af..31525bbc567 100644
1421 --- a/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
1422 +++ b/media-plugins/kodi-audioencoder-flac/kodi-audioencoder-flac-9999.ebuild
1423 @@ -3,7 +3,7 @@
1424
1425 EAPI=7
1426
1427 -inherit cmake-utils kodi-addon
1428 +inherit cmake kodi-addon
1429
1430 DESCRIPTION="Flac encoder addon for Kodi"
1431 HOMEPAGE="https://github.com/xbmc/audioencoder.flac"
1432 @@ -38,5 +38,5 @@ RDEPEND="
1433
1434 src_prepare(){
1435 [ -d depends ] && rm -rf depends || die
1436 - cmake-utils_src_prepare
1437 + cmake_src_prepare
1438 }
1439
1440 diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
1441 index 633bde6e683..a2ee4573d72 100644
1442 --- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
1443 +++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-2.0.2.ebuild
1444 @@ -3,7 +3,7 @@
1445
1446 EAPI=7
1447
1448 -inherit cmake-utils kodi-addon
1449 +inherit cmake kodi-addon
1450
1451 DESCRIPTION="Lame MP3 encoder addon for Kodi"
1452 HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
1453 @@ -38,5 +38,5 @@ RDEPEND="
1454
1455 src_prepare(){
1456 [ -d depends ] && rm -rf depends || die
1457 - cmake-utils_src_prepare
1458 + cmake_src_prepare
1459 }
1460
1461 diff --git a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
1462 index 54032ba673e..35bd36d901d 100644
1463 --- a/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
1464 +++ b/media-plugins/kodi-audioencoder-lame/kodi-audioencoder-lame-9999.ebuild
1465 @@ -3,7 +3,7 @@
1466
1467 EAPI=7
1468
1469 -inherit cmake-utils kodi-addon
1470 +inherit cmake kodi-addon
1471
1472 DESCRIPTION="Lame MP3 encoder addon for Kodi"
1473 HOMEPAGE="https://github.com/xbmc/audioencoder.lame"
1474 @@ -38,5 +38,5 @@ RDEPEND="
1475
1476 src_prepare(){
1477 [ -d depends ] && rm -rf depends || die
1478 - cmake-utils_src_prepare
1479 + cmake_src_prepare
1480 }
1481
1482 diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
1483 index c672bd85ce8..8f789873e0d 100644
1484 --- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
1485 +++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-2.0.3.ebuild
1486 @@ -3,7 +3,7 @@
1487
1488 EAPI=7
1489
1490 -inherit cmake-utils kodi-addon
1491 +inherit cmake kodi-addon
1492
1493 DESCRIPTION="Vorbis encoder addon for Kodi"
1494 HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
1495 @@ -39,5 +39,5 @@ RDEPEND="
1496
1497 src_prepare(){
1498 [ -d depends ] && rm -rf depends || die
1499 - cmake-utils_src_prepare
1500 + cmake_src_prepare
1501 }
1502
1503 diff --git a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
1504 index 9fd58dd114a..82b41c319b1 100644
1505 --- a/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
1506 +++ b/media-plugins/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis-9999.ebuild
1507 @@ -3,7 +3,7 @@
1508
1509 EAPI=7
1510
1511 -inherit cmake-utils kodi-addon
1512 +inherit cmake kodi-addon
1513
1514 DESCRIPTION="Vorbis encoder addon for Kodi"
1515 HOMEPAGE="https://github.com/xbmc/audioencoder.vorbis"
1516 @@ -39,5 +39,5 @@ RDEPEND="
1517
1518 src_prepare(){
1519 [ -d depends ] && rm -rf depends || die
1520 - cmake-utils_src_prepare
1521 + cmake_src_prepare
1522 }
1523
1524 diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
1525 index 2a4af278b06..9f7362baae9 100644
1526 --- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
1527 +++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-2.0.2.ebuild
1528 @@ -3,7 +3,7 @@
1529
1530 EAPI=7
1531
1532 -inherit cmake-utils kodi-addon
1533 +inherit cmake kodi-addon
1534
1535 DESCRIPTION="WAV encoder addon for Kodi"
1536 HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
1537
1538 diff --git a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
1539 index f778e3efffd..52d09f7de93 100644
1540 --- a/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
1541 +++ b/media-plugins/kodi-audioencoder-wav/kodi-audioencoder-wav-9999.ebuild
1542 @@ -3,7 +3,7 @@
1543
1544 EAPI=7
1545
1546 -inherit cmake-utils kodi-addon
1547 +inherit cmake kodi-addon
1548
1549 DESCRIPTION="WAV encoder addon for Kodi"
1550 HOMEPAGE="https://github.com/xbmc/audioencoder.wav"
1551
1552 diff --git a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
1553 index c4ec85a581c..9a4667bbfb4 100644
1554 --- a/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
1555 +++ b/media-plugins/kodi-game-libretro-bnes/kodi-game-libretro-bnes-9999.ebuild
1556 @@ -3,7 +3,7 @@
1557
1558 EAPI=7
1559
1560 -inherit cmake-utils kodi-addon
1561 +inherit cmake kodi-addon
1562
1563 DESCRIPTION="bNES GameClient for Kodi"
1564 HOMEPAGE="https://github.com/kodi-game/game.libretro.bnes"
1565 @@ -34,5 +34,5 @@ RDEPEND="
1566 "
1567 src_prepare() {
1568 echo 'find_library(BNES_LIB NAMES bnes_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-bnes.cmake" || die
1569 - cmake-utils_src_prepare
1570 + cmake_src_prepare
1571 }
1572
1573 diff --git a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
1574 index 5023eb5cc6e..6d5d2d0848d 100644
1575 --- a/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
1576 +++ b/media-plugins/kodi-game-libretro-dosbox/kodi-game-libretro-dosbox-9999.ebuild
1577 @@ -3,7 +3,7 @@
1578
1579 EAPI=7
1580
1581 -inherit cmake-utils kodi-addon
1582 +inherit cmake kodi-addon
1583
1584 DESCRIPTION="DOSBox GameClient for Kodi"
1585 HOMEPAGE="https://github.com/kodi-game/game.libretro.dosbox"
1586 @@ -34,5 +34,5 @@ RDEPEND="
1587 "
1588 src_prepare() {
1589 echo 'find_library(DOSBOX_LIB NAMES dosbox_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-dosbox.cmake" || die
1590 - cmake-utils_src_prepare
1591 + cmake_src_prepare
1592 }
1593
1594 diff --git a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
1595 index dd15a631b6b..12f7918d743 100644
1596 --- a/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
1597 +++ b/media-plugins/kodi-game-libretro-fceumm/kodi-game-libretro-fceumm-9999.ebuild
1598 @@ -3,7 +3,7 @@
1599
1600 EAPI=7
1601
1602 -inherit cmake-utils kodi-addon
1603 +inherit cmake kodi-addon
1604
1605 DESCRIPTION="FCEU-Next GameClient for Kodi"
1606 HOMEPAGE="https://github.com/kodi-game/game.libretro.fceumm"
1607 @@ -34,5 +34,5 @@ RDEPEND="
1608 "
1609 src_prepare() {
1610 echo 'find_library(FCEUMM_LIB NAMES fceumm_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-fceumm.cmake" || die
1611 - cmake-utils_src_prepare
1612 + cmake_src_prepare
1613 }
1614
1615 diff --git a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
1616 index d08d797471c..45c7c19d621 100644
1617 --- a/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
1618 +++ b/media-plugins/kodi-game-libretro-nestopia/kodi-game-libretro-nestopia-9999.ebuild
1619 @@ -3,7 +3,7 @@
1620
1621 EAPI=7
1622
1623 -inherit cmake-utils kodi-addon
1624 +inherit cmake kodi-addon
1625
1626 DESCRIPTION="Nestopia GameClient for Kodi"
1627 HOMEPAGE="https://github.com/kodi-game/game.libretro.nestopia"
1628 @@ -34,5 +34,5 @@ RDEPEND="
1629 "
1630 src_prepare() {
1631 echo 'find_library(NESTOPIA_LIB NAMES nestopia_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-nestopia.cmake" || die
1632 - cmake-utils_src_prepare
1633 + cmake_src_prepare
1634 }
1635
1636 diff --git a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
1637 index 4b6e38acdc5..539bc5a7329 100644
1638 --- a/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
1639 +++ b/media-plugins/kodi-game-libretro-snes9x/kodi-game-libretro-snes9x-9999.ebuild
1640 @@ -3,7 +3,7 @@
1641
1642 EAPI=7
1643
1644 -inherit cmake-utils kodi-addon
1645 +inherit cmake kodi-addon
1646
1647 DESCRIPTION="Snes9x GameClient for Kodi"
1648 HOMEPAGE="https://github.com/kodi-game/game.libretro.snes9x"
1649 @@ -34,5 +34,5 @@ RDEPEND="
1650 "
1651 src_prepare() {
1652 echo 'find_library(SNES9X_LIB NAMES snes9x_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-snes9x.cmake" || die
1653 - cmake-utils_src_prepare
1654 + cmake_src_prepare
1655 }
1656
1657 diff --git a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
1658 index 852f780f1e2..4693fbee017 100644
1659 --- a/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
1660 +++ b/media-plugins/kodi-game-libretro-twentyfortyeight/kodi-game-libretro-twentyfortyeight-9999.ebuild
1661 @@ -3,7 +3,7 @@
1662
1663 EAPI=7
1664
1665 -inherit cmake-utils kodi-addon
1666 +inherit cmake kodi-addon
1667
1668 DESCRIPTION="2048 for Kodi"
1669 HOMEPAGE="https://github.com/kodi-game/game.libretro.2048"
1670 @@ -35,5 +35,5 @@ RDEPEND="
1671
1672 src_prepare() {
1673 echo 'find_library(2048_LIB NAMES 2048_libretro${CMAKE_SHARED_LIBRARY_SUFFIX} PATH_SUFFIXES libretro)' > "${S}/Findlibretro-2048.cmake" || die
1674 - cmake-utils_src_prepare
1675 + cmake_src_prepare
1676 }
1677
1678 diff --git a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
1679 index 7a362f9d027..1c072bc4353 100644
1680 --- a/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
1681 +++ b/media-plugins/kodi-game-libretro/kodi-game-libretro-9999.ebuild
1682 @@ -3,7 +3,7 @@
1683
1684 EAPI=7
1685
1686 -inherit cmake-utils kodi-addon
1687 +inherit cmake kodi-addon
1688
1689 DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
1690 HOMEPAGE="https://github.com/kodi-game/game.libretro"
1691
1692 diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
1693 index 8c3da94fa9c..55dcb1916c4 100644
1694 --- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
1695 +++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
1696 @@ -3,7 +3,7 @@
1697
1698 EAPI=7
1699
1700 -inherit cmake-utils kodi-addon
1701 +inherit cmake kodi-addon
1702
1703 DESCRIPTION="Kodi's Adaptive inputstream addon"
1704 HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
1705 @@ -38,5 +38,5 @@ RDEPEND="
1706
1707 src_prepare(){
1708 [ -d depends ] && rm -rf depends || die
1709 - cmake-utils_src_prepare
1710 + cmake_src_prepare
1711 }
1712
1713 diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
1714 index 3adffa9da5e..4766db65de4 100644
1715 --- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
1716 +++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-2.0.6.ebuild
1717 @@ -3,7 +3,7 @@
1718
1719 EAPI=7
1720
1721 -inherit cmake-utils kodi-addon
1722 +inherit cmake kodi-addon
1723
1724 DESCRIPTION="Kodi's RTMP inputstream addon"
1725 HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
1726 @@ -37,5 +37,5 @@ RDEPEND="
1727
1728 src_prepare(){
1729 [ -d depends ] && rm -rf depends || die
1730 - cmake-utils_src_prepare
1731 + cmake_src_prepare
1732 }
1733
1734 diff --git a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
1735 index 75e15b5c141..e38c1e39aac 100644
1736 --- a/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
1737 +++ b/media-plugins/kodi-inputstream-rtmp/kodi-inputstream-rtmp-9999.ebuild
1738 @@ -3,7 +3,7 @@
1739
1740 EAPI=7
1741
1742 -inherit cmake-utils kodi-addon
1743 +inherit cmake kodi-addon
1744
1745 DESCRIPTION="Kodi's RTMP inputstream addon"
1746 HOMEPAGE="https://github.com/xbmc/inputstream.rtmp"
1747 @@ -37,5 +37,5 @@ RDEPEND="
1748
1749 src_prepare(){
1750 [ -d depends ] && rm -rf depends || die
1751 - cmake-utils_src_prepare
1752 + cmake_src_prepare
1753 }
1754
1755 diff --git a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
1756 index fd7b1226a27..9b0ab5cbd9b 100644
1757 --- a/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
1758 +++ b/media-plugins/kodi-peripheral-joystick/kodi-peripheral-joystick-9999.ebuild
1759 @@ -3,7 +3,7 @@
1760
1761 EAPI=7
1762
1763 -inherit cmake-utils kodi-addon
1764 +inherit cmake kodi-addon
1765
1766 DESCRIPTION="Libretro compatibility layer for the Kodi Game API"
1767 HOMEPAGE="https://github.com/xbmc/peripheral.joystick"
1768
1769 diff --git a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
1770 index a2853221614..4daed9983f6 100644
1771 --- a/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
1772 +++ b/media-plugins/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller-9999.ebuild
1773 @@ -3,7 +3,7 @@
1774
1775 EAPI=7
1776
1777 -inherit cmake-utils kodi-addon
1778 +inherit cmake kodi-addon
1779
1780 DESCRIPTION="Steam controller driver for Kodi"
1781 HOMEPAGE="https://github.com/kodi-game/peripheral.steamcontroller"
1782
1783 diff --git a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
1784 index 64d10d3212c..ac13610cbe2 100644
1785 --- a/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
1786 +++ b/media-plugins/kodi-pvr-argustv/kodi-pvr-argustv-9999.ebuild
1787 @@ -3,7 +3,7 @@
1788
1789 EAPI=7
1790
1791 -inherit cmake-utils kodi-addon
1792 +inherit cmake kodi-addon
1793
1794 DESCRIPTION="Kodi's ARGUS TV client addon"
1795 HOMEPAGE="https://github.com/kodi-pvr/pvr.argustv"
1796
1797 diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
1798 index 5a8fd989966..4ac4ff311b3 100644
1799 --- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
1800 +++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-3.6.1.ebuild
1801 @@ -3,7 +3,7 @@
1802
1803 EAPI=7
1804
1805 -inherit cmake-utils kodi-addon
1806 +inherit cmake kodi-addon
1807
1808 DESCRIPTION="Demo PVR for Kodi"
1809 HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
1810
1811 diff --git a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
1812 index 6d694e9aa2d..d6bd3b529c1 100644
1813 --- a/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
1814 +++ b/media-plugins/kodi-pvr-demo/kodi-pvr-demo-9999.ebuild
1815 @@ -3,7 +3,7 @@
1816
1817 EAPI=7
1818
1819 -inherit cmake-utils kodi-addon
1820 +inherit cmake kodi-addon
1821
1822 DESCRIPTION="Demo PVR for Kodi"
1823 HOMEPAGE="https://github.com/kodi-pvr/pvr.demo"
1824
1825 diff --git a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
1826 index dc3768c88ed..c0a254a79c5 100644
1827 --- a/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
1828 +++ b/media-plugins/kodi-pvr-dvblink/kodi-pvr-dvblink-9999.ebuild
1829 @@ -3,7 +3,7 @@
1830
1831 EAPI=7
1832
1833 -inherit cmake-utils kodi-addon
1834 +inherit cmake kodi-addon
1835
1836 DESCRIPTION="Kodi's DVBLink client addon"
1837 HOMEPAGE="https://github.com/kodi-pvr/pvr.dvblink"
1838
1839 diff --git a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
1840 index 0c4eb9081cd..581b837cc49 100644
1841 --- a/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
1842 +++ b/media-plugins/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer-9999.ebuild
1843 @@ -3,7 +3,7 @@
1844
1845 EAPI=7
1846
1847 -inherit cmake-utils kodi-addon
1848 +inherit cmake kodi-addon
1849
1850 DESCRIPTION="Kodi's DVBViewer client addon"
1851 HOMEPAGE="https://github.com/kodi-pvr/pvr.dvbviewer"
1852
1853 diff --git a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
1854 index c8a6715f02e..81465262967 100644
1855 --- a/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
1856 +++ b/media-plugins/kodi-pvr-filmon/kodi-pvr-filmon-9999.ebuild
1857 @@ -3,7 +3,7 @@
1858
1859 EAPI=7
1860
1861 -inherit cmake-utils kodi-addon
1862 +inherit cmake kodi-addon
1863
1864 DESCRIPTION="Kodi's Filmon client addon"
1865 HOMEPAGE="https://github.com/kodi-pvr/pvr.filmon"
1866
1867 diff --git a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
1868 index 2e9cd82c323..b4b0f32502b 100644
1869 --- a/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
1870 +++ b/media-plugins/kodi-pvr-hts/kodi-pvr-hts-9999.ebuild
1871 @@ -3,7 +3,7 @@
1872
1873 EAPI=7
1874
1875 -inherit cmake-utils kodi-addon
1876 +inherit cmake kodi-addon
1877
1878 DESCRIPTION="Tvheadend Live TV and Radio PVR client addon for Kodi"
1879 HOMEPAGE="https://github.com/kodi-pvr/pvr.hts"
1880
1881 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild
1882 index 939caa2844b..a049d98849a 100644
1883 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild
1884 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.1.ebuild
1885 @@ -3,7 +3,7 @@
1886
1887 EAPI=7
1888
1889 -inherit cmake-utils kodi-addon
1890 +inherit cmake kodi-addon
1891
1892 DESCRIPTION="Kodi's IPTVSimple client addon"
1893 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1894
1895 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild
1896 index 939caa2844b..a049d98849a 100644
1897 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild
1898 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.3.ebuild
1899 @@ -3,7 +3,7 @@
1900
1901 EAPI=7
1902
1903 -inherit cmake-utils kodi-addon
1904 +inherit cmake kodi-addon
1905
1906 DESCRIPTION="Kodi's IPTVSimple client addon"
1907 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1908
1909 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild
1910 index 939caa2844b..a049d98849a 100644
1911 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild
1912 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.4.ebuild
1913 @@ -3,7 +3,7 @@
1914
1915 EAPI=7
1916
1917 -inherit cmake-utils kodi-addon
1918 +inherit cmake kodi-addon
1919
1920 DESCRIPTION="Kodi's IPTVSimple client addon"
1921 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1922
1923 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild
1924 index 2fe768383e5..3a7648ae6ff 100644
1925 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild
1926 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.5.ebuild
1927 @@ -3,7 +3,7 @@
1928
1929 EAPI=7
1930
1931 -inherit cmake-utils kodi-addon
1932 +inherit cmake kodi-addon
1933
1934 DESCRIPTION="Kodi's IPTVSimple client addon"
1935 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1936 @@ -41,5 +41,5 @@ RDEPEND="
1937
1938 src_prepare(){
1939 [ -d depends ] && rm -rf depends || die
1940 - cmake-utils_src_prepare
1941 + cmake_src_prepare
1942 }
1943
1944 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild
1945 index 2fe768383e5..3a7648ae6ff 100644
1946 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild
1947 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.6.ebuild
1948 @@ -3,7 +3,7 @@
1949
1950 EAPI=7
1951
1952 -inherit cmake-utils kodi-addon
1953 +inherit cmake kodi-addon
1954
1955 DESCRIPTION="Kodi's IPTVSimple client addon"
1956 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1957 @@ -41,5 +41,5 @@ RDEPEND="
1958
1959 src_prepare(){
1960 [ -d depends ] && rm -rf depends || die
1961 - cmake-utils_src_prepare
1962 + cmake_src_prepare
1963 }
1964
1965 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild
1966 index 2fe768383e5..3a7648ae6ff 100644
1967 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild
1968 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.7.ebuild
1969 @@ -3,7 +3,7 @@
1970
1971 EAPI=7
1972
1973 -inherit cmake-utils kodi-addon
1974 +inherit cmake kodi-addon
1975
1976 DESCRIPTION="Kodi's IPTVSimple client addon"
1977 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1978 @@ -41,5 +41,5 @@ RDEPEND="
1979
1980 src_prepare(){
1981 [ -d depends ] && rm -rf depends || die
1982 - cmake-utils_src_prepare
1983 + cmake_src_prepare
1984 }
1985
1986 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
1987 index 2fe768383e5..3a7648ae6ff 100644
1988 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
1989 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-3.8.8.ebuild
1990 @@ -3,7 +3,7 @@
1991
1992 EAPI=7
1993
1994 -inherit cmake-utils kodi-addon
1995 +inherit cmake kodi-addon
1996
1997 DESCRIPTION="Kodi's IPTVSimple client addon"
1998 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
1999 @@ -41,5 +41,5 @@ RDEPEND="
2000
2001 src_prepare(){
2002 [ -d depends ] && rm -rf depends || die
2003 - cmake-utils_src_prepare
2004 + cmake_src_prepare
2005 }
2006
2007 diff --git a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
2008 index 50ce43f2a41..ca417deb565 100644
2009 --- a/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
2010 +++ b/media-plugins/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple-9999.ebuild
2011 @@ -3,7 +3,7 @@
2012
2013 EAPI=7
2014
2015 -inherit cmake-utils kodi-addon
2016 +inherit cmake kodi-addon
2017
2018 DESCRIPTION="Kodi's IPTVSimple client addon"
2019 HOMEPAGE="https://github.com/kodi-pvr/pvr.iptvsimple"
2020 @@ -41,5 +41,5 @@ RDEPEND="
2021
2022 src_prepare(){
2023 [ -d depends ] && rm -rf depends || die
2024 - cmake-utils_src_prepare
2025 + cmake_src_prepare
2026 }
2027
2028 diff --git a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
2029 index 7a797bda817..be92d13bcec 100644
2030 --- a/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
2031 +++ b/media-plugins/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver-9999.ebuild
2032 @@ -3,7 +3,7 @@
2033
2034 EAPI=7
2035
2036 -inherit cmake-utils kodi-addon
2037 +inherit cmake kodi-addon
2038
2039 DESCRIPTION="Kodi's MediaPortal TVServer client addon"
2040 HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
2041
2042 diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild
2043 index 4ff772b6927..169ab5d577a 100644
2044 --- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild
2045 +++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.11.ebuild
2046 @@ -3,7 +3,7 @@
2047
2048 EAPI=7
2049
2050 -inherit cmake-utils kodi-addon
2051 +inherit cmake kodi-addon
2052
2053 DESCRIPTION="MythTV PVR for Kodi"
2054 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
2055
2056 diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild
2057 index 4ff772b6927..169ab5d577a 100644
2058 --- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild
2059 +++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.12.ebuild
2060 @@ -3,7 +3,7 @@
2061
2062 EAPI=7
2063
2064 -inherit cmake-utils kodi-addon
2065 +inherit cmake kodi-addon
2066
2067 DESCRIPTION="MythTV PVR for Kodi"
2068 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
2069
2070 diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild
2071 index 4ff772b6927..169ab5d577a 100644
2072 --- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild
2073 +++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.13.ebuild
2074 @@ -3,7 +3,7 @@
2075
2076 EAPI=7
2077
2078 -inherit cmake-utils kodi-addon
2079 +inherit cmake kodi-addon
2080
2081 DESCRIPTION="MythTV PVR for Kodi"
2082 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
2083
2084 diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild
2085 index 4ff772b6927..169ab5d577a 100644
2086 --- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild
2087 +++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.14.ebuild
2088 @@ -3,7 +3,7 @@
2089
2090 EAPI=7
2091
2092 -inherit cmake-utils kodi-addon
2093 +inherit cmake kodi-addon
2094
2095 DESCRIPTION="MythTV PVR for Kodi"
2096 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
2097
2098 diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
2099 index 4ff772b6927..169ab5d577a 100644
2100 --- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
2101 +++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-5.10.9.ebuild
2102 @@ -3,7 +3,7 @@
2103
2104 EAPI=7
2105
2106 -inherit cmake-utils kodi-addon
2107 +inherit cmake kodi-addon
2108
2109 DESCRIPTION="MythTV PVR for Kodi"
2110 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
2111
2112 diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
2113 index f829825e052..7d7c00bce61 100644
2114 --- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
2115 +++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
2116 @@ -3,7 +3,7 @@
2117
2118 EAPI=7
2119
2120 -inherit cmake-utils kodi-addon
2121 +inherit cmake kodi-addon
2122
2123 DESCRIPTION="MythTV PVR for Kodi"
2124 HOMEPAGE="https://github.com/janbar/pvr.mythtv"
2125
2126 diff --git a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
2127 index 3055e0e7059..2754d05ee24 100644
2128 --- a/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
2129 +++ b/media-plugins/kodi-pvr-nextpvr/kodi-pvr-nextpvr-9999.ebuild
2130 @@ -3,7 +3,7 @@
2131
2132 EAPI=7
2133
2134 -inherit cmake-utils kodi-addon
2135 +inherit cmake kodi-addon
2136
2137 DESCRIPTION="Kodi's NextPVR client addon"
2138 HOMEPAGE="https://github.com/kodi-pvr/pvr.nextpvr"
2139
2140 diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
2141 index 7554c5d1aca..0b92ad8f0f3 100644
2142 --- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
2143 +++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-3.4.2.ebuild
2144 @@ -3,7 +3,7 @@
2145
2146 EAPI=7
2147
2148 -inherit cmake-utils kodi-addon
2149 +inherit cmake kodi-addon
2150
2151 DESCRIPTION="Kodi's Njoy N7 client addon"
2152 HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
2153
2154 diff --git a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
2155 index 959e619083e..615c455a8b6 100644
2156 --- a/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
2157 +++ b/media-plugins/kodi-pvr-njoy/kodi-pvr-njoy-9999.ebuild
2158 @@ -3,7 +3,7 @@
2159
2160 EAPI=7
2161
2162 -inherit cmake-utils kodi-addon
2163 +inherit cmake kodi-addon
2164
2165 DESCRIPTION="Kodi's Njoy N7 client addon"
2166 HOMEPAGE="https://github.com/kodi-pvr/pvr.njoy"
2167
2168 diff --git a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
2169 index c1d659d31e3..35866d578b8 100644
2170 --- a/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
2171 +++ b/media-plugins/kodi-pvr-pctv/kodi-pvr-pctv-9999.ebuild
2172 @@ -3,7 +3,7 @@
2173
2174 EAPI=7
2175
2176 -inherit cmake-utils kodi-addon
2177 +inherit cmake kodi-addon
2178
2179 DESCRIPTION="Kodi's PCTV client addon"
2180 HOMEPAGE="https://github.com/kodi-pvr/pvr.pctv"
2181
2182 diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
2183 index 9ae7e55f385..18a52f9739a 100644
2184 --- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
2185 +++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-3.4.10.ebuild
2186 @@ -3,7 +3,7 @@
2187
2188 EAPI=7
2189
2190 -inherit cmake-utils kodi-addon
2191 +inherit cmake kodi-addon
2192
2193 DESCRIPTION="Kodi's Stalker client addon"
2194 HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
2195 @@ -40,5 +40,5 @@ RDEPEND="
2196
2197 src_prepare(){
2198 [ -d depends ] && rm -rf depends || die
2199 - cmake-utils_src_prepare
2200 + cmake_src_prepare
2201 }
2202
2203 diff --git a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
2204 index ade1c39778f..1d87dde51fa 100644
2205 --- a/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
2206 +++ b/media-plugins/kodi-pvr-stalker/kodi-pvr-stalker-9999.ebuild
2207 @@ -3,7 +3,7 @@
2208
2209 EAPI=7
2210
2211 -inherit cmake-utils kodi-addon
2212 +inherit cmake kodi-addon
2213
2214 DESCRIPTION="Kodi's Stalker client addon"
2215 HOMEPAGE="https://github.com/kodi-pvr/pvr.stalker"
2216 @@ -40,5 +40,5 @@ RDEPEND="
2217
2218 src_prepare(){
2219 [ -d depends ] && rm -rf depends || die
2220 - cmake-utils_src_prepare
2221 + cmake_src_prepare
2222 }
2223
2224 diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
2225 index 6ba25eea26c..35a66ba98ea 100644
2226 --- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
2227 +++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.5.0.ebuild
2228 @@ -3,7 +3,7 @@
2229
2230 EAPI=7
2231
2232 -inherit cmake-utils kodi-addon
2233 +inherit cmake kodi-addon
2234
2235 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
2236 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
2237
2238 diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
2239 index 6ba25eea26c..35a66ba98ea 100644
2240 --- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
2241 +++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.6.0.ebuild
2242 @@ -3,7 +3,7 @@
2243
2244 EAPI=7
2245
2246 -inherit cmake-utils kodi-addon
2247 +inherit cmake kodi-addon
2248
2249 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
2250 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
2251
2252 diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
2253 index 6ba25eea26c..35a66ba98ea 100644
2254 --- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
2255 +++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-4.7.0.ebuild
2256 @@ -3,7 +3,7 @@
2257
2258 EAPI=7
2259
2260 -inherit cmake-utils kodi-addon
2261 +inherit cmake kodi-addon
2262
2263 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
2264 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
2265
2266 diff --git a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
2267 index f5b74f9b320..221c3cea94c 100644
2268 --- a/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
2269 +++ b/media-plugins/kodi-pvr-vbox/kodi-pvr-vbox-9999.ebuild
2270 @@ -3,7 +3,7 @@
2271
2272 EAPI=7
2273
2274 -inherit cmake-utils kodi-addon
2275 +inherit cmake kodi-addon
2276
2277 DESCRIPTION="Kodi's VBox Home TV Gateway PVR client addon"
2278 HOMEPAGE="https://github.com/kodi-pvr/pvr.vbox"
2279
2280 diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
2281 index ec16e30ef47..09464f4ac0a 100644
2282 --- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
2283 +++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-3.6.3-r1.ebuild
2284 @@ -3,7 +3,7 @@
2285
2286 EAPI=7
2287
2288 -inherit cmake-utils kodi-addon
2289 +inherit cmake kodi-addon
2290
2291 DESCRIPTION="Kodi PVR addon VNSI"
2292 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
2293
2294 diff --git a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
2295 index 1109235bfe7..716f391406a 100644
2296 --- a/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
2297 +++ b/media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
2298 @@ -3,7 +3,7 @@
2299
2300 EAPI=7
2301
2302 -inherit cmake-utils kodi-addon
2303 +inherit cmake kodi-addon
2304
2305 DESCRIPTION="Kodi PVR addon VNSI"
2306 HOMEPAGE="https://github.com/kodi-pvr/pvr.vdr.vnsi"
2307
2308 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
2309 index 1ff57c48226..46319247cfa 100644
2310 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
2311 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.0.ebuild
2312 @@ -3,7 +3,7 @@
2313
2314 EAPI=7
2315
2316 -inherit cmake-utils kodi-addon
2317 +inherit cmake kodi-addon
2318
2319 DESCRIPTION="Kodi's VuPlus client addon"
2320 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2321
2322 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild
2323 index 801998d4dad..be8a5457a7d 100644
2324 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild
2325 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.1.ebuild
2326 @@ -3,7 +3,7 @@
2327
2328 EAPI=7
2329
2330 -inherit cmake-utils kodi-addon
2331 +inherit cmake kodi-addon
2332
2333 DESCRIPTION="Kodi's VuPlus client addon"
2334 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2335 @@ -40,5 +40,5 @@ RDEPEND="
2336
2337 src_prepare(){
2338 [ -d depends ] && rm -rf depends || die
2339 - cmake-utils_src_prepare
2340 + cmake_src_prepare
2341 }
2342
2343 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild
2344 index 801998d4dad..be8a5457a7d 100644
2345 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild
2346 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.2.ebuild
2347 @@ -3,7 +3,7 @@
2348
2349 EAPI=7
2350
2351 -inherit cmake-utils kodi-addon
2352 +inherit cmake kodi-addon
2353
2354 DESCRIPTION="Kodi's VuPlus client addon"
2355 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2356 @@ -40,5 +40,5 @@ RDEPEND="
2357
2358 src_prepare(){
2359 [ -d depends ] && rm -rf depends || die
2360 - cmake-utils_src_prepare
2361 + cmake_src_prepare
2362 }
2363
2364 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild
2365 index 801998d4dad..be8a5457a7d 100644
2366 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild
2367 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.4.ebuild
2368 @@ -3,7 +3,7 @@
2369
2370 EAPI=7
2371
2372 -inherit cmake-utils kodi-addon
2373 +inherit cmake kodi-addon
2374
2375 DESCRIPTION="Kodi's VuPlus client addon"
2376 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2377 @@ -40,5 +40,5 @@ RDEPEND="
2378
2379 src_prepare(){
2380 [ -d depends ] && rm -rf depends || die
2381 - cmake-utils_src_prepare
2382 + cmake_src_prepare
2383 }
2384
2385 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild
2386 index 801998d4dad..be8a5457a7d 100644
2387 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild
2388 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.5.ebuild
2389 @@ -3,7 +3,7 @@
2390
2391 EAPI=7
2392
2393 -inherit cmake-utils kodi-addon
2394 +inherit cmake kodi-addon
2395
2396 DESCRIPTION="Kodi's VuPlus client addon"
2397 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2398 @@ -40,5 +40,5 @@ RDEPEND="
2399
2400 src_prepare(){
2401 [ -d depends ] && rm -rf depends || die
2402 - cmake-utils_src_prepare
2403 + cmake_src_prepare
2404 }
2405
2406 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild
2407 index 801998d4dad..be8a5457a7d 100644
2408 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild
2409 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.6.ebuild
2410 @@ -3,7 +3,7 @@
2411
2412 EAPI=7
2413
2414 -inherit cmake-utils kodi-addon
2415 +inherit cmake kodi-addon
2416
2417 DESCRIPTION="Kodi's VuPlus client addon"
2418 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2419 @@ -40,5 +40,5 @@ RDEPEND="
2420
2421 src_prepare(){
2422 [ -d depends ] && rm -rf depends || die
2423 - cmake-utils_src_prepare
2424 + cmake_src_prepare
2425 }
2426
2427 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild
2428 index 801998d4dad..be8a5457a7d 100644
2429 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild
2430 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.7.ebuild
2431 @@ -3,7 +3,7 @@
2432
2433 EAPI=7
2434
2435 -inherit cmake-utils kodi-addon
2436 +inherit cmake kodi-addon
2437
2438 DESCRIPTION="Kodi's VuPlus client addon"
2439 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2440 @@ -40,5 +40,5 @@ RDEPEND="
2441
2442 src_prepare(){
2443 [ -d depends ] && rm -rf depends || die
2444 - cmake-utils_src_prepare
2445 + cmake_src_prepare
2446 }
2447
2448 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild
2449 index 801998d4dad..be8a5457a7d 100644
2450 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild
2451 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.8.ebuild
2452 @@ -3,7 +3,7 @@
2453
2454 EAPI=7
2455
2456 -inherit cmake-utils kodi-addon
2457 +inherit cmake kodi-addon
2458
2459 DESCRIPTION="Kodi's VuPlus client addon"
2460 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2461 @@ -40,5 +40,5 @@ RDEPEND="
2462
2463 src_prepare(){
2464 [ -d depends ] && rm -rf depends || die
2465 - cmake-utils_src_prepare
2466 + cmake_src_prepare
2467 }
2468
2469 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild
2470 index 801998d4dad..be8a5457a7d 100644
2471 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild
2472 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-3.28.9.ebuild
2473 @@ -3,7 +3,7 @@
2474
2475 EAPI=7
2476
2477 -inherit cmake-utils kodi-addon
2478 +inherit cmake kodi-addon
2479
2480 DESCRIPTION="Kodi's VuPlus client addon"
2481 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2482 @@ -40,5 +40,5 @@ RDEPEND="
2483
2484 src_prepare(){
2485 [ -d depends ] && rm -rf depends || die
2486 - cmake-utils_src_prepare
2487 + cmake_src_prepare
2488 }
2489
2490 diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
2491 index 95ea1713a67..8eaf874d45a 100644
2492 --- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
2493 +++ b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
2494 @@ -3,7 +3,7 @@
2495
2496 EAPI=7
2497
2498 -inherit cmake-utils kodi-addon
2499 +inherit cmake kodi-addon
2500
2501 DESCRIPTION="Kodi's VuPlus client addon"
2502 HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
2503 @@ -40,5 +40,5 @@ RDEPEND="
2504
2505 src_prepare(){
2506 [ -d depends ] && rm -rf depends || die
2507 - cmake-utils_src_prepare
2508 + cmake_src_prepare
2509 }
2510
2511 diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild
2512 index 353ea5eb850..2108dfb0e13 100644
2513 --- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild
2514 +++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-2.4.5.ebuild
2515 @@ -3,7 +3,7 @@
2516
2517 EAPI=7
2518
2519 -inherit cmake-utils kodi-addon
2520 +inherit cmake kodi-addon
2521
2522 DESCRIPTION="Kodi's Windows Media Center client addon"
2523 HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
2524
2525 diff --git a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
2526 index 60b21dc3a53..a27ba1b2084 100644
2527 --- a/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
2528 +++ b/media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
2529 @@ -3,7 +3,7 @@
2530
2531 EAPI=7
2532
2533 -inherit cmake-utils kodi-addon
2534 +inherit cmake kodi-addon
2535
2536 DESCRIPTION="Kodi's Windows Media Center client addon"
2537 HOMEPAGE="https://github.com/kodi-pvr/pvr.wmc"
2538
2539 diff --git a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
2540 index e3614ec88ae..048241cae25 100644
2541 --- a/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
2542 +++ b/media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-9999.ebuild
2543 @@ -3,7 +3,7 @@
2544
2545 EAPI=7
2546
2547 -inherit cmake-utils kodi-addon
2548 +inherit cmake kodi-addon
2549
2550 DESCRIPTION="Asteroids screensaver for Kodi"
2551 HOMEPAGE="https://github.com/xbmc/screensaver.asteroids"
2552
2553 diff --git a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
2554 index 01b0cdea74f..995c894beca 100644
2555 --- a/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
2556 +++ b/media-plugins/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis-9999.ebuild
2557 @@ -3,7 +3,7 @@
2558
2559 EAPI=7
2560
2561 -inherit cmake-utils kodi-addon
2562 +inherit cmake kodi-addon
2563
2564 DESCRIPTION="Biogenesis screensaver for Kodi"
2565 HOMEPAGE="https://github.com/xbmc/screensaver.biogenesis"
2566
2567 diff --git a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
2568 index 67b977f36ca..0fb40f3eaff 100644
2569 --- a/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
2570 +++ b/media-plugins/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph-9999.ebuild
2571 @@ -3,7 +3,7 @@
2572
2573 EAPI=7
2574
2575 -inherit cmake-utils kodi-addon
2576 +inherit cmake kodi-addon
2577
2578 DESCRIPTION="Crystalmorph screensaver for Kodi"
2579 HOMEPAGE="https://github.com/notspiff/screensaver.crystalmorph"
2580
2581 diff --git a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
2582 index f312ca7ebc2..11b4b17da59 100644
2583 --- a/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
2584 +++ b/media-plugins/kodi-screensaver-greynetic/kodi-screensaver-greynetic-9999.ebuild
2585 @@ -3,7 +3,7 @@
2586
2587 EAPI=7
2588
2589 -inherit cmake-utils kodi-addon
2590 +inherit cmake kodi-addon
2591
2592 DESCRIPTION="Greynetic screensaver for Kodi"
2593 HOMEPAGE="https://github.com/xbmc/screensaver.greynetic"
2594
2595 diff --git a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
2596 index 41a80f39ef0..db29d19e955 100644
2597 --- a/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
2598 +++ b/media-plugins/kodi-screensaver-pingpong/kodi-screensaver-pingpong-9999.ebuild
2599 @@ -3,7 +3,7 @@
2600
2601 EAPI=7
2602
2603 -inherit cmake-utils kodi-addon
2604 +inherit cmake kodi-addon
2605
2606 DESCRIPTION="Ping-pong screensaver for Kodi"
2607 HOMEPAGE="https://github.com/xbmc/screensaver.pingpong"
2608
2609 diff --git a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
2610 index 7caf62b1562..1797ba86d6f 100644
2611 --- a/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
2612 +++ b/media-plugins/kodi-screensaver-pyro/kodi-screensaver-pyro-9999.ebuild
2613 @@ -3,7 +3,7 @@
2614
2615 EAPI=7
2616
2617 -inherit cmake-utils kodi-addon
2618 +inherit cmake kodi-addon
2619
2620 DESCRIPTION="Pyro screensaver for Kodi"
2621 HOMEPAGE="https://github.com/xbmc/screensaver.pyro"
2622
2623 diff --git a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
2624 index 4ffc1f4f3c8..38382a4ce4f 100644
2625 --- a/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
2626 +++ b/media-plugins/kodi-screensaver-rsxs/kodi-screensaver-rsxs-9999.ebuild
2627 @@ -3,7 +3,7 @@
2628
2629 EAPI=7
2630
2631 -inherit cmake-utils kodi-addon
2632 +inherit cmake kodi-addon
2633
2634 DESCRIPTION="RSXS screensaver for Kodi"
2635 HOMEPAGE="https://github.com/notspiff/screensavers.rsxs"
2636
2637 diff --git a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
2638 index d38dfe7343f..50952f01d39 100644
2639 --- a/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
2640 +++ b/media-plugins/kodi-vfs-libarchive/kodi-vfs-libarchive-9999.ebuild
2641 @@ -3,7 +3,7 @@
2642
2643 EAPI=7
2644
2645 -inherit cmake-utils kodi-addon
2646 +inherit cmake kodi-addon
2647
2648 DESCRIPTION="Libarchive VFS add-on for Kodi"
2649 HOMEPAGE="https://github.com/xbmc/vfs.libarchive"
2650
2651 diff --git a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
2652 index 0e1a57116e6..666e051a2f4 100644
2653 --- a/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
2654 +++ b/media-plugins/kodi-vfs-rar/kodi-vfs-rar-9999.ebuild
2655 @@ -3,7 +3,7 @@
2656
2657 EAPI=7
2658
2659 -inherit cmake-utils kodi-addon
2660 +inherit cmake kodi-addon
2661
2662 DESCRIPTION="RAR VFS addon for Kodi"
2663 HOMEPAGE="https://github.com/xbmc/vfs.rar"
2664
2665 diff --git a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
2666 index a5726083a31..1bfb150aa72 100644
2667 --- a/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
2668 +++ b/media-plugins/kodi-vfs-sacd/kodi-vfs-sacd-9999.ebuild
2669 @@ -3,7 +3,7 @@
2670
2671 EAPI=7
2672
2673 -inherit cmake-utils kodi-addon
2674 +inherit cmake kodi-addon
2675
2676 DESCRIPTION="SACD VFS addon for Kodi"
2677 HOMEPAGE="https://github.com/xbmc/vfs.sacd"
2678
2679 diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild
2680 index 0c002b5c684..c4f365ebbf1 100644
2681 --- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild
2682 +++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-1.0.3.ebuild
2683 @@ -3,7 +3,7 @@
2684
2685 EAPI=7
2686
2687 -inherit cmake-utils kodi-addon
2688 +inherit cmake kodi-addon
2689
2690 DESCRIPTION="SFTP VFS addon for Kodi"
2691 HOMEPAGE="https://github.com/xbmc/vfs.sftp"
2692 @@ -36,5 +36,5 @@ DEPEND="
2693
2694 src_prepare(){
2695 [ -d depends ] && rm -rf depends || die
2696 - cmake-utils_src_prepare
2697 + cmake_src_prepare
2698 }
2699
2700 diff --git a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
2701 index 3b97cecb2fb..478d045ff69 100644
2702 --- a/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
2703 +++ b/media-plugins/kodi-vfs-sftp/kodi-vfs-sftp-9999.ebuild
2704 @@ -3,7 +3,7 @@
2705
2706 EAPI=7
2707
2708 -inherit cmake-utils kodi-addon
2709 +inherit cmake kodi-addon
2710
2711 DESCRIPTION="SFTP VFS addon for Kodi"
2712 HOMEPAGE="https://github.com/xbmc/vfs.sftp"
2713 @@ -36,5 +36,5 @@ DEPEND="
2714
2715 src_prepare(){
2716 [ -d depends ] && rm -rf depends || die
2717 - cmake-utils_src_prepare
2718 + cmake_src_prepare
2719 }
2720
2721 diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild
2722 index 017ed11f663..18d2746f752 100644
2723 --- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild
2724 +++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.1.ebuild
2725 @@ -3,7 +3,7 @@
2726
2727 EAPI=7
2728
2729 -inherit cmake-utils kodi-addon
2730 +inherit cmake kodi-addon
2731
2732 DESCRIPTION="Fische visualizer for Kodi"
2733 HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
2734 @@ -39,5 +39,5 @@ RDEPEND="
2735
2736 src_prepare(){
2737 [ -d depends ] && rm -rf depends || die
2738 - cmake-utils_src_prepare
2739 + cmake_src_prepare
2740 }
2741
2742 diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
2743 index 017ed11f663..18d2746f752 100644
2744 --- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
2745 +++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-5.1.2.ebuild
2746 @@ -3,7 +3,7 @@
2747
2748 EAPI=7
2749
2750 -inherit cmake-utils kodi-addon
2751 +inherit cmake kodi-addon
2752
2753 DESCRIPTION="Fische visualizer for Kodi"
2754 HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
2755 @@ -39,5 +39,5 @@ RDEPEND="
2756
2757 src_prepare(){
2758 [ -d depends ] && rm -rf depends || die
2759 - cmake-utils_src_prepare
2760 + cmake_src_prepare
2761 }
2762
2763 diff --git a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
2764 index b59240f9c3e..30288178ef8 100644
2765 --- a/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
2766 +++ b/media-plugins/kodi-visualization-fishbmc/kodi-visualization-fishbmc-9999.ebuild
2767 @@ -3,7 +3,7 @@
2768
2769 EAPI=7
2770
2771 -inherit cmake-utils kodi-addon
2772 +inherit cmake kodi-addon
2773
2774 DESCRIPTION="Fische visualizer for Kodi"
2775 HOMEPAGE="https://github.com/notspiff/visualization.fishbmc"
2776 @@ -39,5 +39,5 @@ RDEPEND="
2777
2778 src_prepare(){
2779 [ -d depends ] && rm -rf depends || die
2780 - cmake-utils_src_prepare
2781 + cmake_src_prepare
2782 }
2783
2784 diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild
2785 index b7231cfeac9..bf3ef6feb06 100644
2786 --- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild
2787 +++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-2.1.0.ebuild
2788 @@ -3,7 +3,7 @@
2789
2790 EAPI=7
2791
2792 -inherit cmake-utils kodi-addon
2793 +inherit cmake kodi-addon
2794
2795 DESCRIPTION="Goom visualizer for Kodi"
2796 HOMEPAGE="https://github.com/notspiff/visualization.goom"
2797
2798 diff --git a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
2799 index 78e5ee68bb1..29b891796cc 100644
2800 --- a/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
2801 +++ b/media-plugins/kodi-visualization-goom/kodi-visualization-goom-9999.ebuild
2802 @@ -3,7 +3,7 @@
2803
2804 EAPI=7
2805
2806 -inherit cmake-utils kodi-addon
2807 +inherit cmake kodi-addon
2808
2809 DESCRIPTION="Goom visualizer for Kodi"
2810 HOMEPAGE="https://github.com/notspiff/visualization.goom"
2811
2812 diff --git a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
2813 index 23fd5802f06..d2a90ef0f7b 100644
2814 --- a/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
2815 +++ b/media-plugins/kodi-visualization-nastyfft/kodi-visualization-nastyfft-9999.ebuild
2816 @@ -3,7 +3,7 @@
2817
2818 EAPI=7
2819
2820 -inherit cmake-utils kodi-addon
2821 +inherit cmake kodi-addon
2822
2823 DESCRIPTION="NastyFFT visualizer for Kodi"
2824 HOMEPAGE="https://github.com/notspiff/visualization.nastyfft"
2825
2826 diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild
2827 index 42a3197de6e..8fa58b99e3c 100644
2828 --- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild
2829 +++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-2.3.4.ebuild
2830 @@ -3,7 +3,7 @@
2831
2832 EAPI=7
2833
2834 -inherit cmake-utils kodi-addon
2835 +inherit cmake kodi-addon
2836
2837 DESCRIPTION="ProjectM visualizer for Kodi"
2838 HOMEPAGE="https://github.com/xbmc/visualization.projectm"
2839 @@ -41,5 +41,5 @@ RDEPEND="
2840
2841 src_prepare(){
2842 [ -d depends ] && rm -rf depends || die
2843 - cmake-utils_src_prepare
2844 + cmake_src_prepare
2845 }
2846
2847 diff --git a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
2848 index adfc10b6a65..82731cd5a9b 100644
2849 --- a/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
2850 +++ b/media-plugins/kodi-visualization-projectm/kodi-visualization-projectm-9999.ebuild
2851 @@ -3,7 +3,7 @@
2852
2853 EAPI=7
2854
2855 -inherit cmake-utils kodi-addon
2856 +inherit cmake kodi-addon
2857
2858 DESCRIPTION="ProjectM visualizer for Kodi"
2859 HOMEPAGE="https://github.com/xbmc/visualization.projectm"
2860 @@ -41,5 +41,5 @@ RDEPEND="
2861
2862 src_prepare(){
2863 [ -d depends ] && rm -rf depends || die
2864 - cmake-utils_src_prepare
2865 + cmake_src_prepare
2866 }
2867
2868 diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild
2869 index f6d47540675..282d8e5f62c 100644
2870 --- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild
2871 +++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.1.ebuild
2872 @@ -3,7 +3,7 @@
2873
2874 EAPI=7
2875
2876 -inherit cmake-utils kodi-addon
2877 +inherit cmake kodi-addon
2878
2879 DESCRIPTION="Shadertoy visualizer for Kodi"
2880 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
2881 @@ -40,5 +40,5 @@ RDEPEND="
2882
2883 src_prepare(){
2884 [ -d depends ] && rm -rf depends || die
2885 - cmake-utils_src_prepare
2886 + cmake_src_prepare
2887 }
2888
2889 diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild
2890 index f6d47540675..282d8e5f62c 100644
2891 --- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild
2892 +++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.2.ebuild
2893 @@ -3,7 +3,7 @@
2894
2895 EAPI=7
2896
2897 -inherit cmake-utils kodi-addon
2898 +inherit cmake kodi-addon
2899
2900 DESCRIPTION="Shadertoy visualizer for Kodi"
2901 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
2902 @@ -40,5 +40,5 @@ RDEPEND="
2903
2904 src_prepare(){
2905 [ -d depends ] && rm -rf depends || die
2906 - cmake-utils_src_prepare
2907 + cmake_src_prepare
2908 }
2909
2910 diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild
2911 index 9638fe3c34c..d0055d3d7d6 100644
2912 --- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild
2913 +++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-1.2.3.ebuild
2914 @@ -3,7 +3,7 @@
2915
2916 EAPI=7
2917
2918 -inherit cmake-utils kodi-addon
2919 +inherit cmake kodi-addon
2920
2921 DESCRIPTION="Shadertoy visualizer for Kodi"
2922 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
2923 @@ -40,5 +40,5 @@ RDEPEND="
2924
2925 src_prepare(){
2926 [ -d depends ] && rm -rf depends || die
2927 - cmake-utils_src_prepare
2928 + cmake_src_prepare
2929 }
2930
2931 diff --git a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
2932 index ee3175563ed..4fe84742983 100644
2933 --- a/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
2934 +++ b/media-plugins/kodi-visualization-shadertoy/kodi-visualization-shadertoy-9999.ebuild
2935 @@ -3,7 +3,7 @@
2936
2937 EAPI=7
2938
2939 -inherit cmake-utils kodi-addon
2940 +inherit cmake kodi-addon
2941
2942 DESCRIPTION="Shadertoy visualizer for Kodi"
2943 HOMEPAGE="https://github.com/xbmc/visualization.shadertoy"
2944 @@ -40,5 +40,5 @@ RDEPEND="
2945
2946 src_prepare(){
2947 [ -d depends ] && rm -rf depends || die
2948 - cmake-utils_src_prepare
2949 + cmake_src_prepare
2950 }
2951
2952 diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild
2953 index 98ac664f5bc..a4662f53e1f 100644
2954 --- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild
2955 +++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.0.ebuild
2956 @@ -3,7 +3,7 @@
2957
2958 EAPI=7
2959
2960 -inherit cmake-utils kodi-addon
2961 +inherit cmake kodi-addon
2962
2963 DESCRIPTION="Spectrum visualizer for Kodi"
2964 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
2965 @@ -39,5 +39,5 @@ RDEPEND="
2966
2967 src_prepare(){
2968 [ -d depends ] && rm -rf depends || die
2969 - cmake-utils_src_prepare
2970 + cmake_src_prepare
2971 }
2972
2973 diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild
2974 index 98ac664f5bc..a4662f53e1f 100644
2975 --- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild
2976 +++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.1.ebuild
2977 @@ -3,7 +3,7 @@
2978
2979 EAPI=7
2980
2981 -inherit cmake-utils kodi-addon
2982 +inherit cmake kodi-addon
2983
2984 DESCRIPTION="Spectrum visualizer for Kodi"
2985 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
2986 @@ -39,5 +39,5 @@ RDEPEND="
2987
2988 src_prepare(){
2989 [ -d depends ] && rm -rf depends || die
2990 - cmake-utils_src_prepare
2991 + cmake_src_prepare
2992 }
2993
2994 diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild
2995 index 98ac664f5bc..a4662f53e1f 100644
2996 --- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild
2997 +++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-3.0.2.ebuild
2998 @@ -3,7 +3,7 @@
2999
3000 EAPI=7
3001
3002 -inherit cmake-utils kodi-addon
3003 +inherit cmake kodi-addon
3004
3005 DESCRIPTION="Spectrum visualizer for Kodi"
3006 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
3007 @@ -39,5 +39,5 @@ RDEPEND="
3008
3009 src_prepare(){
3010 [ -d depends ] && rm -rf depends || die
3011 - cmake-utils_src_prepare
3012 + cmake_src_prepare
3013 }
3014
3015 diff --git a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
3016 index 122892d0031..9af6e1f7f11 100644
3017 --- a/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
3018 +++ b/media-plugins/kodi-visualization-spectrum/kodi-visualization-spectrum-9999.ebuild
3019 @@ -3,7 +3,7 @@
3020
3021 EAPI=7
3022
3023 -inherit cmake-utils kodi-addon
3024 +inherit cmake kodi-addon
3025
3026 DESCRIPTION="Spectrum visualizer for Kodi"
3027 HOMEPAGE="https://github.com/xbmc/visualization.spectrum"
3028 @@ -39,5 +39,5 @@ RDEPEND="
3029
3030 src_prepare(){
3031 [ -d depends ] && rm -rf depends || die
3032 - cmake-utils_src_prepare
3033 + cmake_src_prepare
3034 }
3035
3036 diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild
3037 index 6752d8e6f65..90b24db6491 100644
3038 --- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild
3039 +++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.0.ebuild
3040 @@ -3,7 +3,7 @@
3041
3042 EAPI=7
3043
3044 -inherit cmake-utils kodi-addon
3045 +inherit cmake kodi-addon
3046
3047 DESCRIPTION="StarBurst visualizer for Kodi"
3048 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
3049
3050 diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild
3051 index df8814dad80..75eff173409 100644
3052 --- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild
3053 +++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.1.ebuild
3054 @@ -3,7 +3,7 @@
3055
3056 EAPI=7
3057
3058 -inherit cmake-utils kodi-addon
3059 +inherit cmake kodi-addon
3060
3061 DESCRIPTION="StarBurst visualizer for Kodi"
3062 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
3063 @@ -39,5 +39,5 @@ RDEPEND="
3064
3065 src_prepare(){
3066 [ -d depends ] && rm -rf depends || die
3067 - cmake-utils_src_prepare
3068 + cmake_src_prepare
3069 }
3070
3071 diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild
3072 index df8814dad80..75eff173409 100644
3073 --- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild
3074 +++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-2.0.2.ebuild
3075 @@ -3,7 +3,7 @@
3076
3077 EAPI=7
3078
3079 -inherit cmake-utils kodi-addon
3080 +inherit cmake kodi-addon
3081
3082 DESCRIPTION="StarBurst visualizer for Kodi"
3083 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
3084 @@ -39,5 +39,5 @@ RDEPEND="
3085
3086 src_prepare(){
3087 [ -d depends ] && rm -rf depends || die
3088 - cmake-utils_src_prepare
3089 + cmake_src_prepare
3090 }
3091
3092 diff --git a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
3093 index 12d4d851261..bb33f5a4c03 100644
3094 --- a/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
3095 +++ b/media-plugins/kodi-visualization-starburst/kodi-visualization-starburst-9999.ebuild
3096 @@ -3,7 +3,7 @@
3097
3098 EAPI=7
3099
3100 -inherit cmake-utils kodi-addon
3101 +inherit cmake kodi-addon
3102
3103 DESCRIPTION="StarBurst visualizer for Kodi"
3104 HOMEPAGE="https://github.com/notspiff/visualization.starburst"
3105 @@ -39,5 +39,5 @@ RDEPEND="
3106
3107 src_prepare(){
3108 [ -d depends ] && rm -rf depends || die
3109 - cmake-utils_src_prepare
3110 + cmake_src_prepare
3111 }
3112
3113 diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild
3114 index 76374bb700d..7e98a09050c 100644
3115 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild
3116 +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.0.2.ebuild
3117 @@ -3,7 +3,7 @@
3118
3119 EAPI=7
3120
3121 -inherit cmake-utils kodi-addon
3122 +inherit cmake kodi-addon
3123
3124 DESCRIPTION="Waveform visualizer for Kodi"
3125 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
3126 @@ -39,5 +39,5 @@ RDEPEND="
3127
3128 src_prepare(){
3129 [ -d depends ] && rm -rf depends || die
3130 - cmake-utils_src_prepare
3131 + cmake_src_prepare
3132 }
3133
3134 diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild
3135 index 76374bb700d..7e98a09050c 100644
3136 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild
3137 +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.0.ebuild
3138 @@ -3,7 +3,7 @@
3139
3140 EAPI=7
3141
3142 -inherit cmake-utils kodi-addon
3143 +inherit cmake kodi-addon
3144
3145 DESCRIPTION="Waveform visualizer for Kodi"
3146 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
3147 @@ -39,5 +39,5 @@ RDEPEND="
3148
3149 src_prepare(){
3150 [ -d depends ] && rm -rf depends || die
3151 - cmake-utils_src_prepare
3152 + cmake_src_prepare
3153 }
3154
3155 diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild
3156 index 76374bb700d..7e98a09050c 100644
3157 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild
3158 +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-3.1.1.ebuild
3159 @@ -3,7 +3,7 @@
3160
3161 EAPI=7
3162
3163 -inherit cmake-utils kodi-addon
3164 +inherit cmake kodi-addon
3165
3166 DESCRIPTION="Waveform visualizer for Kodi"
3167 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
3168 @@ -39,5 +39,5 @@ RDEPEND="
3169
3170 src_prepare(){
3171 [ -d depends ] && rm -rf depends || die
3172 - cmake-utils_src_prepare
3173 + cmake_src_prepare
3174 }
3175
3176 diff --git a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
3177 index 233dd1c4531..a5b8bc69ff3 100644
3178 --- a/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
3179 +++ b/media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
3180 @@ -3,7 +3,7 @@
3181
3182 EAPI=7
3183
3184 -inherit cmake-utils kodi-addon
3185 +inherit cmake kodi-addon
3186
3187 DESCRIPTION="Waveform visualizer for Kodi"
3188 HOMEPAGE="https://github.com/xbmc/visualization.waveform"
3189 @@ -39,5 +39,5 @@ RDEPEND="
3190
3191 src_prepare(){
3192 [ -d depends ] && rm -rf depends || die
3193 - cmake-utils_src_prepare
3194 + cmake_src_prepare
3195 }
3196
3197 diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
3198 index 477b728c91b..e85f952ab5a 100644
3199 --- a/media-tv/kodi/kodi-18.3-r1.ebuild
3200 +++ b/media-tv/kodi/kodi-18.3-r1.ebuild
3201 @@ -31,7 +31,7 @@ else
3202 S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
3203 fi
3204
3205 -inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
3206 +inherit autotools cmake eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
3207
3208 DESCRIPTION="A free and open source media-player and entertainment hub"
3209 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
3210 @@ -191,7 +191,7 @@ src_unpack() {
3211 }
3212
3213 src_prepare() {
3214 - cmake-utils_src_prepare
3215 + cmake_src_prepare
3216
3217 # avoid long delays when powerkit isn't running #348580
3218 sed -i \
3219 @@ -291,19 +291,19 @@ src_configure() {
3220 mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
3221 fi
3222
3223 - cmake-utils_src_configure
3224 + cmake_src_configure
3225 }
3226
3227 src_compile() {
3228 - cmake-utils_src_compile all
3229 + cmake_src_compile all
3230 }
3231
3232 src_test() {
3233 - cmake-utils_src_make check
3234 + cmake_build check
3235 }
3236
3237 src_install() {
3238 - cmake-utils_src_install
3239 + cmake_src_install
3240
3241 pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
3242
3243
3244 diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4.ebuild
3245 index d0bde5b7f3d..06da8e68ebf 100644
3246 --- a/media-tv/kodi/kodi-18.4.ebuild
3247 +++ b/media-tv/kodi/kodi-18.4.ebuild
3248 @@ -34,7 +34,7 @@ else
3249 S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
3250 fi
3251
3252 -inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
3253 +inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
3254
3255 DESCRIPTION="A free and open source media-player and entertainment hub"
3256 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
3257 @@ -194,7 +194,7 @@ src_unpack() {
3258 }
3259
3260 src_prepare() {
3261 - cmake-utils_src_prepare
3262 + cmake_src_prepare
3263
3264 # avoid long delays when powerkit isn't running #348580
3265 sed -i \
3266 @@ -294,19 +294,19 @@ src_configure() {
3267 mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
3268 fi
3269
3270 - cmake-utils_src_configure
3271 + cmake_src_configure
3272 }
3273
3274 src_compile() {
3275 - cmake-utils_src_compile all
3276 + cmake_src_compile all
3277 }
3278
3279 src_test() {
3280 - cmake-utils_src_make check
3281 + cmake_build check
3282 }
3283
3284 src_install() {
3285 - cmake-utils_src_install
3286 + cmake_src_install
3287
3288 pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
3289
3290
3291 diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild b/media-tv/kodi/kodi-18.5-r1.ebuild
3292 index 8432426e3c3..0cf08af3545 100644
3293 --- a/media-tv/kodi/kodi-18.5-r1.ebuild
3294 +++ b/media-tv/kodi/kodi-18.5-r1.ebuild
3295 @@ -34,7 +34,7 @@ else
3296 S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
3297 fi
3298
3299 -inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
3300 +inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
3301
3302 DESCRIPTION="A free and open source media-player and entertainment hub"
3303 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
3304 @@ -194,7 +194,7 @@ src_unpack() {
3305 }
3306
3307 src_prepare() {
3308 - cmake-utils_src_prepare
3309 + cmake_src_prepare
3310
3311 # avoid long delays when powerkit isn't running #348580
3312 sed -i \
3313 @@ -293,19 +293,19 @@ src_configure() {
3314 mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
3315 fi
3316
3317 - cmake-utils_src_configure
3318 + cmake_src_configure
3319 }
3320
3321 src_compile() {
3322 - cmake-utils_src_compile all
3323 + cmake_src_compile all
3324 }
3325
3326 src_test() {
3327 - cmake-utils_src_make check
3328 + cmake_build check
3329 }
3330
3331 src_install() {
3332 - cmake-utils_src_install
3333 + cmake_src_install
3334
3335 pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
3336
3337
3338 diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
3339 index 5c2e185500a..2dc5a2981e1 100644
3340 --- a/media-tv/kodi/kodi-9999.ebuild
3341 +++ b/media-tv/kodi/kodi-9999.ebuild
3342 @@ -29,7 +29,7 @@ else
3343 S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
3344 fi
3345
3346 -inherit autotools cmake-utils desktop linux-info pax-utils python-single-r1 xdg
3347 +inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
3348
3349 DESCRIPTION="A free and open source media-player and entertainment hub"
3350 HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
3351 @@ -181,7 +181,7 @@ src_unpack() {
3352 }
3353
3354 src_prepare() {
3355 - cmake-utils_src_prepare
3356 + cmake_src_prepare
3357
3358 # avoid long delays when powerkit isn't running #348580
3359 sed -i \
3360 @@ -281,19 +281,19 @@ src_configure() {
3361 )
3362 fi
3363
3364 - cmake-utils_src_configure
3365 + cmake_src_configure
3366 }
3367
3368 src_compile() {
3369 - cmake-utils_src_compile all
3370 + cmake_src_compile all
3371 }
3372
3373 src_test() {
3374 - cmake-utils_src_make check
3375 + cmake_build check
3376 }
3377
3378 src_install() {
3379 - cmake-utils_src_install
3380 + cmake_src_install
3381
3382 pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
3383
3384
3385 diff --git a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
3386 index 82c8375e72b..03aecea14f7 100644
3387 --- a/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
3388 +++ b/net-libs/nghttp3/nghttp3-0_pre20190912.ebuild
3389 @@ -3,6 +3,7 @@
3390
3391 EAPI=7
3392
3393 +CMAKE_ECLASS=cmake
3394 inherit cmake-multilib
3395
3396 if [[ ${PV} == 9999 ]] ; then
3397 @@ -33,9 +34,9 @@ multilib_src_configure() {
3398 -DENABLE_EXAMPLES=OFF
3399 -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
3400 )
3401 - cmake-utils_src_configure
3402 + cmake_src_configure
3403 }
3404
3405 multilib_src_test() {
3406 - cmake-utils_src_make check
3407 + cmake_build check
3408 }
3409
3410 diff --git a/net-libs/nghttp3/nghttp3-9999.ebuild b/net-libs/nghttp3/nghttp3-9999.ebuild
3411 index 7df7eb88b3a..d6e17cdeb22 100644
3412 --- a/net-libs/nghttp3/nghttp3-9999.ebuild
3413 +++ b/net-libs/nghttp3/nghttp3-9999.ebuild
3414 @@ -3,6 +3,7 @@
3415
3416 EAPI=7
3417
3418 +CMAKE_ECLASS=cmake
3419 inherit cmake-multilib
3420
3421 if [[ ${PV} == 9999 ]] ; then
3422 @@ -31,9 +32,9 @@ multilib_src_configure() {
3423 -DENABLE_EXAMPLES=OFF
3424 -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
3425 )
3426 - cmake-utils_src_configure
3427 + cmake_src_configure
3428 }
3429
3430 multilib_src_test() {
3431 - cmake-utils_src_make check
3432 + cmake_build check
3433 }
3434
3435 diff --git a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
3436 index 04439061030..b5cafbd8d8d 100644
3437 --- a/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
3438 +++ b/net-libs/ngtcp2/ngtcp2-0_pre20190912.ebuild
3439 @@ -3,6 +3,7 @@
3440
3441 EAPI=7
3442
3443 +CMAKE_ECLASS=cmake
3444 inherit cmake-multilib
3445
3446 if [[ ${PV} == 9999 ]] ; then
3447 @@ -35,9 +36,9 @@ multilib_src_configure() {
3448 -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
3449 -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
3450 )
3451 - cmake-utils_src_configure
3452 + cmake_src_configure
3453 }
3454
3455 multilib_src_test() {
3456 - cmake-utils_src_make check
3457 + cmake_build check
3458 }
3459
3460 diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
3461 index 43db6bf28c5..8031a8e7028 100644
3462 --- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
3463 +++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
3464 @@ -3,6 +3,7 @@
3465
3466 EAPI=7
3467
3468 +CMAKE_ECLASS=cmake
3469 inherit cmake-multilib
3470
3471 if [[ ${PV} == 9999 ]] ; then
3472 @@ -33,9 +34,9 @@ multilib_src_configure() {
3473 -DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
3474 -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=$(usex !test)
3475 )
3476 - cmake-utils_src_configure
3477 + cmake_src_configure
3478 }
3479
3480 multilib_src_test() {
3481 - cmake-utils_src_make check
3482 + cmake_build check
3483 }
3484
3485 diff --git a/net-libs/quiche/quiche-0.1.0-r1.ebuild b/net-libs/quiche/quiche-0.1.0-r1.ebuild
3486 index 38155800dc0..8b2edcdb572 100644
3487 --- a/net-libs/quiche/quiche-0.1.0-r1.ebuild
3488 +++ b/net-libs/quiche/quiche-0.1.0-r1.ebuild
3489 @@ -122,7 +122,7 @@ wincolor-1.0.2
3490 ws2_32-sys-0.2.1
3491 "
3492
3493 -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
3494 +inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
3495
3496 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
3497 HOMEPAGE="https://github.com/cloudflare/quiche"
3498 @@ -173,7 +173,7 @@ src_unpack() {
3499
3500 src_prepare(){
3501 default
3502 - cmake-utils_src_prepare
3503 + cmake_src_prepare
3504 multilib_copy_sources
3505 }
3506
3507 @@ -183,11 +183,11 @@ multilib_src_configure(){
3508 -DOPENSSL_NO_ASM=ON
3509 -DBUILD_SHARED_LIBS=OFF
3510 )
3511 - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
3512 + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
3513 }
3514
3515 multilib_src_compile(){
3516 - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
3517 + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
3518 QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
3519 }
3520
3521
3522 diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
3523 index f1dc7f80170..6a43728ec78 100644
3524 --- a/net-libs/quiche/quiche-9999.ebuild
3525 +++ b/net-libs/quiche/quiche-9999.ebuild
3526 @@ -122,7 +122,7 @@ wincolor-1.0.2
3527 ws2_32-sys-0.2.1
3528 "
3529
3530 -inherit cargo cmake-utils flag-o-matic multilib-minimal rust-toolchain
3531 +inherit cargo cmake flag-o-matic multilib-minimal rust-toolchain
3532
3533 DESCRIPTION="Implementation of the QUIC transport protocol and HTTP/3"
3534 HOMEPAGE="https://github.com/cloudflare/quiche"
3535 @@ -173,7 +173,7 @@ src_unpack() {
3536
3537 src_prepare(){
3538 default
3539 - cmake-utils_src_prepare
3540 + cmake_src_prepare
3541 multilib_copy_sources
3542 }
3543
3544 @@ -183,11 +183,11 @@ multilib_src_configure(){
3545 -DOPENSSL_NO_ASM=ON
3546 -DBUILD_SHARED_LIBS=OFF
3547 )
3548 - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_configure
3549 + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_configure
3550 }
3551
3552 multilib_src_compile(){
3553 - BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake-utils_src_compile bssl
3554 + BUILD_DIR="${BUILD_DIR}/deps/boringssl/build" cmake_src_compile bssl
3555 QUICHE_BSSL_PATH="${BUILD_DIR}/deps/boringssl" cargo_src_compile --features pkg-config-meta --target="$(rust_abi)"
3556 }
3557
3558
3559 diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild
3560 index 5bd13426b52..11f242f611c 100644
3561 --- a/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild
3562 +++ b/net-p2p/xmr-stak-rx/xmr-stak-rx-1.0.4.ebuild
3563 @@ -3,7 +3,7 @@
3564
3565 EAPI=7
3566
3567 -inherit cmake-utils systemd
3568 +inherit cmake systemd
3569
3570 if [[ ${PV} == "9999" ]] ; then
3571 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3572 @@ -30,7 +30,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3573 RDEPEND="${DEPEND}"
3574
3575 src_prepare() {
3576 - cmake-utils_src_prepare
3577 + cmake_src_prepare
3578 }
3579
3580 src_configure() {
3581 @@ -42,11 +42,11 @@ src_configure() {
3582 -DOpenSSL_ENABLE=$(usex ssl)
3583 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3584 )
3585 - cmake-utils_src_configure
3586 + cmake_src_configure
3587 }
3588
3589 src_install() {
3590 - cmake-utils_src_install
3591 + cmake_src_install
3592 systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
3593 doinitd "${FILESDIR}"/${PN}
3594 dodir /etc/xmr-stak-rx
3595
3596 diff --git a/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild b/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild
3597 index 5bd13426b52..11f242f611c 100644
3598 --- a/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild
3599 +++ b/net-p2p/xmr-stak-rx/xmr-stak-rx-9999.ebuild
3600 @@ -3,7 +3,7 @@
3601
3602 EAPI=7
3603
3604 -inherit cmake-utils systemd
3605 +inherit cmake systemd
3606
3607 if [[ ${PV} == "9999" ]] ; then
3608 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3609 @@ -30,7 +30,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3610 RDEPEND="${DEPEND}"
3611
3612 src_prepare() {
3613 - cmake-utils_src_prepare
3614 + cmake_src_prepare
3615 }
3616
3617 src_configure() {
3618 @@ -42,11 +42,11 @@ src_configure() {
3619 -DOpenSSL_ENABLE=$(usex ssl)
3620 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3621 )
3622 - cmake-utils_src_configure
3623 + cmake_src_configure
3624 }
3625
3626 src_install() {
3627 - cmake-utils_src_install
3628 + cmake_src_install
3629 systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
3630 doinitd "${FILESDIR}"/${PN}
3631 dodir /etc/xmr-stak-rx
3632
3633 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
3634 index 07ffbf9c103..8876dd4fc1d 100644
3635 --- a/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
3636 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.0.ebuild
3637 @@ -3,7 +3,7 @@
3638
3639 EAPI=7
3640
3641 -inherit cmake-utils systemd
3642 +inherit cmake systemd
3643
3644 if [[ ${PV} == "9999" ]] ; then
3645 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3646 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3647 RDEPEND="${DEPEND}"
3648
3649 src_prepare() {
3650 - cmake-utils_src_prepare
3651 + cmake_src_prepare
3652 if ! use devfee; then
3653 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3654 fi
3655 @@ -44,11 +44,11 @@ src_configure() {
3656 -DOpenSSL_ENABLE=$(usex ssl)
3657 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3658 )
3659 - cmake-utils_src_configure
3660 + cmake_src_configure
3661 }
3662
3663 src_install() {
3664 - cmake-utils_src_install
3665 + cmake_src_install
3666 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3667 doinitd "${FILESDIR}"/${PN}
3668 dodir /etc/xmr-stak
3669
3670 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
3671 index 07ffbf9c103..8876dd4fc1d 100644
3672 --- a/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
3673 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.1.ebuild
3674 @@ -3,7 +3,7 @@
3675
3676 EAPI=7
3677
3678 -inherit cmake-utils systemd
3679 +inherit cmake systemd
3680
3681 if [[ ${PV} == "9999" ]] ; then
3682 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3683 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3684 RDEPEND="${DEPEND}"
3685
3686 src_prepare() {
3687 - cmake-utils_src_prepare
3688 + cmake_src_prepare
3689 if ! use devfee; then
3690 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3691 fi
3692 @@ -44,11 +44,11 @@ src_configure() {
3693 -DOpenSSL_ENABLE=$(usex ssl)
3694 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3695 )
3696 - cmake-utils_src_configure
3697 + cmake_src_configure
3698 }
3699
3700 src_install() {
3701 - cmake-utils_src_install
3702 + cmake_src_install
3703 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3704 doinitd "${FILESDIR}"/${PN}
3705 dodir /etc/xmr-stak
3706
3707 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
3708 index 07ffbf9c103..8876dd4fc1d 100644
3709 --- a/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
3710 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.2.ebuild
3711 @@ -3,7 +3,7 @@
3712
3713 EAPI=7
3714
3715 -inherit cmake-utils systemd
3716 +inherit cmake systemd
3717
3718 if [[ ${PV} == "9999" ]] ; then
3719 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3720 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3721 RDEPEND="${DEPEND}"
3722
3723 src_prepare() {
3724 - cmake-utils_src_prepare
3725 + cmake_src_prepare
3726 if ! use devfee; then
3727 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3728 fi
3729 @@ -44,11 +44,11 @@ src_configure() {
3730 -DOpenSSL_ENABLE=$(usex ssl)
3731 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3732 )
3733 - cmake-utils_src_configure
3734 + cmake_src_configure
3735 }
3736
3737 src_install() {
3738 - cmake-utils_src_install
3739 + cmake_src_install
3740 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3741 doinitd "${FILESDIR}"/${PN}
3742 dodir /etc/xmr-stak
3743
3744 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild
3745 index 07ffbf9c103..8876dd4fc1d 100644
3746 --- a/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild
3747 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.3.ebuild
3748 @@ -3,7 +3,7 @@
3749
3750 EAPI=7
3751
3752 -inherit cmake-utils systemd
3753 +inherit cmake systemd
3754
3755 if [[ ${PV} == "9999" ]] ; then
3756 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3757 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3758 RDEPEND="${DEPEND}"
3759
3760 src_prepare() {
3761 - cmake-utils_src_prepare
3762 + cmake_src_prepare
3763 if ! use devfee; then
3764 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3765 fi
3766 @@ -44,11 +44,11 @@ src_configure() {
3767 -DOpenSSL_ENABLE=$(usex ssl)
3768 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3769 )
3770 - cmake-utils_src_configure
3771 + cmake_src_configure
3772 }
3773
3774 src_install() {
3775 - cmake-utils_src_install
3776 + cmake_src_install
3777 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3778 doinitd "${FILESDIR}"/${PN}
3779 dodir /etc/xmr-stak
3780
3781 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild
3782 index 07ffbf9c103..8876dd4fc1d 100644
3783 --- a/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild
3784 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.4.ebuild
3785 @@ -3,7 +3,7 @@
3786
3787 EAPI=7
3788
3789 -inherit cmake-utils systemd
3790 +inherit cmake systemd
3791
3792 if [[ ${PV} == "9999" ]] ; then
3793 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3794 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3795 RDEPEND="${DEPEND}"
3796
3797 src_prepare() {
3798 - cmake-utils_src_prepare
3799 + cmake_src_prepare
3800 if ! use devfee; then
3801 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3802 fi
3803 @@ -44,11 +44,11 @@ src_configure() {
3804 -DOpenSSL_ENABLE=$(usex ssl)
3805 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3806 )
3807 - cmake-utils_src_configure
3808 + cmake_src_configure
3809 }
3810
3811 src_install() {
3812 - cmake-utils_src_install
3813 + cmake_src_install
3814 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3815 doinitd "${FILESDIR}"/${PN}
3816 dodir /etc/xmr-stak
3817
3818 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild
3819 index 07ffbf9c103..8876dd4fc1d 100644
3820 --- a/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild
3821 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.5.ebuild
3822 @@ -3,7 +3,7 @@
3823
3824 EAPI=7
3825
3826 -inherit cmake-utils systemd
3827 +inherit cmake systemd
3828
3829 if [[ ${PV} == "9999" ]] ; then
3830 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3831 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3832 RDEPEND="${DEPEND}"
3833
3834 src_prepare() {
3835 - cmake-utils_src_prepare
3836 + cmake_src_prepare
3837 if ! use devfee; then
3838 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3839 fi
3840 @@ -44,11 +44,11 @@ src_configure() {
3841 -DOpenSSL_ENABLE=$(usex ssl)
3842 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3843 )
3844 - cmake-utils_src_configure
3845 + cmake_src_configure
3846 }
3847
3848 src_install() {
3849 - cmake-utils_src_install
3850 + cmake_src_install
3851 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3852 doinitd "${FILESDIR}"/${PN}
3853 dodir /etc/xmr-stak
3854
3855 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild
3856 index 07ffbf9c103..8876dd4fc1d 100644
3857 --- a/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild
3858 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.6.ebuild
3859 @@ -3,7 +3,7 @@
3860
3861 EAPI=7
3862
3863 -inherit cmake-utils systemd
3864 +inherit cmake systemd
3865
3866 if [[ ${PV} == "9999" ]] ; then
3867 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3868 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3869 RDEPEND="${DEPEND}"
3870
3871 src_prepare() {
3872 - cmake-utils_src_prepare
3873 + cmake_src_prepare
3874 if ! use devfee; then
3875 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3876 fi
3877 @@ -44,11 +44,11 @@ src_configure() {
3878 -DOpenSSL_ENABLE=$(usex ssl)
3879 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3880 )
3881 - cmake-utils_src_configure
3882 + cmake_src_configure
3883 }
3884
3885 src_install() {
3886 - cmake-utils_src_install
3887 + cmake_src_install
3888 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3889 doinitd "${FILESDIR}"/${PN}
3890 dodir /etc/xmr-stak
3891
3892 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild
3893 index 07ffbf9c103..8876dd4fc1d 100644
3894 --- a/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild
3895 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.7.ebuild
3896 @@ -3,7 +3,7 @@
3897
3898 EAPI=7
3899
3900 -inherit cmake-utils systemd
3901 +inherit cmake systemd
3902
3903 if [[ ${PV} == "9999" ]] ; then
3904 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3905 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3906 RDEPEND="${DEPEND}"
3907
3908 src_prepare() {
3909 - cmake-utils_src_prepare
3910 + cmake_src_prepare
3911 if ! use devfee; then
3912 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3913 fi
3914 @@ -44,11 +44,11 @@ src_configure() {
3915 -DOpenSSL_ENABLE=$(usex ssl)
3916 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3917 )
3918 - cmake-utils_src_configure
3919 + cmake_src_configure
3920 }
3921
3922 src_install() {
3923 - cmake-utils_src_install
3924 + cmake_src_install
3925 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3926 doinitd "${FILESDIR}"/${PN}
3927 dodir /etc/xmr-stak
3928
3929 diff --git a/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild b/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild
3930 index 07ffbf9c103..8876dd4fc1d 100644
3931 --- a/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild
3932 +++ b/net-p2p/xmr-stak/xmr-stak-2.10.8.ebuild
3933 @@ -3,7 +3,7 @@
3934
3935 EAPI=7
3936
3937 -inherit cmake-utils systemd
3938 +inherit cmake systemd
3939
3940 if [[ ${PV} == "9999" ]] ; then
3941 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3942 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3943 RDEPEND="${DEPEND}"
3944
3945 src_prepare() {
3946 - cmake-utils_src_prepare
3947 + cmake_src_prepare
3948 if ! use devfee; then
3949 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3950 fi
3951 @@ -44,11 +44,11 @@ src_configure() {
3952 -DOpenSSL_ENABLE=$(usex ssl)
3953 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3954 )
3955 - cmake-utils_src_configure
3956 + cmake_src_configure
3957 }
3958
3959 src_install() {
3960 - cmake-utils_src_install
3961 + cmake_src_install
3962 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
3963 doinitd "${FILESDIR}"/${PN}
3964 dodir /etc/xmr-stak
3965
3966 diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild
3967 index 07ffbf9c103..8876dd4fc1d 100644
3968 --- a/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild
3969 +++ b/net-p2p/xmr-stak/xmr-stak-2.8.0.ebuild
3970 @@ -3,7 +3,7 @@
3971
3972 EAPI=7
3973
3974 -inherit cmake-utils systemd
3975 +inherit cmake systemd
3976
3977 if [[ ${PV} == "9999" ]] ; then
3978 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
3979 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
3980 RDEPEND="${DEPEND}"
3981
3982 src_prepare() {
3983 - cmake-utils_src_prepare
3984 + cmake_src_prepare
3985 if ! use devfee; then
3986 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
3987 fi
3988 @@ -44,11 +44,11 @@ src_configure() {
3989 -DOpenSSL_ENABLE=$(usex ssl)
3990 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
3991 )
3992 - cmake-utils_src_configure
3993 + cmake_src_configure
3994 }
3995
3996 src_install() {
3997 - cmake-utils_src_install
3998 + cmake_src_install
3999 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
4000 doinitd "${FILESDIR}"/${PN}
4001 dodir /etc/xmr-stak
4002
4003 diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild
4004 index 07ffbf9c103..8876dd4fc1d 100644
4005 --- a/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild
4006 +++ b/net-p2p/xmr-stak/xmr-stak-2.8.2.ebuild
4007 @@ -3,7 +3,7 @@
4008
4009 EAPI=7
4010
4011 -inherit cmake-utils systemd
4012 +inherit cmake systemd
4013
4014 if [[ ${PV} == "9999" ]] ; then
4015 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
4016 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
4017 RDEPEND="${DEPEND}"
4018
4019 src_prepare() {
4020 - cmake-utils_src_prepare
4021 + cmake_src_prepare
4022 if ! use devfee; then
4023 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
4024 fi
4025 @@ -44,11 +44,11 @@ src_configure() {
4026 -DOpenSSL_ENABLE=$(usex ssl)
4027 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
4028 )
4029 - cmake-utils_src_configure
4030 + cmake_src_configure
4031 }
4032
4033 src_install() {
4034 - cmake-utils_src_install
4035 + cmake_src_install
4036 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
4037 doinitd "${FILESDIR}"/${PN}
4038 dodir /etc/xmr-stak
4039
4040 diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
4041 index 07ffbf9c103..8876dd4fc1d 100644
4042 --- a/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
4043 +++ b/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
4044 @@ -3,7 +3,7 @@
4045
4046 EAPI=7
4047
4048 -inherit cmake-utils systemd
4049 +inherit cmake systemd
4050
4051 if [[ ${PV} == "9999" ]] ; then
4052 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
4053 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
4054 RDEPEND="${DEPEND}"
4055
4056 src_prepare() {
4057 - cmake-utils_src_prepare
4058 + cmake_src_prepare
4059 if ! use devfee; then
4060 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
4061 fi
4062 @@ -44,11 +44,11 @@ src_configure() {
4063 -DOpenSSL_ENABLE=$(usex ssl)
4064 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
4065 )
4066 - cmake-utils_src_configure
4067 + cmake_src_configure
4068 }
4069
4070 src_install() {
4071 - cmake-utils_src_install
4072 + cmake_src_install
4073 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
4074 doinitd "${FILESDIR}"/${PN}
4075 dodir /etc/xmr-stak
4076
4077 diff --git a/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild b/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
4078 index 07ffbf9c103..8876dd4fc1d 100644
4079 --- a/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
4080 +++ b/net-p2p/xmr-stak/xmr-stak-2.9.0.ebuild
4081 @@ -3,7 +3,7 @@
4082
4083 EAPI=7
4084
4085 -inherit cmake-utils systemd
4086 +inherit cmake systemd
4087
4088 if [[ ${PV} == "9999" ]] ; then
4089 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
4090 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
4091 RDEPEND="${DEPEND}"
4092
4093 src_prepare() {
4094 - cmake-utils_src_prepare
4095 + cmake_src_prepare
4096 if ! use devfee; then
4097 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
4098 fi
4099 @@ -44,11 +44,11 @@ src_configure() {
4100 -DOpenSSL_ENABLE=$(usex ssl)
4101 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
4102 )
4103 - cmake-utils_src_configure
4104 + cmake_src_configure
4105 }
4106
4107 src_install() {
4108 - cmake-utils_src_install
4109 + cmake_src_install
4110 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
4111 doinitd "${FILESDIR}"/${PN}
4112 dodir /etc/xmr-stak
4113
4114 diff --git a/net-p2p/xmr-stak/xmr-stak-9999.ebuild b/net-p2p/xmr-stak/xmr-stak-9999.ebuild
4115 index 07ffbf9c103..8876dd4fc1d 100644
4116 --- a/net-p2p/xmr-stak/xmr-stak-9999.ebuild
4117 +++ b/net-p2p/xmr-stak/xmr-stak-9999.ebuild
4118 @@ -3,7 +3,7 @@
4119
4120 EAPI=7
4121
4122 -inherit cmake-utils systemd
4123 +inherit cmake systemd
4124
4125 if [[ ${PV} == "9999" ]] ; then
4126 EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
4127 @@ -29,7 +29,7 @@ DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
4128 RDEPEND="${DEPEND}"
4129
4130 src_prepare() {
4131 - cmake-utils_src_prepare
4132 + cmake_src_prepare
4133 if ! use devfee; then
4134 sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
4135 fi
4136 @@ -44,11 +44,11 @@ src_configure() {
4137 -DOpenSSL_ENABLE=$(usex ssl)
4138 -DLIBRARY_OUTPUT_PATH=$(get_libdir)
4139 )
4140 - cmake-utils_src_configure
4141 + cmake_src_configure
4142 }
4143
4144 src_install() {
4145 - cmake-utils_src_install
4146 + cmake_src_install
4147 systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
4148 doinitd "${FILESDIR}"/${PN}
4149 dodir /etc/xmr-stak
4150
4151 diff --git a/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
4152 index 7cc195bf655..897a08ce4f7 100644
4153 --- a/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
4154 +++ b/sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
4155 @@ -3,7 +3,7 @@
4156
4157 EAPI=7
4158
4159 -inherit cmake-utils
4160 +inherit cmake
4161
4162 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
4163 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
4164 @@ -42,10 +42,10 @@ src_configure() {
4165 -DLLVM_VERSION_SUFFIX=roc
4166 -DOCAMLFIND=NO
4167 )
4168 - cmake-utils_src_configure
4169 + cmake_src_configure
4170 }
4171 src_install(){
4172 - cmake-utils_src_install
4173 + cmake_src_install
4174 cat > "99${PN}" <<-EOF
4175 LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
4176 EOF
4177
4178 diff --git a/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild b/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
4179 index 45b3c2928a0..a0104d873d2 100644
4180 --- a/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
4181 +++ b/sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
4182 @@ -3,7 +3,7 @@
4183
4184 EAPI=7
4185
4186 -inherit cmake-utils
4187 +inherit cmake
4188
4189 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
4190 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
4191 @@ -41,10 +41,10 @@ src_configure() {
4192 -DLLVM_INSTALL_UTILS=ON
4193 -DOCAMLFIND=NO
4194 )
4195 - cmake-utils_src_configure
4196 + cmake_src_configure
4197 }
4198 src_install(){
4199 - cmake-utils_src_install
4200 + cmake_src_install
4201 cat > "99${PN}" <<-EOF
4202 LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
4203 EOF
4204
4205 diff --git a/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
4206 index 7cc195bf655..897a08ce4f7 100644
4207 --- a/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
4208 +++ b/sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
4209 @@ -3,7 +3,7 @@
4210
4211 EAPI=7
4212
4213 -inherit cmake-utils
4214 +inherit cmake
4215
4216 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
4217 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
4218 @@ -42,10 +42,10 @@ src_configure() {
4219 -DLLVM_VERSION_SUFFIX=roc
4220 -DOCAMLFIND=NO
4221 )
4222 - cmake-utils_src_configure
4223 + cmake_src_configure
4224 }
4225 src_install(){
4226 - cmake-utils_src_install
4227 + cmake_src_install
4228 cat > "99${PN}" <<-EOF
4229 LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
4230 EOF
4231
4232 diff --git a/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
4233 index 7cc195bf655..897a08ce4f7 100644
4234 --- a/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
4235 +++ b/sys-devel/llvm-roc/llvm-roc-2.8.0.ebuild
4236 @@ -3,7 +3,7 @@
4237
4238 EAPI=7
4239
4240 -inherit cmake-utils
4241 +inherit cmake
4242
4243 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
4244 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
4245 @@ -42,10 +42,10 @@ src_configure() {
4246 -DLLVM_VERSION_SUFFIX=roc
4247 -DOCAMLFIND=NO
4248 )
4249 - cmake-utils_src_configure
4250 + cmake_src_configure
4251 }
4252 src_install(){
4253 - cmake-utils_src_install
4254 + cmake_src_install
4255 cat > "99${PN}" <<-EOF
4256 LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
4257 EOF
4258
4259 diff --git a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
4260 index 7cc195bf655..897a08ce4f7 100644
4261 --- a/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
4262 +++ b/sys-devel/llvm-roc/llvm-roc-2.9.0.ebuild
4263 @@ -3,7 +3,7 @@
4264
4265 EAPI=7
4266
4267 -inherit cmake-utils
4268 +inherit cmake
4269
4270 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
4271 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
4272 @@ -42,10 +42,10 @@ src_configure() {
4273 -DLLVM_VERSION_SUFFIX=roc
4274 -DOCAMLFIND=NO
4275 )
4276 - cmake-utils_src_configure
4277 + cmake_src_configure
4278 }
4279 src_install(){
4280 - cmake-utils_src_install
4281 + cmake_src_install
4282 cat > "99${PN}" <<-EOF
4283 LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
4284 EOF
4285
4286 diff --git a/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild b/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
4287 index af16a02096e..b4f3afd0beb 100644
4288 --- a/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
4289 +++ b/sys-devel/llvm-roc/llvm-roc-3.0.0.ebuild
4290 @@ -3,7 +3,7 @@
4291
4292 EAPI=7
4293
4294 -inherit cmake-utils
4295 +inherit cmake
4296
4297 DESCRIPTION="Radeon Open Compute llvm,lld,clang"
4298 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm/"
4299 @@ -26,7 +26,7 @@ src_prepare() {
4300 cd "${WORKDIR}/llvm-project-roc-ocl-${PV}"
4301 eapply "${FILESDIR}/${P}-add_libraries.patch"
4302 eapply_user
4303 - cmake-utils_src_prepare
4304 + cmake_src_prepare
4305 }
4306
4307 src_configure() {
4308 @@ -45,11 +45,11 @@ src_configure() {
4309
4310 use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
4311
4312 - cmake-utils_src_configure
4313 + cmake_src_configure
4314 }
4315
4316 src_install(){
4317 - cmake-utils_src_install
4318 + cmake_src_install
4319 cat > "99${PN}" <<-EOF
4320 LDPATH="${EROOT}/usr/lib/llvm/roc/lib"
4321 EOF