Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-libs/libqtxdg/, lxqt-base/lxqt-session/, x11-misc/obconf-qt/, ...
Date: Tue, 31 Dec 2019 16:44:06
Message-Id: 1577804533.716b4578b4b57d4caf861ff072475cdad3b0b114.asturm@gentoo
1 commit: 716b4578b4b57d4caf861ff072475cdad3b0b114
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 23 23:25:19 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 31 15:02:13 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=716b4578
7
8 */*: Switch lxqt proj packages to cmake.eclass
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 dev-libs/libqtxdg/libqtxdg-9999.ebuild | 6 +++---
13 dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild | 2 +-
14 lxqt-base/liblxqt/liblxqt-9999.ebuild | 4 ++--
15 lxqt-base/libsysstat/libsysstat-9999.ebuild | 2 +-
16 lxqt-base/lxqt-about/lxqt-about-9999.ebuild | 2 +-
17 lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild | 2 +-
18 lxqt-base/lxqt-config/lxqt-config-9999.ebuild | 6 +++---
19 lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild | 2 +-
20 lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild | 2 +-
21 lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild | 4 ++--
22 lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 6 +++---
23 lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild | 4 ++--
24 lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild | 2 +-
25 lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild | 2 +-
26 lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild | 4 ++--
27 lxqt-base/lxqt-session/lxqt-session-9999.ebuild | 6 +++---
28 lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild | 2 +-
29 media-gfx/lximage-qt/lximage-qt-9999.ebuild | 2 +-
30 x11-libs/libfm-qt/libfm-qt-9999.ebuild | 2 +-
31 x11-misc/obconf-qt/obconf-qt-9999.ebuild | 2 +-
32 x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild | 2 +-
33 x11-themes/lxqt-themes/lxqt-themes-9999.ebuild | 2 +-
34 22 files changed, 34 insertions(+), 34 deletions(-)
35
36 diff --git a/dev-libs/libqtxdg/libqtxdg-9999.ebuild b/dev-libs/libqtxdg/libqtxdg-9999.ebuild
37 index f01b3321..60e5c259 100644
38 --- a/dev-libs/libqtxdg/libqtxdg-9999.ebuild
39 +++ b/dev-libs/libqtxdg/libqtxdg-9999.ebuild
40 @@ -3,7 +3,7 @@
41
42 EAPI=7
43
44 -inherit cmake-utils virtualx
45 +inherit cmake virtualx
46
47 DESCRIPTION="A Qt implementation of XDG standards"
48 HOMEPAGE="https://lxqt.org/"
49 @@ -41,10 +41,10 @@ src_configure() {
50 local mycmakeargs=(
51 -DBUILD_TESTS=$(usex test)
52 )
53 - cmake-utils_src_configure
54 + cmake_src_configure
55 }
56
57 src_test() {
58 # Tests don't work with C
59 - LC_ALL=en_US.utf8 virtx cmake-utils_src_test
60 + LC_ALL=en_US.utf8 virtx cmake_src_test
61 }
62
63 diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild
64 index 7cd05ead..1a30d8ad 100644
65 --- a/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild
66 +++ b/dev-util/lxqt-build-tools/lxqt-build-tools-9999.ebuild
67 @@ -3,7 +3,7 @@
68
69 EAPI=7
70
71 -inherit cmake-utils
72 +inherit cmake
73
74 DESCRIPTION="LXQt Build tools"
75 HOMEPAGE="https://lxqt.org/"
76
77 diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild
78 index 12f74412..16c596e9 100644
79 --- a/lxqt-base/liblxqt/liblxqt-9999.ebuild
80 +++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild
81 @@ -3,7 +3,7 @@
82
83 EAPI=7
84
85 -inherit cmake-utils
86 +inherit cmake
87
88 DESCRIPTION="Common base library for the LXQt desktop environment"
89 HOMEPAGE="https://lxqt.org/"
90 @@ -45,5 +45,5 @@ src_configure() {
91 local mycmakeargs=(
92 -DBUILD_BACKLIGHT_LINUX_BACKEND=$(usex backlight)
93 )
94 - cmake-utils_src_configure
95 + cmake_src_configure
96 }
97
98 diff --git a/lxqt-base/libsysstat/libsysstat-9999.ebuild b/lxqt-base/libsysstat/libsysstat-9999.ebuild
99 index fe2f2307..501c9a8d 100644
100 --- a/lxqt-base/libsysstat/libsysstat-9999.ebuild
101 +++ b/lxqt-base/libsysstat/libsysstat-9999.ebuild
102 @@ -3,7 +3,7 @@
103
104 EAPI=7
105
106 -inherit cmake-utils
107 +inherit cmake
108
109 DESCRIPTION="A Qt-based interface to system statistics"
110 HOMEPAGE="https://lxqt.org/"
111
112 diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
113 index 786aab0f..34a17829 100644
114 --- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
115 +++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
116 @@ -3,7 +3,7 @@
117
118 EAPI=7
119
120 -inherit cmake-utils
121 +inherit cmake
122
123 DESCRIPTION="LXQt about dialog"
124 HOMEPAGE="https://lxqt.org/"
125
126 diff --git a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
127 index 6675bd34..fe244eac 100644
128 --- a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
129 +++ b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
130 @@ -3,7 +3,7 @@
131
132 EAPI=7
133
134 -inherit cmake-utils
135 +inherit cmake
136
137 DESCRIPTION="LXQt system administration tool"
138 HOMEPAGE="https://lxqt.org/"
139
140 diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
141 index 21fcecfc..8de668d9 100644
142 --- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
143 +++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
144 @@ -3,7 +3,7 @@
145
146 EAPI=7
147
148 -inherit cmake-utils xdg-utils
149 +inherit cmake xdg-utils
150
151 DESCRIPTION="LXQt system configuration control center"
152 HOMEPAGE="https://lxqt.org/"
153 @@ -56,11 +56,11 @@ src_configure() {
154 -DWITH_MONITOR="$(usex monitor)"
155 -DWITH_TOUCHPAD="$(usex touchpad)"
156 )
157 - cmake-utils_src_configure
158 + cmake_src_configure
159 }
160
161 src_install() {
162 - cmake-utils_src_install
163 + cmake_src_install
164 doman man/*.1 liblxqt-config-cursor/man/*.1 lxqt-config-appearance/man/*.1
165 }
166
167
168 diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
169 index f3b8ab5a..a61f9b60 100644
170 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
171 +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
172 @@ -3,7 +3,7 @@
173
174 EAPI=7
175
176 -inherit cmake-utils
177 +inherit cmake
178
179 DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
180 HOMEPAGE="https://lxqt.org/"
181
182 diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
183 index 5253f013..264768e9 100644
184 --- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
185 +++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
186 @@ -3,7 +3,7 @@
187
188 EAPI=7
189
190 -inherit cmake-utils
191 +inherit cmake
192
193 DESCRIPTION="LXQt notification daemon and library"
194 HOMEPAGE="https://lxqt.org/"
195
196 diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
197 index 333f665d..4c263bbf 100644
198 --- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
199 +++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
200 @@ -3,7 +3,7 @@
201
202 EAPI=7
203
204 -inherit cmake-utils
205 +inherit cmake
206
207 DESCRIPTION="LXQt OpenSSH user password prompt tool"
208 HOMEPAGE="https://lxqt.org/"
209 @@ -32,7 +32,7 @@ RDEPEND="
210 DEPEND="${RDEPEND}"
211
212 src_install(){
213 - cmake-utils_src_install
214 + cmake_src_install
215 doman man/*.1
216
217 echo "SSH_ASKPASS='${EPREFIX}/usr/bin/lxqt-openssh-askpass'" >> "${T}/99${PN}" \
218
219 diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
220 index 720609ef..8c23822a 100644
221 --- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
222 +++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
223 @@ -3,7 +3,7 @@
224
225 EAPI=7
226
227 -inherit cmake-utils
228 +inherit cmake
229
230 DESCRIPTION="LXQt desktop panel and plugins"
231 HOMEPAGE="https://lxqt.org/"
232 @@ -104,10 +104,10 @@ src_configure() {
233 )
234 fi
235
236 - cmake-utils_src_configure
237 + cmake_src_configure
238 }
239
240 src_install(){
241 - cmake-utils_src_install
242 + cmake_src_install
243 doman panel/man/*.1
244 }
245
246 diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
247 index 05a8f641..0864b15c 100644
248 --- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
249 +++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
250 @@ -3,7 +3,7 @@
251
252 EAPI=7
253
254 -inherit cmake-utils
255 +inherit cmake
256
257 DESCRIPTION="LXQt PolKit authentication agent"
258 HOMEPAGE="https://lxqt.org/"
259 @@ -37,6 +37,6 @@ RDEPEND="
260 DEPEND="${RDEPEND}"
261
262 src_install(){
263 - cmake-utils_src_install
264 + cmake_src_install
265 doman man/*.1
266 }
267
268 diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
269 index 1693c9bb..39aa1978 100644
270 --- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
271 +++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
272 @@ -3,7 +3,7 @@
273
274 EAPI=7
275
276 -inherit cmake-utils
277 +inherit cmake
278
279 DESCRIPTION="LXQt daemon for power management and auto-suspend"
280 HOMEPAGE="https://lxqt.org/"
281
282 diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
283 index 2005d054..cf5c8d82 100644
284 --- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
285 +++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
286 @@ -3,7 +3,7 @@
287
288 EAPI=7
289
290 -inherit cmake-utils
291 +inherit cmake
292
293 DESCRIPTION="LXQt system integration plugin for Qt"
294 HOMEPAGE="https://lxqt.org/"
295
296 diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
297 index 74b7d9d1..6189ad6d 100644
298 --- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
299 +++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
300 @@ -3,7 +3,7 @@
301
302 EAPI=7
303
304 -inherit cmake-utils
305 +inherit cmake
306
307 DESCRIPTION="LXQt quick launcher"
308 HOMEPAGE="https://lxqt.org/"
309 @@ -42,6 +42,6 @@ RDEPEND="
310 DEPEND="${RDEPEND}"
311
312 src_install(){
313 - cmake-utils_src_install
314 + cmake_src_install
315 doman man/*.1
316 }
317
318 diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
319 index 63213382..0978b188 100644
320 --- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
321 +++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
322 @@ -3,7 +3,7 @@
323
324 EAPI=7
325
326 -inherit cmake-utils
327 +inherit cmake
328
329 DESCRIPTION="LXQT session manager"
330 HOMEPAGE="https://lxqt.org/"
331 @@ -48,11 +48,11 @@ src_configure() {
332 local mycmakeargs=(
333 -DWITH_LIBUDEV=$(usex udev)
334 )
335 - cmake-utils_src_configure
336 + cmake_src_configure
337 }
338
339 src_install(){
340 - cmake-utils_src_install
341 + cmake_src_install
342 doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
343
344 echo XDG_CONFIG_DIRS=\"${EPREFIX}/usr/share\" >> 91lxqt-config-dir
345
346 diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
347 index 9768a20a..9d7994fc 100644
348 --- a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
349 +++ b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
350 @@ -3,7 +3,7 @@
351
352 EAPI=7
353
354 -inherit cmake-utils
355 +inherit cmake
356
357 DESCRIPTION="LXQt GUI frontend for sudo"
358 HOMEPAGE="https://lxqt.org/"
359
360 diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
361 index 7e74167d..724fa9c4 100644
362 --- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild
363 +++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
364 @@ -3,7 +3,7 @@
365
366 EAPI=7
367
368 -inherit cmake-utils
369 +inherit cmake
370
371 DESCRIPTION="LXImage Image Viewer - GPicView replacement"
372 HOMEPAGE="https://lxqt.org/"
373
374 diff --git a/x11-libs/libfm-qt/libfm-qt-9999.ebuild b/x11-libs/libfm-qt/libfm-qt-9999.ebuild
375 index de820366..8ca92a4a 100644
376 --- a/x11-libs/libfm-qt/libfm-qt-9999.ebuild
377 +++ b/x11-libs/libfm-qt/libfm-qt-9999.ebuild
378 @@ -3,7 +3,7 @@
379
380 EAPI=7
381
382 -inherit cmake-utils
383 +inherit cmake
384
385 DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
386 HOMEPAGE="https://lxqt.org/"
387
388 diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
389 index e2194d81..eec83363 100644
390 --- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild
391 +++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
392 @@ -3,7 +3,7 @@
393
394 EAPI=7
395
396 -inherit cmake-utils xdg-utils
397 +inherit cmake xdg-utils
398
399 DESCRIPTION="Openbox window manager configuration tool"
400 HOMEPAGE="https://lxqt.org/"
401
402 diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
403 index e8f40638..7c8a2f1b 100644
404 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
405 +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
406 @@ -3,7 +3,7 @@
407
408 EAPI=7
409
410 -inherit cmake-utils xdg-utils
411 +inherit cmake xdg-utils
412
413 if [[ "${PV}" == "9999" ]]; then
414 inherit git-r3
415
416 diff --git a/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild b/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild
417 index 8e8ce23c..f8604467 100644
418 --- a/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild
419 +++ b/x11-themes/lxqt-themes/lxqt-themes-9999.ebuild
420 @@ -3,7 +3,7 @@
421
422 EAPI=7
423
424 -inherit cmake-utils
425 +inherit cmake
426
427 DESCRIPTION="Themes, graphics and icons for LXQt"
428 HOMEPAGE="https://lxqt.org/"