gentoo (valentine's day) resync : 14.02.2021

32 files changed, 419 insertions, 45 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3880e1b843ad..924b2a7066f8 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bladerf-firmware/Manifest b/net-wireless/bladerf-firmware/Manifest
index 27087fee5a4e..38412eae57b8 100644
--- a/net-wireless/bladerf-firmware/Manifest
+++ b/net-wireless/bladerf-firmware/Manifest
@@ -1,5 +1,7 @@
 DIST bladeRF_fw_v2.2.0.img 122760 BLAKE2B ec7ea8e7abec7feba9efbbc4b1e681fdeae51622013e72e2244368b5b9522861f7f76fcc9f8a7d523281d4be06726e63bf286670530641d55da540424cf11963 SHA512 64c75b8ad8a2be6a311892e7e28b16966f6c962b483547e2b959e28b050e0d6b1ac4fa078c53711555bf41e1c5a56945c58807870941b499501b6274410b05f7
 DIST bladeRF_fw_v2.3.2.img 123368 BLAKE2B 70a4d1a90c8c4f16372b87c494417edfb0a74913446f4880e70cbdf3862a59a8f319bce821112f9f7f9106f02f2ffeca110b5f5232ab2d6c81e21a2fefa4f5a9 SHA512 4ca7667ba7c3c6efa6e5f8f9072ba1ef6b95c5fea9d9600d9e0f656b387b7d0e95891f252750d557907d243ec5792690e28ed55dc6bf96b1edf3426798e5d141
+DIST bladeRF_fw_v2.4.0.img 123432 BLAKE2B f451fac209afdb976840f430bee23c2a2cfacb58bb960ea1f4608d97859974bbe4874389c69bca779ef39744d2926aa96d127780dad925451813ffbc9a83c90a SHA512 0fea8985dc4e02146056cba2bf28b31fc7331941eeb2c905cdab29c7b2ee4223c75b99de68f4734329a4c661f7472a1facacde3b251f2663608dacef8bde2017
 EBUILD bladerf-firmware-2.2.0.ebuild 829 BLAKE2B bc8f35217abd47d51f004c3604079b9b934774bfd155cecf21f9cbcb049b69962f06918d6d3ce4e968317a45ba8b79bedebac908d9598fdefbb90c38cb4affc5 SHA512 f7f68bcc3b436fba5e7ec663eb646e960d45d8d21a7fd4c7326b5d869a9ac85e2862ec8eb5c111076599a6be9117b88f0782d5de7700478feb6e481037492ff2
 EBUILD bladerf-firmware-2.3.2.ebuild 824 BLAKE2B 1d60dafe6fa56213d7299191ed2182525d63a77724f0c1b72866d6a61644caabee015b5086f77877d76bd055cb7e9b8117687aa990f18c68daa8c2907bffeee5 SHA512 ed25b2b73d3aba8ae80ab4aa6173eedf9a1bc39a33df2b849f762bce526cc6a640d1cdb966c65f927223504ae5348083ff15815e94955eeeab27d9696bc81ccf
+EBUILD bladerf-firmware-2.4.0.ebuild 826 BLAKE2B d6c1b86e8b67bca76572c1c22d728dee20af663c5135e6345b0379aa09e21121441a0867b94e730a8479cf558f2028c9191fd9c8959a8f2d9c34b54180b555dc SHA512 926fa7f654cd1e632553f627b798625bd1cc1563de06105607adcfc67036aed97aef84cee35bbf35decf4245cd7ac678b427d6d655713212d0efd199999efca3
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
new file mode 100644
index 000000000000..054e6a0a036a
--- /dev/null
+++ b/net-wireless/bladerf-firmware/bladerf-firmware-2.4.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="bladeRF FX3 firmware images"
+HOMEPAGE="http://nuand.com/fx3.php"
+
+#firmware is open source, but uses a proprietary toolchain to build
+#automated builds from git are available, but likely unneeded
+#http://hoopycat.com/bladerf_builds/
+SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${DISTDIR}"
+
+src_unpack() {
+	true
+}
+
+src_install() {
+	insinto /usr/share/Nuand/bladeRF/
+	doins bladeRF_fw_v${PV}.img
+}
+
+pkg_postinst() {
+	elog "Please remember you have to actually flash this onto"
+	elog "your bladerf with the following command:"
+	elog "bladeRF-cli -f /usr/share/Nuand/bladeRF/bladeRF_fw_v${PV}.img"
+}
diff --git a/net-wireless/bladerf-fpga/Manifest b/net-wireless/bladerf-fpga/Manifest
index 02d4061b9d0a..1d59d72f307c 100644
--- a/net-wireless/bladerf-fpga/Manifest
+++ b/net-wireless/bladerf-fpga/Manifest
@@ -1,11 +1,16 @@
 DIST hostedx115-0.11.0.rbf 3571462 BLAKE2B ebf8e583ce73860b652f75640369aab9522c89b90d342618d11cad18c3073df18c37b815e38405568079530899765637c00d9c5a2a0076584d18a4714ac343c8 SHA512 c24f24db343890d42a2a608eabb1d75e59abae5a9be665a0d861adcc2f8063e7550221b01aa1aaff7766d33d12f007d56f918547979f8b622937fc5597977bb2
+DIST hostedx115-0.12.0.rbf 3571462 BLAKE2B a89693c1d53b81e59b7801246afdbee8bc30eda8ac1770b6bbd251445d1e6db36b81c8b34af008c0eb923fe7f661faa3f7d6535fb87047312db042b5ecf44cee SHA512 84161ac1b1d569b93d67e563f4c8800b6e9c376dabe463c457d9cbad2b628519e36eced0120553015922290b817bbb0c0fc9ca66aae17719f8124193af00a996
 DIST hostedx115-0.7.3.rbf 3571462 BLAKE2B 828c28623b42c8f16ee5ec8d6b3f8132b7d93662d5e8b6aad45cb3bfbd14f9788b1a0f236377ce6fb204163d4b1ea1d775d7ddcb566610bef04a8143d9525ce0 SHA512 43a46b5081d52ed0770dafa19e7e71925b9d79ead13da782ee42637db41c42140597c703b0b6da1b56866c92947f811c76c08407eff3b043eeaf66e5560ffa6f
 DIST hostedx40-0.11.0.rbf 1191788 BLAKE2B a0cc51c1e591b44789225e4d42e77ac1b93b8422dc2bd02b38959c5ffd360b01d7649f638e7162302d6e1d0464cb11152c9b71685e7a76d4f4c33a96207b9a4c SHA512 37ff1a6114f1c805bf7df955922d64f66cc2c1e9abd4ada456e3113270f8c131ed795f5549537ff5dbea6a36bba307417ff284ed60fa2dd5f57fdb72caf0a9d1
+DIST hostedx40-0.12.0.rbf 1191788 BLAKE2B 47396bcade3cb2df3769569c5176dfbe8c9b717d02d62101d76d8e0ecdfa8df499966e072dd1b6ad54b03c4448e86fdad0c7e190ed30fbffb579b6282a2b1160 SHA512 1c963d5b4d3ecade5e9565202ce2563493806b44319f2b9b00325f17164f0207396b1546826afc19767f9207b3d526b90e74bef7e0d38be15ba6c81fdeb12c41
 DIST hostedx40-0.7.3.rbf 1191788 BLAKE2B 489372b297a9e7385809b36efa80df7d489cc803e5ae5b8c1a6bdc80434fd462ec5e12ab5996a4412fe3306038766330200776b0e11c816d0004cc7602721aec SHA512 b4619b8918d178a42e0bd4885ef1671a96e8aeb224291ee21a792e0be73a6e4ea2b8951003aa093581971aa220f7d101c4a1cddec90845ca31f11b17c5f67fdd
 DIST hostedxA4-0.11.0.rbf 2632660 BLAKE2B 53040e0d595e1da719f52a1e14ed81b3557f25a89eff30a56ae11ce071c0e7014b0ee5acc885495b757084c9e79fe60a78f71d05f131154b525d48326d27933e SHA512 11b6481fbc71ca4fef18b4267628e1d45794d235995446e29a164bc793d2402285bfd6bd1be596e886cc56fd4576fee7d1fe0c6903a236478bc4e7fd22849030
+DIST hostedxA4-0.12.0.rbf 2632660 BLAKE2B 25f434bcb434df420be3c6a4c0bb3d3f48189e81b36f7bf8d775856080e8552fd4a62690fec31dc1b13ba66057b2261ca749706183f0e4063068c62dcd909634 SHA512 5e3bf78c8f87648df241a234d2bcbad1c8ed066a2b31a7b8f529c2401e140603d47f37b72c9631308d29daaa4f56f77dbff0f1dab8071a55e66e385c1d3a9bd6
 DIST hostedxA4-0.7.3.rbf 2632660 BLAKE2B a98ea6ffc1ffdbf9b8ded3144d4f9fb19dac6b196239dccdd9ce908b185eac4898a65ac897f460b1a0dee437131bdeccecf2b36714099d4f86962f04108c856e SHA512 655df2f698ae376577925349fc4773cf3819360f7bff0932761160aa823625d408be48a809df7edd2e3a4054b418f5dd6a0769f2aa982551ea3b847eaea5fc87
 DIST hostedxA9-0.11.0.rbf 12858972 BLAKE2B 8a68e742a2afa8bac4274c3228390b8c8572255f1c96daf70fd49364ffd96c7490c2d2a712164484b87039fa52d93e808ea144875d873e3e238b6c7e9c92933a SHA512 d7213017b4d49e8cdfea8336889640b11147001887ca4d0a83d979f1fad9c4baec5d2825894e1b732efb2f4602a6d857191703f8d701e0444f6863250388251c
+DIST hostedxA9-0.12.0.rbf 12858972 BLAKE2B 29d3c5d12c232333a7e2cb2e9ef580a7a350a0d04287cf2d068894d4b185a0f8256cfe87269738978ab0f0fabafa28921ca6ff13b8067d61fafb46a30ca230b7 SHA512 990199f980ebdda58f40bd72823585b3091d829b2974e84ab925576b7d1db2dfeef1d0934763636b92baee982470cc2fcff85dfa9bb2c6254b7021274703e4aa
 DIST hostedxA9-0.7.3.rbf 12858972 BLAKE2B 71bbdea5ef372b9a6a6512757391c2b143ff69efbcfec58178873eff14c7995750a43939ea93b69529ccca62987ec4437621b6f78289a94acbc2f14c02069e64 SHA512 e33970360e3104891d3c738ab46662b80a29160d87b913c3a4655aa03bd6ff8236274d1f2ad591e4dcee40c85ff579abcd69e637aa5cf86e1a08c143f89ba685
 EBUILD bladerf-fpga-0.11.0.ebuild 1094 BLAKE2B 80a33113b538d6cb497221ac6dcfe47c08f0f70c53fd46d38bea0618d2a7ea02758fd8d51e3f3a407d70b2404886d5162170d7ec4d6bce923e4a2a2028ec780b SHA512 ae4931a750aee028258d37bce712f956b85f3a078d3939ce01419784aada4b32f602d29be84369db996e487d6b6e4d9a70f4438b28c9d204238603af0bb9646c
+EBUILD bladerf-fpga-0.12.0.ebuild 1096 BLAKE2B 47f88a6482a4e50d87781077adecfde1ee6422412bd2d36cee127ad164375bea77ef89460064a22a3f4e5ddfd92e8e5a37421ac3dc06db635162f7268c43574f SHA512 4233d3490c50872a7fcf4237ff136f70c074fd84358508a3b4bcd53e13af50b875c27bef6e939dbf9a74f3ad81e6d74f03bf7f7a60e521a0b7db543c8208ee2a
 EBUILD bladerf-fpga-0.7.3.ebuild 1099 BLAKE2B e68325362b5cc55e5ddd887202a6ae310f309fd5237916ffdacc80c04a5d0e19dfed5a251c42399189cd24bc77c942ee606b8d36613d299499e0d4d7161b2635 SHA512 3f0ae72740e00885f354f4b14c094574f84f5dc7efd98504a10a50a386181a8e58162dcbb98f49ad7473267eaa5e8ef7a1a8c7087ffd68d9f533fbabccc53984
 MISC metadata.xml 698 BLAKE2B d11ce3cfe82a1fc860cb8d7e796cc70f1d3140430437c9ce676e56836f6e5945f6657493e7087928a684903ac394e51742104a128e3db84fdbe2c7be4f87b646 SHA512 dbe253746eb236f7cc3d3701148ac0bd95604c459261f93bc21c27193ee62dcebd9d1f56da2e95a162d4eb86fc55790c5ad9c285181c955a12ac284caf2e6584
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
new file mode 100644
index 000000000000..cf4de99cf076
--- /dev/null
+++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="bladeRF FPGA bitstreams"
+HOMEPAGE="http://nuand.com/fpga.php"
+
+#fpga code is open source, but uses a proprietary toolchain to build
+#automated builds from git are available, but likely unneeded
+#http://hoopycat.com/bladerf_builds/
+SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf )
+		xA9? ( http://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf )
+		x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
+		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+xA4 +xA9 +x40 +x115"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${DISTDIR}"
+
+src_unpack() {
+	true
+}
+
+src_install() {
+	insinto /usr/share/Nuand/bladeRF/
+	use xA4 && newins hostedxA4-${PV}.rbf hostedxA4.rbf
+	use xA9 && newins hostedxA9-${PV}.rbf hostedxA9.rbf
+	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
+	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
+}
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 4ea1e278d6c9..c5ffe715d936 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,6 +1,8 @@
 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-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
-EBUILD bladerf-2019.07.ebuild 1712 BLAKE2B b2ef0e6fee8dd047ff30a0278ced5fd3893a3dd2bf725c392f152786e9e2f1dd4684ff1e361381c29be7fb603ce1d6c8ebb30dec23e1c27a2ef0a5acd287b330 SHA512 9e3b58f49d6e5781b80bbc3834fa0754da971523a8a22f37f3e3ac393142250a0a5c7ecce2edca60876f3507c77cc9e8e79d53593a0aa5fc610fb38d4a7af7de
-EBUILD bladerf-9999.ebuild 1660 BLAKE2B 65019f05d47d4c7d8003eecd4bd80a2360dbefb379c09643058c2a464175fe970a47a0f87557a851d06715e291f058e26e08dbfb6b3ceebafc1476d776790f05 SHA512 fd802f70997e4418c803edcb31ba4683c5ef6bcebf49323d3d07e970cb90658dde781811e2a8f543dc3abe749d12ba0d216a5f04f07593bd967d16bfec095f98
+DIST bladerf-2021.02.tar.gz 2261850 BLAKE2B 1450d6b865779af6a1ca2a88e6bda0d7292c98e5e194bdb73817d3339575815ed8b0c721515062b2798094affd1141341a1d738d9c7cb8bdb5d38b3641a42511 SHA512 7c0dc93bf0b299651691211ca207a245dd103001261e897058da4807ba14b6f44d6a35100db582d9648187c3e00de9ce282306d6fc6b347cdf874c61792a9926
+EBUILD bladerf-2019.07.ebuild 1690 BLAKE2B 6bd198bd82099a861b202226a6de5339e252e458dcc8143c039b9011b60afb37b2c852f4d8767f7fe2494a32aca786e38cfe086a7971b7736269e373cc9d86d4 SHA512 9ceeb249595508d2f9d2278b33218f62a573e5dceab257828ab919d1fb00592a2d35451cfec23168c48f0bf54ae4c9f145918e37ac1375bdc92f21da0bc40a6a
+EBUILD bladerf-2021.02.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
+EBUILD bladerf-9999.ebuild 1635 BLAKE2B 4395fd25ded370e0949a0b89c39f253b4d91d6465e4651e3f140e22dde8b516a6f089008ee7173f6336d136909ecf5ace01ea4c6e829dd445c8a053c2e7a021b SHA512 054ed6d0d5eaca69b520bc7c748d4bb7e80b0a5e9d9b59aadd7400e951d65011eb3a44e33a1dec49402f2105a7a34912d23a2c53956442831b643af0a0dd8051
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
index 675b62ecbef4..f3febfccacb6 100644
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
@@ -24,7 +24,6 @@ MY_PN="bladeRF"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-	KEYWORDS="amd64 x86"
 else
 	MY_PV=${PV/\_/-}
 	S="${WORKDIR}/${MY_PN}-${MY_PV}"
diff --git a/net-wireless/bladerf/bladerf-2021.02.ebuild b/net-wireless/bladerf/bladerf-2021.02.ebuild
new file mode 100644
index 000000000000..09bf7b568186
--- /dev/null
+++ b/net-wireless/bladerf/bladerf-2021.02.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake 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"
+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 \
+			https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.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.4.0
+	>=net-wireless/bladerf-fpga-0.12.0"
+
+src_unpack() {
+	if [ "${PV}" = "9999" ]; then
+		git-r3_src_unpack
+	else
+		default
+		mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
+	fi
+}
+
+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_src_configure
+}
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index e192ce20c313..aa9b028963b0 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
 HOMEPAGE="https://nuand.com/"
@@ -24,7 +24,6 @@ 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}"
@@ -58,5 +57,5 @@ src_configure() {
 		-DTREAT_WARNINGS_AS_ERRORS=OFF
 		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index e35a2e4cceb4..b128460afcfd 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.4.tar.xz 983816 BLAKE2B de8d475b0aec5b037df43fdb76ebbf4fdb05367f166c14cda818badf49376f2a91de246f991167a57ecaa82a84ac84b4e91f600237c35d86e27431a760192996 SHA512 b8b54942092c1984cfac0cf73e2ac23f7693cb3ee0aa4cfaab1fa0282de4afd539f6860d5541523b542956b2efa31da3ec012dcc39d92fd699d0b8479df641ff
-EBUILD blueman-2.1.4.ebuild 2915 BLAKE2B 6ec92936f2ef88b6e0af682cdc4a832f83ae8c66ea1d592f3a8cdbf804850962b35cec7c3ab4d25bfd80d72127fd8e7090e9a487ba8a43386ccea62009d77843 SHA512 b326218e1259fbae2bbcff946158d96b120521c0671b718f5954e31d8a3890493bdf0291f9420322af39a1571059d7baab953b8adcbece670a164b75aa1046b9
-EBUILD blueman-9999.ebuild 2909 BLAKE2B 858c193450ded8606ee6d70da3faf7eaddddf118a94fe3055f0ed3cdb59c594e11d744572414966fc38d4d83df55ee80f12f6fc7ad26fe7fe99d38f4964a85af SHA512 43d34a8c0dcbda16c8dfca6cb0ccfc9ee53aef9cf2742958d72c1162b9041f3cb996dfc6b786c03266cc03a39015f44810f4cd3db2b60f5f146be817b192271d
+EBUILD blueman-2.1.4.ebuild 2911 BLAKE2B 0466450ab9b1dd3e505e6b016b63b5ddce1b54db4c0611adece1dbd0c6c6cf5a638290eaed22e450852b65d0f1cdef652b6c4ca4bbadca49fa5986800d2b5ad9 SHA512 27dac66a0403dd54b179b721b623703ccffb6b5d840d48dda11ab63d503318fb316e1858b743dee31639d921a651d872b053185f5c5ce570ca7de028c543da98
+EBUILD blueman-9999.ebuild 2905 BLAKE2B 3d80557bbad6913616edbb090de49c365a99b139487acd324a07d1f781f0c0ddc776b2e6a11ebc1c118198f8e112b8b8545891bf3c2e97d2ea9c39ce9c40618e SHA512 8c344268760aacebcbe34df0e3423a11db515550f44bb54622f1c06f4249ea5a3492cb4cd83d31d47d6d9637a6c72a4f72c57d47154863d8b6fb67e9d05c1ec0
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.1.4.ebuild b/net-wireless/blueman/blueman-2.1.4.ebuild
index 8d6b0a615894..34209ec79cbc 100644
--- a/net-wireless/blueman/blueman-2.1.4.ebuild
+++ b/net-wireless/blueman/blueman-2.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -117,7 +117,7 @@ src_install() {
 		doins "${FILESDIR}/01-org.blueman.rules"
 	fi
 
-	rm "${D}"/$(python_get_sitedir)/*.la || die
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index d74182347545..0ab627a1c047 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -117,7 +117,7 @@ src_install() {
 		doins "${FILESDIR}/01-org.blueman.rules"
 	fi
 
-	rm "${D}"/$(python_get_sitedir)/*.la || die
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 02694bce66b9..273db6434152 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,6 +4,6 @@ AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 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-r3.ebuild 7842 BLAKE2B b4c1167dd0cc4073f93ebe2f2bc6d3492f616032050ea99d942a31328f48de378e4230df644ef445b2be1eb4d0fdb48cdf670583a96138ecfd0c099a864f8963 SHA512 d9db343ab082f49221b3b672d96507558257aa6b44f846a1c0f6cad19ea13705fc1bd860eca20d6ee3fff48951adfcd70c58ca37112deec6f67eaa2848134308
-EBUILD hostapd-9999.ebuild 7847 BLAKE2B 3229132f099983c1b9217d4e67df55ca7ec624f72694e5233ee2a34186300cd978bc9e901b6a86d2b099c573a875b4251d38809ad7883b693a348e6d463d017f SHA512 0ccb0816270a3b1fe69541028b952cc98a116fa6788252789546d956944540fad479e0fa26a7974919f300031ec50b6228d5f8ea526ba83ad71a3d2ad0d8e9f7
+EBUILD hostapd-2.9-r3.ebuild 7871 BLAKE2B 50283fe6ba3d643ae7c84c3d47471a56f824ae6aa58cf78b565dc80c8180404f8946182217c74de511ea60cf2e0ab145d58d4e94b6c85a8c49b555b901104593 SHA512 66c092f0d79bff7614fadc0dda04093204de2b1b2afe4c5edc3848d6fb096c21a3abe0b8bf73264339dd67998ce5b7614642574007dbea228adf8f8d978e68c8
+EBUILD hostapd-9999.ebuild 7876 BLAKE2B 0a1fffc7904ade94302842b58f6fae75bf3ffbe0b8a474bbe484c0a5db9699b06d5c15d574664ba1f8b465b7d4ee7a01f394925cad50fbc203c236929dd35acb SHA512 9059af767eb0c61b07aca8d6aa7828e4342a5baef517248c4e88d39701048db694ba9160286636ba6c4dc67030f2f5be44f6c88f03c428cd353431b125ed663e
 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 61cac6a1e0c0..6183c8c4e5f6 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi"
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 97a5fee6569a..3ceb1520bd8d 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://w1.fi"
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 68cbedeae30e..cfefd63f2266 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -4,6 +4,6 @@ AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f3
 DIST iwd-1.10.tar.xz 897928 BLAKE2B 1589300201c835b2b14c34a9adefb525173cc2f9c8154f0a5f12da64a1da3d383acf328c5138bb8d4903ff08f339b7d55f02e215896af90aa75d244f61c3de1f SHA512 c128ec764e9d727b4ae1157717826b3219c5d368746f7709a01cb816f077afaa32083052ee2a4ecd09a7fbd36c03ea9ba6bd1a84c2a33210398dd060e9020db5
 DIST iwd-1.11.tar.xz 907020 BLAKE2B 3b2c0922745c699ba01a2f46061246fbad6e2c7ea1a2f58cd13b5bf2169e9517652740f2dd872b5a274d74a5b8f1962c8e4696eabe5481a0c4783f202217599e SHA512 09c5e5e105b6107d88eff4238bf023f7bf1a408f522b9f84fac890c123bff2e124b937b81e1559db7fe0720f0ac423dc7d37c1b6d502fc4a7b7403fcd798e01d
 EBUILD iwd-1.10.ebuild 4869 BLAKE2B f5cb454578ae1de60535e4884bc870391485c3c70f9c352735f957099a28cd02bcf08f4cf0fda50bf201856f0c176a08f64bcd6eee06df2819785462b163eb97 SHA512 ff719798769d7c2ed5677a4480aa491206e7a3df009189c24bd88d7b9fca81c1ccb5734ac09e3e9aa04a624fb0ee8642a0fd3a59c481e8bd5bf48730afd5fa53
-EBUILD iwd-1.11.ebuild 4875 BLAKE2B f6084b8f8cd7cadebb369685f614e9d7a345f480711d17f7d8ea8fc81a5dbde38af210933b089198cdb95bd7bec12aa113b4ee552a73d89eda738e509005d987 SHA512 a0e2154c5d9075d01d78e5ed48b648b029719bb7245db5fa8579967a21a16df875e8a1415e4cc65fc2920c0bb96160e83bac3cd5e200569bb55f2773764892e4
+EBUILD iwd-1.11.ebuild 4873 BLAKE2B 9eefb4a38258130987b070ba486a08e1f30341011343e83a8ef9ad9b6cf2461a5aa97166898547291240e1d8960dce23c4ef6e03620425a76083ee9549875773 SHA512 1c62bc9899091e073b7a29f28c1525d161093ec0948ff3feb44f1768a1c87d687b4a7760888112deec172af08e91b2a97893b01c7386b8ff8238a78304ba325f
 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.11.ebuild b/net-wireless/iwd/iwd-1.11.ebuild
index 22de68c453c2..1e6534eeb7c4 100644
--- a/net-wireless/iwd/iwd-1.11.ebuild
+++ b/net-wireless/iwd/iwd-1.11.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 246175166142..b1ee7653b024 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,8 +5,10 @@ DIST unifi-6.0.43.zip 136844666 BLAKE2B fb330f9ba8c2d22dacd5e37fbeccc411101e3885
 DIST unifi-6.0.45.zip 147691229 BLAKE2B ad8e34e4934449151b0244bb32e2ce81e2506f228c995e72c2756279ce22f1ce06d44c37f1cfd6156cee0d03066e36d99f98b56d2a1c759ee98ada6569b8309e SHA512 6b2aebf33b6e2114a2b274ce332e2bd88a30406e3a21bc66dc0eddee3ee27ee2e4d3948dea73ff85289cbc2ed0e4f2b646e095091c54120f718b5fb2f0b35943
 DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b
 DIST unifi-6.1.51.zip 151612025 BLAKE2B 879256deb0da92ba028f956d2ef0d0874fbb05a52b0c9763657c2d2b326512ddf66e711694a09b04d0eebfb7147ca757dc0b1fd85a52eb9bd7e6c402936009e9 SHA512 6303cd66dd88c0ac6d67ddef662ac5a7491d1e5ffc670c08f7d76c1607c4c7617234f40c4572daec82f11a7c4fd4eb12afe7c788e158bb7ffba7856eb9b2aefb
+DIST unifi-6.1.54.zip 151673218 BLAKE2B 3d462a5a2edaad9c2ae16e6efc68ef8ef4d6cce98ef2654b08b93b37ae1e8f5b6f69dc330ba410a035f6edaf65673962998eac3167762521e9fd1588992efa41 SHA512 7a5c41b0385fc84cfd580f488579453a474721c297086393dc82ea6a82ebdd36bf2f441fb80879f32617893f6156c5296eb6a5c39723f69d39854ff3a8816eca
 EBUILD unifi-6.0.43.ebuild 1565 BLAKE2B 8b55f4c16cd19b6e34d86c8efae53bff61d80c55e2dc351927d6f5860e6e0db8ebcfd02cf1aff2c1c5998f41da165a53f6e71ba184d705fa6c178c62140726ae SHA512 1fc10fb07c246c9d5b7f6d22dca402c6a79af60c6f450b4ada3b724855092a5eb9af94a1077a2e64cd4d3623ada7d1ba26fff131e04bdfa834e6b6e8c70f331a
 EBUILD unifi-6.0.45.ebuild 1565 BLAKE2B 2750bd1a561a8e7bd0287ef38ec7b6fa8a799dcec219493388c009da1d4c2def69d765a86514ff13f647d8148ff060106382030b039755a43dcc69dab38d3f2c SHA512 6c0526d1b855a49aa2a81f6d91d0a514e54c7332012cc114302c5b73956ac7855ce006b08fbcf2c650c9a05910b145e6068bd4562685408e6032ffa71ed6f624
 EBUILD unifi-6.1.26.ebuild 1566 BLAKE2B 1e7c0b6b4dffc76041f23daa3d6523a7e4b088f4cf3be529bf1acc7bf48c94049d51e351c425bf6a488bb253708bcb62983c2918364ac8f0792231e67c486023 SHA512 f1b22181098927c83c0cefd7359c112ea38f1b4c096edbb4eaee97cbc0ef56261292ddc19e5208319bdfa85908d5203dfaf91f4dc9b893052fc6047f6ff73a9a
 EBUILD unifi-6.1.51.ebuild 1566 BLAKE2B 6845e00e5d5b3042fa22443a994f4cb611a88ef252d0e5c3073962db71d47cb0a5deadadd6f8eb8f396e5632a5656ec61e11e251b9b7699afca3c641b05d5436 SHA512 33e1003dc5d86fac2a5e8fe4d4faccf1ee6be77d07314c5affbd34da7d264e273737d067e7861706f35400687c18a8fa22e7e53ff2895d6b9bff7f892294e05e
+EBUILD unifi-6.1.54.ebuild 1566 BLAKE2B 3fada94def23e868769b4533187060d16805b64f97ed964376fd9c41d145b8a5be4682807bed5e51a6e785367f2b2834399c467dad15fbed4473ecadeb5afff9 SHA512 e44de747c37359ef1cc1df65a6b6798d751274bd6566bd7885c78f0d1377bcd2f1d0942a36ce56bbae95260292479175b33742ea385554afef750aa0b31500b8
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.1.54.ebuild b/net-wireless/unifi/unifi-6.1.54.ebuild
new file mode 100644
index 000000000000..13b347036217
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.54.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 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="-f60db383e8"
+
+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
+}
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index 8b71ede25f02..be788e60f568 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,8 +1,11 @@
 AUX wavemon-0.7.6-ncurses-tinfo.patch 669 BLAKE2B 78d027ef6ca14fda651cb6fa06563f9f60c339af8567b0e743dff2975b812198b4ad2166fa59fd28219dfd51c0983eb4890719718412459d733c78ae6154e0d9 SHA512 46e43f1eef87a4a81cf812f7e576f0c7d8e867fcda6494a81aaf5c45609ae0b4ef4f21f671cfc4d763700ae2eb198c7c8d3d52de95ec0416f9b1e675077de2a1
 AUX wavemon-0.8.0-build.patch 945 BLAKE2B 149355ed7a956d230014e8957efc71bff787d1c6890bd277fc64bfe83c8acdd8cb844d071cdabd0c470465443404b279a600d0dd02b9e8d136ed68d088a58015 SHA512 0c1463974431f51fea24ceb14de785012b89c7d8901d91a50979fdc07d2b11bf7980312b6006ec6f1d2bdaca768d2a947820b5fc6429d361dd6ad957b3798ac2
 AUX wavemon-0.9.1-build.patch 1407 BLAKE2B 55ab2df35083d2ce08c8a0b0a1a48605b0c7d62254cc0622a298cdd6bcbd61b3845f8175bdbb9505ec31032b3649fd4fb49cb2739c4456496f8366ff2df85422 SHA512 5364a9a35d7c4fc7dbf4822d177dfd39bb36405453aae5d5844a1b23291a3e83a7ffc4da9dcd7d7d5ae62ffd906626e47331148e4d1b5770626464b6865465e6
+AUX wavemon-0.9.3-build.patch 1383 BLAKE2B 3c578fa5a08c8659706728b5612e22c991f2e6901e905f17c83743aad806023308c8ac8f73ef1af58a7f14b0382e3cab3a962aee616cf9883eb756d7bc9b6048 SHA512 61fb96ab56921dea52e4b834a29cb0a512a92db5b3c495c127a7d5e0a5a6a5d9d825bb2e474fc0bdf40c515ecb52cc163c0667283dd54d5417a16f52753045ec
 DIST wavemon-0.8.0.tar.gz 196353 BLAKE2B 90d358d325b62ba9379ea525c4399e38c38043e67460b20188c4d81261d290e8e3f154a33240882f8b2611e4db1862d7bd33c87e168569be9d751d431602da81 SHA512 2df48eb300e9b30e0cb7a0ab41ba5e10b2a6e8170dbd11a4c978462c8cd6dc1171f79ceadfdb7344c495420a4e87b7dd723efea4f1af59a6d0312d93049ee798
 DIST wavemon-0.9.2.tar.gz 202575 BLAKE2B 0a1afe1081bbbeb2ba0fec4741df7da846b65bbf182e886b2185c5e406258a1ecf912509b1a8f4862f37ba92832240dc6db4305a8d5cfb6f4876f3e93b04ccc7 SHA512 f1ee2e4602e93f0639c10067d23df021101bfc0496e53b221cd1553ebc90876cdd963cd64d5ef503da6d4dc4fbcf640e78873df1bdf64272e70dfa3c53ec1706
+DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1
 EBUILD wavemon-0.8.0.ebuild 1117 BLAKE2B d5579023a508f8439a2b39447214191a580ef50c8213d3d71ebd90d21f7264e5c94f8ce0c1aba9afa66f12d8ea205adf7189fb20d1343d85f026431d5e92527f SHA512 6780e4604e73619ff09aaa2902d84b51d137c476a70dee744bd14ccf2063e4e235b166065e4dda5fc178db949d2fbe8693bb5c326f4824c3c43a56f19d7a9d4b
 EBUILD wavemon-0.9.2.ebuild 1161 BLAKE2B aac1911ab095eeb2d41a95cd6db61376563dc88dcfbab5ad5cf80114233661ca81105746fae0cd9a7d9ff130a51c0a8a38efbdb44f7429ed2d9438145046b9cb SHA512 14001971ea214960261774f36fd52db37d42cddebbf23587c5eb2a8447cddd4367e37ee79338cf0b06747df250dbf8b043c83d8949eb4a5dbf745b5ce7a6d992
+EBUILD wavemon-0.9.3.ebuild 1137 BLAKE2B 30cc694b307795e384abcb4eab70cada5b6a6f74df22772df15dc3eb9e33bfef9ca8b5346bf517d93e44c30a8a190e706a7935e957d322b13d4c9941cd79982c SHA512 06572556f40d81b6d710a334711cdfad1f68823eeafdc55ede3a0222129b54d80d5fd840eb8dd7d644aad80ba0ddc3c2a4bb27500555f67fdd63a1c01ab3829a
 MISC metadata.xml 445 BLAKE2B a794776afac9b415fbddd75844766c3ab9c93019e549b31c593f7389c1be40a5b47a558aba8f2b7193daa6946e96788be52a744de118a1d513552d20b345960e SHA512 8162bf5d00d03cca9b009ecab83aa0f28f770d8a1774b69767ea2747e095a0c650ea54595d4e6cc2fd1e03c3bef72dbfdd5a6fef067e4264b235d070c9954f2a
diff --git a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
new file mode 100644
index 000000000000..74b09271a0f2
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
@@ -0,0 +1,49 @@
+--- a/configure.ac	2020-12-26 17:44:01.616731241 +0100
++++ b/configure.ac	2020-12-26 17:45:02.447292151 +0100
+@@ -8,8 +8,6 @@
+ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_FILES([Makefile])
+
+-CFLAGS="-O2 -Wall"
+-
+ # wavemon is only supported on Linux, warn user about futile compilations
+ AC_CANONICAL_HOST
+ case "$host_os" in
+@@ -22,6 +22,8 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ 
++PKG_PROG_PKG_CONFIG()
++
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_TIME
+@@ -29,6 +31,7 @@
+ 		  net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
+ 		 [], [AC_MSG_ERROR($ac_header not found)])
+ AC_CHECK_HEADERS([ncursesw/curses.h])
++PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
+ 
+ # linux/if.h needs 'struct sockaddr'
+ # linux/wireless.h in turn depends on linux/if.h
+--- a/Makefile.in	2017-07-14 21:35:18.154423280 +0300
++++ b/Makefile.in	2017-07-14 21:35:34.613402738 +0300
+@@ -9,7 +9,7 @@
+ install-suid-root: exec_perms = 4755
+ 
+ CC	 ?= @CC@
+-CFLAGS	 ?= @CFLAGS@ @LIBNL3_CFLAGS@
++CFLAGS	 = @CFLAGS@ @LIBNL3_CFLAGS@
+ CPPFLAGS ?= @CPPFLAGS@
+ LDFLAGS  ?= @LDFLAGS@
+ DEFS	 ?= @DEFS@
+@@ -25,8 +25,7 @@
+ DOCS	= README.md NEWS THANKS AUTHORS COPYING ChangeLog
+ 
+ %.o: %.c $(HEADERS)
+-	@echo ' CC  ' $<
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
+ 
+ all: @PACKAGE_NAME@
+ @PACKAGE_NAME@: $(MAIN) $(OBJS)
diff --git a/net-wireless/wavemon/wavemon-0.9.3.ebuild b/net-wireless/wavemon/wavemon-0.9.3.ebuild
new file mode 100644
index 000000000000..9f5e4f442ba0
--- /dev/null
+++ b/net-wireless/wavemon/wavemon-0.9.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Ncurses based monitor for IEEE 802.11 wireless LAN cards"
+HOMEPAGE="https://github.com/uoaerg/wavemon/"
+SRC_URI="https://github.com/uoaerg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+
+IUSE="caps"
+RDEPEND="dev-libs/libnl:3
+	sys-libs/ncurses:0=
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README.md THANKS )
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~CFG80211_WEXT"
+
+	check_extra_config
+}
+
+src_prepare() {
+	# Do not install docs to /usr/share
+	sed -i -e '/^install:/s/install-docs//' Makefile.in || die \
+		'sed on Makefile.in failed'
+
+	# automagic on libcap, discovered in bug #448406
+	use caps || export ac_cv_lib_cap_cap_get_flag=false
+
+	# Respect CC
+	tc-export CC
+
+	default_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	default_src_install
+	# Install man files manually(bug #397807)
+	doman wavemon.1
+	doman wavemonrc.5
+}
diff --git a/net-wireless/wepdecrypt/Manifest b/net-wireless/wepdecrypt/Manifest
index 316d3917d585..b01dc9651159 100644
--- a/net-wireless/wepdecrypt/Manifest
+++ b/net-wireless/wepdecrypt/Manifest
@@ -1,7 +1,8 @@
-AUX wepdecrypt-0.8-buffer.patch 588 BLAKE2B 10d13f865f9f9033c017718c10a8cc1b6edc80a28fb7341e7c06b1663afaa87f3905cbbf9fb9d5ad6d407de551f5ffe09cac2d6bf18c778e429a6e1b1ab3becd SHA512 4fd35710e614fcfa54de7d67e9ddc87fe1f956b534f0cd626bfa82ff2c0b3c9c80fab982900e42e5b61bb82472472e9192bbb08a343fc5526ba7366acb17fc6c
-AUX wepdecrypt-0.8-build.patch 1249 BLAKE2B 412a4d2a055d56a444c068ef1a508d693a5ed7335febc84dc8b64aeefbf8debd6b8b118caef8633e5aa1f09ca5fe9025eabe5c208ea2d064af1f34cbec7e66d9 SHA512 0d02e7642b874ab626d2b2d4093e456135b8e8f06ff4afa5dd2caf3e9489d23cd1668ff8cb9a4a732105d88bc55702ad722da682af46f680251597642f15316a
-AUX wepdecrypt-0.8-dyn.patch 548 BLAKE2B 0c699ecb20a35fd2912662fafa1057f832580a6692c7e986a3863a17be59887a58cce475cbf37a888d053e868bdfde98c524bf3bb916215967607915ba7c8493 SHA512 d3d04cf3fd40f68255fc2893560283c5a34abbfb246c15e84e3c8ee4aa2eae6390033ac2c9a352ab68b5c6026ac3f79dd111faf144673faceb15ae1942d7c6cc
-AUX wepdecrypt-0.8-fltk.patch 534 BLAKE2B 08de31992e5f68d883b461e3071d1b094405e29423569d28e3c599e4228b018f84b2753ba2294d0bec1be1cb6ad7e83c6903bc1022d6adcd9ef40c7d356cd999 SHA512 dfc860cb95640a2bdfdc648a2588b6a02e8e47b8ba8959762b69d19a97f4ad5e8253baa8ca53e2a8556b5d4b3ce56fab3bd44d861ab0205465e39fe460ebabdb
+AUX wepdecrypt-0.8-buffer.patch 516 BLAKE2B 30c52367c72e52d7a537c721ae874dd788b57765ebe261fe1f8b491ce58676452ab202afb24e14969d7485fe95bb7f8b28fd60c26ab440b24b4cf19fba8a19f3 SHA512 c0e1c7f03d6f2a588f021ae39f20c3de0788c6ce562da9ed14841f038459d1917115540bf01ffce38aee8ec16948817026e13ccaa4ca58eb35060a9851fa6db0
+AUX wepdecrypt-0.8-build.patch 1076 BLAKE2B 1f2acbc2a63e1317ce20c8a46e7a8ca6871c7d2ae23025fb2aa35737f6dd649fd0816cf36423921dde7624c4b9f768545b8a742609baadef8811c71a21eec05b SHA512 716ec50ef04514ff5eae86571868b5e1041b3d5001fe9b262e7bc77969c05321d9e2449ec70a88ee9d9d9f2b228ada874ebfe4bda2d3e68c5d700826763e11d5
+AUX wepdecrypt-0.8-dyn.patch 477 BLAKE2B c2f00d30dcc5a81dd7f6c737fc919c560bcaeb3b734860b8d930f434a1e1a88be44d43887a9b153e70113696db7e4c712eeb3e574ca92868614c118bb710727c SHA512 f8c5af04dfa5ceebcf877d13c83ac56bfcaa045dbcee0886a2cb530444300d3e494edfafb799c0fec8db377110c5e38349636d747eb016c02e998eb44d5919f9
+AUX wepdecrypt-0.8-fltk.patch 397 BLAKE2B 1e6602d0853d5f37b251e89e50d641ffaf1e4abf8126768105ddf7f306e0dce150d3ee7401e41e3e1af606cbfc1ecfa2987cb68108b8e5dd0112033f3f6f3d02 SHA512 5c562ff285661eef13e02eb1d75a638658e55e868b5bf378b43b037ef4bc99076e630a706823832c2d9e639b3a32f3f59eee3f91b33fa5ad6e2fb79e5e6e0ddd
+AUX wepdecrypt-0.8-fno-common.patch 256 BLAKE2B fed7cb5f1118bf2691b0d3f5fd5c5ffb8373962b1dc73272a57a5b3d9ff3fc8e0eeecd9945cc1710dfff7f3ea34de98f501b7caebf8fecffc811256c91946c2d SHA512 87f9485b8fbde6eabb26908ac0779effe1541a1acce80d40b0172718d3c3f332f085008ccfbaceac9c0398a983413ed3c52c38834a4792b8dc7b14f011a50f45
 DIST wepdecrypt-0.8.tar.gz 90260 BLAKE2B b5f2474ce86b376d77275fa39a59cf4e524221e8eca816dd153c55e3283793ad62257010acb380273dfc391a9e2bc04eeaee53a9a1dc80add3431e763cc6f07a SHA512 68278e44055354eaf85640fdefc8d97a1155e6f022ed3d708db7d32e0fe8a8306a34fd80aae81eb9aa3ef51a069f8fe5ef060847163774184d4181c62853300f
-EBUILD wepdecrypt-0.8-r2.ebuild 768 BLAKE2B 8a28f00d032fcd581510f87f44220ea06fb9c5a71e6ed017c21046e852920e15e9c3c986f192d01bb6b831e2f072e4c44322513d939d253aec7f32680c5c90e2 SHA512 8e6691e318ee69df1fe93de8c11ca4f8a9e729acf2f7abfc7f0e907ac9c512aa84738c96b66d7b9e07834c8c0d6fdd6ddb2c1a0f1f28e692ff9d55c5848c958e
+EBUILD wepdecrypt-0.8-r2.ebuild 939 BLAKE2B 56c18014f144904f18634a2f35d7873422f02c037f2614d2efbeadebe40df5b5164e0822e85d465b927a42964788ecafeca295793473f04b576ec811d273c105 SHA512 48d85534f7d17e428c8b1da5e0f109852812888bcab56b3264dbd2b08528e274a5b5fd7501dd51377c4552d0ecb90280dc2c9312650fdca3652d6a48ebcd4997
 MISC metadata.xml 247 BLAKE2B 28ed640c3f82b1ebdfada3787e9c6f8338282489bfcb9475cbb56e59be4caed2f632461d4f65d4e0d77d4c50a1e4747bababbe5766f2c19b45e93a62e5eefb40 SHA512 afa5218288bb0930f5ebca83619ae5d2b08a02b651aca5455d8fc712a85445754ea9e7e370fcf72c757982a48b60a848318c315746c9c3f01e1ca0bf79260d6f
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
index 4b8fb8d1223a..097979158af7 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-buffer.patch
@@ -1,5 +1,5 @@
---- a/src/wepclient.c	2006-07-08 19:48:08.000000000 -0400
-+++ b/src/wepclient.c	2010-12-10 13:16:32.000000000 -0500
+--- a/src/wepclient.c
++++ b/src/wepclient.c
 @@ -75,7 +75,7 @@
  int server_connection(unsigned char * server_host, int port, char * packet_file, unsigned char * init_key, unsigned char * end_key, unsigned char * decrypted_key, unsigned char * bssid, unsigned char * mode ,int option){
  	int sd, read_bytes, write_bytes, i, fd;
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
index 5c13f87a7402..fb38d95355ee 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-build.patch
@@ -1,6 +1,5 @@
-diff -urNp wepdecrypt-0.8.org/src/Makefile wepdecrypt-0.8/src/Makefile
---- wepdecrypt-0.8.org/src/Makefile	2006-07-09 02:48:08.000000000 +0300
-+++ wepdecrypt-0.8/src/Makefile	2007-11-10 18:36:25.000000000 +0200
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -6,15 +6,12 @@ include ../config.mak
  wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen.o localkeygen.o wepserver.o wepclient.o md5_digest.o
  	$(LD) $(LDFLAGS) -o $@ wepdecrypt.o rc4.o wepfilter.o log.o \
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
index 6fcdc578c729..fab8fdf75e57 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-dyn.patch
@@ -1,5 +1,3 @@
-diff --git a/src/Makefile b/src/Makefile
-index a779cb7..f32e65e 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -8,7 +8,7 @@ wepdecrypt: 	wepdecrypt.o rc4.o wepfilter.o log.o modes.o misc.o verify.o keygen
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
index 149c3eae32ad..df2aa8d27bdc 100644
--- a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fltk.patch
@@ -1,8 +1,3 @@
- configure |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 12fa395..258b157 100755
 --- a/configure
 +++ b/configure
 @@ -2915,7 +2915,7 @@ fi
diff --git a/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fno-common.patch b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fno-common.patch
new file mode 100644
index 000000000000..dd689b18d772
--- /dev/null
+++ b/net-wireless/wepdecrypt/files/wepdecrypt-0.8-fno-common.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/707456
+--- a/src/wepfilter.c
++++ b/src/wepfilter.c
+@@ -30,7 +30,7 @@
+ #include "config.h"
+ #include "misc.h"
+ 
+-int server_mode;
++extern int server_mode;
+ static int capture_successfull = 0;
+ static wlan_packet_list* head = NULL;
+ 
diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
index c7c1c62bc348..7ea4ad0436cc 100644
--- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
+++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
+
 RDEPEND="
 	dev-libs/openssl:=
 	net-libs/libpcap
@@ -19,19 +20,28 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-fltk.patch"
-	"${FILESDIR}/${P}-buffer.patch" # bug#340148.
-	"${FILESDIR}/${P}-dyn.patch"
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-fltk.patch
+	"${FILESDIR}"/${P}-buffer.patch # bug#340148.
+	"${FILESDIR}"/${P}-dyn.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
 	default
 
-	sed -i 's/make/$(MAKE)/g' Makefile || die "Sed failed"
+	sed -i \
+		-e 's/make/$(MAKE)/g' \
+		-e 's/wepdecrypt-$(VERSION)/${PF}/g' Makefile || die
 }
 
 src_configure() {
 	econf \
-		$(use X || echo --disable-gui)
+		$(use X || echo --disable-gui) \
+		--infodir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/man/man1
 }
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index e5f058097691..4e716dbeb312 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,7 @@
 DIST wireless-regdb-2019.03.01.tar.xz 23196 BLAKE2B 804ad05a0270df58dd89eb7193f8b568b5534abfc52b35f519e27cfa1f1922db457c77477b3014bd6b48cdd1bbe9e859a6508afa848cf01efbbf6b20d10c4984 SHA512 f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72
 DIST wireless-regdb-2019.06.03.tar.xz 23176 BLAKE2B 46ed9c25103a57d2370f07035f27ffd89d6a65cdccb22d283aef524aff60b669f21dd4a4dd78c68229a443640a5fd0faa1ad6917e712181881d4b27ead74f480 SHA512 73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb
+DIST wireless-regdb-2020.11.20.tar.xz 24840 BLAKE2B b2db70097db43710cc2b6d8966b5c6d4d910a704a87a0bc979667bfd293d8baa402677b5e5bc0fcc4f49647ede4cd6bc3e17d41288f41e58c5c6cf3b968489a9 SHA512 93764e677c4d5cdcb4e927bff206c646061fe1e65896dd63f683e145d45917545b4e08caa14bfb3ea04ffb85438935503bbde386cbabfef2804905e508ecf7a0
 EBUILD wireless-regdb-20190301.ebuild 1074 BLAKE2B 907d91e22cf6a29b65c82c2d9837ea4128a6928b6674effc000ceaa1a5b75cfb8ccba5fcfb47ceada6c8d7281e49b25f0584d69f20bba4dc1db1cb2a171b1570 SHA512 5c747eb1b4cdd400e5b62df5b73ff21ea3bb8f4614d3b67ea03ea7e364ddad57d6733b2548b0fd8981701093542b1ce8a11b34d259b228db165ead464cbb771f
 EBUILD wireless-regdb-20190603.ebuild 1074 BLAKE2B 907d91e22cf6a29b65c82c2d9837ea4128a6928b6674effc000ceaa1a5b75cfb8ccba5fcfb47ceada6c8d7281e49b25f0584d69f20bba4dc1db1cb2a171b1570 SHA512 5c747eb1b4cdd400e5b62df5b73ff21ea3bb8f4614d3b67ea03ea7e364ddad57d6733b2548b0fd8981701093542b1ce8a11b34d259b228db165ead464cbb771f
-MISC metadata.xml 353 BLAKE2B c6f988d4f44b12b5745a588eaf8fb915883eeeaa5a24d11f40bd82caf0506d60dd77036de48254738468132f9407736c2fba7e773b5ef4481b739e1a7a48741d SHA512 826082212c061dc3e4aa6d59e5cc019ee5a9a184d739fa91274a995dbff0f0b10a0fbf241638b413252f914dfe8c954ae02f2243b0c2653684ea99b9454152ac
+EBUILD wireless-regdb-20201120.ebuild 1073 BLAKE2B c6ba5b18e8c6d66c0a7c9eba5caf82a939302cc7678aacf4b00437e552ba487286408b8fe4a87cc10f0dd790eda01ab915325d46b3fcc458adfd37e20006cbf2 SHA512 88dd43555df0f420365d98e0a1628d808045c3bf058d72d9c6ed4173c013d674a8c5cf7057876aa4411643b076dd55b9a3f79e48aef241394926d72a6eb378dd
+MISC metadata.xml 377 BLAKE2B 0d6169ef294234e5652cf6dbf9d270e8e09e2780449b1bd7b9d565163fbd150584590aff69547aa016fba6c746c64ec34b6ea99cfa3b5203d2b28fa25f5b6546 SHA512 79208a488315b6c618273728b77d0edfbd4c42defca71e4c2092ddf9ef61c535045b181e11dd50277caea46e910e52b310bf6903c84267495a36e8cbc3e17c7c
diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index b3f79edbb0d8..e076774e6335 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -9,4 +9,5 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20201120.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20201120.ebuild
new file mode 100644
index 000000000000..861834a692fc
--- /dev/null
+++ b/net-wireless/wireless-regdb/wireless-regdb-20201120.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}"
+DESCRIPTION="Binary regulatory database for CRDA"
+HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
+SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	einfo "Recompiling regulatory.bin from db.txt would break CRDA verify. Installing unmodified binary version."
+}
+
+src_install() {
+	# This file is not ABI-specific, and crda itself always hardcodes
+	# this path.  So install into a common location for all ABIs to use.
+	insinto /usr/lib/crda
+	doins regulatory.bin
+
+	insinto /etc/wireless-regdb/pubkeys
+	doins sforshee.key.pub.pem
+
+	# Linux 4.15 now complains if the firmware loader
+	# can't find these files #643520
+	insinto /lib/firmware
+	doins regulatory.db
+	doins regulatory.db.p7s
+
+	doman regulatory.bin.5
+	dodoc README db.txt
+}