From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 net-wireless/Manifest.gz                           | Bin 18406 -> 18222 bytes
 net-wireless/aircrack-ng/Manifest                  |   6 +-
 .../aircrack-ng/aircrack-ng-1.6_p20200519.ebuild   | 119 ---------
 .../aircrack-ng/aircrack-ng-1.6_p20200722.ebuild   | 119 +++++++++
 net-wireless/aircrack-ng/metadata.xml              |   3 +
 net-wireless/airpwn/Manifest                       |   3 -
 net-wireless/airpwn/airpwn-1.4-r2.ebuild           |  44 ----
 net-wireless/airpwn/metadata.xml                   |  11 -
 net-wireless/bladerf/Manifest                      |   6 +-
 net-wireless/bladerf/bladerf-2018.08.ebuild        |   4 +-
 net-wireless/bladerf/bladerf-2019.07.ebuild        |   2 +-
 net-wireless/bladerf/bladerf-9999.ebuild           |   4 +-
 net-wireless/blueman/Manifest                      |   4 +-
 net-wireless/blueman/blueman-2.1.3.ebuild          |   2 +-
 net-wireless/blueman/blueman-9999.ebuild           |   2 +-
 net-wireless/broadcom-sta/Manifest                 |   2 +-
 .../broadcom-sta-6.30.223.271-r5.ebuild            |  94 -------
 .../broadcom-sta-6.30.223.271-r6.ebuild            |  94 +++++++
 net-wireless/chirp/Manifest                        |   6 +-
 net-wireless/chirp/chirp-20200430.ebuild           |  53 ----
 net-wireless/chirp/chirp-20200807.ebuild           |  50 ++++
 net-wireless/chirp/chirp-99999999.ebuild           |  26 +-
 net-wireless/gnuradio/Manifest                     |   7 +-
 net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild  | 281 +++++++++++++++++++++
 net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild   | 228 +++++++++++++++++
 net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild      | 223 ++++++++++++++++
 net-wireless/gnuradio/gnuradio-9999.ebuild         |   8 +-
 net-wireless/gr-iqbal/Manifest                     |   4 +-
 net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild       |   6 +-
 net-wireless/gr-iqbal/gr-iqbal-9999.ebuild         |   6 +-
 net-wireless/hackrf-tools/Manifest                 |   6 +-
 net-wireless/hackrf-tools/files/hackrf_easy_flash  | 162 ------------
 .../hackrf-tools/files/hackrf_easy_flash-r1        | 170 +++++++++++++
 .../hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild  |  49 ----
 .../hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild  |  49 ++++
 net-wireless/hackrf-tools/hackrf-tools-9999.ebuild |   8 +-
 net-wireless/hostapd/Manifest                      |   2 +-
 net-wireless/hostapd/metadata.xml                  |   8 +-
 net-wireless/iwd/Manifest                          |   8 +-
 .../iwd-1.8-eapol-prevent-key-reinstallation.patch |  73 ++++++
 net-wireless/iwd/iwd-1.7-r1.ebuild                 |   2 +-
 net-wireless/iwd/iwd-1.7.ebuild                    |   2 +-
 net-wireless/iwd/iwd-1.8-r1.ebuild                 | 156 ++++++++++++
 net-wireless/iwd/iwd-1.8.ebuild                    |   2 +-
 net-wireless/kismet-rest/Manifest                  |   4 +-
 .../kismet-rest/kismet-rest-2019.05.02.ebuild      |   2 +-
 net-wireless/kismet-rest/kismet-rest-9999.ebuild   |   2 +-
 net-wireless/kismet/Manifest                       |   2 +-
 net-wireless/kismet/kismet-2020.04.3.ebuild        |   2 +-
 net-wireless/kismetdb/Manifest                     |   2 +-
 net-wireless/kismetdb/kismetdb-9999.ebuild         |   2 +-
 net-wireless/kismetmobiledashboard/Manifest        |   4 +-
 .../kismetmobiledashboard-1.5_beta1-r2.ebuild      |  36 +++
 .../kismetmobiledashboard-1.5_beta1.ebuild         |  33 ---
 .../kismetmobiledashboard-9999.ebuild              |   9 +-
 net-wireless/nanovna-saver/Manifest                |   4 +-
 .../nanovna-saver/nanovna-saver-0.2.2.ebuild       |  33 ---
 .../nanovna-saver/nanovna-saver-0.3.7.ebuild       |  33 +++
 net-wireless/rtl-sdr/Manifest                      |   4 +-
 net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild       |   2 +-
 net-wireless/rtl-sdr/rtl-sdr-9999.ebuild           |   7 +-
 net-wireless/soapysdr/Manifest                     |   4 +-
 net-wireless/soapysdr/soapysdr-0.7.1.ebuild        |   8 +-
 net-wireless/soapysdr/soapysdr-9999.ebuild         |   8 +-
 net-wireless/srslte/Manifest                       |   5 +-
 net-wireless/srslte/srslte-19.09-r2.ebuild         |  54 ++++
 net-wireless/srslte/srslte-19.09.ebuild            |  49 ----
 net-wireless/srslte/srslte-20.04.1-r1.ebuild       |  57 +++++
 net-wireless/srslte/srslte-9999.ebuild             |  54 ++++
 net-wireless/ubertooth/Manifest                    |   2 +-
 net-wireless/ubertooth/ubertooth-2018.12.1.ebuild  |   2 +-
 net-wireless/unifi/Manifest                        |  12 +-
 net-wireless/unifi/unifi-5.14.15.ebuild            |  68 -----
 net-wireless/unifi/unifi-5.14.17.ebuild            |  68 -----
 net-wireless/unifi/unifi-5.14.22.ebuild            |  68 +++++
 net-wireless/unifi/unifi-5.14.23.ebuild            |  68 +++++
 net-wireless/unifi/unifi-6.0.13.ebuild             |  68 +++++
 net-wireless/unifi/unifi-6.0.15.ebuild             |  68 +++++
 net-wireless/wireless-regdb/Manifest               |   2 +-
 net-wireless/wireless-regdb/metadata.xml           |   3 -
 net-wireless/wireless-tools/Manifest               |   2 +-
 .../wireless-tools-30_pre9-r1.ebuild               |   2 +-
 82 files changed, 2075 insertions(+), 892 deletions(-)
 delete mode 100644 net-wireless/aircrack-ng/aircrack-ng-1.6_p20200519.ebuild
 create mode 100644 net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
 delete mode 100644 net-wireless/airpwn/Manifest
 delete mode 100644 net-wireless/airpwn/airpwn-1.4-r2.ebuild
 delete mode 100644 net-wireless/airpwn/metadata.xml
 delete mode 100644 net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
 create mode 100644 net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
 delete mode 100644 net-wireless/chirp/chirp-20200430.ebuild
 create mode 100644 net-wireless/chirp/chirp-20200807.ebuild
 create mode 100644 net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
 create mode 100644 net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
 create mode 100644 net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
 delete mode 100755 net-wireless/hackrf-tools/files/hackrf_easy_flash
 create mode 100644 net-wireless/hackrf-tools/files/hackrf_easy_flash-r1
 delete mode 100644 net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
 create mode 100644 net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
 create mode 100644 net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
 create mode 100644 net-wireless/iwd/iwd-1.8-r1.ebuild
 create mode 100644 net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild
 delete mode 100644 net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1.ebuild
 delete mode 100644 net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
 create mode 100644 net-wireless/nanovna-saver/nanovna-saver-0.3.7.ebuild
 create mode 100644 net-wireless/srslte/srslte-19.09-r2.ebuild
 delete mode 100644 net-wireless/srslte/srslte-19.09.ebuild
 create mode 100644 net-wireless/srslte/srslte-20.04.1-r1.ebuild
 create mode 100644 net-wireless/srslte/srslte-9999.ebuild
 delete mode 100644 net-wireless/unifi/unifi-5.14.15.ebuild
 delete mode 100644 net-wireless/unifi/unifi-5.14.17.ebuild
 create mode 100644 net-wireless/unifi/unifi-5.14.22.ebuild
 create mode 100644 net-wireless/unifi/unifi-5.14.23.ebuild
 create mode 100644 net-wireless/unifi/unifi-6.0.13.ebuild
 create mode 100644 net-wireless/unifi/unifi-6.0.15.ebuild

(limited to 'net-wireless')

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 90069bde7328..749f2282331d 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index bb64db5a2426..1e699386b85c 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,8 +1,8 @@
 DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5
 DIST aircrack-ng-1.6.tar.gz 7933308 BLAKE2B c4cacdc9b767789a7b2426857831c1f8166d3f2e11a71cffc1466f2d4006552dfe420a50e0085f3c74fbdc23770309bb81d49e0c5372b0e4a8fa5e294c16d942 SHA512 df65ec3032ff20dc4aae4921e6a9c330a51b5df89af02d4c6fbf691fcfade21658b1a2d5de286a7e729dc6fb740f6fd4e6b6f53649486ef64bc3d00d81a95bd5
-DIST aircrack-ng-1.6_p20200519.tar.gz 7598576 BLAKE2B b34f5fca831d253503dcd28f84a9386b9fae68469e7965ca54af2b85daf6dee5ebd5973fc1d08428c52ac936544e48bf422b50ca8873637ac6f20d47037b5498 SHA512 5c0059869e2ee8927f0faa9e8194563f76297ba9e3de46e68acfa433cdfe97977d084277713ab17504295f7038880535a34f295e9d3fe70fd55505ee82801ac2
+DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
 EBUILD aircrack-ng-1.5.2.ebuild 2893 BLAKE2B a93ce214ad665bbf50e7d08bb1250731e2993437592fa6db39b1a207090ec4264e6f8b8b51d6a4f6f97b972250d0abb2afd5b23394899ae3075464939ef4a5ce SHA512 7797d00f2128120e5755a023903f6677c83face85d31053b71e9a11f73fcb2f64069464727aae58c6a234ad1fe673a987afe49c9271a191dd5cf0420b6f43572
 EBUILD aircrack-ng-1.6-r1.ebuild 2952 BLAKE2B fc5540b4faa82f0b88f279c32650d7eabc506e150960028d59786afcc2b9a0dda5198f12d9858bb029e6850f9a9e45f813269eb810d660dcf416ddce244b7496 SHA512 1554f875c73f68a25352437bbd11021c713e9174572cf8c6f88d3959cbbfeccf91920644054b6f207acd7903a0d06c37456273eca23de4114ae1ac7da2b26c56
-EBUILD aircrack-ng-1.6_p20200519.ebuild 3113 BLAKE2B 3897c60a9d2b5bf1160847948dc25fd1da03d98cf81588063549c2304c0ce1bf791302d56804c060d4c7a7f51623bda3381f7e28b7834d710e9f94516f855a4c SHA512 e12c84d8e35189df7fa9b00b9c47b1f6484d4bda034744a2abfeb384f832df24f1552a8499581728d752f364db7fc45c7141899a4e3b9dd0ccfb86791e6d5f07
+EBUILD aircrack-ng-1.6_p20200722.ebuild 3113 BLAKE2B fd379315b4a038fcfaf46b0d179c506fca602b83476eb3c16a2fe42a672a0ba63cae9555fc4c5ecdfaa1654d8c00cab10a142d6412a78d887280e6000cdcaa3f SHA512 5266db58d5dad326a7007382319ac83dd9c4bbae731bbee23216a763c3d7470916e7d424f5bcd2be2d02b432fb6d34edcabf6a70c63d1290df91c54e4dfe793e
 EBUILD aircrack-ng-9999.ebuild 2952 BLAKE2B fc5540b4faa82f0b88f279c32650d7eabc506e150960028d59786afcc2b9a0dda5198f12d9858bb029e6850f9a9e45f813269eb810d660dcf416ddce244b7496 SHA512 1554f875c73f68a25352437bbd11021c713e9174572cf8c6f88d3959cbbfeccf91920644054b6f207acd7903a0d06c37456273eca23de4114ae1ac7da2b26c56
-MISC metadata.xml 936 BLAKE2B 1e62943b6dbb382d972c07ec810b332be4e9e949b025450bdcc6380f129c463c5dc370a476bb3db64172e8ac319b93361ce0cc1cd71d2072acb5a0891413ebf7 SHA512 6fc72c61abbddf6019c5a3610e422d24cd0d915e98789b411c978b54c61b4d6c50224a5d0905b25520f27067245327dd10ad3cada1d0a316d66b18ed9fc3016e
+MISC metadata.xml 1024 BLAKE2B c7f31132d721d72f926098b5a85d4cab21ac4fdbd63e75c15485eb4dd62264061ab4173628e05ddde74523a0557fd905a6dc008305f26c7f65416f92b70a4f4b SHA512 e51a08063ed89d55ba02aef49d249fc18adb03026726230faddf661f55f709a37520c68e632ae2996955f837651309a6d83bdcbad775a540d0a2f1aeddbfee72
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200519.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200519.ebuild
deleted file mode 100644
index dfd72571efe0..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200519.ebuild
+++ /dev/null
@@ -1,119 +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,8} )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-else
-	#SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	COMMIT="225993949cd1c8228227ab4e6d315538a908c101"
-	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	sys-apps/hwloc:0=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}"
-PDEPEND="kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		STATIC_LIBDIR_NAME="$(get_libdir)" \
-		--disable-asan \
-		--enable-shared \
-		--disable-static \
-		--without-opt \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3)
-}
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	default
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	# we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-	find "${D}" -xtype f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
new file mode 100644
index 000000000000..1665bc26c60f
--- /dev/null
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_OPTIONAL=1
+
+inherit toolchain-funcs distutils-r1 flag-o-matic autotools
+
+DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
+HOMEPAGE="http://www.aircrack-ng.org"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
+else
+	#SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
+	COMMIT="5a02ac4818b30d2e87b3e18e497a5f9e5319394f"
+	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
+
+DEPEND="net-libs/libpcap
+	sys-apps/hwloc:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	netlink? ( dev-libs/libnl:3 )
+	pcre? ( dev-libs/libpcre )
+	airdrop-ng? ( ${PYTHON_DEPS} )
+	airgraph-ng? ( ${PYTHON_DEPS} )
+	experimental? ( sys-libs/zlib )
+	sqlite? ( >=dev-db/sqlite-3.4 )"
+RDEPEND="${DEPEND}"
+PDEPEND="kernel_linux? (
+		net-wireless/iw
+		net-wireless/wireless-tools
+		sys-apps/ethtool
+		sys-apps/usbutils
+		sys-apps/pciutils )
+	sys-apps/hwids
+	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		STATIC_LIBDIR_NAME="$(get_libdir)" \
+		--disable-asan \
+		--enable-shared \
+		--disable-static \
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
+}
+
+src_compile() {
+	if [[ $($(tc-getCC) --version) == clang* ]] ; then
+		#https://bugs.gentoo.org/show_bug.cgi?id=472890
+		filter-flags -frecord-gcc-switches
+	fi
+
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_compile
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	default
+
+	if use airgraph-ng; then
+		cd "${S}/scripts/airgraph-ng"
+		distutils-r1_src_install
+	fi
+	if use airdrop-ng; then
+		cd "${S}/scripts/airdrop-ng"
+		distutils-r1_src_install
+	fi
+
+	# we don't need aircrack-ng's oui updater, we have our own
+	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+	find "${D}" -xtype f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	# Message is (c) FreeBSD
+	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
+	if use kernel_FreeBSD ; then
+		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
+		einfo "mode of your wireless card.  So do not care about what the manpages say about"
+		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
+		echo
+		einfo "To return from monitor mode, issue the following command:"
+		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
+		einfo
+		einfo "For aireplay-ng you need FreeBSD >= 7.0."
+	fi
+}
diff --git a/net-wireless/aircrack-ng/metadata.xml b/net-wireless/aircrack-ng/metadata.xml
index c08472be5bcd..23f17220a3fe 100644
--- a/net-wireless/aircrack-ng/metadata.xml
+++ b/net-wireless/aircrack-ng/metadata.xml
@@ -21,4 +21,7 @@
 	<flag name="experimental">Build the "experimental" tools which may randomly fail to run properly</flag>
 	<flag name="netlink">Use netlink for channel control instead of WEXT</flag>
 </use>
+	<upstream>
+		<remote-id type="github">aircrack-ng/aircrack-ng</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/airpwn/Manifest b/net-wireless/airpwn/Manifest
deleted file mode 100644
index 9dbc3441cee9..000000000000
--- a/net-wireless/airpwn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST airpwn-1.4.tgz 910109 BLAKE2B e1e151183e29310a2f35e869fec5f191c37bf25f3bca3f084bea060fad6a8c575cb5ddb56cd5023c252a298b5205c844597908296c6c0b61c8bd560a20b60145 SHA512 c849740848289005eb2a72b09bbfade6bf078a3ff93d39300f6a65d328c527bbafbb2a325f2813064612f91a2da20a2daacb8508497e8410ad0befc4e28331e5
-EBUILD airpwn-1.4-r2.ebuild 967 BLAKE2B c7dc0edc08f632c878bb83ae617ceb5d096afdc4dc0817c16986d4e5d1c42187a1a6c1b3396c8b917574d5aff220fce01d0122fa6c28f845685848ef464285fd SHA512 9f6ff2b4f1d595c701533329d55c74c8a76a6712b6268b546af7fd8da85d7372776a7d7ee0a8d403fc58f6557f7c3767f43c0490805a9d82368d012a605a7ac2
-MISC metadata.xml 333 BLAKE2B 193a48fb68fec9fe4d5b24700647e5deacbad5f02cb229ce07e556028475e6233978afbe3b89b4c8972fddd624c3837b304b4dc888258b6b21bd83a982b3f34a SHA512 66a2e0bbf61c8cbc201d159e067468a77c14588e9567b1cef03c7ac5e2a333561c98f20346d05e20c0a8ce3036905ec507ff9234bab33ef9629ef14916042438
diff --git a/net-wireless/airpwn/airpwn-1.4-r2.ebuild b/net-wireless/airpwn/airpwn-1.4-r2.ebuild
deleted file mode 100644
index 4c695a11a24a..000000000000
--- a/net-wireless/airpwn/airpwn-1.4-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 vcs-clean
-
-DESCRIPTION="Tool for generic packet injection on 802.11"
-HOMEPAGE="http://airpwn.sf.net"
-SRC_URI="mirror://sourceforge/airpwn/$P.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/libpcre
-	dev-libs/openssl:0=
-	net-libs/libnet:1.1=
-	net-libs/libpcap
-	net-wireless/lorcon-old"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf
-	sed -i "s/python2.4/${EPYTHON}/g" conf.h || die
-	sed -i "s|-lorcon -lpthread -lpcre -lpcap -lnet|-lorcon -lpthread -lpcre -lpcap -lnet -lcrypto -l${EPYTHON}|g" Makefile  || die
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		ecvs_clean
-		sed -i "s#content/#/usr/share/${PN}/content/#" conf/* || die
-		doins -r conf content
-	fi
-}
diff --git a/net-wireless/airpwn/metadata.xml b/net-wireless/airpwn/metadata.xml
deleted file mode 100644
index 90013f58cbfb..000000000000
--- a/net-wireless/airpwn/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="sourceforge">airpwn</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index a8a8a6ed1130..2be754880225 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,7 +1,7 @@
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
 DIST bladerf-2018.08.tar.gz 2177625 BLAKE2B 8c3970f38f7645ba46c44803fc370e16012b2ea894d16c5101ea9519f5f9ff1aaa0a39819ac13389a33f7e0336e0e89ffcb7a0abf363cb30b091e88502a7a8c3 SHA512 7f8d0ef146da34474774d00503f0838cdf9404bf42bf1f68fd0f6018c7e7d4937da56110d818237f712bd23547cfbed1e2d04455a9d4d7ac0df96336e331c8f4
 DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
-EBUILD bladerf-2018.08.ebuild 1311 BLAKE2B cf2b8db17bbb3522047bbc35000be8c98730e35da0bb34b88a7ce9f2eafa43a9bd71f3a0dccd03914fd0c3afc05aec31418e7946ec197908f54d3bee3a6f5861 SHA512 5be9b57e483236e7ed5705bb7e25db73b3980bf4973843313629852caf317b533747a348bbcc800302002b1ea79d9febae57e476a6f481afec1767aba500a73d
-EBUILD bladerf-2019.07.ebuild 1666 BLAKE2B 9308ae3a2a2c0be187b80dcce9222174f9773f1a4e68bbdebb418ea9f36172094e0f3f371fa7ed2c8f2e1ee4904b468120a9e6522ae70ef45c88e51af097daff SHA512 e46b0628b56d8ad7401cc7345223040253f275e36623bfbcbe25630e866ab23855429c4944df2078b6dd647fc48da9519e5e2495c2143fbb333b09ea115945e6
-EBUILD bladerf-9999.ebuild 1659 BLAKE2B 5937acb9339f29c5108e3071c0788d71f71e31154623cb09f0111ebc030c63fd0e56f8f69b6d4c2df865579d8ce0b810219e4f46ea706985ed432b825079eb6c SHA512 c324f981e1337ac70fef9067ef22fc4afbb87da084627c3ebc263e6eba7c02146664301f03b01b8408a4e39f243471de8fcdb27ce08077d989ec279034ea6f90
+EBUILD bladerf-2018.08.ebuild 1309 BLAKE2B b11a4ddf301c0c8b4c722cfdbf71d43a1b35202499f9abd48d48bf1da365801fd15107f40a3ac5d0fc084de218b7b83dbc33959f4e7539f02035cdf4b371447d SHA512 d51f7e9f7e8cfb3b82224803de35ebf59f95d18c201dd94dd65a2ff20fda71e96b79bc2ff7a486d39536d4b8412c9355923a1eb69bea9bd7922e635ae4d2fa0a
+EBUILD bladerf-2019.07.ebuild 1667 BLAKE2B 748da9575b2bd878c370e94d11ffa616cd68221a55079a4159ba15819d1548036d0923990cc4cbdfe601f08b2b09c7edd3c3c6241e10ef1ef60139f7164822b5 SHA512 419431abc6107275cff0b3211db4a4d8df362d12bab80740d5359a57226ec1f3bb38385d1bf27c2d4432045d02c93f4a2fb2887350740d743f6ebb2a0d59668b
+EBUILD bladerf-9999.ebuild 1660 BLAKE2B 65019f05d47d4c7d8003eecd4bd80a2360dbefb379c09643058c2a464175fe970a47a0f87557a851d06715e291f058e26e08dbfb6b3ceebafc1476d776790f05 SHA512 fd802f70997e4418c803edcb31ba4683c5ef6bcebf49323d3d07e970cb90658dde781811e2a8f543dc3abe749d12ba0d216a5f04f07593bd967d16bfec095f98
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2018.08.ebuild b/net-wireless/bladerf/bladerf-2018.08.ebuild
index f8fd38c19cd7..347d4f4727e9 100644
--- a/net-wireless/bladerf/bladerf-2018.08.ebuild
+++ b/net-wireless/bladerf/bladerf-2018.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils udev
 
 DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://nuand.com/"
+HOMEPAGE="https://nuand.com/"
 
 #lib is LGPL and cli tools are GPL
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
index 3e3abf294171..3672b069b037 100644
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils udev
 
 DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://nuand.com/"
+HOMEPAGE="https://nuand.com/"
 
 #lib is LGPL and cli tools are GPL
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index 686a4ee43c8b..e192ce20c313 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit cmake-utils udev
 
 DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://nuand.com/"
+HOMEPAGE="https://nuand.com/"
 
 #lib is LGPL and cli tools are GPL
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index b98404d1cd3e..5fd55f5bb9e8 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -2,6 +2,6 @@ AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db7
 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 2944 BLAKE2B 16df020fc15b9563b6762510a59919f89dddbb57875dd30c5df0822f635d7b6306b332e37bcc678f4fc123110974b4b5ecde3bad9d63d0161c1bbda590735247 SHA512 704b8994d9249974e6c80cb169fc97d8f8be913f9ebda4a156fbcdcc67a59e2c0de4787f9f3e9fda6f10feeedc664f197e44a5b5b93823a1625fd8a8bbafdc9b
-EBUILD blueman-9999.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
+EBUILD blueman-2.1.3.ebuild 2945 BLAKE2B 05ebeb5a5bd474b7209d39f9fecd2a0f7fe5b1101cacff197d38f546472fef152fdf8162a197afda12c7b25d8cb9f9cb0aad020a55b6c8d83351a7dc8e0c15f2 SHA512 a57711dfd2eaa8ada2a27b2ce79622bfeb04ed567c2862f6707b832b53b4dd3593e7da9a4db90962417673ff98b790a7e970e817d5d69515629d90e29846ea77
+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.3.ebuild b/net-wireless/blueman/blueman-2.1.3.ebuild
index 28a0cb5e101c..b8777c460fbe 100644
--- a/net-wireless/blueman/blueman-2.1.3.ebuild
+++ b/net-wireless/blueman/blueman-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 8144b23c4cc1..02b2ce337b18 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
diff --git a/net-wireless/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index 7fc2c9df90d5..b209d8f8250d 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -14,5 +14,5 @@ AUX broadcom-sta-6.30.223.271-r5-linux-5.6.patch 3056 BLAKE2B 3842420d177c7faf6a
 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663
 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17
-EBUILD broadcom-sta-6.30.223.271-r5.ebuild 3817 BLAKE2B 4817e0b2188686ba4af9982cfa269898348f25a2d18f1f8547f929fb94f52ae60b95a9fb3e3316500bdf8a5f5556c3ae818b4e5c3a15e87e56292cdfc1150014 SHA512 936c80d538fa007c564a268d2db37cd982c287e5c7be6b31ce4895e38d4cfb5b573750d1b0f0f93a6ebceda19991ff983aef17f5c503d9d8e4be4dfbee93a9e5
+EBUILD broadcom-sta-6.30.223.271-r6.ebuild 3817 BLAKE2B 4817e0b2188686ba4af9982cfa269898348f25a2d18f1f8547f929fb94f52ae60b95a9fb3e3316500bdf8a5f5556c3ae818b4e5c3a15e87e56292cdfc1150014 SHA512 936c80d538fa007c564a268d2db37cd982c287e5c7be6b31ce4895e38d4cfb5b573750d1b0f0f93a6ebceda19991ff983aef17f5c503d9d8e4be4dfbee93a9e5
 MISC metadata.xml 249 BLAKE2B 4a3b51bf90b3ec35dd72dca3b3c73fb89d3e3d08c0989cd7939205ae9d655200886882c2de26146caac3f42ff06ab4a898b85325bd80e69f39491bf4c34ae89e SHA512 4211cb5a85b6a437c0d1727891123af70f296e685c9d59ead2032abbe19d3828fb83d59e559056455ad8b9aadd6136141ab7f9edaff2d55ce2d86b1d698722ce
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
deleted file mode 100644
index b84669a99696..000000000000
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r5.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils linux-info linux-mod
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
-HOMEPAGE="https://www.broadcom.com/support/802.11"
-SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35"
-SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
-	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
-	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
-
-LICENSE="Broadcom"
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="mirror"
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-MODULE_NAMES="wl(net/wireless)"
-MODULESD_WL_ALIASES=("wlan0 wl")
-
-pkg_pretend() {
-	ewarn
-	ewarn "If you are stuck using this unmaintained driver (likely in a MacBook),"
-	ewarn "you may be interested to know that a newer compatible wireless card"
-	ewarn "is supported by the in-tree brcmfmac driver. It has a model number "
-	ewarn "BCM943602CS and is for sale on the second hand market for less than "
-	ewarn "20 USD."
-	ewarn
-	ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and"
-	ewarn "    https://wikidevi.com/wiki/Broadcom_BCM943602CS"
-	ewarn "for more information."
-	ewarn
-}
-
-pkg_setup() {
-	# bug #300570
-	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
-	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
-	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
-	CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS"
-	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
-	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
-	ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
-	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
-	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
-	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
-	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
-	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
-	ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled."
-	if kernel_is ge 3 8 8; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
-	elif kernel_is ge 2 6 32; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
-	elif kernel_is ge 2 6 31; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
-	elif kernel_is ge 2 6 29; then
-		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
-	else
-		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
-	fi
-
-	linux-mod_pkg_setup
-
-	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
-	BUILD_TARGETS="wl.ko"
-}
-
-PATCHES=(
-		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch"
-		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch"
-		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch"
-		"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch"
-)
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc "${DISTDIR}/README-${P}.txt"
-}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
new file mode 100644
index 000000000000..b84669a99696
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils linux-info linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
+HOMEPAGE="https://www.broadcom.com/support/802.11"
+SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_pretend() {
+	ewarn
+	ewarn "If you are stuck using this unmaintained driver (likely in a MacBook),"
+	ewarn "you may be interested to know that a newer compatible wireless card"
+	ewarn "is supported by the in-tree brcmfmac driver. It has a model number "
+	ewarn "BCM943602CS and is for sale on the second hand market for less than "
+	ewarn "20 USD."
+	ewarn
+	ewarn "See https://wikidevi.com/wiki/Broadcom_Wireless_Adapters and"
+	ewarn "    https://wikidevi.com/wiki/Broadcom_BCM943602CS"
+	ewarn "for more information."
+	ewarn
+}
+
+pkg_setup() {
+	# bug #300570
+	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
+	CONFIG_CHECK="~!B43 ~!BCMA ~!SSB ~!X86_INTEL_LPSS"
+	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+	ERROR_BCMA="BCMA: If you insist on building this, you must blacklist it!"
+	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+	ERROR_X86_INTEL_LPSS="X86_INTEL_LPSS: Please disable it. The module does not work with it enabled."
+	if kernel_is ge 3 8 8; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+	elif kernel_is ge 2 6 32; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+PATCHES=(
+		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch"
+		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch"
+		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch"
+		"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
+		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch"
+)
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc "${DISTDIR}/README-${P}.txt"
+}
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 021418417b47..0f7debf5bca7 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
-DIST chirp-daily-20200430.tar.gz 896763 BLAKE2B a0f318499e76ff9c297c4eeff381650d98ea03d20a0d20d7751485376a9299ba0f59aa88340a0f23cdf4bc70f0038b5376c2c78beb3bc593a09f7a7af22b9021 SHA512 f7b0d6d23df2b85d714c2fabefcc32cf5f30ceb7daca6a5982d47962a1fe4d4b210729d0d78cef28af4f21fcfbc9e4d0e6585b5e841220e9f8b5a7fcad1dd2b0
-EBUILD chirp-20200430.ebuild 1147 BLAKE2B eaf2ad93713dbe5900ca388cf84e1beae4d03093fcfbd07fca7a04d857d95d6028fcf2e24d0f77ee06186f190b1862b183af5e21803693f04f31e9b31d779890 SHA512 79b5ca20ec1dc2bdb92c6d24ff496fe0685593fd66dba5c0f8d75660d310dbb6e8e2922d0585ef37bbbd4fe7bad2a827d44fa4ce86eb98a648ad8bd2b94debe1
-EBUILD chirp-99999999.ebuild 1147 BLAKE2B eaf2ad93713dbe5900ca388cf84e1beae4d03093fcfbd07fca7a04d857d95d6028fcf2e24d0f77ee06186f190b1862b183af5e21803693f04f31e9b31d779890 SHA512 79b5ca20ec1dc2bdb92c6d24ff496fe0685593fd66dba5c0f8d75660d310dbb6e8e2922d0585ef37bbbd4fe7bad2a827d44fa4ce86eb98a648ad8bd2b94debe1
+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-20200430.ebuild b/net-wireless/chirp/chirp-20200430.ebuild
deleted file mode 100644
index 461b1ed5328b..000000000000
--- a/net-wireless/chirp/chirp-20200430.ebuild
+++ /dev/null
@@ -1,53 +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"
-fi
-
-inherit distutils-r1 xdg-utils ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="https://chirp.danplanet.com"
-
-RESTRICT="test"
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	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
-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-20200807.ebuild b/net-wireless/chirp/chirp-20200807.ebuild
new file mode 100644
index 000000000000..77faba828a0c
--- /dev/null
+++ b/net-wireless/chirp/chirp-20200807.ebuild
@@ -0,0 +1,50 @@
+# 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
index 461b1ed5328b..48f9b1a77877 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.ebuild
@@ -3,10 +3,18 @@
 
 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}
@@ -14,24 +22,20 @@ inherit distutils-r1 xdg-utils ${SCM}
 DESCRIPTION="Free open-source tool for programming your amateur radio"
 HOMEPAGE="https://chirp.danplanet.com"
 
-RESTRICT="test"
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	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
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="radioreference"
 
 DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
 	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python]"
+	dev-libs/libxml2[python]')"
 RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
+	$(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
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index d2efc6941a65..384de601f8dd 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,10 +1,15 @@
 AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
+DIST 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
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 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-9999.ebuild 6019 BLAKE2B e620da24a69f4b285e34752cac338dff0343a0f77501f8fcd93c76aa860328cc55b8b128ea37fcb6318fcdcb97888edf43dd083f6786cc284ccbafc7fee465f0 SHA512 babb6b819b29a57497b56f555adf45ffc688747dab5f1a19a82297eb1801a5b75a129abda8115d7f5495e675afc2248764002553d5fa47afc2c2c7451b53d1ac
+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
 MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
new file mode 100644
index 000000000000..b85c4e578724
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-1-qt5.tar.xz
+		https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.13-codec2.tar.xz
+		https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint-3.7"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		audio? ( || ( alsa oss jack portaudio ) )
+		alsa? ( audio )
+		oss? ( audio )
+		jack? ( audio )
+		portaudio? ( audio )
+		analog? ( filter )
+		digital? ( filter analog )
+		dtv? ( fec )
+		pager? ( filter analog )
+		qt5? ( filter )
+		uhd? ( filter analog )
+		fcd? ( || ( alsa oss ) )
+		wavelet? ( analog )
+		wxwidgets? ( filter analog )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/orc-0.4.12
+	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	sci-libs/fftw:3.0=
+	alsa? (
+		media-libs/alsa-lib:=
+	)
+	fcd? ( virtual/libusb:1 )
+	jack? (
+		virtual/jack
+	)
+	log? ( dev-libs/log4cpp )
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
+	vocoder? ( media-sound/gsm
+		>=media-libs/codec2-0.8.1 )
+	wavelet? (
+		>=sci-libs/gsl-1.10
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	$(python_gen_cond_dep '
+		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		filter? (
+			|| (
+				sci-libs/scipy-python2[${PYTHON_MULTI_USEDEP}]
+				sci-libs/scipy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		grc? (
+			dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		qt5? (
+			dev-python/PyQt5[opengl,${PYTHON_MULTI_USEDEP}]
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			x11-libs/qwt:6[qt5(+)]
+			dev-qt/qtwidgets:5
+		)
+		utils? (
+			|| (
+				dev-python/matplotlib-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+		wxwidgets? (
+			dev-python/wxpython:3.0[${PYTHON_MULTI_USEDEP}]
+			|| (
+				dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+				dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+			)
+		)
+	')
+	"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	$(python_gen_cond_dep '
+		dev-python/cheetah[${PYTHON_MULTI_USEDEP}]
+		doc? (
+			>=app-doc/doxygen-1.5.7.1
+			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		)
+	')
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	gnome2_environment_reset #534582
+
+	if [[ ${PV} == "9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	epatch "${WORKDIR}"/qt5-maint-00*.patch
+	epatch "${WORKDIR}"/codec2-next-00*.patch
+	epatch "${FILESDIR}"/${PN}-3.7.13.5-boost-1.70-asio.patch
+	epatch "${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch"
+
+	use !alsa && sed -i 's#version.h#version-nonexistant.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistant.h#' cmake/Modules/FindJack.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistant.h#' cmake/Modules/FindPortaudio.cmake
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	#zeromq missing deps isn't fatal
+	python_export PYTHON_SITEDIR
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_WXGUI="$(usex wxwidgets)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DDESIRED_QT_VERSION="$(usex qt5 5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+	ctest -E qtgui
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
new file mode 100644
index 000000000000..ed6d89a7a8fa
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.1.0-r2.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils desktop
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz
+		https://dev.gentoo.org/~fordfrog/distfiles/0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
+	)
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
+			)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+PATCHES=(
+	"${WORKDIR}/0002-boost_qualify_placeholders_with_their_full_namespace.patch"
+)
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test()
+{
+	virtx cmake_src_test
+}
+
+pkg_postinst()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
new file mode 100644
index 000000000000..65be5a358525
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake python-single-r1 virtualx xdg-utils desktop
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
+	EGIT_BRANCH="maint-3.8"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
+
+#RESTRICT="!test? ( test )"
+#Tests are known broken right now
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	audio? ( || ( alsa oss jack portaudio ) )
+	alsa? ( audio )
+	jack? ( audio )
+	oss? ( audio )
+	portaudio? ( audio )
+	analog? ( filter )
+	channels? ( filter analog qt5 )
+	digital? ( filter analog )
+	dtv? ( filter analog fec )
+	modtool? ( utils )
+	qt5? ( filter )
+	trellis? ( analog digital )
+	uhd? ( filter analog )
+	vocoder? ( filter analog )
+	wavelet? ( analog )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
+	dev-libs/log4cpp
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+	sci-libs/fftw:3.0=
+	sci-libs/mpir
+	sci-libs/volk
+	alsa? ( media-libs/alsa-lib:= )
+	fec? (
+		sci-libs/gsl
+		sci-libs/scipy
+	)
+	filter? ( sci-libs/scipy )
+	grc? (
+		$(python_gen_cond_dep 'dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]')
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+	jack? ( virtual/jack )
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	qt5? (
+		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	trellis? ( sci-libs/scipy )
+	uhd? (
+		$(python_gen_cond_dep '>=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}]')
+	)
+	utils? (
+		$(python_gen_cond_dep 'dev-python/click[${PYTHON_USEDEP}]
+		dev-python/click-plugins[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]')
+	)
+	vocoder? (
+		media-sound/gsm
+		>=media-libs/codec2-0.8.1
+	)
+	wavelet? ( sci-libs/gsl
+			dev-libs/gmp
+			sci-libs/lapack
+			)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+"
+
+#That's right, it can't build if gnuradio 3.7 is installed
+#Both due to build failure, and then file collision due to bundled volk
+DEPEND="${RDEPEND}
+	!<net-wireless/gnuradio-3.8
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	xdg_environment_reset #534582
+
+	use !alsa && sed -i 's#version.h#version-nonexistent.h#' cmake/Modules/FindALSA.cmake
+	use !jack && sed -i 's#jack.h#jack-nonexistent.h#' cmake/Modules/FindJACK.cmake
+	use !oss && sed -i 's#soundcard.h#oss-nonexistent.h#g' cmake/Modules/FindOSS.cmake
+	use !portaudio && sed -i 's#portaudio.h#portaudio-nonexistent.h#g' cmake/Modules/FindPORTAUDIO.cmake
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_MODTOOL="$(usex modtool)"
+		-DENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="$(python_get_sitedir)"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# Remove duplicated icons, MIME and desktop files and installation script
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+	# Remove incorrectly byte-compiled Python files and replace
+	find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
+	python_optimize
+}
+
+src_test()
+{
+	virtx cmake_src_test
+}
+
+pkg_postinst()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm()
+{
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index aa068b0e06b5..65be5a358525 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils desktop
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="https://www.gnuradio.org/"
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git"
-	EGIT_BRANCH="pybind"
+	EGIT_BRANCH="maint-3.8"
 	inherit git-r3
 	KEYWORDS=""
 else
@@ -47,7 +47,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
 	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
 	dev-libs/log4cpp
 	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -68,7 +67,7 @@ RDEPEND="${PYTHON_DEPS}
 		x11-libs/gtk+:3[introspection]
 		x11-libs/pango[introspection]
 	)
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	portaudio? ( >=media-libs/portaudio-19_pre )
 	qt5? (
 		$(python_gen_cond_dep 'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
@@ -130,6 +129,7 @@ src_configure() {
 	mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_VOLK=OFF
+		-DENABLE_INTERNAL_VOLK=OFF
 		-DENABLE_GNURADIO_RUNTIME=ON
 		-DENABLE_PYTHON=ON
 		-DENABLE_GR_BLOCKS=ON
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index d5240d4f0ee5..21ec73988f9a 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 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
-EBUILD gr-iqbal-9999.ebuild 912 BLAKE2B 17d764c21c903e23d26cea4865452b10c306201eede2f0c72efa84465711da79bf9c90e9218bf8f716017e0334cb94324b43ed647d45ec16e422517e20c82278 SHA512 73a7ef378432c2b9cc7ecf738fbc3dd8460c07f67ab646b164205253ed09ace59fa06cfba0aa6ecec7c29123b2396ee6e0db79e40f28192bf44fcccc79163dc4
+EBUILD gr-iqbal-0.38.1.ebuild 894 BLAKE2B 16599886e26f85b2ec0a6253e2eee8f46b2c3b14f456f9bf424a715942b84656fc9a28e769919c6caf6999fab2fec7172b595958ef66013493a9341aa49a6b4f SHA512 fdd553aac55a77aacfc604290123c35749e867fa8be289542676a9e5992b37c92d0957d6ccba41c1a84ff225b6836bc4c28d36aac5d2daff435f9f9cf1695ba5
+EBUILD gr-iqbal-9999.ebuild 894 BLAKE2B 16599886e26f85b2ec0a6253e2eee8f46b2c3b14f456f9bf424a715942b84656fc9a28e769919c6caf6999fab2fec7172b595958ef66013493a9341aa49a6b4f SHA512 fdd553aac55a77aacfc604290123c35749e867fa8be289542676a9e5992b37c92d0957d6ccba41c1a84ff225b6836bc4c28d36aac5d2daff435f9f9cf1695ba5
 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 716aaa6176fc..d8b2cae1cdd9 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-0.38.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8})
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="gnuradio I/Q balancing"
 HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
@@ -32,10 +32,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DOXYGEN="$(usex doc)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${ED}/$(python_get_sitedir)"
 }
diff --git a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
index 716aaa6176fc..d8b2cae1cdd9 100644
--- a/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
+++ b/net-wireless/gr-iqbal/gr-iqbal-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8})
 
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="gnuradio I/Q balancing"
 HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
@@ -32,10 +32,10 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DOXYGEN="$(usex doc)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_optimize "${ED}/$(python_get_sitedir)"
 }
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index cc2966649ba3..63037dd9322f 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,5 +1,5 @@
-AUX hackrf_easy_flash 4028 BLAKE2B bfa259dfa26ecd44894406fe0af417ec69451777e73399e84772690a9b26de74f6a6c249146179917ceeeb53465a35c197e2253706f3161c6662b65871769e3f SHA512 c8432b8e29621c00e81b235990a2c6e5ffdd26085e83965ac408f2f6e94dbd5a4bdc3dfa6c1080c156c6d21a4b4e2e09a02e861f1d651bbd5b01986629a18b69
+AUX hackrf_easy_flash-r1 4265 BLAKE2B 19cf7bfc441acac27a9eb1cba149019196134decf44b01d915dc5e2f564b169f00933c8cf36b3ddbc5dac3612620095a7e7f37f2bc46c19b0d1d5a1ede2969fc SHA512 ee11fedf2a9991b09ffd7fe6189149bd6646711011d5eb40f3c7db090e79a5966d86f524378527fd3e6a14d87e3d94a493b88998dbc2276e26bf16bdb5a69210
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD hackrf-tools-2018.01.1-r1.ebuild 1915 BLAKE2B 3eb6d968bd785f855f204909930366427b12e7ac7def980d33d3364fdeeb3c079fd284d1141ee590796c19393a49a5ce677fe9072f84f3c2b7a6457f2fbc1fea SHA512 506b8c1fba7e24f11a34ba8d1647ce5964b6c2d6734e4471487d88525061c3b930143a0762dc006f8fff0eab0abd00778a2f4f46a4423d81308e324b2c4f6a07
-EBUILD hackrf-tools-9999.ebuild 1922 BLAKE2B 4085a775180b848d65471c222c994261331e653f25c81a773ddf6aefdd0d303cce40b7c27ffc9f26e0f77d8a9c5822778a05906fac4f43f78ee276c0e318ff28 SHA512 c5516c4ef81fe0530d023ee20d3423f4c4e72effdf33e8d4b7b0153a6e739ce264650cdb3f56a915aadb11964eda3324d474d67ca74bebd922d411fb972144e1
+EBUILD hackrf-tools-2018.01.1-r2.ebuild 1925 BLAKE2B 7a0f5bfffc468496a315f3e0c6cbed5e40b203d86a01b5d76b3248f2a8a572105f2721b8cada4741b33faa013b52036327efd7d71c3c884d5de962cd7dd312c1 SHA512 7d1a4cfe9993d671cb92e14ce5edc1cfe327d0770050c7d908c444b7503a49078f5e35d6d841cdaaf4114677aa93ecc82fdc267fe02a79966ae94532f090bb81
+EBUILD hackrf-tools-9999.ebuild 1932 BLAKE2B ec767c0a8a0fe94214045adae0c450beb9255861deb5988eaeda87b2cd3857d40230beefc8ac14de704a78b1f9890383c18f361a7204236948f83f7f624713c4 SHA512 b4b995f9946236e733f3e3fdbf5c58ad36efb8908b3c2c2d9d0f33d65fd9a31b4020070576d5b4e26cf68a4cbc7069b17703a70d1007b23d18464d837941d465
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-wireless/hackrf-tools/files/hackrf_easy_flash b/net-wireless/hackrf-tools/files/hackrf_easy_flash
deleted file mode 100755
index 78d0c69b0cd5..000000000000
--- a/net-wireless/hackrf-tools/files/hackrf_easy_flash
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/sh
-
-DFU_MODE=0
-CPLD=0
-
-get_dfu() {
-  if [ -r "/usr/share/hackrf/hackrf_one_usb.dfu" ]; then
-    ram_firmware="/usr/share/hackrf/hackrf_one_usb.dfu"
-  else
-    printf "Unable to find hackrf_one_usb.dfu in the search path\n"
-    exit 1
-  fi
-  export ram_firmware
-}
-
-get_cpld() {
-  if [ -r "/usr/share/hackrf/hackrf_cpld_default.xsvf" ]; then
-    cpld="/usr/share/hackrf/hackrf_cpld_default.xsvf"
-  else
-    printf "Unable to find default.xsvf in the search path\n"
-    exit 1
-  fi
-  export cpld
-}
-
-usage() {
-  printf "hackrf_easy_flash list\n"
-  printf "hackrf_easy_flash upgrade\n"
-}
-
-if [ -z "${1}" ]; then
-  usage
-  exit 0
-fi
-
-list_firmware() {
-  if [ ${DFU_MODE} = 1 ]; then
-    if [ -z "${ram_firmware}" ]; then
-      get_dfu
-    fi
-    printf "Best DFU found: ${ram_firmware}\n"
-  fi
-  printf "Available firmware options:\n"
-  if [ -r "/usr/share/hackrf/hackrf_one_usb.bin" ]; then
-    printf "hackrf (default)\n"
-  fi
-  if [ -r "/usr/share/hackrf/portapack-h1-firmware.bin" ]; then
-    printf "portapack (--portapack)\n"
-  fi
-  if [ -r "/usr/share/hackrf/portapack-h1-havoc.bin" ]; then
-    printf "portapack-havoc (--havoc)\n"
-  fi
-}
-
-#parse args
-while [ -n "${1}" ]; do
-  case $1 in
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    list|--list)
-      list_firmware
-      exit 0
-      ;;
-    update|--update|upgrade|--upgrade|hackrf|--hackrf)
-      firmware="/usr/share/hackrf/hackrf_one_usb.bin"
-      TARGET=hackrf
-      shift
-      ;;
-    portapack|--portapack)
-      firmware="/usr/share/hackrf/portapack-h1-firmware.bin"
-      TARGET=portapack
-      shift
-      ;;
-    havoc|--havoc)
-      firmware="/usr/share/hackrf/portapack-h1-havoc.bin"
-      TARGET=havoc
-      shift
-      ;;
-    cpld|--cpld)
-      CPLD=1
-      get_cpld
-      shift
-      ;;
-    dfu|--dfu)
-      DFU_MODE=1
-      get_dfu
-      shift
-      ;;
-    --)
-      shift
-      break
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-if [ -z "${firmware}" ]; then
-    firmware="/usr/share/hackrf/hackrf_one_usb.bin"
-    TARGET="hackrf"
-fi
-
-if [ ! -r "${firmware}" ]; then
-  printf "Unable to find or read ${firmware}\n"
-  printf "Please ensure the requested firmware is installed and readable\n"
-  exit 1
-fi
-
-if [ "${CPLD}" = 1 ] && [ "${TARGET}" != "hackrf" ]; then
-  printf "To update the CPLD you must use the stock hackrf firmware or do this update manually\n"
-  printf "Try \"$(basename $0) --cpld && $(basename $0) ${TARGET}\"\n"
-  exit 1
-fi
-
-printf "This tool is provided by Gentoo, please report bugs on https://bugs.gentoo.org/\n\n"
-if [ ${DFU_MODE} = 1 ]; then
-  printf "Preparing to reset hackrf with DFU ${ram_firmware}\n"
-  printf "Then flashing with ${firmware}\n\n"
-  printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
-  printf "then plug the HackRF into a USB port on your computer.\n"
-  printf "After the HackRF is plugged in, you may release the DFU button.\n"
-  printf "Press any key to continue or ^c to abort\n"
-  read
-  if ! dfu-util --device 1fc9:000c --download "${ram_firmware}" --reset; then
-    printf "dfu-util reported failure, quitting\n"
-    exit 1
-  fi
-  sleep 2s
-else
-  if hackrf_info | grep -q 'No HackRF boards found.'; then
-    printf "No hackrf found, please ensure you are in hackrf mode or try --dfu\n"
-    exit 1
-  fi
-fi
-if hackrf_spiflash -w "${firmware}"; then
-  sleep 3s
-  hackrf_spiflash -R
-  sleep 3s
-else
-  printf "hackrf_spiflash reported failure, quitting\n"
-  exit 1
-fi
-if [ "${CPLD}" = 1 ]; then
-  #printf "To update the cpld, please reset your hackrf into it's new firmware before updating the cpld\n"
-  #printf "Please reset your hackrf by pressing the button furthest from the antenna or power cycling it.\n"
-  #printf "Press any key to continue or ^c to abort\n"
-  #read
-  if hackrf_cpldjtag -x "${cpld}"; then
-    sleep 3s
-    hackrf_spiflash -R
-  else
-    printf "hackrf_cpldjtag reported failure\n"
-    exit 1
-  fi
-fi
-if [ "${TARGET}" = "hackrf" ]; then
-  hackrf_info
-fi
-printf "If you saw no errors, you are up to date with the requested firmware\n"
diff --git a/net-wireless/hackrf-tools/files/hackrf_easy_flash-r1 b/net-wireless/hackrf-tools/files/hackrf_easy_flash-r1
new file mode 100644
index 000000000000..deece5e31891
--- /dev/null
+++ b/net-wireless/hackrf-tools/files/hackrf_easy_flash-r1
@@ -0,0 +1,170 @@
+#!/bin/sh
+
+DFU_MODE=0
+CPLD=0
+
+get_dfu() {
+  if [ -r "/usr/share/hackrf/hackrf_one_usb.dfu" ]; then
+    ram_firmware="/usr/share/hackrf/hackrf_one_usb.dfu"
+  else
+    printf "Unable to find hackrf_one_usb.dfu in the search path\n"
+    exit 1
+  fi
+  export ram_firmware
+}
+
+get_cpld() {
+  if [ -r "/usr/share/hackrf/hackrf_cpld_default.xsvf" ]; then
+    cpld="/usr/share/hackrf/hackrf_cpld_default.xsvf"
+  else
+    printf "Unable to find default.xsvf in the search path\n"
+    exit 1
+  fi
+  export cpld
+}
+
+usage() {
+  printf "hackrf_easy_flash list\n"
+  printf "hackrf_easy_flash upgrade\n"
+}
+
+if [ -z "${1}" ]; then
+  usage
+  exit 0
+fi
+
+list_firmware() {
+  if [ ${DFU_MODE} = 1 ]; then
+    if [ -z "${ram_firmware}" ]; then
+      get_dfu
+    fi
+    printf "Best DFU found: ${ram_firmware}\n"
+  fi
+  printf "Available firmware options:\n"
+  if [ -r "/usr/share/hackrf/hackrf_one_usb.bin" ]; then
+    printf "hackrf (default)\n"
+  fi
+  if [ -r "/usr/share/hackrf/portapack-h1-firmware.bin" ]; then
+    printf "portapack (--portapack)\n"
+  fi
+  if [ -r "/usr/share/hackrf/portapack-h1-havoc.bin" ]; then
+    printf "portapack-havoc (--havoc)\n"
+  fi
+  if [ -r "/usr/share/hackrf/portapack-h1_h2-mayhem.bin" ]; then
+    printf "portapack-mayhem (--mayhem)\n"
+  fi
+}
+
+#parse args
+while [ -n "${1}" ]; do
+  case $1 in
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    list|--list)
+      list_firmware
+      exit 0
+      ;;
+    update|--update|upgrade|--upgrade|hackrf|--hackrf)
+      firmware="/usr/share/hackrf/hackrf_one_usb.bin"
+      TARGET=hackrf
+      shift
+      ;;
+    portapack|--portapack)
+      firmware="/usr/share/hackrf/portapack-h1-firmware.bin"
+      TARGET=portapack
+      shift
+      ;;
+    havoc|--havoc)
+      firmware="/usr/share/hackrf/portapack-h1-havoc.bin"
+      TARGET=havoc
+      shift
+      ;;
+    mayhem|--mayhem)
+      firmware="/usr/share/hackrf/portapack-h1_h2-mayhem.bin"
+      TARGET=mayhem
+      shift
+      ;;
+    cpld|--cpld)
+      CPLD=1
+      get_cpld
+      shift
+      ;;
+    dfu|--dfu)
+      DFU_MODE=1
+      get_dfu
+      shift
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      break
+      ;;
+  esac
+done
+
+if [ -z "${firmware}" ]; then
+    firmware="/usr/share/hackrf/hackrf_one_usb.bin"
+    TARGET="hackrf"
+fi
+
+if [ ! -r "${firmware}" ]; then
+  printf "Unable to find or read ${firmware}\n"
+  printf "Please ensure the requested firmware is installed and readable\n"
+  exit 1
+fi
+
+if [ "${CPLD}" = 1 ] && [ "${TARGET}" != "hackrf" ]; then
+  printf "To update the CPLD you must use the stock hackrf firmware or do this update manually\n"
+  printf "Try \"$(basename $0) --cpld && $(basename $0) ${TARGET}\"\n"
+  exit 1
+fi
+
+printf "This tool is provided by Gentoo, please report bugs on https://bugs.gentoo.org/\n\n"
+if [ ${DFU_MODE} = 1 ]; then
+  printf "Preparing to reset hackrf with DFU ${ram_firmware}\n"
+  printf "Then flashing with ${firmware}\n\n"
+  printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
+  printf "then plug the HackRF into a USB port on your computer.\n"
+  printf "After the HackRF is plugged in, you may release the DFU button.\n"
+  printf "Press any key to continue or ^c to abort\n"
+  read
+  if ! dfu-util --device 1fc9:000c --download "${ram_firmware}" --reset; then
+    printf "dfu-util reported failure, quitting\n"
+    exit 1
+  fi
+  sleep 2s
+else
+  if hackrf_info | grep -q 'No HackRF boards found.'; then
+    printf "No hackrf found, please ensure you are in hackrf mode or try --dfu\n"
+    exit 1
+  fi
+fi
+if hackrf_spiflash -w "${firmware}"; then
+  sleep 3s
+  hackrf_spiflash -R
+  sleep 3s
+else
+  printf "hackrf_spiflash reported failure, quitting\n"
+  exit 1
+fi
+if [ "${CPLD}" = 1 ]; then
+  #printf "To update the cpld, please reset your hackrf into it's new firmware before updating the cpld\n"
+  #printf "Please reset your hackrf by pressing the button furthest from the antenna or power cycling it.\n"
+  #printf "Press any key to continue or ^c to abort\n"
+  #read
+  if hackrf_cpldjtag -x "${cpld}"; then
+    sleep 3s
+    hackrf_spiflash -R
+  else
+    printf "hackrf_cpldjtag reported failure\n"
+    exit 1
+  fi
+fi
+if [ "${TARGET}" = "hackrf" ]; then
+  hackrf_info
+fi
+printf "If you saw no errors, you are up to date with the requested firmware\n"
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
deleted file mode 100644
index 787eb9c15248..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="tools for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-r3
-	KEYWORDS=""
-	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/hackrf-tools"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="~net-libs/libhackrf-${PV}:=
-		sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	dosbin "${FILESDIR}/hackrf_easy_flash"
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
-		ln -s hackrf_cpld_default-${PV}.xsvf "${ED}/usr/share/hackrf/hackrf_cpld_default.xsvf"
-	else
-		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
-	fi
-}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
new file mode 100644
index 000000000000..bc7430341b07
--- /dev/null
+++ b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="tools for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
+	S="${WORKDIR}/hackrf/host/hackrf-tools"
+else
+	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
+	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="~net-libs/libhackrf-${PV}:=
+		sci-libs/fftw:3.0="
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake_src_install
+	newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
+	if [[ ${PV} != "9999" ]] ; then
+		insinto /usr/share/hackrf
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf
+		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
+		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
+		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
+		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
+		ln -s hackrf_cpld_default-${PV}.xsvf "${ED}/usr/share/hackrf/hackrf_cpld_default.xsvf"
+	else
+		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
+	fi
+}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
index 849ca9207958..db45e737e6b5 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-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=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="tools for communicating with HackRF SDR platform"
 HOMEPAGE="http://greatscottgadgets.com/hackrf/"
@@ -29,8 +29,8 @@ DEPEND="~net-libs/libhackrf-${PV}:=
 RDEPEND="${DEPEND}"
 
 src_install() {
-	cmake-utils_src_install
-	dosbin "${FILESDIR}/hackrf_easy_flash"
+	cmake_src_install
+	newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
 	if [[ ${PV} != "9999" ]] ; then
 		insinto /usr/share/hackrf
 		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 94ac199edeed..b4a41b6ec398 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,4 +4,4 @@ DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803c
 EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 97627e934b0c86d435a332bba6f05f6716ec4fe8af73a94dfd0c5e88f13f92b9ad9b1cf59f99a8fb04f80a91cc6df459155490e874b669b4d7f85e2109b7a1da SHA512 a49d0df20aebdb4681511cbee8ac102d1de3e87f349938ea4e8d8d7bdd6695b6753da37db0bfb69c0a3e3c6b4028f1b4411e5866c02a305687a997fac55adfc1
 EBUILD hostapd-2.9-r2.ebuild 7139 BLAKE2B b97d52c79de0384395f28c84ff1e5e64f63451b4468b1ad2dd3fc9d80210c696dd32b34b0f6a4d97390bbd455fab394590bf5c4b75dfd93c92570145f9aec00f SHA512 2bc40e7fb59298bf530445ee1fb2c6981595bae92f777de099054ce86c7a79ac6c3a7baa797b03dd658e208a4e846497b921d5bda2e2beb10eb8a6bb3dfecc92
 EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
-MISC metadata.xml 1128 BLAKE2B f5c9cd5612ad7ee4322b63d688e97a58e89e2775b123bead2fc3d396296664fca252e03aedb11f81290847010d05c62601d299abfe342f4d5191367b1a77b8cd SHA512 72e93d3f674f764bb332f4e3e86a33b0364c39636c685265f08e21a0f3266c37cb0959cb290070e27b6a5bc3f71dfa40e5157bbfc301b98be87c941452014b73
+MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 444076ebea2c..09503282fa44 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -15,14 +15,14 @@
 		<flag name="suiteb">Adding support for NSA Suite B Cryptography</flag>
 		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
 	</use>
-	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:w1.fi:hostapd</remote-id>
 	</upstream>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 1aad258eaa6a..c73d2e04f5d3 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,4 +1,5 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
+AUX iwd-1.8-eapol-prevent-key-reinstallation.patch 2575 BLAKE2B 1e9683e551178ff54f31f9c8e861afb4b1cbe6d2f11188043d2bc6075fb21fe2637db4b13a4b93c900b9450034d28088e525e42ff0cfea08341fb056c7c74fc2 SHA512 e39965ae121e42ff17c1cc05539af1d9005748d05c0fe2ff4ef7884c3b224973a30875961476ecaad7f6f7567e79dd33bc854be05a71b37c4c05a19e2b60fced
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
@@ -7,8 +8,9 @@ DIST iwd-1.7.tar.xz 846040 BLAKE2B a765513da5482ab5856d1d47c3b302dc65efe3b10f444
 DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
 EBUILD iwd-1.5.ebuild 4213 BLAKE2B afe140abb9952750957c147736baa5b23d085e6899a03a814719fcddce419ddda4d76138e79641346c0d71ed2b70c4b4fb3b07cfe768a3beadff435171d28d88 SHA512 b580d7c67914ad4b0a1e99977358d7ccaacc854984c4c066f2bfb23bb54a8b011ff9ea500a5748d78b0ccd5ef658d55051c6a899cb6b0f172badf712e031bc96
 EBUILD iwd-1.6.ebuild 4230 BLAKE2B 209a21ab5524456d539af9164a986a25f367c0b2e380fc98cd88017ebac0f34369832259919afea695b34a9b39e04b637ea3584e78cb60f3b71c9e7dc5a9c073 SHA512 a1a99b605f0393828cea5077b6d4f2babb637e2028b2f41c7e809bb2ed86ec2c4a8e3c9c29e2dff39d9e72af3a258d9e24c723df41a0932b0d50ce0a8be207bc
-EBUILD iwd-1.7-r1.ebuild 4228 BLAKE2B e6f7a3806372aa1040cbded753f9d25d3d27fef9bbba1c55113c9b144b7f49a391b6c1d7cf40fb1d4025e81813d28aa0d522ed95653a8c7a496997d6c7456688 SHA512 a7787ff0dc7b3539dd80e776e9a80dd32d4e50e3f356575fb172ff76d3e5ff4412905e380a5929c439fc82cf2edfcda4bf6807e3883d92b68fd5d1e02145a2ac
-EBUILD iwd-1.7.ebuild 4226 BLAKE2B 7ae02e004aa75abf06901006b5676dfe6c1117dc3a77493d6942fb279d8e40e8422bf78e47f0e6bbc8b4ca3259eaabe4b6215d62efeb6b024aa5b820bb8f3c44 SHA512 307f17869f6aa7e500db35cd419cf731a3b425d587b307400840bdac0ae22157e9fe8b0fe200fbb6268609e7cc83106130d660fe563f3680c6ddd9bd7e0073cb
-EBUILD iwd-1.8.ebuild 4228 BLAKE2B d82fa656efaa55fd25cbdb58298686382fadb9d66d29da47068f6815843a9439176b5707a1c3793dce67df0b423050068e3b28a88c55eeac2abc398139625660 SHA512 cc12dc2ae6d9d1cad6bead917b37a125a432c18870d0428ed02f97c4839bc51be1c69ed3b2dffe962b77ce3d858ff62e371a17f87b2845efdd4381a55d754fe0
+EBUILD iwd-1.7-r1.ebuild 4222 BLAKE2B 494bb710cdc7b76bb702da467ce2bce7151cc27d239580b08bbd903b04c49375a10559353a69a2cb3b32abccef283d5cd5ef2882bd9d3840ac5f3dae81a7b4a5 SHA512 5c25dc76bbd4e014ecaf63b0b8cc400add7cc8c3cf9294df71ff1d60c1e5b7cff89eec6d7309a40008f2ae448a774a26c727b94aa97cf70316504cc642212f03
+EBUILD iwd-1.7.ebuild 4224 BLAKE2B 3690d838adf8a9f8bc9d3b11cd454cf2bf78196b40c50f7a029e2c8108cccce19ead0dd54f58d44207c647e1b9692633cdc5e281e592d16ef202102e9fca93f4 SHA512 4c30c9d78001a9ed7da673ad1704a0d967bfce1a6f011f434626739cab8b33a0564b1e42ddcc30a862364ac20828a8758b2da8cca89af100e2f1a5f9dc773075
+EBUILD iwd-1.8-r1.ebuild 4298 BLAKE2B 26cfb0821ef1086439e102e3aa88b36667e46192b16a7a2d9e7775426c41f6ef1b04a8848e3309fb55301da8a352dd0b2fcd42fa3f5d56da5e39f84217e14707 SHA512 f9b39f923767ff28291e4e1c0dbc24305e603f4ede7ddab5cd6329be04dedd4bbf92c39b3aafbf58d7706660f35a9490dd91ee0fd864e914a3dce65e014fa9d7
+EBUILD iwd-1.8.ebuild 4226 BLAKE2B 6dae3dc8f42e562c84213f9edab1059c15d3bc0ee861f1ff8b20fa85deaac58b2c5b3ef45d7dfdb46a7b0ab0b2fecdffe3f1e0ce73317862c7e0d3103dcdc672 SHA512 fb9bfb2166f8e01bc862adca01d7d09a7423c8e58770204609c9f12e94ed0e932d35922bb55946dfaf3be1740201c2da7e87476bd30796465b2d0e347b4b95af
 EBUILD iwd-9999.ebuild 4224 BLAKE2B 4fbeee6dd24638918ab7a9edf38658b62ef1d379b6a23b35e1079d9b23a8d3a38077125e38cb49c68d98e937cff92a6640b609029ec2b5457f8e8801cabb7063 SHA512 67d8d45988e608a9674c380a7645a365580bc0a5fd4d5bc95ee3a3e78833f4bfbe5b9d836f45e1fec77f20379c13ee26ebc708e0f8131dcac1e27da7b1dff938
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch b/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
new file mode 100644
index 000000000000..dceb808297e3
--- /dev/null
+++ b/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
@@ -0,0 +1,73 @@
+From f22ba5aebb569ca54521afd2babdc1f67e3904ea Mon Sep 17 00:00:00 2001
+From: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
+Date: Wed, 12 Aug 2020 15:17:21 +0400
+Subject: eapol: prevent key reinstallation on retransmitted Msg4/4
+
+Currently an adversary can retransmit EAPOL Msg4/4 to make the AP
+reinstall the PTK. Against older Linux kernels this can subsequently
+be used to decrypt, replay, and possibly decrypt frames. See the
+KRACK attacks research at krackattacks.com for attack scenarios.
+In this case no machine-in-the-middle position is needed to trigger
+the key reinstallation.
+
+Fix this by using the ptk_complete boolean to track when the 4-way
+handshake has completed (similar to its usage for clients). When
+receiving a retransmitted Msg4/4 accept this frame but do not reinstall
+the PTK.
+
+Credits to Chris M. Stone, Sam Thomas, and Tom Chothia of Birmingham
+University to help discover this issue.
+---
+ src/eapol.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/eapol.c b/src/eapol.c
+index b0036c10..e3581cfe 100644
+--- a/src/eapol.c
++++ b/src/eapol.c
+@@ -1462,7 +1462,6 @@ static void eapol_handle_ptk_2_of_4(struct eapol_sm *sm,
+ 	memcpy(sm->handshake->snonce, ek->key_nonce,
+ 			sizeof(sm->handshake->snonce));
+ 	sm->handshake->have_snonce = true;
+-	sm->handshake->ptk_complete = true;
+ 
+ 	sm->frame_retry = 0;
+ 
+@@ -1782,7 +1781,15 @@ static void eapol_handle_ptk_4_of_4(struct eapol_sm *sm,
+ 	l_timeout_remove(sm->timeout);
+ 	sm->timeout = NULL;
+ 
+-	handshake_state_install_ptk(sm->handshake);
++	/*
++	 * If ptk_complete is set, then we are receiving Message 4 again.
++	 * This might be a retransmission, so accept but don't install
++	 * the keys again.
++	 */
++	if (!sm->handshake->ptk_complete)
++		handshake_state_install_ptk(sm->handshake);
++
++	sm->handshake->ptk_complete = true;
+ }
+ 
+ static void eapol_handle_gtk_1_of_2(struct eapol_sm *sm,
+@@ -2185,6 +2192,7 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
+ 	size_t frame_len = 4 + L_BE16_TO_CPU(frame->header.packet_len);
+ 	const struct eapol_key *ek = eapol_key_validate((const void *) frame,
+ 							frame_len, sm->mic_len);
++	uint16_t key_data_len;
+ 
+ 	if (!ek)
+ 		return;
+@@ -2199,7 +2207,8 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
+ 	if (!sm->handshake->have_anonce)
+ 		return; /* Not expecting an EAPoL-Key yet */
+ 
+-	if (!sm->handshake->ptk_complete)
++	key_data_len = EAPOL_KEY_DATA_LEN(ek, sm->mic_len);
++	if (key_data_len != 0)
+ 		eapol_handle_ptk_2_of_4(sm, ek);
+ 	else
+ 		eapol_handle_ptk_4_of_4(sm, ek);
+-- 
+cgit 1.2.3-1.el7
+
diff --git a/net-wireless/iwd/iwd-1.7-r1.ebuild b/net-wireless/iwd/iwd-1.7-r1.ebuild
index 112a2973ad68..84c262950729 100644
--- a/net-wireless/iwd/iwd-1.7-r1.ebuild
+++ b/net-wireless/iwd/iwd-1.7-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.7.ebuild b/net-wireless/iwd/iwd-1.7.ebuild
index 0855a63e0201..f2b626e25c2e 100644
--- a/net-wireless/iwd/iwd-1.7.ebuild
+++ b/net-wireless/iwd/iwd-1.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.8-r1.ebuild b/net-wireless/iwd/iwd-1.8-r1.ebuild
new file mode 100644
index 000000000000..61bd996e8df6
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.8-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.32"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+COMMON_DEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~RFKILL
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-1.8.ebuild b/net-wireless/iwd/iwd-1.8.ebuild
index 9d3581ffb566..3e066268c2b2 100644
--- a/net-wireless/iwd/iwd-1.8.ebuild
+++ b/net-wireless/iwd/iwd-1.8.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/kismet-rest/Manifest b/net-wireless/kismet-rest/Manifest
index b9c4bb4a2939..9e1249ad06af 100644
--- a/net-wireless/kismet-rest/Manifest
+++ b/net-wireless/kismet-rest/Manifest
@@ -1,4 +1,4 @@
 DIST kismet-rest-2019.05.02.tar.gz 31844 BLAKE2B 66b2540788f892545100ffbac078559027d4671aef012b59d7cbe4da3fe6865d6f46576ea8f99b84b995718fdfe6a82d1d7724fe9a93fcd932dd0bf45893b66d SHA512 6f5daef441bcf36e17c469dc36e6e7b521b08ba3aba2c89c199fa263bc3eb67b3d9217351a72c94df3902e35695874285cf769bb8c54778c657b83e44a18a6c5
-EBUILD kismet-rest-2019.05.02.ebuild 680 BLAKE2B aef772d5ca225daf11e77528e6802504dfea99fca1b29a72754cfeef3e7bb2e89f5fcc817048dffe2ba990d0f90c7386a7a0a8b63e73baa5f687318cb754dc3d SHA512 f5b05f23b1d185e98607690490f9633e79e46d786d1b68d02a1262dc5769ee1d685742e1100aa4da504deae3c1f747dea92e903382da88cb1bd0cb3754371755
-EBUILD kismet-rest-9999.ebuild 680 BLAKE2B aef772d5ca225daf11e77528e6802504dfea99fca1b29a72754cfeef3e7bb2e89f5fcc817048dffe2ba990d0f90c7386a7a0a8b63e73baa5f687318cb754dc3d SHA512 f5b05f23b1d185e98607690490f9633e79e46d786d1b68d02a1262dc5769ee1d685742e1100aa4da504deae3c1f747dea92e903382da88cb1bd0cb3754371755
+EBUILD kismet-rest-2019.05.02.ebuild 686 BLAKE2B 3cf9cd7d70731aee5a29c9da91e88fdb8319a2e97756b5ed020d98dc9deee2c33a7abcc63efec9eaf8049f5037f04b808aed2a68f7e7750b4b4368454a7b78b1 SHA512 84cf22b4b2bff1839ee5815c9ba1ba09e548d52e7465fcc7dd1d7354703c9df2a7705b4892b21e827f5f188e470fc550d8e01b60b763ddea8bd840d164a56db8
+EBUILD kismet-rest-9999.ebuild 686 BLAKE2B 3cf9cd7d70731aee5a29c9da91e88fdb8319a2e97756b5ed020d98dc9deee2c33a7abcc63efec9eaf8049f5037f04b808aed2a68f7e7750b4b4368454a7b78b1 SHA512 84cf22b4b2bff1839ee5815c9ba1ba09e548d52e7465fcc7dd1d7354703c9df2a7705b4892b21e827f5f188e470fc550d8e01b60b763ddea8bd840d164a56db8
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
index 58d94fbd6a20..2c931fa51689 100644
--- a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
+++ b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Kismet REST Python API"
diff --git a/net-wireless/kismet-rest/kismet-rest-9999.ebuild b/net-wireless/kismet-rest/kismet-rest-9999.ebuild
index 58d94fbd6a20..2c931fa51689 100644
--- a/net-wireless/kismet-rest/kismet-rest-9999.ebuild
+++ b/net-wireless/kismet-rest/kismet-rest-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Kismet REST Python API"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index fcc816fac679..9c506ce85492 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -10,6 +10,6 @@ DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0f
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2019.09.1-r2.ebuild 4702 BLAKE2B 5ab2650fda3f9c669eb02d81e11c89a376e4704c46f1ad9b9a0b491c5accf56811edaea7fd4021ee23ee171207203c082e132a441ab147bc79dcea43e1ce5bb7 SHA512 4ea2cffec42a04b0e0588cc0a37f52b898b9dd81d5a72d17d13ec8b1eebaa1eea9d6d807de1bb1a1ebc345e264b9e7dfd1b77463fdf884631199e4d4c600225d
 EBUILD kismet-2019.12.2-r1.ebuild 4919 BLAKE2B b64aa866a750583e867308e5eb53aad49c4c897f13cd36c2d92e9881b1a1196dade4ce87968db86d0ed5cf6fc9e636917bb46830fe991ffee1936660680aff2c SHA512 ffa77d9843091abf23bf9789243567eb369d9cf3e505237647e7a4cef2b34025df243272f7ebf45445e4a908d6126b563442ca2ec5b5c8d0cc6d6daae46debd8
-EBUILD kismet-2020.04.3.ebuild 4984 BLAKE2B 2f9c0e989619d8562dd7ab90948e6f785c0db36b3b8ba6189a653bd0a13c924003db48cafef819ede81985a0f03f8beff00d6d381ed2e1e17fd3a44fb7a18720 SHA512 e50514da8f612a5fef5613ad48b9b55ba7f27c0601186ccd7deb42c75532d8eb65471b15f8b1b38446cb0fd2eee3b042d7dee4ec5555675e1677ebc7004312d8
+EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
 EBUILD kismet-9999.ebuild 4984 BLAKE2B 375fb59e8dbc7884fb73c44137ec31041b091f8a450795309b6f5db63a3746e41471a73bb6818afdeb9956ccb5670fc8c2782e1ac6f93c254a85a4f3caef2e32 SHA512 59d5ef75637be6ebdbc15c9c69e9a7b8f2fd1298a2d01910cc478c7d370688fa1ffdad9a4e1d9a45dc00e9f0e7ca38f95739820383a71e4919ea66268e74a9f2
 MISC metadata.xml 1545 BLAKE2B c1b1fe5d6f61ca1141bf0bec03e7f416a0c7e8ec2b15aaaefe0cfc763af9c385e791747eeaf6c3d0b83594acbb528e0c6ef4abfcb348edd027d77a5ef720fa83 SHA512 49e887edfcde73eea51e96dad9c648f70f59524fc0e3f6567aeff116bf33ad7b9e57f4e8dcdfd02b0fef524a101f172bf1035437a6138376b0a41f1e8e60af32
diff --git a/net-wireless/kismet/kismet-2020.04.3.ebuild b/net-wireless/kismet/kismet-2020.04.3.ebuild
index 3c55de1f6be2..3e9d0c602dc3 100644
--- a/net-wireless/kismet/kismet-2020.04.3.ebuild
+++ b/net-wireless/kismet/kismet-2020.04.3.ebuild
@@ -25,7 +25,7 @@ else
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/net-wireless/kismetdb/Manifest b/net-wireless/kismetdb/Manifest
index 33538e0f1346..2e2408129eb8 100644
--- a/net-wireless/kismetdb/Manifest
+++ b/net-wireless/kismetdb/Manifest
@@ -1,4 +1,4 @@
 DIST kismetdb-2019.05.05.tar.gz 31425 BLAKE2B 4aa4ee6924792376e84fb4a4fb86a425319ea21fc10dc5874df35aa551ce444f62dd381359bad994b89defee3fef8f0bed5e80ffc0d18c025bed28b5cb2efa45 SHA512 0b36c1d4dfb0ffb5749c32884ce1b44c1ece196ebaf07db66157aed2c649c2b4dc650a6553a2e263c4518da2f06f1602754917d5db07f3ab39efb63c38dd8327
 EBUILD kismetdb-2019.05.05.ebuild 705 BLAKE2B 991ba7bf261d18b0485457426ce0e4744cf742a231cc955c5dd0d3ee0db3b1b2c0308d10ff09c1d1feeb582ad8cf6dccfecfd7a6be19d8330b64c9f7e7560c87 SHA512 3d189f94faf493815dfdcdc03d349bd2f5e25ea0c06dcae394fdc405a79c688f8fa5456861d828b229613f90697ec6e3ef600fdefc3e66242fcc374713a1ee97
-EBUILD kismetdb-9999.ebuild 705 BLAKE2B 991ba7bf261d18b0485457426ce0e4744cf742a231cc955c5dd0d3ee0db3b1b2c0308d10ff09c1d1feeb582ad8cf6dccfecfd7a6be19d8330b64c9f7e7560c87 SHA512 3d189f94faf493815dfdcdc03d349bd2f5e25ea0c06dcae394fdc405a79c688f8fa5456861d828b229613f90697ec6e3ef600fdefc3e66242fcc374713a1ee97
+EBUILD kismetdb-9999.ebuild 704 BLAKE2B 2e84174342555d369c0f44da21018553be154e1571679de72202dcdf89bbcdae7b6bfa05ca0567d500809759f701b1c1a0c84d7e7fd0b03f58638108a1144be8 SHA512 078bc55e500da4b35345d7d4735047a6c0b7386ce90833db3fe98c21f3658571c4f5a0a9ef84aafd40a03a8db9c071bfacdde5da40ef0a6d6570e26c8acbdc9a
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetdb/kismetdb-9999.ebuild b/net-wireless/kismetdb/kismetdb-9999.ebuild
index bc8b41e5efe7..c28916339f2a 100644
--- a/net-wireless/kismetdb/kismetdb-9999.ebuild
+++ b/net-wireless/kismetdb/kismetdb-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Kismetdb database log helper library"
 HOMEPAGE="https://kismetwireless.net/"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://www.kismetwireless.net/git/python-kismet-db.git"
+	EGIT_REPO_URI="https://github.com/kismetwireless/python-kismet-db.git"
 else
 	SRC_URI="https://github.com/kismetwireless/python-kismet-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
diff --git a/net-wireless/kismetmobiledashboard/Manifest b/net-wireless/kismetmobiledashboard/Manifest
index 5e7aa462a44e..c9dffad51663 100644
--- a/net-wireless/kismetmobiledashboard/Manifest
+++ b/net-wireless/kismetmobiledashboard/Manifest
@@ -1,4 +1,4 @@
 DIST kismetmobiledashboard-1.5_beta1.tar.gz 2305979 BLAKE2B 05e1f41b02688d2d432ff805b454fc948d387111ab2cf45a7ef72e9421a410a2fe479eca5a9f7eb56f58c807aeb47c1cc0a75c135ee3fb6faee2b979cc89894b SHA512 6abb5bd89b80ed4012d119d7111128bca2625d63f1cb36ab50b79e68b14f355b4c788b1290a720bb51268903b428a42dfffcb4373a2170a3d32aef5c140a9e91
-EBUILD kismetmobiledashboard-1.5_beta1.ebuild 803 BLAKE2B 9423436a7b961d54151017eb0c871a877440917e16e6b12b21dc2e1a36b1196767039ce6f583cc90f05bb8ab8905fcd336dc10b43d7449b8111744ea42294706 SHA512 7f139b38cf7abb13a479fb855bafd877ab939fe27edfbbed74ee39816d8d8743d43e4136d4e0fa7b1f5004596a2dff149f6f98293d2e56b9d6130c8e5021e37b
-EBUILD kismetmobiledashboard-9999.ebuild 803 BLAKE2B 9423436a7b961d54151017eb0c871a877440917e16e6b12b21dc2e1a36b1196767039ce6f583cc90f05bb8ab8905fcd336dc10b43d7449b8111744ea42294706 SHA512 7f139b38cf7abb13a479fb855bafd877ab939fe27edfbbed74ee39816d8d8743d43e4136d4e0fa7b1f5004596a2dff149f6f98293d2e56b9d6130c8e5021e37b
+EBUILD kismetmobiledashboard-1.5_beta1-r2.ebuild 835 BLAKE2B 50f308b3647afc9d7f36dbb6fa0a3b7542e9593203845bbd1f140c71a5a289898486669a08306f1654d9c0e88082402db75ebd6d2126e2f4e6ca919560983460 SHA512 8f6b413b4ccf50d5acd85986b53eaf586d9c5950f2f481e83594e93f2dea69f6c7d3613677ec9fac4009a819166f6c3932004ab8092d60654db1e2bbdd1f1cb8
+EBUILD kismetmobiledashboard-9999.ebuild 835 BLAKE2B 50f308b3647afc9d7f36dbb6fa0a3b7542e9593203845bbd1f140c71a5a289898486669a08306f1654d9c0e88082402db75ebd6d2126e2f4e6ca919560983460 SHA512 8f6b413b4ccf50d5acd85986b53eaf586d9c5950f2f481e83594e93f2dea69f6c7d3613677ec9fac4009a819166f6c3932004ab8092d60654db1e2bbdd1f1cb8
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild
new file mode 100644
index 000000000000..b844f4cf0b81
--- /dev/null
+++ b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Mobile UI for kismet"
+HOMEPAGE="https://github.com/elkentaro/KismetMobileDashboard"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/elkentaro/KismetMobileDashboard.git"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	SRC_URI="https://github.com/elkentaro/KismetMobileDashboard/archive/V1.5-beta.1.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/KismetMobileDashboard-1.5-beta.1"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="net-wireless/kismet"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i 's#\$(INSTALL)#install#' Makefile
+	default
+}
+
+src_compile() {
+	KIS_SRC_DIR="/usr/share/kismet" emake
+}
+
+src_install() {
+	DESTDIR="${ED}" KIS_SRC_DIR="/usr/share/kismet" emake install
+}
diff --git a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1.ebuild b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1.ebuild
deleted file mode 100644
index 5e92f7f7e0e6..000000000000
--- a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-1.5_beta1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-DESCRIPTION="Mobile UI for kismet"
-HOMEPAGE="https://github.com/elkentaro/KismetMobileDashboard"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/elkentaro/KismetMobileDashboard.git"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-	SRC_URI="https://github.com/elkentaro/KismetMobileDashboard/archive/V1.5-beta.1.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/KismetMobileDashboard-1.5-beta.1"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="net-wireless/kismet"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_compile() {
-	KIS_SRC_DIR="/usr/share/kismet" emake
-}
-
-src_install() {
-	DESTDIR="${ED}" KIS_SRC_DIR="/usr/share/kismet" emake install
-}
diff --git a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild
index 5e92f7f7e0e6..b844f4cf0b81 100644
--- a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild
+++ b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild
@@ -1,10 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
 DESCRIPTION="Mobile UI for kismet"
 HOMEPAGE="https://github.com/elkentaro/KismetMobileDashboard"
 if [ "${PV}" = "9999" ]; then
@@ -24,6 +22,11 @@ DEPEND="net-wireless/kismet"
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
+src_prepare() {
+	sed -i 's#\$(INSTALL)#install#' Makefile
+	default
+}
+
 src_compile() {
 	KIS_SRC_DIR="/usr/share/kismet" emake
 }
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index ef3d088d140a..029899729189 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,4 +1,4 @@
-DIST nanovna-saver-0.2.2.tar.gz 178819 BLAKE2B 97949c0b77f6fa122f4f1d446fe10b9d2aee8be37d6d1d47fcfe95db978e70886b110932c820bc248491cc68014c5ee5f76bea33a7b3e971ca8f9fbaaa323217 SHA512 fe1d23103472bccf804b4b0c0df6cc8ec2a782cf442214358c1bd1895c185f472701656bd9ffacf3bbf0b24ee964f8c58a103570cd8c80adbd0126a7113ccb5c
-EBUILD nanovna-saver-0.2.2.ebuild 827 BLAKE2B 52f62df193b7891c75e35e242f490c9a28e8cb1b3b52516b14aac86626f6f8900f0089026c570106470cffb61ec022ae7b905ece0b251b48b69a5647cc50bab3 SHA512 2c8b79e43b6c9ca8e06e4db1f81893cee9769d4ba7cb92c3e19b84f523074cba2f285129a548372d1991f8ae14ecc914bfe0f9f75f5a5b1f0978e4596ed75153
+DIST nanovna-saver-0.3.7.tar.gz 359208 BLAKE2B 62ece990d4ed5b1d3916c1a59bdabc9efe071d9930b378e8ac211babba4294cb4f1ce3bdc876629f2d709295a6043e78b8cd2a59d6f69d4d7d37e6e03280dc24 SHA512 76a84a11cba9e1bb245d16dc6d94d27105f200bb5ed5bf39aca952e30e9ff350395f03c62922d57340b4de7ac8367af5b1485e8faec906ab291f7ff98204d699
+EBUILD nanovna-saver-0.3.7.ebuild 832 BLAKE2B 07ac7fe2799543f1ed5084ed2d12590c0f6b5d8d78434202f9abf0d00be71f1be4751deb05b4fb6e1f0865fbcbf86549f18b95a1b4bd20c226a6096d3a9c3810 SHA512 d06288aed717051677f7aa3fa4b5f9983032b92c5ca624089c51e2253795c440f9d65fafff9ac0398398159c27a9f320adc675297a2665efa228fbd2a0d83183
 EBUILD nanovna-saver-9999.ebuild 827 BLAKE2B 52f62df193b7891c75e35e242f490c9a28e8cb1b3b52516b14aac86626f6f8900f0089026c570106470cffb61ec022ae7b905ece0b251b48b69a5647cc50bab3 SHA512 2c8b79e43b6c9ca8e06e4db1f81893cee9769d4ba7cb92c3e19b84f523074cba2f285129a548372d1991f8ae14ecc914bfe0f9f75f5a5b1f0978e4596ed75153
 MISC metadata.xml 432 BLAKE2B a8869193d052dd0ec1fcae10641b19f61fe2faa2bfde6e60f9758b4da9620a316e9b318d11c778fcb0c1de1a2537f98587a8ec928bb814ae53b0160deef18be7 SHA512 0727e758f3cfd75ee8b54ac05636228fe6422ae5b8a0b0eb37f475abc075d30765b3452a05c9e99c56b8a25c378bebfce69462906910c86254f586203640dffe
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
deleted file mode 100644
index b0585e449aea..000000000000
--- a/net-wireless/nanovna-saver/nanovna-saver-0.2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-inherit distutils-r1
-
-DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
-HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
-SRC_URI=""
-
-LICENSE="GPL-3+"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-else
-	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
-BDEPEND=""
-
-src_prepare(){
-	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
-	distutils-r1_src_prepare
-}
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.3.7.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.3.7.ebuild
new file mode 100644
index 000000000000..4060e6e8d9e9
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.3.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+SRC_URI=""
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND=""
+
+src_prepare(){
+	sed -i "s#find_packages()#find_packages(exclude=['test'])#" setup.py
+	distutils-r1_src_prepare
+}
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 48c7d28dbf54..9b58f3508d2f 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -5,6 +5,6 @@ DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccc
 DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1142 BLAKE2B 1321119ae94c5c89a8912dde134ee7890b987c70cafa61617f0118fa596cab58485f3fbf51b3f6ebfce819eb50b281606adfb36cbea12497ea02cbc7a0e053d2 SHA512 043448e7787215446c27eb1e264e7c18f463f829ae162dd23ede268c3664ed0073fac4c6f3c30c77902cf421bf535eee83a585575b980c1fafc9119809cbe9a1
 EBUILD rtl-sdr-0.5.4.ebuild 1149 BLAKE2B 3690e4cfd90271b6b49a0f453b0a1e290e096e432f42621cfd3a97aebcd0050a4a4cbc69334c6906eed637c3814bdb554e97edf997d116618715af8c1673f7b1 SHA512 08d4f453f18be3c631b54ca11f0042c60163182f25bcb335148d32978a64280f116d61fed6fa0bff8efc94acc09b901c87a89e3a93bfb6d7f24e8936ccd24411
-EBUILD rtl-sdr-0.6.0-r1.ebuild 1181 BLAKE2B 017cf726d4b9503d9bebde574531e98751a53e5bcad630c42ca611a17f4cf2eb8d2625b60915eed951f5134110a16e272c14e17871836fc6d92e8821a6c36303 SHA512 b95abbf805d32964883cdba6ead9a5b0bdfb0aa9bbd25c81ad8652f9c26d2d589e1fbb2bead99621e78d9628386ec7e890d8f2855fc803dcd43bf2fd7fd31331
-EBUILD rtl-sdr-9999.ebuild 1321 BLAKE2B 9a17a4c0fb60c6454919c77188b65f6905ce3dadd6f2526f63bf920cb718b96a8abb7ed631bec418343714966e2c1d33e5a4e8f6793073eb62a9db3ba6859731 SHA512 f081e318a25a5fedf39e39103b3cf19c3cca892d921b65e09c36c2d25f96eff9035f7d19e50d2a726c163f2dbf43fa5a3cc5d384cc1beb7fd627a0ebee9ff0bf
+EBUILD rtl-sdr-0.6.0-r1.ebuild 1180 BLAKE2B 52cafed14f3ffadadfe80fc939bde5798eb93ceac4a7d050e1f03c5a1ece453f646619181476f0074752c24e6437ab218b92fe4c7531ef96cd38525e09ec9938 SHA512 d30cbb5fe9ab5c80a2eb44a53e875bb6042ad5352f5418cab1e2097197b94d15ffd1d8dd7e973891571258912562dab6c85b6a848e384c72c3fd7b0b6b4af395
+EBUILD rtl-sdr-9999.ebuild 1269 BLAKE2B c64ffc27db5f0eebe6423f96717ac2eb7ea3ce56ed374e4f1e5685ea738c5745f2498843795e7b0d93a4790c585a67a4b9520a22c32862b25a6d729a7f37d4a8 SHA512 01e3c7ba4e964fa48411a6a66aa1b631cb25ab102df693ec5859a8ee10b8f7966fe1d89260fe83c09a65d0752e8e60bdaa4b5512f176824af69a0f41b3772d04
 MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
index cb3fa88be9d5..f64f3d037d80 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
 else
 	SRC_URI="https://github.com/steve-m/librtlsdr/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 arm ~arm64 x86"
 	S="${WORKDIR}"/librtlsdr-${PV}
 fi
 
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 6f788b128c8f..f404f170f4f4 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake multilib
 
 DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
 HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
@@ -41,13 +41,12 @@ src_configure() {
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
 		-DENABLE_ZEROCOPY="$(usex zerocopy)"
-		-DLIB_INSTALL_DIR=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
 	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
 }
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index 77b9e3b06172..57aace9d9b0c 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapysdr-0.7.1.tar.gz 124532 BLAKE2B 157c24610b5f89b549a7d670e26ba68cabb923b7fd95bab4adc4896f7fb9e13f58e53671a4802804bc15b09eb1113baddb5879fd14efe8b8ea1bfbff363dde0f SHA512 9b2c4251d6362faecf770df021b74e3b387b99699ae4f7d3f145801e2acc901a3803f7b4d2cd50267013f1add6658703dfa5db6db28b8a645f1f8230117123cd
-EBUILD soapysdr-0.7.1.ebuild 1278 BLAKE2B 1dcc0ca1890088234ebbc86f956fc37d7d31b20841560b92a6098d03a8f76678d7474d743cd165730b0fb53ab9b7cc67cee9d405cd8217063fe387ca7644c8b2 SHA512 b9dafe42f278a02d20a3f0e4fd6b87e322f51d66b0f76313fd1d3610af3c1c25963021537b0e323947579c14dadcad88e2abfac556eb75f7ee7049ca1c662be7
-EBUILD soapysdr-9999.ebuild 1278 BLAKE2B 1dcc0ca1890088234ebbc86f956fc37d7d31b20841560b92a6098d03a8f76678d7474d743cd165730b0fb53ab9b7cc67cee9d405cd8217063fe387ca7644c8b2 SHA512 b9dafe42f278a02d20a3f0e4fd6b87e322f51d66b0f76313fd1d3610af3c1c25963021537b0e323947579c14dadcad88e2abfac556eb75f7ee7049ca1c662be7
+EBUILD soapysdr-0.7.1.ebuild 1232 BLAKE2B ea990b75dbb4966b840112467ca097712cb505d40e805757d5b5693ae506698d64df199e4b2929af0b0241e5883f704d525bc11ad1c0313623e0ed8cf4d2d8ad SHA512 1f92c5a3565e07c339e82938deebd3e1c5776f46b6569acc4a08ac895f1bc65c163125b5d3239ceeaccdedbd858cd2d80131a755fb2db5df953f04ec94dad569
+EBUILD soapysdr-9999.ebuild 1232 BLAKE2B ea990b75dbb4966b840112467ca097712cb505d40e805757d5b5693ae506698d64df199e4b2929af0b0241e5883f704d525bc11ad1c0313623e0ed8cf4d2d8ad SHA512 1f92c5a3565e07c339e82938deebd3e1c5776f46b6569acc4a08ac895f1bc65c163125b5d3239ceeaccdedbd858cd2d80131a755fb2db5df953f04ec94dad569
 MISC metadata.xml 775 BLAKE2B dbcad63785d9af5b1f2f93775c645f78e6344a2c47fe0ed1f71ab47d9945be2885e4becb2d9b329e145b035cf3af2f50daacc56175126d2fc3b6feae5e4579a7 SHA512 8805602022441e46c239411c7050ae3c4ef954c796a4293f3fb2eb0ff6cbc87a47eb554b89a29c22622e088f6cb232f05c154c0d6f8f864b35cc5f9c2a292862
diff --git a/net-wireless/soapysdr/soapysdr-0.7.1.ebuild b/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
index 178d51ae1427..f3b498a69d52 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
@@ -39,10 +39,10 @@ PDEPEND="bladerf? ( net-wireless/soapybladerf )
 
 src_configure() {
 	configuration() {
-		mycmakeargs+=( -DENABLE_PYTHON=ON )
-		if python_is_python3; then
-			mycmakeargs+=( -DBUILD_PYTHON3=ON )
-		fi
+		mycmakeargs+=(
+			-DENABLE_PYTHON=ON
+			-DBUILD_PYTHON3=ON
+		)
 	}
 
 	if use python; then
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild
index 178d51ae1427..f3b498a69d52 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -39,10 +39,10 @@ PDEPEND="bladerf? ( net-wireless/soapybladerf )
 
 src_configure() {
 	configuration() {
-		mycmakeargs+=( -DENABLE_PYTHON=ON )
-		if python_is_python3; then
-			mycmakeargs+=( -DBUILD_PYTHON3=ON )
-		fi
+		mycmakeargs+=(
+			-DENABLE_PYTHON=ON
+			-DBUILD_PYTHON3=ON
+		)
 	}
 
 	if use python; then
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index 0cca963aef0a..541bcf9643a4 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,3 +1,6 @@
 DIST srslte-19.09.tar.gz 2372283 BLAKE2B 8d3b3cdfe777824c30e570f61ffddd1a9b1fd8136b6f67c2d54cbcfe089a1f55cc56d5b02ddb983c8a3e96af4228509b17a3c816b2d5196bc87bae29e14a625f SHA512 3516bb4aa027437420509eeca98e30f8f5c2bc7f8f1a606309587b70b51f2e6712c605155ec76a38868bf4c1f9007641c8c5b986c1cda76486bf3c4788eed888
-EBUILD srslte-19.09.ebuild 1107 BLAKE2B 9fb6445e2629d7d896d017a825d6fe3507f97314333d1d7ee62c1c5a52d90699c886f6e6dbd8228f64362b4505900840cadf45cc129ff29a571d3ae41d06e7b2 SHA512 817a68fdca302fbfff955aba9a4e20f381441ee42a9cd9f72a76a466c5af5c68a59dc57bcff5369d7becfc58d5fef01aa39a443d8fee3ff5c20c80d7911b6dca
+DIST srslte-20.04.1.tar.gz 7852357 BLAKE2B 1a9f4064c39fb09d155d0fef7de77f2277528296f749a8cef42624d0dd68a3e957eabceea44d74a1c5a4b28bf6e89f10dbf4b91a4b35ef197e07c36863277167 SHA512 0c55fc5f29a419c74c1bdbf94f63d0296341a1691faac9bf1e862d1b8afd207807907d376efc49513bb0f0e4f8fa6ef16fa8785d203a454824b33652788b5d2f
+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-9999.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-19.09-r2.ebuild b/net-wireless/srslte/srslte-19.09-r2.ebuild
new file mode 100644
index 000000000000..15a5ca816b79
--- /dev/null
+++ b/net-wireless/srslte/srslte-19.09-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
+HOMEPAGE="http://www.softwareradiosystems.com"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git"
+else
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	MY_PV=${PV//./_}
+	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bladerf simcard soapysdr uhd zeromq"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/libconfig
+	net-misc/lksctp-tools
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
+	bladerf? ( net-wireless/bladerf:= )
+	simcard? ( sys-apps/pcsc-lite )
+	soapysdr? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:= )
+	zeromq? ( net-libs/zeromq )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i '/ -Werror"/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/srslte/srslte-19.09.ebuild b/net-wireless/srslte/srslte-19.09.ebuild
deleted file mode 100644
index 444a0103a637..000000000000
--- a/net-wireless/srslte/srslte-19.09.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils vcs-snapshot
-
-MY_PV=${PV/./_}
-
-DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
-HOMEPAGE="http://www.softwareradiosystems.com"
-SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bladerf simcard soapysdr uhd zeromq"
-
-DEPEND="
-	dev-libs/boost
-	dev-libs/libconfig
-	net-misc/lksctp-tools
-	net-libs/mbedtls
-	sci-libs/fftw:*
-	bladerf? ( net-wireless/bladerf:= )
-	simcard? ( sys-apps/pcsc-lite )
-	soapysdr? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:= )
-	zeromq? ( net-libs/zeromq )
-
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	sed -i '/ -Werror"/d' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_SOAPYSDR="$(usex soapysdr)"
-		-DENABLE_ZEROMQ="$(usex zeromq)"
-		-DENABLE_HARDSIM="$(usex simcard)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/srslte/srslte-20.04.1-r1.ebuild b/net-wireless/srslte/srslte-20.04.1-r1.ebuild
new file mode 100644
index 000000000000..8bfdf919f31d
--- /dev/null
+++ b/net-wireless/srslte/srslte-20.04.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
+HOMEPAGE="http://www.softwareradiosystems.com"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	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"
+	MY_PV=${PV//./_}
+	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bladerf simcard soapysdr uhd zeromq"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/libconfig
+	net-misc/lksctp-tools
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
+	bladerf? ( net-wireless/bladerf:= )
+	simcard? ( sys-apps/pcsc-lite )
+	soapysdr? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:= )
+	zeromq? ( net-libs/zeromq )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i '/ -Werror"/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild
new file mode 100644
index 000000000000..15a5ca816b79
--- /dev/null
+++ b/net-wireless/srslte/srslte-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
+HOMEPAGE="http://www.softwareradiosystems.com"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git"
+else
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+	MY_PV=${PV//./_}
+	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bladerf simcard soapysdr uhd zeromq"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/libconfig
+	net-misc/lksctp-tools
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
+	bladerf? ( net-wireless/bladerf:= )
+	simcard? ( sys-apps/pcsc-lite )
+	soapysdr? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:= )
+	zeromq? ( net-libs/zeromq )
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -i '/ -Werror"/d' CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index d864f6fca792..414211c1e95a 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,5 +1,5 @@
 AUX ubertooth-2018.12.1-gcc-10.patch 783 BLAKE2B e0d79ff3217de27b4c04c8e0427c5217753b739d6ce04ddcbb20bb2ce20f64d695fad4b969415bfd3b01232f4b08dcf6d5ec2b1096618e202c6a330903fac3e5 SHA512 4982db0ade9305520764801a9c4f7b3b2df070cfbc1549e766267136740f66fd392cbe8eeac28a5acd0f4196e9dbe3043a6707a07c770955a7b67a803bcbb70f
 DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc SHA512 409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b
-EBUILD ubertooth-2018.12.1.ebuild 2124 BLAKE2B 9355ad729ba26e38a14ef6a115477cc76df7c17fa4f64d992679b943da4b51d000dd4845d4246348abcfbe4f6f3457cd761f1c0a4b384b4dee8c5ca350cc65d8 SHA512 4fe0f94f43e03340bd7a0b6d0cd33ded3c2d9013d74f893158a74344d3c8e21a79dc0cd1003e827c89da3992e50aec319bf9487a4e3dd3a934470f58ea8151d8
+EBUILD ubertooth-2018.12.1.ebuild 2121 BLAKE2B f76d7998e10f672897c463b15f703eba820258f8ae6b6891846495fdb745be299dd0f4c1e902f4c7ebab5ed2b0b0cc0466b031e2909402f6801cfd36d0feb423 SHA512 4f5d29bbb09e2485e589a27ebce1d552504c49330b62b53c83bdca6c25ca164cc78ec02d1d45d616d99583941870e33e24d13d87c67a50341206de4d0b4629cf
 EBUILD ubertooth-9999.ebuild 2077 BLAKE2B 0955fc76aa31f91e02986c5c4b1379ea0beed4f8eaa9306feae2fc7e251bff7cbe79c46b121b1923cfeae247c3886244b7995e6c640852f917db638d1e60f4e2 SHA512 1f9e0ea4a0fed9a8e4c27a4f48496ca840103766cdada2799dec452304a88e41be3f68a4b59b4e9f0eb8ef9185c7f15b06a51cce8a1a5ed611190614d7a0a4eb
 MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
index 32189828f352..d71069e391f4 100644
--- a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	S="${WORKDIR}/${PN}-${MY_PV}/host"
 	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 fi
 DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
 
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index b2d37e696eb0..f29ec9f290ac 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,12 +4,16 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.13.29.zip 151004470 BLAKE2B 0980c012bddbbeb5d18d26ebc8427137e410577e22a9c49b799f0e8fa39343191bc361b9345919917e53ded5ff0af2b35fd71e48072a09d5533a5e89feb9a20c SHA512 01b9811e288e377aff727416b32d966af5cc7a45e0f03f08f8892c89ad40a1833f4150bc42d8732468fcd2242c790bcd62b343132149a868c0d95f38b9f17dda
 DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347f6384ff71b4e78d156d5a0a5309eb5bb0b05de31721a8dd21f917d0c5b87697a337ec096a1701640796defbb8 SHA512 f1258d4f8fa73f43385260245ca31ee5d159c99db005609a22b09cbe551a886ebf685069bf95be5a0609335fe9d7290bc04158eb2430bdaa238aa7a13da681ab
-DIST unifi-5.14.15.zip 152267634 BLAKE2B 7c691294d0f359153aab5f0c1df9eb06f15d6d9d7b5b98e460163222a41d4e46b9cbca0d58c0a754242abc57c4f5e6c9d2ed7d7a08b7a587e8424a0d0467f17b SHA512 6807298856a0c14ae2bd6009c167ed73bdaefe91c8c47e227e985b797263a76b2bcc7bbc040237e70ee0f6633060718fd23066bc622232aee14bf0a4f6938535
-DIST unifi-5.14.17.zip 154131925 BLAKE2B fe1adc4f244190b697243498dd542eeb7f13ba209f94d0ddac938e960da9c24ba47cff7a01fbfe0d90eca2bb2b4f43f86bbb765636c5a3267e6b21fff7a919a8 SHA512 1438718e441639fb9cd4112cabfd6e527e1dd401457d1c27c8320152bee289dd8ff2b21e16b63c9ae85ba8b350d396fa9f2f270ed33579f84d027d4962b2ee30
+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.13.zip 180668004 BLAKE2B 40eb75f67a58f9796c0f2b51cbf3a46021399e55be016986c531e5a090cbeee45889e69e52c53c668538977df64058e5782038f38e9b7ed667bcfc0b7872e5ff SHA512 9392eef34023a5071b2d2d1ff35bc7a17cb6ba3a70c452b884de86c832a85a419f1b4ecd8d6aeca2ab40a7280149e3794a36b6d0764be898bef2ea4ab2eba49b
+DIST unifi-6.0.15.zip 181660567 BLAKE2B 7dd73e54711333ed3893994dcde15e8d362a823a777b8d82f6989f0c15aa7e661b7d28cf6db0dee3a81f6a33c883ca14fd265c2e4b434630a2248bd27c964a62 SHA512 f8055cb0304644be06f858a7866217393e9199a46fed1dfdf11199de9a85278a4cead1a39d50e3a23c4257b43d0e364021e4f1663c924a37665ac917fb6140d5
 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.15.ebuild 1567 BLAKE2B 16561466e5bd3e390af407661b31ffa3feb81a0b5e84092cabd52300e7e5e7fc8981104730588e51f2b2a1de0049e8b1b1b2a9de35b3a95276d334f03156cc6c SHA512 5ff099c41cef65d88a259540e867b368db07f9e118bbad259d0e75aeea195dd2d53a7f3b61cd112165d881ee95991b19e8fe8c929e9d352c424d80ecd4eb3771
-EBUILD unifi-5.14.17.ebuild 1567 BLAKE2B e3eb49ff610d157777ab5e8d907fad641ea4969ba71fb4f428492bf90cc980259370ab4cfa5676f1acc087553386a5ecca375dc232d7a9bdac16a32dbd392623 SHA512 2fbe01cc54bac949f62f2462a6723b3081728a33eba9350a46394561b7a2a782ac65420008e6019bf4c93495ca78f38894ee9062fc2a2a1b45c4c9b66a658c99
+EBUILD unifi-5.14.22.ebuild 1567 BLAKE2B 18e719065dabc0f01e0e9ef1b078e9351e915fef828efb36ce4772226f30d20c4833fff9255e23c59fbbf2e6f77e89423d3a909f0faf2978e86d11f55af70645 SHA512 811b5ab374ff4673916ee7577a48e48638bf0336542e1884e2cefe92d3b8b31d13a69bbb74547b06d0511c832901e8e8388f802a04ec5322671fa360c90d7758
+EBUILD unifi-5.14.23.ebuild 1567 BLAKE2B c31646d73d1431df37128fcae64363d48625387686111d52d79ce4b4be70f69f07886daacbbb03e8782eb32cfb7959d70b25e7097a31b7dca284ad807329ca04 SHA512 de7d3746952cd92fcce20e643c8ecca38435f9be33f3a123169cdffda27b9dfab98760ef4316f1c97cb64726739a94dc32ce8f2a01e4772f4f29bfcfe261feda
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
+EBUILD unifi-6.0.13.ebuild 1566 BLAKE2B bae463772dccc551033e2bd55b2245f61dccffe681748a0c01c9694c621462a1a80404f3b3dba0ce43c4a281e2f2caf5c0ccd3844cc8a360b636652715e35366 SHA512 86c928324383f716df8b6f0ff7bb7e80728dfaa733544eefbe8321b5806260622a149b3e0ae04dc7e304b9036ef3bd500eb2d3883af0cb3a941a6151daae81f4
+EBUILD unifi-6.0.15.ebuild 1566 BLAKE2B 8b4b7da944d361f82cb4a8eeb4ce65b83784df4c0581bc4873a73c744a4d8de6fdc04d635d328b97533acbee5cfa94109a436374ffad5623a22e6bad6a5999e7 SHA512 3f784d89287bb0a56309f8ed79acac9b8723b30f4e24a15b7e65a2c3c232a7084c7c2739a5f855f60defba114dacbb17f10aee797b8c3c94f408b59773909516
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.14.15.ebuild b/net-wireless/unifi/unifi-5.14.15.ebuild
deleted file mode 100644
index 22d2f71a0a01..000000000000
--- a/net-wireless/unifi/unifi-5.14.15.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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="-c3f8d69687"
-
-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/5.14"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.14.17.ebuild b/net-wireless/unifi/unifi-5.14.17.ebuild
deleted file mode 100644
index 1b95a1e166b0..000000000000
--- a/net-wireless/unifi/unifi-5.14.17.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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="-254554c8a7"
-
-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/5.14"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.14.22.ebuild b/net-wireless/unifi/unifi-5.14.22.ebuild
new file mode 100644
index 000000000000..f7657757712d
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.14.22.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="-9bf8d2f44f"
+
+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/5.14"
+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
+}
diff --git a/net-wireless/unifi/unifi-5.14.23.ebuild b/net-wireless/unifi/unifi-5.14.23.ebuild
new file mode 100644
index 000000000000..3347070e980d
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.14.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="-70ddb4015a"
+
+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/5.14"
+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
+}
diff --git a/net-wireless/unifi/unifi-6.0.13.ebuild b/net-wireless/unifi/unifi-6.0.13.ebuild
new file mode 100644
index 000000000000..d7fba07ec7ce
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.13.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="-49f6654778"
+
+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
+}
diff --git a/net-wireless/unifi/unifi-6.0.15.ebuild b/net-wireless/unifi/unifi-6.0.15.ebuild
new file mode 100644
index 000000000000..c17ea6d564a9
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.15.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="-60e2436234"
+
+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
+}
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 99f7ff6cf9c4..e5f058097691 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -2,4 +2,4 @@ DIST wireless-regdb-2019.03.01.tar.xz 23196 BLAKE2B 804ad05a0270df58dd89eb7193f8
 DIST wireless-regdb-2019.06.03.tar.xz 23176 BLAKE2B 46ed9c25103a57d2370f07035f27ffd89d6a65cdccb22d283aef524aff60b669f21dd4a4dd78c68229a443640a5fd0faa1ad6917e712181881d4b27ead74f480 SHA512 73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb
 EBUILD wireless-regdb-20190301.ebuild 1074 BLAKE2B 907d91e22cf6a29b65c82c2d9837ea4128a6928b6674effc000ceaa1a5b75cfb8ccba5fcfb47ceada6c8d7281e49b25f0584d69f20bba4dc1db1cb2a171b1570 SHA512 5c747eb1b4cdd400e5b62df5b73ff21ea3bb8f4614d3b67ea03ea7e364ddad57d6733b2548b0fd8981701093542b1ce8a11b34d259b228db165ead464cbb771f
 EBUILD wireless-regdb-20190603.ebuild 1074 BLAKE2B 907d91e22cf6a29b65c82c2d9837ea4128a6928b6674effc000ceaa1a5b75cfb8ccba5fcfb47ceada6c8d7281e49b25f0584d69f20bba4dc1db1cb2a171b1570 SHA512 5c747eb1b4cdd400e5b62df5b73ff21ea3bb8f4614d3b67ea03ea7e364ddad57d6733b2548b0fd8981701093542b1ce8a11b34d259b228db165ead464cbb771f
-MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
+MISC metadata.xml 353 BLAKE2B c6f988d4f44b12b5745a588eaf8fb915883eeeaa5a24d11f40bd82caf0506d60dd77036de48254738468132f9407736c2fba7e773b5ef4481b739e1a7a48741d SHA512 826082212c061dc3e4aa6d59e5cc019ee5a9a184d739fa91274a995dbff0f0b10a0fbf241638b413252f914dfe8c954ae02f2243b0c2653684ea99b9454152ac
diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index 85961e02f62e..b3f79edbb0d8 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -9,7 +9,4 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<longdescription lang="en">
-		Regulatory rules database for wireless network cards
-	</longdescription>
 </pkgmetadata>
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index 97155b39a18a..9ce24a45a902 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,5 +1,5 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9-r1.ebuild 1781 BLAKE2B b38e21dcffa05ec43507bce7277adcc6a9e7d87a7e03a35256ba3a26c4fa4f99b3b6901108bfe725c7260ccedcf97e63da1493f752733bc234b611fe70a98ef6 SHA512 91e71d7b8f1c21d92486b4c6b0bef1cdfd0de681763615b02cc643d48b397f872126fff7d974d28d552b07ee9ac13ded30dc05c8fc2397d7f985a056b783565d
+EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 154b536864dab7a1b024d17a8a996c8641674a936ab08580b98eff46d6024d0eb61b28b427515e80cd93302cdc0c8c6435af2b5ef34f59270642a40ce83703b0 SHA512 27bba166483e60c9daee81683d4de75010491245297a556a7b6e1440f61cb2906051571101577a5bed624662ac23b4efa115da15b545f7d0569dd13fd46dc52e
 EBUILD wireless-tools-30_pre9.ebuild 1763 BLAKE2B 13d6da1bc9bbf1ca4bfe19a83a4b8b3dfe2ca8642abde1f2711814051ca91047bbf161d069acc3dbacea8cb5dada5ace287de309c1c60121809610a01fca272c SHA512 6099ac7cd5f4615e49ef894c21278df88616479ba7a5a8d7e41e289cee43c1eacd575d36ac7804968205ac9396bdbf060a67ff127722dea362bf3e23d8838987
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index 9013ba6595ed..b6ebdfd2dde9 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="multicall"
 
 DEPEND="sys-apps/sed"
-- 
cgit v1.2.3