1 |
commit: 8934bbb6174ce9e379e281eecb02b080583d3d8e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 30 08:08:52 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 30 11:33:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8934bbb6 |
7 |
|
8 |
dev-qt: Switch from ~PV to =QT5_PV* version dependencies |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
dev-qt/qt3d/qt3d-5.15.2-r10.ebuild | 12 ++++++------ |
13 |
dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild | 2 +- |
14 |
dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild | 2 +- |
15 |
dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild | 6 +++--- |
16 |
dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild | 4 ++-- |
17 |
dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild | 14 +++++++------- |
18 |
dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild | 8 ++++---- |
19 |
dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild | 4 ++-- |
20 |
dev-qt/qtsql/qtsql-5.15.2-r10.ebuild | 2 +- |
21 |
dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild | 8 ++++---- |
22 |
dev-qt/qttest/qttest-5.15.2-r10.ebuild | 6 +++--- |
23 |
dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild | 4 ++-- |
24 |
dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild | 6 +++--- |
25 |
dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild | 2 +- |
26 |
dev-qt/qtxml/qtxml-5.15.2-r10.ebuild | 4 ++-- |
27 |
15 files changed, 42 insertions(+), 42 deletions(-) |
28 |
|
29 |
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild |
30 |
index 5d0cb68569d..d62d584d062 100644 |
31 |
--- a/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild |
32 |
+++ b/dev-qt/qt3d/qt3d-5.15.2-r10.ebuild |
33 |
@@ -16,13 +16,13 @@ fi |
34 |
IUSE="gamepad gles2-only qml vulkan" |
35 |
|
36 |
RDEPEND=" |
37 |
- ~dev-qt/qtconcurrent-${PV} |
38 |
- ~dev-qt/qtcore-${PV} |
39 |
- ~dev-qt/qtgui-${PV}:5=[vulkan=] |
40 |
- ~dev-qt/qtnetwork-${PV} |
41 |
+ =dev-qt/qtconcurrent-${QT5_PV}* |
42 |
+ =dev-qt/qtcore-${QT5_PV}* |
43 |
+ =dev-qt/qtgui-${QT5_PV}*:5=[vulkan=] |
44 |
+ =dev-qt/qtnetwork-${QT5_PV}* |
45 |
>=media-libs/assimp-4.0.0 |
46 |
- gamepad? ( ~dev-qt/qtgamepad-${PV} ) |
47 |
- qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] ) |
48 |
+ gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* ) |
49 |
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] ) |
50 |
" |
51 |
DEPEND="${RDEPEND} |
52 |
vulkan? ( dev-util/vulkan-headers ) |
53 |
|
54 |
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild |
55 |
index feb85fe83e0..328a9f14324 100644 |
56 |
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild |
57 |
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild |
58 |
@@ -16,7 +16,7 @@ fi |
59 |
IUSE="" |
60 |
|
61 |
DEPEND=" |
62 |
- ~dev-qt/qtcore-${PV}:5= |
63 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
64 |
" |
65 |
RDEPEND="${DEPEND}" |
66 |
|
67 |
|
68 |
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild |
69 |
index 97954168dbe..c941e4ff22d 100644 |
70 |
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild |
71 |
+++ b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild |
72 |
@@ -16,7 +16,7 @@ fi |
73 |
IUSE="" |
74 |
|
75 |
DEPEND=" |
76 |
- ~dev-qt/qtcore-${PV}:5= |
77 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
78 |
>=sys-apps/dbus-1.4.20 |
79 |
" |
80 |
RDEPEND="${DEPEND}" |
81 |
|
82 |
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild |
83 |
index 70434d09b66..8dcfeeb41e6 100644 |
84 |
--- a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild |
85 |
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild |
86 |
@@ -14,10 +14,10 @@ fi |
87 |
IUSE="evdev qml sdl" |
88 |
|
89 |
DEPEND=" |
90 |
- ~dev-qt/qtcore-${PV} |
91 |
- ~dev-qt/qtgui-${PV}[evdev?] |
92 |
+ =dev-qt/qtcore-${QT5_PV}* |
93 |
+ =dev-qt/qtgui-${QT5_PV}*[evdev?] |
94 |
evdev? ( virtual/libudev:= ) |
95 |
- qml? ( ~dev-qt/qtdeclarative-${PV} ) |
96 |
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) |
97 |
sdl? ( media-libs/libsdl2 ) |
98 |
" |
99 |
RDEPEND="${DEPEND}" |
100 |
|
101 |
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild |
102 |
index 4931c366931..c132f79eb2c 100644 |
103 |
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild |
104 |
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild |
105 |
@@ -15,8 +15,8 @@ fi |
106 |
IUSE="mng" |
107 |
|
108 |
DEPEND=" |
109 |
- ~dev-qt/qtcore-${PV} |
110 |
- ~dev-qt/qtgui-${PV} |
111 |
+ =dev-qt/qtcore-${QT5_PV}* |
112 |
+ =dev-qt/qtgui-${QT5_PV}* |
113 |
media-libs/libwebp:= |
114 |
media-libs/tiff:0 |
115 |
mng? ( media-libs/libmng:= ) |
116 |
|
117 |
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild |
118 |
index bd450762770..e188210cae3 100644 |
119 |
--- a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild |
120 |
+++ b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild |
121 |
@@ -18,16 +18,16 @@ IUSE="" |
122 |
|
123 |
RDEPEND=" |
124 |
dev-libs/icu:= |
125 |
- ~dev-qt/qtcore-${PV} |
126 |
- ~dev-qt/qtdeclarative-${PV} |
127 |
- ~dev-qt/qtgui-${PV} |
128 |
- ~dev-qt/qtnetwork-${PV} |
129 |
- ~dev-qt/qtpositioning-${PV}[qml] |
130 |
- ~dev-qt/qtsql-${PV} |
131 |
+ =dev-qt/qtcore-${QT5_PV}* |
132 |
+ =dev-qt/qtdeclarative-${QT5_PV}* |
133 |
+ =dev-qt/qtgui-${QT5_PV}* |
134 |
+ =dev-qt/qtnetwork-${QT5_PV}* |
135 |
+ =dev-qt/qtpositioning-${QT5_PV}*[qml] |
136 |
+ =dev-qt/qtsql-${QT5_PV}* |
137 |
sys-libs/zlib |
138 |
" |
139 |
DEPEND="${RDEPEND} |
140 |
- ~dev-qt/qtconcurrent-${PV} |
141 |
+ =dev-qt/qtconcurrent-${QT5_PV}* |
142 |
" |
143 |
|
144 |
QT5_TARGET_SUBDIRS=( |
145 |
|
146 |
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild |
147 |
index 871e2ba4d59..5bf7883dbf8 100644 |
148 |
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild |
149 |
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r10.ebuild |
150 |
@@ -17,13 +17,13 @@ fi |
151 |
IUSE="cups gles2-only" |
152 |
|
153 |
RDEPEND=" |
154 |
- ~dev-qt/qtcore-${PV}:5= |
155 |
- ~dev-qt/qtgui-${PV}[gles2-only=] |
156 |
- ~dev-qt/qtwidgets-${PV}[gles2-only=] |
157 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
158 |
+ =dev-qt/qtgui-${QT5_PV}*[gles2-only=] |
159 |
+ =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] |
160 |
cups? ( >=net-print/cups-1.4 ) |
161 |
" |
162 |
DEPEND="${RDEPEND} |
163 |
- test? ( ~dev-qt/qtnetwork-${PV} ) |
164 |
+ test? ( =dev-qt/qtnetwork-${QT5_PV}* ) |
165 |
" |
166 |
|
167 |
QT5_TARGET_SUBDIRS=( |
168 |
|
169 |
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild |
170 |
index c2273fe433d..2ba5257f660 100644 |
171 |
--- a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild |
172 |
+++ b/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild |
173 |
@@ -15,10 +15,10 @@ IUSE="alsa flite" |
174 |
|
175 |
RDEPEND=" |
176 |
>=app-accessibility/speech-dispatcher-0.8.7 |
177 |
- ~dev-qt/qtcore-${PV} |
178 |
+ =dev-qt/qtcore-${QT5_PV}* |
179 |
flite? ( |
180 |
>=app-accessibility/flite-2[alsa?] |
181 |
- ~dev-qt/qtmultimedia-${PV}[alsa?] |
182 |
+ =dev-qt/qtmultimedia-${QT5_PV}*[alsa?] |
183 |
alsa? ( media-libs/alsa-lib ) |
184 |
) |
185 |
" |
186 |
|
187 |
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild |
188 |
index d38357ed20b..5e3139adc38 100644 |
189 |
--- a/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild |
190 |
+++ b/dev-qt/qtsql/qtsql-5.15.2-r10.ebuild |
191 |
@@ -21,7 +21,7 @@ REQUIRED_USE=" |
192 |
" |
193 |
|
194 |
DEPEND=" |
195 |
- ~dev-qt/qtcore-${PV}:5= |
196 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
197 |
freetds? ( dev-db/freetds ) |
198 |
mysql? ( dev-db/mysql-connector-c:= ) |
199 |
oci8? ( dev-db/oracle-instantclient:=[sdk] ) |
200 |
|
201 |
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild |
202 |
index 8ec99ee6442..35c7a6dafaa 100644 |
203 |
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild |
204 |
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r10.ebuild |
205 |
@@ -15,11 +15,11 @@ fi |
206 |
IUSE="" |
207 |
|
208 |
RDEPEND=" |
209 |
- ~dev-qt/qtcore-${PV} |
210 |
- ~dev-qt/qtgui-${PV} |
211 |
- ~dev-qt/qtwidgets-${PV} |
212 |
+ =dev-qt/qtcore-${QT5_PV}* |
213 |
+ =dev-qt/qtgui-${QT5_PV}* |
214 |
+ =dev-qt/qtwidgets-${QT5_PV}* |
215 |
sys-libs/zlib:= |
216 |
" |
217 |
DEPEND="${RDEPEND} |
218 |
- test? ( ~dev-qt/qtxml-${PV} ) |
219 |
+ test? ( =dev-qt/qtxml-${QT5_PV}* ) |
220 |
" |
221 |
|
222 |
diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild |
223 |
index c662b55cdf2..31c93a57448 100644 |
224 |
--- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild |
225 |
+++ b/dev-qt/qttest/qttest-5.15.2-r10.ebuild |
226 |
@@ -17,12 +17,12 @@ fi |
227 |
IUSE="" |
228 |
|
229 |
RDEPEND=" |
230 |
- ~dev-qt/qtcore-${PV}:5= |
231 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
232 |
" |
233 |
DEPEND="${RDEPEND} |
234 |
test? ( |
235 |
- ~dev-qt/qtgui-${PV} |
236 |
- ~dev-qt/qtxml-${PV} |
237 |
+ =dev-qt/qtgui-${QT5_PV}* |
238 |
+ =dev-qt/qtxml-${QT5_PV}* |
239 |
) |
240 |
" |
241 |
|
242 |
|
243 |
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild |
244 |
index f45c8d00c60..f5f2653d1d4 100644 |
245 |
--- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild |
246 |
+++ b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild |
247 |
@@ -14,5 +14,5 @@ fi |
248 |
|
249 |
IUSE="" |
250 |
|
251 |
-DEPEND="=dev-qt/qtcore-${PV}*" |
252 |
-BDEPEND="=dev-qt/linguist-tools-${PV}*" |
253 |
+DEPEND="=dev-qt/qtcore-${QT5_PV}*" |
254 |
+BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*" |
255 |
|
256 |
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild |
257 |
index 5910e9c5d92..8dad56cf5ae 100644 |
258 |
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild |
259 |
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild |
260 |
@@ -15,9 +15,9 @@ fi |
261 |
IUSE="qml +ssl" |
262 |
|
263 |
DEPEND=" |
264 |
- ~dev-qt/qtcore-${PV} |
265 |
- ~dev-qt/qtnetwork-${PV}[ssl=] |
266 |
- qml? ( ~dev-qt/qtdeclarative-${PV} ) |
267 |
+ =dev-qt/qtcore-${QT5_PV}* |
268 |
+ =dev-qt/qtnetwork-${QT5_PV}*[ssl=] |
269 |
+ qml? ( =dev-qt/qtdeclarative-${QT5_PV}* ) |
270 |
|
271 |
" |
272 |
RDEPEND="${DEPEND}" |
273 |
|
274 |
diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild |
275 |
index a1b3c1180fb..29f8f003612 100644 |
276 |
--- a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild |
277 |
+++ b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild |
278 |
@@ -17,6 +17,6 @@ DEPEND=" |
279 |
=dev-qt/qtcore-${QT5_PV}* |
280 |
=dev-qt/qtdeclarative-${QT5_PV}* |
281 |
=dev-qt/qtgui-${QT5_PV}* |
282 |
- =dev-qt/qtwebengine-${PV}*:5 |
283 |
+ =dev-qt/qtwebengine-${QT5_PV}*:5 |
284 |
" |
285 |
RDEPEND="${DEPEND}" |
286 |
|
287 |
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild |
288 |
index 27bede818a8..196504a0765 100644 |
289 |
--- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild |
290 |
+++ b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild |
291 |
@@ -16,10 +16,10 @@ fi |
292 |
IUSE="" |
293 |
|
294 |
RDEPEND=" |
295 |
- ~dev-qt/qtcore-${PV}:5= |
296 |
+ =dev-qt/qtcore-${QT5_PV}*:5= |
297 |
" |
298 |
DEPEND="${RDEPEND} |
299 |
- test? ( ~dev-qt/qtnetwork-${PV} ) |
300 |
+ test? ( =dev-qt/qtnetwork-${QT5_PV}* ) |
301 |
" |
302 |
|
303 |
QT5_TARGET_SUBDIRS=( |