gentoo resync : 22.01.2021

15 files changed, 214 insertions, 218 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 5f4e56105536..5dabdc952ad8 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index aabbeeb0fedd..b3f88112e4a4 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,6 +1,4 @@
-DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
-EBUILD dump1090-3.7.2.ebuild 1543 BLAKE2B ef4ea5495cd0a264c993ba40bc0a2d564f497b56b8248dfbbb4323bb293159017ac729eb5e17bcdcecd7e56bd04a001a9613e6fc986e3d6b8932039bfccaf272 SHA512 d70dbea5cef1ea41cfbfa430f8800057e12f5bb2a265368d5e7b6310f5386e2a4ed042ed971738efc242df37e098228371c999cf7596bd179d38a48cf58efd6a
-EBUILD dump1090-4.0.ebuild 1200 BLAKE2B f228e05164a56a0ab88d4db5adc12c14faa34b5229f419bbd24bdb1b107ab66bc1aab5b232990bdaef014dc1c11bd0923fa3805e3c5d3a41f7f083bb1aefb13d SHA512 a8b894977f7d26ac853d784bb72635f8a0354bc309ae13b0b3cb77bbdb23b06e877f9c26d3205136f5431f325f515d5ea20dc24c5ef19563cd087a2e32120620
+EBUILD dump1090-4.0.ebuild 1198 BLAKE2B edc010e8e61f5cd0aa157d07b66ca6872f90b002814483b8b23dcb5ee9f322a70b01944659fe1f5c2e8ebb4851aaa9b5fc0c60b740dbcb05d62ce981d225fe6d SHA512 a2137f3fbfea632f01190ee85d782cb2fd2771ffae7312ebe892d34c60efffeb09032a6c4d491cb2915022c9d86eedfb64f0b58dfcc761c68e9a756a80bdcb78
 EBUILD dump1090-9999.ebuild 1177 BLAKE2B 9d7fc48eec212479ab0b5e8eff2ee88e7fa8764546da69a8df7efaea579a80ed21720ac7c6e6eb7588be68a7bcdbe6e5f0b4d1a7e2d62d3fd9de273313f655ba SHA512 8dade3337cd83b09b4cb7748464410bf1765a9af86d03ad57dad51a0c5b1937025631b8bc8cee89b94dccb03de27457a050f2c7e8bccbc4374141e4b84a67f04
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild
deleted file mode 100644
index 742de05fd100..000000000000
--- a/net-wireless/dump1090/dump1090-3.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="simple Mode S decoder for RTLSDR devices"
-#Original repo
-#HOMEPAGE="https://github.com/antirez/dump1090"
-#Repo that has actually been touched recenly
-#HOMEPAGE="https://github.com/mutability/dump1090"
-#And now we move to the next one in line
-HOMEPAGE="https://github.com/flightaware/dump1090"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-else
-	KEYWORDS="amd64 x86"
-	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	#SRC_URI="https://github.com/flightaware/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
-	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="bladerf +rtlsdr"
-
-RDEPEND="bladerf? ( net-wireless/bladerf:= )
-		rtlsdr? ( net-wireless/rtl-sdr:= )
-		sys-libs/ncurses:=
-		virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i 's#-O2 -g -Wall -Werror -W##' Makefile
-	sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		BLADERF=$(usex bladerf) \
-		RTLSDR=$(usex rtlsdr)
-}
-
-src_install() {
-	dobin ${PN}
-	dobin view1090
-	dodoc README.md
-
-	insinto /usr/share/${PN}/html
-	doins -r public_html/*
-
-	insinto /usr/share/${PN}/tools
-	doins -r tools/*
-
-	insinto /usr/share/${PN}
-	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
-}
diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild
index ea826fc4f16a..006faa02a61b 100644
--- a/net-wireless/dump1090/dump1090-4.0.ebuild
+++ b/net-wireless/dump1090/dump1090-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 18cdda043f5c..02694bce66b9 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 7437 BLAKE2B a5f58c2e465cec4b95d945c078c3695fa86c1b5372458bf32465daadfc7ef912489db1ba148c842deaf94db9ef655ed7943ad0bb06414427ed43c932116abb8a SHA512 956b2344bb31ced7059cb16a22b0f653497c5c502bcbd66c2ca76483f025beaca9257b5824c7925edc9b54fd05deae8424ca6f0de0a43909d27ab9f2b920eec8
-EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
+EBUILD hostapd-2.9-r3.ebuild 7842 BLAKE2B b4c1167dd0cc4073f93ebe2f2bc6d3492f616032050ea99d942a31328f48de378e4230df644ef445b2be1eb4d0fdb48cdf670583a96138ecfd0c099a864f8963 SHA512 d9db343ab082f49221b3b672d96507558257aa6b44f846a1c0f6cad19ea13705fc1bd860eca20d6ee3fff48951adfcd70c58ca37112deec6f67eaa2848134308
+EBUILD hostapd-9999.ebuild 7847 BLAKE2B 3229132f099983c1b9217d4e67df55ca7ec624f72694e5233ee2a34186300cd978bc9e901b6a86d2b099c573a875b4251d38809ad7883b693a348e6d463d017f SHA512 0ccb0816270a3b1fe69541028b952cc98a116fa6788252789546d956944540fad479e0fa26a7974919f300031ec50b6228d5f8ea526ba83ad71a3d2ad0d8e9f7
 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 b93c40f9893c..61cac6a1e0c0 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs systemd savedconfig
 
@@ -10,16 +10,18 @@ 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"
+S="${S}/${PN}"
 
-if [[ $PV == 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+	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
@@ -46,8 +48,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 pkg_pretend() {
 	if use internal-tls; then
 		if use libressl; then
@@ -71,12 +71,14 @@ src_prepare() {
 	# i.e. anything outside ${S}/${PN}
 	pushd ../ >/dev/null || die
 	default
-	#CVE-2019-16275 bug #696032
+
+	# CVE-2019-16275 bug #696032
 	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
 	# CVE-2020-12695 bug #727542
 	eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
 	eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
 	eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+
 	popd >/dev/null || die
 
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
@@ -88,122 +90,122 @@ src_configure() {
 
 	restore_config "${CONFIG}"
 	if [[ -f "${CONFIG}" ]]; then
-		default_src_configure
+		default
 		return 0
 	fi
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
+	echo "CC = $(tc-getCC)" > ${CONFIG} || die
 
 	# 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_EAP=y" >> ${CONFIG} || die
+	echo "CONFIG_ERP=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
 
 	if use suiteb; then
-		echo "CONFIG_SUITEB=y" >> ${CONFIG}
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+		echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
+		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
 	fi
 
 	if use internal-tls && ! use libressl; then
-		echo "CONFIG_TLS=internal" >> ${CONFIG}
+		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
 	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}
+		echo "CONFIG_DPP=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
+		echo "CONFIG_OWE=y" >> ${CONFIG} || die
+		echo "CONFIG_SAE=y" >> ${CONFIG} || die
+		echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
+		echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
 	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}
+		echo "CONFIG_WPS=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS2=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
 		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}
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die
 
 	einfo "Enabling drivers: "
 
 	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die
 	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
 	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
 	einfo "  None driver enabled"
 
 	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
 
 	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
 
 	# 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}
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die
+	echo "CONFIG_PKCS12=y" >> ${CONFIG} || die
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die
+	echo "CONFIG_IAPP=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die
+	echo "CONFIG_HS20=y" >> ${CONFIG} || die
+	echo "CONFIG_WNM=y" >> ${CONFIG} || die
+	echo "CONFIG_FST=y" >> ${CONFIG} || die
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die
+	echo "CONFIG_ACS=y" >> ${CONFIG} || die
 
 	if use netlink; then
 		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die
 	fi
 
 	if use ipv6; then
 		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
+		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
 	fi
 
 	if use sqlite; then
 		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
 	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
+		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
 	fi
 
 	# TODO: Add support for BSD drivers
 
-	default_src_configure
+	default
 }
 
 src_compile() {
@@ -265,7 +267,8 @@ pkg_postinst() {
 	einfo "essid_wlan0=\"test\""
 	einfo "mode_wlan0=\"master\""
 	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+
+	#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."
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 06ae239217e1..97a5fee6569a 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs systemd savedconfig
 
@@ -10,16 +10,18 @@ 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"
+S="${S}/${PN}"
 
-if [[ $PV == 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+	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
@@ -46,8 +48,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 pkg_pretend() {
 	if use internal-tls; then
 		if use libressl; then
@@ -71,6 +71,14 @@ src_prepare() {
 	# 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"
+	# CVE-2020-12695 bug #727542
+	eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
+	eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
+	eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+
 	popd >/dev/null || die
 
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
@@ -82,122 +90,122 @@ src_configure() {
 
 	restore_config "${CONFIG}"
 	if [[ -f "${CONFIG}" ]]; then
-		default_src_configure
+		default
 		return 0
 	fi
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
+	echo "CC = $(tc-getCC)" > ${CONFIG} || die
 
 	# 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_EAP=y" >> ${CONFIG} || die
+	echo "CONFIG_ERP=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
 
 	if use suiteb; then
-		echo "CONFIG_SUITEB=y" >> ${CONFIG}
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+		echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
+		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
 	fi
 
 	if use internal-tls && ! use libressl; then
-		echo "CONFIG_TLS=internal" >> ${CONFIG}
+		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
 	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}
+		echo "CONFIG_DPP=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
+		echo "CONFIG_OWE=y" >> ${CONFIG} || die
+		echo "CONFIG_SAE=y" >> ${CONFIG} || die
+		echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
+		echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
 	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}
+		echo "CONFIG_WPS=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS2=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
 		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}
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die
 
 	einfo "Enabling drivers: "
 
 	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die
 	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
 	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
 	einfo "  None driver enabled"
 
 	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
 
 	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
 
 	# 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}
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die
+	echo "CONFIG_PKCS12=y" >> ${CONFIG} || die
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die
+	echo "CONFIG_IAPP=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die
+	echo "CONFIG_HS20=y" >> ${CONFIG} || die
+	echo "CONFIG_WNM=y" >> ${CONFIG} || die
+	echo "CONFIG_FST=y" >> ${CONFIG} || die
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die
+	echo "CONFIG_ACS=y" >> ${CONFIG} || die
 
 	if use netlink; then
 		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die
 	fi
 
 	if use ipv6; then
 		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
+		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
 	fi
 
 	if use sqlite; then
 		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
 	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
+		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
 	fi
 
 	# TODO: Add support for BSD drivers
 
-	default_src_configure
+	default
 }
 
 src_compile() {
@@ -259,7 +267,8 @@ pkg_postinst() {
 	einfo "essid_wlan0=\"test\""
 	einfo "mode_wlan0=\"master\""
 	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+
+	#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."
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 6bd850a474b8..68cbedeae30e 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,7 +3,7 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 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 4884 BLAKE2B a68b6fa5e0521bdd9bf432c702defa624a352601411dcfd0a20f36b83426d15bf02f5cc8129219764302698b4be2bf27732b5c728e373832d9ea448ae4748c6a SHA512 c25ce5a1982aed15fa2dc2d92071b2ffcf76f1fd46dde59c54383019e28606e0e3291871af75e6278b44ff7280c37295d475bbfad5fde7f0b381eaa289997eea
-EBUILD iwd-1.11.ebuild 4890 BLAKE2B 6a2d7a1c998fb9b37d495d25feb726cc3bda89985dad75f2808b8eaea3c47de2ce29cb3eafa56acaa61d0283a8f14ea0d0402ee295059e6c0076377a0024d15a SHA512 dc5f5d79ee58c60f176516ce44f11cf1d7582aaddbca6fa21a8764796e129f3efc52f818fa1225fc2f23ff4f1b7327905959c429019ed652926d8f41a3bc78a4
+EBUILD iwd-1.10.ebuild 4869 BLAKE2B f5cb454578ae1de60535e4884bc870391485c3c70f9c352735f957099a28cd02bcf08f4cf0fda50bf201856f0c176a08f64bcd6eee06df2819785462b163eb97 SHA512 ff719798769d7c2ed5677a4480aa491206e7a3df009189c24bd88d7b9fca81c1ccb5734ac09e3e9aa04a624fb0ee8642a0fd3a59c481e8bd5bf48730afd5fa53
+EBUILD iwd-1.11.ebuild 4875 BLAKE2B f6084b8f8cd7cadebb369685f614e9d7a345f480711d17f7d8ea8fc81a5dbde38af210933b089198cdb95bd7bec12aa113b4ee552a73d89eda738e509005d987 SHA512 a0e2154c5d9075d01d78e5ed48b648b029719bb7245db5fa8579967a21a16df875e8a1415e4cc65fc2920c0bb96160e83bac3cd5e200569bb55f2773764892e4
 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.10.ebuild b/net-wireless/iwd/iwd-1.10.ebuild
index c07c53ce4651..2333bef8d99b 100644
--- a/net-wireless/iwd/iwd-1.10.ebuild
+++ b/net-wireless/iwd/iwd-1.10.ebuild
@@ -54,7 +54,6 @@ pkg_setup() {
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
 		~CFG80211
 		~CRYPTO_AES
-		~CRYPTO_ARC4
 		~CRYPTO_CBC
 		~CRYPTO_CMAC
 		~CRYPTO_DES
diff --git a/net-wireless/iwd/iwd-1.11.ebuild b/net-wireless/iwd/iwd-1.11.ebuild
index 555a577368d8..22de68c453c2 100644
--- a/net-wireless/iwd/iwd-1.11.ebuild
+++ b/net-wireless/iwd/iwd-1.11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.35"
+ELL_REQ="0.36"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -54,7 +54,6 @@ pkg_setup() {
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
 		~CFG80211
 		~CRYPTO_AES
-		~CRYPTO_ARC4
 		~CRYPTO_CBC
 		~CRYPTO_CMAC
 		~CRYPTO_DES
diff --git a/net-wireless/iwgtk/Manifest b/net-wireless/iwgtk/Manifest
new file mode 100644
index 000000000000..6c67ef1f5e35
--- /dev/null
+++ b/net-wireless/iwgtk/Manifest
@@ -0,0 +1,3 @@
+DIST iwgtk-0.4.tar.gz 103988 BLAKE2B 0a848f805509507066e9eb97c1a3ccd1f3e441a6a01789b7ec291a12f67a619227b7845249342c15301c755dd6e3594379a888d278dc71c20cf377322f9969a5 SHA512 7a6d55493fe7cad57dc8338aafe48236c1ececb688a64cbdeb5748c60f5d109ae7912182c6d4df094588baee2aff3bd5481f82a80c4c267283a5067a0127f9e0
+EBUILD iwgtk-0.4.ebuild 828 BLAKE2B 02a2666efee59ffd6324f87a84165e50ea36cd6e7a8780db9fb5e9a09e61063ba8dfa3ded0b651e35945fae3a98b59f514096ffa196ae61f34dfae46e2de14a1 SHA512 b23ccbd8fe802913fdd1d5597f2b810b37aa3161b04e0f88ec19b1c650bc1c488cd54787eac3dd8b154ef4e14bbcd0a8c824612bedbe12d628d9faca1c94acef
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/net-wireless/iwgtk/iwgtk-0.4.ebuild b/net-wireless/iwgtk/iwgtk-0.4.ebuild
new file mode 100644
index 000000000000..eb3eb819b7af
--- /dev/null
+++ b/net-wireless/iwgtk/iwgtk-0.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg
+
+DESCRIPTION="Lightweight, graphical wifi management utility for Linux"
+HOMEPAGE="https://github.com/J-Lentz/iwgtk"
+SRC_URI="https://github.com/J-Lentz/iwgtk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	dev-libs/atk:0
+	dev-libs/glib:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/pango:0
+"
+
+RDEPEND="
+	${DEPEND}
+	net-wireless/iwd
+"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/^CC=/CC?=/' \
+		-e 's/^CFLAGS=/CFLAGS:=$(CFLAGS) /' \
+		-e 's/^LDLIBS=/LDLIBS:=$(LDFLAGS) /' \
+		-e 's/-O3$/${CFLAGS}/' \
+		Makefile || die
+}
+
+src_install() {
+	emake prefix="${ED}/usr" install
+	gunzip "${ED}/usr/share/man/man1/iwgtk.1.gz" || die
+}
diff --git a/net-wireless/iwgtk/metadata.xml b/net-wireless/iwgtk/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/net-wireless/iwgtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index f94f492cc560..33179fc99215 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 94f116317650c8aaf24eace60400e4d1ec097499658652f4ea081070e749c31ee477570d34e5cf398b33029112f2439533b57930f5370930ea266c2bfd5be2e7 SHA512 2f893f1a8708c891746ed1b0ce56645ef4ad123d98ea6598dc0949502ff999476c4bae9c7f50088a6c71ca50d09e6ab86c7f6a882cac0121dfd12317d5424cc4
-MISC metadata.xml 461 BLAKE2B b23d4c4b8865ca1c58140486368ee2f4daa29d67af27cc5cce63c137d652c4d28b131140807735e9a5125790cc53629eeef074705278c5a550073d92c3447894 SHA512 503400e6ae36b1819015f51f0e5e01d7ba3c18c0133d625f3c35242dcaef5cd5ce72d57caf1b18892dee2865fcd1af1313f42140f360c249f2048874985d5d5d
+MISC metadata.xml 355 BLAKE2B 0441e923879a9f8a7954b64e0199304de6092bef5ea75efe4e5d2ca7eca30ff42a2edf31619a7fc85fbd0df4e0962d6c05ddca9036845a2207629fc3634c923a SHA512 1f86b5d78aec2789666c397e0db47914e481b32a6ba0d9e7ffdadf336ede75b14c0f041f4017dea1947ea7b645e3710d5326365cbbba63455438558e59e17b0e
diff --git a/net-wireless/reaver/metadata.xml b/net-wireless/reaver/metadata.xml
index 8fee4bf36671..8bf85482f71a 100644
--- a/net-wireless/reaver/metadata.xml
+++ b/net-wireless/reaver/metadata.xml
@@ -5,10 +5,6 @@
 	<email>oleg@kaa.org.ua</email>
 	<name>Oleg Kravchenko</name>
 </maintainer>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>