gentoo resync : 08.01.2021

25 files changed, 92 insertions, 685 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 799855960fed..5f4e56105536 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 7a0dd6410bbb..4ea1e278d6c9 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,8 +1,6 @@
 AUX bladerf-2019.07-gcc10.patch 966 BLAKE2B fe17328ea2c01e3345aab309414384395ac9bff0583bd324c995515a372ea84cb93d42e198a37ac650dcd4d219f8621f58740f15ecf8dbe08624891c228ee422 SHA512 287e0abdd5ba393b3d9376fb3f275bc2a0fe215e2918eef4365b580b0678683b81cabd80cfb1e4f42332b063b3800a6218254f6006b3d747ac6cd5e42686480e
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
-DIST bladerf-2018.08.tar.gz 2177625 BLAKE2B 8c3970f38f7645ba46c44803fc370e16012b2ea894d16c5101ea9519f5f9ff1aaa0a39819ac13389a33f7e0336e0e89ffcb7a0abf363cb30b091e88502a7a8c3 SHA512 7f8d0ef146da34474774d00503f0838cdf9404bf42bf1f68fd0f6018c7e7d4937da56110d818237f712bd23547cfbed1e2d04455a9d4d7ac0df96336e331c8f4
 DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
-EBUILD bladerf-2018.08.ebuild 1309 BLAKE2B b11a4ddf301c0c8b4c722cfdbf71d43a1b35202499f9abd48d48bf1da365801fd15107f40a3ac5d0fc084de218b7b83dbc33959f4e7539f02035cdf4b371447d SHA512 d51f7e9f7e8cfb3b82224803de35ebf59f95d18c201dd94dd65a2ff20fda71e96b79bc2ff7a486d39536d4b8412c9355923a1eb69bea9bd7922e635ae4d2fa0a
 EBUILD bladerf-2019.07.ebuild 1712 BLAKE2B b2ef0e6fee8dd047ff30a0278ced5fd3893a3dd2bf725c392f152786e9e2f1dd4684ff1e361381c29be7fb603ce1d6c8ebb30dec23e1c27a2ef0a5acd287b330 SHA512 9e3b58f49d6e5781b80bbc3834fa0754da971523a8a22f37f3e3ac393142250a0a5c7ecce2edca60876f3507c77cc9e8e79d53593a0aa5fc610fb38d4a7af7de
 EBUILD bladerf-9999.ebuild 1660 BLAKE2B 65019f05d47d4c7d8003eecd4bd80a2360dbefb379c09643058c2a464175fe970a47a0f87557a851d06715e291f058e26e08dbfb6b3ceebafc1476d776790f05 SHA512 fd802f70997e4418c803edcb31ba4683c5ef6bcebf49323d3d07e970cb90658dde781811e2a8f543dc3abe749d12ba0d216a5f04f07593bd967d16bfec095f98
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2018.08.ebuild b/net-wireless/bladerf/bladerf-2018.08.ebuild
deleted file mode 100644
index 347d4f4727e9..000000000000
--- a/net-wireless/bladerf/bladerf-2018.08.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="https://nuand.com/"
-
-#lib is LGPL and cli tools are GPL
-LICENSE="GPL-2+ LGPL-2.1+"
-
-SLOT="0/${PV}"
-
-#maintainer notes:
-#doc use flag, looks like it can't be disabled right now and will
-#	always build if pandoc and help2man are installed
-#	also ignores when deps are missing and just disables docs
-IUSE="doc +tecla"
-
-MY_PN="bladeRF"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/\_/-}
-	S="${WORKDIR}/${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-CDEPEND=">=dev-libs/libusb-1.0.16
-	tecla? ( dev-libs/libtecla )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-2.2.0
-	>=net-wireless/bladerf-fpga-0.7.3"
-
-src_configure() {
-	mycmakeargs=(
-		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		-DBUILD_DOCUMENTATION="$(usex doc)"
-		-DENABLE_LIBTECLA="$(usex tecla)"
-		-DTREAT_WARNINGS_AS_ERRORS=OFF
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 8008b0979a52..d6d5e9df7707 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -4,6 +4,6 @@ AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3
 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
 DIST gnuradio-3.8.2.0.tar.xz 2438736 BLAKE2B 93eabff578cd6b3b6587a6aa083095c787323ebf87a447d61999813e7e5e48b414d080a4fc02d01dabaa9378d42e3a210451a9109fc202991ebda8d1c9669676 SHA512 33930f62762cd9e3d1038b4a903f01e7ab33129732d207c126a89c1f1e719e9d656a94cdcbf3f6010f8476fedacee639c8a12444c41cdd56ad9fbace7863a170
-EBUILD gnuradio-3.8.2.0-r1.ebuild 6374 BLAKE2B 7254a8afa26163c695efab606d2440f2b166d21d9bbf96df5075a29e25cc672e93d0ffbaa3b9c6468d7499e66447a5c3f203dcbe3e71beffac1816d7f11c29f3 SHA512 4a7d97523de00fe42ac658374d303af6aa8cd70df224a968c6e736763663de084ed4b48d5c014edb28cb95029189a925663c9c7cbb607b1074392ffab7ab655d
+EBUILD gnuradio-3.8.2.0-r1.ebuild 6376 BLAKE2B e6f69b46f041ba16794440c1da7be06e380c706a94b5e9580122bd83aaf76921852d1bd7b1a1474cd61b2a96dcb42a6462debf14af57e181e5f7be46b4d4dc9c SHA512 cdebc55c185d37dcd69757038ea17548cd815ba3b234d1bb470db4323ab351c38f3698cee1bbe57fce856407959f494c42c010079844c0d8acfc9bf4e035a4b4
 EBUILD gnuradio-9999.ebuild 5963 BLAKE2B 80edb3e39b870a933927b52cafc95eef2a2ec29e0bd271bc2ced894fd49bae82c805df8010ff3df358221dfcab545b7d04788750017655f7cd02a7576f4046c7 SHA512 1ca5b9a03688bfea06f83202c34b53adcf5763670b51fd31cfea856d04d568c417d73c2d2145008d35805f19a1a3debc4cf73a607d5e098f4ba2aec08961f523
 MISC metadata.xml 1593 BLAKE2B 75fa7c4bde9843a9e1ff24eb3311a605abf00eeb6624216cc1fb0c6b425f013cf0c26c71076a9eb1d2bf65b6739e9c52a97f47a4bbcceff2640128dbb5c489b8 SHA512 6f9bce6f28289c43a814ae9ee7204c1a74afe85e1758a22b309e55b20e24e00815dbe2f6b6e964d564e79546ca5fce2351c14a099f839653419e62214b51ea30
diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
index 95ad272d2873..03f72839367e 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,7 +89,7 @@ RDEPEND="${PYTHON_DEPS}
 	)
 	vocoder? (
 		media-sound/gsm
-		>=media-libs/codec2-0.8.1
+		>=media-libs/codec2-0.8.1:=
 	)
 	wavelet? ( sci-libs/gsl
 			dev-libs/gmp
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index b37cec92c149..6bd850a474b8 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,12 +1,9 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
-AUX iwd-1.8-eapol-prevent-key-reinstallation.patch 2575 BLAKE2B 1e9683e551178ff54f31f9c8e861afb4b1cbe6d2f11188043d2bc6075fb21fe2637db4b13a4b93c900b9450034d28088e525e42ff0cfea08341fb056c7c74fc2 SHA512 e39965ae121e42ff17c1cc05539af1d9005748d05c0fe2ff4ef7884c3b224973a30875961476ecaad7f6f7567e79dd33bc854be05a71b37c4c05a19e2b60fced
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.10.tar.xz 897928 BLAKE2B 1589300201c835b2b14c34a9adefb525173cc2f9c8154f0a5f12da64a1da3d383acf328c5138bb8d4903ff08f339b7d55f02e215896af90aa75d244f61c3de1f SHA512 c128ec764e9d727b4ae1157717826b3219c5d368746f7709a01cb816f077afaa32083052ee2a4ecd09a7fbd36c03ea9ba6bd1a84c2a33210398dd060e9020db5
-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.10.ebuild 4890 BLAKE2B 7113e611b7868ad83ea9921cc1c41a6f0afad8458a327309f75fee0ac91acbd650e6e46c078612aea81b953d6589b5e809fb32ac735a0bb7b0f59f3fa6fc933f SHA512 c5e2504b92a43e1da4f9ebc13eba2e734121b0de595d81d51478884855ea6ff5c85cc3d56f33cba7b682cc135a647763bfdb05d5496c80b3235d3ce28d2329e6
-EBUILD iwd-1.8-r3.ebuild 4477 BLAKE2B d80632f00a31b5f1f751373701f80602d34e8fb8cec14316f5405a76af1df1cbed79f0b786d3f9e3e2bce2d54f7ee72ffcb0595455e9095c87c55b68b9f4b50f SHA512 d9b44088c2a4ddc0b42831ffca847daa1570d72583526a669c2178fff2a8d2c0cbf5415dc6f4d3edc2991fc588951e546de4b67449f721fa4e2ad71d2fd52e1e
-EBUILD iwd-1.9-r1.ebuild 4885 BLAKE2B b648703ecd98f049847a6d9e68e67556648269405db9eee067258ae2cc4a34c493dd9842864226c5184e1512329b65eb1f6b95b561a8f64d28fd2e8c6478db37 SHA512 8e3ab57f8ec33631b4ddb7d0972dfcdef909b3cb382f5ad197b0b5248d2bbb6e38a061968b6603a7182e0a87618a1d3e95ecd75239dddcfbc2d3ea700fe0ab0f
+DIST iwd-1.11.tar.xz 907020 BLAKE2B 3b2c0922745c699ba01a2f46061246fbad6e2c7ea1a2f58cd13b5bf2169e9517652740f2dd872b5a274d74a5b8f1962c8e4696eabe5481a0c4783f202217599e SHA512 09c5e5e105b6107d88eff4238bf023f7bf1a408f522b9f84fac890c123bff2e124b937b81e1559db7fe0720f0ac423dc7d37c1b6d502fc4a7b7403fcd798e01d
+EBUILD iwd-1.10.ebuild 4884 BLAKE2B a68b6fa5e0521bdd9bf432c702defa624a352601411dcfd0a20f36b83426d15bf02f5cc8129219764302698b4be2bf27732b5c728e373832d9ea448ae4748c6a SHA512 c25ce5a1982aed15fa2dc2d92071b2ffcf76f1fd46dde59c54383019e28606e0e3291871af75e6278b44ff7280c37295d475bbfad5fde7f0b381eaa289997eea
+EBUILD iwd-1.11.ebuild 4890 BLAKE2B 6a2d7a1c998fb9b37d495d25feb726cc3bda89985dad75f2808b8eaea3c47de2ce29cb3eafa56acaa61d0283a8f14ea0d0402ee295059e6c0076377a0024d15a SHA512 dc5f5d79ee58c60f176516ce44f11cf1d7582aaddbca6fa21a8764796e129f3efc52f818fa1225fc2f23ff4f1b7327905959c429019ed652926d8f41a3bc78a4
 EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
 MISC metadata.xml 832 BLAKE2B 5f9e80bd6e64bb7542509fa934e5fba8f433781f35b0c5e3f0dcae48a4a4cd3ecf23312241358daeccc0429f8bd74651531b7d628ec19f6af16714027ff8ddc2 SHA512 06950191a98edb0453b80500c0c1b7ca879fea962cd13f5ad695923d866edb4aa99753750d67110eac0a790d8ddeff9154add4fc8793d34af35870e13e8a6464
diff --git a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch b/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
deleted file mode 100644
index dceb808297e3..000000000000
--- a/net-wireless/iwd/files/iwd-1.8-eapol-prevent-key-reinstallation.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From f22ba5aebb569ca54521afd2babdc1f67e3904ea Mon Sep 17 00:00:00 2001
-From: Mathy Vanhoef <Mathy.Vanhoef@kuleuven.be>
-Date: Wed, 12 Aug 2020 15:17:21 +0400
-Subject: eapol: prevent key reinstallation on retransmitted Msg4/4
-
-Currently an adversary can retransmit EAPOL Msg4/4 to make the AP
-reinstall the PTK. Against older Linux kernels this can subsequently
-be used to decrypt, replay, and possibly decrypt frames. See the
-KRACK attacks research at krackattacks.com for attack scenarios.
-In this case no machine-in-the-middle position is needed to trigger
-the key reinstallation.
-
-Fix this by using the ptk_complete boolean to track when the 4-way
-handshake has completed (similar to its usage for clients). When
-receiving a retransmitted Msg4/4 accept this frame but do not reinstall
-the PTK.
-
-Credits to Chris M. Stone, Sam Thomas, and Tom Chothia of Birmingham
-University to help discover this issue.
----
- src/eapol.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/eapol.c b/src/eapol.c
-index b0036c10..e3581cfe 100644
---- a/src/eapol.c
-+++ b/src/eapol.c
-@@ -1462,7 +1462,6 @@ static void eapol_handle_ptk_2_of_4(struct eapol_sm *sm,
- 	memcpy(sm->handshake->snonce, ek->key_nonce,
- 			sizeof(sm->handshake->snonce));
- 	sm->handshake->have_snonce = true;
--	sm->handshake->ptk_complete = true;
- 
- 	sm->frame_retry = 0;
- 
-@@ -1782,7 +1781,15 @@ static void eapol_handle_ptk_4_of_4(struct eapol_sm *sm,
- 	l_timeout_remove(sm->timeout);
- 	sm->timeout = NULL;
- 
--	handshake_state_install_ptk(sm->handshake);
-+	/*
-+	 * If ptk_complete is set, then we are receiving Message 4 again.
-+	 * This might be a retransmission, so accept but don't install
-+	 * the keys again.
-+	 */
-+	if (!sm->handshake->ptk_complete)
-+		handshake_state_install_ptk(sm->handshake);
-+
-+	sm->handshake->ptk_complete = true;
- }
- 
- static void eapol_handle_gtk_1_of_2(struct eapol_sm *sm,
-@@ -2185,6 +2192,7 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
- 	size_t frame_len = 4 + L_BE16_TO_CPU(frame->header.packet_len);
- 	const struct eapol_key *ek = eapol_key_validate((const void *) frame,
- 							frame_len, sm->mic_len);
-+	uint16_t key_data_len;
- 
- 	if (!ek)
- 		return;
-@@ -2199,7 +2207,8 @@ static void eapol_auth_key_handle(struct eapol_sm *sm,
- 	if (!sm->handshake->have_anonce)
- 		return; /* Not expecting an EAPoL-Key yet */
- 
--	if (!sm->handshake->ptk_complete)
-+	key_data_len = EAPOL_KEY_DATA_LEN(ek, sm->mic_len);
-+	if (key_data_len != 0)
- 		eapol_handle_ptk_2_of_4(sm, ek);
- 	else
- 		eapol_handle_ptk_4_of_4(sm, ek);
--- 
-cgit 1.2.3-1.el7
-
diff --git a/net-wireless/iwd/iwd-1.10.ebuild b/net-wireless/iwd/iwd-1.10.ebuild
index 68624a7cdd36..c07c53ce4651 100644
--- a/net-wireless/iwd/iwd-1.10.ebuild
+++ b/net-wireless/iwd/iwd-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.9-r1.ebuild b/net-wireless/iwd/iwd-1.11.ebuild
index c170b16a7f3c..555a577368d8 100644
--- a/net-wireless/iwd/iwd-1.9-r1.ebuild
+++ b/net-wireless/iwd/iwd-1.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.33"
+ELL_REQ="0.35"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-1.8-r3.ebuild b/net-wireless/iwd/iwd-1.8-r3.ebuild
deleted file mode 100644
index a8c6fbd6ae43..000000000000
--- a/net-wireless/iwd/iwd-1.8-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~X509_CERTIFICATE_PARSER
-	"
-	if use crda;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
-		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
-	fi
-
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if use kernel_linux && kernel_is -lt 4 15; then
-			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
-			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
-		fi
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/qradiolink/Manifest b/net-wireless/qradiolink/Manifest
deleted file mode 100644
index 2b0bb4d9c895..000000000000
--- a/net-wireless/qradiolink/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX find-qwt.patch 558 BLAKE2B 1affd8c72ca6779e321e144487abe162c8938e573bcbdfae49ef042fcec72395f052ba21a8713d7907b412e0886224028fa1ed60ce584d4d86264838242773cc SHA512 4919cfcaa4302f86cc517a5b2c46b51b5e3501cab7c7791869c95bd0ee9b8c3ef6b45cc0349607c8eefbb213fe1df0fbcfd40f3f6e2d99c4dd968248b4eb8a49
-EBUILD qradiolink-9999.ebuild 1116 BLAKE2B 0994f0b97610233ae5914d12c2140db06c281248e56fdab57a12fe3cab185f788c3a23ed8b0be0172649cd8171bff5d9635611d437d6eab6950ba28996502522 SHA512 1ff1ac6cde7a68d385afd86077f9a6985bb66a1272b68032980edaf68a619f2031a444e740317ca21060b59bc5d3a40c220f0bc01c9afc8086296a205baa048c
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/qradiolink/files/find-qwt.patch b/net-wireless/qradiolink/files/find-qwt.patch
deleted file mode 100644
index 70ec3188776f..000000000000
--- a/net-wireless/qradiolink/files/find-qwt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/qradiolink.pro b/qradiolink.pro
-index d64c073..08a7e52 100644
---- a/qradiolink.pro
-+++ b/qradiolink.pro
-@@ -161,7 +161,7 @@ LIBS += -lrt  # need to include on some distros
- unix:!symbian: LIBS += -lprotobuf -lopus -lpulse-simple -lpulse -lcodec2 -lgsm -lasound -ljpeg -lconfig++ -lspeexdsp
-                     #-lFestival -lestbase -leststring -lestools
- #INCLUDEPATH += /usr/include/speech_tools
--INCLUDEPATH += /usr/include/qwt-qt4
--INCLUDEPATH += /usr/include/qwt
-+CONFIG += link_pkgconfig
-+PKGCONFIG += Qt5Qwt
- 
- RESOURCES += resources.qrc
diff --git a/net-wireless/qradiolink/metadata.xml b/net-wireless/qradiolink/metadata.xml
deleted file mode 100644
index 1570f891c6a3..000000000000
--- a/net-wireless/qradiolink/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/net-wireless/qradiolink/qradiolink-9999.ebuild b/net-wireless/qradiolink/qradiolink-9999.ebuild
deleted file mode 100644
index e6049347971e..000000000000
--- a/net-wireless/qradiolink/qradiolink-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Multimode SDR experimentation GUI for GNUradio"
-HOMEPAGE="http://qradiolink.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [ "${PV}" = "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kantooon/qradiolink.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/kantooon/qradiolink/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-IUSE=""
-
-DEPEND="dev-libs/libconfig[cxx]
-	net-wireless/gnuradio:=[analog,audio,digital,fec,filter,qt5]
-	net-wireless/gr-osmosdr:=
-	dev-libs/boost:=
-	dev-libs/protobuf:=
-	media-libs/opus:=
-	media-sound/pulseaudio
-	media-libs/codec2:=
-	media-sound/gsm:=
-	media-libs/libjpeg-turbo:=
-	media-libs/speexdsp:=
-	dev-qt/qtwidgets:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5=
-	dev-qt/qtsql:5=
-	dev-qt/qtcore:5=
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/find-qwt.patch"
-	cd ext/ || die
-	protoc --cpp_out=. Mumble.proto
-	protoc --cpp_out=. QRadioLink.proto
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin qradiolink
-}
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index 967c8737722f..d8f17b56a038 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,4 +1,4 @@
 DIST srslte-20.10.1.tar.gz 8098321 BLAKE2B 713cbe45c49baa416b96dc432982656fef92082f026392c890f447d09588a48aafab32f94a4d7ed982814d2d838224303895a0bd0276a90f5815f6d0707d9732 SHA512 a6e38ccdb02a7e129f51fbad258722f5cd1f568541627c3e9e70f9e92491279cb55c18ab0463bce94b0f5fc62f0868027a83beffc483bb3689f0838fbea91186
-EBUILD srslte-20.10.1.ebuild 1275 BLAKE2B 3462eff2e3a56a4e763973b323e56f7b13ce4091111f64b700a9a1d84fcb861a31f21ac4b242132cc32780902f340314136ae87e50179cbaef4c4eb06844e380 SHA512 1e2708a885a3893df7a98acfa403ac2f2520cbc6e28e24c8f6777aea1f6876faf3d26dbd90d9ba1f0ef925fee94ae18ef7d051395f94288f0edbe2fa6775c0cd
-EBUILD srslte-9999.ebuild 1275 BLAKE2B 3462eff2e3a56a4e763973b323e56f7b13ce4091111f64b700a9a1d84fcb861a31f21ac4b242132cc32780902f340314136ae87e50179cbaef4c4eb06844e380 SHA512 1e2708a885a3893df7a98acfa403ac2f2520cbc6e28e24c8f6777aea1f6876faf3d26dbd90d9ba1f0ef925fee94ae18ef7d051395f94288f0edbe2fa6775c0cd
+EBUILD srslte-20.10.1-r1.ebuild 1281 BLAKE2B baa6646e268d10d3004aa8304381c961fca417de9620b5327ddf99bfaf2d00d2fc9a3552cc25f0678c19d9e124ef50c013e7df0714f62b36636b82c0bcd552c6 SHA512 2b73c09100584c7a47c22bcf5c52459693fdfe6879aaeca18166fbf7eb3c30669e76f31dc80120362b90e7ef7c6cadefcfcc2d10b90aa34d5c7d085e236e734d
+EBUILD srslte-9999.ebuild 1281 BLAKE2B baa6646e268d10d3004aa8304381c961fca417de9620b5327ddf99bfaf2d00d2fc9a3552cc25f0678c19d9e124ef50c013e7df0714f62b36636b82c0bcd552c6 SHA512 2b73c09100584c7a47c22bcf5c52459693fdfe6879aaeca18166fbf7eb3c30669e76f31dc80120362b90e7ef7c6cadefcfcc2d10b90aa34d5c7d085e236e734d
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-20.10.1.ebuild b/net-wireless/srslte/srslte-20.10.1-r1.ebuild
index 4030279938a7..a0d7409fa528 100644
--- a/net-wireless/srslte/srslte-20.10.1.ebuild
+++ b/net-wireless/srslte/srslte-20.10.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,8 @@ SLOT="0"
 IUSE="bladerf simcard soapysdr uhd zeromq"
 
 DEPEND="
-	dev-libs/boost
-	dev-libs/libconfig
+	dev-libs/boost:=
+	dev-libs/libconfig:=
 	net-misc/lksctp-tools
 	net-libs/mbedtls:=
 	sci-libs/fftw:3.0=
@@ -34,7 +34,7 @@ DEPEND="
 	simcard? ( sys-apps/pcsc-lite )
 	soapysdr? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:= )
-	zeromq? ( net-libs/zeromq )
+	zeromq? ( net-libs/zeromq:= )
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild
index 4030279938a7..a0d7409fa528 100644
--- a/net-wireless/srslte/srslte-9999.ebuild
+++ b/net-wireless/srslte/srslte-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,8 +25,8 @@ SLOT="0"
 IUSE="bladerf simcard soapysdr uhd zeromq"
 
 DEPEND="
-	dev-libs/boost
-	dev-libs/libconfig
+	dev-libs/boost:=
+	dev-libs/libconfig:=
 	net-misc/lksctp-tools
 	net-libs/mbedtls:=
 	sci-libs/fftw:3.0=
@@ -34,7 +34,7 @@ DEPEND="
 	simcard? ( sys-apps/pcsc-lite )
 	soapysdr? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:= )
-	zeromq? ( net-libs/zeromq )
+	zeromq? ( net-libs/zeromq:= )
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 414211c1e95a..1f0eaad650da 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,5 +1,7 @@
 AUX ubertooth-2018.12.1-gcc-10.patch 783 BLAKE2B e0d79ff3217de27b4c04c8e0427c5217753b739d6ce04ddcbb20bb2ce20f64d695fad4b969415bfd3b01232f4b08dcf6d5ec2b1096618e202c6a330903fac3e5 SHA512 4982db0ade9305520764801a9c4f7b3b2df070cfbc1549e766267136740f66fd392cbe8eeac28a5acd0f4196e9dbe3043a6707a07c770955a7b67a803bcbb70f
 DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc SHA512 409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b
+DIST ubertooth-2020-12-R1.tar.xz 763952 BLAKE2B 592c5fa689e0f944875bd777dedfd83394ebe5c9c65c1ac2c19006a949daeda8440dc102e537cf97b4547e0730df8f47d5c2a420d84d5dc770577b6039e16b28 SHA512 f127cae09d9b20dc34ffad080871f4505cbeccc1117e0e4e841ecf4a30f578d02b67b52786d7a82bdfc43d06562919008c076f8eb9befc7e4bd95def05a3864c
 EBUILD ubertooth-2018.12.1.ebuild 2121 BLAKE2B f76d7998e10f672897c463b15f703eba820258f8ae6b6891846495fdb745be299dd0f4c1e902f4c7ebab5ed2b0b0cc0466b031e2909402f6801cfd36d0feb423 SHA512 4f5d29bbb09e2485e589a27ebce1d552504c49330b62b53c83bdca6c25ca164cc78ec02d1d45d616d99583941870e33e24d13d87c67a50341206de4d0b4629cf
+EBUILD ubertooth-2020.12.1.ebuild 2077 BLAKE2B 1685985073295a888b4f301cc3a8c3cb4f69e14454a2554f3e2b8cc17ea967e2a23cedac6d2e90448a5136ab0818b810e111632104372fb95a15e831b64f6451 SHA512 2fc8b66630a598d17b77541e6afa96cd457eaad46b6a5fea6e8db220414199df53adbcca31c6479be8022e23c0e9e243267b9ab6f716952ad6d45aff4a070338
 EBUILD ubertooth-9999.ebuild 2077 BLAKE2B 0955fc76aa31f91e02986c5c4b1379ea0beed4f8eaa9306feae2fc7e251bff7cbe79c46b121b1923cfeae247c3886244b7995e6c640852f917db638d1e60f4e2 SHA512 1f9e0ea4a0fed9a8e4c27a4f48496ca840103766cdada2799dec452304a88e41be3f68a4b59b4e9f0eb8ef9185c7f15b06a51cce8a1a5ed611190614d7a0a4eb
 MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/ubertooth-2020.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2020.12.1.ebuild
new file mode 100644
index 000000000000..c3cfc4790455
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2020.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
+DEPEND="bluez? ( net-wireless/bluez:= )
+	>=net-libs/libbtbb-${PV}:=[static-libs?]
+	static-libs? ( dev-libs/libusb[static-libs] )
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/host"
+else
+	S="${WORKDIR}/${PN}-${MY_PV}/host"
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_BLUEZ=$(usex bluez)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DINSTALL_UDEV_RULES=$(usex udev)
+		-DENABLE_PYTHON=false
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	insinto /usr/share/${PN}
+	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+	if [[ ${PV} == "9999" ]] ; then
+		ewarn "Firmware isn't available for git releases, we assume you are already"
+		ewarn "on the latest and/or can build your own."
+	else
+		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
+	fi
+	popd
+
+	elog "Everyone can read from the ubertooth, but to talk to it"
+	elog "your user needs to be in the usb group."
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index bbf01b41482d..2dcfcc2cab90 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,17 +1,8 @@
-AUX mongod-wrapper 305 BLAKE2B 3bd1bfe831541e0e2c49b3875b23578e3b36307947ee7f0800b08331cd2f4aba627d9b263a06447c82da723bfba09f0cb5c682bb36a2e0e8c63d9360fe8fd0b0 SHA512 5089b8005978f97158353b12968f3994bd9d6ec66bbc899775846af297aba0fc938994f2ccb57c1f924af38781741b646dc70896029f9f86465043df3bd2fe19
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 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.41.zip 216846940 BLAKE2B 14aaabc6c33fc312ca26cae03eec7bc1a80c26d381735223753eb073baa4141e1791651e724fa6a75d16274abc2299b791d08f1032256ddfd2c6518fc2b3d30f SHA512 9264a322bf78efa38f009e81a7e7fd37534600d859a46221bc8237db159049510279c939fb2294907a94e59c841989b890693fdc800cde05d9f4e7cd6c50c7ab
-DIST unifi-6.0.42.zip 151690952 BLAKE2B 9f67f1dbb7b85f6bf92414a3d424600d610dc4ae926766e8b71dc5ceabdc1d33bccec3cbec839483aca40b2360c6dd8b31eb3de7dd20077c3d751c01b137cfcb SHA512 548f2d280065259270484e2530d800f829869eb5802939a2f13ba08ae99017f0a2dc5152e1b2f85d940a032326d4cb7d3a1a58649dc96428bea04156c26eab88
 DIST unifi-6.0.43.zip 136844666 BLAKE2B fb330f9ba8c2d22dacd5e37fbeccc411101e388525cdf7ae76fd2ade629c8230d10a5098d01453fcd9e091d581961b556c7f86d1625baff735fa76a2896b2d94 SHA512 16cfec8f12aa31c146ebd38b946a51730f7ca600f36f16058e06ec20d6d3597a34fa8fa8efef1bad1980b73a15c13d5c6458f03d08cee6eda5cedf62ef17a6b8
-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.41.ebuild 1565 BLAKE2B f2c97c8425ddbf3d8e6be92076993feb7da2c1c60802f0ef544c05be197dedec07cf2593e5d998464aeaf299ea13283524570dd1e3ff59c4bc285603e2406b16 SHA512 c9811f60745c408409638b4d334eb91da016a83e77f1b0ab417b7c6da4f0ade8b8883d263e501ef0b32f375ceacf7d4e05b0c515c965adbfdc41c3d47962aa2c
-EBUILD unifi-6.0.42.ebuild 1566 BLAKE2B ffd3e28a82be97ee19bc0b1e9b233043e188efe974ac66d07da76d6e8404d4d81dcde9f697f0b78e31f9ea1e1e01143bb3d389c59cae75fb8da7b3fe42a7818d SHA512 ca96322294cc453a364d736be4ea5159232612eabf98f16a8486a52a14dab1fb1549ea7601aaca13d1940a1e0d509aed89c29bcdfe9258b5428a3294d88f2109
 EBUILD unifi-6.0.43.ebuild 1565 BLAKE2B 8b55f4c16cd19b6e34d86c8efae53bff61d80c55e2dc351927d6f5860e6e0db8ebcfd02cf1aff2c1c5998f41da165a53f6e71ba184d705fa6c178c62140726ae SHA512 1fc10fb07c246c9d5b7f6d22dca402c6a79af60c6f450b4ada3b724855092a5eb9af94a1077a2e64cd4d3623ada7d1ba26fff131e04bdfa834e6b6e8c70f331a
-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/files/mongod-wrapper b/net-wireless/unifi/files/mongod-wrapper
deleted file mode 100644
index e8d65bb8aec9..000000000000
--- a/net-wireless/unifi/files/mongod-wrapper
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Remove --nohttpinterface argument, since it does not exist on MongoDB >= 3.6.x anymore
-# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-for arg do
-	shift
-	[ "${arg}" = "--nohttpinterface" ] && continue
-	set -- "$@" "${arg}"
-done
-
-exec /usr/bin/mongod "$@"
diff --git a/net-wireless/unifi/unifi-5.6.42-r1.ebuild b/net-wireless/unifi/unifi-5.6.42-r1.ebuild
deleted file mode 100644
index 33839d8b5a94..000000000000
--- a/net-wireless/unifi/unifi-5.6.42-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-# RC_SUFFIX=""
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.6"
-
-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/armhf lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.0.41.ebuild b/net-wireless/unifi/unifi-6.0.41.ebuild
deleted file mode 100644
index f03719c68a74..000000000000
--- a/net-wireless/unifi/unifi-6.0.41.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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="-5353824aa0"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/6.0"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.0.42.ebuild b/net-wireless/unifi/unifi-6.0.42.ebuild
deleted file mode 100644
index f724e3c60a0e..000000000000
--- a/net-wireless/unifi/unifi-6.0.42.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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="-703ac3104b"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/6.0"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.1.25.ebuild b/net-wireless/unifi/unifi-6.1.25.ebuild
deleted file mode 100644
index dae3aad8362c..000000000000
--- a/net-wireless/unifi/unifi-6.1.25.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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="-7de38fe4fa"
-
-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
-}