Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
Date: Sun, 09 Feb 2020 16:34:45
Message-Id: 1581266059.fd07701bd0cf2f2ff2cd24453d8e7895dd74f2d8.mgorny@gentoo
1 commit: fd07701bd0cf2f2ff2cd24453d8e7895dd74f2d8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 17:40:55 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:34:19 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd07701b
7
8 net-wireless/gnuradio: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild | 36 +++++----
13 ....13.5-r2.ebuild => gnuradio-3.7.13.5-r3.ebuild} | 91 ++++++++++++----------
14 net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 72 +++++++++--------
15 net-wireless/gnuradio/gnuradio-9999.ebuild | 68 ++++++++--------
16 4 files changed, 143 insertions(+), 124 deletions(-)
17
18 diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
19 index 5c9dcc31678..a38d393dfeb 100644
20 --- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
21 +++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2018 Gentoo Foundation
24 +# Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=5
28 @@ -35,21 +35,25 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
29 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
30 RDEPEND="${PYTHON_DEPS}
31 >=dev-lang/orc-0.4.12
32 - dev-libs/boost:0=[${PYTHON_USEDEP}]
33 + $(python_gen_cond_dep '
34 + dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
35 + ')
36 !<=dev-libs/boost-1.52.0-r6:0/1.52
37 dev-util/cppunit
38 sci-libs/fftw:3.0=
39 fcd? ( virtual/libusb:1 )
40 alsa? (
41 - media-libs/alsa-lib[${PYTHON_USEDEP}]
42 + media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
43 )
44 grc? (
45 - dev-python/lxml[${PYTHON_USEDEP}]
46 - || (
47 - dev-python/numpy-python2[${PYTHON_USEDEP}]
48 - dev-python/numpy[${PYTHON_USEDEP}]
49 - )
50 - dev-python/pygtk:2[${PYTHON_USEDEP}]
51 + $(python_gen_cond_dep '
52 + dev-python/lxml[${PYTHON_MULTI_USEDEP}]
53 + || (
54 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
55 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
56 + )
57 + dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
58 + ')
59 )
60 jack? (
61 media-sound/jack-audio-connection-kit
62 @@ -58,19 +62,21 @@ RDEPEND="${PYTHON_DEPS}
63 >=media-libs/portaudio-19_pre
64 )
65 sdl? ( media-libs/libsdl )
66 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
67 + uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
68 wavelet? (
69 sci-libs/gsl
70 )
71 "
72 DEPEND="${RDEPEND}
73 dev-lang/swig
74 - dev-python/cheetah[${PYTHON_USEDEP}]
75 virtual/pkgconfig
76 - doc? (
77 - >=app-doc/doxygen-1.5.7.1
78 - dev-python/sphinx[${PYTHON_USEDEP}]
79 - )
80 + $(python_gen_cond_dep '
81 + dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
82 + doc? (
83 + >=app-doc/doxygen-1.5.7.1
84 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
85 + )
86 + ')
87 grc? (
88 x11-misc/xdg-utils
89 )
90
91 diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
92 similarity index 84%
93 rename from net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
94 rename to net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
95 index dec78f161e8..a73f9f65dc6 100644
96 --- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r2.ebuild
97 +++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
98 @@ -50,30 +50,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
99 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
100 RDEPEND="${PYTHON_DEPS}
101 >=dev-lang/orc-0.4.12
102 - dev-libs/boost:0=[python,${PYTHON_USEDEP}]
103 !<=dev-libs/boost-1.52.0-r6:0/1.52
104 - dev-python/mako[${PYTHON_USEDEP}]
105 - dev-python/six[${PYTHON_USEDEP}]
106 sci-libs/fftw:3.0=
107 alsa? (
108 media-libs/alsa-lib:=
109 )
110 fcd? ( virtual/libusb:1 )
111 - filter? (
112 - || (
113 - sci-libs/scipy-python2[${PYTHON_USEDEP}]
114 - sci-libs/scipy[${PYTHON_USEDEP}]
115 - )
116 - )
117 - grc? (
118 - dev-python/cheetah[${PYTHON_USEDEP}]
119 - dev-python/lxml[${PYTHON_USEDEP}]
120 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
121 - || (
122 - dev-python/numpy-python2[${PYTHON_USEDEP}]
123 - dev-python/numpy[${PYTHON_USEDEP}]
124 - )
125 - )
126 jack? (
127 media-sound/jack-audio-connection-kit
128 )
129 @@ -81,44 +63,67 @@ RDEPEND="${PYTHON_DEPS}
130 portaudio? (
131 >=media-libs/portaudio-19_pre
132 )
133 - qt5? (
134 - dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
135 - dev-qt/qtcore:5
136 - dev-qt/qtgui:5
137 - x11-libs/qwt:6[qt5(+)]
138 - dev-qt/qtwidgets:5
139 - )
140 sdl? ( >=media-libs/libsdl-1.2.0 )
141 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
142 - utils? (
143 - || (
144 - dev-python/matplotlib-python2[${PYTHON_USEDEP}]
145 - dev-python/matplotlib[${PYTHON_USEDEP}]
146 - )
147 - )
148 + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
149 vocoder? ( media-sound/gsm
150 >=media-libs/codec2-0.8.1 )
151 wavelet? (
152 >=sci-libs/gsl-1.10
153 )
154 - wxwidgets? (
155 - dev-python/wxpython:3.0[${PYTHON_USEDEP}]
156 - || (
157 - dev-python/numpy-python2[${PYTHON_USEDEP}]
158 - dev-python/numpy[${PYTHON_USEDEP}]
159 - )
160 - )
161 zeromq? ( >=net-libs/zeromq-2.1.11 )
162 + $(python_gen_cond_dep '
163 + dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
164 + dev-python/mako[${PYTHON_MULTI_USEDEP}]
165 + dev-python/six[${PYTHON_MULTI_USEDEP}]
166 + filter? (
167 + || (
168 + sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
169 + sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
170 + )
171 + )
172 + grc? (
173 + dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
174 + dev-python/lxml[${PYTHON_MULTI_USEDEP}]
175 + >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
176 + || (
177 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
178 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
179 + )
180 + )
181 + qt5? (
182 + dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
183 + dev-qt/qtcore:5
184 + dev-qt/qtgui:5
185 + x11-libs/qwt:6[qt5(+)]
186 + dev-qt/qtwidgets:5
187 + )
188 + utils? (
189 + || (
190 + dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
191 + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
192 + )
193 + )
194 + wxwidgets? (
195 + dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
196 + || (
197 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
198 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
199 + )
200 + )
201 + ')
202 "
203
204 DEPEND="${RDEPEND}
205 app-text/docbook-xml-dtd:4.2
206 >=dev-lang/swig-3.0.5
207 virtual/pkgconfig
208 - doc? (
209 - >=app-doc/doxygen-1.5.7.1
210 - dev-python/sphinx[${PYTHON_USEDEP}]
211 - )
212 + $(python_gen_cond_dep '
213 + dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
214 + doc? (
215 + >=app-doc/doxygen-1.5.7.1
216 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
217 + )
218 + ')
219 grc? ( x11-misc/xdg-utils )
220 oss? ( virtual/os-headers )
221 test? ( >=dev-util/cppunit-1.9.14 )
222
223 diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
224 index 8c07aa105ae..f8ecf5a7787 100644
225 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
226 +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
227 @@ -47,30 +47,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
228 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
229 RDEPEND="${PYTHON_DEPS}
230 >=dev-lang/orc-0.4.12
231 - dev-libs/boost:0=[${PYTHON_USEDEP}]
232 - !<=dev-libs/boost-1.52.0-r6:0/1.52
233 - dev-python/mako[${PYTHON_USEDEP}]
234 - dev-python/six[${PYTHON_USEDEP}]
235 sci-libs/fftw:3.0=
236 alsa? (
237 media-libs/alsa-lib:=
238 )
239 fcd? ( virtual/libusb:1 )
240 - filter? (
241 - || (
242 - sci-libs/scipy-python2[${PYTHON_USEDEP}]
243 - sci-libs/scipy[${PYTHON_USEDEP}]
244 - )
245 - )
246 - grc? (
247 - dev-python/cheetah[${PYTHON_USEDEP}]
248 - dev-python/lxml[${PYTHON_USEDEP}]
249 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
250 - || (
251 - dev-python/numpy-python2[${PYTHON_USEDEP}]
252 - dev-python/numpy[${PYTHON_USEDEP}]
253 - )
254 - )
255 jack? (
256 media-sound/jack-audio-connection-kit
257 )
258 @@ -79,26 +60,47 @@ RDEPEND="${PYTHON_DEPS}
259 >=media-libs/portaudio-19_pre
260 )
261 sdl? ( >=media-libs/libsdl-1.2.0 )
262 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
263 - utils? (
264 - || (
265 - dev-python/matplotlib-python2[${PYTHON_USEDEP}]
266 - dev-python/matplotlib[${PYTHON_USEDEP}]
267 - )
268 - )
269 + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
270 vocoder? ( media-sound/gsm
271 >=media-libs/codec2-0.8.1 )
272 wavelet? (
273 >=sci-libs/gsl-1.10
274 )
275 - wxwidgets? (
276 - dev-python/wxpython:3.0[${PYTHON_USEDEP}]
277 - || (
278 - dev-python/numpy-python2[${PYTHON_USEDEP}]
279 - dev-python/numpy[${PYTHON_USEDEP}]
280 - )
281 - )
282 zeromq? ( >=net-libs/zeromq-2.1.11 )
283 + $(python_gen_cond_dep '
284 + dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
285 + !<=dev-libs/boost-1.52.0-r6:0/1.52
286 + dev-python/mako[${PYTHON_MULTI_USEDEP}]
287 + dev-python/six[${PYTHON_MULTI_USEDEP}]
288 + filter? (
289 + || (
290 + sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
291 + sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
292 + )
293 + )
294 + grc? (
295 + dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
296 + dev-python/lxml[${PYTHON_MULTI_USEDEP}]
297 + >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
298 + || (
299 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
300 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
301 + )
302 + )
303 + utils? (
304 + || (
305 + dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
306 + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
307 + )
308 + )
309 + wxwidgets? (
310 + dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
311 + || (
312 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
313 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
314 + )
315 + )
316 + ')
317 "
318
319 DEPEND="${RDEPEND}
320 @@ -107,7 +109,9 @@ DEPEND="${RDEPEND}
321 virtual/pkgconfig
322 doc? (
323 >=app-doc/doxygen-1.5.7.1
324 - dev-python/sphinx[${PYTHON_USEDEP}]
325 + $(python_gen_cond_dep '
326 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
327 + ')
328 )
329 grc? ( x11-misc/xdg-utils )
330 oss? ( virtual/os-headers )
331
332 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
333 index 6687ca88195..7bbe445db14 100644
334 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
335 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
336 @@ -48,29 +48,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
337 # boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
338 RDEPEND="${PYTHON_DEPS}
339 >=dev-lang/orc-0.4.12
340 - dev-libs/boost:0=[${PYTHON_USEDEP}]
341 !<=dev-libs/boost-1.52.0-r6:0/1.52
342 - || (
343 - dev-python/numpy-python2[${PYTHON_USEDEP}]
344 - dev-python/numpy[${PYTHON_USEDEP}]
345 - )
346 - dev-python/six[${PYTHON_USEDEP}]
347 sci-libs/fftw:3.0=
348 alsa? (
349 media-libs/alsa-lib:=
350 )
351 fcd? ( virtual/libusb:1 )
352 - filter? (
353 - || (
354 - sci-libs/scipy-python2[${PYTHON_USEDEP}]
355 - sci-libs/scipy[${PYTHON_USEDEP}]
356 - )
357 - )
358 - grc? (
359 - dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
360 - dev-python/pyyaml[${PYTHON_USEDEP}]
361 - dev-python/mako[${PYTHON_USEDEP}]
362 - )
363 jack? (
364 media-sound/jack-audio-connection-kit
365 )
366 @@ -78,22 +61,9 @@ RDEPEND="${PYTHON_DEPS}
367 portaudio? (
368 >=media-libs/portaudio-19_pre
369 )
370 - qt5? (
371 - dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
372 - dev-qt/qtcore:5
373 - dev-qt/qtgui:5
374 - dev-qt/qtwidgets:5
375 - x11-libs/qwt:6[qt5(+)]
376 - )
377 sdl? ( >=media-libs/libsdl-1.2.0 )
378 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
379 + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
380 dev-libs/log4cpp )
381 - utils? (
382 - || (
383 - dev-python/matplotlib-python2[${PYTHON_USEDEP}]
384 - dev-python/matplotlib[${PYTHON_USEDEP}]
385 - )
386 - )
387 vocoder? ( media-sound/gsm
388 >=media-libs/codec2-0.8.1 )
389 wavelet? (
390 @@ -101,6 +71,38 @@ RDEPEND="${PYTHON_DEPS}
391 )
392 zeromq? ( >=net-libs/zeromq-2.1.11
393 dev-libs/gmp:= )
394 + $(python_gen_cond_dep '
395 + dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
396 + || (
397 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
398 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
399 + )
400 + dev-python/six[${PYTHON_MULTI_USEDEP}]
401 + filter? (
402 + || (
403 + sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
404 + sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
405 + )
406 + )
407 + grc? (
408 + dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
409 + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
410 + dev-python/mako[${PYTHON_MULTI_USEDEP}]
411 + )
412 + qt5? (
413 + dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
414 + dev-qt/qtcore:5
415 + dev-qt/qtgui:5
416 + dev-qt/qtwidgets:5
417 + x11-libs/qwt:6[qt5(+)]
418 + )
419 + utils? (
420 + || (
421 + dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
422 + dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
423 + )
424 + )
425 + ')
426 "
427
428 DEPEND="${RDEPEND}
429 @@ -109,7 +111,9 @@ DEPEND="${RDEPEND}
430 virtual/pkgconfig
431 doc? (
432 >=app-doc/doxygen-1.5.7.1
433 - dev-python/sphinx[${PYTHON_USEDEP}]
434 + $(python_gen_cond_dep '
435 + dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
436 + ')
437 )
438 grc? ( x11-misc/xdg-utils )
439 oss? ( virtual/os-headers )