gentoo resync : 17.02.2020

35 files changed, 522 insertions, 74 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index cd24eaa7e8b3..7da2f7f60fa9 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index f6d7b1e8750f..445b361c2879 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,6 +1,6 @@
 DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046a094f9c772a562f19ae783c30810cf7b6aa8668566ef6998af79090266771aeea8037b446eb0b9755b602ddcebc0d2 SHA512 72c249782dda3a875fbec98e4fe0e6044a6f123ebd36341a5f42733dfe6c26d96b5c74f67c0547b81c5dd5e2f52a6f475b424885f8e6fa21279ac539228038f5
 DIST aircrack-ng-1.6.tar.gz 7933308 BLAKE2B c4cacdc9b767789a7b2426857831c1f8166d3f2e11a71cffc1466f2d4006552dfe420a50e0085f3c74fbdc23770309bb81d49e0c5372b0e4a8fa5e294c16d942 SHA512 df65ec3032ff20dc4aae4921e6a9c330a51b5df89af02d4c6fbf691fcfade21658b1a2d5de286a7e729dc6fb740f6fd4e6b6f53649486ef64bc3d00d81a95bd5
 EBUILD aircrack-ng-1.5.2.ebuild 2893 BLAKE2B a93ce214ad665bbf50e7d08bb1250731e2993437592fa6db39b1a207090ec4264e6f8b8b51d6a4f6f97b972250d0abb2afd5b23394899ae3075464939ef4a5ce SHA512 7797d00f2128120e5755a023903f6677c83face85d31053b71e9a11f73fcb2f64069464727aae58c6a234ad1fe673a987afe49c9271a191dd5cf0420b6f43572
-EBUILD aircrack-ng-1.6.ebuild 3065 BLAKE2B b9c609292bc81035b97a48a2ba3824f2c6a9c96a6d299b4831525f5f14f66d79366ddc5f0159e81130c5737f23a9cd62d5bc2938db2b31000384cd8f1438c445 SHA512 0a9dbcb42146f62aad2e4b6db30bf86605347c094131f4a23056512d6fab3e81169350c62474c3f37222e919c5b2fa4e7c3f251e019ca3974e69420c582fa3a0
-EBUILD aircrack-ng-9999.ebuild 2896 BLAKE2B a71674967487bffbe6662aba8c02b5861d403f4cf97cb8ff711d19d46ad295a4e6089acaa5dca96fb1aab4704fc44bc3ed8dac6b60656bab149d0875c02da557 SHA512 69c5efbb589d303a88a1ef18fcd2def9c9273e26fa967eebc320d5f6443c592119012ea213f0d35ce224d3627de4c296f0f6f46723ba061f335f65728d68cf0c
+EBUILD aircrack-ng-1.6-r1.ebuild 2951 BLAKE2B 7196765247884f2206191517dea0b801b0a240c491ed652f50aa3fbb604549c9810b74c8e1cbc54eaa36ec82fb256f6f49eb47110be2705eaf44c26fd1d0ecf2 SHA512 6ba1953e3af47afa061691b42ec238a19bda98080f99adf0a67aa9ffd95fd7bd82cd9f96680e68db10ee839e6f35d8ce4469da2ad84e2ffda8699b63ca86d7cb
+EBUILD aircrack-ng-9999.ebuild 2952 BLAKE2B fc5540b4faa82f0b88f279c32650d7eabc506e150960028d59786afcc2b9a0dda5198f12d9858bb029e6850f9a9e45f813269eb810d660dcf416ddce244b7496 SHA512 1554f875c73f68a25352437bbd11021c713e9174572cf8c6f88d3959cbbfeccf91920644054b6f207acd7903a0d06c37456273eca23de4114ae1ac7da2b26c56
 MISC metadata.xml 936 BLAKE2B 1e62943b6dbb382d972c07ec810b332be4e9e949b025450bdcc6380f129c463c5dc370a476bb3db64172e8ac319b93361ce0cc1cd71d2072acb5a0891413ebf7 SHA512 6fc72c61abbddf6019c5a3610e422d24cd0d915e98789b411c978b54c61b4d6c50224a5d0905b25520f27067245327dd10ad3cada1d0a316d66b18ed9fc3016e
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
index 69db574fc3d5..2b60f7a33838 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6-r1.ebuild
@@ -3,10 +3,7 @@
 
 EAPI=7
 
-# Upstream aircrack-ng supports python 3.x but lorcon doesn't yet and
-# it is needed for airdrop-ng. Will adjust when ready.
-#PYTHON_COMPAT=( python2_7 python3_{6,7,8})
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8})
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -101,6 +98,7 @@ src_install() {
 
 	# we don't need aircrack-ng's oui updater, we have our own
 	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+	find "${D}" -xtype f -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index fa7cdd3ca822..e6f82c3506c9 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -98,6 +98,7 @@ src_install() {
 
 	# we don't need aircrack-ng's oui updater, we have our own
 	rm "${ED}"/usr/sbin/airodump-ng-oui-update
+	find "${D}" -xtype f -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/net-wireless/airpwn/Manifest b/net-wireless/airpwn/Manifest
index fcbbb00b231d..9dbc3441cee9 100644
--- a/net-wireless/airpwn/Manifest
+++ b/net-wireless/airpwn/Manifest
@@ -1,3 +1,3 @@
 DIST airpwn-1.4.tgz 910109 BLAKE2B e1e151183e29310a2f35e869fec5f191c37bf25f3bca3f084bea060fad6a8c575cb5ddb56cd5023c252a298b5205c844597908296c6c0b61c8bd560a20b60145 SHA512 c849740848289005eb2a72b09bbfade6bf078a3ff93d39300f6a65d328c527bbafbb2a325f2813064612f91a2da20a2daacb8508497e8410ad0befc4e28331e5
-EBUILD airpwn-1.4-r2.ebuild 960 BLAKE2B d4d5be6c1860a18a464b700c36be69a4f3ed723fefa1a2c67181e70be335bc492268ea9ea38f848a629f7ab874974c3ed395916ae09be3b776fb01a83b6e4453 SHA512 1aa8cf123b5ebf10ec128eddeedfa032581107fd75312220776e8332c3b871f68d39d2cebf2cf334f9e8934c1bbe84789c0abac39f55ebc8f1c6d6987c46bd79
+EBUILD airpwn-1.4-r2.ebuild 967 BLAKE2B c7dc0edc08f632c878bb83ae617ceb5d096afdc4dc0817c16986d4e5d1c42187a1a6c1b3396c8b917574d5aff220fce01d0122fa6c28f845685848ef464285fd SHA512 9f6ff2b4f1d595c701533329d55c74c8a76a6712b6268b546af7fd8da85d7372776a7d7ee0a8d403fc58f6557f7c3767f43c0490805a9d82368d012a605a7ac2
 MISC metadata.xml 333 BLAKE2B 193a48fb68fec9fe4d5b24700647e5deacbad5f02cb229ce07e556028475e6233978afbe3b89b4c8972fddd624c3837b304b4dc888258b6b21bd83a982b3f34a SHA512 66a2e0bbf61c8cbc201d159e067468a77c14588e9567b1cef03c7ac5e2a333561c98f20346d05e20c0a8ce3036905ec507ff9234bab33ef9629ef14916042438
diff --git a/net-wireless/airpwn/airpwn-1.4-r2.ebuild b/net-wireless/airpwn/airpwn-1.4-r2.ebuild
index 1bfc79c50856..4c695a11a24a 100644
--- a/net-wireless/airpwn/airpwn-1.4-r2.ebuild
+++ b/net-wireless/airpwn/airpwn-1.4-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils flag-o-matic python-single-r1
+inherit eutils flag-o-matic python-single-r1 vcs-clean
 
 DESCRIPTION="Tool for generic packet injection on 802.11"
 HOMEPAGE="http://airpwn.sf.net"
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index 2fd4e8f2cbea..31b2c6537d00 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -3,6 +3,6 @@ AUX airtraf-1.1-fprintf-format.patch 421 BLAKE2B 8acd7417ded374a9973f52be45ee171
 AUX airtraf-1.1-off-by-one.patch 744 BLAKE2B c2000cc9014cfb02cb65fa6a51e3803c54dc813ef0268ec35fdf3119033438ab5b24e9caa5c0104435deeeedb46c545ada16683ccb638628385aef13647aafb5 SHA512 c19194498b2169a4ac20f20e51ea197bc9c96f5150a730a299375ea8d6babb4e498246fd8faf93d7dc285ca8a21d300a33102b2860868c7b9b02c89bd818c1fb
 AUX airtraf-1.1-sniffd.patch 1699 BLAKE2B b175d5d6b82beb519d4a74c4faabd9967d030a08b0fe18c779ca6cccb34a277e740a861034e0e567278ba2485c842bd2be05f4e64dfc38a3a1af3e14fa2a57a5 SHA512 6906700e625d8c9b78b248d281b19e158610c1d58d1ab23de3526bf3d060b3bdc259ae768b587ff52fdbaf4dd343ccda30517578825b75e65ff11d7fda515a1f
 DIST airtraf-1.1.tar.gz 136241 BLAKE2B 682516c6441efac8699fb15d40b99b50882d1c2d9e3acd344a979df080ca4f5532b0aa3247f37360f78ad2902018f907d6fe3e912b1d7b0df383c3bfe16f61a9 SHA512 7f341abb25e15dbdf510805230ee2f186a7a66d5c1e486bfdb978d3d8534d8b8c2cc1b5e0e323357c65af1eedbcb1da3e3e5f3ac8299db5f203f54b4a868f90b
-EBUILD airtraf-1.1-r3.ebuild 1084 BLAKE2B 2539bef87e23d475fb0e2c53b461881d6f09808160af99f1466b917b0b158d0386da76ed365312a13c1d6956a875489833a6f329d8bed4fa7d9f02ed60a54275 SHA512 61d87eae646ca16feb05a3c4e48d6b87cef3289bbc5d2445f661ab3015f8c1d73eb7dfe877e757eb993eaa7adad40c72f7a62b2d0eb108fd5cbbbbfa0aee1b37
+EBUILD airtraf-1.1-r3.ebuild 1081 BLAKE2B 052487088b29513f8294fae463857b668a50eb00bc5f27ef4cd411122d22cb20ac41d596ae1bf79e134049133826536f0f188489385eda029e676c1e53296030 SHA512 7d1e98434c23e842d49758d62cb807fef90e3d9de82a67dfea0ea524b52f9cc450c227e2c7b0b450f0a860f0bb373217d9a3e3f88ef02143bb69afe11c328f67
 EBUILD airtraf-1.1-r4.ebuild 1117 BLAKE2B 6e0f3596122ad56466210a6e314db2728be225ef8acc9dbc34c76e4c0d2a43d21613e458fc16cfea3c3e8f7450e0213a82c27936c5ff0b82d253a60babbf3075 SHA512 c646e1fcd056613629a5388c1bba1de7900d38eb6743ac9db617a4fbd05e1af4b7ea40a7a2bffb9c6bef20dd493a1f60ff472671dc462a48512f1d695c5db232
 MISC metadata.xml 684 BLAKE2B 58863082b9d07f5798333fd9ab8e1a7777fe7ce8e0a63a4bbb5f6905b4125547c1248fcfa95027668fba537399330ef4464a3a2681733bb0ba68ede152ac7db7 SHA512 51cdb73af9ffdaba0fb7a8778dd573885fa446def0baa3932925e89357d43fe33af62095d01f1cc51f5135c2cfb09f7044381b080e077c7bae0a3276a231ae33
diff --git a/net-wireless/airtraf/airtraf-1.1-r3.ebuild b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
index 8ea1d681278f..34441fc1bb66 100644
--- a/net-wireless/airtraf/airtraf-1.1-r3.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index b96ac31c691b..b88d10b21edc 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -2,5 +2,6 @@ AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 B
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.9-r1.ebuild 6803 BLAKE2B 97627e934b0c86d435a332bba6f05f6716ec4fe8af73a94dfd0c5e88f13f92b9ad9b1cf59f99a8fb04f80a91cc6df459155490e874b669b4d7f85e2109b7a1da SHA512 a49d0df20aebdb4681511cbee8ac102d1de3e87f349938ea4e8d8d7bdd6695b6753da37db0bfb69c0a3e3c6b4028f1b4411e5866c02a305687a997fac55adfc1
-EBUILD hostapd-9999.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
+EBUILD hostapd-2.9-r2.ebuild 6987 BLAKE2B 6d270ff2808b330ab31b8fc7025ad1c18b04a2e11069dd5d82253a5475c83ed6bd8640b4c4153e89e061fcc7b6568891df6cca55b3dbc997e128d8fc97ac3376 SHA512 96922e51fd1d038b527d9031de401b4266bc3eb2f4d34c3c41d8aaf5d94a43b28843cb8090081a1549bf5bd63ba2fa742b896c3335d2ff42c73823f964b14829
+EBUILD hostapd-9999.ebuild 6866 BLAKE2B 7b7a2f2119b8ef37739ff84dcc91f363f8bb113e1143688d450e91b621e0357432d0ede39126629c00df3ad4fe2d64ec8c6d53435e3e73b0f359072b9c6308d9 SHA512 857d32d8a7d0753e7d16356462a8792606edfecfee3ac2c847792e60d4bc1e5984838b285fbd4ac0e4a42e4a78f42ba74bc5674129ca661c97d81a2a20e17b7a
 MISC metadata.xml 1055 BLAKE2B f04ae6c0be8dbf9385cc0ce306a3aee69c0c07370e6574a88804ba0ed4cef38c81ec61ca6cac9b1810ce5d07ce6bd97f0dfec23b4737c4b092a12cda95799994 SHA512 afc6a14a55d177190797a6483fde1e6ea397ed43b60faf9d3bb919e5c9c68aaa75238d73a8e15d3a3450d916c6b5d9bc2cd8cf75fc4592cc99220128152a5867
diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
new file mode 100644
index 000000000000..365c114a0165
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi"
+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"
+
+if [[ $PV == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
+	else
+		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
+	fi
+	# Never stabilize snapshot ebuilds please
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	kernel_linux? (
+		dev-libs/libnl:3
+		crda? ( net-wireless/crda )
+	)
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# Allow users to apply patches to src/drivers for example,
+	# i.e. anything outside ${S}/${PN}
+	pushd ../ >/dev/null || die
+	default
+	#CVE-2019-16275 bug #696032
+	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+	popd >/dev/null || die
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf" || die
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+	echo "CONFIG_SAE=y" >> ${CONFIG}
+	echo "CONFIG_OWE=y" >> ${CONFIG}
+	echo "CONFIG_DPP=y" >> ${CONFIG}
+	echo "CONFIG_SUITEB=y" >> ${CONFIG}
+	echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+
+	if use internal-tls && ! use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
+		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
+	echo "CONFIG_FST=y" >> ${CONFIG}
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
+
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	emake V=1
+
+	if use libressl || ! use internal-tls; then
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
+	fi
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+	fperms -R 600 /etc/${PN}
+
+	dosbin ${PN}
+	dobin ${PN}_cli
+
+	if use libressl || ! use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
+
+	doman ${PN}{.8,_cli.1}
+
+	dodoc ChangeLog README
+	use wps && dodoc README-WPS
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/${PN}.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/${PN}
+	fi
+
+	save_config .config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/${PN}."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	einfo "the kernel source for the mac80211 driver. You should "
+	#	einfo "re-emerge ${PN} after upgrading your kernel source."
+	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
+}
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 382256f224b1..6ab779890926 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -90,6 +90,11 @@ src_configure() {
 	echo "CONFIG_EAP=y" >> ${CONFIG}
 	echo "CONFIG_ERP=y" >> ${CONFIG}
 	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+	echo "CONFIG_SAE=y" >> ${CONFIG}
+	echo "CONFIG_OWE=y" >> ${CONFIG}
+	echo "CONFIG_DPP=y" >> ${CONFIG}
+	echo "CONFIG_SUITEB=y" >> ${CONFIG}
+	echo "CONFIG_SUITEB192=y" >> ${CONFIG}
 
 	if use internal-tls && ! use libressl; then
 		echo "CONFIG_TLS=internal" >> ${CONFIG}
diff --git a/net-wireless/kismet-rest/Manifest b/net-wireless/kismet-rest/Manifest
index 0fa98d09dd4d..b9c4bb4a2939 100644
--- a/net-wireless/kismet-rest/Manifest
+++ b/net-wireless/kismet-rest/Manifest
@@ -1,4 +1,4 @@
 DIST kismet-rest-2019.05.02.tar.gz 31844 BLAKE2B 66b2540788f892545100ffbac078559027d4671aef012b59d7cbe4da3fe6865d6f46576ea8f99b84b995718fdfe6a82d1d7724fe9a93fcd932dd0bf45893b66d SHA512 6f5daef441bcf36e17c469dc36e6e7b521b08ba3aba2c89c199fa263bc3eb67b3d9217351a72c94df3902e35695874285cf769bb8c54778c657b83e44a18a6c5
-EBUILD kismet-rest-2019.05.02.ebuild 685 BLAKE2B b1dda01d2783beb04f023861f6810391366d78bd2250ae16cff2964ac180f28590dcfebc617c3766829f0208c85f011cfa6b7910a37869704a6b8d861719c799 SHA512 93e2e48957da57ae180647d54aacdabd8852e1a18f8a242959ac17077132d3c70a18517a262d5300fdd6fb0e8dc2d017af51e0fad6d1e4281e55ccef3ffa4da6
-EBUILD kismet-rest-9999.ebuild 685 BLAKE2B b1dda01d2783beb04f023861f6810391366d78bd2250ae16cff2964ac180f28590dcfebc617c3766829f0208c85f011cfa6b7910a37869704a6b8d861719c799 SHA512 93e2e48957da57ae180647d54aacdabd8852e1a18f8a242959ac17077132d3c70a18517a262d5300fdd6fb0e8dc2d017af51e0fad6d1e4281e55ccef3ffa4da6
+EBUILD kismet-rest-2019.05.02.ebuild 680 BLAKE2B aef772d5ca225daf11e77528e6802504dfea99fca1b29a72754cfeef3e7bb2e89f5fcc817048dffe2ba990d0f90c7386a7a0a8b63e73baa5f687318cb754dc3d SHA512 f5b05f23b1d185e98607690490f9633e79e46d786d1b68d02a1262dc5769ee1d685742e1100aa4da504deae3c1f747dea92e903382da88cb1bd0cb3754371755
+EBUILD kismet-rest-9999.ebuild 680 BLAKE2B aef772d5ca225daf11e77528e6802504dfea99fca1b29a72754cfeef3e7bb2e89f5fcc817048dffe2ba990d0f90c7386a7a0a8b63e73baa5f687318cb754dc3d SHA512 f5b05f23b1d185e98607690490f9633e79e46d786d1b68d02a1262dc5769ee1d685742e1100aa4da504deae3c1f747dea92e903382da88cb1bd0cb3754371755
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
index c5f6d594eb5e..58d94fbd6a20 100644
--- a/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
+++ b/net-wireless/kismet-rest/kismet-rest-2019.05.02.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Kismet REST Python API"
diff --git a/net-wireless/kismet-rest/kismet-rest-9999.ebuild b/net-wireless/kismet-rest/kismet-rest-9999.ebuild
index c5f6d594eb5e..58d94fbd6a20 100644
--- a/net-wireless/kismet-rest/kismet-rest-9999.ebuild
+++ b/net-wireless/kismet-rest/kismet-rest-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="Kismet REST Python API"
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index e65b4d77c0aa..b8fdf4a5791a 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,6 +1,8 @@
 DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
 DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
+DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 EBUILD lorcon-0.0_p20150109.ebuild 1323 BLAKE2B b6339a31e80485e9169453e69c2311f964eb2995e613001ffb033cac40581868124d1635f56d627291224dcc2346778c269d0c5e4f65682c7e4b99cfc01e02d2 SHA512 1933c94718b830c9c5a24a78dec8835f82b5c30c43bd6fde38bfa994c8916c19eba7b3b49912ef9f7f5e7b5313fcdd55a127b81f88126c6c31ad7ada4d0b5927
 EBUILD lorcon-0.0_p20180409-r1.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
-EBUILD lorcon-9999.ebuild 1930 BLAKE2B 30ef4dec066a7edd7b2c1656571a7cbb211eb95dfe27d7fc44fff303e3dbfc21f95532c5ef197107e64d8f90c9a5cfd326b7c0fa539ea4d40223fa28c8c83d9c SHA512 d94e57cf76f0e0f2d313fcf1bfefd9f48f44335f7d77f9c43e24f492cfe48abefd02f711349a2c12dfc4a84c1e971255f8045999192c3ad33594327dab7ed260
+EBUILD lorcon-0.0_p20200214.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
+EBUILD lorcon-9999.ebuild 1509 BLAKE2B 1788e3e7b00088dbd528baf2a933a9da9246a81cc7274b57c8badd03f42b03faa8ccf12c29ab2f8ed06cc650c3a6c61bb8b2cddb66f85a41a40eda1c9f4b122f SHA512 2e080e821430dc34c8be88cc717ebc7b854e617bf374748cf1fb6fae5d00d0f215540ec6c1b18b282709ab5a84c1671fe834fe2a4d9cb4323622ef10601ef88c
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
new file mode 100644
index 000000000000..7e81f8596710
--- /dev/null
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8})
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A generic library for injecting 802.11 frames"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
+
+if [[ ${PV} == "9999" ]] ; then
+	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
+	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
+	inherit git-r3
+	S="${WORKDIR}"/${P}
+else
+	GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
+	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+	dev-libs/libnl:3=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		cp -R "${S}/" "${WORKDIR}/all"
+	fi
+	default_src_unpack
+}
+
+src_prepare() {
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	default_src_configure
+}
+
+src_compile() {
+	default_src_compile
+	if use python; then
+		LDFLAGS+=" -L${S}/.libs/"
+		cd pylorcon2 || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	if use python; then
+		cd pylorcon2 || die
+		distutils-r1_src_install
+	fi
+	find "${D}" -xtype f -name '*.la' -delete || die
+}
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index d9ac3ecfbee9..7e81f8596710 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8})
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1
@@ -15,10 +15,9 @@ if [[ ${PV} == "9999" ]] ; then
 	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
 	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}"/${P}
 else
-	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+	GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
 	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
@@ -35,6 +34,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
@@ -45,12 +45,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
-	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
-	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
-	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
 	default
 	use python && distutils-r1_src_prepare
 }
@@ -74,8 +68,5 @@ src_install() {
 		cd pylorcon2 || die
 		distutils-r1_src_install
 	fi
-}
-
-src_test() {
-	:
+	find "${D}" -xtype f -name '*.la' -delete || die
 }
diff --git a/net-wireless/mdk/Manifest b/net-wireless/mdk/Manifest
index e1e7ae66c734..c2a75a12902d 100644
--- a/net-wireless/mdk/Manifest
+++ b/net-wireless/mdk/Manifest
@@ -1,5 +1,5 @@
 AUX 3.6-makefile.patch 707 BLAKE2B 19cc0aebd1c0194a331c909f66a9cb19c983134cba5c4d9201baa4391f752215bce40212588d3e989fab2bad3ae164ba39c4253bdbadc2b15e36f7a7c6c474c5 SHA512 6889b2385d6dbac55ec7ecb757aefd822fe3c15f9259fb38e2b3999a9f381a8e58a079e2cfaff5922dd4e10b843b88b7aae8d424b769407e1bbca444e9666280
 AUX fix_wids_mdk3_v5.patch 520 BLAKE2B a28e6a21a41c39af9920f0f382fecfa01b353815f20f1e5a521c9f5d6d78b42baa5d58d725e1593301d3439aab058587ee847be9ff373d26a017cb3485d3dff2 SHA512 23e1e525340972a2b04e9f2d829dc43a7b8dea0c06c7b739c85842b48aa87a61854cab93f86a50b13545e00fbee0c4d0d89913aa944926fd0725d50beca89c80
 DIST mdk3-v6.tar.bz2 213279 BLAKE2B e15d8d758f2d0b5ba4cdd66ce0d97d28e454d6593fd2ea76c7e0e0ee6ea6fd9daeef7f005bed7611f4a7017246ea7f53c6eadf8a8cdbd941c7273db8d5ab8b48 SHA512 a5180fc231c2e041064467b9415d2d238ea680f19c88b2320983dd6dbe91a62af1a37da0fc548c1b0860ede046e1f9976dec729c919d8e6c0ab98231990dfec4
-EBUILD mdk-3.6-r1.ebuild 746 BLAKE2B 65a5c4c4e0a4ef855734624693717f70edba07c98dcdb022615206f1828346a9e23226e73890943ec15739eacbad52c4916bb4d6c0c8a92a3735eb1e8f52f3aa SHA512 fb196d0aecaa957284d2f0f5ad611fac98b3496ff6b749e218616df0cd99a9699df9448216b942236294f6e793f5d639d7607d30fd454712bfeb5fb3e214ce3f
+EBUILD mdk-3.6-r1.ebuild 743 BLAKE2B 5aef9c8d98e07d951f2a9b34a53d4fd185104ba03373ea777beb95275f0bea8a14d7a5ef09a11fa4bf1a645582de721328ef2563e71062bb92f2f41eb0703834 SHA512 2cc1570da8ea0aca9732d3e84a97e12a01c9a4c76c0e555878b569f5bddc15e43ade0800c60740f80f5dc0dfde365350a94ebc44219108f92390ba741ed6f55c
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/mdk/mdk-3.6-r1.ebuild b/net-wireless/mdk/mdk-3.6-r1.ebuild
index 952509b6bd0f..25fba124b5a4 100644
--- a/net-wireless/mdk/mdk-3.6-r1.ebuild
+++ b/net-wireless/mdk/mdk-3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-wireless/python-wifi/Manifest b/net-wireless/python-wifi/Manifest
index 86c4a3edb1cb..1e76e1bb8370 100644
--- a/net-wireless/python-wifi/Manifest
+++ b/net-wireless/python-wifi/Manifest
@@ -1,3 +1,3 @@
 DIST python-wifi-0.5.0.tar.bz2 69113 BLAKE2B fe2a6693ca22a963c5149991693ea72e58542ea0c9622573f0f6ad7194d50daa09fe52e8f349224a2131bf2a8fbe0ee9538e17d5413fefe574e60ee9416aa345 SHA512 cbbb337b20f60bb28597dc6e3c90b8d20ddee9512cf000ca0107eb01d2bfde1b3047458d1a3f4dc4b9836ae283cbc24792ffb95c4747027896cd6e50a72151d8
-EBUILD python-wifi-0.5.0-r3.ebuild 844 BLAKE2B 660b5cec5e3e7fcca8e09c93c69f1cc34dba336c944fddd16e416f7f9cae0025cf6876c259034e221ad3764afdee59fbd756c7a104f8e79ff4c9e88d48502e59 SHA512 98fb01d1ce8219f0da25c1ae80f829da9788357a78ed119fc9ca96cf59649a09501a1ae0511509cc244aa70f682ff71e94477fead8f16d66ff3660ff5a0631fd
+EBUILD python-wifi-0.5.0-r3.ebuild 841 BLAKE2B 142ce70978d7443568a088110e5131a079cd0e17e2796eb2f146bff0041a9dc8cab87c935909afe5cd59c992fbd814509c088c2c0f63abaf3c4beafc8f5fa960 SHA512 06e8feca90a4bfb958bf2447aa98bb99b32b60e5bf7287c399794e0317ef54a43fcb88b8e38e23de3385c972aa0ab53a00a20a439b8ccbcaa0eaf4818dc2777c
 MISC metadata.xml 329 BLAKE2B 9bb66e4d52b4b290c05ef91d15cdef7ae45d46da08311d825b9c33f8fded2106be79edd68e32a44d6399dae763204220dc60c6348f440fd8dd30fc9163c91e4f SHA512 254d847c410e8ab8f3822a03f7689245ca47e5682c73f60ca40a2e2a81ca661421c0db040332dcc6800d942d4904d2e2ca7e234b5eda1b257a358f2236258978
diff --git a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
index 934920fa6334..139f1aa9d1c3 100644
--- a/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
+++ b/net-wireless/python-wifi/python-wifi-0.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index 2fcf4a590cc3..f94f492cc560 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -1,4 +1,4 @@
 AUX reaver-1.6.5-confdir.patch 281 BLAKE2B d8c1b89bf6a5291b75b99182a2a9b2149f6f83191fa5c0586ef5780acbc6e7d5fcf496f9b1f4715df0a3f7b097073e9a1a80ddc218c96d285aa297ddb595e1cd SHA512 36e2ede41de78573dae93727cee30c7f4031edce6b485d940a3f30209573e21be06d3e75ffb8239105e383bbd849fb728dc9ce9d28c5bab7d85b1b9526a67f5f
 DIST reaver-1.6.5.tar.gz 479441 BLAKE2B 21a1c54da559be4346b0c874947e982ea49ec6f20e612e3699d25524d49681a197a2a8cad0a31dd8dba919d065de48082572a471aa4f736397066edf7f7d8a43 SHA512 3e70d9fffefee3f6d60e72d7d7b1da91032e184c7d27f94b9f26e2260b7274d491f2e41f8056b386a211b9838d21afc6b65a8a826d310b51fc1065fa9e135dc0
-EBUILD reaver-1.6.5.ebuild 735 BLAKE2B 01f0f63737879c54b45580ca228d6ee64453f79e8225130fa49fc4cffa5e02143b752c2a9108384895fb79ad560bc444716c04ae171b6ed076d47159a292aa8e SHA512 22f79e17cd0b12e052bce31b0922e12be8f32e72596ca90b51d33ab1b6422f43868ad56399eb3b6b69f68e0955c1f1b1abd371f47fb91663b1a8d8ad8d77ad11
+EBUILD reaver-1.6.5.ebuild 735 BLAKE2B 94f116317650c8aaf24eace60400e4d1ec097499658652f4ea081070e749c31ee477570d34e5cf398b33029112f2439533b57930f5370930ea266c2bfd5be2e7 SHA512 2f893f1a8708c891746ed1b0ce56645ef4ad123d98ea6598dc0949502ff999476c4bae9c7f50088a6c71ca50d09e6ab86c7f6a882cac0121dfd12317d5424cc4
 MISC metadata.xml 461 BLAKE2B b23d4c4b8865ca1c58140486368ee2f4daa29d67af27cc5cce63c137d652c4d28b131140807735e9a5125790cc53629eeef074705278c5a550073d92c3447894 SHA512 503400e6ae36b1819015f51f0e5e01d7ba3c18c0133d625f3c35242dcaef5cd5ce72d57caf1b18892dee2865fcd1af1313f42140f360c249f2048874985d5d5d
diff --git a/net-wireless/reaver/reaver-1.6.5.ebuild b/net-wireless/reaver/reaver-1.6.5.ebuild
index a46582c37173..45c848928d28 100644
--- a/net-wireless/reaver/reaver-1.6.5.ebuild
+++ b/net-wireless/reaver/reaver-1.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index 35b8bb60bb14..77b9e3b06172 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapysdr-0.7.1.tar.gz 124532 BLAKE2B 157c24610b5f89b549a7d670e26ba68cabb923b7fd95bab4adc4896f7fb9e13f58e53671a4802804bc15b09eb1113baddb5879fd14efe8b8ea1bfbff363dde0f SHA512 9b2c4251d6362faecf770df021b74e3b387b99699ae4f7d3f145801e2acc901a3803f7b4d2cd50267013f1add6658703dfa5db6db28b8a645f1f8230117123cd
-EBUILD soapysdr-0.7.1.ebuild 1288 BLAKE2B 212213d1783125b60c87cc9425106746f600e0b57bfce1b767d2c1a769837b40148ed784157d70c660156d2c8d48bb16c3335fe2099286b40145854902538453 SHA512 54f5761482e2ab3f169037ab871c4401fdfc015ec1f989dfccb31a80a29a6e2414de27dd5cf84a5e3cf29894bc25e66d49c630212df8910887f557b7325ca1e7
-EBUILD soapysdr-9999.ebuild 1288 BLAKE2B 212213d1783125b60c87cc9425106746f600e0b57bfce1b767d2c1a769837b40148ed784157d70c660156d2c8d48bb16c3335fe2099286b40145854902538453 SHA512 54f5761482e2ab3f169037ab871c4401fdfc015ec1f989dfccb31a80a29a6e2414de27dd5cf84a5e3cf29894bc25e66d49c630212df8910887f557b7325ca1e7
+EBUILD soapysdr-0.7.1.ebuild 1278 BLAKE2B 1dcc0ca1890088234ebbc86f956fc37d7d31b20841560b92a6098d03a8f76678d7474d743cd165730b0fb53ab9b7cc67cee9d405cd8217063fe387ca7644c8b2 SHA512 b9dafe42f278a02d20a3f0e4fd6b87e322f51d66b0f76313fd1d3610af3c1c25963021537b0e323947579c14dadcad88e2abfac556eb75f7ee7049ca1c662be7
+EBUILD soapysdr-9999.ebuild 1278 BLAKE2B 1dcc0ca1890088234ebbc86f956fc37d7d31b20841560b92a6098d03a8f76678d7474d743cd165730b0fb53ab9b7cc67cee9d405cd8217063fe387ca7644c8b2 SHA512 b9dafe42f278a02d20a3f0e4fd6b87e322f51d66b0f76313fd1d3610af3c1c25963021537b0e323947579c14dadcad88e2abfac556eb75f7ee7049ca1c662be7
 MISC metadata.xml 775 BLAKE2B dbcad63785d9af5b1f2f93775c645f78e6344a2c47fe0ed1f71ab47d9945be2885e4becb2d9b329e145b035cf3af2f50daacc56175126d2fc3b6feae5e4579a7 SHA512 8805602022441e46c239411c7050ae3c4ef954c796a4293f3fb2eb0ff6cbc87a47eb554b89a29c22622e088f6cb232f05c154c0d6f8f864b35cc5f9c2a292862
diff --git a/net-wireless/soapysdr/soapysdr-0.7.1.ebuild b/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
index 9244fbbf714d..178d51ae1427 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-r1
 
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild
index 9244fbbf714d..178d51ae1427 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-r1
 
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 89ff9d7a6a7c..998ae5f3c742 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,10 +4,12 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.12.35.zip 114691419 BLAKE2B 0400f78cbc880f52e8e352a1b8ef925c293b5a51137aaba89c4e26f7b213661e2b9e5caf09cfc6af0f74456e1217f4e2b8f398c11ebe32b1b6a17153cef9e920 SHA512 4e6b3726e5b6e43c1688fbdefe816eedb1cefc671bc9f861cc06f1c4f52a903670e033c2c5b2c66c5ed2c3f42e8f573e6245fe483a32a0df33283d46ccb5d96a
 DIST unifi-5.12.46.zip 115612217 BLAKE2B 86facd4f21cf66091acfb4bfa5155188b30b1a33848ff0c24c393abf53f5efb114aca86b43b6040961fd9afe6ba1e1a42280f20f48c21772f884edd52b10b25c SHA512 05135f75bf6484810ff66b58452ea8bca1c4e47d5fa7a955bdf9653777f80a7fa355bdaa6586e3a0d98bdcf69cce4e28cf3d14cf8204b82591ba6a08307deef3
+DIST unifi-5.12.60.zip 117404012 BLAKE2B 2ef8fbbf3c6be963929678e1e563ec4e8716e385a61ae770fdf275d166a8b0db3bdbbd043a61bf9aca347a2383712733de5b80712f2ce9201772956f1e6fd2a1 SHA512 d6c172f69b13941fa1c6a69dc1a21111995a94f9a42024c8814cbda6e68796a2244a08e6acd00dc5af45b68164157d1cd5d04b343aeb4086cbd71b72c5af2904
 DIST unifi-5.13.9.zip 117147673 BLAKE2B d05f0e6d0bdada8e1e02f78f99d59f02e259f9c6f6e78827a7288520e393e0811f37501004b3914f5df4ec2065728b28d5a9eb3a376d1f83b174ab7e07215bea SHA512 363b8019ba0854c289b2ec375739d0a86353fd876f3b59c7d8dd191da40866433e2222d98c1888d5d45a5def1209c1c0d7be733a71c3f5749c7b4def682d195e
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.12.35.ebuild 1777 BLAKE2B 84159e527fa3a125543f3335bb8fb17ceac1634ce143ffc262a2caf5c6da27e452ce6adf999a205b187bad5623fdde25f97bd83f46dd93ee448fd83c84ed4f50 SHA512 a4324b8391a72d073fb67b629326683335bafa66c013483f689c95fdd59caf7e4c697f2ee74d63ea68075a7660dc5e4034f7569043cc80e147a0df3fa4717f87
 EBUILD unifi-5.12.46.ebuild 1789 BLAKE2B 977f4d7e280eae27045fbdd0507862166579c4d029b35a6c39de7091ca15000510604f175859709183686956456d4d90b6bcb4c43cbbba59fdad99f100791429 SHA512 8bd4ffa29ba3c36b2fc0d9555aa9b06844ecf6d5e6bc1ce187187616fea96ac7e580f015accc671eaef6dbe70031a8c29553e563d4332483761f0194fd68166d
+EBUILD unifi-5.12.60.ebuild 1789 BLAKE2B 6ed0184ca911a3ce1f3f043e683768c7df6a21a3a4b5781f49c903d3f750ec869ae5dbaaad3f44cbb7b5c13ad0d8be6a6fec6fdefa0ddf38a83d3b85f11937e1 SHA512 71d2dcb21db8e1105293c827add5d5af4444546b8bad180a858e2961623bf464fa4f583286978bb05904bfb250da49eedccea681eea6aba3fddb54fb07446cf1
 EBUILD unifi-5.13.9.ebuild 1789 BLAKE2B a0cda416e4a6f95c35ab8ab296b70f15f9191011db5652cd1be5a1b8f1e142c4cd050f994625c500fddfc4491a2cfbcfe91677b6736178625b6914b3d3af5769 SHA512 2152629d311b8b98997c20e434f79e5fd49200a962def20c0cb631be45460baaff26193585a1cd4b5d3226a4679b0699c2acc7027c2a197242c0c53f26dfa7eb
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.12.60.ebuild b/net-wireless/unifi/unifi-5.12.60.ebuild
new file mode 100644
index 000000000000..a311dd5a8da4
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.12.60.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-e24b0812ee"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/5.12"
+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() {
+	# 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/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 89e666cf2832..d192e12444d5 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD wireless-regdb-20190301.ebuild 1073 BLAKE2B 053056bd258c2dcaf320aa6f00602db1024276465ece816067f7d1229bca508f2f4ff9ea359fd622607ef7155ee4b73e7623c455d26f8e8855583bb6c4c8be47 SHA512 808ba6715cb99c5579f5b637af6803e5af09d7ea20e2cf0f2146ff2d55bfbb48ead7d5876fc22869977456a10bdf6bc9e109448561d1dde719685384e049b85c
-EBUILD wireless-regdb-20190603.ebuild 1073 BLAKE2B 053056bd258c2dcaf320aa6f00602db1024276465ece816067f7d1229bca508f2f4ff9ea359fd622607ef7155ee4b73e7623c455d26f8e8855583bb6c4c8be47 SHA512 808ba6715cb99c5579f5b637af6803e5af09d7ea20e2cf0f2146ff2d55bfbb48ead7d5876fc22869977456a10bdf6bc9e109448561d1dde719685384e049b85c
+EBUILD wireless-regdb-20190301.ebuild 1073 BLAKE2B feb8c9f16ce45e9613aea9fb590c2dd221a55ea2126072d149c33653b062e6a7ad4da445bbdf1560114cb04facae44b6a4ad0864a79bd9dc4e28db0592e087b3 SHA512 1095084aa9937c1219e6099b7171314bdc8242ecfde4485d9fb2cdce7383550fc92b8fa492034b3a6f56e9d53ea57e237a9370f1f000bbeeedfa693ede536cb7
+EBUILD wireless-regdb-20190603.ebuild 1073 BLAKE2B feb8c9f16ce45e9613aea9fb590c2dd221a55ea2126072d149c33653b062e6a7ad4da445bbdf1560114cb04facae44b6a4ad0864a79bd9dc4e28db0592e087b3 SHA512 1095084aa9937c1219e6099b7171314bdc8242ecfde4485d9fb2cdce7383550fc92b8fa492034b3a6f56e9d53ea57e237a9370f1f000bbeeedfa693ede536cb7
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
index 61b3b1605fae..6f46b27ed2b1 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20190301.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
index 61b3b1605fae..6f46b27ed2b1 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index a70bd5f60c17..cfadc251fd6d 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -13,6 +13,6 @@ AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f64
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
-EBUILD wpa_supplicant-2.9-r1.ebuild 11996 BLAKE2B 6f660ea568378c62b7873830e17784d3f7d72eee9eee518a5386d2fc364ebf3206f28230a1f1f56cf7ea6dd9eca624a260b764764d70d18f0af1c83b70800bd7 SHA512 bd99242b4f84703f254e029608f1ee3510c662892d9ac1818c739e202de43edaf4f617affcf01b4b137d1e6fae6dd756b5730cbf35fb7e69850385275aa3c7fd
-EBUILD wpa_supplicant-9999.ebuild 11881 BLAKE2B b2d2fca20ffbf263e09fa689a3605dcc2ce70724ee9206c115819e0f7530c7ab37694fdde9b35fc895572eca8b102ed2f81d36279b59fe83e766e2b10a80032b SHA512 69012ffc31cde17189a2613f517231b5bbaadee747cb1aa9c04b8200a00223e968a45f6d3a972a41989fbd01a6e2e02c417f7addd23a6d6c0c16b9ac67ac7a40
-MISC metadata.xml 1457 BLAKE2B fdfb0a4eb716e8021a5d473e94a886d5f59c437b66610d986c309bd9b0e9d01b8996f5f5f48079a18e524db369a7a85983216bcf691be592987dda9b9b016fd6 SHA512 e7e64d2d464b3a315ff66257f7f919dda6ad27d9d12941ce269b717c5f31757b0ef32e9f991b8fa1458d45411c0fb13e1c1dbaf3a7e8306be446843c4ffb7c8c
+EBUILD wpa_supplicant-2.9-r2.ebuild 12455 BLAKE2B a48b06814d13913d622e3aa6893993a3e96456f50d99284ef4ab99fbcaadf520f633128bac0fbeb0b1549b496b5a37ebdafc8d4d27c192401d0c722cc760c830 SHA512 e00b9059942a60848f3de7d9ac0d649121e090462e2eeef2151e9128ee5a3503f16edfb7f738919e83032f40bdcab2c6ef194f54aa6eb1a9ac3db666ce713c0b
+EBUILD wpa_supplicant-9999.ebuild 12066 BLAKE2B 7a1da1ecb8c245f38dbcf995135d786a3e2d61258a67d2144f4de63b20ee45b193a08c2970e9c76f3b28019e4565a780172b012962b1985b5dd6f963e8c3dc2a SHA512 cc1cd94cf7ececb90803c96744a0b679e53b422d82380ff43a4a6301a671cdfc83896c9a76825c33c2c7a18e13d54b283b0974f74b1023e922a419b82103d348
+MISC metadata.xml 1676 BLAKE2B f58705c6f4646675662468a497d1b0dbd7bb2c6870cd1b93b2fe186824da40c120e64b767acc470c2ddbf055af57d56f6d3d739267c5ff165d9c26a0969d3ec2 SHA512 fb5a6c37dd832b8af73b209e677735e583353a5542b24e9df1cda698bcec3702d10aa47cc4efbfb8df67122ad3dc6ad4c8ca6440579df68f67ff9f64e483852c
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index a52a722509e2..743ca1d2c5b8 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -7,12 +7,15 @@
 	</maintainer>
 	<use>
 		<flag name="ap">Add support for access point mode</flag>
+		<flag name="broadcom-sta">Flag to help users disable features not supported by broadcom-sta driver</flag>
 		<flag name="eap-sim">Add support for EAP-SIM authentication algorithm</flag>
-		<flag name="eapol_test">Build and install eapol_test binary</flag>
+		<flag name="eapol-test">Build and install eapol_test binary</flag>
 		<flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag>
 		<flag name="fils">Add support for Fast Initial Link Setup (802.11ai)</flag>
 		<flag name="hs2-0">Add support for 802.11u and Passpoint for HotSpot 2.0</flag>
 		<flag name="macsec">Add support for wired macsec</flag>
+		<flag name="mbo">Add support Multiband Operation</flag>
+		<flag name="mesh">Add support for mesh mode</flag>
 		<flag name="p2p">Add support for Wi-Fi Direct mode</flag>
 		<flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag>
 		<flag name="privsep">Enable wpa_priv privledge separation binary</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 8cfb6d7ecd1e..13942c996c1c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/"
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -26,6 +26,7 @@ IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec p2
 REQUIRED_USE="
 	macsec? ( !privsep )
 	privsep? ( !macsec )
+	broadcom-sta? ( !fils !mesh !mbo )
 "
 
 CDEPEND="dbus? ( sys-apps/dbus )
@@ -150,7 +151,6 @@ src_configure() {
 	Kconfig_style_config TLSV11
 	Kconfig_style_config TLSV12
 	Kconfig_style_config GETRANDOM
-	Kconfig_style_config MBO
 
 	# Basic authentication methods
 	# NOTE: we don't set GPSK or SAKE as they conflict
@@ -160,6 +160,8 @@ src_configure() {
 	Kconfig_style_config EAP_OTP
 	Kconfig_style_config EAP_PAX
 	Kconfig_style_config EAP_PSK
+	Kconfig_style_config EAP_TLV
+	Kconfig_style_config EAP_EXE
 	Kconfig_style_config IEEE8021X_EAPOL
 	Kconfig_style_config PKCS12
 	Kconfig_style_config PEERKEY
@@ -184,7 +186,7 @@ src_configure() {
 		Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
 	fi
 
-	if use eapol_test ; then
+	if use eapol-test ; then
 		Kconfig_style_config EAPOL_TEST
 	fi
 
@@ -197,6 +199,12 @@ src_configure() {
 		Kconfig_style_config HS20
 	fi
 
+	if use mbo ; then
+		Kconfig_style_config MBO
+	else
+		Kconfig_style_config MBO n
+	fi
+
 	if use uncommon-eap-types; then
 		Kconfig_style_config EAP_GPSK
 		Kconfig_style_config EAP_SAKE
@@ -233,8 +241,11 @@ src_configure() {
 			Kconfig_style_config FILS
 			Kconfig_style_config FILS_SK_PFS
 		fi
-		# Enabling mesh networks.
-		Kconfig_style_config MESH
+		if use mesh; then
+			Kconfig_style_config MESH
+		else
+			Kconfig_style_config MESH n
+		fi
 		#WPA3
 		Kconfig_style_config OWE
 		Kconfig_style_config SAE
@@ -295,12 +306,20 @@ src_configure() {
 		Kconfig_style_config WPS_NFC
 	else
 		Kconfig_style_config WPS n
+		Kconfig_style_config WPS2 n
+		Kconfig_style_config WPS_UFD n
+		Kconfig_style_config WPS_ER n
+		Kconfig_style_config WPS_UPNP n
+		Kconfig_style_config WPS_NFC n
 	fi
 
 	# Wi-Fi Direct (WiDi)
 	if use p2p ; then
 		Kconfig_style_config P2P
 		Kconfig_style_config WIFI_DISPLAY
+	else
+		Kconfig_style_config P2P n
+		Kconfig_style_config WIFI_DISPLAY n
 	fi
 
 	# Access Point Mode
@@ -355,7 +374,7 @@ src_compile() {
 		emake -C "${S}"/wpa_gui-qt4
 	fi
 
-	if use eapol_test ; then
+	if use eapol-test ; then
 		emake eapol_test
 	fi
 }
@@ -414,7 +433,7 @@ src_install() {
 		systemd_dounit systemd/wpa_supplicant.service
 	fi
 
-	if use eapol_test ; then
+	if use eapol-test ; then
 		dobin eapol_test
 	fi
 
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index f73f675d9fde..3cb7b352a50f 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/"
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -26,6 +26,7 @@ IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec p2
 REQUIRED_USE="
 	macsec? ( !privsep )
 	privsep? ( !macsec )
+	broadcom-sta? ( !fils !mesh !mbo )
 "
 
 CDEPEND="dbus? ( sys-apps/dbus )
@@ -147,7 +148,6 @@ src_configure() {
 	Kconfig_style_config TLSV11
 	Kconfig_style_config TLSV12
 	Kconfig_style_config GETRANDOM
-	Kconfig_style_config MBO
 
 	# Basic authentication methods
 	# NOTE: we don't set GPSK or SAKE as they conflict
@@ -183,7 +183,7 @@ src_configure() {
 		Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
 	fi
 
-	if use eapol_test ; then
+	if use eapol-test ; then
 		Kconfig_style_config EAPOL_TEST
 	fi
 
@@ -196,6 +196,12 @@ src_configure() {
 		Kconfig_style_config HS20
 	fi
 
+	if use mbo ; then
+		Kconfig_style_config MBO
+	else
+		Kconfig_style_config MBO n
+	fi
+
 	if use uncommon-eap-types; then
 		Kconfig_style_config EAP_GPSK
 		Kconfig_style_config EAP_SAKE
@@ -232,8 +238,11 @@ src_configure() {
 			Kconfig_style_config FILS
 			Kconfig_style_config FILS_SK_PFS
 		fi
-		# Enabling mesh networks.
-		Kconfig_style_config MESH
+		if use mesh; then
+			Kconfig_style_config MESH
+		else
+			Kconfig_style_config MESH n
+		fi
 		#WPA3
 		Kconfig_style_config OWE
 		Kconfig_style_config SAE
@@ -303,6 +312,9 @@ src_configure() {
 	if use p2p ; then
 		Kconfig_style_config P2P
 		Kconfig_style_config WIFI_DISPLAY
+	else
+		Kconfig_style_config P2P n
+		Kconfig_style_config WIFI_DISPLAY n
 	fi
 
 	# Access Point Mode
@@ -357,7 +369,7 @@ src_compile() {
 		emake -C "${S}"/wpa_gui-qt4
 	fi
 
-	if use eapol_test ; then
+	if use eapol-test ; then
 		emake eapol_test
 	fi
 }
@@ -397,7 +409,7 @@ src_install() {
 		into /usr
 		dobin wpa_gui-qt4/wpa_gui
 		doicon wpa_gui-qt4/icons/wpa_gui.svg
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+		domenu wpa_gui-qt4/wpa_gui.desktop
 	else
 		rm "${ED}"/usr/share/man/man8/wpa_gui.8
 	fi
@@ -416,7 +428,7 @@ src_install() {
 		systemd_dounit systemd/wpa_supplicant.service
 	fi
 
-	if use eapol_test ; then
+	if use eapol-test ; then
 		dobin eapol_test
 	fi