gentoo resync : 23.09.2020

62 files changed, 1159 insertions, 1119 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 5ffeaff0ebb5..f55a775e8482 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 5fd55f5bb9e8..1821748e4a60 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,7 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.1.2.tar.xz 950296 BLAKE2B dec19174813a76d5abb941b7a93257428175961c4f05709e5c1ba304302b4163a61cde2ae5938f40053ea43298ee8ac483cd0439c80ce76bae41a95b3dc8d5ac SHA512 44d397d3a9d154d05b5231e18e624bf1ca33c690be5eeb448620ba4882110306925b78dbbbd815384ee3faeff147d2b042c01be28fb1b43568924c9657484527
 DIST blueman-2.1.3.tar.xz 950772 BLAKE2B bec7c8da59b94e8f30ff5f41e057ae5662928a4469b46d0ad2b33521a9b3a5de94056f6f35440d90e05116b1dd83dcd2437f1c00fb6b9532c14ab0698716c57a SHA512 376007c6e857f0e10a4d5e4bc2a50f6d170d393389d3aa5d02728646bf27e2fe5c08fb835bb5432a980d2b6c70c348a0274015552be6229c15a89c34c0d105f2
-EBUILD blueman-2.1.2.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
-EBUILD blueman-2.1.3.ebuild 2945 BLAKE2B 05ebeb5a5bd474b7209d39f9fecd2a0f7fe5b1101cacff197d38f546472fef152fdf8162a197afda12c7b25d8cb9f9cb0aad020a55b6c8d83351a7dc8e0c15f2 SHA512 a57711dfd2eaa8ada2a27b2ce79622bfeb04ed567c2862f6707b832b53b4dd3593e7da9a4db90962417673ff98b790a7e970e817d5d69515629d90e29846ea77
+EBUILD blueman-2.1.3.ebuild 2952 BLAKE2B d98321931d1297af5d5d79e6dd792cedf38bc9403ba8e4a63e03a2f723a61f9fc1dd28b6bb2f2ed7d89ff6f716384e9aa7fc96afc856ff9ce703c82885bdc9e1 SHA512 0421e389b816f8579809a49f0b91903ae6382cbda06a1c495254182fe3ab90c9741b3940ef234b2659a6c58f2a7c453e9143673181527a2f68c748da8b39afbc
 EBUILD blueman-9999.ebuild 2922 BLAKE2B 1691375e1344f181e3f5f68c5347d27345b7e1c6d1f07ecf8ee1deb2db8e6d6fe7e38cfb8f5204adbba2749337d32a9b0872eb0db1092d7b6ca37892430c2c9b SHA512 daa32eed2666b048e2a77c940d87e530b702245ebdccdb136fa7c45a753cfa43123723fee6568b1f2a8c4a406d6520a3081a8fdc7be63ca0ec0f06d6c9bf2ad1
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.1.2.ebuild b/net-wireless/blueman/blueman-2.1.2.ebuild
deleted file mode 100644
index 8144b23c4cc1..000000000000
--- a/net-wireless/blueman/blueman-2.1.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_MULTI_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio[bluetooth]
-			media-sound/pulseaudio-modules-bt
-		)
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# replace py-compile to fix py3
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
-}
-
-src_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.1.3.ebuild b/net-wireless/blueman/blueman-2.1.3.ebuild
index b8777c460fbe..06839a236a4e 100644
--- a/net-wireless/blueman/blueman-2.1.3.ebuild
+++ b/net-wireless/blueman/blueman-2.1.3.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://github.com/blueman-project/blueman"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS="~arm ~arm64"
+	KEYWORDS="arm arm64 ppc ppc64 x86"
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
 fi
 
 # icons are GPL-2
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
deleted file mode 100644
index 0f7debf5bca7..000000000000
--- a/net-wireless/chirp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST chirp-daily-20200807.tar.gz 933776 BLAKE2B 192c36688fed011ba4ea97b0c5569f1681f15841f06c99c81e7711162c457ffd34d13481695b275e2fa0b0040dc21afe6d259ebf4beb7c3ed13a44679e1b67d8 SHA512 28d5ca132930d5525f24e7899fc370fbdbe9ce22b81fdbc7fee58afdd60a099b4ebcbd42963e92569d011c98eaa556225b018ab1d2d862b3a1a22362f0647325
-EBUILD chirp-20200807.ebuild 1096 BLAKE2B 8f6b66929c7efb2cb9ee3d853291b0fdd7dc628935a733693629a9e04b5d9e65237189ca44047e5ab53fe55967d9ee2d8ff9d680aa74fb5b01f596009029f111 SHA512 9a370708f3756311519b4503c000e9e0a3e485c9c239f01b1a31b43444699b66af6a4cd9a5444df00af64875a2ba6b8da271cb516be8e3e2bcc056d24c3039d9
-EBUILD chirp-99999999.ebuild 1360 BLAKE2B ee330c96ed27c9e7aa58339800c4098df4053c732cefce08439e26c72fa0509f6595c8aacbeb59c357ac116e6b067ab48a5c23b8c1109c8f97da17f65febb625 SHA512 21e2d8d43a1b6cfaeacd64e110b15b2a174a0518aac1323b7fb7b43e1df2425e78b84eecfadb684933ced6d9057806fa409e0bd16622d2a64d8977bd0c6cb15b
-MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20200807.ebuild b/net-wireless/chirp/chirp-20200807.ebuild
deleted file mode 100644
index 77faba828a0c..000000000000
--- a/net-wireless/chirp/chirp-20200807.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == "99999999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-else
-	RESTRICT="test"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-fi
-
-inherit distutils-r1 xdg-utils ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="https://chirp.danplanet.com"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="radioreference"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python]"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i -e "/share\/doc\/chirp/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pushd tests > /dev/null
-	"${PYTHON}" run_tests || die
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
deleted file mode 100644
index 48f9b1a77877..000000000000
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-#PYTHON_COMPAT=( python3_7 )
-#DISTUTILS_SINGLE_IMPL=1
-
-if [[ ${PV} == "99999999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-	#EHG_REVISION="py3"
-else
-	RESTRICT="test"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-fi
-
-inherit distutils-r1 xdg-utils ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="https://chirp.danplanet.com"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="radioreference"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python]')"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-	python_targets_python2_7? ( dev-python/pygtk[${PYTHON_USEDEP}] )
-	!python_targets_python2_7? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection] )
-	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )')"
-
-src_prepare() {
-	sed -i -e "/share\/doc\/chirp/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pushd tests > /dev/null
-	"${PYTHON}" run_tests || die
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-wireless/chirp/metadata.xml b/net-wireless/chirp/metadata.xml
deleted file mode 100644
index 7b8c6700a3c9..000000000000
--- a/net-wireless/chirp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>zerochaos@gentoo.org</email>
-	<name>Rick Farina</name>
-</maintainer>
-<maintainer type="project">
-	<email>radio@gentoo.org</email>
-	<name>Radio</name>
-</maintainer>
-<use>
-	<flag name="radioreference">support downloading data from radioreference.com (premium users only)</flag>
-</use>
-</pkgmetadata>
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index a7f6e1e1ea50..3116a970d473 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,4 +1,3 @@
-AUX crda-3.18-openssl-1.1.0-compatibility.patch 8782 BLAKE2B 7906eedd86aca173199ec957516167cf940d41da668cc7c5b5935232984f88960c1e00c87dfcd03c7d068cdb9168525378c46e1c52b28a9714d14cddce9240df SHA512 417a67139f61c467cd13274d0e6ad1542107dbb00765beed5becccdb64ac0228236498241e1fba9dfd4a5e1acb04ee583c435b699cca9b6a6461e5b7e86328cb
 AUX crda-4.14-do-not-compress-doc.patch 1367 BLAKE2B 021a25a898dc225e52bee293ba94152e5f7e8229c5c0a813a126f239819fd727edfa34c9b85f25e31d7630c13598f797dfcd855d31fd28beec5443866f3841fb SHA512 d3545fff1f6c6ae9ae1ae9c833bb137f84783a32dfb9e2f50075079268f67ee1b001fc904d99c68ff0aad97d674fabd591c1ca2ba378e14551759e56bc3f2e45
 AUX crda-4.14-openssl-1.1.0-compatibility.patch 8821 BLAKE2B 3f679378829d2d39fcac69a111d1caa551cb1b5ee51c34aab48fa3a84847fcb98771126856bc95b6af4462539fed1987682a4528cbc47a17ab03a14b23a3b8fe SHA512 9203965c228bfc7f694380e727ceee0654b18b8da81d49c5d9d379d94087d8f6e972894034c2245086366832d181b7d69180bada5199baff1c90b2012248fc15
 AUX crda-4.14-python-3.patch 3022 BLAKE2B b6d78c1a09ec0f848654139e0ba778f5d65d814b9d7c84df3013aec43baf55f9c23367b15454218e39d3a0959355b4fd030dd4584b7420f6835a8ef421dd72c9 SHA512 b953be9da2ed770d89c905257c2e3f04451ce9ee2a61ee9cc18285b3d8209f8665f5f0a2a4ffb8a5211445cb45fe66dc4e3d302e90c4c0030c293c978dd443c6
@@ -8,8 +7,6 @@ AUX crda-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90
 AUX crda-libressl.patch 410 BLAKE2B c341e349348eb7ce1ca3979865a2a984e44e62786508fe4d93c461abdded1f1169a87a72d90ce4518e3aed1307a4624857e6a563868b303e297a56e6fbf92211 SHA512 205f06886ea5a43f870bc38f3a548ee0f2e10ebc461c3748262bfda521c6145f625ee261089256d3c5dc5d791d1688d072a3f4299ca8af89f311c3f9a74ecc69
 AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
-DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
-EBUILD crda-3.18-r3.ebuild 2143 BLAKE2B 9c7273d7d3d5bfa600074deb6183bfcc1a21b243423e2e42b16f9c8c02c37977a78d3a7c921b3c44b8e2cab5ac0ad6a816ed315a8a1f4ee11c43a394848c62ca SHA512 f084c4912c6e030d48882c1cb56cacae17854b28fcc29ba7783cdf614683a08ce99533b54b0f50fc83bf97f2bd14ed0d0c8387b0e236d43a07fd4fc2eb657159
 EBUILD crda-4.14.ebuild 2214 BLAKE2B d20a6d56b0e33aa7d1dc8390c968a961080521a0537cf2d5601a7c1d70d0580aa5b8a94117e0e2cc1a4f5416c9d1d97fc9d110da225423fa0105d2fc14dac6a9 SHA512 175c24222615c1f73719bf97d3687628d41dbd3fb23f2ebbbf48b160062b9112d275681b7c300d605b3eb0459c88b4675b7747346a5d23842cdeed790f9a3681
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-3.18-r3.ebuild b/net-wireless/crda/crda-3.18-r3.ebuild
deleted file mode 100644
index a121648be719..000000000000
--- a/net-wireless/crda/crda-3.18-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2008-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs python-any-r1 udev
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
-	https://www.kernel.org/pub/software/network/crda/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gcrypt libressl"
-
-RDEPEND="!gcrypt? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
-	virtual/pkgconfig"
-
-python_check_deps() {
-	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-no-ldconfig.patch
-	"${FILESDIR}"/${PN}-no-werror.patch
-	"${FILESDIR}"/${PN}-cflags.patch
-	"${FILESDIR}"/${PN}-libreg-link.patch #542436
-	"${FILESDIR}"/${PN}-3.18-openssl-1.1.0-compatibility.patch #652428
-	"${FILESDIR}"/${PN}-libressl.patch
-	"${FILESDIR}"/${PN}-ldflags.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-_emake() {
-	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
-	# that look like it should change it).  We want to use /usr/lib/
-	# anyways as this file is not ABI specific and we want to share it
-	# among all ABIs rather than pointlessly duplicate it.
-	#
-	# The trailing slash on SBINDIR is required by the source.
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		SBINDIR='$(PREFIX)/sbin/' \
-		LIBDIR='$(PREFIX)/'"$(get_libdir)" \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \
-		USE_OPENSSL=$(usex gcrypt 0 1) \
-		CC="$(tc-getCC)" \
-		V=1 \
-		WERROR= \
-		"$@"
-}
-
-src_compile() {
-	_emake all_noverify
-}
-
-src_test() {
-	_emake verify
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/files/crda-3.18-openssl-1.1.0-compatibility.patch b/net-wireless/crda/files/crda-3.18-openssl-1.1.0-compatibility.patch
deleted file mode 100644
index 00a9b5570d2d..000000000000
--- a/net-wireless/crda/files/crda-3.18-openssl-1.1.0-compatibility.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-From 338637ac08c19708eb35523894b44bbe3c726cfa Mon Sep 17 00:00:00 2001
-From: quentin <quentin@minster.io>
-Date: Mon, 2 Apr 2018 18:07:50 +0200
-Subject: [PATCH] crda: Fix for OpenSSL 1.1.0: BIGNUM now opaque
-
-OpenSSL 1.1.0 makes most of OpenSSL's structures opaque, and provides
-functions to manipulate them. This means it's no longer possible to
-construct an OpenSSL BIGNUM directly from scratch, as was done in
-keys-ssl.c.
-
-Use BN_bin2bn() (available since OpenSSL 0.9.8) to build the bignum from
-its big-endian representation as a byte array.
-
-This also allows factoring the code in utils/key2pub.py as it's now the
-same mechanism as with libgcrypt.
-
-This was tested with OpenSSL 1.1.0g.
-
-Signed-off-by: Quentin Minster <quentin@minster.io>
----
- Makefile         |  12 +++----
- reglib.c         |  44 +++++++++++++++++------
- utils/key2pub.py | 107 ++++++-------------------------------------------------
- 3 files changed, 49 insertions(+), 114 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index a3ead30..a4e7373 100644
---- a/Makefile
-+++ b/Makefile
-@@ -38,18 +38,16 @@ all: all_noverify verify
- 
- all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize
- 
-+$(LIBREG): keys.c
-+
- ifeq ($(USE_OPENSSL),1)
- CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl`
- LDLIBS += `pkg-config --libs openssl`
- 
--$(LIBREG): keys-ssl.c
--
- else
- CFLAGS += -DUSE_GCRYPT
- LDLIBS += -lgcrypt
- 
--$(LIBREG): keys-gcrypt.c
--
- endif
- MKDIR ?= mkdir -p
- INSTALL ?= install
-@@ -109,10 +107,10 @@ $(REG_BIN):
- 	$(NQ)
- 	$(Q) exit 1
- 
--keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
-+keys.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem)
- 	$(NQ) '  GEN ' $@
- 	$(NQ) '  Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem)
--	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
-+	$(Q)./utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) $@
- 
- $(LIBREG): regdb.h reglib.h reglib.c
- 	$(NQ) '  CC  ' $@
-@@ -187,5 +185,5 @@ install: install-libreg install-libreg-headers crda crda.8.gz regdbdump.8.gz
- 
- clean:
- 	$(Q)rm -f $(LIBREG) crda regdbdump intersect db2rd optimize \
--		*.o *~ *.pyc keys-*.c *.gz \
-+		*.o *~ *.pyc keys.c *.gz \
- 	udev/$(UDEV_LEVEL)regulatory.rules udev/regulatory.rules.parsed
-diff --git a/reglib.c b/reglib.c
-index e00e9b8..00f7f56 100644
---- a/reglib.c
-+++ b/reglib.c
-@@ -22,6 +22,7 @@
- #include <openssl/rsa.h>
- #include <openssl/sha.h>
- #include <openssl/pem.h>
-+#include <openssl/bn.h>
- #endif
- 
- #ifdef USE_GCRYPT
-@@ -30,12 +31,8 @@
- 
- #include "reglib.h"
- 
--#ifdef USE_OPENSSL
--#include "keys-ssl.c"
--#endif
--
--#ifdef USE_GCRYPT
--#include "keys-gcrypt.c"
-+#if defined(USE_OPENSSL) || defined(USE_GCRYPT)
-+#include "keys.c"
- #endif
- 
- int debug = 0;
-@@ -81,7 +78,8 @@ reglib_array_len(size_t baselen, unsigned int elemcount, size_t elemlen)
- #ifdef USE_OPENSSL
- int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen)
- {
--	RSA *rsa;
-+	RSA *rsa = NULL;
-+	BIGNUM *rsa_e = NULL, *rsa_n = NULL;
- 	uint8_t hash[SHA_DIGEST_LENGTH];
- 	unsigned int i;
- 	int ok = 0;
-@@ -102,15 +100,35 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen)
- 			goto out;
- 		}
- 
--		rsa->e = &keys[i].e;
--		rsa->n = &keys[i].n;
-+		rsa_e = BN_bin2bn(keys[i].e, keys[i].len_e, NULL);
-+		if (!rsa_e) {
-+			fprintf(stderr, "Failed to convert value for RSA e.\n");
-+			goto out;
-+		}
-+		rsa_n = BN_bin2bn(keys[i].n, keys[i].len_n, NULL);
-+		if (!rsa_n) {
-+			fprintf(stderr, "Failed to convert value for RSA n.\n");
-+			goto out;
-+		}
-+
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+		rsa->e = rsa_e;
-+		rsa->n = rsa_n;
-+#else
-+		if (RSA_set0_key(rsa, rsa_n, rsa_e, NULL) != 1) {
-+			fprintf(stderr, "Failed to set RSA key.\n");
-+			goto out;
-+		}
-+#endif
-+		/* BIGNUMs now owned by the RSA object */
-+		rsa_e = NULL;
-+		rsa_n = NULL;
- 
- 		ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
- 				db + dblen, siglen, rsa) == 1;
- 
--		rsa->e = NULL;
--		rsa->n = NULL;
- 		RSA_free(rsa);
-+		rsa = NULL;
- 	}
- 	if (!ok && (pubkey_dir = opendir(PUBKEY_DIR))) {
- 		while (!ok && (nextfile = readdir(pubkey_dir))) {
-@@ -123,6 +141,7 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen)
- 					ok = RSA_verify(NID_sha1, hash, SHA_DIGEST_LENGTH,
- 						db + dblen, siglen, rsa) == 1;
- 				RSA_free(rsa);
-+				rsa = NULL;
- 				fclose(keyfile);
- 			}
- 		}
-@@ -133,6 +152,9 @@ int reglib_verify_db_signature(uint8_t *db, size_t dblen, size_t siglen)
- 		fprintf(stderr, "Database signature verification failed.\n");
- 
- out:
-+	RSA_free(rsa);
-+	BN_free(rsa_e);
-+	BN_free(rsa_n);
- 	return ok;
- }
- #endif /* USE_OPENSSL */
-diff --git a/utils/key2pub.py b/utils/key2pub.py
-index 9bb04cd..1919270 100755
---- a/utils/key2pub.py
-+++ b/utils/key2pub.py
-@@ -9,84 +9,7 @@ except ImportError, e:
-        sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n')
-        sys.exit(1)
- 
--def print_ssl_64(output, name, val):
--    while val[0] == '\0':
--        val = val[1:]
--    while len(val) % 8:
--        val = '\0' + val
--    vnew = []
--    while len(val):
--        vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7]))
--        val = val[8:]
--    vnew.reverse()
--    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
--    idx = 0
--    for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
--        if not idx:
--            output.write('\t')
--        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
--        idx += 1
--        if idx == 2:
--            idx = 0
--            output.write('\n')
--    if idx:
--        output.write('\n')
--    output.write('};\n\n')
--
--def print_ssl_32(output, name, val):
--    while val[0] == '\0':
--        val = val[1:]
--    while len(val) % 4:
--        val = '\0' + val
--    vnew = []
--    while len(val):
--        vnew.append((val[0], val[1], val[2], val[3], ))
--        val = val[4:]
--    vnew.reverse()
--    output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew)))
--    idx = 0
--    for v1, v2, v3, v4 in vnew:
--        if not idx:
--            output.write('\t')
--        output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4)))
--        idx += 1
--        if idx == 4:
--            idx = 0
--            output.write('\n')
--    if idx:
--        output.write('\n')
--    output.write('};\n\n')
--
--def print_ssl(output, name, val):
--    import struct
--    output.write('#include <stdint.h>\n')
--    if len(struct.pack('@L', 0)) == 8:
--        return print_ssl_64(output, name, val)
--    else:
--        return print_ssl_32(output, name, val)
--
--def print_ssl_keys(output, n):
--    output.write(r'''
--struct pubkey {
--	struct bignum_st e, n;
--};
--
--#define KEY(data) {				\
--	.d = data,				\
--	.top = sizeof(data)/sizeof(data[0]),	\
--}
--
--#define KEYS(e,n)	{ KEY(e), KEY(n), }
--
--static struct pubkey keys[] = {
--''')
--    for n in xrange(n + 1):
--        output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
--    output.write('};\n')
--    pass
--
--def print_gcrypt(output, name, val):
--    output.write('#include <stdint.h>\n')
-+def print_bignum(output, name, val):
-     while val[0] == '\0':
-         val = val[1:]
-     output.write('static const uint8_t %s[%d] = {\n' % (name, len(val)))
-@@ -103,11 +26,11 @@ def print_gcrypt(output, name, val):
-         output.write('\n')
-     output.write('};\n\n')
- 
--def print_gcrypt_keys(output, n):
-+def print_keys(output, n):
-     output.write(r'''
- struct key_params {
- 	const uint8_t *e, *n;
--	uint32_t len_e, len_n;
-+	const uint32_t len_e, len_n;
- };
- 
- #define KEYS(_e, _n) {			\
-@@ -120,25 +43,17 @@ static const struct key_params __attribute__ ((unused)) keys[] = {
-     for n in xrange(n + 1):
-         output.write('	KEYS(e_%d, n_%d),\n' % (n, n))
-     output.write('};\n')
--    
- 
--modes = {
--    '--ssl': (print_ssl, print_ssl_keys),
--    '--gcrypt': (print_gcrypt, print_gcrypt_keys),
--}
- 
--try:
--    mode = sys.argv[1]
--    files = sys.argv[2:-1]
--    outfile = sys.argv[-1]
--except IndexError:
--    mode = None
-+files = sys.argv[1:-1]
-+outfile = sys.argv[-1]
- 
--if not mode in modes:
--    print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys()))
-+if len(files) == 0:
-+    print 'Usage: %s input-file... output-file' % (sys.argv[0], )
-     sys.exit(2)
- 
- output = open(outfile, 'w')
-+output.write('#include <stdint.h>\n\n\n')
- 
- # load key
- idx = 0
-@@ -148,8 +63,8 @@ for f in files:
-     except RSA.RSAError:
-         key = RSA.load_key(f)
- 
--    modes[mode][0](output, 'e_%d' % idx, key.e[4:])
--    modes[mode][0](output, 'n_%d' % idx, key.n[4:])
-+    print_bignum(output, 'e_%d' % idx, key.e[4:])
-+    print_bignum(output, 'n_%d' % idx, key.n[4:])
-     idx += 1
- 
--modes[mode][1](output, idx - 1)
-+print_keys(output, idx - 1)
--- 
-2.16.2
-
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 384de601f8dd..953eb1d6bb81 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,4 +1,8 @@
 AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
+AUX gnuradio-3.8.2.0-lamda-gr-qtgui.patch 11510 BLAKE2B 17154b93d39517cdd0b6607988c60fbc2274644b3b1f0f88fb36f4cb38820365a7c9b1a52ba17f96725d3a1f6596662ebe837f6837a7a67c7d6e8b4b01d2d7ff SHA512 2e2420b65188b88c3b9759cc2feb89c28c9c1cc151ff8555df7cac095f8619445f4594f60fafea6340ae8e3892fe509f66b3f7c8d4bae8bbfd2085ff74f3005c
+AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3aaad53e57ed10aa394f7b36abbe27e69886fe876f5cb9ba03489f5cb4e0362e782f01bacf9956b3709f21ef0c7841ee2b2e04 SHA512 ea69d44b66b2962327141173d4b66add7885f3ece2302fceb3e5cf294f9502b0e6ac34dd28b9b7ff1b3faa024552be70334629c28e596fc4c621f89fec1c4ab5
+AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9712051ae6d758f2de57511bfdea972364c37d70c1eaf6e41921ad4e14e8f005be53016d8613e1c524b529c7b0e2476afc103edb49cfd946 SHA512 86f5f3ed6856fd183e71af1e6a94bc7e4310842f48a1ae7ed85b79d7a1ff86ebe84027bf24c3dc14a47c28335cc5edc321a7fce1ce24bcb26c0d7432e7aab4f7
+AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST 0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2 6933 BLAKE2B 021574de46f582f668788d35bb0f2fb7a47a03ae9d8009adaf3d53946bdf7fc61301a985a7eb0c6cde37fef36dceae86d71d287a8beb61d793b6309064e4e09d SHA512 f42f997a92592d3caf7e29e50bfb5733ab94988743eb3231c78b31272c5cde840f5abd984e1c6b1f928828a6be84eb5d17c3455207509f48652ed160a4f6c7ae
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
@@ -6,10 +10,10 @@ DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c81
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479 SHA512 81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
 DIST gnuradio-3.8.2.0.tar.xz 2438736 BLAKE2B 93eabff578cd6b3b6587a6aa083095c787323ebf87a447d61999813e7e5e48b414d080a4fc02d01dabaa9378d42e3a210451a9109fc202991ebda8d1c9669676 SHA512 33930f62762cd9e3d1038b4a903f01e7ab33129732d207c126a89c1f1e719e9d656a94cdcbf3f6010f8476fedacee639c8a12444c41cdd56ad9fbace7863a170
-EBUILD gnuradio-3.7.13.5-r3.ebuild 7959 BLAKE2B bc68f79eb279d53a1e25fcb534882716ad9e4c129e892367f8ba88e2da175c0422d3ee8e37f4c4f37c8b9bdc498c4a253119cbee26c72c4aae29c1974b5d5efa SHA512 f4d7d68b943b950d5517a8705674c293635928189cce3cc161534f36401a860d134d528108305fcb60390fc437566ec18cab2bb1e86beca3cb242e2856d50544
-EBUILD gnuradio-3.7.13.5-r4.ebuild 8132 BLAKE2B 7cfc1cc16e906645bac232bda3e7d3d0f2e52a8b260c0edf4eb309e70eb55f0916d3fb36b33578eadbbd497adb5f2913991522941503c980a6f05ef3d9cb6e96 SHA512 c0fd682270036c84be9b1439ed7f8516be27e4476061463c4300229625131c3b6a4addc16d4d2361a3b74ef0e15a40e7b701d35d0785d80c30c8e104e875cb41
-EBUILD gnuradio-3.8.1.0-r1.ebuild 5995 BLAKE2B cb288a4e5610db280d7f508c22084a94c8a7482333a9e9704b28f6bf71c8b32f25f68c9fcd1d4488cd230fca8fd5bc965d8956259090d031116678820ec1686d SHA512 27c9e8e47489fd91464217756626848b04c749a181ff71e8f983a227d3a70e52e8d4c687d25c4b6671654fc12956cb226249525164d07345c81001aab462e14c
-EBUILD gnuradio-3.8.1.0-r2.ebuild 6174 BLAKE2B 4547198356244074b45993c2aaf7c3466e3fb7bcac45133f36eea38fe63b886dc6efa3480ea47110939704557d1e7db1a06c3343f0b212b443867874c3c727aa SHA512 c663d579e77289ca863c9bf0774ca1b1a33ef23cbb6c2092a5886d3a7330d274cbe0f75c84ce13ab8a0e0b7975794d34c0cdb1b9a8584771b9d9a8868ec24ca2
-EBUILD gnuradio-3.8.2.0.ebuild 5970 BLAKE2B 5a5b0d4bdd41527239617f7cf2d25468cfb7ae248eb55b024591a6d9a1a165cecbdb7de2da8ff0311f40b04acb520432d31bfec21f4bb15b8ceb73e7b0f50aef SHA512 278297258071b7cd35f043a96f66015a452f9ed2967946c0bb21fabb3dbfb80bb58f7e81fa884f3a5568e3782e207111fc4aca684a137e55c73958a23299aedc
-EBUILD gnuradio-9999.ebuild 5970 BLAKE2B 5a5b0d4bdd41527239617f7cf2d25468cfb7ae248eb55b024591a6d9a1a165cecbdb7de2da8ff0311f40b04acb520432d31bfec21f4bb15b8ceb73e7b0f50aef SHA512 278297258071b7cd35f043a96f66015a452f9ed2967946c0bb21fabb3dbfb80bb58f7e81fa884f3a5568e3782e207111fc4aca684a137e55c73958a23299aedc
+EBUILD gnuradio-3.7.13.5-r3.ebuild 7963 BLAKE2B aec02ac499a1b2cc11c40a133314fa40ba293f309e0bdbb2bfdad56d1b3c16a09b6226177d658d17ccdb9ad9aaf4c8b33dac92577dc55fb82070eaf86582ae92 SHA512 81f1b3d77d1122724d665a0b57c33b6e102689a8b9a3d90f50f45a1327b0c9ee4b5748f9dcf980ef4edebaca4617b49b91682619ab705c3003b154df17a8d369
+EBUILD gnuradio-3.7.13.5-r4.ebuild 8136 BLAKE2B 3f5148845dd0147c008abb5ea740c11f28022b9d73782c04d255438d457bb08a7719e06aeb7a5b16ac6d420962cdbe2415121bf86d30f0ebe48a6bc26b413c9b SHA512 9a7591d241466705b882e0ac14cebacd1717621c253d6b68f529b03603e58a9dd78f2e1664fd27c7b4e03848bf0224a2cd4012b2b1b299475d8ba11395dda30b
+EBUILD gnuradio-3.8.1.0-r1.ebuild 6001 BLAKE2B 169303b741b964fe99d9e118cb009a6fff1e64266f591345683a7bc9cb8d814eadb63097da103e7026922e2f4d32384b24e56298b1db6137dba20bb5110a9e83 SHA512 980f3b69d0c5c73f57e03484907960073689be75a473fa2e2f3893fefeb5e24c4c7d9abd06fcb0032ea30de8f1a73b0c21c4986cd5fbcd96f922450faf6b81cc
+EBUILD gnuradio-3.8.1.0-r2.ebuild 6180 BLAKE2B 5b43706289ce84c725fd6a370c75a2d70794b9db19baaf6121bb5ffd053b367781149d9c6d377da262dfb43b783ac22211cd2d1a82ad2d2233e77cd5a4697910 SHA512 4dbe95781189edcd088685d6cc1e3dafd21fda36d469de5919c1189f788f692e8ce597452e85887445d17f59adb3ad42a29d8eb7fe6156141c7c87acccd81b97
+EBUILD gnuradio-3.8.2.0.ebuild 6214 BLAKE2B b647cbfe1eaf25a98152775c7b1c56d9d9d13cfecb7dded0cbff3a913087889646abf3d2378fc465c4a067623e06b0eb294e3f127b9ecd7abeb81f83be47ea14 SHA512 5fd64b198e7c19dbb69df406aa8c72431a9a3fae31c3069b75a964225f36fe2f8e48c5157cd150818a46e68dd88b3667173c67b64cdca000887fb078b586d711
+EBUILD gnuradio-9999.ebuild 5976 BLAKE2B 23ce3f7fd6dba404271bc2a6fe4f5d50ca7e5851a47cb2f3e72c34dcba796c4835eacc8840a0b52e106869bfc63fe6a43d4f392adc0bd42e3fa42bb34b6d463e SHA512 88519e9721890754e5efc572d9d9f9b5b7745a78499b69e91f1be907a53901273e9eddfae32f9af950d9b19fc12efbbe1a8f247073653e13fa611db13ee7c964
 MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch
new file mode 100644
index 000000000000..0057b38836ce
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-qtgui.patch
@@ -0,0 +1,250 @@
+From faa5e19e15f77a0ba5e7f854df6517c280034369 Mon Sep 17 00:00:00 2001
+From: Johannes Demel <demel@ant.uni-bremen.de>
+Date: Sat, 9 May 2020 15:28:58 +0200
+Subject: [PATCH] msg_handler: Use lambdas in gr-qtgui
+
+gr-qtgui uses lambdas instead of `boost::bind` to register message
+handlers now. This component makes quite heavy use of message handlers.
+---
+ gr-qtgui/lib/const_sink_c_impl.cc       | 3 +--
+ gr-qtgui/lib/edit_box_msg_impl.cc       | 2 +-
+ gr-qtgui/lib/freq_sink_c_impl.cc        | 6 +++---
+ gr-qtgui/lib/freq_sink_f_impl.cc        | 6 +++---
+ gr-qtgui/lib/histogram_sink_f_impl.cc   | 3 +--
+ gr-qtgui/lib/sink_c_impl.cc             | 2 +-
+ gr-qtgui/lib/sink_f_impl.cc             | 2 +-
+ gr-qtgui/lib/time_raster_sink_b_impl.cc | 3 +--
+ gr-qtgui/lib/time_raster_sink_f_impl.cc | 3 +--
+ gr-qtgui/lib/time_sink_c_impl.cc        | 2 +-
+ gr-qtgui/lib/time_sink_f_impl.cc        | 2 +-
+ gr-qtgui/lib/waterfall_sink_c_impl.cc   | 9 +++------
+ gr-qtgui/lib/waterfall_sink_f_impl.cc   | 9 +++------
+ 13 files changed, 21 insertions(+), 31 deletions(-)
+
+diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc
+index 852f6ee109..e4b01907f1 100644
+--- a/gr-qtgui/lib/const_sink_c_impl.cc
++++ b/gr-qtgui/lib/const_sink_c_impl.cc
+@@ -69,8 +69,7 @@ const_sink_c_impl::const_sink_c_impl(int size,
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"),
+-                    boost::bind(&const_sink_c_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     for (int i = 0; i < d_nconnections; i++) {
+         d_residbufs_real.push_back(
+diff --git a/gr-qtgui/lib/edit_box_msg_impl.cc b/gr-qtgui/lib/edit_box_msg_impl.cc
+index 8713aa820e..04f860785a 100644
+--- a/gr-qtgui/lib/edit_box_msg_impl.cc
++++ b/gr-qtgui/lib/edit_box_msg_impl.cc
+@@ -158,7 +158,7 @@ edit_box_msg_impl::edit_box_msg_impl(data_type_t type,
+     message_port_register_out(d_port);
+     message_port_register_in(pmt::mp("val"));
+ 
+-    set_msg_handler(pmt::mp("val"), boost::bind(&edit_box_msg_impl::set_value, this, _1));
++    set_msg_handler(pmt::mp("val"), [this](pmt::pmt_t msg) { this->set_value(msg); });
+ }
+ 
+ edit_box_msg_impl::~edit_box_msg_impl()
+diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
+index 3a34df6ec6..137bccc3c3 100644
+--- a/gr-qtgui/lib/freq_sink_c_impl.cc
++++ b/gr-qtgui/lib/freq_sink_c_impl.cc
+@@ -82,17 +82,17 @@ freq_sink_c_impl::freq_sink_c_impl(int fftsize,
+ 
+     // setup bw input port
+     message_port_register_in(d_port_bw);
+-    set_msg_handler(d_port_bw, boost::bind(&freq_sink_c_impl::handle_set_bw, this, _1));
++    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
+ 
+     // setup output message port to post frequency when display is
+     // double-clicked
+     message_port_register_out(d_port);
+     message_port_register_in(d_port);
+-    set_msg_handler(d_port, boost::bind(&freq_sink_c_impl::handle_set_freq, this, _1));
++    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_c_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     d_main_gui = NULL;
+ 
+diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
+index c14bfc31fd..0b1757c03c 100644
+--- a/gr-qtgui/lib/freq_sink_f_impl.cc
++++ b/gr-qtgui/lib/freq_sink_f_impl.cc
+@@ -82,17 +82,17 @@ freq_sink_f_impl::freq_sink_f_impl(int fftsize,
+ 
+     // setup bw input port
+     message_port_register_in(d_port_bw);
+-    set_msg_handler(d_port_bw, boost::bind(&freq_sink_f_impl::handle_set_bw, this, _1));
++    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
+ 
+     // setup output message port to post frequency when display is
+     // double-clicked
+     message_port_register_out(d_port);
+     message_port_register_in(d_port);
+-    set_msg_handler(d_port, boost::bind(&freq_sink_f_impl::handle_set_freq, this, _1));
++    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"), boost::bind(&freq_sink_f_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     d_main_gui = NULL;
+ 
+diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc
+index d16de932ca..fd357bf40a 100644
+--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
++++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
+@@ -81,8 +81,7 @@ histogram_sink_f_impl::histogram_sink_f_impl(int size,
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"),
+-                    boost::bind(&histogram_sink_f_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     // +1 for the PDU buffer
+     for (int i = 0; i < d_nconnections + 1; i++) {
+diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc
+index d3feb9d16c..8f7ff36ba2 100644
+--- a/gr-qtgui/lib/sink_c_impl.cc
++++ b/gr-qtgui/lib/sink_c_impl.cc
+@@ -96,7 +96,7 @@ sink_c_impl::sink_c_impl(int fftsize,
+     // double-clicked
+     message_port_register_out(d_port);
+     message_port_register_in(d_port);
+-    set_msg_handler(d_port, boost::bind(&sink_c_impl::handle_set_freq, this, _1));
++    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
+ 
+     d_main_gui = NULL;
+ 
+diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc
+index 418b630b78..0b1eccad12 100644
+--- a/gr-qtgui/lib/sink_f_impl.cc
++++ b/gr-qtgui/lib/sink_f_impl.cc
+@@ -95,7 +95,7 @@ sink_f_impl::sink_f_impl(int fftsize,
+     // double-clicked
+     message_port_register_out(d_port);
+     message_port_register_in(d_port);
+-    set_msg_handler(d_port, boost::bind(&sink_f_impl::handle_set_freq, this, _1));
++    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
+ 
+     d_main_gui = NULL;
+ 
+diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc
+index 045c216b00..063ed09d0c 100644
+--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
++++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
+@@ -83,8 +83,7 @@ time_raster_sink_b_impl::time_raster_sink_b_impl(double samp_rate,
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"),
+-                    boost::bind(&time_raster_sink_b_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     d_scale = 1.0f;
+ 
+diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc
+index d186f319da..df94d217bd 100644
+--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
++++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
+@@ -83,8 +83,7 @@ time_raster_sink_f_impl::time_raster_sink_f_impl(double samp_rate,
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"),
+-                    boost::bind(&time_raster_sink_f_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     d_icols = static_cast<int>(ceil(d_cols));
+     d_tmpflt = (float*)volk_malloc(d_icols * sizeof(float), volk_get_alignment());
+diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
+index b73a1c1ad3..26dc5d2e32 100644
+--- a/gr-qtgui/lib/time_sink_c_impl.cc
++++ b/gr-qtgui/lib/time_sink_c_impl.cc
+@@ -80,7 +80,7 @@ time_sink_c_impl::time_sink_c_impl(int size,
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_c_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     // +2 for the PDU message buffers
+     for (unsigned int n = 0; n < d_nconnections + 2; n++) {
+diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
+index df13998d75..8f41d02143 100644
+--- a/gr-qtgui/lib/time_sink_f_impl.cc
++++ b/gr-qtgui/lib/time_sink_f_impl.cc
+@@ -80,7 +80,7 @@ time_sink_f_impl::time_sink_f_impl(int size,
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"), boost::bind(&time_sink_f_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ 
+     // +1 for the PDU buffer
+     for (unsigned int n = 0; n < d_nconnections + 1; n++) {
+diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc
+index fcf2ed98bc..20cebbcbda 100644
+--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
++++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
+@@ -117,20 +117,17 @@ waterfall_sink_c_impl::waterfall_sink_c_impl(int fftsize,
+ 
+     // setup bw input port
+     message_port_register_in(d_port_bw);
+-    set_msg_handler(d_port_bw,
+-                    boost::bind(&waterfall_sink_c_impl::handle_set_bw, this, _1));
++    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
+ 
+     // setup output message port to post frequency when display is
+     // double-clicked
+     message_port_register_out(d_port);
+     message_port_register_in(d_port);
+-    set_msg_handler(d_port,
+-                    boost::bind(&waterfall_sink_c_impl::handle_set_freq, this, _1));
++    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"),
+-                    boost::bind(&waterfall_sink_c_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ }
+ 
+ waterfall_sink_c_impl::~waterfall_sink_c_impl()
+diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc
+index aa1037a472..4ba6427f08 100644
+--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
++++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
+@@ -115,20 +115,17 @@ waterfall_sink_f_impl::waterfall_sink_f_impl(int fftsize,
+ 
+     // setup bw input port
+     message_port_register_in(d_port_bw);
+-    set_msg_handler(d_port_bw,
+-                    boost::bind(&waterfall_sink_f_impl::handle_set_bw, this, _1));
++    set_msg_handler(d_port_bw, [this](pmt::pmt_t msg) { this->handle_set_bw(msg); });
+ 
+     // setup output message port to post frequency when display is
+     // double-clicked
+     message_port_register_out(d_port);
+     message_port_register_in(d_port);
+-    set_msg_handler(d_port,
+-                    boost::bind(&waterfall_sink_f_impl::handle_set_freq, this, _1));
++    set_msg_handler(d_port, [this](pmt::pmt_t msg) { this->handle_set_freq(msg); });
+ 
+     // setup PDU handling input port
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"),
+-                    boost::bind(&waterfall_sink_f_impl::handle_pdus, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handle_pdus(msg); });
+ }
+ 
+ waterfall_sink_f_impl::~waterfall_sink_f_impl()
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch
new file mode 100644
index 000000000000..56787372af0c
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-gr-uhd.patch
@@ -0,0 +1,98 @@
+From 591c2c16355eb065ff3f51f23d9d6026be188132 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
+Date: Sat, 22 Aug 2020 14:06:22 +0200
+Subject: [PATCH] msg_handler: Use lambdas in gr-uhd
+
+---
+ gr-uhd/lib/amsg_source_impl.cc |  3 +--
+ gr-uhd/lib/usrp_block_impl.cc  | 10 ++++++----
+ gr-uhd/lib/usrp_block_impl.h   |  1 -
+ gr-uhd/lib/usrp_source_impl.cc |  6 ++++--
+ 4 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/gr-uhd/lib/amsg_source_impl.cc b/gr-uhd/lib/amsg_source_impl.cc
+index 46d47a5826..e1de62e028 100644
+--- a/gr-uhd/lib/amsg_source_impl.cc
++++ b/gr-uhd/lib/amsg_source_impl.cc
+@@ -22,7 +22,6 @@
+ 
+ #include "amsg_source_impl.h"
+ #include "gr_uhd_common.h"
+-#include <boost/bind.hpp>
+ 
+ namespace gr {
+ namespace uhd {
+@@ -44,7 +43,7 @@ amsg_source_impl::amsg_source_impl(const ::uhd::device_addr_t& device_addr,
+     : _msgq(msgq), _running(true)
+ {
+     _dev = ::uhd::usrp::multi_usrp::make(device_addr);
+-    _amsg_thread = gr::thread::thread(boost::bind(&amsg_source_impl::recv_loop, this));
++    _amsg_thread = gr::thread::thread([this]() { this->recv_loop(); });
+ }
+ 
+ amsg_source_impl::~amsg_source_impl()
+diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
+index e5e1dd9161..8344809837 100644
+--- a/gr-uhd/lib/usrp_block_impl.cc
++++ b/gr-uhd/lib/usrp_block_impl.cc
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include "usrp_block_impl.h"
+-#include <boost/make_shared.hpp>
++#include <functional>
+ 
+ using namespace gr::uhd;
+ 
+@@ -139,10 +139,11 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr,
+     set_msg_handler(pmt::mp("command"),
+                     [this](pmt::pmt_t msg) { this->msg_handler_command(msg); });
+ 
+-// cuz we lazy:
++    // because we're highly efficient and adverse to work
++    namespace ph = std::placeholders;
+ #define REGISTER_CMD_HANDLER(key, _handler) \
+-    register_msg_cmd_handler(key,           \
+-                             boost::bind(&usrp_block_impl::_handler, this, _1, _2, _3))
++    register_msg_cmd_handler(               \
++        key, std::bind(&usrp_block_impl::_handler, this, ph::_1, ph::_2, ph::_3))
+     // Register default command handlers:
+     REGISTER_CMD_HANDLER(cmd_freq_key(), _cmd_handler_freq);
+     REGISTER_CMD_HANDLER(cmd_gain_key(), _cmd_handler_gain);
+@@ -153,6 +154,7 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr,
+     REGISTER_CMD_HANDLER(cmd_rate_key(), _cmd_handler_rate);
+     REGISTER_CMD_HANDLER(cmd_bandwidth_key(), _cmd_handler_bw);
+     REGISTER_CMD_HANDLER(cmd_antenna_key(), _cmd_handler_antenna);
++#undef REGISTER_CMD_HANDLER
+ }
+ 
+ usrp_block_impl::~usrp_block_impl()
+diff --git a/gr-uhd/lib/usrp_block_impl.h b/gr-uhd/lib/usrp_block_impl.h
+index 1dbc3813bd..479b7dcd65 100644
+--- a/gr-uhd/lib/usrp_block_impl.h
++++ b/gr-uhd/lib/usrp_block_impl.h
+@@ -26,7 +26,6 @@
+ #include <gnuradio/uhd/usrp_block.h>
+ #include <pmt/pmt.h>
+ #include <uhd/usrp/multi_usrp.hpp>
+-#include <boost/bind.hpp>
+ #include <boost/dynamic_bitset.hpp>
+ 
+ 
+diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc
+index a2ff0821bd..1e8ef020ab 100644
+--- a/gr-uhd/lib/usrp_source_impl.cc
++++ b/gr-uhd/lib/usrp_source_impl.cc
+@@ -57,8 +57,10 @@ usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t& device_addr,
+ 
+     _samp_rate = this->get_samp_rate();
+     _samps_per_packet = 1;
+-    register_msg_cmd_handler(cmd_tag_key(),
+-                             boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1));
++    register_msg_cmd_handler(
++        cmd_tag_key(), [this](const pmt::pmt_t& val, int chan, const pmt::pmt_t& msg) {
++            this->_cmd_handler_tag(val);
++        });
+ }
+ 
+ usrp_source_impl::~usrp_source_impl() {}
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch
new file mode 100644
index 000000000000..ea687a7ed876
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-most-components.patch
@@ -0,0 +1,290 @@
+From c6e3632952bd3e86e4d8437d7619e7fececb524e Mon Sep 17 00:00:00 2001
+From: Johannes Demel <demel@ant.uni-bremen.de>
+Date: Sat, 9 May 2020 15:14:37 +0200
+Subject: [PATCH] msg_handler: Use lambdas in most components
+
+With this commit, all components except gr-qtgui use lambdas instead of
+`boost::bind` to register msg handlers.
+---
+ gr-digital/lib/chunks_to_symbols_impl.cc         |  6 ++----
+ gr-digital/lib/constellation_receiver_cb_impl.cc | 10 ++++------
+ gr-digital/lib/costas_loop_cc_impl.cc            |  2 +-
+ gr-digital/lib/crc32_async_bb_impl.cc            |  4 ++--
+ gr-digital/lib/header_payload_demux_impl.cc      |  5 ++---
+ gr-digital/lib/protocol_formatter_async_impl.cc  |  3 +--
+ gr-fec/lib/async_decoder_impl.cc                 |  5 ++---
+ gr-fec/lib/async_encoder_impl.cc                 |  5 ++---
+ gr-fec/lib/depuncture_bb_impl.cc                 |  2 +-
+ gr-fec/lib/puncture_bb_impl.cc                   |  2 +-
+ gr-fec/lib/puncture_ff_impl.cc                   |  2 +-
+ gr-filter/lib/freq_xlating_fir_filter_impl.cc    |  8 ++------
+ gr-filter/lib/mmse_resampler_cc_impl.cc          |  2 +-
+ gr-filter/lib/mmse_resampler_ff_impl.cc          |  2 +-
+ gr-uhd/lib/usrp_block_impl.cc                    |  2 +-
+ gr-zeromq/lib/pub_msg_sink_impl.cc               |  2 +-
+ gr-zeromq/lib/push_msg_sink_impl.cc              |  2 +-
+ 17 files changed, 26 insertions(+), 38 deletions(-)
+
+diff --git a/gr-digital/lib/chunks_to_symbols_impl.cc b/gr-digital/lib/chunks_to_symbols_impl.cc
+index 26d590a66e..c2cc99b0c8 100644
+--- a/gr-digital/lib/chunks_to_symbols_impl.cc
++++ b/gr-digital/lib/chunks_to_symbols_impl.cc
+@@ -51,10 +51,8 @@ chunks_to_symbols_impl<IN_T, OUT_T>::chunks_to_symbols_impl(
+       d_symbol_table(symbol_table)
+ {
+     this->message_port_register_in(pmt::mp("set_symbol_table"));
+-    this->set_msg_handler(
+-        pmt::mp("set_symbol_table"),
+-        boost::bind(
+-            &chunks_to_symbols_impl<IN_T, OUT_T>::handle_set_symbol_table, this, _1));
++    this->set_msg_handler(pmt::mp("set_symbol_table"),
++                          [this](pmt::pmt_t msg) { this->handle_set_symbol_table(msg); });
+ }
+ 
+ template <class IN_T, class OUT_T>
+diff --git a/gr-digital/lib/constellation_receiver_cb_impl.cc b/gr-digital/lib/constellation_receiver_cb_impl.cc
+index 7fb7559d5e..1c160ff1bb 100644
+--- a/gr-digital/lib/constellation_receiver_cb_impl.cc
++++ b/gr-digital/lib/constellation_receiver_cb_impl.cc
+@@ -61,14 +61,12 @@ constellation_receiver_cb_impl::constellation_receiver_cb_impl(
+             "This receiver only works with constellations of dimension 1.");
+ 
+     message_port_register_in(pmt::mp("set_constellation"));
+-    set_msg_handler(
+-        pmt::mp("set_constellation"),
+-        boost::bind(&constellation_receiver_cb_impl::handle_set_constellation, this, _1));
++    set_msg_handler(pmt::mp("set_constellation"),
++                    [this](pmt::pmt_t msg) { this->handle_set_constellation(msg); });
+ 
+     message_port_register_in(pmt::mp("rotate_phase"));
+-    set_msg_handler(
+-        pmt::mp("rotate_phase"),
+-        boost::bind(&constellation_receiver_cb_impl::handle_rotate_phase, this, _1));
++    set_msg_handler(pmt::mp("rotate_phase"),
++                    [this](pmt::pmt_t msg) { this->handle_rotate_phase(msg); });
+ }
+ 
+ constellation_receiver_cb_impl::~constellation_receiver_cb_impl() {}
+diff --git a/gr-digital/lib/costas_loop_cc_impl.cc b/gr-digital/lib/costas_loop_cc_impl.cc
+index c3b30834eb..b1a0e67caa 100644
+--- a/gr-digital/lib/costas_loop_cc_impl.cc
++++ b/gr-digital/lib/costas_loop_cc_impl.cc
+@@ -82,7 +82,7 @@ costas_loop_cc_impl::costas_loop_cc_impl(float loop_bw, int order, bool use_snr)
+ 
+     message_port_register_in(pmt::mp("noise"));
+     set_msg_handler(pmt::mp("noise"),
+-                    boost::bind(&costas_loop_cc_impl::handle_set_noise, this, _1));
++                    [this](pmt::pmt_t msg) { this->handle_set_noise(msg); });
+ }
+ 
+ costas_loop_cc_impl::~costas_loop_cc_impl() {}
+diff --git a/gr-digital/lib/crc32_async_bb_impl.cc b/gr-digital/lib/crc32_async_bb_impl.cc
+index bffbb2a737..230decc2ae 100644
+--- a/gr-digital/lib/crc32_async_bb_impl.cc
++++ b/gr-digital/lib/crc32_async_bb_impl.cc
+@@ -48,9 +48,9 @@ crc32_async_bb_impl::crc32_async_bb_impl(bool check)
+     message_port_register_out(d_out_port);
+ 
+     if (check)
+-        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::check, this, _1));
++        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->check(msg); });
+     else
+-        set_msg_handler(d_in_port, boost::bind(&crc32_async_bb_impl::calc, this, _1));
++        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->calc(msg); });
+ }
+ 
+ crc32_async_bb_impl::~crc32_async_bb_impl() {}
+diff --git a/gr-digital/lib/header_payload_demux_impl.cc b/gr-digital/lib/header_payload_demux_impl.cc
+index 98c805fb20..5dc65f422b 100644
+--- a/gr-digital/lib/header_payload_demux_impl.cc
++++ b/gr-digital/lib/header_payload_demux_impl.cc
+@@ -150,9 +150,8 @@ header_payload_demux_impl::header_payload_demux_impl(
+     }
+     set_tag_propagation_policy(TPP_DONT);
+     message_port_register_in(msg_port_id());
+-    set_msg_handler(
+-        msg_port_id(),
+-        boost::bind(&header_payload_demux_impl::parse_header_data_msg, this, _1));
++    set_msg_handler(msg_port_id(),
++                    [this](pmt::pmt_t msg) { this->parse_header_data_msg(msg); });
+     for (size_t i = 0; i < special_tags.size(); i++) {
+         d_special_tags.push_back(pmt::string_to_symbol(special_tags[i]));
+         d_special_tags_last_value.push_back(pmt::PMT_NIL);
+diff --git a/gr-digital/lib/protocol_formatter_async_impl.cc b/gr-digital/lib/protocol_formatter_async_impl.cc
+index 84b693745d..08e324ecfb 100644
+--- a/gr-digital/lib/protocol_formatter_async_impl.cc
++++ b/gr-digital/lib/protocol_formatter_async_impl.cc
+@@ -54,8 +54,7 @@ protocol_formatter_async_impl::protocol_formatter_async_impl(
+     message_port_register_out(d_hdr_port);
+     message_port_register_out(d_pld_port);
+ 
+-    set_msg_handler(d_in_port,
+-                    boost::bind(&protocol_formatter_async_impl::append, this, _1));
++    set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->append(msg); });
+ }
+ 
+ protocol_formatter_async_impl::~protocol_formatter_async_impl() {}
+diff --git a/gr-fec/lib/async_decoder_impl.cc b/gr-fec/lib/async_decoder_impl.cc
+index e7a668c832..c907b297a5 100644
+--- a/gr-fec/lib/async_decoder_impl.cc
++++ b/gr-fec/lib/async_decoder_impl.cc
+@@ -64,11 +64,10 @@ async_decoder_impl::async_decoder_impl(generic_decoder::sptr my_decoder,
+ 
+     if (d_packed) {
+         d_pack = new blocks::kernel::pack_k_bits(8);
+-        set_msg_handler(d_in_port,
+-                        boost::bind(&async_decoder_impl::decode_packed, this, _1));
++        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->decode_packed(msg); });
+     } else {
+         set_msg_handler(d_in_port,
+-                        boost::bind(&async_decoder_impl::decode_unpacked, this, _1));
++                        [this](pmt::pmt_t msg) { this->decode_unpacked(msg); });
+     }
+ 
+     // The maximum frame size is set by the initial frame size of the decoder.
+diff --git a/gr-fec/lib/async_encoder_impl.cc b/gr-fec/lib/async_encoder_impl.cc
+index 811d55601f..2e8fd62d12 100644
+--- a/gr-fec/lib/async_encoder_impl.cc
++++ b/gr-fec/lib/async_encoder_impl.cc
+@@ -63,8 +63,7 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder,
+     message_port_register_out(d_out_port);
+ 
+     if (d_packed) {
+-        set_msg_handler(d_in_port,
+-                        boost::bind(&async_encoder_impl::encode_packed, this, _1));
++        set_msg_handler(d_in_port, [this](pmt::pmt_t msg) { this->encode_packed(msg); });
+ 
+         d_unpack = new blocks::kernel::unpack_k_bits(8);
+ 
+@@ -74,7 +73,7 @@ async_encoder_impl::async_encoder_impl(generic_encoder::sptr my_encoder,
+ 
+     } else {
+         set_msg_handler(d_in_port,
+-                        boost::bind(&async_encoder_impl::encode_unpacked, this, _1));
++                        [this](pmt::pmt_t msg) { this->encode_unpacked(msg); });
+     }
+ 
+     if (d_packed || (strncmp(d_encoder->get_input_conversion(), "pack", 4) == 0)) {
+diff --git a/gr-fec/lib/depuncture_bb_impl.cc b/gr-fec/lib/depuncture_bb_impl.cc
+index 27d00bb5bb..59ed44dd8a 100644
+--- a/gr-fec/lib/depuncture_bb_impl.cc
++++ b/gr-fec/lib/depuncture_bb_impl.cc
+@@ -74,7 +74,7 @@ depuncture_bb_impl::depuncture_bb_impl(int puncsize, int puncpat, int delay, cha
+     set_fixed_rate(true);
+     set_relative_rate((uint64_t)d_puncsize, (uint64_t)(d_puncsize - d_puncholes));
+     set_output_multiple(d_puncsize);
+-    // set_msg_handler(boost::bind(&depuncture_bb_impl::catch_msg, this, _1));
++    // set_msg_handler(<portname>, [this](pmt::pmt_t msg) { this->catch_msg(msg); });
+ }
+ 
+ depuncture_bb_impl::~depuncture_bb_impl() {}
+diff --git a/gr-fec/lib/puncture_bb_impl.cc b/gr-fec/lib/puncture_bb_impl.cc
+index a365d6a69f..1f328c2214 100644
+--- a/gr-fec/lib/puncture_bb_impl.cc
++++ b/gr-fec/lib/puncture_bb_impl.cc
+@@ -72,7 +72,7 @@ puncture_bb_impl::puncture_bb_impl(int puncsize, int puncpat, int delay)
+     set_fixed_rate(true);
+     set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize);
+     set_output_multiple(d_puncsize - d_puncholes);
+-    // set_msg_handler(boost::bind(&puncture_bb_impl::catch_msg, this, _1));
++    // set_msg_handler(<portname>, [this](pmt::pmt_t msg) { this->catch_msg(msg); });
+ }
+ 
+ puncture_bb_impl::~puncture_bb_impl() {}
+diff --git a/gr-fec/lib/puncture_ff_impl.cc b/gr-fec/lib/puncture_ff_impl.cc
+index c95288d691..31c686ea4c 100644
+--- a/gr-fec/lib/puncture_ff_impl.cc
++++ b/gr-fec/lib/puncture_ff_impl.cc
+@@ -72,7 +72,7 @@ puncture_ff_impl::puncture_ff_impl(int puncsize, int puncpat, int delay)
+     set_fixed_rate(true);
+     set_relative_rate((uint64_t)(d_puncsize - d_puncholes), (uint64_t)d_puncsize);
+     set_output_multiple(d_puncsize - d_puncholes);
+-    // set_msg_handler(boost::bind(&puncture_ff_impl::catch_msg, this, _1));
++    // set_msg_handler(<portname>, [this](pmt::pmt_t msg) { this->catch_msg(msg); });
+ }
+ 
+ puncture_ff_impl::~puncture_ff_impl() {}
+diff --git a/gr-filter/lib/freq_xlating_fir_filter_impl.cc b/gr-filter/lib/freq_xlating_fir_filter_impl.cc
+index 8ddc967ba1..1050fb82a5 100644
+--- a/gr-filter/lib/freq_xlating_fir_filter_impl.cc
++++ b/gr-filter/lib/freq_xlating_fir_filter_impl.cc
+@@ -67,12 +67,8 @@ freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::freq_xlating_fir_filter_impl(
+     this->build_composite_fir();
+ 
+     this->message_port_register_in(pmt::mp("freq"));
+-    this->set_msg_handler(
+-        pmt::mp("freq"),
+-        boost::bind(
+-            &freq_xlating_fir_filter_impl<IN_T, OUT_T, TAP_T>::handle_set_center_freq,
+-            this,
+-            _1));
++    this->set_msg_handler(pmt::mp("freq"),
++                          [this](pmt::pmt_t msg) { this->handle_set_center_freq(msg); });
+ }
+ 
+ template <class IN_T, class OUT_T, class TAP_T>
+diff --git a/gr-filter/lib/mmse_resampler_cc_impl.cc b/gr-filter/lib/mmse_resampler_cc_impl.cc
+index 59f9eacfab..9ca62082ce 100644
+--- a/gr-filter/lib/mmse_resampler_cc_impl.cc
++++ b/gr-filter/lib/mmse_resampler_cc_impl.cc
+@@ -53,7 +53,7 @@ mmse_resampler_cc_impl::mmse_resampler_cc_impl(float phase_shift, float resamp_r
+     set_inverse_relative_rate(d_mu_inc);
+     message_port_register_in(pmt::intern("msg_in"));
+     set_msg_handler(pmt::intern("msg_in"),
+-                    boost::bind(&mmse_resampler_cc_impl::handle_msg, this, _1));
++                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
+ }
+ 
+ mmse_resampler_cc_impl::~mmse_resampler_cc_impl() { delete d_resamp; }
+diff --git a/gr-filter/lib/mmse_resampler_ff_impl.cc b/gr-filter/lib/mmse_resampler_ff_impl.cc
+index 342d9f7678..312a6a8755 100644
+--- a/gr-filter/lib/mmse_resampler_ff_impl.cc
++++ b/gr-filter/lib/mmse_resampler_ff_impl.cc
+@@ -54,7 +54,7 @@ mmse_resampler_ff_impl::mmse_resampler_ff_impl(float phase_shift, float resamp_r
+ 
+     message_port_register_in(pmt::intern("msg_in"));
+     set_msg_handler(pmt::intern("msg_in"),
+-                    boost::bind(&mmse_resampler_ff_impl::handle_msg, this, _1));
++                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
+ }
+ 
+ mmse_resampler_ff_impl::~mmse_resampler_ff_impl() { delete d_resamp; }
+diff --git a/gr-uhd/lib/usrp_block_impl.cc b/gr-uhd/lib/usrp_block_impl.cc
+index 4f030159ff..e5e1dd9161 100644
+--- a/gr-uhd/lib/usrp_block_impl.cc
++++ b/gr-uhd/lib/usrp_block_impl.cc
+@@ -137,7 +137,7 @@ usrp_block_impl::usrp_block_impl(const ::uhd::device_addr_t& device_addr,
+     // Set up message ports:
+     message_port_register_in(pmt::mp("command"));
+     set_msg_handler(pmt::mp("command"),
+-                    boost::bind(&usrp_block_impl::msg_handler_command, this, _1));
++                    [this](pmt::pmt_t msg) { this->msg_handler_command(msg); });
+ 
+ // cuz we lazy:
+ #define REGISTER_CMD_HANDLER(key, _handler) \
+diff --git a/gr-zeromq/lib/pub_msg_sink_impl.cc b/gr-zeromq/lib/pub_msg_sink_impl.cc
+index b5da7421ef..3973b8f835 100644
+--- a/gr-zeromq/lib/pub_msg_sink_impl.cc
++++ b/gr-zeromq/lib/pub_msg_sink_impl.cc
+@@ -62,7 +62,7 @@ pub_msg_sink_impl::pub_msg_sink_impl(char* address, int timeout, bool bind)
+     }
+ 
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"), boost::bind(&pub_msg_sink_impl::handler, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handler(msg); });
+ }
+ 
+ pub_msg_sink_impl::~pub_msg_sink_impl()
+diff --git a/gr-zeromq/lib/push_msg_sink_impl.cc b/gr-zeromq/lib/push_msg_sink_impl.cc
+index 4140781ab9..fee734753b 100644
+--- a/gr-zeromq/lib/push_msg_sink_impl.cc
++++ b/gr-zeromq/lib/push_msg_sink_impl.cc
+@@ -62,7 +62,7 @@ push_msg_sink_impl::push_msg_sink_impl(char* address, int timeout, bool bind)
+     }
+ 
+     message_port_register_in(pmt::mp("in"));
+-    set_msg_handler(pmt::mp("in"), boost::bind(&push_msg_sink_impl::handler, this, _1));
++    set_msg_handler(pmt::mp("in"), [this](pmt::pmt_t msg) { this->handler(msg); });
+ }
+ 
+ push_msg_sink_impl::~push_msg_sink_impl()
diff --git a/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch
new file mode 100644
index 000000000000..2d91fe2cce26
--- /dev/null
+++ b/net-wireless/gnuradio/files/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch
@@ -0,0 +1,298 @@
+From 7c841011f9316d4aae068b444c995829e09278d7 Mon Sep 17 00:00:00 2001
+From: Johannes Demel <demel@ant.uni-bremen.de>
+Date: Sat, 9 May 2020 14:25:32 +0200
+Subject: [PATCH] msg_handler: Use lambdas to set msg handlers
+
+With this commit, all calls to `set_msg_handler` in `gr-blocks` use
+lambdas. This helps to use `std::function` instead of `boost::function`.
+---
+ gnuradio-runtime/lib/block.cc                       | 3 +--
+ gr-blocks/lib/copy_impl.cc                          | 2 +-
+ gr-blocks/lib/message_debug_impl.cc                 | 6 +++---
+ gr-blocks/lib/message_strobe_impl.cc                | 3 +--
+ gr-blocks/lib/message_strobe_random_impl.cc         | 3 +--
+ gr-blocks/lib/multiply_matrix_impl.cc               | 7 ++-----
+ gr-blocks/lib/mute_impl.cc                          | 2 +-
+ gr-blocks/lib/nop_impl.cc                           | 3 +--
+ gr-blocks/lib/pdu_filter_impl.cc                    | 2 +-
+ gr-blocks/lib/pdu_remove_impl.cc                    | 2 +-
+ gr-blocks/lib/pdu_set_impl.cc                       | 3 ++-
+ gr-blocks/lib/random_pdu_impl.cc                    | 2 +-
+ gr-blocks/lib/repeat_impl.cc                        | 2 +-
+ gr-blocks/lib/socket_pdu_impl.cc                    | 8 ++++----
+ gr-blocks/lib/tagged_stream_multiply_length_impl.cc | 5 ++---
+ gr-blocks/lib/tuntap_pdu_impl.cc                    | 2 +-
+ 16 files changed, 24 insertions(+), 31 deletions(-)
+
+diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc
+index 5914283908..beec8c470c 100644
+--- a/gnuradio-runtime/lib/block.cc
++++ b/gnuradio-runtime/lib/block.cc
+@@ -61,9 +61,8 @@ block::block(const std::string& name,
+ {
+     global_block_registry.register_primitive(alias(), this);
+     message_port_register_in(d_system_port);
+-    set_msg_handler(d_system_port, boost::bind(&block::system_handler, this, _1));
+-
+     configure_default_loggers(d_logger, d_debug_logger, symbol_name());
++    set_msg_handler(d_system_port, [this](pmt::pmt_t msg) { this->system_handler(msg); });
+ }
+ 
+ block::~block() { global_block_registry.unregister_primitive(symbol_name()); }
+diff --git a/gr-blocks/lib/copy_impl.cc b/gr-blocks/lib/copy_impl.cc
+index c377e57b1e..4c97d07a76 100644
+--- a/gr-blocks/lib/copy_impl.cc
++++ b/gr-blocks/lib/copy_impl.cc
+@@ -44,7 +44,7 @@ copy_impl::copy_impl(size_t itemsize)
+       d_enabled(true)
+ {
+     message_port_register_in(pmt::mp("en"));
+-    set_msg_handler(pmt::mp("en"), boost::bind(&copy_impl::handle_enable, this, _1));
++    set_msg_handler(pmt::mp("en"), [this](pmt::pmt_t msg) { this->handle_enable(msg); });
+ }
+ 
+ copy_impl::~copy_impl() {}
+diff --git a/gr-blocks/lib/message_debug_impl.cc b/gr-blocks/lib/message_debug_impl.cc
+index a8c84aa509..719fbd818a 100644
+--- a/gr-blocks/lib/message_debug_impl.cc
++++ b/gr-blocks/lib/message_debug_impl.cc
+@@ -90,14 +90,14 @@ message_debug_impl::message_debug_impl()
+     : block("message_debug", io_signature::make(0, 0, 0), io_signature::make(0, 0, 0))
+ {
+     message_port_register_in(pmt::mp("print"));
+-    set_msg_handler(pmt::mp("print"), boost::bind(&message_debug_impl::print, this, _1));
++    set_msg_handler(pmt::mp("print"), [this](pmt::pmt_t msg) { this->print(msg); });
+ 
+     message_port_register_in(pmt::mp("store"));
+-    set_msg_handler(pmt::mp("store"), boost::bind(&message_debug_impl::store, this, _1));
++    set_msg_handler(pmt::mp("store"), [this](pmt::pmt_t msg) { this->store(msg); });
+ 
+     message_port_register_in(pmt::mp("print_pdu"));
+     set_msg_handler(pmt::mp("print_pdu"),
+-                    boost::bind(&message_debug_impl::print_pdu, this, _1));
++                    [this](pmt::pmt_t msg) { this->print_pdu(msg); });
+ }
+ 
+ message_debug_impl::~message_debug_impl() {}
+diff --git a/gr-blocks/lib/message_strobe_impl.cc b/gr-blocks/lib/message_strobe_impl.cc
+index 038eeae5a1..67a95be8f2 100644
+--- a/gr-blocks/lib/message_strobe_impl.cc
++++ b/gr-blocks/lib/message_strobe_impl.cc
+@@ -53,8 +53,7 @@ message_strobe_impl::message_strobe_impl(pmt::pmt_t msg, long period_ms)
+     message_port_register_out(d_port);
+ 
+     message_port_register_in(pmt::mp("set_msg"));
+-    set_msg_handler(pmt::mp("set_msg"),
+-                    boost::bind(&message_strobe_impl::set_msg, this, _1));
++    set_msg_handler(pmt::mp("set_msg"), [this](pmt::pmt_t msg) { this->set_msg(msg); });
+ }
+ 
+ message_strobe_impl::~message_strobe_impl() {}
+diff --git a/gr-blocks/lib/message_strobe_random_impl.cc b/gr-blocks/lib/message_strobe_random_impl.cc
+index 0ab5d6adc7..1b8deca952 100644
+--- a/gr-blocks/lib/message_strobe_random_impl.cc
++++ b/gr-blocks/lib/message_strobe_random_impl.cc
+@@ -74,8 +74,7 @@ message_strobe_random_impl::message_strobe_random_impl(
+         new gr::thread::thread(boost::bind(&message_strobe_random_impl::run, this)));
+ 
+     message_port_register_in(pmt::mp("set_msg"));
+-    set_msg_handler(pmt::mp("set_msg"),
+-                    boost::bind(&message_strobe_random_impl::set_msg, this, _1));
++    set_msg_handler(pmt::mp("set_msg"), [this](pmt::pmt_t msg) { this->set_msg(msg); });
+ }
+ 
+ long message_strobe_random_impl::next_delay()
+diff --git a/gr-blocks/lib/multiply_matrix_impl.cc b/gr-blocks/lib/multiply_matrix_impl.cc
+index e1b9c746c6..03e7894536 100644
+--- a/gr-blocks/lib/multiply_matrix_impl.cc
++++ b/gr-blocks/lib/multiply_matrix_impl.cc
+@@ -235,9 +235,7 @@ multiply_matrix_impl<gr_complex>::multiply_matrix_impl(
+ 
+     pmt::pmt_t port_name = pmt::string_to_symbol("set_A");
+     message_port_register_in(port_name);
+-    set_msg_handler(
+-        port_name,
+-        boost::bind(&multiply_matrix_impl<gr_complex>::msg_handler_A, this, _1));
++    set_msg_handler(port_name, [this](pmt::pmt_t msg) { this->msg_handler_A(msg); });
+ }
+ 
+ template <>
+@@ -256,8 +254,7 @@ multiply_matrix_impl<float>::multiply_matrix_impl(
+ 
+     pmt::pmt_t port_name = pmt::string_to_symbol("set_A");
+     message_port_register_in(port_name);
+-    set_msg_handler(port_name,
+-                    boost::bind(&multiply_matrix_impl<float>::msg_handler_A, this, _1));
++    set_msg_handler(port_name, [this](pmt::pmt_t msg) { this->msg_handler_A(msg); });
+ }
+ 
+ 
+diff --git a/gr-blocks/lib/mute_impl.cc b/gr-blocks/lib/mute_impl.cc
+index bd65ce2075..c9a1d200c8 100644
+--- a/gr-blocks/lib/mute_impl.cc
++++ b/gr-blocks/lib/mute_impl.cc
+@@ -48,7 +48,7 @@ mute_impl<T>::mute_impl(bool mute)
+ {
+     this->message_port_register_in(pmt::intern("set_mute"));
+     this->set_msg_handler(pmt::intern("set_mute"),
+-                          boost::bind(&mute_impl<T>::set_mute_pmt, this, _1));
++                          [this](pmt::pmt_t msg) { this->set_mute_pmt(msg); });
+ }
+ 
+ template <class T>
+diff --git a/gr-blocks/lib/nop_impl.cc b/gr-blocks/lib/nop_impl.cc
+index db216d97a4..4e1e887f42 100644
+--- a/gr-blocks/lib/nop_impl.cc
++++ b/gr-blocks/lib/nop_impl.cc
+@@ -26,7 +26,6 @@
+ 
+ #include "nop_impl.h"
+ #include <gnuradio/io_signature.h>
+-#include <boost/bind.hpp>
+ 
+ namespace gr {
+ namespace blocks {
+@@ -45,7 +44,7 @@ nop_impl::nop_impl(size_t sizeof_stream_item)
+     // Arrange to have count_received_msgs called when messages are received.
+     message_port_register_in(pmt::mp("port"));
+     set_msg_handler(pmt::mp("port"),
+-                    boost::bind(&nop_impl::count_received_msgs, this, _1));
++                    [this](pmt::pmt_t msg) { this->count_received_msgs(msg); });
+ }
+ 
+ nop_impl::~nop_impl() {}
+diff --git a/gr-blocks/lib/pdu_filter_impl.cc b/gr-blocks/lib/pdu_filter_impl.cc
+index b0748eec02..760027a78c 100644
+--- a/gr-blocks/lib/pdu_filter_impl.cc
++++ b/gr-blocks/lib/pdu_filter_impl.cc
+@@ -45,7 +45,7 @@ pdu_filter_impl::pdu_filter_impl(pmt::pmt_t k, pmt::pmt_t v, bool invert)
+     message_port_register_out(pdu::pdu_port_id());
+     message_port_register_in(pdu::pdu_port_id());
+     set_msg_handler(pdu::pdu_port_id(),
+-                    boost::bind(&pdu_filter_impl::handle_msg, this, _1));
++                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
+ }
+ 
+ void pdu_filter_impl::handle_msg(pmt::pmt_t pdu)
+diff --git a/gr-blocks/lib/pdu_remove_impl.cc b/gr-blocks/lib/pdu_remove_impl.cc
+index 19cc4dc76a..58277ca0d0 100644
+--- a/gr-blocks/lib/pdu_remove_impl.cc
++++ b/gr-blocks/lib/pdu_remove_impl.cc
+@@ -43,7 +43,7 @@ pdu_remove_impl::pdu_remove_impl(pmt::pmt_t k)
+     message_port_register_out(pdu::pdu_port_id());
+     message_port_register_in(pdu::pdu_port_id());
+     set_msg_handler(pdu::pdu_port_id(),
+-                    boost::bind(&pdu_remove_impl::handle_msg, this, _1));
++                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
+ }
+ 
+ void pdu_remove_impl::handle_msg(pmt::pmt_t pdu)
+diff --git a/gr-blocks/lib/pdu_set_impl.cc b/gr-blocks/lib/pdu_set_impl.cc
+index 40fbc3cd83..61f1bb1284 100644
+--- a/gr-blocks/lib/pdu_set_impl.cc
++++ b/gr-blocks/lib/pdu_set_impl.cc
+@@ -43,7 +43,8 @@ pdu_set_impl::pdu_set_impl(pmt::pmt_t k, pmt::pmt_t v)
+ {
+     message_port_register_out(pdu::pdu_port_id());
+     message_port_register_in(pdu::pdu_port_id());
+-    set_msg_handler(pdu::pdu_port_id(), boost::bind(&pdu_set_impl::handle_msg, this, _1));
++    set_msg_handler(pdu::pdu_port_id(),
++                    [this](pmt::pmt_t msg) { this->handle_msg(msg); });
+ }
+ 
+ void pdu_set_impl::handle_msg(pmt::pmt_t pdu)
+diff --git a/gr-blocks/lib/random_pdu_impl.cc b/gr-blocks/lib/random_pdu_impl.cc
+index 75d825aefa..5207a779d6 100644
+--- a/gr-blocks/lib/random_pdu_impl.cc
++++ b/gr-blocks/lib/random_pdu_impl.cc
+@@ -53,7 +53,7 @@ random_pdu_impl::random_pdu_impl(int min_items,
+     message_port_register_out(pdu::pdu_port_id());
+     message_port_register_in(pmt::mp("generate"));
+     set_msg_handler(pmt::mp("generate"),
+-                    boost::bind(&random_pdu_impl::generate_pdu, this, _1));
++                    [this](pmt::pmt_t msg) { this->generate_pdu(msg); });
+     if (length_modulo < 1)
+         throw std::runtime_error("length_module must be >= 1");
+     if (max_items < length_modulo)
+diff --git a/gr-blocks/lib/repeat_impl.cc b/gr-blocks/lib/repeat_impl.cc
+index 189fbc8948..7262b11a2e 100644
+--- a/gr-blocks/lib/repeat_impl.cc
++++ b/gr-blocks/lib/repeat_impl.cc
+@@ -45,7 +45,7 @@ repeat_impl::repeat_impl(size_t itemsize, int interp)
+ {
+     message_port_register_in(pmt::mp("interpolation"));
+     set_msg_handler(pmt::mp("interpolation"),
+-                    boost::bind(&repeat_impl::msg_set_interpolation, this, _1));
++                    [this](pmt::pmt_t msg) { this->msg_set_interpolation(msg); });
+ }
+ 
+ void repeat_impl::msg_set_interpolation(pmt::pmt_t msg)
+diff --git a/gr-blocks/lib/socket_pdu_impl.cc b/gr-blocks/lib/socket_pdu_impl.cc
+index df69f07ad2..edf572e76c 100644
+--- a/gr-blocks/lib/socket_pdu_impl.cc
++++ b/gr-blocks/lib/socket_pdu_impl.cc
+@@ -101,7 +101,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
+         start_tcp_accept();
+ 
+         set_msg_handler(pdu::pdu_port_id(),
+-                        boost::bind(&socket_pdu_impl::tcp_server_send, this, _1));
++                        [this](pmt::pmt_t msg) { this->tcp_server_send(msg); });
+     } else if (type == "TCP_CLIENT") {
+         boost::system::error_code error = boost::asio::error::host_not_found;
+         d_tcp_socket.reset(new boost::asio::ip::tcp::socket(d_io_service));
+@@ -111,7 +111,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
+         d_tcp_socket->set_option(boost::asio::ip::tcp::no_delay(d_tcp_no_delay));
+ 
+         set_msg_handler(pdu::pdu_port_id(),
+-                        boost::bind(&socket_pdu_impl::tcp_client_send, this, _1));
++                        [this](pmt::pmt_t msg) { this->tcp_client_send(msg); });
+ 
+         d_tcp_socket->async_read_some(
+             boost::asio::buffer(d_rxbuf),
+@@ -131,7 +131,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
+                         boost::asio::placeholders::bytes_transferred));
+ 
+         set_msg_handler(pdu::pdu_port_id(),
+-                        boost::bind(&socket_pdu_impl::udp_send, this, _1));
++                        [this](pmt::pmt_t msg) { this->udp_send(msg); });
+     } else if (type == "UDP_CLIENT") {
+         d_udp_socket.reset(
+             new boost::asio::ip::udp::socket(d_io_service, d_udp_endpoint));
+@@ -144,7 +144,7 @@ socket_pdu_impl::socket_pdu_impl(std::string type,
+                         boost::asio::placeholders::bytes_transferred));
+ 
+         set_msg_handler(pdu::pdu_port_id(),
+-                        boost::bind(&socket_pdu_impl::udp_send, this, _1));
++                        [this](pmt::pmt_t msg) { this->udp_send(msg); });
+     } else
+         throw std::runtime_error("gr::blocks:socket_pdu: unknown socket type");
+ 
+diff --git a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
+index 30f4c46dc6..2266c01fe3 100644
+--- a/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
++++ b/gr-blocks/lib/tagged_stream_multiply_length_impl.cc
+@@ -49,9 +49,8 @@ tagged_stream_multiply_length_impl::tagged_stream_multiply_length_impl(
+     set_tag_propagation_policy(TPP_DONT);
+     set_relative_rate(1, 1);
+     message_port_register_in(pmt::intern("set_scalar"));
+-    set_msg_handler(
+-        pmt::intern("set_scalar"),
+-        boost::bind(&tagged_stream_multiply_length_impl::set_scalar_pmt, this, _1));
++    set_msg_handler(pmt::intern("set_scalar"),
++                    [this](pmt::pmt_t msg) { this->set_scalar_pmt(msg); });
+ }
+ 
+ tagged_stream_multiply_length_impl::~tagged_stream_multiply_length_impl() {}
+diff --git a/gr-blocks/lib/tuntap_pdu_impl.cc b/gr-blocks/lib/tuntap_pdu_impl.cc
+index 4343ae1dc3..19742235d9 100644
+--- a/gr-blocks/lib/tuntap_pdu_impl.cc
++++ b/gr-blocks/lib/tuntap_pdu_impl.cc
+@@ -96,7 +96,7 @@ tuntap_pdu_impl::tuntap_pdu_impl(std::string dev, int MTU, bool istunflag)
+ 
+     // set up input message port
+     message_port_register_in(pdu::pdu_port_id());
+-    set_msg_handler(pdu::pdu_port_id(), boost::bind(&tuntap_pdu_impl::send, this, _1));
++    set_msg_handler(pdu::pdu_port_id(), [this](pmt::pmt_t msg) { this->send(msg); });
+ }
+ 
+ int tuntap_pdu_impl::tun_alloc(char* dev, int flags)
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
index a73f9f65dc64..e5e6b1a24c2d 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
@@ -77,8 +77,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/six[${PYTHON_MULTI_USEDEP}]
 		filter? (
 			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+				dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/scipy[${PYTHON_MULTI_USEDEP}]
 			)
 		)
 		grc? (
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
index b85c4e578724..4bd0848dbf45 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
@@ -78,8 +78,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/six[${PYTHON_MULTI_USEDEP}]
 		filter? (
 			|| (
-				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+				dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/scipy[${PYTHON_MULTI_USEDEP}]
 			)
 		)
 		grc? (
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
index 3fd0a24eac18..ebf97b1bfda9 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r1.ebuild
@@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib:= )
 	fec? (
 		sci-libs/gsl
-		sci-libs/scipy
+		dev-python/scipy
 	)
-	filter? ( sci-libs/scipy )
+	filter? ( dev-python/scipy )
 	grc? (
 		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( sci-libs/scipy )
+	trellis? ( dev-python/scipy )
 	uhd? (
 		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
index ed6d89a7a8fa..3ae37a1a92e3 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
@@ -57,9 +57,9 @@ RDEPEND="${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib:= )
 	fec? (
 		sci-libs/gsl
-		sci-libs/scipy
+		dev-python/scipy
 	)
-	filter? ( sci-libs/scipy )
+	filter? ( dev-python/scipy )
 	grc? (
 		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -78,7 +78,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( sci-libs/scipy )
+	trellis? ( dev-python/scipy )
 	uhd? (
 		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
index 65be5a358525..601ceea4ed97 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
@@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib:= )
 	fec? (
 		sci-libs/gsl
-		sci-libs/scipy
+		dev-python/scipy
 	)
-	filter? ( sci-libs/scipy )
+	filter? ( dev-python/scipy )
 	grc? (
 		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( sci-libs/scipy )
+	trellis? ( dev-python/scipy )
 	uhd? (
 		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
@@ -114,6 +114,13 @@ DEPEND="${RDEPEND}
 	zeromq? ( net-libs/cppzmq )
 "
 
+PATCHES=(
+	"${FILESDIR}/gnuradio-3.8.2.0-lamda-gr-qtgui.patch"
+	"${FILESDIR}/gnuradio-3.8.2.0-lamda-gr-uhd.patch"
+	"${FILESDIR}/gnuradio-3.8.2.0-lamda-most-components.patch"
+	"${FILESDIR}/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch"
+)
+
 src_prepare() {
 	xdg_environment_reset #534582
 
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 65be5a358525..43237bbd9cc2 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -56,9 +56,9 @@ RDEPEND="${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib:= )
 	fec? (
 		sci-libs/gsl
-		sci-libs/scipy
+		dev-python/scipy
 	)
-	filter? ( sci-libs/scipy )
+	filter? ( dev-python/scipy )
 	grc? (
 		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -77,7 +77,7 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtwidgets:5
 	)
 	sdl? ( >=media-libs/libsdl-1.2.0 )
-	trellis? ( sci-libs/scipy )
+	trellis? ( dev-python/scipy )
 	uhd? (
 		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
 	)
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index 593891db1828..a1adfc7d568f 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -2,6 +2,6 @@ AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42af
 DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
 DIST gqrx-2.12.1.tar.gz 1334839 BLAKE2B 9ad8ab710675f4b42ff652d642026aba00dad63867f836662054aaab89cc7788874cc0f47de531257ee901f3bc58a6e6d5aef3c5a4fe30ae367d24fcd87ae763 SHA512 28d3da6c4ff750cf580db658aee267162a64103e9dac1d212f70df6bc602c8d50ccb7aaf88c7e976cfa235b884e02b4994e679f69aed640485c44ed07f183cc9
 EBUILD gqrx-2.11.5-r1.ebuild 1460 BLAKE2B 88cf1bfa99c38b3b4bf74de16b0cd3d624f24fe9a7d8801ea0fc1e79114fea5c2eac6ec441fa6da08a31317b87c7a7266063b4867b3c33d32f7a5b37961fe041 SHA512 4dda5191329758fd82c199a595e44a2e2aae879ecc603ff975e87121713a628f6a1e7d8a78456d77bdb20c6f9804eda1dcf3314e97c5a1fc21ed6d3e78dd2aa4
-EBUILD gqrx-2.12.1.ebuild 1396 BLAKE2B 92ba0267d2583fb7d303bfd738a052870b9c3b867a1cacb0a805175d2788917ebd00556e0319f6d6ad1d6a5894bbfca578cf2c3cb89bf269d05e2d5d200b2589 SHA512 dea8b2cf69f669556478326aac9c6c7212795b16503c1c7808fe556692249edb63941ff345420f0f19f65861340503994a381a3bd0a645dfd21dd36a4004f389
-EBUILD gqrx-9999.ebuild 1396 BLAKE2B 92ba0267d2583fb7d303bfd738a052870b9c3b867a1cacb0a805175d2788917ebd00556e0319f6d6ad1d6a5894bbfca578cf2c3cb89bf269d05e2d5d200b2589 SHA512 dea8b2cf69f669556478326aac9c6c7212795b16503c1c7808fe556692249edb63941ff345420f0f19f65861340503994a381a3bd0a645dfd21dd36a4004f389
+EBUILD gqrx-2.12.1-r1.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
+EBUILD gqrx-9999.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.12.1.ebuild b/net-wireless/gqrx/gqrx-2.12.1-r1.ebuild
index 5497f6b12fd5..a008cc56721e 100644
--- a/net-wireless/gqrx/gqrx-2.12.1.ebuild
+++ b/net-wireless/gqrx/gqrx-2.12.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
 HOMEPAGE="https://gqrx.dk/"
@@ -11,7 +11,6 @@ HOMEPAGE="https://gqrx.dk/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -30,6 +29,7 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	sci-libs/volk
 	pulseaudio? ( media-sound/pulseaudio:= )
 	portaudio? ( media-libs/portaudio:= )"
 RDEPEND="${DEPEND}"
@@ -38,7 +38,10 @@ src_prepare() {
 	if use !pulseaudio; then
 		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
 	fi
-	cmake-utils_src_prepare
+	if use portaudio; then
+		sed -i 's#find_package(Portaudio#find_package(PORTAUDIO#' CMakeLists.txt || die
+	fi
+	cmake_src_prepare
 	eapply_user
 }
 
@@ -54,7 +57,7 @@ src_configure() {
 	local mycmakeargs=(
 		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index 5497f6b12fd5..a008cc56721e 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
 HOMEPAGE="https://gqrx.dk/"
@@ -11,7 +11,6 @@ HOMEPAGE="https://gqrx.dk/"
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -30,6 +29,7 @@ DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	sci-libs/volk
 	pulseaudio? ( media-sound/pulseaudio:= )
 	portaudio? ( media-libs/portaudio:= )"
 RDEPEND="${DEPEND}"
@@ -38,7 +38,10 @@ src_prepare() {
 	if use !pulseaudio; then
 		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
 	fi
-	cmake-utils_src_prepare
+	if use portaudio; then
+		sed -i 's#find_package(Portaudio#find_package(PORTAUDIO#' CMakeLists.txt || die
+	fi
+	cmake_src_prepare
 	eapply_user
 }
 
@@ -54,7 +57,7 @@ src_configure() {
 	local mycmakeargs=(
 		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index 21ec73988f9a..e5d04e97efa2 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,6 +1,6 @@
 DIST gr-iqbal-0.37.3.tar.gz 105924 BLAKE2B 25eddc718e2b6d5c679a0d6f199d9d49ff69b535502bf9449d7561ae8c172014a5058cee7ef692a36ec518408747d63d01a23c963f45a5d4b5f58175c49f5bbc SHA512 04ac24e2cc8ebf458088e4d8b005818d3f2496fdc801779dc276c21ee751520039078d5157022a886494f8d62b586d69c703e83fb0539e775ce95e3ca34cf374
 DIST gr-iqbal-0.38.1.tar.gz 106392 BLAKE2B 009f36dcf34127e80d8afa91196906a2b2dc8696dd16f9e7d6d9011d9baf2e4c2dfac78eb1acabcbe52dd88ce08b15f8da407b141585f2c60fd63549218576e0 SHA512 b2f74bba560478b746ad1b11d70202fa2d396462f4806918379543fc69a915346745b34f9ffb2914091ec677295f6f378a5b22641c26aa37c5e23092623b5cee
 EBUILD gr-iqbal-0.37.3.ebuild 708 BLAKE2B b02d0481770d6b05038a0eec9b5f69bcb02866e6436229f523cc204faace02ba17f0350e3ecff4d3827d3a10e6d3ada25a7fb16523f81ef268ec29df5002f2fe SHA512 d93be823cf734ce2a96aa0fe7ea4a25dc590c1fd90f5320caf340b9dfda90c2da1108d5b0195dd6ea3a949ca1d38b194ab32f60d6fb65147ef158d9dbf6cf1e1
-EBUILD gr-iqbal-0.38.1.ebuild 894 BLAKE2B 16599886e26f85b2ec0a6253e2eee8f46b2c3b14f456f9bf424a715942b84656fc9a28e769919c6caf6999fab2fec7172b595958ef66013493a9341aa49a6b4f SHA512 fdd553aac55a77aacfc604290123c35749e867fa8be289542676a9e5992b37c92d0957d6ccba41c1a84ff225b6836bc4c28d36aac5d2daff435f9f9cf1695ba5
-EBUILD gr-iqbal-9999.ebuild 894 BLAKE2B 16599886e26f85b2ec0a6253e2eee8f46b2c3b14f456f9bf424a715942b84656fc9a28e769919c6caf6999fab2fec7172b595958ef66013493a9341aa49a6b4f SHA512 fdd553aac55a77aacfc604290123c35749e867fa8be289542676a9e5992b37c92d0957d6ccba41c1a84ff225b6836bc4c28d36aac5d2daff435f9f9cf1695ba5
+EBUILD gr-iqbal-0.38.1.ebuild 864 BLAKE2B 922265ce7d23112dd60ea4f9642a235bad372c495b9a21f6d7f20f6524e81409d70d8b4f0d130aa2d229835d4e92144cf14ab72abc28e60e35e50b3c10c3e50a SHA512 1732456dff3d84ddca603b54ab12bcdbc6775fd4df103cef6d1d96132464ee6d3ee19e8672e51c5b23f2ab034871350a044a5967eb57ecf31b7130c5ca0f9835
+EBUILD gr-iqbal-9999.ebuild 864 BLAKE2B 922265ce7d23112dd60ea4f9642a235bad372c495b9a21f6d7f20f6524e81409d70d8b4f0d130aa2d229835d4e92144cf14ab72abc28e60e35e50b3c10c3e50a SHA512 1732456dff3d84ddca603b54ab12bcdbc6775fd4df103cef6d1d96132464ee6d3ee19e8672e51c5b23f2ab034871350a044a5967eb57ecf31b7130c5ca0f9835
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
index d8b2cae1cdd9..a8c503e87bbe 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
@@ -37,5 +37,5 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_optimize "${ED}/$(python_get_sitedir)"
+	python_optimize
 }
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index d8b2cae1cdd9..a8c503e87bbe 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -37,5 +37,5 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_optimize "${ED}/$(python_get_sitedir)"
+	python_optimize
 }
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index 95f807c53be2..e5a77667ec39 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,11 +1,3 @@
-DIST iw-4.14.tar.xz 114096 BLAKE2B 2b2e4667e37864b9f9e490a47546f9a1f458da7b230e0e6448216d68525a23e47425220132896b9b2bd424c9ecf32e35e2207a9004efa23152628ce3aa9c20ad SHA512 1ce6335628641eb14ed71d39b96a9907fe36e597e6413fdce7f98f7007939bbdc3fac5af69eb1c857259706937e1a7495cf8cbd4e4ba8528c2a471ef6e4bf809
-DIST iw-4.9.tar.xz 105764 BLAKE2B ad8105df91c4717293d5595b5ed9b4d022e455c608d70d1aeefc3d5516dcf92e507f38f424eca60f9d819e998286a4094a83002a1b9aaf4e204ca7a02fded67e SHA512 3c99d8fc07d6d85b8304ff34b96573e22af65aea688a8cb08051ce4857d7ce9ac32a5acd3b30157c6c78e942f84a18f9229c17e353b7a6d01c80324729af18b3
-DIST iw-5.0.1.tar.xz 132664 BLAKE2B a3b48f379f927440e08cf9794c6fca3a888a753b391188900a0975eb997b0f904075b3f22f6882d1b44d0bcd7484fdd639484d5901b6d02cc4d5d8158d545f93 SHA512 98764c1be7c63f86cc10193319e18c216a3f9a323444723b2949db0738ff8fcff04e6d78c035b5448c083d825a4b4cde27ec607539ec79b1898af73a7969c544
-DIST iw-5.3.tar.xz 136912 BLAKE2B 94355d946987be62e7cf7a3515b7e78d19995bc9a2689fc107fef4b2ff81d304d330a6e779adb03385feb92320c29e8bc6f1ec06b2c2dae115fe728213e32c76 SHA512 986fb7cf37cc3cab7b4058b5b73fadf1dc101fa764a144c9e4fc400d2327429df53fefbd4ea9ee63821e793a4118d468012a857800521ecf9973a7b9428229c9
 DIST iw-5.4.tar.xz 136252 BLAKE2B 0e69d1520a1a41f135207affd610e84f693e744d3c7891c7efd75451df0d7aac84be71d02a72b5c08d0b8d850b29b8ed7afb4c3481ef0bd1bef98f14c3f3aaeb SHA512 84408194e5b3a2f119ae9711d856ecb4343734ebb91150e0441b2410af8f75f460ce9ab1ce7151b0dda3926270bcb80fa684058945b7549c98964a0379e39ba2
-EBUILD iw-4.14.ebuild 773 BLAKE2B bc6ccd6f4031a419034c982a7babef83244c7617960c59536d1223d5db3281c5c5d9ff581af22d084203c5e0b997014413d62cbac658227a13e5f2efa41528ac SHA512 d7c403c81aa5f24ccc5d7a2964e7c810668913d71921ad8bafb295b0ef80c6d208ebdb43124618729b16f5c64b894bfd7c5f7445885b80d0283a1b81f5422a0f
-EBUILD iw-4.9.ebuild 766 BLAKE2B d2fb6d98fbf8e8588e6428db5656bfffc24e09b815d886b115d2f8c4bf8d342b66bf999908982645a7456705c729019078d2ae89f27ad3e7b0e5f859fe2b0844 SHA512 003c59621058a9324bc05d60a5f51a529a687c30f5543449750ae2195a999ea44b5e11bdfbbac48c575901803ce48eba66a2b9ee6abd1ba2289cb7de9c2b4704
-EBUILD iw-5.0.1.ebuild 870 BLAKE2B 3398efc126a7054cebace66edde21a96ffe78cd1577933945f3fefff647a7848c8595479ac342cec1c6c94d801c6d54347836a3d28f68b1cc94ceb2c4c00c9d0 SHA512 0b895d24be82a4419689fb7b9b5a66cb750951f636ce8e0b61d35e4cdc5497e6405d81c1b8337a7252b8fc71f54576e3196b43db0d117b5d516fa8c8f0a8aeef
-EBUILD iw-5.3.ebuild 874 BLAKE2B df56dff1b5f1354a7dea6e6ad815fbd49ab1a643e698cb5bbbab69193542c6cc8b4bb5a0b76fc0297ee4e006401e658abc49b8a7e32d38f0d08a07b3cee16a5f SHA512 5a50df1c663df3ae473fae4a5bc89aae09fed71c5b1074704f544d5fbd1fc522d7dfcdc93e435e105eaada5df7c39a5059476754d76b5c6cdd53b29213fd615e
-EBUILD iw-5.4.ebuild 869 BLAKE2B 0b547753550a9443c2650c778c78624907c9fa9968dd4d0542fc015d61499e3a11589174b4b43c743de871da006e03659fe1f895fe8f8e81a0f429dcf37a5c37 SHA512 d458e8723092f24479b956cbe6413f265d6c5aba23202f88ee4fbb3b671aed714992801342b78c7a75abd7a094c07d74e0f81246bbc33eca238cd2423240705c
+EBUILD iw-5.4.ebuild 856 BLAKE2B 05b0e85c02c9725debe89421d81d83860a8e958e2483ab31c34aea1071daf7cc5bc748b5ec88311660f0e3a49793b0b614141ccec371cf389ffdce1635e65003 SHA512 70cfd3f166c350c8fe388b0f6f70a6c7d96857d937bec00f246f67ca5c8648b4bdddfdd5d90bc0926bed34c5bd74feb294a238c2c3aee9e60a2961215502a669
 MISC metadata.xml 325 BLAKE2B 4081db738ce07e18a087d3517e082f3aca70e17aa3e7fe371795cac7fead6fcd6a8226817fc0d995a8be9e43cb56617c345b64abbaf806ced7a96246538db9a5 SHA512 4d4ca6e03b9d43532e35b043873f134e47176b9e22b9c61e19a129726e2685218beecf31148ec5d3eba6cd02a0f818c1e2032e5bda247a1e51bafcbd7b951cea
diff --git a/net-wireless/iw/iw-4.14.ebuild b/net-wireless/iw/iw-4.14.ebuild
deleted file mode 100644
index 7a5b9ac76f07..000000000000
--- a/net-wireless/iw/iw-4.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	tc-export CC LD PKG_CONFIG
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-4.9.ebuild b/net-wireless/iw/iw-4.9.ebuild
deleted file mode 100644
index 5ababca47604..000000000000
--- a/net-wireless/iw/iw-4.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	tc-export CC LD PKG_CONFIG
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-5.0.1.ebuild b/net-wireless/iw/iw-5.0.1.ebuild
deleted file mode 100644
index 5f8ba4f5d306..000000000000
--- a/net-wireless/iw/iw-5.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	tc-export CC LD PKG_CONFIG
-
-	# do not compress man pages by default.
-	sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-5.3.ebuild b/net-wireless/iw/iw-5.3.ebuild
deleted file mode 100644
index f7ab9c077948..000000000000
--- a/net-wireless/iw/iw-5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
-SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="dev-libs/libnl:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	tc-export CC LD PKG_CONFIG
-
-	# do not compress man pages by default.
-	sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die
-}
-
-src_compile() {
-	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
-	emake V=1
-}
-
-src_install() {
-	emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-}
diff --git a/net-wireless/iw/iw-5.4.ebuild b/net-wireless/iw/iw-5.4.ebuild
index ad63db87ee84..9a7e9054ab9d 100644
--- a/net-wireless/iw/iw-5.4.ebuild
+++ b/net-wireless/iw/iw-5.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="nl80211-based configuration utility for wireless devices using the mac80211 kernel stack"
+DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack"
 HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
 SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
 
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 947be9624227..4bf56ce893d8 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -5,9 +5,9 @@ AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
-DIST kismet-2020-09-R1.tar.xz 8694804 BLAKE2B 1389486809024179c3be71a8b26cdb460f483e1af0dd7cda9d36450d10e4df16536f23db3b5ca3fd6b65b0c48514c96e5cb37ec71425a8f087d58e7a89bed137 SHA512 e687c76b9e94d973245f61d6fc59a1a05a06ba9c765f7661a183d14d0228676359a7d7798bac9f3b493a5c311e53785c54fd9f0d12bf6cdc4d43919bad167327
+DIST kismet-2020-09-R3.tar.xz 8692092 BLAKE2B a38a889aa382e597e11c7fe0452e0faf40a991f6ece7fcb29a9605bc158b629647bf6117c6bd72e957f5a6f2b89788983f120130b3a6f0f31ae3a386dcdfdb44 SHA512 b1c0daee20c59124059cfa71d5ab938c47f143a467e14b442aaf67a372599ff799a08951745cedb6f38e5cded7f5a30834bf03adee53846a90a593a0b3231a6a
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 9d2cb57cc3728ebaeb8ccf8b9ed4716473c4930d006d4b6f1b5badb21e6433da49b24e4d9a1f41dff698ec198cae7d09450266a78f7be67b65cfbfd61b459ca2 SHA512 4463682c7ebba71368ecb28f9ac89789be91de8c11f2ff3a1395ad4101f3ce8da2fef5e0622d211b885b9d1cacde82f27cd73aeb1079b6415af7b232dd730090
 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
-EBUILD kismet-2020.09.1.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
+EBUILD kismet-2020.09.3.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
 EBUILD kismet-9999.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
 MISC metadata.xml 1445 BLAKE2B e915106684538d82bbd7488f9a1e37990a6b7c8bec8265db850797beeacdef58671f5635f186c21afca9c0c0964fcdb8bf6589d9d235e3e91eaa0c0d88dc5548 SHA512 33bafa9ff07daa54dcca14b76a80f01ed483e0952abe254f9a9627655f998922e7a2ff006fa6e24d6009af5ce78dd43ac43900f0ea61a22541110ce5b7d6cc86
diff --git a/net-wireless/kismet/kismet-2020.09.1.ebuild b/net-wireless/kismet/kismet-2020.09.3.ebuild
index 06840c1eb328..06840c1eb328 100644
--- a/net-wireless/kismet/kismet-2020.09.1.ebuild
+++ b/net-wireless/kismet/kismet-2020.09.3.ebuild
diff --git a/net-wireless/rfcat/Manifest b/net-wireless/rfcat/Manifest
deleted file mode 100644
index 9214cfc2982f..000000000000
--- a/net-wireless/rfcat/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST RfCatChronosCCBootloader-170313.hex 49806 BLAKE2B 5a742393b1236b77c5a5391a1d7d102a649ad7898a4841b8c3e61129d5f27662db5f63468272c66c7eac7a881bff535ba100294a112a0a0c9351be43cd4cfab2 SHA512 3319de119c76d1373251cea98d847d210082edfce6ec116da1e06e4e48ae9a6780bff7bdd2d231667bebc4cfefe770cccb86db14aba45df27e040cc48e23ce35
-DIST RfCatDonsCCBootloader-170313.hex 49664 BLAKE2B 9936f4a5b1262f4abb5e8d38205af909d2640170b24499f9f3e9f6320501fa4f1e438d859dde59b1b8425dfaad8743fed0a0e1fd2b66fbcff9e22b97362f65b9 SHA512 c3fe9a14135a24a44d8c9d193278850a1ba41085f4225397fe21f47e9a874bf1cdaec080acb57d3b086ce05132711df8e6e4cb63b7eacf7d2c24fcafe4dff1f2
-DIST RfCatYS1CCBootloader-170313.hex 50208 BLAKE2B 9df19800d5c0c5a4b8c99f550c758c14d9e3d6dab1f3ed58f65b7577720989eec113f2f243d0d5686a7137398d833374da38faae6ed1ba95836bbebb3448a417 SHA512 6b51aed7ca3ae916137056df711c0f8f76de7f30dec48227da226a7c8814fdded5a1d544f746c74423f69289bae90276b425f7b44a7ad4af5dd96994efc385e2
-DIST immeSniff-170508.hex 38770 BLAKE2B fd34fee85ee6bf893234939cab9794c34f9302e37d86636116e544ca39e368ed8b6015ae2efa80c49ad56722b1fa573897e0b93ca4d5b2e6496c9f92c9c761d6 SHA512 3f06693fc893071adfb75e510da4d5c47752480896e449f893141b4db43dc7fb859dc25ab368d742ae612ebda085f199bcd8e18c9f5fa6f58c6b6204defc7b5f
-DIST rfcat-0.0.190423.tar.gz 334587 BLAKE2B da565d3272262b876763cb65da1f03fa2edd13c423dc23b1bfa91453ce4a8c1629e2f61f79dfaae3137ffbf3d85daec588a97a74db17149e677bef619e5d38ff SHA512 2c44ee933d5a47f3cf83b85c423b10ee044ce37a9e11f8bab0bf8c9734d8d8cac4744cec456eb1c12ad397b72194af7010f4b99aae95b42759bc63eb7b737532
-DIST rfcat_170508.tgz 462440 BLAKE2B 20d4b875be7caeb8263e3582c101a2402527b2f4f54feceba49bf01f65d268f3f9537c42a9a40502a6e232c7d828b6be27d899e979509c607c1160a71aa3677a SHA512 79f960ee6b8c2d66cb17ca69216041bb9679b0d38579feb3ab59bbb6e41337b29c4ad30a6d03b2de4c58eeeff5f22fe26412a670da5278e81a47a2ec3d699f60
-EBUILD rfcat-0.0.170508.ebuild 1381 BLAKE2B 06c89b4f5b5edbc0f9569fbe13e3c51b68e81775d77d8e03a7e8f2bb6ded0d567a46329171bdb8f83fdaf5db2e156d1337b37412565d05a0eb9331d37e83a7d6 SHA512 5957e81e866b1ecafa618c435da3790e1a540f31d8d893c42314f9339af4e9bd8a0158be50e8404b54efbc2fee29638369935291be5b6452b4085f880165ca45
-EBUILD rfcat-0.0.190423.ebuild 1485 BLAKE2B 29e5db161de76c854e02bce6dbf97283881b34357b2e751938aed0df4f4e7c1477ae4074013a3fc19ed88bf76c541729682fffdf19c79c1c1d08e412d8293132 SHA512 45ed01a14d008eb4aa791d8431ce681fe9b91eeae57ef66cf9ba5df55aa1a41d025d8a0d76f3dec5d3313367cf68a64aa53f9de375237d9c401e8fb36060c1ec
-EBUILD rfcat-9999.ebuild 1485 BLAKE2B 3781bc95018bbd58ea843a9aef8bb74beb35f11ae3c5a45b55cb1c31e9954a1fb2eb9528b0f2f3ab58174d51bcd92d80708a28652d13f0781c1f3530bb4ee75e SHA512 14d416a96bd25bcb6a0f78a1b0113f01f11050eacd7ec47fe6e547bb2e47e287c054654848f7e0c94beeed13da21872d681a26d21f88c1dc1101e5d1ba9acc29
-MISC metadata.xml 332 BLAKE2B f434ada12078111a24ebbf48d22c9820bd2c4f93c86b90a75e3e31b62dada319d35260ca469b9e8931abfd34416b9018c55e6a246ba9f29b793f32eb30e3bfce SHA512 c99ea897c8e261d0fe784a70e40fa34d11e5ed1600ff1a24c5b0a3618430c9509d94755ec3c4e76e656c62cc51502b6345f0de7713f9a3dc213ef00bb5fce468
diff --git a/net-wireless/rfcat/metadata.xml b/net-wireless/rfcat/metadata.xml
deleted file mode 100644
index f804913238a3..000000000000
--- a/net-wireless/rfcat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">atlas0fd00m/rfcat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/rfcat/rfcat-0.0.170508.ebuild b/net-wireless/rfcat/rfcat-0.0.170508.ebuild
deleted file mode 100644
index 344278dba590..000000000000
--- a/net-wireless/rfcat/rfcat-0.0.170508.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="The swiss army knife of subGHz"
-HOMEPAGE="https://bitbucket.org/atlas0fd00m/rfcat/"
-
-if [ "${PV}" = "9999" ]; then
-	EHG_REPO_URI="https://bitbucket.org/atlas0fd00m/rfcat"
-	inherit mercurial
-	KEYWORDS=""
-else
-	DATE="170508"
-	FIRMWARE_DATE="170313"
-	SRC_URI="https://bitbucket.org/atlas0fd00m/rfcat/downloads/rfcat_${DATE}.tgz \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/immeSniff-${DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatChronosCCBootloader-${FIRMWARE_DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatDonsCCBootloader-${FIRMWARE_DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatYS1CCBootloader-${FIRMWARE_DATE}.hex"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}_${DATE}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-#DEPEND="dev-embedded/sdcc"
-#RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-
-	if [ "${PV}" != "9999" ]; then
-		insinto /usr/share/rfcat
-		doins "${DISTDIR}"/*.hex
-	fi
-}
-
-pkg_postinst() {
-	if [ "${PV}" = "9999" ]; then
-		ewarn "Right now, this only installs the rfcat host tools, nothing related to firmware"
-	else
-		einfo "Pre-compiled firmwares from upstream are installed in /usr/share/rfcat"
-	fi
-}
diff --git a/net-wireless/rfcat/rfcat-0.0.190423.ebuild b/net-wireless/rfcat/rfcat-0.0.190423.ebuild
deleted file mode 100644
index 644402fa8044..000000000000
--- a/net-wireless/rfcat/rfcat-0.0.190423.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="The swiss army knife of subGHz"
-HOMEPAGE="https://github.com/atlas0fd00m/rfcat.git"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/atlas0fd00m/rfcat.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	DATE="170508"
-	FIRMWARE_DATE="170313"
-	COMMIT="109f887fc816021a2cb2875dce62ab9cad02c5f3"
-	SRC_URI="https://github.com/atlas0fd00m/rfcat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/immeSniff-${DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatChronosCCBootloader-${FIRMWARE_DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatDonsCCBootloader-${FIRMWARE_DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatYS1CCBootloader-${FIRMWARE_DATE}.hex"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-#DEPEND="dev-embedded/sdcc"
-#RDEPEND="${DEPEND}"
-PDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	if [ "${PV}" != "9999" ]; then
-		insinto /usr/share/rfcat
-		doins "${DISTDIR}"/*.hex
-	fi
-}
-
-pkg_postinst() {
-	if [ "${PV}" = "9999" ]; then
-		ewarn "Right now, this only installs the rfcat host tools, nothing related to firmware"
-	else
-		einfo "Pre-compiled firmwares from upstream are installed in /usr/share/rfcat"
-	fi
-}
diff --git a/net-wireless/rfcat/rfcat-9999.ebuild b/net-wireless/rfcat/rfcat-9999.ebuild
deleted file mode 100644
index c5a88d6cf870..000000000000
--- a/net-wireless/rfcat/rfcat-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="The swiss army knife of subGHz"
-HOMEPAGE="https://github.com/atlas0fd00m/rfcat.git"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/atlas0fd00m/rfcat.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	DATE="170508"
-	FIRMWARE_DATE="170313"
-	COMMIT="109f887fc816021a2cb2875dce62ab9cad02c5f3"
-	SRC_URI="https://github.com/atlas0fd00m/rfcat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/immeSniff-${DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatChronosCCBootloader-${FIRMWARE_DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatDonsCCBootloader-${FIRMWARE_DATE}.hex \
-		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatYS1CCBootloader-${FIRMWARE_DATE}.hex"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}_${COMMIT}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-#DEPEND="dev-embedded/sdcc"
-#RDEPEND="${DEPEND}"
-PDEPEND="dev-python/future[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	if [ "${PV}" != "9999" ]; then
-		insinto /usr/share/rfcat
-		doins "${DISTDIR}"/*.hex
-	fi
-}
-
-pkg_postinst() {
-	if [ "${PV}" = "9999" ]; then
-		ewarn "Right now, this only installs the rfcat host tools, nothing related to firmware"
-	else
-		einfo "Pre-compiled firmwares from upstream are installed in /usr/share/rfcat"
-	fi
-}
diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index 780415c50c61..e28c6857df6e 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,6 +1,4 @@
-DIST rtl_433-0.1_p20190709.tar.gz 718424 BLAKE2B f7acd89013114c7d357edfc4610be8a7405feac11843dcb1bc7fefe81556a3b09ee26622dd58d68afb3d99840db8e997dbbc66cccda53a34964b32bac352462c SHA512 d36757a567c7696b150b03a1e09fda74f7a4ec454bc1b5658e4a6b22370de5c102a152257d436c87f0ddff325c17b0e9b8afbae0dc3e82ab04111d78a728a590
-DIST rtl_433-20.02_p20200327.tar.gz 805791 BLAKE2B db1eb9563252d2711b441b12071f5de887e835decc93e30bec0a8133b927cd14cc7030380febe97b3d135df97a9eb01d5b42ebe93b761f524709f3a072a792b4 SHA512 2aecf45669dfdca849b6761b069c107491f879624092ea2ab9738ea9f1514b1c516e0bfcc0851f6947863fa6682ac809220bb88635edf10fb77025a8f4be07f3
-EBUILD rtl_433-0.1_p20190709-r1.ebuild 902 BLAKE2B 56650cbafb488b7b7ac4a40773d5c1218f4b059bea5fb7919d353f851335ab8d3289bed08b3566251fa6255c658236e4e909d5c547b4250564d3a11021d2d4cc SHA512 17630501c94699ac49fe62e80dc5a5167ea3fcf86e9f01220614ad16c0f8eb9fc7b5f0013f16f81e6114e76d76a5979df4986d3a528290d409fccec404e2c959
-EBUILD rtl_433-20.02_p20200327.ebuild 1068 BLAKE2B 33b648fc425bdedf4098cf735df6e81033e7fa898c54050309973695ecc22af2d80950300d7a5f12a988828b857cd98db9566ae7927827cd8ecc2f6879a68872 SHA512 ab2e97530f0c0a046d2ba26a1a6937cf76d7990ce42505e1e2f74f384a684243d90cd71c2ef5015d1278b2ccc10e0d96625a6b9a34c00490afc7cc7c7f46f295
-EBUILD rtl_433-9999.ebuild 1068 BLAKE2B 33b648fc425bdedf4098cf735df6e81033e7fa898c54050309973695ecc22af2d80950300d7a5f12a988828b857cd98db9566ae7927827cd8ecc2f6879a68872 SHA512 ab2e97530f0c0a046d2ba26a1a6937cf76d7990ce42505e1e2f74f384a684243d90cd71c2ef5015d1278b2ccc10e0d96625a6b9a34c00490afc7cc7c7f46f295
-MISC metadata.xml 480 BLAKE2B 981c663d0bf6138305e869fa5c2c2486a92fae661a5f8700241350db57ad9da12a6d271a36603f895cff902d726243ffa647fada5cb1d02358eff5fee24b14a9 SHA512 23de623b5ecaaaa8bdca0a1b9e73194f26b039cfc547e64afcef865f2a52c40553a5560f420b9c4db6c32e858c6c3d48dc66248743916ebed83744eda7b072dd
+DIST rtl_433-20.02_p20200922.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4
+EBUILD rtl_433-20.02_p20200922.ebuild 1064 BLAKE2B 00aca84b3bb114c63e95dd015ed2905fd9e88cca4ff36dae773a0b82584bf6fe5ab14ee4f8909b1fd42d6acd27aed51b44c592983831759c1b60f814575f216e SHA512 e603a15c4362e40ca20cbd3adfd9318cab22e24618039a776ce81357ae88584eac6c6bce2225b1885d3cb94496c75e7bdd873bf97fe623432f76282373409604
+EBUILD rtl_433-9999.ebuild 1064 BLAKE2B 00aca84b3bb114c63e95dd015ed2905fd9e88cca4ff36dae773a0b82584bf6fe5ab14ee4f8909b1fd42d6acd27aed51b44c592983831759c1b60f814575f216e SHA512 e603a15c4362e40ca20cbd3adfd9318cab22e24618039a776ce81357ae88584eac6c6bce2225b1885d3cb94496c75e7bdd873bf97fe623432f76282373409604
+MISC metadata.xml 483 BLAKE2B 9e8acd25e8e0234d628267907ac17b9613349d9263a2b59dee400cb6a0fa202e4e9373dbb65fb05fd53ca03ac2734b8bec78d3dfecac652d401fa79508d2cff4 SHA512 a040362e74c0d7f41185d0d4d45d2e3055151090276d77647f47d41031487d8648fdc727fb61b283cf415737ed9fd0bd1753c594138582866e67b662b0c78222
diff --git a/net-wireless/rtl_433/metadata.xml b/net-wireless/rtl_433/metadata.xml
index 0d857348a304..2d1d33ef0ae0 100644
--- a/net-wireless/rtl_433/metadata.xml
+++ b/net-wireless/rtl_433/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <use>
     <flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
-    <flag name="soapy">Build with SoapySDR support</flag>
+    <flag name="soapysdr">Build with SoapySDR support</flag>
   </use>
   <upstream>
     <remote-id type="github">merbanan/rtl_433</remote-id>
diff --git a/net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild b/net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild
deleted file mode 100644
index b952620e854e..000000000000
--- a/net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Decode OOK modulated signals"
-HOMEPAGE="https://github.com/merbanan/rtl_433"
-if [[ $PV == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
-	KEYWORDS=""
-else
-	COMMIT="496f82b54b8957dbdd1bb60a080aeccfd31da73e"
-	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+rtlsdr soapy"
-
-DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= )
-	soapy? ( net-wireless/soapysdr:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_RTLSDR="$(usex rtlsdr)"
-		-DENABLE_SOAPYSDR="$(usex soapy)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${ED}/usr/etc" "${ED}/" || die
-}
diff --git a/net-wireless/rtl_433/rtl_433-20.02_p20200327.ebuild b/net-wireless/rtl_433/rtl_433-20.02_p20200922.ebuild
index 610e9924f290..c5ce6b6c42a2 100644
--- a/net-wireless/rtl_433/rtl_433-20.02_p20200327.ebuild
+++ b/net-wireless/rtl_433/rtl_433-20.02_p20200922.ebuild
@@ -11,9 +11,8 @@ HOMEPAGE="https://github.com/merbanan/rtl_433"
 if [[ $PV == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
-	KEYWORDS=""
 else
-	COMMIT="f82c02561dcde055143903d0f65257eb3211d45b"
+	COMMIT="105342a33271bac6837d06aa86c23eec9e9ecb6a"
 	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	#SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -22,17 +21,17 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+rtlsdr soapy"
+IUSE="+rtlsdr soapysdr"
 
 DEPEND="rtlsdr? ( net-wireless/rtl-sdr:=
 			virtual/libusb:1 )
-	soapy? ( net-wireless/soapysdr:= )"
+	soapysdr? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
-		-DENABLE_SOAPYSDR="$(usex soapy)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild
index 610e9924f290..c5ce6b6c42a2 100644
--- a/net-wireless/rtl_433/rtl_433-9999.ebuild
+++ b/net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -11,9 +11,8 @@ HOMEPAGE="https://github.com/merbanan/rtl_433"
 if [[ $PV == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
-	KEYWORDS=""
 else
-	COMMIT="f82c02561dcde055143903d0f65257eb3211d45b"
+	COMMIT="105342a33271bac6837d06aa86c23eec9e9ecb6a"
 	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	#SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -22,17 +21,17 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+rtlsdr soapy"
+IUSE="+rtlsdr soapysdr"
 
 DEPEND="rtlsdr? ( net-wireless/rtl-sdr:=
 			virtual/libusb:1 )
-	soapy? ( net-wireless/soapysdr:= )"
+	soapysdr? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
-		-DENABLE_SOAPYSDR="$(usex soapy)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/soapy_power/Manifest b/net-wireless/soapy_power/Manifest
index 2b3ec354212c..19f1cf1bbc5c 100644
--- a/net-wireless/soapy_power/Manifest
+++ b/net-wireless/soapy_power/Manifest
@@ -1,4 +1,4 @@
 DIST soapy_power-1.6.1.tar.gz 14672 BLAKE2B 7cc16fed02a02f91cb62d3937a1cf73144f8a427acbba1bacf4c8949f8d270d7bf5a443ddd227b0a53183d79f62fa2fc5e13f67ac188dfc3a2a385d22634076a SHA512 19aa0e80a7b67cb29d842343c09b8ca2e3068583c8117a8151c5b47f1a34369f0ec833f038595323712986c9348b14a43dc1fdc6516adb40de6b42a281d782e1
-EBUILD soapy_power-1.6.1-r1.ebuild 808 BLAKE2B b45a557051820c09d012684a692df98e263fb4f0c6971e0985114dce3effc7b74d82256ff59dcf67b502505925eea59495feb18df793c4b16286862e55fb5bc1 SHA512 a43485212cf1ea88c78ccbcb88938cabdbb81eeacae66fad07cd972bbe63543ba2e0012c76a4c4cfff59bcf76210728114fadd8cf33e7631876da274b99be721
-EBUILD soapy_power-9999.ebuild 808 BLAKE2B b45a557051820c09d012684a692df98e263fb4f0c6971e0985114dce3effc7b74d82256ff59dcf67b502505925eea59495feb18df793c4b16286862e55fb5bc1 SHA512 a43485212cf1ea88c78ccbcb88938cabdbb81eeacae66fad07cd972bbe63543ba2e0012c76a4c4cfff59bcf76210728114fadd8cf33e7631876da274b99be721
-MISC metadata.xml 609 BLAKE2B 5e2c28479b7a0aa5217b53274eaf016a8184843cf7a86120a1d3c0f0a069f5d5b507defd0eb9a118bb451d118be2f7483b9241f59af8ea34e3b48c9236a402e8 SHA512 a9d538ff6255f8b7b170930541004fd29390452a658f97602bb033cae736b2059272768c81d6701f6f1312b13388ac542208bf6f109e03e66e27ec5911911ad7
+EBUILD soapy_power-1.6.1-r1.ebuild 810 BLAKE2B 490a45da0602b582dd33648dd268d495bd368caaf796963316eae409691a4087563a61a94dbfbe1ef6f085f384d80912677ab86c1d7041c03a4fdcc409638202 SHA512 463a7c5224f52482b1118572c7a1818ba6a541ca94db9652d97c72c0aee787008962db1a0d454ac9366fd07bfb71f614c6d5f6e19df4e23d266a97b11aab5169
+EBUILD soapy_power-9999.ebuild 810 BLAKE2B 490a45da0602b582dd33648dd268d495bd368caaf796963316eae409691a4087563a61a94dbfbe1ef6f085f384d80912677ab86c1d7041c03a4fdcc409638202 SHA512 463a7c5224f52482b1118572c7a1818ba6a541ca94db9652d97c72c0aee787008962db1a0d454ac9366fd07bfb71f614c6d5f6e19df4e23d266a97b11aab5169
+MISC metadata.xml 611 BLAKE2B d58da42c4d6e535ea11a306f3c684fb173a1b406aa892a4636052b2e5f0ebff95f4fc2fb405b1e02ccf859387b59ee944dab5df51141ca975abd890a0d5399aa SHA512 5805b94476aebdafe5242c63d7d192daec8bb19df05d04d6983cf4950da55974f2b19ccbd6af12561795bc519b869f52b8bb2fba5a7d6ec0dae34231c4c1ba9f
diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml
index e93f0c7982e8..5a4e0cc6cf6b 100644
--- a/net-wireless/soapy_power/metadata.xml
+++ b/net-wireless/soapy_power/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Radio</name>
 	</maintainer>
 	<use>
-		<flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag>
+		<flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag>
 		<flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
 	</use>
 	<upstream>
diff --git a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
index 6daef0f42e7b..fd1472590b6c 100644
--- a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
+++ b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild
@@ -27,5 +27,5 @@ DEPEND=""
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/simplespectral[${PYTHON_USEDEP}]
 	>=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
-		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
 		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild
index 6daef0f42e7b..fd1472590b6c 100644
--- a/net-wireless/soapy_power/soapy_power-9999.ebuild
+++ b/net-wireless/soapy_power/soapy_power-9999.ebuild
@@ -27,5 +27,5 @@ DEPEND=""
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/simplespectral[${PYTHON_USEDEP}]
 	>=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}]
-		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
 		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/soapyuhd/Manifest b/net-wireless/soapyuhd/Manifest
index eb706df9ca50..7af323a2bfa4 100644
--- a/net-wireless/soapyuhd/Manifest
+++ b/net-wireless/soapyuhd/Manifest
@@ -1,4 +1,4 @@
-DIST soapyuhd-0.3.6.tar.gz 32894 BLAKE2B 479be969cd07e965f0d324778e8943830d655516e2ef407e61b99bc890096bf37efe083dec3862716cdfdecff9c7fc79eaf19f335d30ff08ae831b8aa7ebff2b SHA512 8bb2a5538ed869a93eb7dfac3d9213efa6af9761ab3a5977cdfc8de5763d969cf2b838320dad99c2c9f91284a2fdc0b686e99ae368f2e79bbb8597605118357f
-EBUILD soapyuhd-0.3.6.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
-EBUILD soapyuhd-9999.ebuild 644 BLAKE2B c6b31b854ed82c410704cbabe69d0752674b3a0fff8cd8116aeeaf77f726605016983fde94f7c7969c3682d770b4324e123954b714c8ee4728e45c1b5ee5dcdb SHA512 d568698b88819a0517a2a0fba65b704e4a74ed21650acdd414b901e9f88abe65bf577f6953e5f27217b7e3be3bf648e9c979303654a3bde0eff2d00f9fa6b263
+DIST soapyuhd-0.4.0.tar.gz 33794 BLAKE2B f18e52c0a80b7eac353ebe74c477e2d5fe18a92824c6ff28bf64ff8e31582c76f4da4c4351592aa9566bc25f533bb42d9694de7939e25cf1f510e25b2d25f1fa SHA512 f94092e18d7d555516bfa27f81c5d36f748394e9699c28b0d17050c3e1848f193e86373fff22e35757189e903732dde98ac2609c9aa043cbf142b9ef923ca577
+EBUILD soapyuhd-0.4.0.ebuild 647 BLAKE2B c42fbde9347a494e07be7f33e34eb7b4efb9d53deef73409aa206e417e6969a5e5ad5568ebc712467631d5a730fa317fd156e6bc49dfebacc790036b28b7b70b SHA512 f60a4c44d5f66c2034f9c947e7e7b3c064c9f3893a36e9c43a8d2c17c95a5aec4a524957d1833ef9f28f32c077db4821e079bb8092a91326cd0c0f4134ac8139
+EBUILD soapyuhd-9999.ebuild 638 BLAKE2B 70c6888e6371fe7e0608761d711c63c41dff53acd3642e487d5ef6e76ee885c32b69cac3e831c7bc4b7aa002a5930f3daa4715d4f9249abaffa50e0c70b3eb6f SHA512 f266c7f7c01056b7db17185558bcb7900e0b047a816bf40617886b62807825f8804a3c1e889f40d606756e307fa4b4a9182de07182ecac6099fc8a233c9f2e8e
 MISC metadata.xml 430 BLAKE2B 583986bcf088a9cfcda635a68fef35c98ad5d5504be93f03b1034936930b38a81f3a952f1a33409a71406b3178cccb98afac8c3dafef670cbda3383830d1c22d SHA512 31ca3b4aff913064ad156b644b1598cc3412d818cf0b67607b222770852e98fc1e4d5e164d053088bd53bdffe9f394a279a1525dabfa3f22db972bc5099101f6
diff --git a/net-wireless/soapyuhd/soapyuhd-0.3.6.ebuild b/net-wireless/soapyuhd/soapyuhd-0.4.0.ebuild
index 16bc1bdb9fba..fe30d10c1962 100644
--- a/net-wireless/soapyuhd/soapyuhd-0.3.6.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Soapy SDR plugins for UHD supported SDR devices "
 HOMEPAGE="https://github.com/pothosware/SoapyUHD"
@@ -21,6 +21,6 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="net-wireless/soapysdr:=
-		net-wireless/uhd:=
+		<net-wireless/uhd-4.0.0.0:=
 		dev-libs/boost:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyuhd/soapyuhd-9999.ebuild b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
index 16bc1bdb9fba..d86411cd4706 100644
--- a/net-wireless/soapyuhd/soapyuhd-9999.ebuild
+++ b/net-wireless/soapyuhd/soapyuhd-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Soapy SDR plugins for UHD supported SDR devices "
 HOMEPAGE="https://github.com/pothosware/SoapyUHD"
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index 541bcf9643a4..21536cac2cdf 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,6 +1,6 @@
 DIST srslte-19.09.tar.gz 2372283 BLAKE2B 8d3b3cdfe777824c30e570f61ffddd1a9b1fd8136b6f67c2d54cbcfe089a1f55cc56d5b02ddb983c8a3e96af4228509b17a3c816b2d5196bc87bae29e14a625f SHA512 3516bb4aa027437420509eeca98e30f8f5c2bc7f8f1a606309587b70b51f2e6712c605155ec76a38868bf4c1f9007641c8c5b986c1cda76486bf3c4788eed888
-DIST srslte-20.04.1.tar.gz 7852357 BLAKE2B 1a9f4064c39fb09d155d0fef7de77f2277528296f749a8cef42624d0dd68a3e957eabceea44d74a1c5a4b28bf6e89f10dbf4b91a4b35ef197e07c36863277167 SHA512 0c55fc5f29a419c74c1bdbf94f63d0296341a1691faac9bf1e862d1b8afd207807907d376efc49513bb0f0e4f8fa6ef16fa8785d203a454824b33652788b5d2f
+DIST srslte-20.04.2.tar.gz 7852105 BLAKE2B f9c7a5d83ee5e1cde0ad74775e504a8fe332e829343f64019b8f4d8f52cb001c29e5c0b611776db88a2c8338fa00ecdaccfc45e06fc8669554a326efd20f0a8d SHA512 2db146ab30e19fe2027252d5f4fd8c52385923e24d721f4deee01a99b8fbb9b03758997bc336fb0773e0633f0cdf1fa769e3f251e7b02b18a8f0e2d6d25e42d7
 EBUILD srslte-19.09-r2.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
-EBUILD srslte-20.04.1-r1.ebuild 1347 BLAKE2B 1dcd99948780ebff4ed51e10cc8807bdd94907e25268f8cd9504a5160344997dea2c0a04ac5c10d5197a4cad60b5d81a55e0d3115aec37829e3ca150da18e82e SHA512 eaf90de135182158f2ea36e169feeec77c0c3ff8374e9d0e72667c64c8ede8d589e3c29ad85d4bf790481a545fa4845d1fb0b71ac680c8d5c6e9a31089e8b737
+EBUILD srslte-20.04.2.ebuild 1275 BLAKE2B a25c0fadfd891f1d228782fc07d11e04427fcae2b0c8b24bf3f6d510f02c4e3c00d817967f4929cafddd02014fe2be62787f4038fb913ea89e50cd1afadbf905 SHA512 82e0cc8bda22f8c9f04139cfbe0b5f1a1ef83dc7ab111ebde208330bc0ae1b68153e987f15ba132c687e555f1c30c0bfbb857219f2cec16abc5593b15bd3c3b8
 EBUILD srslte-9999.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-20.04.1-r1.ebuild b/net-wireless/srslte/srslte-20.04.2.ebuild
index 8bfdf919f31d..1015f72c313f 100644
--- a/net-wireless/srslte/srslte-20.04.1-r1.ebuild
+++ b/net-wireless/srslte/srslte-20.04.2.ebuild
@@ -13,12 +13,11 @@ if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git"
 else
 	inherit vcs-snapshot
-	#This version has not earned keywords:
-	#https://github.com/srsLTE/srsLTE/issues/526
-	#https://github.com/srsLTE/srsLTE/issues/527
-	#KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~x86"
 	MY_PV=${PV//./_}
 	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+	#https://github.com/srsLTE/srsLTE/issues/537
+	RESTRICT=test
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index dcc7ba884f91..ea4aa6d929e0 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,6 +1,9 @@
 AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
+AUX uhd-4.0.0.0-tinfo.patch 2163 BLAKE2B b1575290096e85c107772963deaed3f85b8612ad1e1b7b8a800e01d036822e18866cb35249321ad27cfe1c90291894463f0186692f8c20ca8f6ae2242301cc0f SHA512 289c720f465a78f20626c5b17605fe06f33634f225cd3d84834a6fb46448d5e11812fe5997a07141f87f014abb26e3d08afdba0c36335f7640c5db290269439c
 DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
+DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-EBUILD uhd-3.15.0.0-r1.ebuild 3857 BLAKE2B 951e6367365f2fe5e799ee1b8d5509f8adcd2f6a694055a0728bfbe090d010ebadb826f1f5e0d700c3da50d3075c2ef24d1ac44b3c96673a97eff639acb238e9 SHA512 1adaf9d6a7afc1953ecd40eeb47f754fdf10e47ea1aab5561e77dcd2ded6223f4c9414dbf8f1483c8ff32d6ae9cc8e7487c796b796bf3ffafde263fd816270b4
+DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
 EBUILD uhd-3.15.0.0-r100.ebuild 3863 BLAKE2B e8eefa884f15a0caf06f3f2a48b0db779eade762d9fc1acab56e0ee9e798c147f460edb0b4ede70e801e2ac74d1aacc3d39bb52e45b6644590860fadaafeaef8 SHA512 765e9f4f4d45ef666bb82f69ce29204a092f8b95ba167164596dfb9fa87789b419cd03cf67a129a793e54453a8f9d02f7f91a4feddc2c95cd1fa39673cc4267e
+EBUILD uhd-4.0.0.0.ebuild 3806 BLAKE2B 28ac40c940ddb4ac5dc431d5a652e8f6dfd586b8c74110f048d6131b4b1b6d7377eb9052efe32464ae064c16b80e73dedadd66001efe688c822fb05076818ee7 SHA512 1211e67b4cbd0303e51cbe0998c001ddd4dac16670461caee2aa7e308d8201cf0bf833c4ff9a382a1f8c574ec5064971e07dddfa99fd65c3002d5cdb0248ce95
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch
new file mode 100644
index 000000000000..484aa1f9c2f5
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.0.0.0-tinfo.patch
@@ -0,0 +1,42 @@
+diff -Naur host/CMakeLists.txt uhd-4.0.0.0-patched/host/CMakeLists.txt
+--- host/CMakeLists.txt	2020-09-13 15:14:04.000000000 -0400
++++ host/CMakeLists.txt	2020-09-16 10:11:52.266933094 -0400
+@@ -506,6 +506,9 @@
+ if(ENABLE_USB)
+     list(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
+ endif(ENABLE_USB)
++
++LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
++
+ set(UHD_RFNOC_FOUND "TRUE")
+ 
+ configure_file(
+diff -Naur host/examples/CMakeLists.txt uhd-4.0.0.0-patched/host/examples/CMakeLists.txt
+--- host/examples/CMakeLists.txt	2020-09-13 15:14:04.000000000 -0400
++++ host/examples/CMakeLists.txt	2020-09-16 10:12:49.082935381 -0400
+@@ -55,11 +55,11 @@
+ if(CURSES_FOUND)
+     include_directories(${CURSES_INCLUDE_DIR})
+     add_executable(rx_ascii_art_dft rx_ascii_art_dft.cpp)
+-    target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
++    target_link_libraries(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
+     UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
+ 
+     add_executable(twinrx_freq_hopping twinrx_freq_hopping.cpp)
+-    target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
++    target_link_libraries(twinrx_freq_hopping uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
+     UHD_INSTALL(TARGETS twinrx_freq_hopping RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
+ endif(CURSES_FOUND)
+ 
+diff -Naur host/utils/latency/CMakeLists.txt uhd-4.0.0.0-patched/host/utils/latency/CMakeLists.txt
+--- host/utils/latency/CMakeLists.txt	2020-09-13 15:14:04.000000000 -0400
++++ host/utils/latency/CMakeLists.txt	2020-09-16 10:13:55.994938074 -0400
+@@ -25,7 +25,7 @@
+         get_filename_component(name ${source} NAME_WE)
+         add_executable(${name} ${source} ${latency_lib_path})
+     	LIBUHD_APPEND_SOURCES(${name})
+-        target_link_libraries(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES})
++        target_link_libraries(${name} uhd ${Boost_LIBRARIES} tinfo ${CURSES_LIBRARIES})
+     	UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})
+     endforeach(source)
+ 
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-4.0.0.0.ebuild
index 21c29ff40be4..72e82395ade9 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 #not sure why, but eapi 7 fails
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
 
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	app-arch/gzip
 "
 
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch" )
 
 S="${WORKDIR}/${P}/host"
 
@@ -65,9 +65,6 @@ src_prepare() {
 
 	gnome2_environment_reset #534582
 
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-
 	#rpath is set for apple and no one else, just remove the conditional
 	sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
 }
@@ -144,3 +141,9 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}/images"
 }
+
+src_test() {
+	#we can disable the python tests
+	#ctest -E 'py*'
+	PYTHON_PATH=python/ cmake-utils_src_test
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index f8503eddcd41..caed3249824b 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -7,13 +7,15 @@ DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347
 DIST unifi-5.14.22.zip 242779284 BLAKE2B 7056229ff86db56e192c96cc61b9a5c0fba8cd96727a5260af39c5949fe0df49d8bac880ac7e016938e7d7f36b6fa378addef73a08b074e8795898ae3a4ded4f SHA512 4bfa673cea02d014927844fcf4ab97c09581b4b9abe2eab618f388d74f4fa78c294f240beacfdc8a33316a9b73164224f114e28ea202f8b8930927183c11ec88
 DIST unifi-5.14.23.zip 195394703 BLAKE2B ba762712b958f4a784f281419edcd9f7622a4df4881e23a9bbf53b70ca8d9c2dd2452d8b567f1151c7cb7031947fcc0e79193c7b853a23f8faf4235edea62388 SHA512 e29969da15bed74fe24eb7b997c14247f3e8c53cc43021c402365f93cda3b7cc48b9222235770101ab37cdd574eb94d1aba445bc04393b70dac386b7a77cebb9
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.18.zip 182521633 BLAKE2B 1b80396a721125479579275d071765e468aa62f21664b3009398cf91585a9d66a31d0e503c61fffad9dea2ae63e354321205033807530ee60b4da66930ca6def SHA512 83d0fafacda4c0e271d6f3c85dd3e7f4e0faddd43822700d5206c5be3876d470d1417901c29be11c95af2688edd0b269e3758b73de6283be3aa3f7f602ad19fc
 DIST unifi-6.0.20.zip 182776288 BLAKE2B 3b9aca0a7b356a1bab2e9f6af8da21ee43b7c4f14392292a0f25803395a12ad726ad7db46f4c4863841bf9c3cdc973ae5bfdd9e7dc48974494807e6ba15658b8 SHA512 926f78c3f9b3035e09a8592bd52239665fb379d9324ceae42494a55d01325028dd0d09f0692cd23466216958fe51153f2093f747fadbaf9aabd49c450233aae3
+DIST unifi-6.0.22.zip 183238039 BLAKE2B f76b59087922b46ec8db1869b167aeb62b3047e87e4f80de9ed32caa8e1d8210a384dc3ec1f06a59e2aaf740c5247539c215f821290c6c5f5398d05b37fd2fae SHA512 99e510a2c7f13929b436a73b5cb5d8d8ce48cfa4464bc610dd588c2af30cbb0f4b8c0fd8058a2108f2c3f0850f492445f6b1b9c1b6d84bfdb5e2af7cbe261283
+DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881
 EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb
 EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9
 EBUILD unifi-5.14.22.ebuild 1567 BLAKE2B 18e719065dabc0f01e0e9ef1b078e9351e915fef828efb36ce4772226f30d20c4833fff9255e23c59fbbf2e6f77e89423d3a909f0faf2978e86d11f55af70645 SHA512 811b5ab374ff4673916ee7577a48e48638bf0336542e1884e2cefe92d3b8b31d13a69bbb74547b06d0511c832901e8e8388f802a04ec5322671fa360c90d7758
 EBUILD unifi-5.14.23.ebuild 1566 BLAKE2B b41bc9e03b2812566edb82bf3127501cb12df15484045c267c2e47bf1eebdefc740ee978c36e914d3cd1911728b7a4871f2bfb2f90198d38b9c3a771299c4e4e SHA512 a9998d13dda0fd508595d0c53667fec28001c1ee5766422a793f8a512c22a1266933c21f5e6e3b17702f68cd328aa5202f810aa9da020fdd66c88b3e80c30afd
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
-EBUILD unifi-6.0.18.ebuild 1566 BLAKE2B 0d5345ecc947710f6d01332a7f68548eddf65adfc9fe7f385cdb44c8c367d145de4b44b6a3c1b124bb87ff5018aca5760829b19c6a3e011b06c30f1df1628247 SHA512 e0b29cf469c5e96b35d814a46015b0afaf07e925d2eb13ce290318337d273b21f009bb94fce9b2b839e7d3335eff3a332b98e3c1e047db0936b08c752e0a7301
-EBUILD unifi-6.0.20.ebuild 1566 BLAKE2B d7ce4d01f4b58287324f01568f6a5a5810d05c100bc6d8d71efffa31146082dc26c25fb2c7ba9187bde12bb1b440e04af3ff4d7b60aad2fa346f2a90720d2f5e SHA512 2140f9d813804bb533cedc699aff741f1001bae746fae41b17508964600542c5ac7fca9e27d136b37cfe2fe6d4eff9c92eae5ebed3502b3b09e19084b4981002
+EBUILD unifi-6.0.20.ebuild 1565 BLAKE2B c72187a8dfffd38f278f21540784ff62fe881dcc74bb7311e0f9a9171c09d8f19cd1dfa93366f6d7b7dcacef5368a9089c82959736c5179cb75578424f7bd698 SHA512 5e92a24ef3335e6d37a18797e2796374450a6e9adf12174b50c00ab16db1ce8bc87d7d13e11efc2710c9919f0f068e4de0fdc485571a3a530461fa5b16744c59
+EBUILD unifi-6.0.22.ebuild 1566 BLAKE2B c0c5d4420196da1fc8dbb66da2f5ce78b2832d687e36de47df4d90fd83d1fcfec0aafccf7865c4805d3cc198cd4731d07d89507a7205fdb8ae456f09eba03d3b SHA512 de2d1437717378e4a10db19c47ce5c6e6c3a840c35e2aa5f6c15cf2bef860532b258f9ad8220d07b2f8b28bd5be44de99e927a8fdd9c62f8a17988e3e436bb88
+EBUILD unifi-6.0.23.ebuild 1566 BLAKE2B 8d215f37409ce704ab95f64fa14cec750959be590b428c6e527ca820ccc8e6e983f8e137e7dec6e36b9771212cf479a70b2a05696414caf7d37ca66ab63bc850 SHA512 257e0107e1124a5805bee6a5ba21b6b689ee309c72882602a35d6aa056b15fe90605828233cabbe756a7b33ec7bd2ffffc6febbae951c5819593c25ce801a2ae
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.0.20.ebuild b/net-wireless/unifi/unifi-6.0.20.ebuild
index 4516135ff546..82a9960326c5 100644
--- a/net-wireless/unifi/unifi-6.0.20.ebuild
+++ b/net-wireless/unifi/unifi-6.0.20.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/6.0"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-6.0.18.ebuild b/net-wireless/unifi/unifi-6.0.22.ebuild
index 184ee24cc3a2..163cf5c3fb7a 100644
--- a/net-wireless/unifi/unifi-6.0.18.ebuild
+++ b/net-wireless/unifi/unifi-6.0.22.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-2f53410e48"
+RC_SUFFIX="-5cc1d1cd11"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.0.23.ebuild b/net-wireless/unifi/unifi-6.0.23.ebuild
new file mode 100644
index 000000000000..3b3f7c9e3fc3
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.23.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-20b313f50d"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/6.0"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}