gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /net-wireless
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
109 files changed, 521 insertions, 2504 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index bd39b2f61162..16d155630cb7 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 1e699386b85c..90466ac987a9 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,8 +1,6 @@
-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_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-r1.ebuild 2949 BLAKE2B bdfdcf2f7e46029d4e95770ae33406ab90e290621b808ac0508bc13ed3d4553e8d420e6977adaba74f7c2858efcf178742dd6cac2c8fd12e118bf93e91ffecc4 SHA512 1c7b2b1ab60ac617f61bf5b41da148b4ccaf63a46b01af459f420ebe026b5794b815d4b0bcfb0614e0d27816dbcd88035feead33320481ee28b02cab4c0ae0e4
 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 1024 BLAKE2B c7f31132d721d72f926098b5a85d4cab21ac4fdbd63e75c15485eb4dd62264061ab4173628e05ddde74523a0557fd905a6dc008305f26c7f65416f92b70a4f4b SHA512 e51a08063ed89d55ba02aef49d249fc18adb03026726230faddf661f55f709a37520c68e632ae2996955f837651309a6d83bdcbad775a540d0a2f1aeddbfee72
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
deleted file mode 100644
index bc429d293451..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-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
-	MY_PV=${PV/_/-}
-	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	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
-}
-
-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-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
index e6f82c3506c9..815680f34379 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 215db9ab0cbf..b15c90be76b5 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.1.3.tar.xz 950772 BLAKE2B bec7c8da59b94e8f30ff5f41e057ae5662928a4469b46d0ad2b33521a9b3a5de94056f6f35440d90e05116b1dd83dcd2437f1c00fb6b9532c14ab0698716c57a SHA512 376007c6e857f0e10a4d5e4bc2a50f6d170d393389d3aa5d02728646bf27e2fe5c08fb835bb5432a980d2b6c70c348a0274015552be6229c15a89c34c0d105f2
-EBUILD blueman-2.1.3.ebuild 2957 BLAKE2B 5dea3bf352f9066261cd291d6ce47839df3151382310f76662668a822c20088f3418d39c8112a4c2f999fe8a6cb767291b3f43dbb8e4e471a0308b90fff0aae1 SHA512 4316659537d32f5bc22202324413f56692702eb40b2703b6142bf49b454288c30c3e1d94b83c999be6eb5739f103aae4e6b43a6f03d411fa5bb19c985f246fa5
-EBUILD blueman-9999.ebuild 2922 BLAKE2B 1691375e1344f181e3f5f68c5347d27345b7e1c6d1f07ecf8ee1deb2db8e6d6fe7e38cfb8f5204adbba2749337d32a9b0872eb0db1092d7b6ca37892430c2c9b SHA512 daa32eed2666b048e2a77c940d87e530b702245ebdccdb136fa7c45a753cfa43123723fee6568b1f2a8c4a406d6520a3081a8fdc7be63ca0ec0f06d6c9bf2ad1
+DIST blueman-2.1.4.tar.xz 983816 BLAKE2B de8d475b0aec5b037df43fdb76ebbf4fdb05367f166c14cda818badf49376f2a91de246f991167a57ecaa82a84ac84b4e91f600237c35d86e27431a760192996 SHA512 b8b54942092c1984cfac0cf73e2ac23f7693cb3ee0aa4cfaab1fa0282de4afd539f6860d5541523b542956b2efa31da3ec012dcc39d92fd699d0b8479df641ff
+EBUILD blueman-2.1.4.ebuild 2915 BLAKE2B a1be2846af31666ba6c745ac20c76ea923ac80b576b4dc0167a580ebedb7c6189716633b978093cb10ca7df4256692afd2a9db7fe613d9587f0e41228ba7fa89 SHA512 30ea7804e1e3f54860051923d9f3b00cb5a68b92e262f42380c4bd8a4762f6e81db131a8e990606871fed51744dc8420807f12fb9cd4b6419081c1a9276b6428
+EBUILD blueman-9999.ebuild 2909 BLAKE2B 08f968934181a5e916351e45eb5111d8f993218075cc5994b32029ececdddba6808d037dbd32f98b5b897b3d1b89bd5bbd9e20b51b7ee3a1e13037f181b6b46a SHA512 75bda2fca9b674091a6c62d0687405ebb28ddc4c7bb2dcd7ef1946f4d2e5730f71ee63d6e7925924d47ed98370bdf0995b069be008ec4cc3496a3428f6929216
 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.4.ebuild
index b86f628e3676..8705d7ca38fa 100644
--- a/net-wireless/blueman/blueman-2.1.3.ebuild
+++ b/net-wireless/blueman/blueman-2.1.4.ebuild
@@ -12,7 +12,6 @@ HOMEPAGE="https://github.com/blueman-project/blueman"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 02b2ce337b18..c81a8ef9639b 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -12,7 +12,6 @@ HOMEPAGE="https://github.com/blueman-project/blueman"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	S=${WORKDIR}/${P/_/.}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 5db16aacda09..5a3ed73ef372 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -5,8 +5,6 @@ AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb364657
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
-DIST bluez-5.54.tar.xz 2003760 BLAKE2B 278a8be86d93654b9ec31ed2591a89a2a0f35fd8378fc3cffd9028b1aab431071b802e77b956503fd16239e5b821ab356733fdc49436ef811b87190e185a91c2 SHA512 e19d15d3a478a7af47c1921c8827843492e38787b1182152155bd3d8ad9e1d8ee25c5fda1f24e38c54ebbf946b09fe75007dca9a24d1c35f73303558e558dcbe
 DIST bluez-5.55.tar.xz 2041428 BLAKE2B 7eee44063ea53188d35324bcc5b5f0539cf92a5934632743677bbf41822b8b79a899a82a93fd79887fe058e6f0c0e66ed8d5da46e5585682613bc1847cb009a8 SHA512 9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033
-EBUILD bluez-5.54.ebuild 9541 BLAKE2B 8b63bd805f3544e897a8b62cda2746af71ef2c24800038a4af8d43229e4451f673860112c5a91834d4ebe8a2f49e5ce6ea5f3b851f0def153b23d0223e70a0d5 SHA512 b6ca1f461f7452c6a19af3e47057edf68012935920d9932935c0d53b8357699cc872b00ebd6b120762e74baaca6d483feab65c1083d54d39904e1943758b4f6c
-EBUILD bluez-5.55.ebuild 9656 BLAKE2B 09b4149c1241b7c9b55742dd84b90d4f2420ae0daf39067fc5db39d58d252b7487a681fc3a92c353bff45549c8da2964b3c34a2f991763b7f2af4dd1beba7b4f SHA512 97b589100ed28309c0aca4e02cd78f2a8becd9f09c71f6c4341f02dbb7e8190be2cd838dc843f2fb9483b17dbf54eb3add33d1c346c3fe09456ce71ab9b3c668
+EBUILD bluez-5.55.ebuild 9650 BLAKE2B 012d68f7fa66132d94529dae070e7252274e2acc5d99bcd43ecc45649cb8a4ae7d372d8b9147f27d2c4d942041778d299bf9a3a110d8119adbb6d61426f3b97d SHA512 7cef761136d49cfd9773d5e1f88518c087c061d0d6b4ef2cf11f55eb311d43736f91981ed88c70648e9ccc18862bba28df94de6649ab25031f39f7bc3eaa8e46
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.54.ebuild b/net-wireless/bluez/bluez-5.54.ebuild
deleted file mode 100644
index 9f48674ca4a2..000000000000
--- a/net-wireless/bluez/bluez-5.54.ebuild
+++ /dev/null
@@ -1,297 +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} )
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-"
-
-TEST_DEPS="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( ${TEST_DEPS} )
-"
-DEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/hwids-20121202.2
-	btpclient? ( >=dev-libs/ell-0.28 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.28
-		>=dev-libs/json-c-0.13:=
-		sys-libs/readline:0=
-	)
-	midi? ( media-libs/alsa-lib )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? (
-		>=sys-apps/dbus-1.6:=[user-session=]
-		sys-apps/systemd
-	)
-	!systemd? ( >=sys-apps/dbus-1.6:= )
-	udev? ( >=virtual/udev-172 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	# https://bugs.gentoo.org/539844
-	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-)
-
-pkg_setup() {
-	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
-	# to prevent bugs like:
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
-				~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL"
-	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
-	if use mesh || use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
-		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH
-		~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
-	fi
-	if use test; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER"
-	fi
-	linux-info_pkg_setup
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	if ! use user-session || ! use systemd; then
-		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
-	fi
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--enable-datafiles \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable btpclient external-ell) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable mesh external-ell) \
-		$(multilib_native_use_enable midi) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also that tools can break"
-			ewarn "without previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			dobin tools/btmgmt
-			# gatttool is only built with readline, bug #530776
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
-			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
-			# https://bugs.archlinux.org/task/37686
-			dobin attrib/gatttool
-			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
-			dobin tools/avinfo
-		fi
-
-		# Not installed by default after being built, bug #666756
-		use btpclient && dobin tools/btpclient
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# Drop python2 only test tools
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
-			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
-
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-pkgincludeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	if use user-session && use systemd; then
-		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	# Setup auto enable as Fedora does for allowing to use
-	# keyboards/mouse as soon as possible
-	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	# Install .json files as examples to be used by meshctl
-	if use mesh; then
-		dodoc tools/mesh-gatt/*.json
-		local DOC_CONTENTS="Some example .json files were installed into
-		/usr/share/doc/${PF} to be used with meshctl. Feel free to
-		uncompress and copy them to ~/.config/meshctl to use them."
-		readme.gentoo_create_doc
-	fi
-
-	# From Fedora:
-	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
-	# as found on some Atom based x86 hardware
-	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
-	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
-	exeinto /usr/libexec/bluetooth
-	doexe "${FILESDIR}/btattach-bcm-service.sh"
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
-	use mesh && readme.gentoo_print_elog
-}
diff --git a/net-wireless/bluez/bluez-5.55.ebuild b/net-wireless/bluez/bluez-5.55.ebuild
index 12445761a180..49612c6b9762 100644
--- a/net-wireless/bluez/bluez-5.55.ebuild
+++ b/net-wireless/bluez/bluez-5.55.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 3116a970d473..c9df8a0fc1ea 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -8,5 +8,5 @@ AUX crda-libressl.patch 410 BLAKE2B c341e349348eb7ce1ca3979865a2a984e44e62786508
 AUX crda-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 DIST crda-4.14.tar.gz 72753 BLAKE2B 79e96bc41103eb221d841c74081c2abf507c46ae7790d5d8201dbc49260bc833630b95f74da5500817e07f1b4108713867071bd82ecc4c46d202d1e0ea865675 SHA512 0d52cf62589ec2debfd66de95b82b03a1c15048d8425cf5ef43c3e1f51ce1311a6d898fd5f69badcceb3181d35c836db197c6f070654dab351b01e96a1dd1053
-EBUILD crda-4.14.ebuild 2214 BLAKE2B d20a6d56b0e33aa7d1dc8390c968a961080521a0537cf2d5601a7c1d70d0580aa5b8a94117e0e2cc1a4f5416c9d1d97fc9d110da225423fa0105d2fc14dac6a9 SHA512 175c24222615c1f73719bf97d3687628d41dbd3fb23f2ebbbf48b160062b9112d275681b7c300d605b3eb0459c88b4675b7747346a5d23842cdeed790f9a3681
+EBUILD crda-4.14.ebuild 2213 BLAKE2B f8b344f5414c3e1f3656079b3c66c1d16b1a8f3165127b2a54aebeccbbb78a69238920ae59af32192bcfc75e186d88643aea7206c02b6e46ed581a7b014aa2d6 SHA512 755360d228cbd1b4aeacc5aca97ff5a8b223fc93192c640d08837ae5dedeec38b795c8d3357d3cadcaae43b280c0182dfe9dd4adefe1a058db649a60733e8758
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-4.14.ebuild b/net-wireless/crda/crda-4.14.ebuild
index 185314a365c1..844a9a34cc38 100644
--- a/net-wireless/crda/crda-4.14.ebuild
+++ b/net-wireless/crda/crda-4.14.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit toolchain-funcs python-any-r1 udev
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
@@ -22,13 +22,13 @@ RDEPEND="!gcrypt? (
 	gcrypt? ( dev-libs/libgcrypt:0= )
 	dev-libs/libnl:3
 	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
 	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
 	virtual/pkgconfig"
 
 python_check_deps() {
-	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/m2crypto[${PYTHON_USEDEP}]"
 }
 
 PATCHES=(
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 4c2a2b7b1f8f..faeb01d21c29 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,4 +1,6 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
 DIST gnome-bluetooth-3.34.1.tar.xz 354568 BLAKE2B 53e0f4d172e12ba1fec8dae476929fadaab2fd0a8e8ac063debbe516f925a3bb04c9000012fc2e143baf00c7bbdd4f2bd31bd64e674c1851e4ec544ab9c058a5 SHA512 3e0080bbeeddc144fdcf6b4f0d59b0885fd5881aee670d2e5dffd4ede9b0f988358ad0e815ba86add8b7fd5e93e1f8fc7bfacd10b8d69606aa569fd67356be08
+DIST gnome-bluetooth-3.34.3.tar.xz 353032 BLAKE2B fbf75328780d54307ebf6f8d9d58080060d05b3d76665e3c09f3d2bbc033dbda87a7d4eb43d8fe751955f8240febc13d0446cab1bac085c4a73e9c4e9ff25033 SHA512 a20985576fbc0594a198c8f58e6098db24c73454a9dfc0f5f47581a1bfc0a72e3f0d2592f4a01593c5ed132e4924d934d4d65fd501d274f3b032e1e548794272
 EBUILD gnome-bluetooth-3.34.1.ebuild 1417 BLAKE2B 5872967d80f0990faf599c704e1116ac12bc252859efdf52dee83b531f85a10336e084576d38ec88027cd252a9a6bb8db2a9943873780f0d430b91e30615f648 SHA512 c1f20c9cd2e4385e350e33586220c58e6d84f989462650a085faa6306662d41149e5446bcf9a7fadbfe6af4dcbfdba5ccf91d77d45b0d1ac26f49281d3f18ffa
+EBUILD gnome-bluetooth-3.34.3.ebuild 1392 BLAKE2B 6f26781267bc3a587d3fab4810cf197390efe0c94062d74d429e2bfd0f895a5e50c4fc3ef03ccfe4a38c2bd8f8e786afd1e08f369b8ab88bbbbff88d80506dbb SHA512 a174a97cc49657d58c39963db5bd8ff5bbf88dbebfa321a4509233e3f3b031fb9195d47d4714c14fcdcd2455e50596a0b2957ee7c3b38f3807869fad090f4148
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
new file mode 100644
index 000000000000..29311e2afa0f
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson udev xdg
+
+DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
+SLOT="2/13" # subslot = libgnome-bluetooth soname version
+IUSE="gtk-doc +introspection"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.12:3[introspection?]
+	media-libs/libcanberra[gtk3]
+	>=x11-libs/libnotify-0.7.0
+	virtual/libudev
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	acct-group/plugdev
+	virtual/udev
+	>=net-wireless/bluez-5
+"
+BDEPEND="
+	>=dev-util/meson-0.49.0
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dicon_update=false
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	udev_dorules "${FILESDIR}"/61-${PN}.rules
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if ! has_version 'sys-auth/consolekit[acl]' && ! has_version 'sys-apps/systemd[acl]' ; then
+		elog "Don't forget to add yourself to the plugdev group "
+		elog "if you want to be able to control bluetooth transmitter."
+	fi
+}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 953eb1d6bb81..89930f748d59 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,19 +1,12 @@
-AUX gnuradio-3.7.13.5-boost-1.70-asio.patch 769 BLAKE2B 19a0f56540911443a8b2b8af3f16b3a784ae760ac60a017f5d2d642a6612c4c4f310df5937ba1d815b9cf9ff8e7d5de660876140f6821d2ab59acf94270ccbe6 SHA512 b3270301945489ac6cb301f30c28bea4b9d59ee7cb2a0e5a162e8ff514e0173d849236db8c3e60fa028a9df2304fc22ce73b7eabb525e567867ad72d7cd46dd7
 AUX gnuradio-3.8.2.0-lamda-gr-qtgui.patch 11510 BLAKE2B 17154b93d39517cdd0b6607988c60fbc2274644b3b1f0f88fb36f4cb38820365a7c9b1a52ba17f96725d3a1f6596662ebe837f6837a7a67c7d6e8b4b01d2d7ff SHA512 2e2420b65188b88c3b9759cc2feb89c28c9c1cc151ff8555df7cac095f8619445f4594f60fafea6340ae8e3892fe509f66b3f7c8d4bae8bbfd2085ff74f3005c
 AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3aaad53e57ed10aa394f7b36abbe27e69886fe876f5cb9ba03489f5cb4e0362e782f01bacf9956b3709f21ef0c7841ee2b2e04 SHA512 ea69d44b66b2962327141173d4b66add7885f3ece2302fceb3e5cf294f9502b0e6ac34dd28b9b7ff1b3faa024552be70334629c28e596fc4c621f89fec1c4ab5
 AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9712051ae6d758f2de57511bfdea972364c37d70c1eaf6e41921ad4e14e8f005be53016d8613e1c524b529c7b0e2476afc103edb49cfd946 SHA512 86f5f3ed6856fd183e71af1e6a94bc7e4310842f48a1ae7ed85b79d7a1ff86ebe84027bf24c3dc14a47c28335cc5edc321a7fce1ce24bcb26c0d7432e7aab4f7
 AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02
-AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST 0002-boost_qualify_placeholders_with_their_full_namespace.patch.bz2 6933 BLAKE2B 021574de46f582f668788d35bb0f2fb7a47a03ae9d8009adaf3d53946bdf7fc61301a985a7eb0c6cde37fef36dceae86d71d287a8beb61d793b6309064e4e09d SHA512 f42f997a92592d3caf7e29e50bfb5733ab94988743eb3231c78b31272c5cde840f5abd984e1c6b1f928828a6be84eb5d17c3455207509f48652ed160a4f6c7ae
-DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
-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 7963 BLAKE2B aec02ac499a1b2cc11c40a133314fa40ba293f309e0bdbb2bfdad56d1b3c16a09b6226177d658d17ccdb9ad9aaf4c8b33dac92577dc55fb82070eaf86582ae92 SHA512 81f1b3d77d1122724d665a0b57c33b6e102689a8b9a3d90f50f45a1327b0c9ee4b5748f9dcf980ef4edebaca4617b49b91682619ab705c3003b154df17a8d369
-EBUILD gnuradio-3.7.13.5-r4.ebuild 8136 BLAKE2B 3f5148845dd0147c008abb5ea740c11f28022b9d73782c04d255438d457bb08a7719e06aeb7a5b16ac6d420962cdbe2415121bf86d30f0ebe48a6bc26b413c9b SHA512 9a7591d241466705b882e0ac14cebacd1717621c253d6b68f529b03603e58a9dd78f2e1664fd27c7b4e03848bf0224a2cd4012b2b1b299475d8ba11395dda30b
 EBUILD gnuradio-3.8.1.0-r1.ebuild 6001 BLAKE2B 169303b741b964fe99d9e118cb009a6fff1e64266f591345683a7bc9cb8d814eadb63097da103e7026922e2f4d32384b24e56298b1db6137dba20bb5110a9e83 SHA512 980f3b69d0c5c73f57e03484907960073689be75a473fa2e2f3893fefeb5e24c4c7d9abd06fcb0032ea30de8f1a73b0c21c4986cd5fbcd96f922450faf6b81cc
 EBUILD gnuradio-3.8.1.0-r2.ebuild 6180 BLAKE2B 5b43706289ce84c725fd6a370c75a2d70794b9db19baaf6121bb5ffd053b367781149d9c6d377da262dfb43b783ac22211cd2d1a82ad2d2233e77cd5a4697910 SHA512 4dbe95781189edcd088685d6cc1e3dafd21fda36d469de5919c1189f788f692e8ce597452e85887445d17f59adb3ad42a29d8eb7fe6156141c7c87acccd81b97
 EBUILD gnuradio-3.8.2.0.ebuild 6214 BLAKE2B b647cbfe1eaf25a98152775c7b1c56d9d9d13cfecb7dded0cbff3a913087889646abf3d2378fc465c4a067623e06b0eb294e3f127b9ecd7abeb81f83be47ea14 SHA512 5fd64b198e7c19dbb69df406aa8c72431a9a3fae31c3069b75a964225f36fe2f8e48c5157cd150818a46e68dd88b3667173c67b64cdca000887fb078b586d711
 EBUILD gnuradio-9999.ebuild 5976 BLAKE2B 23ce3f7fd6dba404271bc2a6fe4f5d50ca7e5851a47cb2f3e72c34dcba796c4835eacc8840a0b52e106869bfc63fe6a43d4f392adc0bd42e3fa42bb34b6d463e SHA512 88519e9721890754e5efc572d9d9f9b5b7745a78499b69e91f1be907a53901273e9eddfae32f9af950d9b19fc12efbbe1a8f247073653e13fa611db13ee7c964
-MISC metadata.xml 1864 BLAKE2B 770bdfc6a1344b8b199d32e3eafed27340c0bee307da9395915518041b4bede6a72fc0b984e8af02ca9a1c0e15558552c35156c31a80f990acb90548c0de6fa9 SHA512 93a9d4bf34b36a2b30c4be255e97d0f5cd220643357ec43bc59f4f46f9fca9f825df17add6245cf46710a328f1f48e81513be60a1f880c4bcd6c857e3f403d0b
+MISC metadata.xml 1532 BLAKE2B 0e5d971ca6a16064f0c250b3577bed7196c01089279821adb4d30523a850dc84a9f88936a8ff3471e468b36cf42942c34098e59351e9b97fcd97c6be110213b9 SHA512 636c94dab0303842c19cdb3aaccc354cdb5f14d758ee601e921e3d0bbcd6c7b2080abc16ba04ae9882129711312acfb58edfbd44b2619723cd01a989cafcd204
diff --git a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch b/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch
deleted file mode 100644
index d4925e674eab..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-3.7.13.5-boost-1.70-asio.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Bug: https://bugs.gentoo.org/683380
-Patch adapted from FreeBSD:
-https://svnweb.freebsd.org/ports/head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc?view=markup&pathrev=499093
-
---- a/gr-blocks/lib/socket_pdu_impl.cc
-+++ b/gr-blocks/lib/socket_pdu_impl.cc
-@@ -165,7 +165,11 @@
-     void
-     socket_pdu_impl::start_tcp_accept()
-     {
-+#if (BOOST_VERSION >= 107000)
-+      tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
-+#else
-       tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
-+#endif
- 
-       d_acceptor_tcp->async_accept(new_connection->socket(),
-         boost::bind(&socket_pdu_impl::handle_tcp_accept, this,
diff --git a/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch b/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch
deleted file mode 100644
index 60eb7c7bbbe9..000000000000
--- a/net-wireless/gnuradio/files/gnuradio-wxpy3.0-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Update for wxPython 3.0
- wx.InitAllImageHandlers() issues a deprecation warning with wxPython 3.0
- and is a no-op with wxPython 2.8.
- Deprecated constants like wxSAVE are gone from the C++ API, so wx.SAVE, etc
- are also likely to go from wxPython soon.
- The alias "wx.Color" is gone in wxPython 3.0 - only "wx.Colour" is now
- supported, so update docstring to use the correct class name.
-Author: Olly Betts <olly@survex.com>
-Forwarded: no
-Last-Update: 2014-08-21
-
---- a/gr-wxgui/python/wxgui/plot.py
-+++ b/gr-wxgui/python/wxgui/plot.py
-@@ -522,7 +522,7 @@
-                     self,
-                     "Choose a file with extension bmp, gif, xbm, xpm, png, or jpg", ".", "",
-                     "BMP files (*.bmp)|*.bmp|XBM files (*.xbm)|*.xbm|XPM file (*.xpm)|*.xpm|PNG files (*.png)|*.png|JPG files (*.jpg)|*.jpg",
--                    wx.SAVE|wx.OVERWRITE_PROMPT
-+                    wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT
-                     )
-             try:
-                 while 1:
-@@ -1820,7 +1820,6 @@
- 
-     class MyApp(wx.App):
-         def OnInit(self):
--            wx.InitAllImageHandlers()
-             frame = TestFrame(None, -1, "PlotCanvas")
-             #frame.Show(True)
-             self.SetTopWindow(frame)
---- a/gr-wxgui/python/wxgui/plotter/gltext.py
-+++ b/gr-wxgui/python/wxgui/plotter/gltext.py
-@@ -50,7 +50,7 @@
-         """
-         text (String)         - Text
-         font (wx.Font)        - Font to draw with (None = System default)
--        foreground (wx.Color) - Color of the text
-+        foreground (wx.Colour)- Color of the text
-                 or (wx.Bitmap)- Bitmap to overlay the text with
-         centered (bool)       - Center the text
- 
-@@ -317,7 +317,7 @@
-             text (string)           - displayed text
-             font (wx.Font)          - if None, system default font will be used with font_size
-             font_size (int)         - font size in points
--            foreground (wx.Color)   - Color of the text
-+            foreground (wx.Colour)  - Color of the text
-                     or (wx.Bitmap)  - Bitmap to overlay the text with
-             centered (bool)         - should the text drawn centered towards position?
- 
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
deleted file mode 100644
index e5e6b1a24c2d..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r3.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://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"
-	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? (
-		media-sound/jack-audio-connection-kit
-	)
-	log? ( dev-libs/log4cpp )
-	portaudio? (
-		>=media-libs/portaudio-19_pre
-	)
-	sdl? ( >=media-libs/libsdl-1.2.0 )
-	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_SINGLE_USEDEP}] )
-	vocoder? ( media-sound/gsm
-		>=media-libs/codec2-0.8.1 )
-	wavelet? (
-		>=sci-libs/gsl-1.10
-	)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
-	$(python_gen_cond_dep '
-		dev-libs/boost:0=[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		filter? (
-			|| (
-				dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/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
-
-	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.7.13.5-r4.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
deleted file mode 100644
index 4bd0848dbf45..000000000000
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5-r4.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-CMAKE_BUILD_TYPE="None"
-inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://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? (
-			|| (
-				dev-python/scipy-python2[${PYTHON_MULTI_USEDEP}]
-				dev-python/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/metadata.xml b/net-wireless/gnuradio/metadata.xml
index 5d03b8a37dbf..f3386a84a9e2 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -7,19 +7,14 @@
 	</maintainer>
 	<use>
 		<flag name="analog">enable analog signal processing blocks</flag>
-		<flag name="atsc">enable ATSC (HDTV) transmitter and receiver blocks</flag>
 		<flag name="audio">enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag>
 		<flag name="channels">enable channel mode blocks</flag>
 		<flag name="digital">enable digital signal processing blocks</flag>
 		<flag name="dtv">enable digital tv signal processing blocks</flag>
-		<flag name="fcd">enable Funcube Dongle source block</flag>
 		<flag name="fec">enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
 		<flag name="filter">enable filter signal processing blocks</flag>
 		<flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
-		<flag name="log">enable logging to console and files</flag>
 		<flag name="modtool">enable modtool for editing GNU Radio modules and components</flag>
-		<flag name="noaa">enable NOAA POES HRPT receiver blocks</flag>
-		<flag name="pager">enable pager signal processing blocks</flag>
 		<flag name="performance-counters">enable block performance counters</flag>
 		<flag name="trellis">enable trellis blocks for FSM</flag>
 		<flag name="uhd">install UHD source and sink blocks</flag>
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index a1adfc7d568f..39bc7657808f 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,7 +1,9 @@
 AUX gqrx-bladerf-samplerate.patch 1197 BLAKE2B 1496903e5ae8ce0cba7b0fc30a34d42afe5e76adefc4ab4566fdd5e6c7e88994843c1ba3462be5f30740e35ddbea451317e0910fc5c6fe3f4564d3afc5bff2e4 SHA512 40e02bdaa7af30ae30eb447f01b79776f792a5f30fe3e1d3317d3a40ff8dedb3f19ef13b1e8566781c07ff1086bc919723c2aed940b7fbe88dff9c124116e73f
 DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
 DIST gqrx-2.12.1.tar.gz 1334839 BLAKE2B 9ad8ab710675f4b42ff652d642026aba00dad63867f836662054aaab89cc7788874cc0f47de531257ee901f3bc58a6e6d5aef3c5a4fe30ae367d24fcd87ae763 SHA512 28d3da6c4ff750cf580db658aee267162a64103e9dac1d212f70df6bc602c8d50ccb7aaf88c7e976cfa235b884e02b4994e679f69aed640485c44ed07f183cc9
+DIST gqrx-2.14.tar.gz 1343030 BLAKE2B 8aee7586970e3060f32556be223bed99b6df496fe2565cd56c1001d2f821b3151daa716a6c27aee0c449f3a71117188fe275ad75f406ff8acaac3faaa98cc880 SHA512 cae2003f3832a7edc6c39c591a4a96c9930a7a9c8c42684e3f906df9f582b033939a591261189093d955d07f5d3a9796137a2aff6c7ba936b6cbacf000ca5bf5
 EBUILD gqrx-2.11.5-r1.ebuild 1460 BLAKE2B 88cf1bfa99c38b3b4bf74de16b0cd3d624f24fe9a7d8801ea0fc1e79114fea5c2eac6ec441fa6da08a31317b87c7a7266063b4867b3c33d32f7a5b37961fe041 SHA512 4dda5191329758fd82c199a595e44a2e2aae879ecc603ff975e87121713a628f6a1e7d8a78456d77bdb20c6f9804eda1dcf3314e97c5a1fc21ed6d3e78dd2aa4
 EBUILD gqrx-2.12.1-r1.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
+EBUILD gqrx-2.14.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
 EBUILD gqrx-9999.ebuild 1490 BLAKE2B f0f5bd7edea78f4c31b25122afb2b5434c03081fcf310c508547e1a5c7065cecd9ec75a4daf8c726510ddfd9e42d7d5422151e00a19f42e6c3163cce9d52bd43 SHA512 8162527686dfd3063efa02b9437b359f76b3aebe8ae41409134b4e4697f06b099ec36387d35cdb8baac74659a7ead58eb566a42769ac55956ff44a788ed343ee
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.14.ebuild b/net-wireless/gqrx/gqrx-2.14.ebuild
new file mode 100644
index 000000000000..a008cc56721e
--- /dev/null
+++ b/net-wireless/gqrx/gqrx-2.14.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Software defined radio receiver powered by GNU Radio and Qt"
+HOMEPAGE="https://gqrx.dk/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/csete/gqrx.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/csete/gqrx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="gr-audio portaudio pulseaudio"
+REQUIRED_USE="^^ ( pulseaudio portaudio gr-audio )"
+
+DEPEND=">=net-wireless/gnuradio-3.7_rc:=[audio,analog,filter]
+	>=net-wireless/gr-osmosdr-0.1.0:=
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	sci-libs/volk
+	pulseaudio? ( media-sound/pulseaudio:= )
+	portaudio? ( media-libs/portaudio:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if use !pulseaudio; then
+		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
+	fi
+	if use portaudio; then
+		sed -i 's#find_package(Portaudio#find_package(PORTAUDIO#' CMakeLists.txt || die
+	fi
+	cmake_src_prepare
+	eapply_user
+}
+
+src_configure() {
+	if use pulseaudio; then
+		LINUX_AUDIO_BACKEND=Pulseaudio
+	elif use portaudio; then
+		LINUX_AUDIO_BACKEND=Portaudio
+	elif use gr-audio; then
+		LINUX_AUDIO_BACKEND=Gr-audio
+	fi
+
+	local mycmakeargs=(
+		"-DLINUX_AUDIO_BACKEND=${LINUX_AUDIO_BACKEND}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/src/gqrx
+}
diff --git a/net-wireless/gr-baz/Manifest b/net-wireless/gr-baz/Manifest
deleted file mode 100644
index be14dfab8c04..000000000000
--- a/net-wireless/gr-baz/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-baz-9999.ebuild 1018 BLAKE2B d189a04998b7093d13c580ee2aef1614eb85731409a7b016148ec4513a673fb5090aab391251a8e5726adbe2895a3b43c53bfc320b499c77a2abc82b365dd104 SHA512 d2386763973341407a95f75600a22b99176e0b684769252823771a39997fa66818c9c71824fc708ea3a569d04008df7d0e204409bf4be2628bc2f4bfc8d51595
-MISC metadata.xml 522 BLAKE2B 6f6257b56aebf6189db585f5bdb502d59950c416bf7f06b0f5f2a71520fb32360d4c427c7284e1d7b5f66a886d045304a47e89fbb28dd1676a2eb53d2ce0f166 SHA512 2d5ba9656be7bb652bd96331027dda5bd4d963e949ed1ef24dae55e8945ac9dfc3863fd2a223f47dadd5731475433cf2b1018d7390a47bdd8725a8907a173c64
diff --git a/net-wireless/gr-baz/gr-baz-9999.ebuild b/net-wireless/gr-baz/gr-baz-9999.ebuild
deleted file mode 100644
index 36f890e014d4..000000000000
--- a/net-wireless/gr-baz/gr-baz-9999.ebuild
+++ /dev/null
@@ -1,49 +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} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/balint256/gr-baz.git"
-else
-	KEYWORDS=""
-fi
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Gnuradio baz"
-HOMEPAGE="https://wiki.spench.net/wiki/Gr-baz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="armadillo doc rtlsdr uhd"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[threads,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
-	armadillo? ( sci-libs/armadillo )
-	rtlsdr? ( virtual/libusb:1 )
-	uhd? ( net-wireless/uhd[${PYTHON_SINGLE_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r samples/*
-}
diff --git a/net-wireless/gr-baz/metadata.xml b/net-wireless/gr-baz/metadata.xml
deleted file mode 100644
index db954afee0e3..000000000000
--- a/net-wireless/gr-baz/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>zerochaos@gentoo.org</email>
-	<name>Rick Farina</name>
-</maintainer>
-<maintainer type="project">
-	<email>radio@gentoo.org</email>
-	<name>Radio</name>
-</maintainer>
-<use>
-	<flag name="armadillo">install MUSIC DOA estimator block</flag>
-	<flag name="rtlsdr">install rtlsdr source block</flag>
-	<flag name="uhd">install UHD aware blocks</flag>
-</use>
-</pkgmetadata>
diff --git a/net-wireless/gr-doa/Manifest b/net-wireless/gr-doa/Manifest
deleted file mode 100644
index e28c57df6fac..000000000000
--- a/net-wireless/gr-doa/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-doa-9999.ebuild 940 BLAKE2B dc60f8544a5cee46b01d7f5659f9d8e0425ceddadd7433a3192a24dcc5098c31af53b35b60ed0f9d51b21668bdf90930d8c6022ddf97327ff4d533d6d8325782 SHA512 a5cf17fb15c6d118dc0955512df20f843ca6176aa27865fc14c8b51951ec5b357b01e2d16a4046a5c783e45878e54aba952bb9175697234ffc87a425cfb4e354
-MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-doa/gr-doa-9999.ebuild b/net-wireless/gr-doa/gr-doa-9999.ebuild
deleted file mode 100644
index ea4932a57e95..000000000000
--- a/net-wireless/gr-doa/gr-doa-9999.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 python-single-r1
-
-DESCRIPTION="Gnuradio flowgraphs and modules for Direction of Arrival analysis"
-HOMEPAGE="https://github.com/samwhiting/gnuradio-doa"
-EGIT_REPO_URI="https://github.com/samwhiting/gnuradio-doa.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc"
-#Tests fail, https://github.com/samwhiting/gnuradio-doa/issues/3
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}/gr-doa"
-
-src_configure() {
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/${P}/flowgraphs"
-}
diff --git a/net-wireless/gr-doa/metadata.xml b/net-wireless/gr-doa/metadata.xml
deleted file mode 100644
index 8a3f94073560..000000000000
--- a/net-wireless/gr-doa/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>zerochaos@gentoo.org</email>
-	<name>Rick Farina</name>
-</maintainer>
-<maintainer type="project">
-	<email>radio@gentoo.org</email>
-	<name>Radio</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/gr-foo/Manifest b/net-wireless/gr-foo/Manifest
deleted file mode 100644
index ee5a53ebad0b..000000000000
--- a/net-wireless/gr-foo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-foo-9999.ebuild 1219 BLAKE2B ff830fdcce826a6d0082e7eb0027cfa4116839911a4a3622d91d69e717ccf9cea6772b33590d7c5b418c550a9ed7748daa55a95e5ed055e3103e7527b5cde6a4 SHA512 858a6e2b6493dfca94cf69319136030011092b290833a91aa21599a534cc18347c2d803f16ac1a7e3cf6a75c9a342d3b0949644cbc472a79ebcb245e225a030c
-MISC metadata.xml 317 BLAKE2B a600d3d673f37d66dbb32b1480bc115a246665dc69ef42a9e7ea144bc9145b23fd01eae793a313e7f6ccba4d072e80b97430f3dfa4937ed606716cd4519eee66 SHA512 4a8573f02b2807a76df349c29d61cf6d64631dac6fa13a86579b8df9ccba8abe379168e47eef796b02cf6b93765ae4826c25189c3f012105e8d949a939c966f1
diff --git a/net-wireless/gr-foo/gr-foo-9999.ebuild b/net-wireless/gr-foo/gr-foo-9999.ebuild
deleted file mode 100644
index 035e0e058a23..000000000000
--- a/net-wireless/gr-foo/gr-foo-9999.ebuild
+++ /dev/null
@@ -1,48 +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} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bastibl/gr-foo.git"
-else
-	KEYWORDS=""
-fi
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Some GNU Radio blocks that bastianbl uses"
-HOMEPAGE="https://github.com/rftap/gr-rftap"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
-	net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0
-"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gr-foo/metadata.xml b/net-wireless/gr-foo/metadata.xml
deleted file mode 100644
index 3c76d261c682..000000000000
--- a/net-wireless/gr-foo/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="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">bastibl/gr-foo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index be91a7f66642..891bddd9d72c 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,6 +1,4 @@
-DIST gr-ieee802154-0.0_p20190606.tar.gz 195541 BLAKE2B f565808788c463816633774362be0bf6e6900db52051ef4f8e2eed5b110c7b9edcf05458f8a4a8e3afef59c4a76101a5606ea9c9023ad922162ee9466cc7e343 SHA512 b430ee6c16356307566619cd50258c3fd05ca198a67f0b47eea6b8d1038de6cc070823dd7392a56c4308cd74495802b4b52a4a425ce43ce4afb56386ec5fa39a
 DIST gr-ieee802154-0.0_p20191006.tar.gz 94443 BLAKE2B f561b401b97741e6a06d36b97be765f66778002c6ea7814ffcc08e7aa93d6236705a25c1f32d536d3e2d2193b92608cdd469ba086f459f0f8290c74f52297d6a SHA512 1c552cfe3739165382c36aeb8f556b17ee7925459d74c96d36a7b1f821e177860ddab601c87184cd33db9c97d1231edeb4267bbfbf9df198708db692e27a1a86
-EBUILD gr-ieee802154-0.0_p20190606.ebuild 1351 BLAKE2B 268f659fe1b7219fa2e515613fcbe0052637b847996193e436e87d7866783c54ae30d85a43657c030fe73b0f1f7d87558b936044e3abe85b3706ae4e85da1ec1 SHA512 68fa564c2187038c01221086ca7a7a86413c5bb6199a276d289722eb81fbe1a3f2e3803577aaeb1253ec6afbc6d5d5fdb3d22b6f9bfa75c3e384b69afad75183
 EBUILD gr-ieee802154-0.0_p20191006.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 EBUILD gr-ieee802154-9999.ebuild 1477 BLAKE2B 073a9067e81be3fdae9241348d525cef835d7c89766e84fe76a78319ccb951d7f072be1532d927f136f570bc8533d61a6e6de4a55a2d925cfb24563df16f6c12 SHA512 c05ac91dfccbe2ef6da651f9e7578fef44626256dbdb912dc049e16ae801a176e4092514f713b30ae1c1d3b3dc3fc91b3b62fea1211d80be65b172dc4863a39a
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
deleted file mode 100644
index 89e8afbf67b3..000000000000
--- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20190606.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
-HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
-	KEYWORDS=""
-else
-	COMMIT="d3d94023c71af9e6d7721f7412fba88ff5325234"
-	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
-	')
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
-	sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DGR_PKG_DOC_DIR="/usr/share/doc/${P}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
index 69cebe5eca97..d32a4894e1eb 100644
--- a/net-wireless/gr-iio/Manifest
+++ b/net-wireless/gr-iio/Manifest
@@ -1,6 +1,4 @@
-DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
 DIST gr-iio-0.3_p20191219.tar.gz 56149 BLAKE2B 9f95d3eadd1e7c87145093571442064d66a9ae72b2d49bdfb8a437757ede3ea7968184686741de45d9d5cadfd95d87c098f6262ff642a37cd5efbd0d14be061b SHA512 9664ce7e45c91389ce9bca0224451c592101a99f2a5ac6122ab822df8e0e8fb595fb8d0f55589237e76e9d3c49534c14902c1d991b75141decfa2e5cf983527c
-EBUILD gr-iio-0.3-r3.ebuild 787 BLAKE2B 09d0be1cc71419bd6860607576addfde2c65eff09cc7f60182467dcee686d6a044fe033a653b1db27971d68eee94a6ba7c4f6f7827ecc08191798a0f50a89938 SHA512 688f3b54237474f15eaa535b37025c0173cfd5034d78ef30524634700182a464f35f6c3805bf03cbc2de693a3dc0a902e475b61cc3c3894685fd4af7fb1d24ef
 EBUILD gr-iio-0.3_p20191219-r1.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 EBUILD gr-iio-9999.ebuild 985 BLAKE2B 605ee9494affec56200e04a799672e40ed0e04910dc4e2eaa9469cee9ab8906b247ec85b929e268756ab17f96fb338790bfec31302538cd23ea30b293c3c8db5 SHA512 c7ac95c53ba1d70a9e86a09bbf668209f3d37ea9e1b96f5217869ef5d85ad876d6a5cbf327a4c268bf3931ecb4a2807c76dfb839db3e611af6ec93d0421582aa
 MISC metadata.xml 434 BLAKE2B 565c3b42597436890ea7bc2d5b13d16720480e8932878c73bc3efe0708ca6ad2e900b7595248dfc0e25fbca17ad3f216bdfc02c0f29519013db5ac8137a09a7c SHA512 1e970d2cfc935f25ad3cde099739a9574c8bcae6a4e8c59d7aba6bd01319155d9bfc80124d2dad649f24aa7a937bdad7cc843525282f72b10e5e999eca7a4f49
diff --git a/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
deleted file mode 100644
index cc5dd36528ff..000000000000
--- a/net-wireless/gr-iio/gr-iio-0.3-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNU Radio IIO Blocks"
-HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	=net-wireless/gnuradio-3.7*:=
-	dev-libs/boost:=
-	net-libs/libiio:=
-	net-libs/libad9361-iio:="
-
-DEPEND="${RDEPEND}
-	sys-devel/flex:=
-	sys-devel/bison:=
-	dev-util/cppunit:=
-	dev-lang/swig:0"
diff --git a/net-wireless/gr-iqbal/Manifest b/net-wireless/gr-iqbal/Manifest
index e5d04e97efa2..7b76f89f19d1 100644
--- a/net-wireless/gr-iqbal/Manifest
+++ b/net-wireless/gr-iqbal/Manifest
@@ -1,6 +1,4 @@
-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 864 BLAKE2B 922265ce7d23112dd60ea4f9642a235bad372c495b9a21f6d7f20f6524e81409d70d8b4f0d130aa2d229835d4e92144cf14ab72abc28e60e35e50b3c10c3e50a SHA512 1732456dff3d84ddca603b54ab12bcdbc6775fd4df103cef6d1d96132464ee6d3ee19e8672e51c5b23f2ab034871350a044a5967eb57ecf31b7130c5ca0f9835
 EBUILD gr-iqbal-9999.ebuild 864 BLAKE2B 922265ce7d23112dd60ea4f9642a235bad372c495b9a21f6d7f20f6524e81409d70d8b4f0d130aa2d229835d4e92144cf14ab72abc28e60e35e50b3c10c3e50a SHA512 1732456dff3d84ddca603b54ab12bcdbc6775fd4df103cef6d1d96132464ee6d3ee19e8672e51c5b23f2ab034871350a044a5967eb57ecf31b7130c5ca0f9835
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild b/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
deleted file mode 100644
index c1920c8ed5ed..000000000000
--- a/net-wireless/gr-iqbal/gr-iqbal-0.37.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="gnuradio I/Q balancing"
-HOMEPAGE="http://git.osmocom.org/gr-iqbal/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-iqbal.git"
-else
-	SRC_URI="https://github.com/osmocom/gr-iqbal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="=net-wireless/gnuradio-3.7*:0=[${PYTHON_SINGLE_USEDEP}]
-	net-libs/libosmo-dsp:=
-	dev-libs/boost:=
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/gr-m2k/Manifest b/net-wireless/gr-m2k/Manifest
new file mode 100644
index 000000000000..f20c65541b2e
--- /dev/null
+++ b/net-wireless/gr-m2k/Manifest
@@ -0,0 +1,2 @@
+EBUILD gr-m2k-9999.ebuild 1011 BLAKE2B 2e93b4657199ec0300a674c9e1d72fd4c085134d45b99a96fed1e732635d5aef44f0987beb6bc2023259304652ebd2f1a1a5a2a74f2a2628fba481509741ede4 SHA512 0c04bc5c65a1b9d1c806fe3a2b3fb3ca3201d24fdca8058d4d0c20ae3bd5c9b2e69efb9d3783480499204ef31c7eafbee3e2b787df4aabb1bfc3a87ce78b0c42
+MISC metadata.xml 434 BLAKE2B 31c5fd25b051d7792a76722799e422e424352855c41bca00abcd91b7bfbc048ed639fe35e7583b47a2989b938bfe3711c15c8e3504d295872f56cbb4e3440788 SHA512 1ed58dcd37fd1916d7f817252dfdf5e17574aaaa2e9f2601f35d892b81d10e9b5e67536b943966519c0a3e3bd9d96a5490de8998a9a311862a0ac58246de0965
diff --git a/net-wireless/gr-m2k/gr-m2k-9999.ebuild b/net-wireless/gr-m2k/gr-m2k-9999.ebuild
new file mode 100644
index 000000000000..5ba99f4abc99
--- /dev/null
+++ b/net-wireless/gr-m2k/gr-m2k-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="A C++ library for interfacing with the ADALM2000"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-m2k"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-m2k.git"
+	inherit git-r3
+else
+	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
+	SRC_URI="https://github.com/analogdevicesinc/gr-m2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	=net-wireless/gnuradio-3.8*:=
+	net-libs/libiio
+	net-wireless/libm2k
+	"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DCMAKE_SKIP_BUILD_RPATH=TRUE
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#this seems to not compile things
+	python_optimize
+}
diff --git a/net-wireless/gr-ntsc/metadata.xml b/net-wireless/gr-m2k/metadata.xml
index 57a10860975c..683b3dae68f4 100644
--- a/net-wireless/gr-ntsc/metadata.xml
+++ b/net-wireless/gr-m2k/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Radio</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">kik/sdr-tv</remote-id>
+		<remote-id type="github">analogdevicesinc/gr-m2k</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/gr-ntsc-rc/Manifest b/net-wireless/gr-ntsc-rc/Manifest
deleted file mode 100644
index 4ed93c99938b..000000000000
--- a/net-wireless/gr-ntsc-rc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-ntsc-rc-9999.ebuild 861 BLAKE2B 2d9e90220fdc13a72068293460fc602d77ca979d766bb238d5119db282d5c7c8b744f729028b21b3218e2dcdf324f34e795b54d6cd2ee5fd919dca78dfb66f1e SHA512 a6e1e2d5cace59d67f3b2c2fb06af1fb976682d1739a4c6a859c0678d3830530c64481a75a372be381487a199e704ecab1d0b645491840d764bb540bbf8daebf
-MISC metadata.xml 431 BLAKE2B ea50ec1fb171b7338852942042e16e18a22c91b9cea930f1cf07a2f3c11562b382686185ad7526d14f7538fc66bfef5b16d076d8551820e7ef6ff8aaabb5ae0d SHA512 3b7b5ff2cd39626db4d679a5e4ff31df14d1377b438a3948cd10749fde6aa10ae477415f48ce6da5dab5b28ce174dfcfb60dab08e184758525b4eee83d9beeed
diff --git a/net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild b/net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild
deleted file mode 100644
index 0ec7eac6d1eb..000000000000
--- a/net-wireless/gr-ntsc-rc/gr-ntsc-rc-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="NTSC receiver and transmitter for 5 GHz drones"
-HOMEPAGE="https://github.com/lscardoso/gr-ntsc-rc"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/lscardoso/gr-ntsc-rc.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/lscardoso/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:="
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:="
-
-src_install() {
-	cmake-utils_src_install
-	dodir /usr/share/doc/${PF}
-	mv "${ED}"/usr/share/doc/gr-NTSC/* "${ED}/usr/share/doc/${PF}"
-	rm -rf "${ED}"/usr/share/doc/gr-NTSC
-}
diff --git a/net-wireless/gr-ntsc/Manifest b/net-wireless/gr-ntsc/Manifest
deleted file mode 100644
index b745c0deec47..000000000000
--- a/net-wireless/gr-ntsc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-ntsc-9999.ebuild 840 BLAKE2B a27e6d526814c4fbde07c81686e74f83ad1b70dc11be82ee960dac53f8944fd5ecc7254238ec92a0f8756cbbe89db83c671c7121c25ea0c0d8e62e926012efae SHA512 13a79107f938c6e70023ee2f798a65ecc185b0fce713228957b96b9e89245462653e5118fbe6e264cbeb6267572aa0e8a8b0a0627bac044e09176e8911cb72cc
-MISC metadata.xml 421 BLAKE2B 71d536c4fa8989dcccfb7c7e6b22ed6b83883f63eacaab51b501cf62956b8582e7805d47d43676a503236a4178c34d9ca6e7f39b0c4e8292a94865a395315204 SHA512 f278ce7ed1090b98382067bb1a7aaf48bfc8663aaf8c60a75e52e6c751346e4d31e7c7e689aab995a8ac8dd0550aa4e15f83e0d26db3b97e238735f6b2664aa2
diff --git a/net-wireless/gr-ntsc/gr-ntsc-9999.ebuild b/net-wireless/gr-ntsc/gr-ntsc-9999.ebuild
deleted file mode 100644
index e29ef7932782..000000000000
--- a/net-wireless/gr-ntsc/gr-ntsc-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="RTL2832U NTSC viewer"
-HOMEPAGE="https://github.com/kik/sdr-tv"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/kik/sdr-tv.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/kik/sdr-tv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:="
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:="
-
-S="${WORKDIR}/${PF}/gr-ntsc"
-
-src_install() {
-	cmake-utils_src_install
-	dodir /usr/share/doc/${PF}
-	mv "${ED}"/usr/share/doc/gr-ntsc/* "${ED}/usr/share/doc/${PF}"
-	rm -rf "${ED}"/usr/share/doc/gr-ntsc
-}
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index beabb1a299ef..20f3293518fd 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,8 +1,6 @@
-DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
 DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
 DIST gr-osmosdr-0.2.2.tar.gz 251425 BLAKE2B e1e29280b84139bf4b1b25ee35553f48abe7f26f9f240852c25f883ec6df406157d9b734035fd6df87e50b6d6f8ddab679ea91430558716acba05a9a64844c3d SHA512 42aef6efd35fd9184a371202398455de7cac3a88374e761359ab837a329495b653a95f5641f0a9533daeaa08c0d7fd5649b1b33359009dd4e8a3b9b24aedd2af
-EBUILD gr-osmosdr-0.1.5-r1.ebuild 1926 BLAKE2B a61337ac088431d18e5e2bd04b0bcf8c60b1519e07c0b86a61dbb23e74346796fdf1ff6a16258365f88f2bab3628934fafd8774d728c5f50befb2d68e3f9a5ce SHA512 3ebb20e9c58fd195b6c59d885cd0f4f6cc88af32dabd0cc2da2567eb0aa997cdbf72b616ad375350faa43c87bc3c4baae7dc3160d8e80c468bd47985c7c4383c
 EBUILD gr-osmosdr-0.2.0.ebuild 1966 BLAKE2B ae9b27b1b420dbda5d612aa75c67451008cad32e852da3765d25ae64e11d1202f3911d293ab45dd5fa88b854ba447705299f3412ea2e52f88060d5952116e731 SHA512 8e5882f21cbfe98f2bfae8f6e8c6fd8827e18234150f1557e28f4d53cd1778757b3a160ed1cbf6608e6de3de564c92c9e5d58ce4e435f2db21ee5caeef00af59
 EBUILD gr-osmosdr-0.2.2.ebuild 2199 BLAKE2B 90a673c1a90268b367a93f593a22e905d1a83ad4e43597564b8b10142cd8898996621851c1ca45a50bd2d892234b0467e6bf145ae08aba8d31fb309f02ee6a8a SHA512 141a81ca92922bbdf69f2731e1e20200a61372abb8b32d0be26ccb8679627b8b8b64d53a2e17147635df3a804700cf64118d39b48c69026efd911ddbcf73b28e
-EBUILD gr-osmosdr-9999.ebuild 1948 BLAKE2B a3f613241993c7efebdece14548cfe61c75cc5beb8efd0a463e2e83643658b0b921692908edb17fe401773b17ea8317f87be1491190449078bef9d1095a5ac55 SHA512 c4ff4d8d9fc20284b846886a1bc2a3ad6dc7c6ebc4a18af44616500cce0833fabec96d1c29ef44518073ef9729655f4cf0fdcad4a8482a761ce06e667a4cbf08
-MISC metadata.xml 965 BLAKE2B 6dbc466abe93e1ffef58f8f07ac4326ced3e9399c86fcb3135c16293065d0c9dfca6584e527b1d60f4fbaee6322ff6ed7a5c5a8ae20c8f985d0488a94352e8ea SHA512 2c744ddfec67ffd438ea76afc037e6ff7480d5349b63e00ac74dff191f33f3f9ecde08ee167b568b64a7dea33d3efbf67be582f1613bd8f8a5e0d29275a8da77
+EBUILD gr-osmosdr-9999.ebuild 1870 BLAKE2B e2146fd7533be269ecd9ebb06db93fee74fd41a1c9b01fdb9f4e9941ba8880d414686aff305c44d5a2803f8f2e2f924254053417305b59f43b9a176e203bc109 SHA512 3fa2aebcfee0cdc93ecd56a1a045d94d6bdf7e4e514cc25c10c0b4ad25b3d075a42cdd0695be7243f23c150da2ee37431e3d47d86c99b530f5f6d913c515021c
+MISC metadata.xml 906 BLAKE2B 7c95ce3b8aa4159311da0d1b52be2bbe8f455035a4b35a7e93b45beb0cd064c57520dcf1fb9e28578ee631d9f18fd76e6f88885adc4fd8518cf413eb39e0cce0 SHA512 4774699e05eb13ac4a006a68f8d5f173ddb5528561b71cee5e2e2e3a84b7ae843f0be621df245933e3ac250b6bc7b03494f6435b1d940c9e78844a563f449ef3
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
deleted file mode 100644
index 53e6a3392760..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
-else
-	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspy bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	=net-wireless/gnuradio-3.7*:0=[fcd?,${PYTHON_SINGLE_USEDEP}]
-	airspy? ( net-wireless/airspy )
-	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
-	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
-	sdrplay? ( net-wireless/sdrplay )
-	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_FCD="$(usex fcd)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_MIRI="$(usex mirisdr)"
-		-DENABLE_PYTHON="$(usex python)"
-		-DENABLE_RTL="$(usex rtlsdr)"
-		-DENABLE_RTL_TCP="$(usex rtlsdr)"
-		-DENABLE_SOAPY="$(usex soapy)"
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		python_fix_shebang "${ED}"/usr/bin
-	fi
-}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
index 9c632a04463c..00b281ec6758 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
@@ -29,7 +29,6 @@ RDEPEND="${PYTHON_DEPS}
 	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
-	mirisdr? ( net-libs/libmirisdr:= )
 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
@@ -47,7 +46,6 @@ src_configure() {
 		-DENABLE_BLADERF="$(usex bladerf)"
 		-DENABLE_HACKRF="$(usex hackrf)"
 		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_MIRI="$(usex mirisdr)"
 		-DENABLE_PYTHON="$(usex python)"
 		-DENABLE_RTL="$(usex rtlsdr)"
 		-DENABLE_RTL_TCP="$(usex rtlsdr)"
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 68a1bf0f0a5c..39125bb505e6 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="airspy">Build with Airspy support</flag>
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
-	<flag name="fcd">Build with Funcube Dongle support</flag>
 	<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest
index 35b24c2c72ff..a635ef0ad95b 100644
--- a/net-wireless/gr-paint/Manifest
+++ b/net-wireless/gr-paint/Manifest
@@ -1,6 +1,4 @@
-DIST gr-paint-0.0_p20200418.tar.gz 2129751 BLAKE2B 8767ff1ec791352dc701d0f7f68bbbd4088073379b4116ff2dbf2120b5e6e9b1a87ba0b0554a8489dc9b93cdb2ea5e3a8596b09482512fd1b10ea25d5b5c0fe9 SHA512 5f52e2baa090ed80d8a5b75846821b47163dcc055b94201fb59788bd85769a4e3f8c18654de45e68cb4088681b2db8b2327b5d14f176872bfe8bb2e01d7b6bfb
 DIST gr-paint-0.0_p20200517.tar.gz 1588114 BLAKE2B dffae6fdd6832ef7a39911b5f20d385e1691021e49659c36244c4aa1086fa74f4f59aceb4f208a24dd76854455183644c8f7db7e6ed0600664dc02f08e6682c5 SHA512 00b508b08baafd02e69197028a6408da81f5d1bf3dfe6d3229f248d60503ccec48f3fa0491bb785ed1ece40ea90d34544bc3b62e4506459488d56540b9d519c2
-EBUILD gr-paint-0.0_p20200418.ebuild 1098 BLAKE2B 1578dfee76801a9d4c8896794771cd913d25e6e700e89b3adfe4acfa72f4c16ea56827e61bb94949f1b50da968ffbe6df544a142d99c1b62b21e4a404ce1d90a SHA512 7fbd7d8090c1bf535702245e15eaaf0192dd9098657e4f918250d5f6957ddda066ea62a028a70df1e184161929802392fb3ea3a0913a3d99e7fcebac2e93287f
 EBUILD gr-paint-0.0_p20200517.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
 EBUILD gr-paint-9999.ebuild 1239 BLAKE2B 064df4e230b2fba16170e10b2802d61d0bd72ebea664d8a8eb4d4fda7bf00362198f28dee6edca2eef9c6c5e2b3ed9dcfc6f2a3b2630ded73b7106899e28a860 SHA512 a4da87078dd0297af87953bac720f160d92f58e33dedc669e150a5c3acf6af87ab1cb0692a246123bf5bd06b9e726e3f1b8cea938bcb7e64008563a0bb900c23
 MISC metadata.xml 426 BLAKE2B c0655dfe4af8bc17dc267dcadf37625b86e4830bc565044fe43b0911d166a19d6ab56dc73d2ad37890e5d0f83ca52fd078034fd6675310447361cebd2730b704 SHA512 10082af73f8e1acbf8a97062d4802b8ae6a3f187034933c7a14fe932aac3e654b3dde399ec33b3cf174c528ac77d41f2ab75969e39cb6e2f9c343ce52f7d0b64
diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
deleted file mode 100644
index d8339979c4e2..000000000000
--- a/net-wireless/gr-paint/gr-paint-0.0_p20200418.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/drmpeg/gr-paint.git"
-else
-	COMMIT="e36b2c638061d14f1b3c3bf3e889a8c99c273930"
-	SRC_URI="https://github.com/drmpeg/gr-paint/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64"
-fi
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="Paints monochrome images into the waterfall of a receiver"
-HOMEPAGE="https://github.com/drmpeg/gr-paint"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
-	')
-	=net-wireless/gnuradio-3.7*:=[${PYTHON_SINGLE_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	media-gfx/imagemagick
-"
-BDEPEND="
-	dev-lang/swig
-	dev-util/cppunit
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOXYGEN=$(usex doc)
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gr-ppm-wiegand/Manifest b/net-wireless/gr-ppm-wiegand/Manifest
deleted file mode 100644
index d46f5bed5dd4..000000000000
--- a/net-wireless/gr-ppm-wiegand/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-ppm-wiegand-9999.ebuild 1003 BLAKE2B b12a8730c7e5af19356347458c671fb912681371e8b25e3e0b0e55974f1dd5172b88f1718f24772340d394f8ad2b56cc4a540ce69d77c4d182a79f5fd0f01207 SHA512 72f7abf29e845b3c8ef13f9602c7f03124871a13c1a8d68416cfde3efc8311fb718aa9df09cc9d6a5370e58bf57d51c5c2a8fb8d69469143ae28fd51de69cf66
-MISC metadata.xml 433 BLAKE2B d35d74676208c0b6bd50a880912d7bb312424b305252bc986a9b384d9adfbf9a1dee32ff5b34451467b4c62e06cf6ec217a829eecf738c372661ec4ea34cdbf2 SHA512 44eb1c132d221835916d15dc141e9a04651e5648cdfcb7f09fa2f698d547fd2155407a55a751d0b59b049cc1dbfabef29ac73493357f57980f1dc50669154094
diff --git a/net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild b/net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild
deleted file mode 100644
index 6807b68ba670..000000000000
--- a/net-wireless/gr-ppm-wiegand/gr-ppm-wiegand-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GnuRadio PPM (Differential Pulse Position Modulation/Demodulation) plugin"
-HOMEPAGE="https://github.com/redsand/gr-ppm-wiegand"
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/redsand/gr-ppm-wiegand.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/redsand/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3+"
-SLOT="0"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	>=net-wireless/gnuradio-3.7.0:="
-
-DEPEND="${RDEPEND}
-	dev-libs/boost:=
-	dev-util/cppunit"
-
-src_configure() {
-	#not supported by upstream...yet
-	mycmakeargs=(
-		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install(){
-	default
-	dodir "/usr/share/doc/${PF}"
-	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${PF}"
-}
diff --git a/net-wireless/gr-rftap/Manifest b/net-wireless/gr-rftap/Manifest
deleted file mode 100644
index b0af9411bc49..000000000000
--- a/net-wireless/gr-rftap/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-rftap-9999.ebuild 1170 BLAKE2B 29333fb8ff876250f6f95471f1a33341f8a27cdf170c4c11c7234ffb243b483fd751fd48e66dde2403e266d8b9b9799a9877bc98c010fd7fffdcdf04fec9b7a6 SHA512 2f6421bcc1d9c24b9465a9a45a7b68bfd830cefbdedd39fc7aa6bab8390cf58bbc9460c859e37e7385699202b2e0e6e8a496823d84eb536c11718ad2719b4429
-MISC metadata.xml 317 BLAKE2B 4970c2c939374961593cf134bf3f1030d14fed37ebdc9c15369a1c94dc4786649920c349f9aa6ea76b7d56bd720ae560b4b7e900c046f573cc75c55d7429f658 SHA512 bd237119e49e0e715f528eea05fc9cb8fd758779209849c7a5e5ffd964c98b3912c63af8363192ba94db59d2b62a4dd28c9d1521d61b843b02fe3feb6ad9558a
diff --git a/net-wireless/gr-rftap/gr-rftap-9999.ebuild b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
deleted file mode 100644
index 54059b6ad6cd..000000000000
--- a/net-wireless/gr-rftap/gr-rftap-9999.ebuild
+++ /dev/null
@@ -1,48 +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} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rftap/gr-rftap.git"
-else
-	KEYWORDS=""
-fi
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="RFtap Module for GNU Radio"
-HOMEPAGE="https://github.com/rftap/gr-rftap"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig:0
-"
-#cppunit is listed in cmake, but only needed for tests and there are no tests
-#	dev-util/cppunit"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gr-rftap/metadata.xml b/net-wireless/gr-rftap/metadata.xml
deleted file mode 100644
index 390b5fa8048e..000000000000
--- a/net-wireless/gr-rftap/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="project">
-		<email>radio@gentoo.org</email>
-		<name>Radio</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">rftap/gr-rftap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest
new file mode 100644
index 000000000000..4b4190029110
--- /dev/null
+++ b/net-wireless/gr-scopy/Manifest
@@ -0,0 +1,4 @@
+DIST gr-scopy-0.0_p20201005.tar.gz 204034 BLAKE2B 17d797822c7920186a6d875119d582fda7b74f9c23248d9821ba172f59b1df1433520e723e4dc6b1eca1f08fb7256893767794b584d7c0bd53aa2ede80cd2b92 SHA512 12c0e76008b0a7570a85707afe28a102541e02f10a55346c76cb7984e8435e20281e6406c86ee22e8b4fbe0211bb6657f88f36bdf6b3b76d4e24b2a3f12e6350
+EBUILD gr-scopy-0.0_p20201005.ebuild 817 BLAKE2B 34f4f0a184905b9fbc65b7b539850a294215bd01fef104a7710fd7a804209f1f2a1ba1bde7701281aadf407ee33215ebdc8eead802513ceb7a42fa8d3e391fbe SHA512 11a0b6e0c89053466e396bfbbd7e6230982ac4e39b02e3e03bfc15adb6fc2c78e2349f76645743f3cc308f2b3af38e701b9faec55a41907c5aa58a5b16d0a2de
+EBUILD gr-scopy-9999.ebuild 817 BLAKE2B 34f4f0a184905b9fbc65b7b539850a294215bd01fef104a7710fd7a804209f1f2a1ba1bde7701281aadf407ee33215ebdc8eead802513ceb7a42fa8d3e391fbe SHA512 11a0b6e0c89053466e396bfbbd7e6230982ac4e39b02e3e03bfc15adb6fc2c78e2349f76645743f3cc308f2b3af38e701b9faec55a41907c5aa58a5b16d0a2de
+MISC metadata.xml 436 BLAKE2B 52dfd60f8ca67f146f2b8c98ade718465914ede481aa625ad269b58a98e5652a13abb398c85bb5688654547e0041045a776921197869180c675e98f1b555643a SHA512 09d9b7e861198b2476e6a852a476993c66a0d6a55fcaf712e6adef28ee016f1223e0c9fb7f9f89632fc5a4e8ca5d29c2af366216d35ce24f63b8527f20d20ec8
diff --git a/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
new file mode 100644
index 000000000000..f695c1501bb3
--- /dev/null
+++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20201005.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Scopy IIO blocks for GNU Radio"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git"
+	inherit git-r3
+else
+	COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3"
+	SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	=net-wireless/gnuradio-3.8*:=
+	sci-libs/volk:=
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
new file mode 100644
index 000000000000..f695c1501bb3
--- /dev/null
+++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Scopy IIO blocks for GNU Radio"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-scopy"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-scopy.git"
+	inherit git-r3
+else
+	COMMIT="f48b45cabe2a81f491137dbc220032ea65f080c3"
+	SRC_URI="https://github.com/analogdevicesinc/gr-scopy/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	=net-wireless/gnuradio-3.8*:=
+	sci-libs/volk:=
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	cmake_src_install
+	python_optimize
+}
diff --git a/net-wireless/gr-ntsc-rc/metadata.xml b/net-wireless/gr-scopy/metadata.xml
index 52c0f7d49939..5424315fd975 100644
--- a/net-wireless/gr-ntsc-rc/metadata.xml
+++ b/net-wireless/gr-scopy/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Radio</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">lscardoso/gr-ntsc-rc</remote-id>
+		<remote-id type="github">analogdevicesinc/gr-scopy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/gr-specest/Manifest b/net-wireless/gr-specest/Manifest
deleted file mode 100644
index 6bd156f99ab0..000000000000
--- a/net-wireless/gr-specest/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gr-specest-9999.ebuild 705 BLAKE2B c1ab054b70cc03ebcad46faf4554744ff34d4e4b3265e1021c61be668f41e1e1a36fe94390058f4a6b1b95f3ab134acee72f4bfcdc05359e1b3d1370287e32d6 SHA512 b2aed42b65770c00ac5dd8c8f6ed48bec96424b64f47afa75c4d6f2ee718ba0fdc2acd9066161cf03543088d5262085c1834e893ce547643261fcdd86f069172
-MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-specest/gr-specest-9999.ebuild b/net-wireless/gr-specest/gr-specest-9999.ebuild
deleted file mode 100644
index f6bdadd0aeb1..000000000000
--- a/net-wireless/gr-specest/gr-specest-9999.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 python-single-r1
-
-DESCRIPTION="A module adding spectral estimation routines to GNU Radio"
-HOMEPAGE="https://github.com/kit-cel/gr-specest"
-EGIT_REPO_URI="https://github.com/kit-cel/gr-specest.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_SINGLE_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-src_configure() {
-	mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gr-specest/metadata.xml b/net-wireless/gr-specest/metadata.xml
deleted file mode 100644
index 8a3f94073560..000000000000
--- a/net-wireless/gr-specest/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>zerochaos@gentoo.org</email>
-	<name>Rick Farina</name>
-</maintainer>
-<maintainer type="project">
-	<email>radio@gentoo.org</email>
-	<name>Radio</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 5f18b9a78a27..0d10f253989f 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -5,6 +5,6 @@ AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 B
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 8651030448176873599cf48122c958fbd48130506be543f674a5811cbf1fbca224e6b70610d737aba40d4880f9db976771df314e917b93f84edb1ef3a2bf2379 SHA512 c25fff3e0767cdaadb8f8c181916422b127f0851f66150333a2c1cda89493f1b162f63975f3eca6eb2d181121201a8b74a55436a4b540005bb9918f8c2180253
-EBUILD hostapd-2.9-r3.ebuild 7440 BLAKE2B b90a96b77b1fa2857fb1390ffb50791c8fa755f44d84f9817dceaf1546e620ee530e7fe18e6b725d35e3f6d4869866d28c5d7253b1c15b7c8f16fc9641299be0 SHA512 659e4f514d648dde03674edcd3bd3d5214cb46b380144006d18a145c4db806609faf37c7ecd3a976f65ba7bbeb5bbf839ceba2e029e2db13eb280effba181d67
+EBUILD hostapd-2.9-r3.ebuild 7437 BLAKE2B a5f58c2e465cec4b95d945c078c3695fa86c1b5372458bf32465daadfc7ef912489db1ba148c842deaf94db9ef655ed7943ad0bb06414427ed43c932116abb8a SHA512 956b2344bb31ced7059cb16a22b0f653497c5c502bcbd66c2ca76483f025beaca9257b5824c7925edc9b54fd05deae8424ca6f0de0a43909d27ab9f2b920eec8
 EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
 MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index af3b036853f5..b93c40f9893c 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="~amd64 ~arm arm64 ~mips ppc ~x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest
index e5a77667ec39..c75af7a59f77 100644
--- a/net-wireless/iw/Manifest
+++ b/net-wireless/iw/Manifest
@@ -1,3 +1,5 @@
 DIST iw-5.4.tar.xz 136252 BLAKE2B 0e69d1520a1a41f135207affd610e84f693e744d3c7891c7efd75451df0d7aac84be71d02a72b5c08d0b8d850b29b8ed7afb4c3481ef0bd1bef98f14c3f3aaeb SHA512 84408194e5b3a2f119ae9711d856ecb4343734ebb91150e0441b2410af8f75f460ce9ab1ce7151b0dda3926270bcb80fa684058945b7549c98964a0379e39ba2
+DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be
 EBUILD iw-5.4.ebuild 856 BLAKE2B 05b0e85c02c9725debe89421d81d83860a8e958e2483ab31c34aea1071daf7cc5bc748b5ec88311660f0e3a49793b0b614141ccec371cf389ffdce1635e65003 SHA512 70cfd3f166c350c8fe388b0f6f70a6c7d96857d937bec00f246f67ca5c8648b4bdddfdd5d90bc0926bed34c5bd74feb294a238c2c3aee9e60a2961215502a669
+EBUILD iw-5.9.ebuild 861 BLAKE2B 069df6bd51d3447a30bf123d6672b2161ac0fb221e771f309df822ffb11683607cd4636e7c05d14a3302bc7fb153c061cb54ee6e7fe90b455483e47683fdc61b SHA512 c2eae8d8e3dd38905c81c44e594c627cb3c117573556f51b82cd50d38bc2b1e70df38b6c4a74abbfa537c0f8ca4dcfd291cbd3ff95a08bee55cde63061df0ee6
 MISC metadata.xml 325 BLAKE2B 4081db738ce07e18a087d3517e082f3aca70e17aa3e7fe371795cac7fead6fcd6a8226817fc0d995a8be9e43cb56617c345b64abbaf806ced7a96246538db9a5 SHA512 4d4ca6e03b9d43532e35b043873f134e47176b9e22b9c61e19a129726e2685218beecf31148ec5d3eba6cd02a0f818c1e2032e5bda247a1e51bafcbd7b951cea
diff --git a/net-wireless/iw/iw-5.9.ebuild b/net-wireless/iw/iw-5.9.ebuild
new file mode 100644
index 000000000000..f87a241976d3
--- /dev/null
+++ b/net-wireless/iw/iw-5.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack"
+HOMEPAGE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-libs/libnl:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	tc-export CC LD PKG_CONFIG
+
+	# do not compress man pages by default.
+	sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+	LDFLAGS="${CFLAGS} ${LDFLAGS}" \
+	emake V=1
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 996289cf196b..047b5f4a7ea0 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -5,6 +5,6 @@ AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f3
 DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
 DIST iwd-1.9.tar.xz 883616 BLAKE2B 57dd4a6e00d73bcfb752e1bd3661e97251d1dab4c05638d148ae7031bff35d606063f79e575ed4d3d3a60ff5514eb3fc340e1eec4c2e7074bf8d6d4b79832f6d SHA512 d8762495f7f5a342476653c0cf64c31b3b41a3064a05c4fcf49b9faf4394b0d7a5db6aae6324896bdc8f7b104697fb4c4315f7073a4fde4fc87f8f55d932538b
 EBUILD iwd-1.8-r3.ebuild 4477 BLAKE2B d80632f00a31b5f1f751373701f80602d34e8fb8cec14316f5405a76af1df1cbed79f0b786d3f9e3e2bce2d54f7ee72ffcb0595455e9095c87c55b68b9f4b50f SHA512 d9b44088c2a4ddc0b42831ffca847daa1570d72583526a669c2178fff2a8d2c0cbf5415dc6f4d3edc2991fc588951e546de4b67449f721fa4e2ad71d2fd52e1e
-EBUILD iwd-1.9-r1.ebuild 4870 BLAKE2B 9e65385109c3d3125878351d0324c4fca5550487f67a34bedd69cd986552ea5dd40ee701696e041145be744124c8d78a888f8b5acd26d1c785efcd4f711c7c50 SHA512 d8188fa38f588b66355e89f42abf712670ad1d4dc07c5e8fd8e0345791d7cfbc3b9f1fe61db379d16c3fff76d9252b07d4309be0e60af672c4b2de5ff7986d6a
+EBUILD iwd-1.9-r1.ebuild 4885 BLAKE2B b648703ecd98f049847a6d9e68e67556648269405db9eee067258ae2cc4a34c493dd9842864226c5184e1512329b65eb1f6b95b561a8f64d28fd2e8c6478db37 SHA512 8e3ab57f8ec33631b4ddb7d0972dfcdef909b3cb382f5ad197b0b5248d2bbb6e38a061968b6603a7182e0a87618a1d3e95ecd75239dddcfbc2d3ea700fe0ab0f
 EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
 MISC metadata.xml 832 BLAKE2B 5f9e80bd6e64bb7542509fa934e5fba8f433781f35b0c5e3f0dcae48a4a4cd3ecf23312241358daeccc0429f8bd74651531b7d628ec19f6af16714027ff8ddc2 SHA512 06950191a98edb0453b80500c0c1b7ca879fea962cd13f5ad695923d866edb4aa99753750d67110eac0a790d8ddeff9154add4fc8793d34af35870e13e8a6464
diff --git a/net-wireless/iwd/iwd-1.9-r1.ebuild b/net-wireless/iwd/iwd-1.9-r1.ebuild
index d9b58be0e827..c170b16a7f3c 100644
--- a/net-wireless/iwd/iwd-1.9-r1.ebuild
+++ b/net-wireless/iwd/iwd-1.9-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"
@@ -174,6 +174,7 @@ src_install() {
 		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
 		echo "[Network]" >> "${iwdconf}"
 		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		dodir /etc/conf.d
 		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
 	fi
 }
diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
deleted file mode 100644
index 65bb332d41dc..000000000000
--- a/net-wireless/kismet-ubertooth/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571
-EBUILD kismet-ubertooth-2017.03.2.ebuild 1402 BLAKE2B 3f1ae3793fca725e35eb9b4b44cffafde23f8836618dfdafdccbb7393ceb7f86e4c860f3bf81da980effc048754fed5f4902e05c6134889c76bfd7de580fde38 SHA512 c585a8cbe819c7d473fc5aa812157e993788796799365a5798399a2d069b9a9720c6144a6e3b3603d165f08a8f088056dccb78bdffb4a43488fca0387b6280f4
-EBUILD kismet-ubertooth-9999.ebuild 1402 BLAKE2B 3f1ae3793fca725e35eb9b4b44cffafde23f8836618dfdafdccbb7393ceb7f86e4c860f3bf81da980effc048754fed5f4902e05c6134889c76bfd7de580fde38 SHA512 c585a8cbe819c7d473fc5aa812157e993788796799365a5798399a2d069b9a9720c6144a6e3b3603d165f08a8f088056dccb78bdffb4a43488fca0387b6280f4
-MISC metadata.xml 393 BLAKE2B f37f4208ce8be998d00855d32214adc4bf24ff29336a4864473dbbce9fa1516ef82caf8480c095949607e39e32bc3a125dd1b2aa89b715e887c8324749bdd5f6 SHA512 893bb1eced169c39d3d8af2f45ce45ab6ca0d502214071d28ec8d16c31c4e5c9ee4519e54da611bebbe4eee4a95e0fc95ce81aa7587cc121758ef5f0bd9448a6
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild
deleted file mode 100644
index c0ebcd76347b..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-2017.03.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S="${WORKDIR}/ubertooth-${MY_PV}"
-	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:=
-	<net-wireless/kismet-2017.0.0
-	>=net-wireless/ubertooth-${PV}:=
-	>=net-libs/libbtbb-${PV}:=
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
deleted file mode 100644
index c0ebcd76347b..000000000000
--- a/net-wireless/kismet-ubertooth/kismet-ubertooth-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	MY_PV=${PV/\./-}
-	MY_PV=${MY_PV/./-R}
-	S="${WORKDIR}/ubertooth-${MY_PV}"
-	SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Provides basic bluetooth support in kismet"
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE=""
-
-DEPEND=">=net-wireless/kismet-2011.03.2-r1:=
-	<net-wireless/kismet-2017.0.0
-	>=net-wireless/ubertooth-${PV}:=
-	>=net-libs/libbtbb-${PV}:=
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake KIS_SRC_DIR="/usr/include/kismet/"
-}
-
-src_install() {
-	if has_version =net-wireless/kismet-9999; then
-		cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
-	else
-		cd "${S}/host/kismet/plugin-ubertooth" || die
-	fi
-	emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
-}
-
-pkg_postinst() {
-	ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
-}
diff --git a/net-wireless/kismet-ubertooth/metadata.xml b/net-wireless/kismet-ubertooth/metadata.xml
deleted file mode 100644
index a3cffdff6714..000000000000
--- a/net-wireless/kismet-ubertooth/metadata.xml
+++ /dev/null
@@ -1,12 +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="github">greatscottgadgets/ubertooth</remote-id>
-		<remote-id type="sourceforge">ubertooth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index abb2aab202a1..44cd62ef014b 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,13 +1,8 @@
-AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
-AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
-AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
-DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
 DIST kismet-2020-04-R3.tar.xz 3159552 BLAKE2B 458c40dea530008295d46aadaf15699a0fd9025bb572cb23e94f059f31bba2835dedd9c39725d0183e84d31c326c2769450ce0b8bee7e7ca3bb7ac9dd82f4cc6 SHA512 585def7f19f479c6049cbc24e3886276d816f584fcb2070009cd90e35b33630d3e544145abf5f8b1eae87ec571a213ed9cb9f6b81345257c9bf1332d5bb319c2
 DIST kismet-2020-09-R4.tar.xz 8692520 BLAKE2B 68098080cfca6968538ecf4840a3ab06f95bfe9b72829dc7ea551b1a5f15d5b65fbfaa8cecfef19a537abf081d0c4e2b2ffdedc0e34023a3393013227c898d97 SHA512 4f2dd641999dd2675d2c4dfbe28caf5a8476d5d7bd9dedeefb7b1420b48b9155a4d576123832974586d51c61ca4d77d8572ab7038da3ec6fa2a7791f3e1a1479
-EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 9d2cb57cc3728ebaeb8ccf8b9ed4716473c4930d006d4b6f1b5badb21e6433da49b24e4d9a1f41dff698ec198cae7d09450266a78f7be67b65cfbfd61b459ca2 SHA512 4463682c7ebba71368ecb28f9ac89789be91de8c11f2ff3a1395ad4101f3ce8da2fef5e0622d211b885b9d1cacde82f27cd73aeb1079b6415af7b232dd730090
 EBUILD kismet-2020.04.3.ebuild 4981 BLAKE2B 62fcf37f04f9651f33c8686e31f387eb237498a4030a07636c922823167a59e69d9896789fa908f432af41c8f6701c3044996dd2229be6eb67ca455bd8b858ca SHA512 dd6e4ddbbbb1847574e35a66413f0d208b02c9ade36f4f4646920df86fc714466aeea3f357f7541cf10bff4e38e7b86ca1a2aead7a8a60c4a18eb9230875355a
 EBUILD kismet-2020.09.4.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
-EBUILD kismet-9999.ebuild 5271 BLAKE2B 1fbb78f42a55aa7bb106804dffffadc1df44a9f2748a5c43d7bb277bea00f886a748274b238057eb0eff598862b7005c8692df0b1637f7c102865eb7e8ce4e11 SHA512 f2dc77125cce758bb8d4ec839055ec18ee83979b208c4242a7b41ff298ceba2fb76324ce1587a6322d01017a1c3980f0ede39425ab3848d90ba069cb0f843c9b
-MISC metadata.xml 1445 BLAKE2B e915106684538d82bbd7488f9a1e37990a6b7c8bec8265db850797beeacdef58671f5635f186c21afca9c0c0964fcdb8bf6589d9d235e3e91eaa0c0d88dc5548 SHA512 33bafa9ff07daa54dcca14b76a80f01ed483e0952abe254f9a9627655f998922e7a2ff006fa6e24d6009af5ce78dd43ac43900f0ea61a22541110ce5b7d6cc86
+EBUILD kismet-9999.ebuild 5353 BLAKE2B 021a715e070f8d03aaf4fa02c8e45eac65c26c73c8997d908cf37b832b6c4cd6c9372e688c30580012e8c52c9bdd1b2c028f1250c5765967bc122b9bfa71b186 SHA512 956d4ca0b78278de7cff8815eecfbadb703924cd3e894bcbb5a01933dce10ead7dbad7b82da463dab48194b49ded34ce2e5418532c3802319a2525485682fb1f
+MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch b/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
deleted file mode 100644
index bdfde9fbc7c2..000000000000
--- a/net-wireless/kismet/files/kismet-2016.07.1-ruby-fixes.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/ruby/kismet.rb b/ruby/kismet.rb
-index 5b18b23..7eab708 100755
---- a/ruby/kismet.rb
-+++ b/ruby/kismet.rb
-@@ -61,8 +61,6 @@ class Kismet
- 		rescue Exception => e
- 			pp e
- 
--			break if @die
--
- 			puts "write error: #{$!}"
- 		end
- 	end
-diff --git a/ruby/kismet_addsource.rb b/ruby/kismet_addsource.rb
-index 057a514..d3ae968 100755
---- a/ruby/kismet_addsource.rb
-+++ b/ruby/kismet_addsource.rb
-@@ -20,7 +20,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require 'optparse'
- 
-diff --git a/ruby/kismet_alert_syslog.rb b/ruby/kismet_alert_syslog.rb
-index 6969247..27373a9 100755
---- a/ruby/kismet_alert_syslog.rb
-+++ b/ruby/kismet_alert_syslog.rb
-@@ -20,7 +20,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require "getopt/long"
- require 'syslog'
-diff --git a/ruby/kismet_list.rb b/ruby/kismet_list.rb
-index ec8f0f9..7adffe6 100755
---- a/ruby/kismet_list.rb
-+++ b/ruby/kismet_list.rb
-@@ -20,7 +20,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- 
- def bssidcb(proto, fields)
- 	puts "Kismet saw network #{fields['bssid']} manuf #{fields['manuf']} on channel #{fields['channel']}"
-diff --git a/ruby/kismet_shootout.rb b/ruby/kismet_shootout.rb
-index 25021b9..61f70b0 100755
---- a/ruby/kismet_shootout.rb
-+++ b/ruby/kismet_shootout.rb
-@@ -21,7 +21,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require 'optparse'
- 
-diff --git a/ruby/kismet_sql.rb b/ruby/kismet_sql.rb
-index 9fe581d..b878979 100755
---- a/ruby/kismet_sql.rb
-+++ b/ruby/kismet_sql.rb
-@@ -22,7 +22,7 @@
- 
- require 'socket'
- require 'time'
--require 'kismet'
-+require_relative 'kismet'
- require 'pp'
- require "getopt/long"
- require "sqlite3"
diff --git a/net-wireless/kismet/files/kismet.confd b/net-wireless/kismet/files/kismet.confd
deleted file mode 100644
index d203513c7143..000000000000
--- a/net-wireless/kismet/files/kismet.confd
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet.conf
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet_server, see `kismet_server --help`
-KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/files/kismet.initd b/net-wireless/kismet/files/kismet.initd
deleted file mode 100644
index 000e6ea03cdf..000000000000
--- a/net-wireless/kismet/files/kismet.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-checkconfig() {
-	if [ ! -e /etc/kismet.conf ]; then
-		eerror "Configuration file /etc/kismet.conf not found"
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting kismet server"
-	start-stop-daemon --start --quiet --pidfile /var/run/kismet_server.pid \
-		--background --make-pidfile --exec /usr/bin/kismet_server \
-		-- ${KISMET_SERVER_OPTIONS}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping kismet server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/kismet_server.pid
-	eend ${?}
-}
diff --git a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild b/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
deleted file mode 100644
index 17f5963fa10c..000000000000
--- a/net-wireless/kismet/kismet-2016.07.1-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib user
-
-MY_P=${P/\./-}
-MY_P=${MY_P/./-R}
-S=${WORKDIR}/${MY_P}
-
-SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86"
-
-DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
-HOMEPAGE="https://www.kismetwireless.net"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="+client +pcre speech +plugin-autowep +plugin-btscan plugin-dot15d4 +plugin-ptw +plugin-spectools +plugin-syslog +ruby selinux +suid"
-
-CDEPEND="net-wireless/wireless-tools
-	kernel_linux? ( sys-libs/libcap
-			dev-libs/libnl:3
-			net-libs/libpcap
-			)
-	pcre? ( dev-libs/libpcre )
-	suid? ( sys-libs/libcap )
-	client? ( sys-libs/ncurses:0= )
-	!arm? ( speech? ( app-accessibility/flite ) )
-	plugin-btscan? ( net-wireless/bluez )
-	plugin-dot15d4? ( virtual/libusb:0 )
-	plugin-spectools? ( net-wireless/spectools )
-	plugin-ptw? ( dev-libs/openssl:= )
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
-	ruby? ( dev-lang/ruby:* )
-	selinux? ( sec-policy/selinux-kismet )
-"
-
-src_prepare() {
-	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
-		conf/kismet.conf.in
-
-	# Don't strip and set correct mangrp
-	sed -i -e 's| -s||g' \
-		-e 's|@mangrp@|root|g' Makefile.in
-
-	epatch "${FILESDIR}/${P}-ruby-fixes.patch"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable client) \
-		$(use_enable pcre)
-}
-
-src_compile() {
-	emake
-
-	if use plugin-autowep; then
-		cd "${S}"/restricted-plugin-autowep
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake
-	fi
-}
-
-src_install() {
-	if use plugin-autowep; then
-		cd "${S}"/restricted-plugin-autowep
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-btscan; then
-		cd "${S}"/plugin-btscan
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-dot15d4; then
-		cd "${S}"/plugin-dot15d4
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-ptw; then
-		cd "${S}"/restricted-plugin-ptw
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-spectools; then
-		cd "${S}"/plugin-spectools
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use plugin-syslog; then
-		cd "${S}"/plugin-syslog
-		KIS_SRC_DIR="${S}" emake DESTDIR="${ED}" LIBDIR="$(get_libdir)" install
-	fi
-	if use ruby; then
-		cd "${S}"/ruby
-		dobin *.rb
-	fi
-
-	cd "${S}"
-	emake DESTDIR="${D}" commoninstall
-
-	##dragorn would prefer I set fire to my head than do this, but it works
-	##all external kismet plugins (read: kismet-ubertooth) must be rebuilt when kismet is
-	##is there an automatic way to force this?
-	# install headers for external plugins
-	insinto /usr/include/kismet
-	doins *.h
-	doins Makefile.inc
-	#todo write a plugin finder that tells you what needs to be rebuilt when kismet is updated, etc
-
-	dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
-
-	insinto /etc
-	doins conf/kismet{,_drone}.conf
-
-	if use suid; then
-	dobin kismet_capture
-	fi
-}
-
-pkg_preinst() {
-	if use suid; then
-		enewgroup kismet
-		fowners root:kismet /usr/bin/kismet_capture
-		# Need to set the permissions after chowning.
-		# See chown(2)
-		fperms 4550 /usr/bin/kismet_capture
-		elog "Kismet has been installed with a setuid-root helper binary"
-		elog "to enable minimal-root operation.  Users need to be part of"
-		elog "the 'kismet' group to perform captures from physical devices."
-	fi
-	if ! use suid; then
-		ewarn "It is highly discouraged to run a sniffer as root,"
-		ewarn "Please consider enabling the suid use flag and adding"
-		ewarn "your user to the kismet group."
-	fi
-}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 06840c1eb328..ef1ead221a27 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit autotools eutils multilib python-single-r1 udev systemd
 
@@ -45,7 +45,8 @@ CDEPEND="
 	dev-libs/elfutils:=
 	sys-libs/zlib:=
 	dev-db/sqlite:=
-	net-libs/libmicrohttpd
+	net-libs/libmicrohttpd:=
+	net-libs/libwebsockets:=[client]
 	kernel_linux? ( sys-libs/libcap
 			dev-libs/libnl:3
 			net-libs/libpcap
@@ -55,6 +56,7 @@ CDEPEND="
 	dev-libs/protobuf:=
 	$(python_gen_cond_dep '
 		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
 	')
 	sys-libs/ncurses:=
 	lm-sensors? ( sys-apps/lm-sensors )
diff --git a/net-wireless/kismet/metadata.xml b/net-wireless/kismet/metadata.xml
index f9a1efd46a10..c596280be249 100644
--- a/net-wireless/kismet/metadata.xml
+++ b/net-wireless/kismet/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name="client">Build the ncurses-based user interface</flag>
 		<flag name="libusb">Support libusb based capture sources such as mousejack, cc2540(ble), and nrf51822(ble)</flag>
 		<flag name="suid">
 			Install a setuid root helper binary with limited functionality;
@@ -14,15 +13,7 @@
 			reducing security risks
 		</flag>
 		<flag name="pcre">Build with pcre support</flag>
-		<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
-		<flag name="plugin-autowep">Build the autowep plugin</flag>
-		<flag name="plugin-btscan">Build the btscan plugin</flag>
-		<flag name="plugin-dot15d4">Build the dot15d4 plugin</flag>
-		<flag name="plugin-ptw">Build the ptw plugin</flag>
-		<flag name="plugin-spectools">Build the spectools plugin. This uses <pkg>net-wireless/spectools</pkg></flag>
-		<flag name="plugin-syslog">Build the syslog plugin.</flag>
 		<flag name="rtlsdr">Enable rtlsdr based kismet capture sources</flag>
-		<flag name="ruby">Build extras which are written in ruby, example plugins and the like.</flag>
 		<flag name="ubertooth">Enable capture source for ubertooth to sniff bluetooth low energy</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-wireless/libm2k/Manifest b/net-wireless/libm2k/Manifest
new file mode 100644
index 000000000000..cea6f8fb1913
--- /dev/null
+++ b/net-wireless/libm2k/Manifest
@@ -0,0 +1,4 @@
+DIST libm2k-0.0_p20201005.tar.gz 590923 BLAKE2B 47b018ca8524a30d2d22c387c45361a3765ef356a481ff144783e459f673f3c00ba122cfc086b4f7d3cef2f6847b9adee3bc1eec4f6ee52eb355a9625b29b7c6 SHA512 60ca79048408e3ee6b09978f417cc8a0b67982fe9ac62563331c96fb503af22b050803f9d10598e9edd02eb3af396c1ad0d16772ae3cd3d16c251bd588a682c8
+EBUILD libm2k-0.0_p20201005.ebuild 991 BLAKE2B 93700169646a26cc02aa5a8f6b2bbb7249c9e030c0cee08adb4e001cab875a7270abf7cde13da836841f1caecab018e3fb81e3b3405891e17d615a89ac89dee8 SHA512 f4badd6debb148a8d5b1e82addfaee4e258bc935bd199e7870651501aece20fc4987db2741cc2d43deb905297c075988421ec8cad9135f656371525420b13041
+EBUILD libm2k-9999.ebuild 991 BLAKE2B 93700169646a26cc02aa5a8f6b2bbb7249c9e030c0cee08adb4e001cab875a7270abf7cde13da836841f1caecab018e3fb81e3b3405891e17d615a89ac89dee8 SHA512 f4badd6debb148a8d5b1e82addfaee4e258bc935bd199e7870651501aece20fc4987db2741cc2d43deb905297c075988421ec8cad9135f656371525420b13041
+MISC metadata.xml 434 BLAKE2B ee59215337ebe6103d9b550b50e381777b127cac44de0c642917dcfaeba038aac25e90440232d59c9f8b0e0e247922507a6f43861d1542aaabdc146176a54c8e SHA512 1e626748df18992eb4ab12b95ab5ed01b3ba1f8ddae1b00a9bb13b2430fd7313c16f1ae102f9d7ffeeb2797d3ac433749f13f95e44a0a11771b99226511308f6
diff --git a/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild b/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
new file mode 100644
index 000000000000..25cde65f485c
--- /dev/null
+++ b/net-wireless/libm2k/libm2k-0.0_p20201005.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1 udev
+
+DESCRIPTION="A C++ library for interfacing with the ADALM2000"
+HOMEPAGE="https://github.com/analogdevicesinc/libm2k"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git"
+	inherit git-r3
+else
+	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
+	SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libiio
+	"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
+		-DCMAKE_SKIP_BUILD_RPATH=TRUE
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#this seems to not compile things
+	python_optimize
+}
diff --git a/net-wireless/libm2k/libm2k-9999.ebuild b/net-wireless/libm2k/libm2k-9999.ebuild
new file mode 100644
index 000000000000..25cde65f485c
--- /dev/null
+++ b/net-wireless/libm2k/libm2k-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1 udev
+
+DESCRIPTION="A C++ library for interfacing with the ADALM2000"
+HOMEPAGE="https://github.com/analogdevicesinc/libm2k"
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libm2k.git"
+	inherit git-r3
+else
+	COMMIT="f98dfa42134d2dff458c7832842d1f51c3131aa4"
+	SRC_URI="https://github.com/analogdevicesinc/libm2k/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libiio
+	"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+"
+
+src_configure() {
+	mycmakeargs=(
+		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
+		-DCMAKE_SKIP_BUILD_RPATH=TRUE
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	#this seems to not compile things
+	python_optimize
+}
diff --git a/net-wireless/gr-ppm-wiegand/metadata.xml b/net-wireless/libm2k/metadata.xml
index 4c5cd62965d6..5e6b1e4eb830 100644
--- a/net-wireless/gr-ppm-wiegand/metadata.xml
+++ b/net-wireless/libm2k/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Radio</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">redsand/gr-ppm-wiegand</remote-id>
+		<remote-id type="github">analogdevicesinc/libm2k</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index b8fdf4a5791a..6e1fbe34ce72 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,8 +1,4 @@
-DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
-DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
-EBUILD lorcon-0.0_p20150109.ebuild 1323 BLAKE2B b6339a31e80485e9169453e69c2311f964eb2995e613001ffb033cac40581868124d1635f56d627291224dcc2346778c269d0c5e4f65682c7e4b99cfc01e02d2 SHA512 1933c94718b830c9c5a24a78dec8835f82b5c30c43bd6fde38bfa994c8916c19eba7b3b49912ef9f7f5e7b5313fcdd55a127b81f88126c6c31ad7ada4d0b5927
-EBUILD lorcon-0.0_p20180409-r1.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
-EBUILD lorcon-0.0_p20200214.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
-EBUILD lorcon-9999.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
+EBUILD lorcon-0.0_p20200214.ebuild 1498 BLAKE2B 36c71df3685620bb30a13dc94c0b16f1e218e98e214d8edcff3a6bb0bbd8dbe3134613081591f07a07978d41d6d915965f3c491a9ef5c0c8eb049f5c9fcf91e0 SHA512 edb2e112a1f811ea364c3817209246ada32ca516ab090d0b681539d33cd739a7a5eef580045e01192322f4922924790b9ae7c4ddde4f149547eb6d156f95a4ad
+EBUILD lorcon-9999.ebuild 1502 BLAKE2B b7a4b4565d0351638a82b71dc98460a32ab809a7b0f72d76af72ec64912b644d30008919afe5604c593abe59ef5ba59e3a72ba9576a7bf7f8959f3895217915d SHA512 3866484a05980975e8aa64315b582aa5f96f942ad19ddcaebe207c589d5dd8d6c06f373527f1de230884759c0769e99ce41c2d27e498074d83ddd6e36de5636c
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
deleted file mode 100644
index 715e6dd1a8c6..000000000000
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="http://802.11ninja.net/lorcon"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-	dev-libs/libnl:3=
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"/${P}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cp -R "${S}/" "${WORKDIR}/all"
-	fi
-	default_src_unpack
-}
-
-src_prepare() {
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	default_src_configure
-}
-
-src_compile() {
-	default_src_compile
-	if use python; then
-		LDFLAGS+=" -L${S}/.libs/"
-		cd pylorcon2 || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	if use python; then
-		cd pylorcon2 || die
-		distutils-r1_src_install
-	fi
-}
-
-src_test() {
-	:
-}
diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
deleted file mode 100644
index d9ac3ecfbee9..000000000000
--- a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1
-
-DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="https://github.com/kismetwireless/lorcon"
-
-if [[ ${PV} == "9999" ]] ; then
-	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
-	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}"/${P}
-else
-	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
-	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-
-DEPEND="
-	python? ( ${PYTHON_DEPS} )
-	dev-libs/libnl:3=
-	net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cp -R "${S}/" "${WORKDIR}/all"
-	fi
-	default_src_unpack
-}
-
-src_prepare() {
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
-	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
-	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	default_src_configure
-}
-
-src_compile() {
-	default_src_compile
-	if use python; then
-		LDFLAGS+=" -L${S}/.libs/"
-		cd pylorcon2 || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	if use python; then
-		cd pylorcon2 || die
-		distutils-r1_src_install
-	fi
-}
-
-src_test() {
-	:
-}
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
index 7e81f8596710..13d500f801a5 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -20,7 +20,7 @@ else
 	GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
@@ -50,7 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	default_src_configure
+	econf --disable-static
 }
 
 src_compile() {
@@ -68,5 +68,5 @@ src_install() {
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
-	find "${D}" -xtype f -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index 7e81f8596710..5f2fea92453c 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	default_src_configure
+	econf --disable-static
 }
 
 src_compile() {
@@ -68,5 +68,5 @@ src_install() {
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
-	find "${D}" -xtype f -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-wireless/mousejack/Manifest b/net-wireless/mousejack/Manifest
deleted file mode 100644
index 9d0973cb2515..000000000000
--- a/net-wireless/mousejack/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mousejack 858 BLAKE2B 5989e4f8c6645bc2feb8fe2ebbb9d2a2b5beba328016aa3c0c53ff20720b8e62cd08f83dc08dc608eb1b8ff27f3a92ea0a547547074bf9cca56276b0e63caad3 SHA512 31c89a7d85ab36a978439ecaaa03dbae1b1e8511d3aa02b1acb521854d81b4e8c012c202792abbf28f25283ec718ad4abd4d14a16ba4c8ead073c054490e9c84
-DIST mousejack-0.0_p20160726.tar.gz 34252 BLAKE2B 7511d29aa94f2fb5590b34d52eaa64150f3931933f043c9028e2d9cae61342a314a369e80e51e1150294afaadca06e58ec71ba4df4150a7a58d9a82d28919a58 SHA512 01fc87a347aea9ccad7611ef494da0521da278b7664e511409f0f822327b02f6fb555c5b5da86aae998b8fd34b7a55260d03594fbd9bb61c3ceca77e7d54958c
-EBUILD mousejack-0.0_p20160726-r2.ebuild 1290 BLAKE2B 033a8ce1143e0762ffea92f11bca5243e27795baa346c340021c3ca508d27c071ecd845e83731ffe693c63dda158487b5c40aa1ecbcbacc7a806966d3cb5680c SHA512 99be115e435f1fb455e267c1576577c55f90071dba74e25ac91b3f6055a456d1c10d727a75d7e227650ee8456e63596d652bb686e773dea95516f6666ab413c9
-MISC metadata.xml 360 BLAKE2B ca2e678d3f96cece827270a7c5ee404a5e926c0a231979c4cc4442085fde9af1ce8d28f2a07b5bcf7f475eccb3b772d843ef36c03ae405205e710f5a3a240195 SHA512 ed42ea84e9b7f97be6aafb2cea3495e63abab197759a31795ebab8900f29caf500040b0deaf7997c6f598a8a8db3b2a64925d6df05f9b5b851037bd4e25b0b3a
diff --git a/net-wireless/mousejack/files/mousejack b/net-wireless/mousejack/files/mousejack
deleted file mode 100644
index 666ea47d9c9e..000000000000
--- a/net-wireless/mousejack/files/mousejack
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-usage() {
-  printf "The following firmware's are supported:\n"
-  printf "Nordic Semiconductor Bootloader\n"
-  printf "CrazyRadio Firmware\n"
-  printf "RFStorm Research Firmware\n"
-  printf "run \"mousejack install\"\n\n"
-  printf "To flash Logitech Unifying Dongle C-U0007\n"
-  printf "run \"mousejack logitech_install\"\n\n"
-}
-
-if [ -z "${1}" ]; then
-  usage
-  exit 1
-fi
-
-#parse args
-while true; do
-  case $1 in
-    -h|--help)
-      usage
-      exit 0
-      ;;
-    install)
-      /usr/share/mousejack/prog/usb-flash.py /usr/share/mousejack/dongle.bin
-      exit $?
-      ;;
-    logitech_install)
-      /usr/share/mousejack/prog/logitech-usb-flash.py /usr/share/mousejack/dongle.formatted.bin /usr/share/mousejack/dongle.formatted.ihx
-      exit $?
-      ;;
-    --)
-      shift
-      break
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
diff --git a/net-wireless/mousejack/metadata.xml b/net-wireless/mousejack/metadata.xml
deleted file mode 100644
index c5c7cc912abc..000000000000
--- a/net-wireless/mousejack/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="github">BastilleResearch/nrf-research-firmware</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild b/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
deleted file mode 100644
index f5149a462303..000000000000
--- a/net-wireless/mousejack/mousejack-0.0_p20160726-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards"
-HOMEPAGE="https://www.mousejack.com/"
-COMMIT="02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93"
-SRC_URI="https://github.com/BastilleResearch/nrf-research-firmware/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/nrf-research-firmware-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="dev-embedded/sdcc[device-lib,mcs51,sdbinutils]"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pyusb[${PYTHON_MULTI_USEDEP}]
-	')"
-
-src_prepare() {
-	mv tools/lib tools/nrf24 || die
-	for file in tools/nrf24-*; do
-		sed -i 's#from lib#from nrf24#' ${file} || die
-	done
-	default
-}
-src_install() {
-	insinto /usr/share/${PN}
-	doins bin/dongle.{bin,formatted.bin,formatted.ihx}
-
-	python_domodule tools/nrf24
-	python_doscript tools/nrf24-*
-
-	python_scriptinto /usr/share/${PN}/prog
-	python_doscript prog/usb-flasher/usb-flash.py
-	python_doscript prog/usb-flasher/logitech-usb-flash.py
-	python_doscript prog/usb-flasher/unifying.py
-
-	dosbin "${FILESDIR}/mousejack"
-}
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 029899729189..c879ff1221d3 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD nanovna-saver-0.3.7-r1.ebuild 910 BLAKE2B a9d031652c8ed32cb9102ee4b6b074ac2da5c28f96f429fb195c34c3c524bc3269752ec2c67cd71cd6589456fb5e679a4d68e1eec2ea3500a130a52df6a950ac SHA512 9c0efd4691047696531e08e016d8891e00128a5de956637067643d49ed7604bfea2f6e3e932581b1a6412629897aae09407d69b3c7102df62f690d2236747443
+EBUILD nanovna-saver-9999.ebuild 910 BLAKE2B a9d031652c8ed32cb9102ee4b6b074ac2da5c28f96f429fb195c34c3c524bc3269752ec2c67cd71cd6589456fb5e679a4d68e1eec2ea3500a130a52df6a950ac SHA512 9c0efd4691047696531e08e016d8891e00128a5de956637067643d49ed7604bfea2f6e3e932581b1a6412629897aae09407d69b3c7102df62f690d2236747443
 MISC metadata.xml 432 BLAKE2B a8869193d052dd0ec1fcae10641b19f61fe2faa2bfde6e60f9758b4da9620a316e9b318d11c778fcb0c1de1a2537f98587a8ec928bb814ae53b0160deef18be7 SHA512 0727e758f3cfd75ee8b54ac05636228fe6422ae5b8a0b0eb37f475abc075d30765b3452a05c9e99c56b8a25c378bebfce69462906910c86254f586203640dffe
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.3.7.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.3.7-r1.ebuild
index 4060e6e8d9e9..fe9c1981c8e3 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-0.3.7.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.3.7-r1.ebuild
@@ -22,9 +22,11 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
+	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/scipy-1.5[${PYTHON_USEDEP}]"
 BDEPEND=""
 
 src_prepare(){
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index b0585e449aea..fe9c1981c8e3 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,11 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]"
+	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/scipy-1.5[${PYTHON_USEDEP}]"
 BDEPEND=""
 
 src_prepare(){
diff --git a/net-wireless/osmo-fl2k/Manifest b/net-wireless/osmo-fl2k/Manifest
index 43339ef727b7..e0a86e88c8ae 100644
--- a/net-wireless/osmo-fl2k/Manifest
+++ b/net-wireless/osmo-fl2k/Manifest
@@ -1,4 +1,4 @@
 DIST osmo-fl2k-0.1.1.tar.gz 68811 BLAKE2B 6c1b602b47d5e0816d93750e0470ed4530e587341f28e2e93c3aef634d7108b981cc4a96b758d72796316f15e4401ef746b91a983f374e63103ac76d8b7168c1 SHA512 55b384e18cfa5a1ab660860874cc6f6256b812ee867c863b6cd12c67cfc3517632469fc1ed6b83a35c956aa5371e1198634a52b292b109da828bee60c23f5140
 EBUILD osmo-fl2k-0.1.1.ebuild 1264 BLAKE2B ff9ee662871853ab86ec47263ba125e57652f00dd87c53b323e184f92a41bed72a8231429eeac148f4311936e3323b97059f564e3f0d94e7db80d4dba5f3a056 SHA512 c167f2335a11fbca68e8e2a195edc55d645119906cad7d640f52814436c5480c1e32d262842ff7e100f62ee4031b6ee253398bac5857f874ae76fc8fc3ae6d00
-EBUILD osmo-fl2k-9999.ebuild 1251 BLAKE2B b3db79c09a1aa4f31af789c7ba0ba965e24c8d127f2ef3782b439036165d889162958390c85aca171a91d95f0425c24358e68e9e605b47d9cfbacad579e21d53 SHA512 ea7dfcb433ee512beccc4adf3d81698fb8c086443ecf2a6bb317e01f6bc20d15202d734e909a29ed5998eb02cfb0394339d8cc84efddc0602fbc6c546a990e6c
+EBUILD osmo-fl2k-9999.ebuild 1261 BLAKE2B 1c65126580c67e48dc5d40c6c1467df0a523a21c74c482f765c7ed627075e5d35c74cc399827e42d2b3b39a51500ae789f9cd139675118a8a44c1ba0f4550fa4 SHA512 59e5969e91dfa795e82049a2a4a5d8792236d549e9774189596d4a5a4411f4ebb8ee20f699fff6db4c12310ed01ef1b61dc5d39dd1f87e2fa2e3d76c883a499b
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
index 17e694cb18e9..148e9614dedc 100644
--- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
+++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils linux-info udev
+inherit cmake-utils flag-o-matic linux-info udev
 
 DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs"
 
diff --git a/net-wireless/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
deleted file mode 100644
index 59130fac5d29..000000000000
--- a/net-wireless/python-wifi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-wifi-0.5.0.tar.bz2 69113 BLAKE2B fe2a6693ca22a963c5149991693ea72e58542ea0c9622573f0f6ad7194d50daa09fe52e8f349224a2131bf2a8fbe0ee9538e17d5413fefe574e60ee9416aa345 SHA512 cbbb337b20f60bb28597dc6e3c90b8d20ddee9512cf000ca0107eb01d2bfde1b3047458d1a3f4dc4b9836ae283cbc24792ffb95c4747027896cd6e50a72151d8
-EBUILD python-wifi-0.5.0-r3.ebuild 842 BLAKE2B 8882fc4fc795597352752180527554165e93c36321479b6c2d12030d1726078243d832387c881a7fc8c4cde7a59400c97ac58ff0836a95bb4239c2c04036bfba SHA512 ae8aaacead6a43a32057814d7d498b70414deb3f4d8ef46b48f160ac9a8f270bde296ef4d0066bdbefd8500858d7191a4a14d2c670737e26235465daac6a463f
-MISC metadata.xml 329 BLAKE2B 9bb66e4d52b4b290c05ef91d15cdef7ae45d46da08311d825b9c33f8fded2106be79edd68e32a44d6399dae763204220dc60c6348f440fd8dd30fc9163c91e4f SHA512 254d847c410e8ab8f3822a03f7689245ca47e5682c73f60ca40a2e2a81ca661421c0db040332dcc6800d942d4904d2e2ca7e234b5eda1b257a358f2236258978
diff --git a/net-wireless/python-wifi/metadata.xml b/net-wireless/python-wifi/metadata.xml
deleted file mode 100644
index b447a239cea6..000000000000
--- a/net-wireless/python-wifi/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="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">python-wifi.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
deleted file mode 100644
index 16cb7625f40f..000000000000
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
+++ /dev/null
@@ -1,33 +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 distutils-r1
-
-DESCRIPTION="Provides r/w access to a wireless network card's capabilities"
-HOMEPAGE="https://pypi.org/project/python-wifi/"
-SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-LICENSE="LGPL-2.1 examples? ( GPL-2 )"
-IUSE="examples"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/AUTHORS docs/BUGS docs/DEVEL.txt docs/TODO )
-
-src_install() {
-	distutils-r1_src_install
-	use examples && dodoc -r examples
-	rm -rv "${ED}"/usr/{docs,examples,INSTALL,README} || die
-	if use examples; then
-		mv -v "${ED}"/usr{,/share}/man || die
-	else
-		rm -rv "${ED}"/usr/man || die
-	fi
-}
diff --git a/net-wireless/sigutils/Manifest b/net-wireless/sigutils/Manifest
index 558f00fce2dc..27f680165671 100644
--- a/net-wireless/sigutils/Manifest
+++ b/net-wireless/sigutils/Manifest
@@ -1,3 +1,3 @@
 DIST sigutils-0.1.0.tar.gz 98315 BLAKE2B 68e91dea40ad5e9cbff98f8618945ef11df4ae6551827c1e52a1a8051bbc61162e4bc0c1bc90fe4d7fe84992132d35b46af56d199cb90896a27d429bdedb9d2e SHA512 871bbd72739463f1094748edbddf07a9641fb34b29ba78b4d241ad1116f3a85128e99800561f72348a8c7a2590e2d0b3a3b99c368246807bac7a5665fb5829ca
-EBUILD sigutils-0.1.0.ebuild 650 BLAKE2B 1a626f56efa61a4961ea58c98add260e7c05d4595421fbdd9f190cc8288f70b65a0162d54a7b7d4ef7910e9ac2bcccac419cd686e95cc672c14dac5a12e892c4 SHA512 062f66a0f01d4a2cc449ca456bab28c30341300e1c42826d92370ee52114d40d0e6f47b03fb184db361d8709e94d87aed79121784ff37c57e5815e748174aaad
+EBUILD sigutils-0.1.0-r1.ebuild 731 BLAKE2B e2fbc80851505c72349d5ba1216daeaa427a7c7f0bc407a18ea1f51e274b1ba6609e62335222841e032ee3dd610ebe6a20cc33964176959c676310e8f4330036 SHA512 d916a415035d214248158efc317b13c4f8c3cc44a07a889c255ed7e07e383f052c98c540e4abdbaee124376f0ba3c5c596c60c930058bf4009ee1536e7a0f921
 MISC metadata.xml 430 BLAKE2B 0617bbaea3eb0eff26d2be0949e0dcb76850118c2386ef63a8a28ecdc5cb85f812fd513842b01692d340dac750a4693c5fe9360c7019c75e5551f247bed02e60 SHA512 118d1cfdd0bf5445e8c3ffb610dfea69635b22d22945c7c827b741aad87c0ae55527185aa6c2fa52837c4d5ac7628ad62f9482a22c2315bdf9ff771b4ee12ca8
diff --git a/net-wireless/sigutils/sigutils-0.1.0.ebuild b/net-wireless/sigutils/sigutils-0.1.0-r1.ebuild
index 61e850915e24..30a26a5d5071 100644
--- a/net-wireless/sigutils/sigutils-0.1.0.ebuild
+++ b/net-wireless/sigutils/sigutils-0.1.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_prepare() {
-	sed -i "s#DESTINATION lib#DESTINATION $(get_libdir)#" CMakeLists.txt
+	sed -i -e "s#DESTINATION lib#DESTINATION $(get_libdir)#" -e "s#/lib/#/$(get_libdir)/#" CMakeLists.txt
+	sed -i "s#/lib#/$(get_libdir)#" sigutils.pc.in
 	cmake_src_prepare
 }
diff --git a/net-wireless/suwidgets/Manifest b/net-wireless/suwidgets/Manifest
index c4fa03f217e6..c2ecf98a9efe 100644
--- a/net-wireless/suwidgets/Manifest
+++ b/net-wireless/suwidgets/Manifest
@@ -1,3 +1,3 @@
 DIST suwidgets-0.1.0.tar.gz 74722 BLAKE2B 7677fe49cba6646eb45b01aea2d311aba5ab62adae71d9c5b8381766aeeec09560f1c028f94fdce7056b1340d923f6d4727fcc2295db609231a1e5c70dd8f26b SHA512 9f623e01e66d22424b99682c00b5109d9fe07d041f51c583573304897e1bbad33e940a19fc3d1104f97dfcd2f7b7d9a00abc02a3c91e0114214a7a954dfdc054
-EBUILD suwidgets-0.1.0.ebuild 627 BLAKE2B e3b01895fb51c7c243e06ce1ef45a5d4ff43f33e5d59af0acafe3014696d1ee9be5316eadc542caf696177ec2dadf38e72437e8d123305bbf0a26fd80ee55196 SHA512 3017b734602c28092089a8a8c811fbdc6a56dc8022946cf71e21797b0d7993ca12f27254edc46f092a0425e0979442d4e52f25e725733976afdf3186a34f5e99
+EBUILD suwidgets-0.1.0.ebuild 858 BLAKE2B 8a28d6fb24cbda479a1a5e78290440ebc0514ce670dfe29c236132d359ccce5a106b41904a0ed71a32d8c318a662c723ed3ca1c3a7e761e6de7e444a86ba890f SHA512 8a653d0312a49f9a3f8397aa927b65f97c030cc3400fb447f964b2df65e68ceb569ae170ceaea44f9f45ed5a4c7c0760246bbb416653b580d68058750968158f
 MISC metadata.xml 431 BLAKE2B 0c9b453568696f8a3a73cffb7281410a1d3c43c5a199063c7474130c772fe6b7047d23607626bcde8dc0045f324a96f299213f530a21f50b38b65d033875450f SHA512 208660d96495925cbe34d1e8e8cdc256044f0a794110c58ce358163d8008fc976f5cc9881e4ba214b655f3e60c0d9d63577ceea94a5a7459cd059257de35785c
diff --git a/net-wireless/suwidgets/suwidgets-0.1.0.ebuild b/net-wireless/suwidgets/suwidgets-0.1.0.ebuild
index f5bf575c6fa8..9808d33a6b2c 100644
--- a/net-wireless/suwidgets/suwidgets-0.1.0.ebuild
+++ b/net-wireless/suwidgets/suwidgets-0.1.0.ebuild
@@ -23,6 +23,14 @@ BDEPEND=""
 
 S="${WORKDIR}/SuWidgets-${PV}"
 
+src_prepare() {
+	sed -i '/^#include <QPainter>/i #include <QPainterPath>' Waveform.cpp Waterfall.cpp	\
+		Transition.cpp SymView.cpp QVerticalLabel.cpp LCD.cpp Histogram.cpp \
+		Constellation.cpp ColorChooserButton.cpp
+
+	default
+}
+
 src_configure() {
 	eqmake5 SuWidgetsLib.pro
 }
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 2b2a424ee5b3..dee3fb0360bd 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,11 +3,13 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881
-DIST unifi-6.0.24.zip 219639979 BLAKE2B a96df3d87ca5e22791ea7480012add840b09a76fe603d24057ffa74f61c12a3fdcceffafe9a2aeb5c31111cdd00348c7bc5193929ef350a2f9dd6730260759a3 SHA512 d12c49d429659b504a132597aa1eba89d173b9671a231c4c4d27ec23c81be2b964e96439469ef467a212af5ca91c1b3bc4080d4ee0c3b71f7d4576b530a5e8b0
-DIST unifi-6.1.16.zip 220033149 BLAKE2B 4e965c1577ef35d3dd28357aa884f8234f3cc9c45783dd261153ecc87bda24fc4b58ea4f49096304331bd11896251c29eaaa8e8b44046e50ee7e9d54d997223a SHA512 d1b241d5a47ee34c66a08b847405f615f83782fc67a38fe5fc4c281bac6335bc2ab8b021774cafb98753759b9924e773a2c4883a1ed2b30cb2e58ab56b3c07f3
+DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
+DIST unifi-6.0.37.zip 236439236 BLAKE2B 764c6406c3ac4a51617f6236280d63af3b6bd9c23a065f56bf8302ca72535b9cad8c2a78bac3ba07bc07f0997b635dea4d4fb71c395d46cf45fdbb05cb8d5b9b SHA512 07b452d84d8cd5d5d67db8d274a710bfbf3d3d19529b8692073ca5ec8108267694cdf85e8a101926599acc8aba9ac5f774dd78f2d5868da5b57c3d462748a2b4
+DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
+DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
-EBUILD unifi-6.0.23.ebuild 1565 BLAKE2B 56f4a5e9740cdd7bc9e34349164c9612152fc969f042bb82d0a7b08c46fc5ec2efa7539f0b1bda1f0469cd04c8a8988f773367497cb8b208f0df5cdd1d7fcabd SHA512 2a24a46c8656413cc847693580f830b6a4a379fb585640418b025cdb5c0c972fd0ef3ef2fc2a8ba7a9df98fd15fbd2c196e519bff47a54d652edfb69a45c41be
-EBUILD unifi-6.0.24.ebuild 1566 BLAKE2B 1d2f8558ab7608c4d2db9e28f244c92aa7416439eb63bd02a27131debff9abed084cf03a1b4bce7d7286bad82ef686fed5d0940b8a2d27f5c3a76ae56505fd18 SHA512 9084039cfe18b5192bf3fe7afb21642c0fe1b17ecacfaef8c9007fc7ae0a308d91d3db6e2e13f943dd9be5ab667f72a4618e218b6d59aab7457dabbdfc924ea0
-EBUILD unifi-6.1.16.ebuild 1566 BLAKE2B c937d09d3157202e6fa4eb1ecd18826e9338f81f8e1b6a99d2b5ce46fcd302c57460d54d56b0e40125c1f1291cffc37c9c7dceb927454c42a4854b97a9bd0bb0 SHA512 2073f720ca81bde8256e043ca4eb5352daaf9e4d7e1bf238affb529c873862040defcf8d56db9b907a27484129980415e3fd9ea56b312b485a979f1e5f174d9b
+EBUILD unifi-6.0.36.ebuild 1556 BLAKE2B 6df2bb70ec315f7563d0960752b1bc96bae42e86a405e1f0ce3fd6aba545946a1366a2b64330b4ccbd2440c869047ffe156691354cbb056d5c3cc31fd29d0775 SHA512 4ba4a362ede45d1d39f004420e5b8739e75192f40135b62baea81697d466f99141a2fba7345cab114164190823735bc6f7b01c82966fe1642a5123093c066ef8
+EBUILD unifi-6.0.37.ebuild 1566 BLAKE2B 06315a7418702776055d5c6e1ff2f7557e1b10cc5b26ba15904880d54992414ee16071803bbf8d7a3b15f952f7b9970b04ff170c7636c7780e5e10606d290997 SHA512 3233d5449c71fa4bb585afc5f838553a23582b3c18fe5676b79e0ba55fd62c803d6c1d4ab6880da045fe2795f2ed4c315bbcc9947dd54777be8719f871dae9d4
+EBUILD unifi-6.1.25.ebuild 1566 BLAKE2B e59fb68b8f475fe749a31cf89adcc03d52a9de40348f4f62a84a761afa8a883c787f6f4b8254da00ba712fa3adcfb76e901f94525b294b364f47ccfa31ead4f2 SHA512 d1563a980e956e414e414ec1ff544c7a952bbe9bfb8e433be52ea81cf45124ddc75f10d67973b1a940bff593aa0c43b3149215a2b8bc2d1bed5709bc7ee9d497
+EBUILD unifi-6.1.26.ebuild 1566 BLAKE2B 1e7c0b6b4dffc76041f23daa3d6523a7e4b088f4cf3be529bf1acc7bf48c94049d51e351c425bf6a488bb253708bcb62983c2918364ac8f0792231e67c486023 SHA512 f1b22181098927c83c0cefd7359c112ea38f1b4c096edbb4eaee97cbc0ef56261292ddc19e5208319bdfa85908d5203dfaf91f4dc9b893052fc6047f6ff73a9a
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.0.24.ebuild b/net-wireless/unifi/unifi-6.0.36.ebuild
index b9e8e79d0068..2100bb3c54c9 100644
--- a/net-wireless/unifi/unifi-6.0.24.ebuild
+++ b/net-wireless/unifi/unifi-6.0.36.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-b200bf6446"
+#RC_SUFFIX=""
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.0.23.ebuild b/net-wireless/unifi/unifi-6.0.37.ebuild
index 53d19bcb20c0..02e3fe060f99 100644
--- a/net-wireless/unifi/unifi-6.0.23.ebuild
+++ b/net-wireless/unifi/unifi-6.0.37.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-20b313f50d"
+RC_SUFFIX="-db4f549ad2"
 
 inherit systemd
 
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/6.0"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-6.1.16.ebuild b/net-wireless/unifi/unifi-6.1.25.ebuild
index 195b85deca48..dae3aad8362c 100644
--- a/net-wireless/unifi/unifi-6.1.16.ebuild
+++ b/net-wireless/unifi/unifi-6.1.25.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-6e18ee6227"
+RC_SUFFIX="-7de38fe4fa"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.1.26.ebuild b/net-wireless/unifi/unifi-6.1.26.ebuild
new file mode 100644
index 000000000000..6663cad81218
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-a072032c50"
+
+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.1"
+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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /net-wireless
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)