1 |
commit: 608fd301fcfc4f1d804d948245e623ebfbf75d74 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 30 19:12:17 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 19 13:08:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=608fd301 |
7 |
|
8 |
*/*: Switch proxy-maint to cmake.eclass |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
app-arch/innoextract/innoextract-1.8.ebuild | 4 ++-- |
13 |
dev-db/cpp-driver/cpp-driver-2.11.0.ebuild | 4 ++-- |
14 |
dev-libs/hyperscan/hyperscan-5.1.0.ebuild | 4 ++-- |
15 |
dev-libs/hyperscan/hyperscan-5.1.1.ebuild | 6 +++--- |
16 |
dev-libs/hyperscan/hyperscan-5.2.0.ebuild | 6 +++--- |
17 |
dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild | 4 ++-- |
18 |
dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild | 4 ++-- |
19 |
dev-util/edb-debugger/edb-debugger-9999.ebuild | 6 +++--- |
20 |
.../kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild | 4 ++-- |
21 |
dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild | 4 ++-- |
22 |
mail-filter/rspamd/rspamd-2.2.ebuild | 10 +++++----- |
23 |
mail-filter/rspamd/rspamd-9999.ebuild | 10 +++++----- |
24 |
media-libs/libsoundio/libsoundio-2.0.0.ebuild | 3 ++- |
25 |
.../loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild | 6 +++--- |
26 |
media-sound/loudness-scanner/loudness-scanner-9999.ebuild | 6 +++--- |
27 |
.../libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild | 2 +- |
28 |
net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild | 2 +- |
29 |
net-libs/tox/tox-0.2.10.ebuild | 8 ++++---- |
30 |
net-libs/tox/tox-0.2.9-r1.ebuild | 8 ++++---- |
31 |
net-libs/tox/tox-9999.ebuild | 8 ++++---- |
32 |
20 files changed, 55 insertions(+), 54 deletions(-) |
33 |
|
34 |
diff --git a/app-arch/innoextract/innoextract-1.8.ebuild b/app-arch/innoextract/innoextract-1.8.ebuild |
35 |
index b5df9fba5b8..5c58d878b0f 100644 |
36 |
--- a/app-arch/innoextract/innoextract-1.8.ebuild |
37 |
+++ b/app-arch/innoextract/innoextract-1.8.ebuild |
38 |
@@ -3,7 +3,7 @@ |
39 |
|
40 |
EAPI=7 |
41 |
|
42 |
-inherit cmake-utils |
43 |
+inherit cmake |
44 |
|
45 |
DESCRIPTION="A tool to unpack installers created by Inno Setup" |
46 |
HOMEPAGE="https://constexpr.org/innoextract/" |
47 |
@@ -29,5 +29,5 @@ src_configure() { |
48 |
-DWITH_CONV=$(usex iconv iconv builtin) |
49 |
) |
50 |
|
51 |
- cmake-utils_src_configure |
52 |
+ cmake_src_configure |
53 |
} |
54 |
|
55 |
diff --git a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild |
56 |
index 9413734574c..6ef9399da25 100644 |
57 |
--- a/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild |
58 |
+++ b/dev-db/cpp-driver/cpp-driver-2.11.0.ebuild |
59 |
@@ -3,7 +3,7 @@ |
60 |
|
61 |
EAPI=7 |
62 |
|
63 |
-inherit cmake-utils |
64 |
+inherit cmake |
65 |
|
66 |
DESCRIPTION="DataStax C/C++ Driver for Cassandra" |
67 |
HOMEPAGE="https://datastax.github.io/cpp-driver/" |
68 |
@@ -24,5 +24,5 @@ DEPEND="${RDEPEND}" |
69 |
|
70 |
src_configure() { |
71 |
local mycmakeargs=( -DCASS_USE_OPENSSL=$(usex ssl) ) |
72 |
- cmake-utils_src_configure |
73 |
+ cmake_src_configure |
74 |
} |
75 |
|
76 |
diff --git a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild |
77 |
index 8cecb0a904a..ec3fa0a718e 100644 |
78 |
--- a/dev-libs/hyperscan/hyperscan-5.1.0.ebuild |
79 |
+++ b/dev-libs/hyperscan/hyperscan-5.1.0.ebuild |
80 |
@@ -5,7 +5,7 @@ EAPI=7 |
81 |
|
82 |
PYTHON_COMPAT=( python2_7 ) |
83 |
|
84 |
-inherit cmake-utils python-r1 |
85 |
+inherit cmake python-r1 |
86 |
|
87 |
DESCRIPTION="High-performance regular expression matching library" |
88 |
HOMEPAGE="https://01.org/hyperscan" |
89 |
@@ -33,5 +33,5 @@ src_configure() { |
90 |
-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) |
91 |
-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) |
92 |
) |
93 |
- cmake-utils_src_configure |
94 |
+ cmake_src_configure |
95 |
} |
96 |
|
97 |
diff --git a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild |
98 |
index 6e6970b8c42..f21c9535c2d 100644 |
99 |
--- a/dev-libs/hyperscan/hyperscan-5.1.1.ebuild |
100 |
+++ b/dev-libs/hyperscan/hyperscan-5.1.1.ebuild |
101 |
@@ -5,7 +5,7 @@ EAPI=7 |
102 |
|
103 |
PYTHON_COMPAT=( python2_7 ) |
104 |
|
105 |
-inherit cmake-utils python-r1 flag-o-matic |
106 |
+inherit cmake python-r1 flag-o-matic |
107 |
|
108 |
DESCRIPTION="High-performance regular expression matching library" |
109 |
SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
110 |
@@ -27,7 +27,7 @@ REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}" |
111 |
src_prepare() { |
112 |
# upstream workaround |
113 |
append-cxxflags -Wno-redundant-move |
114 |
- cmake-utils_src_prepare |
115 |
+ cmake_src_prepare |
116 |
} |
117 |
|
118 |
src_configure() { |
119 |
@@ -35,5 +35,5 @@ src_configure() { |
120 |
-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) |
121 |
-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) |
122 |
) |
123 |
- cmake-utils_src_configure |
124 |
+ cmake_src_configure |
125 |
} |
126 |
|
127 |
diff --git a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild |
128 |
index 6e6970b8c42..f21c9535c2d 100644 |
129 |
--- a/dev-libs/hyperscan/hyperscan-5.2.0.ebuild |
130 |
+++ b/dev-libs/hyperscan/hyperscan-5.2.0.ebuild |
131 |
@@ -5,7 +5,7 @@ EAPI=7 |
132 |
|
133 |
PYTHON_COMPAT=( python2_7 ) |
134 |
|
135 |
-inherit cmake-utils python-r1 flag-o-matic |
136 |
+inherit cmake python-r1 flag-o-matic |
137 |
|
138 |
DESCRIPTION="High-performance regular expression matching library" |
139 |
SRC_URI="https://github.com/01org/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
140 |
@@ -27,7 +27,7 @@ REQUIRED_USE="cpu_flags_x86_ssse3 ${PYTHON_REQUIRED_USE}" |
141 |
src_prepare() { |
142 |
# upstream workaround |
143 |
append-cxxflags -Wno-redundant-move |
144 |
- cmake-utils_src_prepare |
145 |
+ cmake_src_prepare |
146 |
} |
147 |
|
148 |
src_configure() { |
149 |
@@ -35,5 +35,5 @@ src_configure() { |
150 |
-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON) |
151 |
-DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF) |
152 |
) |
153 |
- cmake-utils_src_configure |
154 |
+ cmake_src_configure |
155 |
} |
156 |
|
157 |
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild |
158 |
index c5dadbd7bf7..bb8d77db791 100644 |
159 |
--- a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild |
160 |
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild |
161 |
@@ -3,7 +3,7 @@ |
162 |
|
163 |
EAPI=7 |
164 |
|
165 |
-inherit cmake-utils |
166 |
+inherit cmake |
167 |
|
168 |
DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" |
169 |
HOMEPAGE="https://github.com/eteran/edb-debugger" |
170 |
@@ -47,5 +47,5 @@ src_prepare() { |
171 |
sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die |
172 |
fi |
173 |
|
174 |
- cmake-utils_src_prepare |
175 |
+ cmake_src_prepare |
176 |
} |
177 |
|
178 |
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild |
179 |
index 12fcafb7f2c..21c906d4859 100644 |
180 |
--- a/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild |
181 |
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0-r1.ebuild |
182 |
@@ -3,7 +3,7 @@ |
183 |
|
184 |
EAPI=7 |
185 |
|
186 |
-inherit cmake-utils |
187 |
+inherit cmake |
188 |
|
189 |
DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" |
190 |
HOMEPAGE="https://github.com/eteran/edb-debugger" |
191 |
@@ -45,5 +45,5 @@ src_prepare() { |
192 |
sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die |
193 |
fi |
194 |
|
195 |
- cmake-utils_src_prepare |
196 |
+ cmake_src_prepare |
197 |
} |
198 |
|
199 |
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild |
200 |
index b6517f3c57f..6ff5cb3e1c0 100644 |
201 |
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild |
202 |
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild |
203 |
@@ -3,7 +3,7 @@ |
204 |
|
205 |
EAPI=7 |
206 |
|
207 |
-inherit cmake-utils git-r3 |
208 |
+inherit cmake git-r3 |
209 |
|
210 |
DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg" |
211 |
HOMEPAGE="https://github.com/eteran/edb-debugger" |
212 |
@@ -38,12 +38,12 @@ src_prepare() { |
213 |
if ! use graphviz; then |
214 |
sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die |
215 |
fi |
216 |
- cmake-utils_src_prepare |
217 |
+ cmake_src_prepare |
218 |
} |
219 |
|
220 |
src_configure() { |
221 |
local mycmakeargs=( |
222 |
-DBUILD_JUMBO=$(usex jumbo-build) |
223 |
) |
224 |
- cmake-utils_src_configure |
225 |
+ cmake_src_configure |
226 |
} |
227 |
|
228 |
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild |
229 |
index b8d2337eeb5..f430b5be279 100644 |
230 |
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild |
231 |
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild |
232 |
@@ -3,7 +3,7 @@ |
233 |
|
234 |
EAPI=7 |
235 |
|
236 |
-inherit cmake-utils qmake-utils |
237 |
+inherit cmake qmake-utils |
238 |
|
239 |
DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces" |
240 |
HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor" |
241 |
@@ -49,5 +49,5 @@ src_configure() { |
242 |
-DBUILD_TESTING=$(usex test) |
243 |
-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules |
244 |
) |
245 |
- cmake-utils_src_configure |
246 |
+ cmake_src_configure |
247 |
} |
248 |
|
249 |
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild |
250 |
index b8d2337eeb5..f430b5be279 100644 |
251 |
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild |
252 |
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild |
253 |
@@ -3,7 +3,7 @@ |
254 |
|
255 |
EAPI=7 |
256 |
|
257 |
-inherit cmake-utils qmake-utils |
258 |
+inherit cmake qmake-utils |
259 |
|
260 |
DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces" |
261 |
HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor" |
262 |
@@ -49,5 +49,5 @@ src_configure() { |
263 |
-DBUILD_TESTING=$(usex test) |
264 |
-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules |
265 |
) |
266 |
- cmake-utils_src_configure |
267 |
+ cmake_src_configure |
268 |
} |
269 |
|
270 |
diff --git a/mail-filter/rspamd/rspamd-2.2.ebuild b/mail-filter/rspamd/rspamd-2.2.ebuild |
271 |
index c428effd2fe..dea0ef8dd70 100644 |
272 |
--- a/mail-filter/rspamd/rspamd-2.2.ebuild |
273 |
+++ b/mail-filter/rspamd/rspamd-2.2.ebuild |
274 |
@@ -3,7 +3,7 @@ |
275 |
|
276 |
EAPI=7 |
277 |
|
278 |
-inherit cmake-utils pax-utils systemd tmpfiles |
279 |
+inherit cmake pax-utils systemd tmpfiles |
280 |
|
281 |
if [[ ${PV} == *9999 ]] ; then |
282 |
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" |
283 |
@@ -42,7 +42,7 @@ RDEPEND=" |
284 |
DEPEND="${RDEPEND}" |
285 |
|
286 |
src_prepare() { |
287 |
- cmake-utils_src_prepare |
288 |
+ cmake_src_prepare |
289 |
|
290 |
sed -i -e '/PROJECT/s/LANGUAGES C ASM/LANGUAGES C CXX ASM/' CMakeLists.txt \ |
291 |
|| die "sed CMakeLists.txt failed" |
292 |
@@ -63,15 +63,15 @@ src_configure() { |
293 |
-DENABLE_LUAJIT=$(usex jit ON OFF) |
294 |
-DENABLE_PCRE2=$(usex pcre2 ON OFF) |
295 |
) |
296 |
- cmake-utils_src_configure |
297 |
+ cmake_src_configure |
298 |
} |
299 |
|
300 |
src_test() { |
301 |
- cmake-utils_src_test |
302 |
+ cmake_src_test |
303 |
} |
304 |
|
305 |
src_install() { |
306 |
- cmake-utils_src_install |
307 |
+ cmake_src_install |
308 |
|
309 |
newconfd "${FILESDIR}"/rspamd.conf rspamd |
310 |
newinitd "${FILESDIR}/rspamd-r7.init" rspamd |
311 |
|
312 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
313 |
index 3a11c07504f..c99c087f76d 100644 |
314 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
315 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
316 |
@@ -3,7 +3,7 @@ |
317 |
|
318 |
EAPI=7 |
319 |
|
320 |
-inherit cmake-utils pax-utils systemd tmpfiles |
321 |
+inherit cmake pax-utils systemd tmpfiles |
322 |
|
323 |
if [[ ${PV} == *9999 ]] ; then |
324 |
EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" |
325 |
@@ -42,7 +42,7 @@ RDEPEND=" |
326 |
DEPEND="${RDEPEND}" |
327 |
|
328 |
src_prepare() { |
329 |
- cmake-utils_src_prepare |
330 |
+ cmake_src_prepare |
331 |
|
332 |
sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
333 |
rspamd.service \ |
334 |
@@ -61,15 +61,15 @@ src_configure() { |
335 |
-DENABLE_LUAJIT=$(usex jit ON OFF) |
336 |
-DENABLE_PCRE2=$(usex pcre2 ON OFF) |
337 |
) |
338 |
- cmake-utils_src_configure |
339 |
+ cmake_src_configure |
340 |
} |
341 |
|
342 |
src_test() { |
343 |
- cmake-utils_src_test |
344 |
+ cmake_src_test |
345 |
} |
346 |
|
347 |
src_install() { |
348 |
- cmake-utils_src_install |
349 |
+ cmake_src_install |
350 |
|
351 |
newconfd "${FILESDIR}"/rspamd.conf rspamd |
352 |
newinitd "${FILESDIR}/rspamd-r7.init" rspamd |
353 |
|
354 |
diff --git a/media-libs/libsoundio/libsoundio-2.0.0.ebuild b/media-libs/libsoundio/libsoundio-2.0.0.ebuild |
355 |
index 33ece577af3..3ea88b323db 100644 |
356 |
--- a/media-libs/libsoundio/libsoundio-2.0.0.ebuild |
357 |
+++ b/media-libs/libsoundio/libsoundio-2.0.0.ebuild |
358 |
@@ -3,6 +3,7 @@ |
359 |
|
360 |
EAPI=7 |
361 |
|
362 |
+CMAKE_ECLASS=cmake |
363 |
inherit cmake-multilib |
364 |
|
365 |
DESCRIPTION="C library for cross-platform real-time audio input and output" |
366 |
@@ -30,5 +31,5 @@ multilib_src_configure() { |
367 |
-DBUILD_EXAMPLE_PROGRAMS=$(multilib_native_usex examples) |
368 |
-DBUILD_TESTS=no |
369 |
) |
370 |
- cmake-utils_src_configure |
371 |
+ cmake_src_configure |
372 |
} |
373 |
|
374 |
diff --git a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild |
375 |
index 725c5aaa0a4..ee2ac482713 100644 |
376 |
--- a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild |
377 |
+++ b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild |
378 |
@@ -3,7 +3,7 @@ |
379 |
|
380 |
EAPI=7 |
381 |
|
382 |
-inherit cmake-utils |
383 |
+inherit cmake |
384 |
|
385 |
DESCRIPTION="Scans your music files and tags them with loudness information" |
386 |
HOMEPAGE="https://github.com/jiixyj/loudness-scanner/" |
387 |
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}" |
388 |
S="${WORKDIR}/${PN}" |
389 |
|
390 |
src_prepare() { |
391 |
- cmake-utils_src_prepare |
392 |
+ cmake_src_prepare |
393 |
sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \ |
394 |
"${S}"/scanner/inputaudio/input.c |
395 |
} |
396 |
@@ -59,7 +59,7 @@ src_configure() { |
397 |
-DDISABLE_RSVG2:BOOL=$(usex gtk no yes) |
398 |
-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes) |
399 |
) |
400 |
- cmake-utils_src_configure |
401 |
+ cmake_src_configure |
402 |
} |
403 |
|
404 |
src_install() { |
405 |
|
406 |
diff --git a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild |
407 |
index 4c6bb45b8be..0608e103196 100644 |
408 |
--- a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild |
409 |
+++ b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild |
410 |
@@ -3,7 +3,7 @@ |
411 |
|
412 |
EAPI=7 |
413 |
|
414 |
-inherit cmake-utils git-r3 |
415 |
+inherit cmake git-r3 |
416 |
|
417 |
DESCRIPTION="Scans your music files and tags them with loudness information" |
418 |
HOMEPAGE="https://github.com/jiixyj/loudness-scanner/" |
419 |
@@ -38,7 +38,7 @@ DEPEND=" |
420 |
RDEPEND="${DEPEND}" |
421 |
|
422 |
src_prepare() { |
423 |
- cmake-utils_src_prepare |
424 |
+ cmake_src_prepare |
425 |
sed -i -e 's|".",|"'${EROOT}'/usr/'$(get_libdir)'/loudness-scanner",|g' \ |
426 |
"${S}"/scanner/inputaudio/input.c |
427 |
} |
428 |
@@ -57,7 +57,7 @@ src_configure() { |
429 |
-DDISABLE_RSVG2:BOOL=$(usex gtk no yes) |
430 |
-DDISABLE_SNDFILE:BOOL=$(usex sndfile no yes) |
431 |
) |
432 |
- cmake-utils_src_configure |
433 |
+ cmake_src_configure |
434 |
} |
435 |
|
436 |
src_install() { |
437 |
|
438 |
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild |
439 |
index fc1c8f6ae91..4a5341b2b8b 100644 |
440 |
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild |
441 |
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.2.ebuild |
442 |
@@ -3,7 +3,7 @@ |
443 |
|
444 |
EAPI=7 |
445 |
|
446 |
-inherit multilib cmake-utils |
447 |
+inherit cmake |
448 |
|
449 |
DESCRIPTION="Signal Protocol C Library" |
450 |
HOMEPAGE="https://www.whispersystems.org/" |
451 |
|
452 |
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild |
453 |
index e56f24c04c6..b14bcd42a76 100644 |
454 |
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild |
455 |
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-9999.ebuild |
456 |
@@ -3,7 +3,7 @@ |
457 |
|
458 |
EAPI=7 |
459 |
|
460 |
-inherit git-r3 multilib cmake-utils |
461 |
+inherit git-r3 cmake |
462 |
|
463 |
DESCRIPTION="Signal Protocol C Library" |
464 |
HOMEPAGE="https://www.whispersystems.org/" |
465 |
|
466 |
diff --git a/net-libs/tox/tox-0.2.10.ebuild b/net-libs/tox/tox-0.2.10.ebuild |
467 |
index 11d676ea613..d8e4d1d2a74 100644 |
468 |
--- a/net-libs/tox/tox-0.2.10.ebuild |
469 |
+++ b/net-libs/tox/tox-0.2.10.ebuild |
470 |
@@ -3,7 +3,7 @@ |
471 |
|
472 |
EAPI=7 |
473 |
|
474 |
-inherit cmake-utils systemd |
475 |
+inherit cmake systemd |
476 |
|
477 |
MY_P="c-toxcore-${PV}" |
478 |
DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" |
479 |
@@ -38,7 +38,7 @@ RDEPEND=" |
480 |
S="${WORKDIR}/${MY_P}" |
481 |
|
482 |
src_prepare() { |
483 |
- cmake-utils_src_prepare |
484 |
+ cmake_src_prepare |
485 |
#remove faulty tests |
486 |
for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do |
487 |
sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die |
488 |
@@ -81,11 +81,11 @@ src_configure() { |
489 |
einfo "Logging disabled" |
490 |
fi |
491 |
|
492 |
- cmake-utils_src_configure |
493 |
+ cmake_src_configure |
494 |
} |
495 |
|
496 |
src_install() { |
497 |
- cmake-utils_src_install |
498 |
+ cmake_src_install |
499 |
|
500 |
if use daemon; then |
501 |
newinitd "${FILESDIR}"/initd tox-dht-daemon |
502 |
|
503 |
diff --git a/net-libs/tox/tox-0.2.9-r1.ebuild b/net-libs/tox/tox-0.2.9-r1.ebuild |
504 |
index 5307394b128..a6e9875d9fc 100644 |
505 |
--- a/net-libs/tox/tox-0.2.9-r1.ebuild |
506 |
+++ b/net-libs/tox/tox-0.2.9-r1.ebuild |
507 |
@@ -3,7 +3,7 @@ |
508 |
|
509 |
EAPI=7 |
510 |
|
511 |
-inherit cmake-utils systemd |
512 |
+inherit cmake systemd |
513 |
|
514 |
MY_P="c-toxcore-${PV}" |
515 |
DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" |
516 |
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND} |
517 |
S="${WORKDIR}/${MY_P}" |
518 |
|
519 |
src_prepare() { |
520 |
- cmake-utils_src_prepare |
521 |
+ cmake_src_prepare |
522 |
#remove faulty tests |
523 |
for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do |
524 |
sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die |
525 |
@@ -74,11 +74,11 @@ src_configure() { |
526 |
einfo "Logging disabled" |
527 |
fi |
528 |
|
529 |
- cmake-utils_src_configure |
530 |
+ cmake_src_configure |
531 |
} |
532 |
|
533 |
src_install() { |
534 |
- cmake-utils_src_install |
535 |
+ cmake_src_install |
536 |
|
537 |
if use daemon; then |
538 |
newinitd "${FILESDIR}"/initd tox-dht-daemon |
539 |
|
540 |
diff --git a/net-libs/tox/tox-9999.ebuild b/net-libs/tox/tox-9999.ebuild |
541 |
index 02c53456282..151001dd8ee 100644 |
542 |
--- a/net-libs/tox/tox-9999.ebuild |
543 |
+++ b/net-libs/tox/tox-9999.ebuild |
544 |
@@ -3,7 +3,7 @@ |
545 |
|
546 |
EAPI=7 |
547 |
|
548 |
-inherit cmake-utils git-r3 systemd |
549 |
+inherit cmake git-r3 systemd |
550 |
|
551 |
DESCRIPTION="Encrypted P2P, messaging, and audio/video calling platform" |
552 |
HOMEPAGE="https://tox.chat" |
553 |
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}" |
554 |
RDEPEND="${COMMON_DEPEND}" |
555 |
|
556 |
src_prepare() { |
557 |
- cmake-utils_src_prepare |
558 |
+ cmake_src_prepare |
559 |
#remove faulty tests |
560 |
for testname in bootstrap lan_discovery save_compatibility tcp_relay tox_many_tcp; do |
561 |
sed -i -e "/^auto_test(${testname})$/d" CMakeLists.txt || die |
562 |
@@ -74,11 +74,11 @@ src_configure() { |
563 |
mycmakeargs+=(-DMIN_LOGGER_LEVEL="") |
564 |
einfo "Logging Disabled" |
565 |
fi |
566 |
- cmake-utils_src_configure |
567 |
+ cmake_src_configure |
568 |
} |
569 |
|
570 |
src_install() { |
571 |
- cmake-utils_src_install |
572 |
+ cmake_src_install |
573 |
|
574 |
if use daemon; then |
575 |
newinitd "${FILESDIR}"/initd tox-dht-daemon |