gentoo auto-resync : 15:07:2022 - 19:43:32

7 files changed, 302 insertions, 29 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 27dd6c4db26d..bd4a8a146f15 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 3ebf47598e86..20be15931e64 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,5 +1,7 @@
+DIST gnuradio-3.10.3.0.tar.gz 4376594 BLAKE2B 676c16dda6c4b01ca922fe942e1572653c57dd8f6240ad74af2b10351470ad53ecc5c4a7347e04cb1c898388c48f561f7871c39140f77c50f9217963355793a6 SHA512 fe4cd2204257b65129f148bbdd6a1c192559b8824a131bd99cc2ac854e1880ee4fa07b702170452b3b6070df34d99db27ef0fe064c50e6e5a6335e61e38e6645
 DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
+EBUILD gnuradio-3.10.3.0.ebuild 6737 BLAKE2B 108e3366d485e152a7065a9a418dc79063c235a27c7b02eedc1dac06ccbbd9a6a67fbf46315157feb2b3426583b4c57c76fcb463ef9449a80689fddfd80d8e14 SHA512 a44e2dbbfc2da4be91f759a82639063d2e13ee19a1cf022b34c5f139cb89bc59c7aa17d349422fd18daf72ce33bd053d8ef838ffd4c77a6bed17622df7615e4a
 EBUILD gnuradio-3.8.5.0-r1.ebuild 6179 BLAKE2B 0a80d18deaf566e360a3ac27f9f9be82b1ca77f863e55f63d33e2db2963be501fbb48ff40d803f517ab9d1d6942f70e1308403283ba02994869c583ce8a798cf SHA512 2cb684eb7e6ed1720789adb1a856b0b789d78973f288c02288ecfce734118f7d5d27feda40816981e9633ee925d23d4252317587941983ef1e6829654ffe4b7e
 EBUILD gnuradio-3.8.5.0.ebuild 6125 BLAKE2B 80ff9f450051087bf7d4801115097ca83423c9bb30149c416141bd09fd6b054d6c19a477a09dac84cbfecda14b731d48265e6be0ad50173bf8f47868b4025eab SHA512 5ec39ebc2b28a720a1c19573ad20ff2e7c4a992e3467c7ac999d47044ad212d6ef88f840dcc5cdf7526153656eba58c159c47a2e13c3c61459170788b9e7c74d
-EBUILD gnuradio-9999.ebuild 5985 BLAKE2B 93ab02962149379a688c3db4db570cddb1da16d87fc4955327a22550f1a17eca6b034a69e28d92bafb1915427d659e4292883b231315ce8ed4f002bc35409465 SHA512 3de04e75f3d94d03d21f353ffcf4d8100520772d1864e4f814a6056cd6a5b10abcf3ee6077d28c6dc3126e6989b7993686a279780c2d3a75ceb66c84c9f07dad
-MISC metadata.xml 1676 BLAKE2B 9dc4c025e09d54b083b7681f5a06e491375d9621fbb60d0a0b8c218da0e9a3d7cc557aaac86002984bf0b7dbc82848261d3ec0cceeb0cb35ebaed92675cea2a9 SHA512 e52efa5ac1bb1dc576b2802d581741c43622aabfac2133b1e3aefdcec671e2c67631f91c1322d22a4b315e1e12c006cc696dd97aa0f18ebace534cc249251b12
+EBUILD gnuradio-9999.ebuild 6737 BLAKE2B 108e3366d485e152a7065a9a418dc79063c235a27c7b02eedc1dac06ccbbd9a6a67fbf46315157feb2b3426583b4c57c76fcb463ef9449a80689fddfd80d8e14 SHA512 a44e2dbbfc2da4be91f759a82639063d2e13ee19a1cf022b34c5f139cb89bc59c7aa17d349422fd18daf72ce33bd053d8ef838ffd4c77a6bed17622df7615e4a
+MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0
diff --git a/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
new file mode 100644
index 000000000000..5e21cefe2fdd
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.10.3.0.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx 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://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.10"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy 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}]')
+	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir:=
+	sci-libs/volk:=
+	media-libs/libsndfile
+	sys-libs/libunwind
+	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? (
+		$(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]')
+	)
+	fec? (
+		sci-libs/gsl:=
+		dev-python/scipy
+	)
+	filter? (
+		dev-python/scipy
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+	)
+	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]
+	)
+	iio? (
+		net-libs/libiio:=
+		net-libs/libad9361-iio:=
+	)
+	jack? ( virtual/jack )
+	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
+	)
+	soapy? (
+		$(python_gen_cond_dep 'net-wireless/soapysdr[${PYTHON_USEDEP}]')
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( dev-python/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.8 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!!<net-wireless/gnuradio-3.10
+	app-text/docbook-xml-dtd:4.2
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
+	dev-libs/spdlog
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-libs/mathjax
+	)
+	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_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_IIO="$(usex iio)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_NETWORK="$(usex network)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_SOAPY="$(usex soapy)"
+		-DENABLE_GR_BLOCKTOOL=OFF		# for now
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-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}"
+		-DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax"
+	)
+	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 78f7c917fedf..5e21cefe2fdd 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils desktop
+inherit cmake python-single-r1 virtualx xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -14,14 +14,14 @@ SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
-	EGIT_BRANCH="maint-3.8"
+	EGIT_BRANCH="maint-3.10"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~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"
+IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq"
 
 #RESTRICT="!test? ( test )"
 #Tests are known broken right now
@@ -49,15 +49,24 @@ 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}]')
+	$(python_gen_cond_dep 'dev-python/jsonschema[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
 	sci-libs/mpir:=
 	sci-libs/volk:=
+	media-libs/libsndfile
+	sys-libs/libunwind
 	alsa? ( media-libs/alsa-lib:= )
+	ctrlport? (
+		$(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]')
+	)
 	fec? (
 		sci-libs/gsl:=
 		dev-python/scipy
 	)
-	filter? ( dev-python/scipy )
+	filter? (
+		dev-python/scipy
+		$(python_gen_cond_dep 'dev-python/pyqtgraph[${PYTHON_USEDEP}]')
+	)
 	grc? (
 		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -66,6 +75,10 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection]
 	)
+	iio? (
+		net-libs/libiio:=
+		net-libs/libad9361-iio:=
+	)
 	jack? ( virtual/jack )
 	portaudio? ( >=media-libs/portaudio-19_pre )
 	qt5? (
@@ -75,6 +88,9 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/qwt:6[qt5(+)]
 		dev-qt/qtwidgets:5
 	)
+	soapy? (
+		$(python_gen_cond_dep 'net-wireless/soapysdr[${PYTHON_USEDEP}]')
+	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
 	trellis? ( dev-python/scipy )
 	uhd? (
@@ -88,7 +104,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	vocoder? (
 		media-sound/gsm
-		>=media-libs/codec2-0.8.1
+		>=media-libs/codec2-0.8.1:=
 	)
 	wavelet? (
 		sci-libs/gsl:=
@@ -98,15 +114,18 @@ RDEPEND="${PYTHON_DEPS}
 	zeromq? ( >=net-libs/zeromq-2.1.11:= )
 "
 
-#That's right, it can't build if gnuradio 3.7 is installed
+#That's right, it can't build if gnuradio 3.8 is installed
 #Both due to build failure, and then file collision due to bundled volk
 DEPEND="${RDEPEND}
-	!<net-wireless/gnuradio-3.8
+	!!<net-wireless/gnuradio-3.10
 	app-text/docbook-xml-dtd:4.2
-	>=dev-lang/swig-3.0.5
+	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]')
+	dev-libs/spdlog
 	virtual/pkgconfig
 	doc? (
 		>=app-doc/doxygen-1.5.7.1
+		dev-libs/mathjax
 	)
 	grc? ( x11-misc/xdg-utils )
 	oss? ( virtual/os-headers )
@@ -128,36 +147,40 @@ 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_AUDIO=ON
 		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_CTRLPORT="$(usex ctrlport)"
 		-DENABLE_GR_DIGITAL="$(usex digital)"
 		-DENABLE_DOXYGEN="$(usex doc)"
 		-DENABLE_GR_DTV="$(usex dtv)"
 		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FFT=ON
 		-DENABLE_GR_FILTER="$(usex filter)"
 		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_IIO="$(usex iio)"
 		-DENABLE_GR_MODTOOL="$(usex modtool)"
 		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
 		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_NETWORK="$(usex network)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_SOAPY="$(usex soapy)"
+		-DENABLE_GR_BLOCKTOOL=OFF		# for now
 		-DENABLE_GR_TRELLIS="$(usex trellis)"
 		-DENABLE_GR_UHD="$(usex uhd)"
 		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
 		-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}"
+		-DMATHJAX2_ROOT="${EPREFIX}/usr/share/mathjax"
 	)
 	cmake_src_configure
 }
@@ -184,18 +207,18 @@ src_install() {
 	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"
+	#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
+	#	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
+	find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
 	python_optimize
 }
 
diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index fdcbd394e398..619ce7994007 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -15,8 +15,11 @@
 		<flag name="fec">enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
 		<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="iio">enable enable support for IIO devices</flag>
 		<flag name="modtool">enable modtool for editing GNU Radio modules and components</flag>
+		<flag name="network">enable block for networking support</flag>
 		<flag name="performance-counters">enable block performance counters</flag>
+		<flag name="soapy">enable support for SoapySDR blocks</flag>
 		<flag name="trellis">enable trellis blocks for FSM</flag>
 		<flag name="uhd">install UHD source and sink blocks</flag>
 		<flag name="utils">install scripts to enable viewing and analysis of files produced by flow graphs</flag>
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 92458f5838c3..a6d21d2a37f5 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -4,5 +4,5 @@ DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b3
 DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c
 DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
 EBUILD uhd-4.1.0.5.ebuild 3566 BLAKE2B 45dc4989480875a6ebdc3afd3fdc955af2cb48cf44f80dfd45289d2404a1bea6b3d7993e4976809e0a0306080acccdb79b730fffe05fd77af94b479e970a38c7 SHA512 ff76a249133c92c8365ad9ea299c2a7fa935519cd0125b4389549eff522face5aaee660d59f127e4c11586d6f80231236f96921d1e091e96dbcc57b18165f019
-EBUILD uhd-4.2.0.0.ebuild 3555 BLAKE2B 70daac07930ecfdba679a14f82ebce62716443c55f72d8dd3637ca51f2eee6aff34eb927604ff0c7f49e3f461e107d7db18dc991cfa8d3e89773e3ecfdeabd20 SHA512 2701ed1cf181289e1035ee54ced1a8a962810c69cbf2dd5c815c1b56e452c59ee1112450ef8c412f1b00191bacfb8cbf7b7accc67c960b015c5c85dd1bcbdbd1
+EBUILD uhd-4.2.0.0.ebuild 3691 BLAKE2B 495e7f314aaef9e2b50a797f1d28d0961fb263b296e13cf6c6e36fb58584b1d0c936e24bfa9544d4ce832ca4e096a93447fa339d483212f55c7cfaa4bc8e261a SHA512 bbc6020203c20f1d85f7b2d7198d2b5d3dbeeecf2936e0daef9e660c133478f1890a96879c0447d950aa806a3fd8d0783f54eae0d07f83eb8ef011ed3f1e19c6
 MISC metadata.xml 1160 BLAKE2B 0bcd5e0ea7008a4847cd0ec47e900eaad894c1b37f9917197ed408edb6525f3526fce2086fa318d66f9fe3a355a8a3d5b92dcdffd2518439fb4813f9cdec5b8a SHA512 b53864ec397c266c6c914c9d7bf44eb30187585fac7d5c871b54e91e7909186c756bcd49850343a28093e77148b506bbab5583834a0a125cefe9280c2e324c4d
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index 3af996fef0db..065339744a53 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-3)"
 KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+b100 +b200 doc e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
+IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 			b100? ( usb )
@@ -84,6 +84,8 @@ src_configure() {
 		-DENABLE_X300="$(usex x300)"
 		-DENABLE_MPMD="$(usex mpmd)"
 		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+		-DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
+		-DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
 		-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DUHD_VERSION="${PV}"