Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
Date: Wed, 24 Oct 2018 14:30:51
Message-Id: 1540391418.960210d67a8a1bd7c32493a4a3831d01efd98bef.zerochaos@gentoo
1 commit: 960210d67a8a1bd7c32493a4a3831d01efd98bef
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 24 14:28:13 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 24 14:30:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960210d6
7
8 net-wireless/gnuradio: match upstream development
9
10 next branch (3.8.9999) is deprecated and merged to master, so basically
11 one less branch for us to track now
12
13 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
14 Package-Manager: Portage-2.3.51, Repoman-2.3.11
15
16 net-wireless/gnuradio/gnuradio-3.7.9999.ebuild | 4 +-
17 net-wireless/gnuradio/gnuradio-3.8.9999.ebuild | 248 -------------------------
18 net-wireless/gnuradio/gnuradio-9999.ebuild | 52 +++---
19 3 files changed, 24 insertions(+), 280 deletions(-)
20
21 diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
22 index 3b3053625af..eaeda20092f 100644
23 --- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
24 +++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
25 @@ -22,8 +22,6 @@ else
26 fi
27 if [[ ${PV} == "3.7.9999" ]]; then
28 EGIT_BRANCH="maint-3.7"
29 -elif [[ ${PV} == "3.8.9999" ]]; then
30 - EGIT_BRANCH="next"
31 fi
32
33 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
34 @@ -103,7 +101,7 @@ DEPEND="${RDEPEND}
35 src_prepare() {
36 gnome2_environment_reset #534582
37
38 - if [[ ${PV} == "3.8.9999" ]]; then
39 + if [[ ${PV} == "9999" ]]; then
40 true
41 else
42 epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
43
44 diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
45 deleted file mode 100644
46 index cdc3acd6eeb..00000000000
47 --- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
48 +++ /dev/null
49 @@ -1,248 +0,0 @@
50 -# Copyright 1999-2018 Gentoo Authors
51 -# Distributed under the terms of the GNU General Public License v2
52 -
53 -EAPI=6
54 -PYTHON_COMPAT=( python2_7 )
55 -
56 -CMAKE_BUILD_TYPE="None"
57 -inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
58 -
59 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
60 -HOMEPAGE="https://www.gnuradio.org/"
61 -LICENSE="GPL-3"
62 -SLOT="0/${PV}"
63 -
64 -if [[ ${PV} =~ "9999" ]]; then
65 - EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
66 - inherit git-r3
67 - KEYWORDS=""
68 -else
69 - SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
70 - KEYWORDS="~amd64 ~arm ~x86"
71 -fi
72 -if [[ ${PV} == "3.7.9999" ]]; then
73 - EGIT_BRANCH="maint"
74 -elif [[ ${PV} == "3.8.9999" ]]; then
75 - EGIT_BRANCH="next"
76 -fi
77 -
78 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
79 -
80 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
81 - audio? ( || ( alsa oss jack portaudio ) )
82 - alsa? ( audio )
83 - oss? ( audio )
84 - jack? ( audio )
85 - portaudio? ( audio )
86 - analog? ( filter )
87 - digital? ( filter analog )
88 - dtv? ( fec )
89 - pager? ( filter analog )
90 - qt5? ( filter )
91 - uhd? ( filter analog )
92 - fcd? ( || ( alsa oss ) )
93 - wavelet? ( analog )
94 - wxwidgets? ( filter analog )"
95 -
96 -# bug #348206
97 -# comedi? ( >=sci-electronics/comedilib-0.8 )
98 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
99 -RDEPEND="${PYTHON_DEPS}
100 - >=dev-lang/orc-0.4.12
101 - dev-libs/boost:0=[${PYTHON_USEDEP}]
102 - !<=dev-libs/boost-1.52.0-r6:0/1.52
103 - dev-python/numpy[${PYTHON_USEDEP}]
104 - dev-python/six[${PYTHON_USEDEP}]
105 - sci-libs/fftw:3.0=
106 - alsa? (
107 - media-libs/alsa-lib:=
108 - )
109 - fcd? ( virtual/libusb:1 )
110 - filter? ( sci-libs/scipy )
111 - grc? (
112 - dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
113 - dev-python/pyyaml[${PYTHON_USEDEP}]
114 - dev-python/mako[${PYTHON_USEDEP}]
115 - )
116 - jack? (
117 - media-sound/jack-audio-connection-kit
118 - )
119 - log? ( dev-libs/log4cpp )
120 - portaudio? (
121 - >=media-libs/portaudio-19_pre
122 - )
123 - qt5? (
124 - dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
125 - dev-qt/qtcore:5
126 - dev-qt/qtgui:5
127 - dev-qt/qtwidgets:5
128 - x11-libs/qwt:6[qt5(+)]
129 - )
130 - sdl? ( >=media-libs/libsdl-1.2.0 )
131 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
132 - dev-libs/log4cpp )
133 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
134 - vocoder? ( media-sound/gsm
135 - >=media-libs/codec2-0.8.1 )
136 - wavelet? (
137 - >=sci-libs/gsl-1.10
138 - )
139 - zeromq? ( >=net-libs/zeromq-2.1.11 )
140 - "
141 -
142 -DEPEND="${RDEPEND}
143 - app-text/docbook-xml-dtd:4.2
144 - >=dev-lang/swig-3.0.5
145 - virtual/pkgconfig
146 - doc? (
147 - >=app-doc/doxygen-1.5.7.1
148 - dev-python/sphinx[${PYTHON_USEDEP}]
149 - )
150 - grc? ( x11-misc/xdg-utils )
151 - oss? ( virtual/os-headers )
152 - test? ( >=dev-util/cppunit-1.9.14 )
153 - zeromq? ( net-libs/cppzmq )
154 -"
155 -
156 -src_prepare() {
157 - gnome2_environment_reset #534582
158 -
159 - if [[ ${PV} == "3.8.9999" ]]; then
160 - true
161 - else
162 - epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
163 - fi
164 - # Useless UI element would require qt3support, bug #365019
165 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
166 -
167 - use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
168 - use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
169 - use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
170 -
171 - cmake-utils_src_prepare
172 -}
173 -
174 -src_configure() {
175 - python_export PYTHON_SITEDIR
176 - mycmakeargs=(
177 - -DENABLE_DEFAULT=OFF
178 - -DENABLE_GNURADIO_RUNTIME=ON
179 - -DENABLE_VOLK=ON
180 - -DENABLE_PYTHON=ON
181 - -DENABLE_GR_BLOCKS=ON
182 - -DENABLE_GR_FFT=ON
183 - -DENABLE_GR_AUDIO=ON
184 - -DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
185 - -DENABLE_GR_ANALOG="$(usex analog)"
186 - -DENABLE_GR_ATSC="$(usex atsc)"
187 - -DENABLE_GR_CHANNELS="$(usex channels)"
188 - -DENABLE_GR_DIGITAL="$(usex digital)"
189 - -DENABLE_DOXYGEN="$(usex doc)"
190 - -DENABLE_SPHINX="$(usex doc)"
191 - -DENABLE_GR_DTV="$(usex dtv)"
192 - -DENABLE_GR_FCD="$(usex fcd)"
193 - -DENABLE_GR_FEC="$(usex fec)"
194 - -DENABLE_GR_FILTER="$(usex filter)"
195 - -DENABLE_GRC="$(usex grc)"
196 - -DENABLE_GR_AUDIO_JACK="$(usex jack)"
197 - -DENABLE_GR_LOG="$(usex log)"
198 - -DENABLE_GR_NOAA="$(usex noaa)"
199 - -DENABLE_GR_AUDIO_OSS="$(usex oss)"
200 - -DENABLE_GR_PAGER="$(usex pager)"
201 - -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
202 - -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
203 - -DENABLE_TESTING="$(usex test)"
204 - -DENABLE_GR_TRELLIS="$(usex trellis)"
205 - -DENABLE_GR_UHD="$(usex uhd)"
206 - -DENABLE_GR_UTILS="$(usex utils)"
207 - -DENABLE_GR_VOCODER="$(usex vocoder)"
208 - -DENABLE_GR_WAVELET="$(usex wavelet)"
209 - -DENABLE_GR_QTGUI="$(usex qt5)"
210 - -DDESIRED_QT_VERSION="$(usex qt5 5)"
211 - -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
212 - -DENABLE_GR_ZEROMQ="$(usex zeromq)"
213 - -DENABLE_GR_CORE=ON
214 - -DSYSCONFDIR="${EPREFIX}"/etc
215 - -DPYTHON_EXECUTABLE="${PYTHON}"
216 - -DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
217 - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
218 - )
219 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
220 - cmake-utils_src_configure
221 -}
222 -
223 -src_install() {
224 - cmake-utils_src_install
225 -
226 - if use examples ; then
227 - dodir /usr/share/doc/${PF}/
228 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
229 - docompress -x /usr/share/doc/${PF}/examples
230 - else
231 - # It seems that the examples are always installed
232 - rm -rf "${ED}"/usr/share/${PN}/examples || die
233 - fi
234 -
235 - if use doc || use examples; then
236 - #this doesn't appear useful
237 - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
238 - fi
239 -
240 - # We install the mimetypes to the correct locations from the ebuild
241 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
242 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
243 -
244 - # Install icons, menu items and mime-types for GRC
245 - if use grc ; then
246 - local fd_path="${S}/grc/scripts/freedesktop"
247 - insinto /usr/share/mime/packages
248 - doins "${fd_path}/${PN}-grc.xml"
249 -
250 - domenu "${fd_path}/"*.desktop
251 - doicon "${fd_path}/"*.png
252 - fi
253 -
254 - python_fix_shebang "${ED}"
255 -}
256 -
257 -src_test()
258 -{
259 - ctest -E qtgui
260 -}
261 -
262 -pkg_postinst()
263 -{
264 - local GRC_ICON_SIZES="32 48 64 128 256"
265 -
266 - if use grc ; then
267 - xdg_desktop_database_update
268 - xdg_mimeinfo_database_update
269 - for size in ${GRC_ICON_SIZES} ; do
270 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
271 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
272 - || die "icon resource installation failed"
273 - xdg-icon-resource install --noupdate --context apps --size ${size} \
274 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
275 - || die "icon resource installation failed"
276 - done
277 - xdg-icon-resource forceupdate
278 - fi
279 -}
280 -
281 -pkg_postrm()
282 -{
283 - local GRC_ICON_SIZES="32 48 64 128 256"
284 -
285 - if use grc ; then
286 - xdg_desktop_database_update
287 - xdg_mimeinfo_database_update
288 - for size in ${GRC_ICON_SIZES} ; do
289 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
290 - application-gnuradio-grc || ewarn "icon uninstall failed"
291 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
292 - gnuradio-grc || ewarn "icon uninstall failed"
293 -
294 - done
295 - xdg-icon-resource forceupdate
296 - fi
297 -}
298
299 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
300 index 6d225009790..d5a75330aee 100644
301 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
302 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
303 @@ -5,7 +5,7 @@ EAPI=6
304 PYTHON_COMPAT=( python2_7 )
305
306 CMAKE_BUILD_TYPE="None"
307 -inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
308 +inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
309
310 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
311 HOMEPAGE="https://www.gnuradio.org/"
312 @@ -22,11 +22,9 @@ else
313 fi
314 if [[ ${PV} == "3.7.9999" ]]; then
315 EGIT_BRANCH="maint"
316 -elif [[ ${PV} == "3.8.9999" ]]; then
317 - EGIT_BRANCH="next"
318 fi
319
320 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
321 +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
322
323 REQUIRED_USE="${PYTHON_REQUIRED_USE}
324 audio? ( || ( alsa oss jack portaudio ) )
325 @@ -38,6 +36,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
326 digital? ( filter analog )
327 dtv? ( fec )
328 pager? ( filter analog )
329 + qt5? ( filter )
330 uhd? ( filter analog )
331 fcd? ( || ( alsa oss ) )
332 wavelet? ( analog )
333 @@ -50,8 +49,8 @@ RDEPEND="${PYTHON_DEPS}
334 >=dev-lang/orc-0.4.12
335 dev-libs/boost:0=[${PYTHON_USEDEP}]
336 !<=dev-libs/boost-1.52.0-r6:0/1.52
337 - dev-python/mako[${PYTHON_USEDEP}]
338 dev-python/numpy[${PYTHON_USEDEP}]
339 + dev-python/six[${PYTHON_USEDEP}]
340 sci-libs/fftw:3.0=
341 alsa? (
342 media-libs/alsa-lib:=
343 @@ -59,9 +58,9 @@ RDEPEND="${PYTHON_DEPS}
344 fcd? ( virtual/libusb:1 )
345 filter? ( sci-libs/scipy )
346 grc? (
347 - dev-python/cheetah[${PYTHON_USEDEP}]
348 - dev-python/lxml[${PYTHON_USEDEP}]
349 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
350 + dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
351 + dev-python/pyyaml[${PYTHON_USEDEP}]
352 + dev-python/mako[${PYTHON_USEDEP}]
353 )
354 jack? (
355 media-sound/jack-audio-connection-kit
356 @@ -70,26 +69,29 @@ RDEPEND="${PYTHON_DEPS}
357 portaudio? (
358 >=media-libs/portaudio-19_pre
359 )
360 + qt5? (
361 + dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
362 + dev-qt/qtcore:5
363 + dev-qt/qtgui:5
364 + dev-qt/qtwidgets:5
365 + x11-libs/qwt:6[qt5(+)]
366 + )
367 sdl? ( >=media-libs/libsdl-1.2.0 )
368 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
369 + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}]
370 + dev-libs/log4cpp )
371 utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
372 vocoder? ( media-sound/gsm
373 >=media-libs/codec2-0.8.1 )
374 wavelet? (
375 >=sci-libs/gsl-1.10
376 )
377 - wxwidgets? (
378 - dev-python/lxml[${PYTHON_USEDEP}]
379 - dev-python/numpy[${PYTHON_USEDEP}]
380 - dev-python/wxpython:3.0[${PYTHON_USEDEP}]
381 - )
382 - zeromq? ( >=net-libs/zeromq-2.1.11 )
383 + zeromq? ( >=net-libs/zeromq-2.1.11
384 + dev-libs/gmp:= )
385 "
386
387 DEPEND="${RDEPEND}
388 app-text/docbook-xml-dtd:4.2
389 >=dev-lang/swig-3.0.5
390 - dev-python/cheetah[${PYTHON_USEDEP}]
391 virtual/pkgconfig
392 doc? (
393 >=app-doc/doxygen-1.5.7.1
394 @@ -104,7 +106,7 @@ DEPEND="${RDEPEND}
395 src_prepare() {
396 gnome2_environment_reset #534582
397
398 - if [[ ${PV} == "3.8.9999" ]]; then
399 + if [[ ${PV} == "9999" ]]; then
400 true
401 else
402 epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
403 @@ -120,16 +122,7 @@ src_prepare() {
404 }
405
406 src_configure() {
407 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
408 - #audio provider is still automagic
409 - #zeromq missing deps isn't fatal
410 - #remaining QA issues, these appear broken:
411 - #ENABLE_ENABLE_PERFORMANCE_COUNTERS
412 - #ENABLE_GR_AUDIO_ALSA
413 - #ENABLE_GR_AUDIO_JACK
414 - #ENABLE_GR_AUDIO_OSS
415 - #ENABLE_GR_AUDIO_PORTAUDIO
416 - #ENABLE_GR_CORE
417 + python_export PYTHON_SITEDIR
418 mycmakeargs=(
419 -DENABLE_DEFAULT=OFF
420 -DENABLE_GNURADIO_RUNTIME=ON
421 @@ -163,13 +156,14 @@ src_configure() {
422 -DENABLE_GR_UTILS="$(usex utils)"
423 -DENABLE_GR_VOCODER="$(usex vocoder)"
424 -DENABLE_GR_WAVELET="$(usex wavelet)"
425 - -DENABLE_GR_WXGUI="$(usex wxwidgets)"
426 - -DENABLE_GR_QTGUI=OFF
427 + -DENABLE_GR_QTGUI="$(usex qt5)"
428 + -DDESIRED_QT_VERSION="$(usex qt5 5)"
429 -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
430 -DENABLE_GR_ZEROMQ="$(usex zeromq)"
431 -DENABLE_GR_CORE=ON
432 -DSYSCONFDIR="${EPREFIX}"/etc
433 -DPYTHON_EXECUTABLE="${PYTHON}"
434 + -DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
435 -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
436 )
437 use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )