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: Sun, 18 Feb 2018 03:48:13
Message-Id: 1518925684.0bcac3f6f8afbc59b6e1d5866785bbf046257023.zerochaos@gentoo
1 commit: 0bcac3f6f8afbc59b6e1d5866785bbf046257023
2 Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 18 03:47:42 2018 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 18 03:48:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcac3f6
7
8 net-wireless/gnuradio: lots of work
9
10 drop old ebuilds
11 drop wxwidgets support from 3.6 slot
12 update to eapi 6
13
14 Package-Manager: Portage-2.3.24, Repoman-2.3.6
15
16 net-wireless/gnuradio/Manifest | 5 -
17 net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild | 13 +-
18 net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild | 237 -----------------------
19 net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild | 232 ----------------------
20 net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild | 76 ++++----
21 net-wireless/gnuradio/gnuradio-3.7.11.ebuild | 237 -----------------------
22 net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild | 231 ----------------------
23 net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild | 230 ----------------------
24 net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild | 230 ----------------------
25 net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild | 236 ----------------------
26 net-wireless/gnuradio/gnuradio-9999.ebuild | 87 +++++----
27 11 files changed, 96 insertions(+), 1718 deletions(-)
28
29 diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
30 index 15d3d0bed97..448c1950605 100644
31 --- a/net-wireless/gnuradio/Manifest
32 +++ b/net-wireless/gnuradio/Manifest
33 @@ -1,7 +1,2 @@
34 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
35 -DIST gnuradio-3.7.10.2.tar.gz 4354889 BLAKE2B fdc113cf5731b0ffdb05580f711e9e8efd971097304c86fb123d0c2d8b429cde5e9805d32c075f7b75cf713367388fa601bb96df9f63654c52e72b7155dde7e9 SHA512 caf389314708c219ef77a6b7111ecffdb074bc5be047fa127706cad7b785ec1262f60b0416d8c4ce1baf769f822f2f571d6e14eef8066636a53568fcfa68dbe2
36 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
37 -DIST gnuradio-3.7.6.1.tar.gz 3588833 BLAKE2B 148ca4327744f2052b9a28d656f1f051edc9d77b03fd141b531c03070f07ee105abaafa9507a91b549b74772c50afbe864c4085681ebdde6b1d6164f81223998 SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939
38 -DIST gnuradio-3.7.7.1.tar.gz 3845988 BLAKE2B 07c29539defaf6df343ad9cf460181e4234d3a259a3dfa565d65a2ed0e5f1d72399a28be66d8f38a58d5f2832289aa445a72705353abf3535cd6ef8e42e2d945 SHA512 7be9568d19cbe03f3c229dbda5fc8d448a4a57d84bd9f8b91a400c65b526414539536c0a391b15d5f0e63bf22ef5675dc3ed8a6ed94ce3b1e4328948fa202ba1
39 -DIST gnuradio-3.7.8.1.tar.gz 3962961 BLAKE2B 831754e04f108c4b2c8ce883be83819d81c2301a26b3b3e95b1c7a6cc1ec706df7680ca8a191e4bfe2527126e2220cb7ba4c6b3053a05a593c84c6f26d81f6b0 SHA512 21468335d698963ce5090b03b980ecc3714c301f3cd5d071d8a1b083c3c985479c42ee6d842b1b600ac85640ce875fb2bbfd6f51d30144cb612ac55e648c0c9a
40 -DIST gnuradio-3.7.9.3.tar.gz 4158777 BLAKE2B a9f8ee1ff376acf6b07e46bd303ce4a0e5c2985d8a8bd2bd83a52b5ad692daa271b442a0c94686c056018d9b8273e37c3b9ec2d636aa2ef04b9f928eb119f9ac SHA512 f73466defc5d14d18790ddf149af0c6e1d53d2d46d60c20bdbfd1a742840ad11f0e783dc4e6a7e67bd826fa19e40d9d14045abcad34d602ae37e64be7e271b5b
41
42 diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
43 index eeb3a09cc03..43d13099383 100644
44 --- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
45 +++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
46 @@ -1,4 +1,4 @@
47 -# Copyright 1999-2014 Gentoo Foundation
48 +# Copyright 1999-2018 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50
51 EAPI=5
52 @@ -20,7 +20,7 @@ else
53 KEYWORDS="~amd64 ~arm ~x86"
54 fi
55
56 -IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
57 +IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet"
58
59 REQUIRED_USE="${PYTHON_REQUIRED_USE}
60 analog? ( filter )
61 @@ -29,8 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
62 qt4? ( filter )
63 uhd? ( filter analog )
64 fcd? ( || ( alsa oss ) )
65 - wavelet? ( analog )
66 - wxwidgets? ( filter analog )"
67 + wavelet? ( analog )"
68
69 # bug #348206
70 # comedi? ( >=sci-electronics/comedilib-0.7 )
71 @@ -66,10 +65,6 @@ RDEPEND="${PYTHON_DEPS}
72 wavelet? (
73 sci-libs/gsl
74 )
75 - wxwidgets? (
76 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
77 - dev-python/numpy[${PYTHON_USEDEP}]
78 - )
79 "
80 DEPEND="${RDEPEND}
81 dev-lang/swig
82 @@ -113,9 +108,9 @@ src_configure() {
83 $(cmake-utils_use_enable uhd GR_UHD) \
84 $(cmake-utils_use_enable utils GR_UTILS) \
85 $(cmake-utils_use_enable wavelet GR_WAVELET) \
86 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
87 $(cmake-utils_use_enable qt4 GR_QTGUI) \
88 $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
89 + -DENABLE_GR_WXGUI=OFF \
90 -DENABLE_GR_CORE=ON \
91 -DSYSCONFDIR="${EPREFIX}"/etc \
92 -DPYTHON_EXECUTABLE="${PYTHON}"
93
94 diff --git a/net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild
95 deleted file mode 100644
96 index f12ff19d36f..00000000000
97 --- a/net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild
98 +++ /dev/null
99 @@ -1,237 +0,0 @@
100 -# Copyright 1999-2017 Gentoo Foundation
101 -# Distributed under the terms of the GNU General Public License v2
102 -
103 -EAPI=5
104 -PYTHON_COMPAT=( python2_7 )
105 -
106 -CMAKE_BUILD_TYPE="None"
107 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
108 -
109 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
110 -HOMEPAGE="http://gnuradio.org/"
111 -LICENSE="GPL-3"
112 -SLOT="0/${PV}"
113 -
114 -if [[ ${PV} == "9999" ]] ; then
115 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
116 - inherit git-r3
117 - KEYWORDS=""
118 -else
119 - SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
120 - KEYWORDS="~amd64 ~arm ~x86"
121 -fi
122 -
123 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
124 -
125 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
126 - audio? ( || ( alsa oss jack portaudio ) )
127 - alsa? ( audio )
128 - oss? ( audio )
129 - jack? ( audio )
130 - portaudio? ( audio )
131 - analog? ( filter )
132 - digital? ( filter analog )
133 - dtv? ( fec )
134 - pager? ( filter analog )
135 - qt4? ( filter )
136 - uhd? ( filter analog )
137 - fcd? ( || ( alsa oss ) )
138 - wavelet? ( analog )
139 - wxwidgets? ( filter analog )"
140 -
141 -# bug #348206
142 -# comedi? ( >=sci-electronics/comedilib-0.8 )
143 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
144 -RDEPEND="${PYTHON_DEPS}
145 - >=dev-lang/orc-0.4.12
146 - dev-libs/boost:0=[${PYTHON_USEDEP}]
147 - !<=dev-libs/boost-1.52.0-r6:0/1.52
148 - dev-python/numpy[${PYTHON_USEDEP}]
149 - sci-libs/fftw:3.0=
150 - alsa? (
151 - media-libs/alsa-lib[${PYTHON_USEDEP}]
152 - )
153 - fcd? ( virtual/libusb:1 )
154 - filter? ( sci-libs/scipy )
155 - grc? (
156 - dev-python/cheetah[${PYTHON_USEDEP}]
157 - dev-python/lxml[${PYTHON_USEDEP}]
158 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
159 - )
160 - jack? (
161 - media-sound/jack-audio-connection-kit
162 - )
163 - log? ( dev-libs/log4cpp )
164 - portaudio? (
165 - >=media-libs/portaudio-19_pre
166 - )
167 - qt4? (
168 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
169 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
170 - >=dev-qt/qtcore-4.4:4
171 - >=dev-qt/qtgui-4.4:4
172 - x11-libs/qwt:6[qt4(+)]
173 - )
174 - sdl? ( >=media-libs/libsdl-1.2.0 )
175 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
176 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
177 - vocoder? ( media-sound/gsm )
178 - wavelet? (
179 - >=sci-libs/gsl-1.10
180 - )
181 - wxwidgets? (
182 - dev-python/lxml[${PYTHON_USEDEP}]
183 - dev-python/numpy[${PYTHON_USEDEP}]
184 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
185 - )
186 - zeromq? ( >=net-libs/zeromq-2.1.11 )
187 - "
188 -
189 -DEPEND="${RDEPEND}
190 - app-text/docbook-xml-dtd:4.2
191 - >=dev-lang/swig-3.0.5
192 - dev-python/cheetah[${PYTHON_USEDEP}]
193 - virtual/pkgconfig
194 - doc? (
195 - >=app-doc/doxygen-1.5.7.1
196 - dev-python/sphinx[${PYTHON_USEDEP}]
197 - )
198 - grc? ( x11-misc/xdg-utils )
199 - oss? ( virtual/os-headers )
200 - test? ( >=dev-util/cppunit-1.9.14 )
201 - zeromq? ( net-libs/cppzmq )
202 -"
203 -
204 -src_prepare() {
205 - gnome2_environment_reset #534582
206 -
207 - # Useless UI element would require qt3support, bug #365019
208 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
209 - epatch_user
210 -}
211 -
212 -src_configure() {
213 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
214 - #audio provider is still automagic
215 - #zeromq missing deps isn't fatal
216 - mycmakeargs=(
217 - -DENABLE_DEFAULT=OFF
218 - -DENABLE_GNURADIO_RUNTIME=ON
219 - -DENABLE_VOLK=ON
220 - -DENABLE_PYTHON=ON
221 - -DENABLE_GR_BLOCKS=ON
222 - -DENABLE_GR_FFT=ON
223 - -DENABLE_GR_AUDIO=ON
224 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
225 - $(cmake-utils_use_enable analog GR_ANALOG) \
226 - $(cmake-utils_use_enable atsc GR_ATSC) \
227 - $(cmake-utils_use_enable channels GR_CHANNELS) \
228 - $(cmake-utils_use_enable digital GR_DIGITAL) \
229 - $(cmake-utils_use_enable doc DOXYGEN) \
230 - $(cmake-utils_use_enable doc SPHINX) \
231 - $(cmake-utils_use_enable dtv GR_DTV) \
232 - $(cmake-utils_use_enable fcd GR_FCD) \
233 - $(cmake-utils_use_enable fec GR_FEC) \
234 - $(cmake-utils_use_enable filter GR_FILTER) \
235 - $(cmake-utils_use_enable grc GRC) \
236 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
237 - $(cmake-utils_use_enable log GR_LOG) \
238 - $(cmake-utils_use_enable noaa GR_NOAA) \
239 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
240 - $(cmake-utils_use_enable pager GR_PAGER) \
241 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
242 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
243 - $(cmake-utils_use_enable test TESTING) \
244 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
245 - $(cmake-utils_use_enable uhd GR_UHD) \
246 - $(cmake-utils_use_enable utils GR_UTILS) \
247 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
248 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
249 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
250 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
251 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
252 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
253 - -DENABLE_GR_CORE=ON \
254 - -DSYSCONFDIR="${EPREFIX}"/etc \
255 - -DPYTHON_EXECUTABLE="${PYTHON}"
256 - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
257 - )
258 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
259 - cmake-utils_src_configure
260 -}
261 -
262 -src_install() {
263 - cmake-utils_src_install
264 -
265 - if use examples ; then
266 - dodir /usr/share/doc/${PF}/
267 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
268 - docompress -x /usr/share/doc/${PF}/examples
269 - else
270 - # It seems that the examples are always installed
271 - rm -rf "${ED}"/usr/share/${PN}/examples || die
272 - fi
273 -
274 - if use doc || use examples; then
275 - #this doesn't appear useful
276 - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
277 - fi
278 -
279 - # We install the mimetypes to the correct locations from the ebuild
280 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
281 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
282 -
283 - # Install icons, menu items and mime-types for GRC
284 - if use grc ; then
285 - local fd_path="${S}/grc/scripts/freedesktop"
286 - insinto /usr/share/mime/packages
287 - doins "${fd_path}/${PN}-grc.xml"
288 -
289 - domenu "${fd_path}/"*.desktop
290 - doicon "${fd_path}/"*.png
291 - fi
292 -
293 - python_fix_shebang "${ED}"
294 -}
295 -
296 -src_test()
297 -{
298 - ctest -E qtgui
299 -}
300 -
301 -pkg_postinst()
302 -{
303 - local GRC_ICON_SIZES="32 48 64 128 256"
304 -
305 - if use grc ; then
306 - fdo-mime_desktop_database_update
307 - fdo-mime_mime_database_update
308 - for size in ${GRC_ICON_SIZES} ; do
309 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
310 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
311 - || die "icon resource installation failed"
312 - xdg-icon-resource install --noupdate --context apps --size ${size} \
313 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
314 - || die "icon resource installation failed"
315 - done
316 - xdg-icon-resource forceupdate
317 - fi
318 -}
319 -
320 -pkg_postrm()
321 -{
322 - local GRC_ICON_SIZES="32 48 64 128 256"
323 -
324 - if use grc ; then
325 - fdo-mime_desktop_database_update
326 - fdo-mime_mime_database_update
327 - for size in ${GRC_ICON_SIZES} ; do
328 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
329 - application-gnuradio-grc || ewarn "icon uninstall failed"
330 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
331 - gnuradio-grc || ewarn "icon uninstall failed"
332 -
333 - done
334 - xdg-icon-resource forceupdate
335 - fi
336 -}
337
338 diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild
339 deleted file mode 100644
340 index 55c7486a843..00000000000
341 --- a/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild
342 +++ /dev/null
343 @@ -1,232 +0,0 @@
344 -# Copyright 1999-2017 Gentoo Foundation
345 -# Distributed under the terms of the GNU General Public License v2
346 -
347 -EAPI=5
348 -PYTHON_COMPAT=( python2_7 )
349 -
350 -CMAKE_BUILD_TYPE="None"
351 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
352 -
353 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
354 -HOMEPAGE="http://gnuradio.org/"
355 -LICENSE="GPL-3"
356 -SLOT="0/${PV}"
357 -
358 -if [[ ${PV} == "9999" ]] ; then
359 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
360 - inherit git-r3
361 - KEYWORDS=""
362 -else
363 - SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
364 - KEYWORDS="~amd64 ~arm ~x86"
365 -fi
366 -
367 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet zeromq"
368 -
369 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
370 - audio? ( || ( alsa oss jack portaudio ) )
371 - alsa? ( audio )
372 - oss? ( audio )
373 - jack? ( audio )
374 - portaudio? ( audio )
375 - analog? ( filter )
376 - digital? ( filter analog )
377 - dtv? ( fec )
378 - pager? ( filter analog )
379 - qt4? ( filter )
380 - uhd? ( filter analog )
381 - fcd? ( || ( alsa oss ) )
382 - wavelet? ( analog )
383 -"
384 -
385 -# bug #348206
386 -# comedi? ( >=sci-electronics/comedilib-0.8 )
387 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
388 -RDEPEND="${PYTHON_DEPS}
389 - >=dev-lang/orc-0.4.12
390 - dev-libs/boost:0=[${PYTHON_USEDEP}]
391 - !<=dev-libs/boost-1.52.0-r6:0/1.52
392 - dev-python/numpy[${PYTHON_USEDEP}]
393 - sci-libs/fftw:3.0=
394 - alsa? (
395 - media-libs/alsa-lib[${PYTHON_USEDEP}]
396 - )
397 - fcd? ( virtual/libusb:1 )
398 - filter? ( sci-libs/scipy )
399 - grc? (
400 - dev-python/cheetah[${PYTHON_USEDEP}]
401 - dev-python/lxml[${PYTHON_USEDEP}]
402 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
403 - )
404 - jack? (
405 - media-sound/jack-audio-connection-kit
406 - )
407 - log? ( dev-libs/log4cpp )
408 - portaudio? (
409 - >=media-libs/portaudio-19_pre
410 - )
411 - qt4? (
412 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
413 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
414 - >=dev-qt/qtcore-4.4:4
415 - >=dev-qt/qtgui-4.4:4
416 - x11-libs/qwt:6[qt4(+)]
417 - )
418 - sdl? ( >=media-libs/libsdl-1.2.0 )
419 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
420 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
421 - vocoder? ( media-sound/gsm )
422 - wavelet? (
423 - >=sci-libs/gsl-1.10
424 - )
425 - zeromq? ( >=net-libs/zeromq-2.1.11 )
426 -"
427 -
428 -DEPEND="${RDEPEND}
429 - app-text/docbook-xml-dtd:4.2
430 - >=dev-lang/swig-3.0.5
431 - dev-python/cheetah[${PYTHON_USEDEP}]
432 - virtual/pkgconfig
433 - doc? (
434 - >=app-doc/doxygen-1.5.7.1
435 - dev-python/sphinx[${PYTHON_USEDEP}]
436 - )
437 - grc? ( x11-misc/xdg-utils )
438 - oss? ( virtual/os-headers )
439 - test? ( >=dev-util/cppunit-1.9.14 )
440 - zeromq? ( net-libs/cppzmq )
441 -"
442 -
443 -src_prepare() {
444 - gnome2_environment_reset #534582
445 -
446 - # Useless UI element would require qt3support, bug #365019
447 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
448 - epatch_user
449 -}
450 -
451 -src_configure() {
452 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
453 - #audio provider is still automagic
454 - #zeromq missing deps isn't fatal
455 - mycmakeargs=(
456 - -DENABLE_DEFAULT=OFF
457 - -DENABLE_GNURADIO_RUNTIME=ON
458 - -DENABLE_VOLK=ON
459 - -DENABLE_PYTHON=ON
460 - -DENABLE_GR_BLOCKS=ON
461 - -DENABLE_GR_FFT=ON
462 - -DENABLE_GR_AUDIO=ON
463 - -DENABLE_GR_WXGUI=OFF
464 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
465 - $(cmake-utils_use_enable analog GR_ANALOG) \
466 - $(cmake-utils_use_enable atsc GR_ATSC) \
467 - $(cmake-utils_use_enable channels GR_CHANNELS) \
468 - $(cmake-utils_use_enable digital GR_DIGITAL) \
469 - $(cmake-utils_use_enable doc DOXYGEN) \
470 - $(cmake-utils_use_enable doc SPHINX) \
471 - $(cmake-utils_use_enable dtv GR_DTV) \
472 - $(cmake-utils_use_enable fcd GR_FCD) \
473 - $(cmake-utils_use_enable fec GR_FEC) \
474 - $(cmake-utils_use_enable filter GR_FILTER) \
475 - $(cmake-utils_use_enable grc GRC) \
476 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
477 - $(cmake-utils_use_enable log GR_LOG) \
478 - $(cmake-utils_use_enable noaa GR_NOAA) \
479 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
480 - $(cmake-utils_use_enable pager GR_PAGER) \
481 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
482 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
483 - $(cmake-utils_use_enable test TESTING) \
484 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
485 - $(cmake-utils_use_enable uhd GR_UHD) \
486 - $(cmake-utils_use_enable utils GR_UTILS) \
487 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
488 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
489 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
490 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
491 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
492 - -DENABLE_GR_CORE=ON \
493 - -DSYSCONFDIR="${EPREFIX}"/etc \
494 - -DPYTHON_EXECUTABLE="${PYTHON}"
495 - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
496 - )
497 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
498 - cmake-utils_src_configure
499 -}
500 -
501 -src_install() {
502 - cmake-utils_src_install
503 -
504 - if use examples ; then
505 - dodir /usr/share/doc/${PF}/
506 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
507 - docompress -x /usr/share/doc/${PF}/examples
508 - else
509 - # It seems that the examples are always installed
510 - rm -rf "${ED}"/usr/share/${PN}/examples || die
511 - fi
512 -
513 - if use doc || use examples; then
514 - #this doesn't appear useful
515 - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
516 - fi
517 -
518 - # We install the mimetypes to the correct locations from the ebuild
519 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
520 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
521 -
522 - # Install icons, menu items and mime-types for GRC
523 - if use grc ; then
524 - local fd_path="${S}/grc/scripts/freedesktop"
525 - insinto /usr/share/mime/packages
526 - doins "${fd_path}/${PN}-grc.xml"
527 -
528 - domenu "${fd_path}/"*.desktop
529 - doicon "${fd_path}/"*.png
530 - fi
531 -
532 - python_fix_shebang "${ED}"
533 -}
534 -
535 -src_test()
536 -{
537 - ctest -E qtgui
538 -}
539 -
540 -pkg_postinst()
541 -{
542 - local GRC_ICON_SIZES="32 48 64 128 256"
543 -
544 - if use grc ; then
545 - fdo-mime_desktop_database_update
546 - fdo-mime_mime_database_update
547 - for size in ${GRC_ICON_SIZES} ; do
548 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
549 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
550 - || die "icon resource installation failed"
551 - xdg-icon-resource install --noupdate --context apps --size ${size} \
552 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
553 - || die "icon resource installation failed"
554 - done
555 - xdg-icon-resource forceupdate
556 - fi
557 -}
558 -
559 -pkg_postrm()
560 -{
561 - local GRC_ICON_SIZES="32 48 64 128 256"
562 -
563 - if use grc ; then
564 - fdo-mime_desktop_database_update
565 - fdo-mime_mime_database_update
566 - for size in ${GRC_ICON_SIZES} ; do
567 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
568 - application-gnuradio-grc || ewarn "icon uninstall failed"
569 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
570 - gnuradio-grc || ewarn "icon uninstall failed"
571 -
572 - done
573 - xdg-icon-resource forceupdate
574 - fi
575 -}
576
577 diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
578 index acadae1e43c..b41d31baa05 100644
579 --- a/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
580 +++ b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
581 @@ -1,7 +1,7 @@
582 # Copyright 1999-2018 Gentoo Foundation
583 # Distributed under the terms of the GNU General Public License v2
584
585 -EAPI=5
586 +EAPI=6
587 PYTHON_COMPAT=( python2_7 )
588
589 CMAKE_BUILD_TYPE="None"
590 @@ -22,6 +22,8 @@ else
591 fi
592
593 IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
594 +#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
595 +RESTRICT=test
596
597 REQUIRED_USE="${PYTHON_REQUIRED_USE}
598 audio? ( || ( alsa oss jack portaudio ) )
599 @@ -108,13 +110,21 @@ src_prepare() {
600 epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
601 # Useless UI element would require qt3support, bug #365019
602 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
603 - #default
604 + default
605 + cmake-utils_src_prepare
606 }
607
608 src_configure() {
609 # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
610 #audio provider is still automagic
611 #zeromq missing deps isn't fatal
612 + #remaining QA issues, these appear broken:
613 + #ENABLE_ENABLE_PERFORMANCE_COUNTERS
614 + #ENABLE_GR_AUDIO_ALSA
615 + #ENABLE_GR_AUDIO_JACK
616 + #ENABLE_GR_AUDIO_OSS
617 + #ENABLE_GR_AUDIO_PORTAUDIO
618 + #ENABLE_GR_CORE
619 mycmakeargs=(
620 -DENABLE_DEFAULT=OFF
621 -DENABLE_GNURADIO_RUNTIME=ON
622 @@ -123,37 +133,37 @@ src_configure() {
623 -DENABLE_GR_BLOCKS=ON
624 -DENABLE_GR_FFT=ON
625 -DENABLE_GR_AUDIO=ON
626 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
627 - $(cmake-utils_use_enable analog GR_ANALOG) \
628 - $(cmake-utils_use_enable atsc GR_ATSC) \
629 - $(cmake-utils_use_enable channels GR_CHANNELS) \
630 - $(cmake-utils_use_enable digital GR_DIGITAL) \
631 - $(cmake-utils_use_enable doc DOXYGEN) \
632 - $(cmake-utils_use_enable doc SPHINX) \
633 - $(cmake-utils_use_enable dtv GR_DTV) \
634 - $(cmake-utils_use_enable fcd GR_FCD) \
635 - $(cmake-utils_use_enable fec GR_FEC) \
636 - $(cmake-utils_use_enable filter GR_FILTER) \
637 - $(cmake-utils_use_enable grc GRC) \
638 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
639 - $(cmake-utils_use_enable log GR_LOG) \
640 - $(cmake-utils_use_enable noaa GR_NOAA) \
641 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
642 - $(cmake-utils_use_enable pager GR_PAGER) \
643 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
644 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
645 - $(cmake-utils_use_enable test TESTING) \
646 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
647 - $(cmake-utils_use_enable uhd GR_UHD) \
648 - $(cmake-utils_use_enable utils GR_UTILS) \
649 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
650 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
651 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
652 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
653 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
654 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
655 - -DENABLE_GR_CORE=ON \
656 - -DSYSCONFDIR="${EPREFIX}"/etc \
657 + -DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
658 + -DENABLE_GR_ANALOG="$(usex analog)"
659 + -DENABLE_GR_ATSC="$(usex atsc)"
660 + -DENABLE_GR_CHANNELS="$(usex channels)"
661 + -DENABLE_GR_DIGITAL="$(usex digital)"
662 + -DENABLE_DOXYGEN="$(usex doc)"
663 + -DENABLE_SPHINX="$(usex doc)"
664 + -DENABLE_GR_DTV="$(usex dtv)"
665 + -DENABLE_GR_FCD="$(usex fcd)"
666 + -DENABLE_GR_FEC="$(usex fec)"
667 + -DENABLE_GR_FILTER="$(usex filter)"
668 + -DENABLE_GRC="$(usex grc)"
669 + -DENABLE_GR_AUDIO_JACK="$(usex jack)"
670 + -DENABLE_GR_LOG="$(usex log)"
671 + -DENABLE_GR_NOAA="$(usex noaa)"
672 + -DENABLE_GR_AUDIO_OSS="$(usex oss)"
673 + -DENABLE_GR_PAGER="$(usex pager)"
674 + -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
675 + -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
676 + -DENABLE_TESTING="$(usex test)"
677 + -DENABLE_GR_TRELLIS="$(usex trellis)"
678 + -DENABLE_GR_UHD="$(usex uhd)"
679 + -DENABLE_GR_UTILS="$(usex utils)"
680 + -DENABLE_GR_VOCODER="$(usex vocoder)"
681 + -DENABLE_GR_WAVELET="$(usex wavelet)"
682 + -DENABLE_GR_WXGUI="$(usex wxwidgets)"
683 + -DENABLE_GR_QTGUI="$(usex qt4)"
684 + -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
685 + -DENABLE_GR_ZEROMQ="$(usex zeromq)"
686 + -DENABLE_GR_CORE=ON
687 + -DSYSCONFDIR="${EPREFIX}"/etc
688 -DPYTHON_EXECUTABLE="${PYTHON}"
689 -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
690 )
691
692 diff --git a/net-wireless/gnuradio/gnuradio-3.7.11.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11.ebuild
693 deleted file mode 100644
694 index 361fda83547..00000000000
695 --- a/net-wireless/gnuradio/gnuradio-3.7.11.ebuild
696 +++ /dev/null
697 @@ -1,237 +0,0 @@
698 -# Copyright 1999-2017 Gentoo Foundation
699 -# Distributed under the terms of the GNU General Public License v2
700 -
701 -EAPI=5
702 -PYTHON_COMPAT=( python2_7 )
703 -
704 -CMAKE_BUILD_TYPE="None"
705 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
706 -
707 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
708 -HOMEPAGE="http://gnuradio.org/"
709 -LICENSE="GPL-3"
710 -SLOT="0/${PV}"
711 -
712 -if [[ ${PV} == "9999" ]] ; then
713 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
714 - inherit git-r3
715 - KEYWORDS=""
716 -else
717 - SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
718 - KEYWORDS="~amd64 ~arm ~x86"
719 -fi
720 -
721 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
722 -
723 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
724 - audio? ( || ( alsa oss jack portaudio ) )
725 - alsa? ( audio )
726 - oss? ( audio )
727 - jack? ( audio )
728 - portaudio? ( audio )
729 - analog? ( filter )
730 - digital? ( filter analog )
731 - dtv? ( fec )
732 - pager? ( filter analog )
733 - qt4? ( filter )
734 - uhd? ( filter analog )
735 - fcd? ( || ( alsa oss ) )
736 - wavelet? ( analog )
737 - wxwidgets? ( filter analog )"
738 -
739 -# bug #348206
740 -# comedi? ( >=sci-electronics/comedilib-0.8 )
741 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
742 -RDEPEND="${PYTHON_DEPS}
743 - >=dev-lang/orc-0.4.12
744 - dev-libs/boost:0=[${PYTHON_USEDEP}]
745 - !<=dev-libs/boost-1.52.0-r6:0/1.52
746 - dev-python/numpy[${PYTHON_USEDEP}]
747 - sci-libs/fftw:3.0=
748 - alsa? (
749 - media-libs/alsa-lib[${PYTHON_USEDEP}]
750 - )
751 - fcd? ( virtual/libusb:1 )
752 - filter? ( sci-libs/scipy )
753 - grc? (
754 - dev-python/cheetah[${PYTHON_USEDEP}]
755 - dev-python/lxml[${PYTHON_USEDEP}]
756 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
757 - )
758 - jack? (
759 - media-sound/jack-audio-connection-kit
760 - )
761 - log? ( dev-libs/log4cpp )
762 - portaudio? (
763 - >=media-libs/portaudio-19_pre
764 - )
765 - qt4? (
766 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
767 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
768 - >=dev-qt/qtcore-4.4:4
769 - >=dev-qt/qtgui-4.4:4
770 - x11-libs/qwt:6[qt4(+)]
771 - )
772 - sdl? ( >=media-libs/libsdl-1.2.0 )
773 - uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
774 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
775 - vocoder? ( media-sound/gsm )
776 - wavelet? (
777 - >=sci-libs/gsl-1.10
778 - )
779 - wxwidgets? (
780 - dev-python/lxml[${PYTHON_USEDEP}]
781 - dev-python/numpy[${PYTHON_USEDEP}]
782 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
783 - )
784 - zeromq? ( >=net-libs/zeromq-2.1.11 )
785 - "
786 -
787 -DEPEND="${RDEPEND}
788 - app-text/docbook-xml-dtd:4.2
789 - >=dev-lang/swig-3.0.5
790 - dev-python/cheetah[${PYTHON_USEDEP}]
791 - virtual/pkgconfig
792 - doc? (
793 - >=app-doc/doxygen-1.5.7.1
794 - dev-python/sphinx[${PYTHON_USEDEP}]
795 - )
796 - grc? ( x11-misc/xdg-utils )
797 - oss? ( virtual/os-headers )
798 - test? ( >=dev-util/cppunit-1.9.14 )
799 - zeromq? ( net-libs/cppzmq )
800 -"
801 -
802 -src_prepare() {
803 - gnome2_environment_reset #534582
804 -
805 - # Useless UI element would require qt3support, bug #365019
806 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
807 - epatch_user
808 -}
809 -
810 -src_configure() {
811 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
812 - #audio provider is still automagic
813 - #zeromq missing deps isn't fatal
814 - mycmakeargs=(
815 - -DENABLE_DEFAULT=OFF
816 - -DENABLE_GNURADIO_RUNTIME=ON
817 - -DENABLE_VOLK=ON
818 - -DENABLE_PYTHON=ON
819 - -DENABLE_GR_BLOCKS=ON
820 - -DENABLE_GR_FFT=ON
821 - -DENABLE_GR_AUDIO=ON
822 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
823 - $(cmake-utils_use_enable analog GR_ANALOG) \
824 - $(cmake-utils_use_enable atsc GR_ATSC) \
825 - $(cmake-utils_use_enable channels GR_CHANNELS) \
826 - $(cmake-utils_use_enable digital GR_DIGITAL) \
827 - $(cmake-utils_use_enable doc DOXYGEN) \
828 - $(cmake-utils_use_enable doc SPHINX) \
829 - $(cmake-utils_use_enable dtv GR_DTV) \
830 - $(cmake-utils_use_enable fcd GR_FCD) \
831 - $(cmake-utils_use_enable fec GR_FEC) \
832 - $(cmake-utils_use_enable filter GR_FILTER) \
833 - $(cmake-utils_use_enable grc GRC) \
834 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
835 - $(cmake-utils_use_enable log GR_LOG) \
836 - $(cmake-utils_use_enable noaa GR_NOAA) \
837 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
838 - $(cmake-utils_use_enable pager GR_PAGER) \
839 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
840 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
841 - $(cmake-utils_use_enable test TESTING) \
842 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
843 - $(cmake-utils_use_enable uhd GR_UHD) \
844 - $(cmake-utils_use_enable utils GR_UTILS) \
845 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
846 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
847 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
848 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
849 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
850 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
851 - -DENABLE_GR_CORE=ON \
852 - -DSYSCONFDIR="${EPREFIX}"/etc \
853 - -DPYTHON_EXECUTABLE="${PYTHON}"
854 - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
855 - )
856 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
857 - cmake-utils_src_configure
858 -}
859 -
860 -src_install() {
861 - cmake-utils_src_install
862 -
863 - if use examples ; then
864 - dodir /usr/share/doc/${PF}/
865 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
866 - docompress -x /usr/share/doc/${PF}/examples
867 - else
868 - # It seems that the examples are always installed
869 - rm -rf "${ED}"/usr/share/${PN}/examples || die
870 - fi
871 -
872 - if use doc || use examples; then
873 - #this doesn't appear useful
874 - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
875 - fi
876 -
877 - # We install the mimetypes to the correct locations from the ebuild
878 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
879 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
880 -
881 - # Install icons, menu items and mime-types for GRC
882 - if use grc ; then
883 - local fd_path="${S}/grc/scripts/freedesktop"
884 - insinto /usr/share/mime/packages
885 - doins "${fd_path}/${PN}-grc.xml"
886 -
887 - domenu "${fd_path}/"*.desktop
888 - doicon "${fd_path}/"*.png
889 - fi
890 -
891 - python_fix_shebang "${ED}"
892 -}
893 -
894 -src_test()
895 -{
896 - ctest -E qtgui
897 -}
898 -
899 -pkg_postinst()
900 -{
901 - local GRC_ICON_SIZES="32 48 64 128 256"
902 -
903 - if use grc ; then
904 - fdo-mime_desktop_database_update
905 - fdo-mime_mime_database_update
906 - for size in ${GRC_ICON_SIZES} ; do
907 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
908 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
909 - || die "icon resource installation failed"
910 - xdg-icon-resource install --noupdate --context apps --size ${size} \
911 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
912 - || die "icon resource installation failed"
913 - done
914 - xdg-icon-resource forceupdate
915 - fi
916 -}
917 -
918 -pkg_postrm()
919 -{
920 - local GRC_ICON_SIZES="32 48 64 128 256"
921 -
922 - if use grc ; then
923 - fdo-mime_desktop_database_update
924 - fdo-mime_mime_database_update
925 - for size in ${GRC_ICON_SIZES} ; do
926 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
927 - application-gnuradio-grc || ewarn "icon uninstall failed"
928 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
929 - gnuradio-grc || ewarn "icon uninstall failed"
930 -
931 - done
932 - xdg-icon-resource forceupdate
933 - fi
934 -}
935
936 diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
937 deleted file mode 100644
938 index 812f66bd3e5..00000000000
939 --- a/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
940 +++ /dev/null
941 @@ -1,231 +0,0 @@
942 -# Copyright 1999-2015 Gentoo Foundation
943 -# Distributed under the terms of the GNU General Public License v2
944 -
945 -EAPI=5
946 -PYTHON_COMPAT=( python2_7 )
947 -
948 -CMAKE_BUILD_TYPE="None"
949 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
950 -
951 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
952 -HOMEPAGE="http://gnuradio.org/"
953 -LICENSE="GPL-3"
954 -SLOT="0/${PV}"
955 -
956 -if [[ ${PV} == "9999" ]] ; then
957 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
958 - inherit git-r3
959 - KEYWORDS=""
960 -else
961 - SRC_URI="http://s3-dist.gnuradio.org/${P}.tar.gz"
962 - KEYWORDS="~amd64 ~arm ~x86"
963 -fi
964 -
965 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
966 -
967 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
968 - audio? ( || ( alsa oss jack portaudio ) )
969 - alsa? ( audio )
970 - oss? ( audio )
971 - jack? ( audio )
972 - portaudio? ( audio )
973 - analog? ( filter )
974 - digital? ( filter analog )
975 - dtv? ( fec )
976 - pager? ( filter analog )
977 - qt4? ( filter )
978 - uhd? ( filter analog )
979 - fcd? ( || ( alsa oss ) )
980 - wavelet? ( analog )
981 - wxwidgets? ( filter analog )"
982 -
983 -# bug #348206
984 -# comedi? ( >=sci-electronics/comedilib-0.8 )
985 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
986 -RDEPEND="${PYTHON_DEPS}
987 - >=dev-lang/orc-0.4.12
988 - dev-libs/boost:0=[${PYTHON_USEDEP}]
989 - !<=dev-libs/boost-1.52.0-r6:0/1.52
990 - dev-python/numpy[${PYTHON_USEDEP}]
991 - sci-libs/fftw:3.0=
992 - alsa? (
993 - media-libs/alsa-lib[${PYTHON_USEDEP}]
994 - )
995 - fcd? ( virtual/libusb:1 )
996 - filter? ( sci-libs/scipy )
997 - grc? (
998 - dev-python/cheetah[${PYTHON_USEDEP}]
999 - dev-python/lxml[${PYTHON_USEDEP}]
1000 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
1001 - )
1002 - jack? (
1003 - media-sound/jack-audio-connection-kit
1004 - )
1005 - log? ( dev-libs/log4cpp )
1006 - portaudio? (
1007 - >=media-libs/portaudio-19_pre
1008 - )
1009 - qt4? (
1010 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
1011 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
1012 - >=dev-qt/qtcore-4.4:4
1013 - >=dev-qt/qtgui-4.4:4
1014 - x11-libs/qwt:6
1015 - )
1016 - sdl? ( >=media-libs/libsdl-1.2.0 )
1017 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
1018 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
1019 - vocoder? ( media-sound/gsm )
1020 - wavelet? (
1021 - >=sci-libs/gsl-1.10
1022 - )
1023 - wxwidgets? (
1024 - dev-python/lxml[${PYTHON_USEDEP}]
1025 - dev-python/numpy[${PYTHON_USEDEP}]
1026 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
1027 - )
1028 - zeromq? ( >=net-libs/zeromq-2.1.11 )
1029 - "
1030 -
1031 -DEPEND="${RDEPEND}
1032 - dev-lang/swig
1033 - dev-python/cheetah[${PYTHON_USEDEP}]
1034 - virtual/pkgconfig
1035 - doc? (
1036 - >=app-doc/doxygen-1.5.7.1
1037 - dev-python/sphinx[${PYTHON_USEDEP}]
1038 - )
1039 - grc? ( x11-misc/xdg-utils )
1040 - oss? ( virtual/os-headers )
1041 - test? ( >=dev-util/cppunit-1.9.14 )
1042 - zeromq? ( net-libs/cppzmq )
1043 -"
1044 -
1045 -src_prepare() {
1046 - gnome2_environment_reset #534582
1047 -
1048 - # Useless UI element would require qt3support, bug #365019
1049 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
1050 - epatch "${FILESDIR}/${P}-qwt-with-qt5-support.patch"
1051 - epatch_user
1052 -}
1053 -
1054 -src_configure() {
1055 - # TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
1056 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
1057 - #audio provider is still automagic
1058 - #zeromq missing deps isn't fatal
1059 - mycmakeargs=(
1060 - -DENABLE_DEFAULT=OFF
1061 - -DENABLE_GNURADIO_RUNTIME=ON
1062 - -DENABLE_VOLK=ON
1063 - -DENABLE_PYTHON=ON
1064 - -DENABLE_GR_BLOCKS=ON
1065 - -DENABLE_GR_FFT=ON
1066 - -DENABLE_GR_AUDIO=ON
1067 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
1068 - $(cmake-utils_use_enable analog GR_ANALOG) \
1069 - $(cmake-utils_use_enable atsc GR_ATSC) \
1070 - $(cmake-utils_use_enable channels GR_CHANNELS) \
1071 - $(cmake-utils_use_enable digital GR_DIGITAL) \
1072 - $(cmake-utils_use_enable doc DOXYGEN) \
1073 - $(cmake-utils_use_enable doc SPHINX) \
1074 - $(cmake-utils_use_enable dtv GR_DTV) \
1075 - $(cmake-utils_use_enable fcd GR_FCD) \
1076 - $(cmake-utils_use_enable fec GR_FEC) \
1077 - $(cmake-utils_use_enable filter GR_FILTER) \
1078 - $(cmake-utils_use_enable grc GRC) \
1079 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
1080 - $(cmake-utils_use_enable log GR_LOG) \
1081 - $(cmake-utils_use_enable noaa GR_NOAA) \
1082 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
1083 - $(cmake-utils_use_enable pager GR_PAGER) \
1084 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
1085 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
1086 - $(cmake-utils_use_enable test TESTING) \
1087 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
1088 - $(cmake-utils_use_enable uhd GR_UHD) \
1089 - $(cmake-utils_use_enable utils GR_UTILS) \
1090 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
1091 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
1092 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
1093 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
1094 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
1095 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
1096 - -DENABLE_GR_CORE=ON \
1097 - -DSYSCONFDIR="${EPREFIX}"/etc \
1098 - -DPYTHON_EXECUTABLE="${PYTHON}"
1099 - )
1100 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
1101 - cmake-utils_src_configure
1102 -}
1103 -
1104 -src_install() {
1105 - cmake-utils_src_install
1106 -
1107 - if use examples ; then
1108 - dodir /usr/share/doc/${PF}/
1109 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
1110 - else
1111 - # It seems that the examples are always installed
1112 - rm -rf "${ED}"/usr/share/${PN}/examples || die
1113 - fi
1114 -
1115 - # We install the mimetypes to the correct locations from the ebuild
1116 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
1117 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
1118 -
1119 - # Install icons, menu items and mime-types for GRC
1120 - if use grc ; then
1121 - local fd_path="${S}/grc/freedesktop"
1122 - insinto /usr/share/mime/packages
1123 - doins "${fd_path}/${PN}-grc.xml"
1124 -
1125 - domenu "${fd_path}/"*.desktop
1126 - doicon "${fd_path}/"*.png
1127 - fi
1128 -
1129 - python_fix_shebang "${ED}"
1130 -}
1131 -
1132 -src_test()
1133 -{
1134 - ctest -E qtgui
1135 -}
1136 -
1137 -pkg_postinst()
1138 -{
1139 - local GRC_ICON_SIZES="32 48 64 128 256"
1140 -
1141 - if use grc ; then
1142 - fdo-mime_desktop_database_update
1143 - fdo-mime_mime_database_update
1144 - for size in ${GRC_ICON_SIZES} ; do
1145 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
1146 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
1147 - || die "icon resource installation failed"
1148 - xdg-icon-resource install --noupdate --context apps --size ${size} \
1149 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
1150 - || die "icon resource installation failed"
1151 - done
1152 - xdg-icon-resource forceupdate
1153 - fi
1154 -}
1155 -
1156 -pkg_postrm()
1157 -{
1158 - local GRC_ICON_SIZES="32 48 64 128 256"
1159 -
1160 - if use grc ; then
1161 - fdo-mime_desktop_database_update
1162 - fdo-mime_mime_database_update
1163 - for size in ${GRC_ICON_SIZES} ; do
1164 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
1165 - application-gnuradio-grc || ewarn "icon uninstall failed"
1166 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
1167 - gnuradio-grc || ewarn "icon uninstall failed"
1168 -
1169 - done
1170 - xdg-icon-resource forceupdate
1171 - fi
1172 -}
1173
1174 diff --git a/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild
1175 deleted file mode 100644
1176 index d1af88e8344..00000000000
1177 --- a/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild
1178 +++ /dev/null
1179 @@ -1,230 +0,0 @@
1180 -# Copyright 1999-2015 Gentoo Foundation
1181 -# Distributed under the terms of the GNU General Public License v2
1182 -
1183 -EAPI=5
1184 -PYTHON_COMPAT=( python2_7 )
1185 -
1186 -CMAKE_BUILD_TYPE="None"
1187 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
1188 -
1189 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
1190 -HOMEPAGE="http://gnuradio.org/"
1191 -LICENSE="GPL-3"
1192 -SLOT="0/${PV}"
1193 -
1194 -if [[ ${PV} == "9999" ]] ; then
1195 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
1196 - inherit git-r3
1197 - KEYWORDS=""
1198 -else
1199 - SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
1200 - KEYWORDS="~amd64 ~arm ~x86"
1201 -fi
1202 -
1203 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
1204 -
1205 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
1206 - audio? ( || ( alsa oss jack portaudio ) )
1207 - alsa? ( audio )
1208 - oss? ( audio )
1209 - jack? ( audio )
1210 - portaudio? ( audio )
1211 - analog? ( filter )
1212 - digital? ( filter analog )
1213 - dtv? ( fec )
1214 - pager? ( filter analog )
1215 - qt4? ( filter )
1216 - uhd? ( filter analog )
1217 - fcd? ( || ( alsa oss ) )
1218 - wavelet? ( analog )
1219 - wxwidgets? ( filter analog )"
1220 -
1221 -# bug #348206
1222 -# comedi? ( >=sci-electronics/comedilib-0.8 )
1223 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
1224 -RDEPEND="${PYTHON_DEPS}
1225 - >=dev-lang/orc-0.4.12
1226 - dev-libs/boost:0=[${PYTHON_USEDEP}]
1227 - !<=dev-libs/boost-1.52.0-r6:0/1.52
1228 - dev-python/numpy[${PYTHON_USEDEP}]
1229 - sci-libs/fftw:3.0=
1230 - alsa? (
1231 - media-libs/alsa-lib[${PYTHON_USEDEP}]
1232 - )
1233 - fcd? ( virtual/libusb:1 )
1234 - filter? ( sci-libs/scipy )
1235 - grc? (
1236 - dev-python/cheetah[${PYTHON_USEDEP}]
1237 - dev-python/lxml[${PYTHON_USEDEP}]
1238 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
1239 - )
1240 - jack? (
1241 - media-sound/jack-audio-connection-kit
1242 - )
1243 - log? ( dev-libs/log4cpp )
1244 - portaudio? (
1245 - >=media-libs/portaudio-19_pre
1246 - )
1247 - qt4? (
1248 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
1249 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
1250 - >=dev-qt/qtcore-4.4:4
1251 - >=dev-qt/qtgui-4.4:4
1252 - x11-libs/qwt:6
1253 - )
1254 - sdl? ( >=media-libs/libsdl-1.2.0 )
1255 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
1256 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
1257 - vocoder? ( media-sound/gsm )
1258 - wavelet? (
1259 - >=sci-libs/gsl-1.10
1260 - )
1261 - wxwidgets? (
1262 - dev-python/lxml[${PYTHON_USEDEP}]
1263 - dev-python/numpy[${PYTHON_USEDEP}]
1264 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
1265 - )
1266 - zeromq? ( >=net-libs/zeromq-2.1.11 )
1267 - "
1268 -
1269 -DEPEND="${RDEPEND}
1270 - >=dev-lang/swig-3.0.5
1271 - dev-python/cheetah[${PYTHON_USEDEP}]
1272 - virtual/pkgconfig
1273 - doc? (
1274 - >=app-doc/doxygen-1.5.7.1
1275 - dev-python/sphinx[${PYTHON_USEDEP}]
1276 - )
1277 - grc? ( x11-misc/xdg-utils )
1278 - oss? ( virtual/os-headers )
1279 - test? ( >=dev-util/cppunit-1.9.14 )
1280 - zeromq? ( net-libs/cppzmq )
1281 -"
1282 -
1283 -src_prepare() {
1284 - gnome2_environment_reset #534582
1285 -
1286 - # Useless UI element would require qt3support, bug #365019
1287 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
1288 - epatch_user
1289 -}
1290 -
1291 -src_configure() {
1292 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
1293 - #audio provider is still automagic
1294 - #zeromq missing deps isn't fatal
1295 - mycmakeargs=(
1296 - -DENABLE_DEFAULT=OFF
1297 - -DENABLE_GNURADIO_RUNTIME=ON
1298 - -DENABLE_VOLK=ON
1299 - -DENABLE_PYTHON=ON
1300 - -DENABLE_GR_BLOCKS=ON
1301 - -DENABLE_GR_FFT=ON
1302 - -DENABLE_GR_AUDIO=ON
1303 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
1304 - $(cmake-utils_use_enable analog GR_ANALOG) \
1305 - $(cmake-utils_use_enable atsc GR_ATSC) \
1306 - $(cmake-utils_use_enable channels GR_CHANNELS) \
1307 - $(cmake-utils_use_enable digital GR_DIGITAL) \
1308 - $(cmake-utils_use_enable doc DOXYGEN) \
1309 - $(cmake-utils_use_enable doc SPHINX) \
1310 - $(cmake-utils_use_enable dtv GR_DTV) \
1311 - $(cmake-utils_use_enable fcd GR_FCD) \
1312 - $(cmake-utils_use_enable fec GR_FEC) \
1313 - $(cmake-utils_use_enable filter GR_FILTER) \
1314 - $(cmake-utils_use_enable grc GRC) \
1315 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
1316 - $(cmake-utils_use_enable log GR_LOG) \
1317 - $(cmake-utils_use_enable noaa GR_NOAA) \
1318 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
1319 - $(cmake-utils_use_enable pager GR_PAGER) \
1320 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
1321 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
1322 - $(cmake-utils_use_enable test TESTING) \
1323 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
1324 - $(cmake-utils_use_enable uhd GR_UHD) \
1325 - $(cmake-utils_use_enable utils GR_UTILS) \
1326 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
1327 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
1328 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
1329 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
1330 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
1331 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
1332 - -DENABLE_GR_CORE=ON \
1333 - -DSYSCONFDIR="${EPREFIX}"/etc \
1334 - -DPYTHON_EXECUTABLE="${PYTHON}"
1335 - -DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
1336 - )
1337 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
1338 - cmake-utils_src_configure
1339 -}
1340 -
1341 -src_install() {
1342 - cmake-utils_src_install
1343 -
1344 - if use examples ; then
1345 - dodir /usr/share/doc/${PF}/
1346 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
1347 - else
1348 - # It seems that the examples are always installed
1349 - rm -rf "${ED}"/usr/share/${PN}/examples || die
1350 - fi
1351 -
1352 - # We install the mimetypes to the correct locations from the ebuild
1353 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
1354 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
1355 -
1356 - # Install icons, menu items and mime-types for GRC
1357 - if use grc ; then
1358 - local fd_path="${S}/grc/freedesktop"
1359 - insinto /usr/share/mime/packages
1360 - doins "${fd_path}/${PN}-grc.xml"
1361 -
1362 - domenu "${fd_path}/"*.desktop
1363 - doicon "${fd_path}/"*.png
1364 - fi
1365 -
1366 - python_fix_shebang "${ED}"
1367 -}
1368 -
1369 -src_test()
1370 -{
1371 - ctest -E qtgui
1372 -}
1373 -
1374 -pkg_postinst()
1375 -{
1376 - local GRC_ICON_SIZES="32 48 64 128 256"
1377 -
1378 - if use grc ; then
1379 - fdo-mime_desktop_database_update
1380 - fdo-mime_mime_database_update
1381 - for size in ${GRC_ICON_SIZES} ; do
1382 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
1383 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
1384 - || die "icon resource installation failed"
1385 - xdg-icon-resource install --noupdate --context apps --size ${size} \
1386 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
1387 - || die "icon resource installation failed"
1388 - done
1389 - xdg-icon-resource forceupdate
1390 - fi
1391 -}
1392 -
1393 -pkg_postrm()
1394 -{
1395 - local GRC_ICON_SIZES="32 48 64 128 256"
1396 -
1397 - if use grc ; then
1398 - fdo-mime_desktop_database_update
1399 - fdo-mime_mime_database_update
1400 - for size in ${GRC_ICON_SIZES} ; do
1401 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
1402 - application-gnuradio-grc || ewarn "icon uninstall failed"
1403 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
1404 - gnuradio-grc || ewarn "icon uninstall failed"
1405 -
1406 - done
1407 - xdg-icon-resource forceupdate
1408 - fi
1409 -}
1410
1411 diff --git a/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
1412 deleted file mode 100644
1413 index d1af88e8344..00000000000
1414 --- a/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
1415 +++ /dev/null
1416 @@ -1,230 +0,0 @@
1417 -# Copyright 1999-2015 Gentoo Foundation
1418 -# Distributed under the terms of the GNU General Public License v2
1419 -
1420 -EAPI=5
1421 -PYTHON_COMPAT=( python2_7 )
1422 -
1423 -CMAKE_BUILD_TYPE="None"
1424 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
1425 -
1426 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
1427 -HOMEPAGE="http://gnuradio.org/"
1428 -LICENSE="GPL-3"
1429 -SLOT="0/${PV}"
1430 -
1431 -if [[ ${PV} == "9999" ]] ; then
1432 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
1433 - inherit git-r3
1434 - KEYWORDS=""
1435 -else
1436 - SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
1437 - KEYWORDS="~amd64 ~arm ~x86"
1438 -fi
1439 -
1440 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
1441 -
1442 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
1443 - audio? ( || ( alsa oss jack portaudio ) )
1444 - alsa? ( audio )
1445 - oss? ( audio )
1446 - jack? ( audio )
1447 - portaudio? ( audio )
1448 - analog? ( filter )
1449 - digital? ( filter analog )
1450 - dtv? ( fec )
1451 - pager? ( filter analog )
1452 - qt4? ( filter )
1453 - uhd? ( filter analog )
1454 - fcd? ( || ( alsa oss ) )
1455 - wavelet? ( analog )
1456 - wxwidgets? ( filter analog )"
1457 -
1458 -# bug #348206
1459 -# comedi? ( >=sci-electronics/comedilib-0.8 )
1460 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
1461 -RDEPEND="${PYTHON_DEPS}
1462 - >=dev-lang/orc-0.4.12
1463 - dev-libs/boost:0=[${PYTHON_USEDEP}]
1464 - !<=dev-libs/boost-1.52.0-r6:0/1.52
1465 - dev-python/numpy[${PYTHON_USEDEP}]
1466 - sci-libs/fftw:3.0=
1467 - alsa? (
1468 - media-libs/alsa-lib[${PYTHON_USEDEP}]
1469 - )
1470 - fcd? ( virtual/libusb:1 )
1471 - filter? ( sci-libs/scipy )
1472 - grc? (
1473 - dev-python/cheetah[${PYTHON_USEDEP}]
1474 - dev-python/lxml[${PYTHON_USEDEP}]
1475 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
1476 - )
1477 - jack? (
1478 - media-sound/jack-audio-connection-kit
1479 - )
1480 - log? ( dev-libs/log4cpp )
1481 - portaudio? (
1482 - >=media-libs/portaudio-19_pre
1483 - )
1484 - qt4? (
1485 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
1486 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
1487 - >=dev-qt/qtcore-4.4:4
1488 - >=dev-qt/qtgui-4.4:4
1489 - x11-libs/qwt:6
1490 - )
1491 - sdl? ( >=media-libs/libsdl-1.2.0 )
1492 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
1493 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
1494 - vocoder? ( media-sound/gsm )
1495 - wavelet? (
1496 - >=sci-libs/gsl-1.10
1497 - )
1498 - wxwidgets? (
1499 - dev-python/lxml[${PYTHON_USEDEP}]
1500 - dev-python/numpy[${PYTHON_USEDEP}]
1501 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
1502 - )
1503 - zeromq? ( >=net-libs/zeromq-2.1.11 )
1504 - "
1505 -
1506 -DEPEND="${RDEPEND}
1507 - >=dev-lang/swig-3.0.5
1508 - dev-python/cheetah[${PYTHON_USEDEP}]
1509 - virtual/pkgconfig
1510 - doc? (
1511 - >=app-doc/doxygen-1.5.7.1
1512 - dev-python/sphinx[${PYTHON_USEDEP}]
1513 - )
1514 - grc? ( x11-misc/xdg-utils )
1515 - oss? ( virtual/os-headers )
1516 - test? ( >=dev-util/cppunit-1.9.14 )
1517 - zeromq? ( net-libs/cppzmq )
1518 -"
1519 -
1520 -src_prepare() {
1521 - gnome2_environment_reset #534582
1522 -
1523 - # Useless UI element would require qt3support, bug #365019
1524 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
1525 - epatch_user
1526 -}
1527 -
1528 -src_configure() {
1529 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
1530 - #audio provider is still automagic
1531 - #zeromq missing deps isn't fatal
1532 - mycmakeargs=(
1533 - -DENABLE_DEFAULT=OFF
1534 - -DENABLE_GNURADIO_RUNTIME=ON
1535 - -DENABLE_VOLK=ON
1536 - -DENABLE_PYTHON=ON
1537 - -DENABLE_GR_BLOCKS=ON
1538 - -DENABLE_GR_FFT=ON
1539 - -DENABLE_GR_AUDIO=ON
1540 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
1541 - $(cmake-utils_use_enable analog GR_ANALOG) \
1542 - $(cmake-utils_use_enable atsc GR_ATSC) \
1543 - $(cmake-utils_use_enable channels GR_CHANNELS) \
1544 - $(cmake-utils_use_enable digital GR_DIGITAL) \
1545 - $(cmake-utils_use_enable doc DOXYGEN) \
1546 - $(cmake-utils_use_enable doc SPHINX) \
1547 - $(cmake-utils_use_enable dtv GR_DTV) \
1548 - $(cmake-utils_use_enable fcd GR_FCD) \
1549 - $(cmake-utils_use_enable fec GR_FEC) \
1550 - $(cmake-utils_use_enable filter GR_FILTER) \
1551 - $(cmake-utils_use_enable grc GRC) \
1552 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
1553 - $(cmake-utils_use_enable log GR_LOG) \
1554 - $(cmake-utils_use_enable noaa GR_NOAA) \
1555 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
1556 - $(cmake-utils_use_enable pager GR_PAGER) \
1557 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
1558 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
1559 - $(cmake-utils_use_enable test TESTING) \
1560 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
1561 - $(cmake-utils_use_enable uhd GR_UHD) \
1562 - $(cmake-utils_use_enable utils GR_UTILS) \
1563 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
1564 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
1565 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
1566 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
1567 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
1568 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
1569 - -DENABLE_GR_CORE=ON \
1570 - -DSYSCONFDIR="${EPREFIX}"/etc \
1571 - -DPYTHON_EXECUTABLE="${PYTHON}"
1572 - -DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
1573 - )
1574 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
1575 - cmake-utils_src_configure
1576 -}
1577 -
1578 -src_install() {
1579 - cmake-utils_src_install
1580 -
1581 - if use examples ; then
1582 - dodir /usr/share/doc/${PF}/
1583 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
1584 - else
1585 - # It seems that the examples are always installed
1586 - rm -rf "${ED}"/usr/share/${PN}/examples || die
1587 - fi
1588 -
1589 - # We install the mimetypes to the correct locations from the ebuild
1590 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
1591 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
1592 -
1593 - # Install icons, menu items and mime-types for GRC
1594 - if use grc ; then
1595 - local fd_path="${S}/grc/freedesktop"
1596 - insinto /usr/share/mime/packages
1597 - doins "${fd_path}/${PN}-grc.xml"
1598 -
1599 - domenu "${fd_path}/"*.desktop
1600 - doicon "${fd_path}/"*.png
1601 - fi
1602 -
1603 - python_fix_shebang "${ED}"
1604 -}
1605 -
1606 -src_test()
1607 -{
1608 - ctest -E qtgui
1609 -}
1610 -
1611 -pkg_postinst()
1612 -{
1613 - local GRC_ICON_SIZES="32 48 64 128 256"
1614 -
1615 - if use grc ; then
1616 - fdo-mime_desktop_database_update
1617 - fdo-mime_mime_database_update
1618 - for size in ${GRC_ICON_SIZES} ; do
1619 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
1620 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
1621 - || die "icon resource installation failed"
1622 - xdg-icon-resource install --noupdate --context apps --size ${size} \
1623 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
1624 - || die "icon resource installation failed"
1625 - done
1626 - xdg-icon-resource forceupdate
1627 - fi
1628 -}
1629 -
1630 -pkg_postrm()
1631 -{
1632 - local GRC_ICON_SIZES="32 48 64 128 256"
1633 -
1634 - if use grc ; then
1635 - fdo-mime_desktop_database_update
1636 - fdo-mime_mime_database_update
1637 - for size in ${GRC_ICON_SIZES} ; do
1638 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
1639 - application-gnuradio-grc || ewarn "icon uninstall failed"
1640 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
1641 - gnuradio-grc || ewarn "icon uninstall failed"
1642 -
1643 - done
1644 - xdg-icon-resource forceupdate
1645 - fi
1646 -}
1647
1648 diff --git a/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild
1649 deleted file mode 100644
1650 index 4e7041aaaa5..00000000000
1651 --- a/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild
1652 +++ /dev/null
1653 @@ -1,236 +0,0 @@
1654 -# Copyright 1999-2016 Gentoo Foundation
1655 -# Distributed under the terms of the GNU General Public License v2
1656 -
1657 -EAPI=5
1658 -PYTHON_COMPAT=( python2_7 )
1659 -
1660 -CMAKE_BUILD_TYPE="None"
1661 -inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
1662 -
1663 -DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
1664 -HOMEPAGE="http://gnuradio.org/"
1665 -LICENSE="GPL-3"
1666 -SLOT="0/${PV}"
1667 -
1668 -if [[ ${PV} == "9999" ]] ; then
1669 - EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
1670 - inherit git-r3
1671 - KEYWORDS=""
1672 -else
1673 - SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
1674 - KEYWORDS="~amd64 ~arm ~x86"
1675 -fi
1676 -
1677 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
1678 -
1679 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
1680 - audio? ( || ( alsa oss jack portaudio ) )
1681 - alsa? ( audio )
1682 - oss? ( audio )
1683 - jack? ( audio )
1684 - portaudio? ( audio )
1685 - analog? ( filter )
1686 - digital? ( filter analog )
1687 - dtv? ( fec )
1688 - pager? ( filter analog )
1689 - qt4? ( filter )
1690 - uhd? ( filter analog )
1691 - fcd? ( || ( alsa oss ) )
1692 - wavelet? ( analog )
1693 - wxwidgets? ( filter analog )"
1694 -
1695 -# bug #348206
1696 -# comedi? ( >=sci-electronics/comedilib-0.8 )
1697 -# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
1698 -RDEPEND="${PYTHON_DEPS}
1699 - >=dev-lang/orc-0.4.12
1700 - dev-libs/boost:0=[${PYTHON_USEDEP}]
1701 - !<=dev-libs/boost-1.52.0-r6:0/1.52
1702 - dev-python/numpy[${PYTHON_USEDEP}]
1703 - sci-libs/fftw:3.0=
1704 - alsa? (
1705 - media-libs/alsa-lib[${PYTHON_USEDEP}]
1706 - )
1707 - fcd? ( virtual/libusb:1 )
1708 - filter? ( sci-libs/scipy )
1709 - grc? (
1710 - dev-python/cheetah[${PYTHON_USEDEP}]
1711 - dev-python/lxml[${PYTHON_USEDEP}]
1712 - >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
1713 - )
1714 - jack? (
1715 - media-sound/jack-audio-connection-kit
1716 - )
1717 - log? ( dev-libs/log4cpp )
1718 - portaudio? (
1719 - >=media-libs/portaudio-19_pre
1720 - )
1721 - qt4? (
1722 - >=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
1723 - >=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
1724 - >=dev-qt/qtcore-4.4:4
1725 - >=dev-qt/qtgui-4.4:4
1726 - x11-libs/qwt:6
1727 - )
1728 - sdl? ( >=media-libs/libsdl-1.2.0 )
1729 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
1730 - utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
1731 - vocoder? ( media-sound/gsm )
1732 - wavelet? (
1733 - >=sci-libs/gsl-1.10
1734 - )
1735 - wxwidgets? (
1736 - dev-python/lxml[${PYTHON_USEDEP}]
1737 - dev-python/numpy[${PYTHON_USEDEP}]
1738 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
1739 - )
1740 - zeromq? ( >=net-libs/zeromq-2.1.11 )
1741 - "
1742 -
1743 -DEPEND="${RDEPEND}
1744 - >=dev-lang/swig-3.0.5
1745 - dev-python/cheetah[${PYTHON_USEDEP}]
1746 - virtual/pkgconfig
1747 - doc? (
1748 - >=app-doc/doxygen-1.5.7.1
1749 - dev-python/sphinx[${PYTHON_USEDEP}]
1750 - )
1751 - grc? ( x11-misc/xdg-utils )
1752 - oss? ( virtual/os-headers )
1753 - test? ( >=dev-util/cppunit-1.9.14 )
1754 - zeromq? ( net-libs/cppzmq )
1755 -"
1756 -
1757 -src_prepare() {
1758 - gnome2_environment_reset #534582
1759 -
1760 - # Useless UI element would require qt3support, bug #365019
1761 - sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
1762 - epatch_user
1763 -}
1764 -
1765 -src_configure() {
1766 - # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
1767 - #audio provider is still automagic
1768 - #zeromq missing deps isn't fatal
1769 - mycmakeargs=(
1770 - -DENABLE_DEFAULT=OFF
1771 - -DENABLE_GNURADIO_RUNTIME=ON
1772 - -DENABLE_VOLK=ON
1773 - -DENABLE_PYTHON=ON
1774 - -DENABLE_GR_BLOCKS=ON
1775 - -DENABLE_GR_FFT=ON
1776 - -DENABLE_GR_AUDIO=ON
1777 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
1778 - $(cmake-utils_use_enable analog GR_ANALOG) \
1779 - $(cmake-utils_use_enable atsc GR_ATSC) \
1780 - $(cmake-utils_use_enable channels GR_CHANNELS) \
1781 - $(cmake-utils_use_enable digital GR_DIGITAL) \
1782 - $(cmake-utils_use_enable doc DOXYGEN) \
1783 - $(cmake-utils_use_enable doc SPHINX) \
1784 - $(cmake-utils_use_enable dtv GR_DTV) \
1785 - $(cmake-utils_use_enable fcd GR_FCD) \
1786 - $(cmake-utils_use_enable fec GR_FEC) \
1787 - $(cmake-utils_use_enable filter GR_FILTER) \
1788 - $(cmake-utils_use_enable grc GRC) \
1789 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
1790 - $(cmake-utils_use_enable log GR_LOG) \
1791 - $(cmake-utils_use_enable noaa GR_NOAA) \
1792 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
1793 - $(cmake-utils_use_enable pager GR_PAGER) \
1794 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
1795 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
1796 - $(cmake-utils_use_enable test TESTING) \
1797 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
1798 - $(cmake-utils_use_enable uhd GR_UHD) \
1799 - $(cmake-utils_use_enable utils GR_UTILS) \
1800 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
1801 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
1802 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
1803 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
1804 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
1805 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
1806 - -DENABLE_GR_CORE=ON \
1807 - -DSYSCONFDIR="${EPREFIX}"/etc \
1808 - -DPYTHON_EXECUTABLE="${PYTHON}"
1809 - -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
1810 - )
1811 - use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
1812 - cmake-utils_src_configure
1813 -}
1814 -
1815 -src_install() {
1816 - cmake-utils_src_install
1817 -
1818 - if use examples ; then
1819 - dodir /usr/share/doc/${PF}/
1820 - mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
1821 - docompress -x /usr/share/doc/${PF}/examples
1822 - else
1823 - # It seems that the examples are always installed
1824 - rm -rf "${ED}"/usr/share/${PN}/examples || die
1825 - fi
1826 -
1827 - if use doc || use examples; then
1828 - #this doesn't appear useful
1829 - rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
1830 - fi
1831 -
1832 - # We install the mimetypes to the correct locations from the ebuild
1833 - rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
1834 - rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
1835 -
1836 - # Install icons, menu items and mime-types for GRC
1837 - if use grc ; then
1838 - local fd_path="${S}/grc/freedesktop"
1839 - insinto /usr/share/mime/packages
1840 - doins "${fd_path}/${PN}-grc.xml"
1841 -
1842 - domenu "${fd_path}/"*.desktop
1843 - doicon "${fd_path}/"*.png
1844 - fi
1845 -
1846 - python_fix_shebang "${ED}"
1847 -}
1848 -
1849 -src_test()
1850 -{
1851 - ctest -E qtgui
1852 -}
1853 -
1854 -pkg_postinst()
1855 -{
1856 - local GRC_ICON_SIZES="32 48 64 128 256"
1857 -
1858 - if use grc ; then
1859 - fdo-mime_desktop_database_update
1860 - fdo-mime_mime_database_update
1861 - for size in ${GRC_ICON_SIZES} ; do
1862 - xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
1863 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
1864 - || die "icon resource installation failed"
1865 - xdg-icon-resource install --noupdate --context apps --size ${size} \
1866 - "${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
1867 - || die "icon resource installation failed"
1868 - done
1869 - xdg-icon-resource forceupdate
1870 - fi
1871 -}
1872 -
1873 -pkg_postrm()
1874 -{
1875 - local GRC_ICON_SIZES="32 48 64 128 256"
1876 -
1877 - if use grc ; then
1878 - fdo-mime_desktop_database_update
1879 - fdo-mime_mime_database_update
1880 - for size in ${GRC_ICON_SIZES} ; do
1881 - xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
1882 - application-gnuradio-grc || ewarn "icon uninstall failed"
1883 - xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
1884 - gnuradio-grc || ewarn "icon uninstall failed"
1885 -
1886 - done
1887 - xdg-icon-resource forceupdate
1888 - fi
1889 -}
1890
1891 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
1892 index 19dfa673fab..b41d31baa05 100644
1893 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
1894 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
1895 @@ -1,7 +1,7 @@
1896 -# Copyright 1999-2017 Gentoo Foundation
1897 +# Copyright 1999-2018 Gentoo Foundation
1898 # Distributed under the terms of the GNU General Public License v2
1899
1900 -EAPI=5
1901 +EAPI=6
1902 PYTHON_COMPAT=( python2_7 )
1903
1904 CMAKE_BUILD_TYPE="None"
1905 @@ -13,7 +13,7 @@ LICENSE="GPL-3"
1906 SLOT="0/${PV}"
1907
1908 if [[ ${PV} == "9999" ]] ; then
1909 - EGIT_REPO_URI=( https://github.com/gnuradio/gnuradio.git http://gnuradio.org/git/gnuradio.git )
1910 + EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
1911 inherit git-r3
1912 KEYWORDS=""
1913 else
1914 @@ -21,7 +21,9 @@ else
1915 KEYWORDS="~amd64 ~arm ~x86"
1916 fi
1917
1918 -IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
1919 +IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt4 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
1920 +#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
1921 +RESTRICT=test
1922
1923 REQUIRED_USE="${PYTHON_REQUIRED_USE}
1924 audio? ( || ( alsa oss jack portaudio ) )
1925 @@ -73,7 +75,7 @@ RDEPEND="${PYTHON_DEPS}
1926 x11-libs/qwt:6[qt4(+)]
1927 )
1928 sdl? ( >=media-libs/libsdl-1.2.0 )
1929 - uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
1930 + uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
1931 utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
1932 vocoder? ( media-sound/gsm )
1933 wavelet? (
1934 @@ -82,7 +84,7 @@ RDEPEND="${PYTHON_DEPS}
1935 wxwidgets? (
1936 dev-python/lxml[${PYTHON_USEDEP}]
1937 dev-python/numpy[${PYTHON_USEDEP}]
1938 - dev-python/wxpython:2.8[${PYTHON_USEDEP}]
1939 + dev-python/wxpython:3.0[${PYTHON_USEDEP}]
1940 )
1941 zeromq? ( >=net-libs/zeromq-2.1.11 )
1942 "
1943 @@ -105,15 +107,24 @@ DEPEND="${RDEPEND}
1944 src_prepare() {
1945 gnome2_environment_reset #534582
1946
1947 + epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
1948 # Useless UI element would require qt3support, bug #365019
1949 sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
1950 - epatch_user
1951 + default
1952 + cmake-utils_src_prepare
1953 }
1954
1955 src_configure() {
1956 # SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
1957 #audio provider is still automagic
1958 #zeromq missing deps isn't fatal
1959 + #remaining QA issues, these appear broken:
1960 + #ENABLE_ENABLE_PERFORMANCE_COUNTERS
1961 + #ENABLE_GR_AUDIO_ALSA
1962 + #ENABLE_GR_AUDIO_JACK
1963 + #ENABLE_GR_AUDIO_OSS
1964 + #ENABLE_GR_AUDIO_PORTAUDIO
1965 + #ENABLE_GR_CORE
1966 mycmakeargs=(
1967 -DENABLE_DEFAULT=OFF
1968 -DENABLE_GNURADIO_RUNTIME=ON
1969 @@ -122,37 +133,37 @@ src_configure() {
1970 -DENABLE_GR_BLOCKS=ON
1971 -DENABLE_GR_FFT=ON
1972 -DENABLE_GR_AUDIO=ON
1973 - $(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
1974 - $(cmake-utils_use_enable analog GR_ANALOG) \
1975 - $(cmake-utils_use_enable atsc GR_ATSC) \
1976 - $(cmake-utils_use_enable channels GR_CHANNELS) \
1977 - $(cmake-utils_use_enable digital GR_DIGITAL) \
1978 - $(cmake-utils_use_enable doc DOXYGEN) \
1979 - $(cmake-utils_use_enable doc SPHINX) \
1980 - $(cmake-utils_use_enable dtv GR_DTV) \
1981 - $(cmake-utils_use_enable fcd GR_FCD) \
1982 - $(cmake-utils_use_enable fec GR_FEC) \
1983 - $(cmake-utils_use_enable filter GR_FILTER) \
1984 - $(cmake-utils_use_enable grc GRC) \
1985 - $(cmake-utils_use_enable jack GR_AUDIO_JACK) \
1986 - $(cmake-utils_use_enable log GR_LOG) \
1987 - $(cmake-utils_use_enable noaa GR_NOAA) \
1988 - $(cmake-utils_use_enable oss GR_AUDIO_OSS) \
1989 - $(cmake-utils_use_enable pager GR_PAGER) \
1990 - $(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
1991 - $(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
1992 - $(cmake-utils_use_enable test TESTING) \
1993 - $(cmake-utils_use_enable trellis GR_TRELLIS) \
1994 - $(cmake-utils_use_enable uhd GR_UHD) \
1995 - $(cmake-utils_use_enable utils GR_UTILS) \
1996 - $(cmake-utils_use_enable vocoder GR_VOCODER) \
1997 - $(cmake-utils_use_enable wavelet GR_WAVELET) \
1998 - $(cmake-utils_use_enable wxwidgets GR_WXGUI) \
1999 - $(cmake-utils_use_enable qt4 GR_QTGUI) \
2000 - $(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
2001 - $(cmake-utils_use_enable zeromq GR_ZEROMQ) \
2002 - -DENABLE_GR_CORE=ON \
2003 - -DSYSCONFDIR="${EPREFIX}"/etc \
2004 + -DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
2005 + -DENABLE_GR_ANALOG="$(usex analog)"
2006 + -DENABLE_GR_ATSC="$(usex atsc)"
2007 + -DENABLE_GR_CHANNELS="$(usex channels)"
2008 + -DENABLE_GR_DIGITAL="$(usex digital)"
2009 + -DENABLE_DOXYGEN="$(usex doc)"
2010 + -DENABLE_SPHINX="$(usex doc)"
2011 + -DENABLE_GR_DTV="$(usex dtv)"
2012 + -DENABLE_GR_FCD="$(usex fcd)"
2013 + -DENABLE_GR_FEC="$(usex fec)"
2014 + -DENABLE_GR_FILTER="$(usex filter)"
2015 + -DENABLE_GRC="$(usex grc)"
2016 + -DENABLE_GR_AUDIO_JACK="$(usex jack)"
2017 + -DENABLE_GR_LOG="$(usex log)"
2018 + -DENABLE_GR_NOAA="$(usex noaa)"
2019 + -DENABLE_GR_AUDIO_OSS="$(usex oss)"
2020 + -DENABLE_GR_PAGER="$(usex pager)"
2021 + -DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
2022 + -DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
2023 + -DENABLE_TESTING="$(usex test)"
2024 + -DENABLE_GR_TRELLIS="$(usex trellis)"
2025 + -DENABLE_GR_UHD="$(usex uhd)"
2026 + -DENABLE_GR_UTILS="$(usex utils)"
2027 + -DENABLE_GR_VOCODER="$(usex vocoder)"
2028 + -DENABLE_GR_WAVELET="$(usex wavelet)"
2029 + -DENABLE_GR_WXGUI="$(usex wxwidgets)"
2030 + -DENABLE_GR_QTGUI="$(usex qt4)"
2031 + -DENABLE_GR_VIDEO_SDL="$(usex sdl)"
2032 + -DENABLE_GR_ZEROMQ="$(usex zeromq)"
2033 + -DENABLE_GR_CORE=ON
2034 + -DSYSCONFDIR="${EPREFIX}"/etc
2035 -DPYTHON_EXECUTABLE="${PYTHON}"
2036 -DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
2037 )