Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtscxml/, dev-qt/qtquickcontrols/, dev-qt/qtsensors/, dev-qt/qtdatavis3d/, ...
Date: Wed, 08 Sep 2021 16:55:58
Message-Id: 1631120084.eb5d79adbde868b2d62fd78b6b031ed435483d74.asturm@gentoo
1 commit: eb5d79adbde868b2d62fd78b6b031ed435483d74
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 28 09:06:06 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 8 16:54:44 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb5d79ad
7
8 dev-qt: EAPI-8 bumps, switch from ~PV to =QT5_PV* version dependencies
9
10 Package-Manager: Portage-3.0.22, Repoman-3.0.3
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 ...tooth-5.15.2.ebuild => qtbluetooth-5.15.2-r1.ebuild} | 12 ++++++------
14 ...qtcharts-5.15.2.ebuild => qtcharts-5.15.2-r1.ebuild} | 11 ++++++-----
15 ...vis3d-5.15.2.ebuild => qtdatavis3d-5.15.2-r1.ebuild} | 9 +++++----
16 ....15.2.ebuild => qtgraphicaleffects-5.15.2-r1.ebuild} | 9 +++++----
17 ...edia-5.15.2.ebuild => qtmultimedia-5.15.2-r1.ebuild} | 17 +++++++++--------
18 ...uth-5.15.2.ebuild => qtnetworkauth-5.15.2-r1.ebuild} | 7 ++++---
19 ...ing-5.15.2.ebuild => qtpositioning-5.15.2-r1.ebuild} | 9 +++++----
20 ...s-5.15.2.ebuild => qtquickcontrols-5.15.2-r1.ebuild} | 11 ++++++-----
21 ...e-5.15.2.ebuild => qtquicktimeline-5.15.2-r1.ebuild} | 8 ++++----
22 ...qtscript-5.15.2.ebuild => qtscript-5.15.2-r1.ebuild} | 9 +++++----
23 .../{qtscxml-5.15.2.ebuild => qtscxml-5.15.2-r1.ebuild} | 7 ++++---
24 ...sensors-5.15.2.ebuild => qtsensors-5.15.2-r1.ebuild} | 9 +++++----
25 ...albus-5.15.2.ebuild => qtserialbus-5.15.2-r1.ebuild} | 11 ++++++-----
26 ...port-5.15.2.ebuild => qtserialport-5.15.2-r1.ebuild} | 5 +++--
27 ...nnel-5.15.2.ebuild => qtwebchannel-5.15.2-r1.ebuild} | 7 ++++---
28 ...view-5.15.2-r1.ebuild => qtwebview-5.15.2-r2.ebuild} | 8 ++++----
29 ...xtras-5.15.2.ebuild => qtx11extras-5.15.2-r1.ebuild} | 8 ++++----
30 17 files changed, 85 insertions(+), 72 deletions(-)
31
32 diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
33 similarity index 76%
34 rename from dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild
35 rename to dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
36 index ab26257c7e4..1a88564f814 100644
37 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild
38 +++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
39 @@ -1,7 +1,7 @@
40 # Copyright 1999-2021 Gentoo Authors
41 # Distributed under the terms of the GNU General Public License v2
42
43 -EAPI=7
44 +EAPI=8
45
46 QT5_MODULE="qtconnectivity"
47 inherit qt5-build
48 @@ -15,14 +15,14 @@ fi
49 IUSE="qml"
50
51 RDEPEND="
52 - ~dev-qt/qtconcurrent-${PV}
53 - ~dev-qt/qtcore-${PV}:5=
54 - ~dev-qt/qtdbus-${PV}
55 + =dev-qt/qtconcurrent-${QT5_PV}*
56 + =dev-qt/qtcore-${QT5_PV}*:5=
57 + =dev-qt/qtdbus-${QT5_PV}*
58 >=net-wireless/bluez-5:=
59 - qml? ( ~dev-qt/qtdeclarative-${PV} )
60 + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
61 "
62 DEPEND="${RDEPEND}
63 - ~dev-qt/qtnetwork-${PV}
64 + =dev-qt/qtnetwork-${QT5_PV}*
65 "
66
67 PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012
68
69 diff --git a/dev-qt/qtcharts/qtcharts-5.15.2.ebuild b/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
70 similarity index 76%
71 rename from dev-qt/qtcharts/qtcharts-5.15.2.ebuild
72 rename to dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
73 index f9ace093194..a23f9413e20 100644
74 --- a/dev-qt/qtcharts/qtcharts-5.15.2.ebuild
75 +++ b/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
76 @@ -1,7 +1,8 @@
77 # Copyright 1999-2021 Gentoo Authors
78 # Distributed under the terms of the GNU General Public License v2
79
80 -EAPI=7
81 +EAPI=8
82 +
83 inherit qt5-build
84
85 DESCRIPTION="Chart component library for the Qt5 framework"
86 @@ -14,10 +15,10 @@ fi
87 IUSE="qml"
88
89 DEPEND="
90 - ~dev-qt/qtcore-${PV}
91 - ~dev-qt/qtgui-${PV}
92 - ~dev-qt/qtwidgets-${PV}
93 - qml? ( ~dev-qt/qtdeclarative-${PV} )
94 + =dev-qt/qtcore-${QT5_PV}*
95 + =dev-qt/qtgui-${QT5_PV}*
96 + =dev-qt/qtwidgets-${QT5_PV}*
97 + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
98 "
99 RDEPEND="${DEPEND}"
100
101
102 diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
103 similarity index 80%
104 rename from dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild
105 rename to dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
106 index 46e32e2b4d7..4963f2fe39a 100644
107 --- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2.ebuild
108 +++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
109 @@ -1,7 +1,8 @@
110 # Copyright 1999-2021 Gentoo Authors
111 # Distributed under the terms of the GNU General Public License v2
112
113 -EAPI=7
114 +EAPI=8
115 +
116 inherit qt5-build
117
118 DESCRIPTION="3D data visualization library for the Qt5 framework"
119 @@ -14,9 +15,9 @@ fi
120 IUSE="gles2-only qml"
121
122 DEPEND="
123 - ~dev-qt/qtcore-${PV}
124 - ~dev-qt/qtgui-${PV}[gles2-only=]
125 - qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
126 + =dev-qt/qtcore-${QT5_PV}*
127 + =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
128 + qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
129 "
130 RDEPEND="${DEPEND}"
131
132
133 diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
134 similarity index 79%
135 rename from dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild
136 rename to dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
137 index 4ad065e1ce3..216671e4f05 100644
138 --- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2.ebuild
139 +++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
140 @@ -1,7 +1,8 @@
141 # Copyright 1999-2021 Gentoo Authors
142 # Distributed under the terms of the GNU General Public License v2
143
144 -EAPI=7
145 +EAPI=8
146 +
147 VIRTUALX_REQUIRED="test"
148 inherit qt5-build
149
150 @@ -14,8 +15,8 @@ fi
151 IUSE=""
152
153 RDEPEND="
154 - ~dev-qt/qtcore-${PV}
155 - ~dev-qt/qtdeclarative-${PV}
156 - ~dev-qt/qtgui-${PV}
157 + =dev-qt/qtcore-${QT5_PV}*
158 + =dev-qt/qtdeclarative-${QT5_PV}*
159 + =dev-qt/qtgui-${QT5_PV}*
160 "
161 DEPEND="${RDEPEND}"
162
163 diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
164 similarity index 82%
165 rename from dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
166 rename to dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
167 index d7aa5646506..2ed94944ea3 100644
168 --- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2.ebuild
169 +++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r1.ebuild
170 @@ -1,7 +1,8 @@
171 # Copyright 1999-2021 Gentoo Authors
172 # Distributed under the terms of the GNU General Public License v2
173
174 -EAPI=7
175 +EAPI=8
176 +
177 inherit qt5-build
178
179 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
180 @@ -13,9 +14,9 @@ fi
181 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
182
183 RDEPEND="
184 - ~dev-qt/qtcore-${PV}
185 - ~dev-qt/qtgui-${PV}[gles2-only=]
186 - ~dev-qt/qtnetwork-${PV}
187 + =dev-qt/qtcore-${QT5_PV}*
188 + =dev-qt/qtgui-${QT5_PV}*[gles2-only=]
189 + =dev-qt/qtnetwork-${QT5_PV}*
190 alsa? ( media-libs/alsa-lib )
191 gstreamer? (
192 dev-libs/glib:2
193 @@ -25,13 +26,13 @@ RDEPEND="
194 )
195 pulseaudio? ( media-sound/pulseaudio[glib] )
196 qml? (
197 - ~dev-qt/qtdeclarative-${PV}
198 - gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
199 + =dev-qt/qtdeclarative-${QT5_PV}*
200 + gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
201 openal? ( media-libs/openal )
202 )
203 widgets? (
204 - ~dev-qt/qtopengl-${PV}
205 - ~dev-qt/qtwidgets-${PV}[gles2-only=]
206 + =dev-qt/qtopengl-${QT5_PV}*
207 + =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
208 )
209 "
210 DEPEND="${RDEPEND}
211
212 diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
213 similarity index 83%
214 rename from dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild
215 rename to dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
216 index ab41e5c6f79..427cf618df8 100644
217 --- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2.ebuild
218 +++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
219 @@ -1,7 +1,8 @@
220 # Copyright 1999-2021 Gentoo Authors
221 # Distributed under the terms of the GNU General Public License v2
222
223 -EAPI=7
224 +EAPI=8
225 +
226 inherit qt5-build
227
228 DESCRIPTION="Network authorization library for the Qt5 framework"
229 @@ -14,7 +15,7 @@ fi
230 IUSE=""
231
232 DEPEND="
233 - ~dev-qt/qtcore-${PV}
234 - ~dev-qt/qtnetwork-${PV}
235 + =dev-qt/qtcore-${QT5_PV}*
236 + =dev-qt/qtnetwork-${QT5_PV}*
237 "
238 RDEPEND="${DEPEND}"
239
240 diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
241 similarity index 86%
242 rename from dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild
243 rename to dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
244 index bffa2b8cacf..6154ad6744a 100644
245 --- a/dev-qt/qtpositioning/qtpositioning-5.15.2.ebuild
246 +++ b/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
247 @@ -1,7 +1,8 @@
248 # Copyright 1999-2021 Gentoo Authors
249 # Distributed under the terms of the GNU General Public License v2
250
251 -EAPI=7
252 +EAPI=8
253 +
254 QT5_MODULE="qtlocation"
255 inherit qt5-build
256
257 @@ -14,9 +15,9 @@ fi
258 IUSE="geoclue +qml"
259
260 RDEPEND="
261 - ~dev-qt/qtcore-${PV}
262 - geoclue? ( ~dev-qt/qtdbus-${PV} )
263 - qml? ( ~dev-qt/qtdeclarative-${PV} )
264 + =dev-qt/qtcore-${QT5_PV}*
265 + geoclue? ( =dev-qt/qtdbus-${QT5_PV}* )
266 + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
267 "
268 DEPEND="${RDEPEND}"
269 PDEPEND="
270
271 diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
272 similarity index 81%
273 rename from dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild
274 rename to dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
275 index 91ad5b9e09f..494d453b030 100644
276 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2.ebuild
277 +++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
278 @@ -1,7 +1,8 @@
279 # Copyright 1999-2021 Gentoo Authors
280 # Distributed under the terms of the GNU General Public License v2
281
282 -EAPI=7
283 +EAPI=8
284 +
285 inherit qt5-build
286
287 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
288 @@ -13,10 +14,10 @@ fi
289 IUSE="+widgets"
290
291 DEPEND="
292 - ~dev-qt/qtcore-${PV}
293 - ~dev-qt/qtdeclarative-${PV}
294 - ~dev-qt/qtgui-${PV}
295 - widgets? ( ~dev-qt/qtwidgets-${PV} )
296 + =dev-qt/qtcore-${QT5_PV}*
297 + =dev-qt/qtdeclarative-${QT5_PV}*
298 + =dev-qt/qtgui-${QT5_PV}*
299 + widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
300 "
301 RDEPEND="${DEPEND}"
302
303
304 diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
305 similarity index 71%
306 rename from dev-qt/qtquicktimeline/qtquicktimeline-5.15.2.ebuild
307 rename to dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
308 index bf8d344fb0b..3ba1e4d5dce 100644
309 --- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2.ebuild
310 +++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
311 @@ -1,7 +1,7 @@
312 -# Copyright 1999-2020 Gentoo Authors
313 +# Copyright 1999-2021 Gentoo Authors
314 # Distributed under the terms of the GNU General Public License v2
315
316 -EAPI=7
317 +EAPI=8
318
319 inherit qt5-build
320
321 @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
322 fi
323
324 DEPEND="
325 - ~dev-qt/qtcore-${PV}
326 - ~dev-qt/qtdeclarative-${PV}
327 + =dev-qt/qtcore-${QT5_PV}*
328 + =dev-qt/qtdeclarative-${QT5_PV}*
329 "
330 RDEPEND="${DEPEND}"
331
332 diff --git a/dev-qt/qtscript/qtscript-5.15.2.ebuild b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
333 similarity index 86%
334 rename from dev-qt/qtscript/qtscript-5.15.2.ebuild
335 rename to dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
336 index 65401423502..00e1e6cc737 100644
337 --- a/dev-qt/qtscript/qtscript-5.15.2.ebuild
338 +++ b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
339 @@ -1,7 +1,8 @@
340 # Copyright 1999-2021 Gentoo Authors
341 # Distributed under the terms of the GNU General Public License v2
342
343 -EAPI=7
344 +EAPI=8
345 +
346 inherit qt5-build
347
348 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
349 @@ -13,10 +14,10 @@ fi
350 IUSE="+jit scripttools"
351
352 DEPEND="
353 - ~dev-qt/qtcore-${PV}
354 + =dev-qt/qtcore-${QT5_PV}*
355 scripttools? (
356 - ~dev-qt/qtgui-${PV}
357 - ~dev-qt/qtwidgets-${PV}
358 + =dev-qt/qtgui-${QT5_PV}*
359 + =dev-qt/qtwidgets-${QT5_PV}*
360 )
361 "
362 RDEPEND="${DEPEND}"
363
364 diff --git a/dev-qt/qtscxml/qtscxml-5.15.2.ebuild b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
365 similarity index 82%
366 rename from dev-qt/qtscxml/qtscxml-5.15.2.ebuild
367 rename to dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
368 index 8a38c015dba..03ff5ecc022 100644
369 --- a/dev-qt/qtscxml/qtscxml-5.15.2.ebuild
370 +++ b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
371 @@ -1,7 +1,8 @@
372 # Copyright 1999-2021 Gentoo Authors
373 # Distributed under the terms of the GNU General Public License v2
374
375 -EAPI=7
376 +EAPI=8
377 +
378 inherit qt5-build
379
380 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
381 @@ -13,7 +14,7 @@ fi
382 IUSE=""
383
384 DEPEND="
385 - ~dev-qt/qtcore-${PV}
386 - ~dev-qt/qtdeclarative-${PV}
387 + =dev-qt/qtcore-${QT5_PV}*
388 + =dev-qt/qtdeclarative-${QT5_PV}*
389 "
390 RDEPEND="${DEPEND}"
391
392 diff --git a/dev-qt/qtsensors/qtsensors-5.15.2.ebuild b/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
393 similarity index 81%
394 rename from dev-qt/qtsensors/qtsensors-5.15.2.ebuild
395 rename to dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
396 index 66b45058d70..c28fdfe5440 100644
397 --- a/dev-qt/qtsensors/qtsensors-5.15.2.ebuild
398 +++ b/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
399 @@ -1,7 +1,8 @@
400 # Copyright 1999-2021 Gentoo Authors
401 # Distributed under the terms of the GNU General Public License v2
402
403 -EAPI=7
404 +EAPI=8
405 +
406 inherit qt5-build
407
408 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
409 @@ -14,9 +15,9 @@ fi
410 IUSE="qml"
411
412 RDEPEND="
413 - ~dev-qt/qtcore-${PV}
414 - ~dev-qt/qtdbus-${PV}
415 - qml? ( ~dev-qt/qtdeclarative-${PV} )
416 + =dev-qt/qtcore-${QT5_PV}*
417 + =dev-qt/qtdbus-${QT5_PV}*
418 + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
419 "
420 DEPEND="${RDEPEND}"
421
422
423 diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
424 similarity index 68%
425 rename from dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild
426 rename to dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
427 index 2b783f49966..0d8fd68fa6e 100644
428 --- a/dev-qt/qtserialbus/qtserialbus-5.15.2.ebuild
429 +++ b/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
430 @@ -1,7 +1,8 @@
431 -# Copyright 1999-2020 Gentoo Authors
432 +# Copyright 1999-2021 Gentoo Authors
433 # Distributed under the terms of the GNU General Public License v2
434
435 -EAPI=7
436 +EAPI=8
437 +
438 inherit qt5-build
439
440 DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
441 @@ -13,8 +14,8 @@ fi
442 IUSE=""
443
444 DEPEND="
445 - ~dev-qt/qtcore-${PV}
446 - ~dev-qt/qtnetwork-${PV}
447 - ~dev-qt/qtserialport-${PV}
448 + =dev-qt/qtcore-${QT5_PV}*
449 + =dev-qt/qtnetwork-${QT5_PV}*
450 + =dev-qt/qtserialport-${QT5_PV}*
451 "
452 RDEPEND="${DEPEND}"
453
454 diff --git a/dev-qt/qtserialport/qtserialport-5.15.2.ebuild b/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
455 similarity index 93%
456 rename from dev-qt/qtserialport/qtserialport-5.15.2.ebuild
457 rename to dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
458 index dbbb302a3f9..26e5eb53bd0 100644
459 --- a/dev-qt/qtserialport/qtserialport-5.15.2.ebuild
460 +++ b/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
461 @@ -1,7 +1,8 @@
462 # Copyright 1999-2021 Gentoo Authors
463 # Distributed under the terms of the GNU General Public License v2
464
465 -EAPI=7
466 +EAPI=8
467 +
468 inherit qt5-build
469
470 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
471 @@ -13,7 +14,7 @@ fi
472 IUSE=""
473
474 DEPEND="
475 - ~dev-qt/qtcore-${PV}
476 + =dev-qt/qtcore-${QT5_PV}*
477 virtual/libudev:=
478 "
479 RDEPEND="${DEPEND}"
480
481 diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
482 similarity index 86%
483 rename from dev-qt/qtwebchannel/qtwebchannel-5.15.2.ebuild
484 rename to dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
485 index b5486b450fc..1f5019a95f5 100644
486 --- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2.ebuild
487 +++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
488 @@ -1,7 +1,8 @@
489 # Copyright 1999-2021 Gentoo Authors
490 # Distributed under the terms of the GNU General Public License v2
491
492 -EAPI=7
493 +EAPI=8
494 +
495 inherit qt5-build
496
497 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
498 @@ -13,8 +14,8 @@ fi
499 IUSE="qml"
500
501 DEPEND="
502 - ~dev-qt/qtcore-${PV}
503 - qml? ( ~dev-qt/qtdeclarative-${PV} )
504 + =dev-qt/qtcore-${QT5_PV}*
505 + qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
506 "
507 RDEPEND="${DEPEND}"
508
509
510 diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
511 similarity index 79%
512 rename from dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild
513 rename to dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
514 index d17dd95908f..a1b3c1180fb 100644
515 --- a/dev-qt/qtwebview/qtwebview-5.15.2-r1.ebuild
516 +++ b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
517 @@ -1,7 +1,7 @@
518 # Copyright 1999-2021 Gentoo Authors
519 # Distributed under the terms of the GNU General Public License v2
520
521 -EAPI=7
522 +EAPI=8
523
524 inherit qt5-build
525
526 @@ -14,9 +14,9 @@ fi
527 IUSE=""
528
529 DEPEND="
530 - ~dev-qt/qtcore-${PV}
531 - ~dev-qt/qtdeclarative-${PV}
532 - ~dev-qt/qtgui-${PV}
533 + =dev-qt/qtcore-${QT5_PV}*
534 + =dev-qt/qtdeclarative-${QT5_PV}*
535 + =dev-qt/qtgui-${QT5_PV}*
536 =dev-qt/qtwebengine-${PV}*:5
537 "
538 RDEPEND="${DEPEND}"
539
540 diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
541 similarity index 77%
542 rename from dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild
543 rename to dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
544 index 40e88544ff0..0174763a58f 100644
545 --- a/dev-qt/qtx11extras/qtx11extras-5.15.2.ebuild
546 +++ b/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
547 @@ -1,7 +1,7 @@
548 # Copyright 1999-2021 Gentoo Authors
549 # Distributed under the terms of the GNU General Public License v2
550
551 -EAPI=7
552 +EAPI=8
553
554 inherit qt5-build
555
556 @@ -14,9 +14,9 @@ fi
557 IUSE=""
558
559 RDEPEND="
560 - ~dev-qt/qtcore-${PV}
561 - ~dev-qt/qtgui-${PV}[X]
562 + =dev-qt/qtcore-${QT5_PV}*
563 + =dev-qt/qtgui-${QT5_PV}*[X]
564 "
565 DEPEND="${RDEPEND}
566 - test? ( ~dev-qt/qtwidgets-${PV} )
567 + test? ( =dev-qt/qtwidgets-${QT5_PV}* )
568 "