gentoo resync : 13.06.2020

6 files changed, 321 insertions, 597 deletions

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 0ecb89c0ca90..b242b17fd321 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,12 +1,11 @@
 AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf156a83f6b463b74398a6bb17f70a0917bdded1e585fe1ead61dd38f5aeb9020fac256a6f5caf9e1f638e214035fb8ec3b8ef7c SHA512 406ecc20f4818f83cbd599c216c60a6d0daf70ed3d227613421d53466307e44f3d32cf5480401273baf74a488c3f73349c145452ca865f1ca9365314c1813768
 AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 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.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
-EBUILD gnuradio-3.6.5.1-r3.ebuild 5339 BLAKE2B 40342241899afb64e9ef4bd4c3ddf74e488dfcef7290c733589868bc17cb12bb9f4dadfccb987817c278921e2606a5fbec15a136823839df696c689cda104548 SHA512 d7427110295bbe6c561ff98b859725498b93e4a479e73e17a6e0dbf766ef9c3d5e18f66ab61ed98c01ef4655d225d45c49f0d9be5e26f9f7cce5e990531535c4
+DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
 EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
-EBUILD gnuradio-3.7.9999.ebuild 7383 BLAKE2B c6178e81d4a1a982a8cc9a305faad53cbd04836a4a2ddc6aa6f10785f09ab40d3c3ac5d4a8a41b1dbd0ee5529409e8b7b1ca869525a56a424dcfe535597f6bd0 SHA512 566f559aed55f2e8f58d4818c90722b20a13d242d155a0512e17c923a4beab9aaa1c1c86290618cba78c7ec3868b7414518c1df428e36b2cb649631179222853
-EBUILD gnuradio-9999.ebuild 7340 BLAKE2B 3184d2a662f4b5b1974bd3b520e3d03a04098b23196f5cd346dbda30a4a05e3b801231dcd171e8aa3f5075452574d73a50d97e6473f88f4ad8cb9d56bf0df930 SHA512 74975e565a74ac889d37f299a2bcdc06a87f9e6fb63da0d9fbfea4df3dab3812c82f1740736042f09223e695302fd4bd7cbe43503bebee2dac33bb1df898b7e9
-MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
+EBUILD gnuradio-3.8.1.0-r1.ebuild 5995 BLAKE2B cb288a4e5610db280d7f508c22084a94c8a7482333a9e9704b28f6bf71c8b32f25f68c9fcd1d4488cd230fca8fd5bc965d8956259090d031116678820ec1686d SHA512 27c9e8e47489fd91464217756626848b04c749a181ff71e8f983a227d3a70e52e8d4c687d25c4b6671654fc12956cb226249525164d07345c81001aab462e14c
+EBUILD gnuradio-9999.ebuild 6019 BLAKE2B e620da24a69f4b285e34752cac338dff0343a0f77501f8fcd93c76aa860328cc55b8b128ea37fcb6318fcdcb97888edf43dd083f6786cc284ccbafc7fee465f0 SHA512 babb6b819b29a57497b56f555adf45ffc688747dab5f1a19a82297eb1801a5b75a129abda8115d7f5495e675afc2248764002553d5fa47afc2c2c7451b53d1ac
+MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
deleted file mode 100644
index a38d393dfebb..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="alsa +analog +digital doc examples fcd +filter grc jack oss pager performance-counters portaudio sdl uhd +utils wavelet"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-		analog? ( filter )
-		digital? ( filter analog )
-		pager? ( filter analog )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )"
-
-# bug #348206
-# comedi? ( >=sci-electronics/comedilib-0.7 )
-# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/orc-0.4.12
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-	')
-	!<=dev-libs/boost-1.52.0-r6:0/1.52
-	dev-util/cppunit
-	sci-libs/fftw:3.0=
-	fcd? ( virtual/libusb:1 )
-	alsa? (
-		media-libs/alsa-lib[${PYTHON_SINGLE_USEDEP}]
-	)
-	grc? (
-		$(python_gen_cond_dep '
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( media-libs/libsdl )
-	uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_SINGLE_USEDEP}] )
-	wavelet? (
-		sci-libs/gsl
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-		doc? (
-			>=app-doc/doxygen-1.5.7.1
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		)
-	')
-	grc? (
-		x11-misc/xdg-utils
-	)
-	oss? (
-		virtual/os-headers
-	)
-"
-
-src_prepare() {
-	# Useless UI element would require qt3support, bug #365019
-	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
-	epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch
-	cmake-utils_src_prepare
-}
-
-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
-	mycmakeargs=(
-		$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \
-		$(cmake-utils_use_enable analog GR_ANALOG) \
-		$(cmake-utils_use_enable digital GR_DIGITAL) \
-		$(cmake-utils_use_enable doc DOXYGEN) \
-		$(cmake-utils_use_enable doc SPHINX) \
-		$(cmake-utils_use_enable fcd GR_FCD) \
-		$(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 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 uhd GR_UHD) \
-		$(cmake-utils_use_enable utils GR_UTILS) \
-		$(cmake-utils_use_enable wavelet GR_WAVELET) \
-		$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \
-		-DENABLE_GR_QTGUI=OFF \
-		-DENABLE_GR_WXGUI=OFF \
-		-DENABLE_GR_CORE=ON \
-		-DSYSCONFDIR="${EPREFIX}"/etc \
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	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
-		xdg_desktop_database_update
-		xdg_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
-		xdg_desktop_database_update
-		xdg_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.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
deleted file mode 100644
index f8ecf5a77873..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint-3.7"
-fi
-
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
-
-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 )
-		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
-	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
-	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-		!<=dev-libs/boost-1.52.0-r6:0/1.52
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		wxwidgets? (
-			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
-			|| (
-				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-	')
-	"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.7.1
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_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
-
-	if [[ ${PV} == "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
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	#zeromq missing deps isn't fatal
-	python_export PYTHON_SITEDIR
-	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_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=OFF
-		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
-		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
-		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
-		-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
-		xdg_desktop_database_update
-		xdg_mimeinfo_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
-		xdg_desktop_database_update
-		xdg_mimeinfo_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.8.1.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
new file mode 100644
index 000000000000..3fd0a24eac18
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils desktop
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
+	)
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
+			)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-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_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_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
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	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}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test()
+{
+	virtx cmake_src_test
+}
+
+pkg_postinst()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 7bbe445db144..aa068b0e06b5 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -13,107 +13,101 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="pybind"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
-if [[ ${PV} == "3.7.9999" ]]; then
-	EGIT_BRANCH="maint"
-fi
 
-IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
-RESTRICT="!test? ( test )"
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
 
 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 )
-		qt5? ( filter )
-		uhd? ( filter analog )
-		fcd? ( || ( alsa oss ) )
-		wavelet? ( analog )
-		wxwidgets? ( filter analog )"
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	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-1.52.0-r6:0/1.52
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
-	alsa? (
-		media-libs/alsa-lib:=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
 	)
-	fcd? ( virtual/libusb:1 )
-	jack? (
-		media-sound/jack-audio-connection-kit
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
 	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
+	jack? ( media-sound/jack-audio-connection-kit )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]
-		dev-libs/log4cpp )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
-	zeromq? ( >=net-libs/zeromq-2.1.11
-			dev-libs/gmp:= )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[${PYTHON_MULTI_USEDEP}]
-		|| (
-			dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		)
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
-			)
-		)
-		grc? (
-			dev-python/pygobject:*[cairo(+),${PYTHON_MULTI_USEDEP}]
-			dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
-			dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		)
-		qt5? (
-			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			x11-libs/qwt:6[qt5(+)]
-		)
-		utils? (
-			|| (
-				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
 			)
-		)
-	')
-	"
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
 
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
 DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
 	app-text/docbook-xml-dtd:4.2
 	>=dev-lang/swig-3.0.5
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-		')
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
@@ -122,52 +116,35 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
-	gnome2_environment_reset #534582
+	xdg_environment_reset #534582
 
-	if [[ ${PV} == "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
-
-	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
-	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
-	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
-	python_export PYTHON_SITEDIR
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=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_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_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
 		-DENABLE_TESTING="$(usex test)"
 		-DENABLE_GR_TRELLIS="$(usex trellis)"
 		-DENABLE_GR_UHD="$(usex uhd)"
@@ -175,21 +152,18 @@ src_configure() {
 		-DENABLE_GR_VOCODER="$(usex vocoder)"
 		-DENABLE_GR_WAVELET="$(usex wavelet)"
 		-DENABLE_GR_QTGUI="$(usex qt5)"
-		-DDESIRED_QT_VERSION="$(usex qt5 5)"
 		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
-		-DENABLE_GR_CORE=ON
 		-DSYSCONFDIR="${EPREFIX}"/etc
 		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
 		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 	)
-	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use examples ; then
 		dodir /usr/share/doc/${PF}/
@@ -205,7 +179,7 @@ src_install() {
 		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
 	fi
 
-	# We install the mimetypes to the correct locations from the ebuild
+	# Remove duplicated icons, MIME and desktop files and installation script
 	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
 	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
 
@@ -220,46 +194,30 @@ src_install() {
 	fi
 
 	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
 }
 
 src_test()
 {
-	ctest -E qtgui
+	virtx cmake_src_test
 }
 
 pkg_postinst()
 {
-	local GRC_ICON_SIZES="32 48 64 128 256"
-
 	if use grc ; then
 		xdg_desktop_database_update
+		xdg_icon_cache_update
 		xdg_mimeinfo_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
 		xdg_desktop_database_update
+		xdg_icon_cache_update
 		xdg_mimeinfo_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/metadata.xml b/net-wireless/gnuradio/metadata.xml
index c1685236ff6d..5d03b8a37dbf 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="filter">enable filter signal processing blocks</flag>
 		<flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
 		<flag name="log">enable logging to console and files</flag>
+		<flag name="modtool">enable modtool for editing GNU Radio modules and components</flag>
 		<flag name="noaa">enable NOAA POES HRPT receiver blocks</flag>
 		<flag name="pager">enable pager signal processing blocks</flag>
 		<flag name="performance-counters">enable block performance counters</flag>