gentoo resync : 24.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-24 19:58:07 +0000
commit: 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree: da76713365257a445f3ae3b95470917f59d46728 /net-wireless/gnuradio
parent: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)
11 files changed, 278 insertions, 1098 deletions
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index dbaf6b665947..24a3ffb65dc1 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,19 +1,11 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
 AUX gnuradio-3.7.6.1-qwt-with-qt5-support.patch 961 BLAKE2B 00e64e3a2cb588c87cfb577bb611dc6f166e6886d680be9e7a8e12e6e814436abda8b70f141eb0737f2d4c2bff479a5dc8b92e8e4f90ab72e1c98108f8a47ff1 SHA512 021dfd17426081dd8ec8bb2cd7e7f6a185f2c36f85c83bfa9099c157bffb2d63831241175547f5ad1838ae46e089fa5054fcadbddefb59fa1f34f8c0fa2d4075
+AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
-DIST gnuradio-3.7.10.2.tar.gz 4354889 BLAKE2B fdc113cf5731b0ffdb05580f711e9e8efd971097304c86fb123d0c2d8b429cde5e9805d32c075f7b75cf713367388fa601bb96df9f63654c52e72b7155dde7e9 SHA512 caf389314708c219ef77a6b7111ecffdb074bc5be047fa127706cad7b785ec1262f60b0416d8c4ce1baf769f822f2f571d6e14eef8066636a53568fcfa68dbe2
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-DIST gnuradio-3.7.6.1.tar.gz 3588833 BLAKE2B 148ca4327744f2052b9a28d656f1f051edc9d77b03fd141b531c03070f07ee105abaafa9507a91b549b74772c50afbe864c4085681ebdde6b1d6164f81223998 SHA512 88ec30b2bd93ca032c29f4606856a8e70b0123474fd84115657804429f381dea78f97a7523c9684acad6a27b357ddf876632e957de5c6e0170045dc38d121939
-DIST gnuradio-3.7.7.1.tar.gz 3845988 BLAKE2B 07c29539defaf6df343ad9cf460181e4234d3a259a3dfa565d65a2ed0e5f1d72399a28be66d8f38a58d5f2832289aa445a72705353abf3535cd6ef8e42e2d945 SHA512 7be9568d19cbe03f3c229dbda5fc8d448a4a57d84bd9f8b91a400c65b526414539536c0a391b15d5f0e63bf22ef5675dc3ed8a6ed94ce3b1e4328948fa202ba1
-DIST gnuradio-3.7.8.1.tar.gz 3962961 BLAKE2B 831754e04f108c4b2c8ce883be83819d81c2301a26b3b3e95b1c7a6cc1ec706df7680ca8a191e4bfe2527126e2220cb7ba4c6b3053a05a593c84c6f26d81f6b0 SHA512 21468335d698963ce5090b03b980ecc3714c301f3cd5d071d8a1b083c3c985479c42ee6d842b1b600ac85640ce875fb2bbfd6f51d30144cb612ac55e648c0c9a
-DIST gnuradio-3.7.9.3.tar.gz 4158777 BLAKE2B a9f8ee1ff376acf6b07e46bd303ce4a0e5c2985d8a8bd2bd83a52b5ad692daa271b442a0c94686c056018d9b8273e37c3b9ec2d636aa2ef04b9f928eb119f9ac SHA512 f73466defc5d14d18790ddf149af0c6e1d53d2d46d60c20bdbfd1a742840ad11f0e783dc4e6a7e67bd826fa19e40d9d14045abcad34d602ae37e64be7e271b5b
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5475 BLAKE2B 2a8f95be17ec41fcf172a06c4d9f45eb58d9665be17acc0c59ceaa36a643eadd911f2e6215733cc869fefe7b0e96fcf4d22936706fc081086ac4918831df91b2 SHA512 ccc27ad3e26921c6fd611c22c0709d4c97cf11d40ab3bf949fc9c49033a6cb7b49b870457e0e9262fb174e5ab34f658eb1c9dd0b728c84f95a16af28b34898c3
-EBUILD gnuradio-3.7.10.2.ebuild 6965 BLAKE2B 13db95b75fd23f2d26314d2476b13ce0244eea19420a86eb3bacc440260104f4841f5f2291bb98d1aa0d6c7aaef5e49ec44b2b78c4c687ff04b2b85476d9ef40 SHA512 bc36af95ff5b56dca0f0366bdbe641a5924affcdf91f665cffa3fbb6949314226ede7b32f001c175356769f4fa8229d732c48905dd5deab5f712e191875ad60b
-EBUILD gnuradio-3.7.11-r1.ebuild 6762 BLAKE2B f783f06ef9093a28775a27cfe0ac0df6c8fe7870be53fc6dece540e4eaa91c5e9254d9735ae90c67491d28fbdb25c9a86d3946e7c93a8a934c25974aa2acfc5b SHA512 a94e08919d90a7459e6fce66b16c2d352043d43d7738d589381c4cf587b32196f6bceaf8191a335438d4b5255ce6a932226961935a90fb402f2e7a3b367ffcb7
-EBUILD gnuradio-3.7.11.ebuild 6962 BLAKE2B 73e0c0f077c256f481b260db62c853df25e4e46959806bb41c8016e6e534408e224ebb4d6f65d7ad281977e04cf7eb852f11df6b50840b9ce2ce952c6773f1ee SHA512 876ddc0bab58942688764a11153e76798bfd826373194382745299baec3c2b90dd98a956acba7af5b4bc6c53cafd180936c3835f745e2bc61074b3f3fe0c0a10
-EBUILD gnuradio-3.7.6.1-r2.ebuild 6817 BLAKE2B e0525116ea8e093540732b74ff171d072da0199b711363c3473d8877f7b2c3906e3316a52f7b88b65288fe652aa12467c3b411c759c14e89a447afb65211316f SHA512 c0f60820b9c1d81150149881148dcb63efdb01cb29a138d33c3ab73e0cba9a85361926b1cae81e6fc4af2e6fbc53eb4af00f71e6475b2f875e877c56e8f37d55
-EBUILD gnuradio-3.7.7.1.ebuild 6770 BLAKE2B 121f8b54a3d0db52b77453864f117915822182bca90274d10b8c08d48f163e74c13ae0928238f4f51c4f74ef5a104820d05ba2561b3071eca7170f8071c739e9 SHA512 84dcb4ec031f3d1f67cac10f398620a9518d5c5deba42e54dc80b2370b2f8b9e40c4278532dc039a7beecc1c9bf3d65c09c31fa0444e60b21cc893e9b1e78d39
-EBUILD gnuradio-3.7.8.1.ebuild 6770 BLAKE2B 121f8b54a3d0db52b77453864f117915822182bca90274d10b8c08d48f163e74c13ae0928238f4f51c4f74ef5a104820d05ba2561b3071eca7170f8071c739e9 SHA512 84dcb4ec031f3d1f67cac10f398620a9518d5c5deba42e54dc80b2370b2f8b9e40c4278532dc039a7beecc1c9bf3d65c09c31fa0444e60b21cc893e9b1e78d39
-EBUILD gnuradio-3.7.9.3.ebuild 6919 BLAKE2B 1f09768839c0eb0472d66485a2679dce10bafd03351466db7a2e2f6386b28f2b5a5a3fec90c3de16c4df28b299d2a9fa67f0f93abf0bc71d49ce9d941c36134f SHA512 54ddf28199b020bc37cc95e4a1f721cc4155003f479dfa1192bc41d4aa3a319daeaa40466ed3c33d7c5fc000d253ef1f1ca00d0f36b5499e0f77998344d2068a
-EBUILD gnuradio-9999.ebuild 7007 BLAKE2B bedde4714f62d1af0b08b3bbfafc0f9f758f88d0524a152cf95f79f5a4a88c6da57629c698d234086272c1c178ea6bfe22dabb13c7aa69516bb0f3458f074c78 SHA512 e0e6b7426282ce64cd20eacd82f306f8b4888ff63d16f11c4ae8c815a20b81de25c5f40723a4d8c6264e2c3c4c31344abfe4c5707d4c63b4bf48cbb452371407
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5313 BLAKE2B 5fa23624df4cf4d28504bd9aa1ec2cfe7340299077483481467675dad50629d8b6c3b29b77587bc43b7b1d542a3b9c04ca41470456760fb40efb2d91d089e205 SHA512 8492ef981cc6d401d0c57354e188c3d926eb04c078d7a6997173e926fb22d43b2d4881ea359d77a9491f1e7f67802248982266c680a50624a550b8865be6bb95
+EBUILD gnuradio-3.7.11-r2.ebuild 7057 BLAKE2B 2c593828e3a48fc55bf6e45bcf5fc2386c28307008e040f203fac0d4c59d237610cd4a87aeb3da7df60fc17fc5b6d717bcde230c5b9fb536f470657d1bebc47c SHA512 b4738ba81b862c77c243f2cc26c25bb31fd8d9e2b4a47a1f2485c68fc8db636e9691f10f87a4b2d596a51f12e53af5f06ddfd361e0fd0e23056e6eb5c24afc0c
+EBUILD gnuradio-3.7.9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
+EBUILD gnuradio-3.8.9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
+EBUILD gnuradio-9999.ebuild 7134 BLAKE2B 0e472b2e5831c1584238e498a51009354364dee5a84d079881c018e219205449a3cbc2165887ea925602a36535fd021d2232664a45a66f6883f4e7e8456931d3 SHA512 8ded1e7077faf7cde683b172b36b1fe77650cda9bbb607383e23f4d2fb31c45fa58221259a335f469bd38092ab37aa5ee81e5ab24bd4160be7396bd0c5c6698a
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch b/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch
new file mode 100644
index 000000000000..60eb7c7bbbe9
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch
@@ -0,0 +1,50 @@
+Description: Update for wxPython 3.0
+ wx.InitAllImageHandlers() issues a deprecation warning with wxPython 3.0
+ and is a no-op with wxPython 2.8.
+ Deprecated constants like wxSAVE are gone from the C++ API, so wx.SAVE, etc
+ are also likely to go from wxPython soon.
+ The alias "wx.Color" is gone in wxPython 3.0 - only "wx.Colour" is now
+ supported, so update docstring to use the correct class name.
+Author: Olly Betts <olly@survex.com>
+Forwarded: no
+Last-Update: 2014-08-21
+
+--- a/gr-wxgui/python/wxgui/plot.py
++++ b/gr-wxgui/python/wxgui/plot.py
+@@ -522,7 +522,7 @@
+                     self,
+                     "Choose a file with extension bmp, gif, xbm, xpm, png, or jpg", ".", "",
+                     "BMP files (*.bmp)|*.bmp|XBM files (*.xbm)|*.xbm|XPM file (*.xpm)|*.xpm|PNG files (*.png)|*.png|JPG files (*.jpg)|*.jpg",
+-                    wx.SAVE|wx.OVERWRITE_PROMPT
++                    wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT
+                     )
+             try:
+                 while 1:
+@@ -1820,7 +1820,6 @@
+ 
+     class MyApp(wx.App):
+         def OnInit(self):
+-            wx.InitAllImageHandlers()
+             frame = TestFrame(None, -1, "PlotCanvas")
+             #frame.Show(True)
+             self.SetTopWindow(frame)
+--- a/gr-wxgui/python/wxgui/plotter/gltext.py
++++ b/gr-wxgui/python/wxgui/plotter/gltext.py
+@@ -50,7 +50,7 @@
+         """
+         text (String)         - Text
+         font (wx.Font)        - Font to draw with (None = System default)
+-        foreground (wx.Color) - Color of the text
++        foreground (wx.Colour)- Color of the text
+                 or (wx.Bitmap)- Bitmap to overlay the text with
+         centered (bool)       - Center the text
+ 
+@@ -317,7 +317,7 @@
+             text (string)           - displayed text
+             font (wx.Font)          - if None, system default font will be used with font_size
+             font_size (int)         - font size in points
+-            foreground (wx.Color)   - Color of the text
++            foreground (wx.Colour)  - Color of the text
+                     or (wx.Bitmap)  - Bitmap to overlay the text with
+             centered (bool)         - should the text drawn centered towards position?
+ 
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index eeb3a09cc03c..43d13099383e 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ else
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet wxwidgets"
+IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio qt4 sdl uhd +utils wavelet"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		analog? ( filter )
@@ -29,8 +29,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		qt4? ( filter )
 		uhd? ( filter analog )
 		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
+		wavelet? ( analog )"
 
 # bug #348206
 # comedi? ( >=sci-electronics/comedilib-0.7 )
@@ -66,10 +65,6 @@ RDEPEND="${PYTHON_DEPS}
 	wavelet? (
 		sci-libs/gsl
 	)
-	wxwidgets? (
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
 "
 DEPEND="${RDEPEND}
 	dev-lang/swig
@@ -113,9 +108,9 @@ src_configure() {
 		$(cmake-utils_use_enable uhd GR_UHD) \
 		$(cmake-utils_use_enable utils GR_UTILS) \
 		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
 		$(cmake-utils_use_enable qt4 GR_QTGUI) \
 		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
+		-DENABLE_GR_WXGUI=OFF \
 		-DENABLE_GR_CORE=ON \
 		-DSYSCONFDIR="${EPREFIX}"/etc \
 		-DPYTHON_EXECUTABLE="${PYTHON}"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild
deleted file mode 100644
index 55c7486a8433..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6[qt4(+)]
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		-DENABLE_GR_WXGUI=OFF
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-		docompress -x /usr/share/doc/${PF}/examples
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	if use doc || use examples; then
-		#this doesn't appear useful
-		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/scripts/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
index 361fda83547f..b41d31baa051 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.11.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -22,6 +22,8 @@ else
 fi
 
 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"
+#tests are entirely broken on newer gcc even with -fpermissive added to *FLAGS
+RESTRICT=test
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -82,7 +84,7 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
@@ -105,15 +107,24 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -122,37 +133,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
deleted file mode 100644
index 812f66bd3e5f..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.6.1-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://s3-dist.gnuradio.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${FILESDIR}/${P}-qwt-with-qt5-support.patch"
-	epatch_user
-}
-
-src_configure() {
-	# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF}
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild
deleted file mode 100644
index d1af88e83447..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.7.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild b/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
deleted file mode 100644
index d1af88e83447..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.8.1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="http://gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		audio? ( || ( alsa oss jack portaudio ) )
-		alsa? ( audio )
-		oss? ( audio )
-		jack? ( audio )
-		portaudio? ( audio )
-		analog? ( filter )
-		digital? ( filter analog )
-		dtv? ( fec )
-		pager? ( filter analog )
-		qt4? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.8 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	dev-libs/boost:0=[${PYTHON_USEDEP}]
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_USEDEP}]
-	)
-	fcd? ( virtual/libusb:1 )
-	filter? ( sci-libs/scipy )
-	grc? (
-		dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	qt4? (
-		>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}]
-		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
-		>=dev-qt/qtcore-4.4:4
-		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
-	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-	vocoder? ( media-sound/gsm )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	wxwidgets? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-3.0.5
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	grc? ( x11-misc/xdg-utils )
-	oss? ( virtual/os-headers )
-	test? ( >=dev-util/cppunit-1.9.14 )
-	zeromq? ( net-libs/cppzmq )
-"
-
-src_prepare() {
-	gnome2_environment_reset #534582
-
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
-}
-
-src_configure() {
-	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
-	#audio provider is still automagic
-	#zeromq missing deps isn't fatal
-	mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DENABLE_GNURADIO_RUNTIME=ON
-		-DENABLE_VOLK=ON
-		-DENABLE_PYTHON=ON
-		-DENABLE_GR_BLOCKS=ON
-		-DENABLE_GR_FFT=ON
-		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR='${GR_DOC_DIR}/${CMAKE_PROJECT_NAME}'-"${PVF}"
-	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		dodir /usr/share/doc/${PF}/
-		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
-	else
-	# It seems that the examples are always installed
-		rm -rf "${ED}"/usr/share/${PN}/examples || die
-	fi
-
-	# We install the mimetypes to the correct locations from the ebuild
-	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
-	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
-
-	# Install icons, menu items and mime-types for GRC
-	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
-		insinto /usr/share/mime/packages
-		doins "${fd_path}/${PN}-grc.xml"
-
-		domenu "${fd_path}/"*.desktop
-		doicon "${fd_path}/"*.png
-	fi
-
-	python_fix_shebang "${ED}"
-}
-
-src_test()
-{
-	ctest -E qtgui
-}
-
-pkg_postinst()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
-				|| die "icon resource installation failed"
-			xdg-icon-resource install --noupdate --context apps --size ${size} \
-				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
-				|| die "icon resource installation failed"
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
-
-pkg_postrm()
-{
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
-	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
-		for size in ${GRC_ICON_SIZES} ; do
-			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
-				application-gnuradio-grc || ewarn "icon uninstall failed"
-			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
-				gnuradio-grc || ewarn "icon uninstall failed"
-
-		done
-		xdg-icon-resource forceupdate
-	fi
-}
diff --git a/net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index f12ff19d36fe..6e4c8e7f78f1 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.10.2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -12,14 +12,19 @@ HOMEPAGE="http://gnuradio.org/"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
 
 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"
 
@@ -73,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/qwt:6[qt4(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm )
 	wavelet? (
@@ -82,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
@@ -105,15 +110,28 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	if [[ ${PV} == "3.8.9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -122,37 +140,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 4e7041aaaa57..6e4c8e7f78f1 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9.3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -12,14 +12,19 @@ HOMEPAGE="http://gnuradio.org/"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
 
 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"
 
@@ -70,10 +75,10 @@ RDEPEND="${PYTHON_DEPS}
 		>=dev-python/pyqwt-5.2:5[${PYTHON_USEDEP}]
 		>=dev-qt/qtcore-4.4:4
 		>=dev-qt/qtgui-4.4:4
-		x11-libs/qwt:6
+		x11-libs/qwt:6[qt4(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm )
 	wavelet? (
@@ -82,12 +87,13 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
 
 DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	dev-python/cheetah[${PYTHON_USEDEP}]
 	virtual/pkgconfig
@@ -104,15 +110,28 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	if [[ ${PV} == "3.8.9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -121,37 +140,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
@@ -182,7 +201,7 @@ src_install() {
 
 	# Install icons, menu items and mime-types for GRC
 	if use grc ; then
-		local fd_path="${S}/grc/freedesktop"
+		local fd_path="${S}/grc/scripts/freedesktop"
 		insinto /usr/share/mime/packages
 		doins "${fd_path}/${PN}-grc.xml"
 
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 19dfa673fab8..6e4c8e7f78f1 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
@@ -12,16 +12,21 @@ HOMEPAGE="http://gnuradio.org/"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI=( https://github.com/gnuradio/gnuradio.git http://gnuradio.org/git/gnuradio.git )
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
 	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
 
-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"
+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"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 		audio? ( || ( alsa oss jack portaudio ) )
@@ -73,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/qwt:6[qt4(+)]
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
 	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
 	vocoder? ( media-sound/gsm )
 	wavelet? (
@@ -82,7 +87,7 @@ RDEPEND="${PYTHON_DEPS}
 	wxwidgets? (
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
 	)
 	zeromq? ( >=net-libs/zeromq-2.1.11 )
 	"
@@ -105,15 +110,28 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	gnome2_environment_reset #534582
 
+	if [[ ${PV} == "3.8.9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
 	# Useless UI element would require qt3support, bug #365019
 	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch_user
+	default
+	cmake-utils_src_prepare
 }
 
 src_configure() {
 	# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX
 	#audio provider is still automagic
 	#zeromq missing deps isn't fatal
+	#remaining QA issues, these appear broken:
+	#ENABLE_ENABLE_PERFORMANCE_COUNTERS
+	#ENABLE_GR_AUDIO_ALSA
+	#ENABLE_GR_AUDIO_JACK
+	#ENABLE_GR_AUDIO_OSS
+	#ENABLE_GR_AUDIO_PORTAUDIO
+	#ENABLE_GR_CORE
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
@@ -122,37 +140,37 @@ src_configure() {
 		-DENABLE_GR_BLOCKS=ON
 		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_AUDIO=ON
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable atsc GR_ATSC) \
-		$(cmake-utils_use_enable channels GR_CHANNELS) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable dtv GR_DTV) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(cmake-utils_use_enable fec GR_FEC) \
-		$(cmake-utils_use_enable filter GR_FILTER) \
-		$(cmake-utils_use_enable grc GRC) \
-		$(cmake-utils_use_enable jack GR_AUDIO_JACK) \
-		$(cmake-utils_use_enable log GR_LOG) \
-		$(cmake-utils_use_enable noaa GR_NOAA) \
-		$(cmake-utils_use_enable oss GR_AUDIO_OSS) \
-		$(cmake-utils_use_enable pager GR_PAGER) \
-		$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \
-		$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \
-		$(cmake-utils_use_enable test TESTING) \
-		$(cmake-utils_use_enable trellis GR_TRELLIS) \
-		$(cmake-utils_use_enable uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable vocoder GR_VOCODER) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable wxwidgets GR_WXGUI) \
-		$(cmake-utils_use_enable qt4 GR_QTGUI) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		$(cmake-utils_use_enable zeromq GR_ZEROMQ) \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt4)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-24 19:58:07 +0000
commit	99abbc5e5a6ecd3fc981b45646fd8cb5d320377b (patch)
tree	da76713365257a445f3ae3b95470917f59d46728 /net-wireless/gnuradio
parent	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (diff)