gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-wireless
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
45 files changed, 1834 insertions, 200 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 870d5827fd85..685467031602 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueberry/Manifest b/net-wireless/blueberry/Manifest
index 5a8d7ff09fd6..bb61511a65f3 100644
--- a/net-wireless/blueberry/Manifest
+++ b/net-wireless/blueberry/Manifest
@@ -1,3 +1,3 @@
-DIST blueberry-1.3.9.tar.gz 1411969 BLAKE2B 2a11b12428166dce5dbeb00cc3813e9dea96b61891456622833400f7a9bb69a61317e9d6bdc862edce2c39f64fd04950dc793724338cb266ae365b1d10abee49 SHA512 7ee5e33daf0ce3b41bc3827042aa14ed4de1b58f862e76a50934d6beae79bf7e68b657461370da2e309d15c7ff858c8fb18aa7e891e7bc70e70c171884c5bb57
-EBUILD blueberry-1.3.9.ebuild 1294 BLAKE2B 01e308d3f27ada338dd083533ac90388687ae491da69728823af6dd0fdfd306e1d8c017085c806b9f1bb0434c50e20f581f5a1dd6bda4fb7c32bf576c1c55163 SHA512 6950743f6f657d0cf61602225c9594a4226e8912aab21709e6908566ec417ae9a0dd25d23d8b1baf3b563aa15b78b16b81f711f974930873ed7b18ed9c79c806
+DIST blueberry-1.4.2.tar.gz 1414169 BLAKE2B cd55e2bb572efb2badeab1667324df67c35f5833c53755c76c0793c07e8427c7d4714135014dad90aeaddc806c798f2b89960a051a15f668d214bb95cc0943e3 SHA512 5c2fb94e842cd1229682305f0054061724b958406ea15a64495ca418aa7da73c38b45ddc43c27a193aef995ab860cad985e3369e3dac53d2098463e6e4250493
+EBUILD blueberry-1.4.2.ebuild 1296 BLAKE2B c29128d59d0dcf6995cc592da97c7479a50282fcfdccc024bf153a47bc6fa3caaf88c3562a98fac37ce6a04d6ee9f084db98b7eeeeccaf74295ced6906ae4b74 SHA512 5561f2471aa84bb5b1408018ee85e6a229e53e2b40362e84854e5e0ae4ff5394f11500705339df0dc395b99b51ae74cf2bc1e66e17965c0fc5f9ce93192fbdae
 MISC metadata.xml 493 BLAKE2B dc1b8b9993a0f35f5c76f345a5025545c68c561a906bc8cb6627e65ba94cde16960484c4477afb9769e2e26f35f25c6d49df3e678aef0578ffbd9f7b145b0ccc SHA512 49551111e454436f2bfd52b88befff6bcb06a9aff3130b1c4fcb1ff27974685ababf3e3100a7ffe087f7ed5c958081b9faeed56bbfa160b4d277a1061f4bcd16
diff --git a/net-wireless/blueberry/blueberry-1.3.9.ebuild b/net-wireless/blueberry/blueberry-1.4.2.ebuild
index 9ccd7ba7dc3f..b028a7305853 100644
--- a/net-wireless/blueberry/blueberry-1.3.9.ebuild
+++ b/net-wireless/blueberry/blueberry-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit gnome2-utils python-single-r1 xdg-utils
 
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index b128460afcfd..94bf0e6b15d6 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,7 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.4.tar.xz 983816 BLAKE2B de8d475b0aec5b037df43fdb76ebbf4fdb05367f166c14cda818badf49376f2a91de246f991167a57ecaa82a84ac84b4e91f600237c35d86e27431a760192996 SHA512 b8b54942092c1984cfac0cf73e2ac23f7693cb3ee0aa4cfaab1fa0282de4afd539f6860d5541523b542956b2efa31da3ec012dcc39d92fd699d0b8479df641ff
+DIST blueman-2.2.1.tar.xz 1570992 BLAKE2B b6d2296b68990c25e6d8077b513ebd3915152522fdf66bb5d887a90cf98e8835d993caf89a93089947ff1f6470075b9b6643ee0169ba86e46d190c09fbc6942a SHA512 7668a68470e7b5ab8e5cd774c89a7ae347de4193e293b5f2a467407fcb625e07a482f986fd7b672b763c297a0c0692c1da53dcc4ae75ec7fa118b180be623104
 EBUILD blueman-2.1.4.ebuild 2911 BLAKE2B 0466450ab9b1dd3e505e6b016b63b5ddce1b54db4c0611adece1dbd0c6c6cf5a638290eaed22e450852b65d0f1cdef652b6c4ca4bbadca49fa5986800d2b5ad9 SHA512 27dac66a0403dd54b179b721b623703ccffb6b5d840d48dda11ab63d503318fb316e1858b743dee31639d921a651d872b053185f5c5ce570ca7de028c543da98
+EBUILD blueman-2.2.1.ebuild 2917 BLAKE2B 9b71521273aa199ba6365e1e730a8438722fe148781ed00f9013c7d4f5e58ca47e3db5368b536d14db76165b3c4a2cab6d54d94bfab8f54cbb31e072fa561e82 SHA512 e3c2a2d94424ab83eb1deefbb0a4e6867aae5d99955e8bdcd48a6268b55409ee05f8310c0c5dddfd7560827ae9865959edcb981fc69a26a086fe726c7458407a
 EBUILD blueman-9999.ebuild 2905 BLAKE2B 3d80557bbad6913616edbb090de49c365a99b139487acd324a07d1f781f0c0ddc776b2e6a11ebc1c118198f8e112b8b8545891bf3c2e97d2ea9c39ce9c40618e SHA512 8c344268760aacebcbe34df0e3423a11db515550f44bb54622f1c06f4249ea5a3492cb4cd83d31d47d6d9637a6c72a4f72c57d47154863d8b6fb67e9d05c1ec0
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.2.1.ebuild b/net-wireless/blueman/blueman-2.2.1.ebuild
new file mode 100644
index 000000000000..5d3ff61c631d
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.2.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
+HOMEPAGE="https://github.com/blueman-project/blueman"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+else
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
+	S=${WORKDIR}/${P/_/.}
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+# icons are GPL-2
+# source files are mixed GPL-3+ and GPL-2+
+LICENSE="GPL-3+ GPL-2"
+SLOT="0"
+IUSE="appindicator network nls policykit pulseaudio"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/bluez-5:=
+	${PYTHON_DEPS}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/pkgconfig
+	nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-apps/dbus
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	|| (
+		x11-themes/adwaita-icon-theme
+		x11-themes/faenza-icon-theme
+		x11-themes/mate-icon-theme
+	)
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	network? (
+		net-firewall/iptables
+		|| (
+			sys-apps/net-tools
+			sys-apps/iproute2
+		)
+		|| (
+			net-dns/dnsmasq
+			net-misc/dhcp
+			>=net-misc/networkmanager-0.8
+		)
+	)
+	policykit? ( sys-auth/polkit )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio[bluetooth]
+			media-sound/pulseaudio-modules-bt
+		)
+	)
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	if use network; then
+		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
+			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# replace py-compile to fix py3
+	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
+}
+
+src_configure() {
+	local myconf=(
+		--disable-runtime-deps-check
+		--disable-static
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
+		$(use_enable appindicator)
+		$(use_enable policykit polkit)
+		$(use_enable nls)
+		$(use_enable pulseaudio)
+		# thunar integration is a single data file with no extra deps
+		# so install it unconditionally
+		--enable-thunar-sendto
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use policykit; then
+		# Allow users in plugdev group to modify connections
+		insinto /usr/share/polkit-1/rules.d
+		doins "${FILESDIR}/01-org.blueman.rules"
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index a6d73cf301bb..9b5b0dc83574 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -5,6 +5,7 @@ AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7
 AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.56-avdtp-disconnects.patch 1424 BLAKE2B 200325eb1c1c5ed7d3dfada1214fca26f2eb8de70bbffe0810c7ffc7dd3d672b0c834f25ccba79e35c0c1322047e45fdd8076e4e54644e50ef71fb6415e33a6c SHA512 e44856abfc8ca92744c90723b0d76aab8c19fc44c3f84231c5c9340b85ce0b7a7cb9c41d65b68515845195ef8a50a274067d00555f2751ab1597403a87b80a2d
+AUX bluez-5.58-rfkill.patch 2475 BLAKE2B 0f4cfd4aa97a2e4479c4b109533b4ca39cd6155a1f0a1ee854e2e972dbf294eb870a3371dfebc6fde53cfb2f45d05e0721a3d137511e8822d8628a37570713fd SHA512 094858b34c2f60dafc70ccf0aec5971c47c656c9f74dce54a68e59ca0d3a8fb2902f597588b4f64fc47a6377ef9f3198a194f09c018c9881d1df70a9f652b531
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
@@ -13,5 +14,6 @@ DIST bluez-5.56.tar.xz 2053080 BLAKE2B b901deae4047ebe96c034c20c9d7e6c275d3c1fd3
 DIST bluez-5.58.tar.xz 2060368 BLAKE2B 157780f83181d89fb126face5e9794bc0de8196f43d57d079fc09ae7e45e7ef21bf404e834d844da28d06f9a29cb92f11c310dbbcb7f60e845a335a558d7190c SHA512 159b554e0afd56af5da6f8333383f2fdf96d77a0e82d762bf4b37786e7312b7e61fbbae0f18b26442a606e0a232f48e0f45a4b38b95de36c7daf384f582315a3
 EBUILD bluez-5.55.ebuild 9650 BLAKE2B 30746b26e632aee07a0480d11493a8f45b7236863454956cc42b9e5a7448b132cf906f3ed4fdf51fdee7ebbdf57b55dda77f20407c8fd3595dbd26338f48af51 SHA512 300c443a9b0a1e54902ee928e1cd34ee2eb3de36624c6d2e0c3f839cffe5415667c92049be539983d456526f94f733be5f54fd7fef06342f856ac94ced0be785
 EBUILD bluez-5.56-r1.ebuild 9551 BLAKE2B 752a728bbc6834f2a3698fd3b24fec59f155a6d9f631c52a3ea368b7b80723da73f7a7a9e079cce4dd027fb5dba9732eeeac492ed3b45c496437cdff1976dc3e SHA512 d5b6f9b73e9ac45a21e9e204e69f4fbcb3e511e91e9b927468d79549b8c0f4b069eb6d1d2d5bda80d013c98d0614784d17b200980bcd52d89e6ce3bc0ea516a5
-EBUILD bluez-5.58.ebuild 9422 BLAKE2B a2e20352d44729cdd8bfd6e4751ac465878a9200a22864d0964d2b98119696adb2e200539ca6bad1a280a6341388c8257cdbce4dcd93aa14f53b04aeae70cba0 SHA512 b660be7ed71d9a257352dd1ec887591b5391125b8c2c5355bb70ab02f579c547ab124c6a409bbfb657c99506be3143613b3b6b7b1835099fc3f32b5acccd7b21
+EBUILD bluez-5.58-r1.ebuild 9503 BLAKE2B 5065bd6d983ac9fb5e65c654a26b2f0faeb9a0de73599843baa23a115d48668e1a43c5e9ac7ce2edb5ff7ca005e3b79de59dd997a7d32aa34185d943c7ca6c47 SHA512 1406014f94570199a9e23a1220a92758d17a8e74ff90a61b0f347dce818aa0d5a94830d72bd48e4fcbf34e17c79832b5a0018c080e418733a94ed1a9b2940fe3
+EBUILD bluez-5.58.ebuild 9421 BLAKE2B 1f0dfb997e628516a64113539e77bb545eda978bb12ce4579c05bcd8300f15c81ba84e00145018bf15837e46955d243310be80b16e320312330927183d9b709e SHA512 ac32dd551cc508a44ff9e3a045f5535bdcae4279f2da7529208a390f4e247de6c253252aed3fc3114967a3ea576de16858f40b091bf0479a8b7a961fede43804
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.58-r1.ebuild b/net-wireless/bluez/bluez-5.58-r1.ebuild
new file mode 100644
index 000000000000..c34a9ecc702d
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.58-r1.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/dbus-python-1[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwids-20121202.2
+	btpclient? ( >=dev-libs/ell-0.39 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.39
+		>=dev-libs/json-c-0.13:=
+		sys-libs/readline:0=
+	)
+	midi? ( media-libs/alsa-lib )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
+	udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# rfkill: Fix reading from rfkill socket
+	"${FILESDIR}"/${P}-rfkill.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+)
+
+pkg_setup() {
+	# From http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+	# to prevent bugs like:
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	CONFIG_CHECK="~NET ~BT ~BT_RFCOMM ~BT_RFCOMM_TTY ~BT_BNEP ~BT_BNEP_MC_FILTER
+				~BT_BNEP_PROTO_FILTER ~BT_HIDP ~RFKILL"
+	# https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	# https://bugzilla.kernel.org/show_bug.cgi?id=206815
+	if use mesh || use test; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_USER
+		~CRYPTO_USER_API ~CRYPTO_USER_API_AEAD ~CRYPTO_USER_API_HASH
+		~CRYPTO_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC"
+	fi
+	if use test; then
+		# http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER"
+	fi
+	linux-info_pkg_setup
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
+	fi
+
+	eautoreconf
+
+	if use cups; then
+		# Only not .am to not need to run eautoreconf only because of this
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev hid2hci) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also they can break without"
+			ewarn "previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			dobin tools/btmgmt
+			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
+			dobin attrib/gatttool
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
+		fi
+
+		# Not installed by default after being built, bug #666756
+		use btpclient && dobin tools/btpclient
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# Drop python2 only test tools
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206819
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/simple-player || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206821
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-hfp || die
+			# https://bugzilla.kernel.org/show_bug.cgi?id=206823
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-sap-server	|| die
+
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-pkgincludeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	if use user-session && use systemd; then
+		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r5 bluetooth
+	newconfd "${FILESDIR}"/bluetooth-conf.d bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh-gatt/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp"
+	use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/bluez/bluez-5.58.ebuild b/net-wireless/bluez/bluez-5.58.ebuild
index e3eed24ecf61..51471cbc5ae3 100644
--- a/net-wireless/bluez/bluez-5.58.ebuild
+++ b/net-wireless/bluez/bluez-5.58.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/bluez/files/bluez-5.58-rfkill.patch b/net-wireless/bluez/files/bluez-5.58-rfkill.patch
new file mode 100644
index 000000000000..dd7f2f978e72
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.58-rfkill.patch
@@ -0,0 +1,84 @@
+From 382646b490c1c336dd32f9186293616ceb4d808b Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Mon, 3 May 2021 14:45:00 +0200
+Subject: [PATCH 1/2] rfkill: Fix reading from rfkill socket
+
+The kernel will always send exactly one event, but the size of the
+passed struct will depend on the length of the submitted read() and the
+kernel version. i.e. the interface can be extended and we need to expect
+for a read to be longer than expected if we ask for it.
+
+Fix this by only requesting the needed length and explicitly check the
+length against the V1 version of the structure to make the code a bit
+more future proof in case the internal copy of the struct is updated to
+contain new fields.
+---
+ src/rfkill.c | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/src/rfkill.c b/src/rfkill.c
+index ec9fcdfdd..2099c5ac5 100644
+--- a/src/rfkill.c
++++ b/src/rfkill.c
+@@ -53,12 +53,12 @@ struct rfkill_event {
+ 	uint8_t  soft;
+ 	uint8_t  hard;
+ };
++#define RFKILL_EVENT_SIZE_V1    8
+ 
+ static gboolean rfkill_event(GIOChannel *chan,
+ 				GIOCondition cond, gpointer data)
+ {
+-	unsigned char buf[32];
+-	struct rfkill_event *event = (void *) buf;
++	struct rfkill_event event = { 0 };
+ 	struct btd_adapter *adapter;
+ 	char sysname[PATH_MAX];
+ 	ssize_t len;
+@@ -69,34 +69,32 @@ static gboolean rfkill_event(GIOChannel *chan,
+ 
+ 	fd = g_io_channel_unix_get_fd(chan);
+ 
+-	memset(buf, 0, sizeof(buf));
+-
+-	len = read(fd, buf, sizeof(buf));
++	len = read(fd, &event, sizeof(event));
+ 	if (len < 0) {
+ 		if (errno == EAGAIN)
+ 			return TRUE;
+ 		return FALSE;
+ 	}
+ 
+-	if (len != sizeof(struct rfkill_event))
++	if (len < RFKILL_EVENT_SIZE_V1)
+ 		return TRUE;
+ 
+ 	DBG("RFKILL event idx %u type %u op %u soft %u hard %u",
+-					event->idx, event->type, event->op,
+-						event->soft, event->hard);
++					event.idx, event.type, event.op,
++						event.soft, event.hard);
+ 
+-	if (event->soft || event->hard)
++	if (event.soft || event.hard)
+ 		return TRUE;
+ 
+-	if (event->op != RFKILL_OP_CHANGE)
++	if (event.op != RFKILL_OP_CHANGE)
+ 		return TRUE;
+ 
+-	if (event->type != RFKILL_TYPE_BLUETOOTH &&
+-					event->type != RFKILL_TYPE_ALL)
++	if (event.type != RFKILL_TYPE_BLUETOOTH &&
++					event.type != RFKILL_TYPE_ALL)
+ 		return TRUE;
+ 
+ 	snprintf(sysname, sizeof(sysname) - 1,
+-			"/sys/class/rfkill/rfkill%u/name", event->idx);
++			"/sys/class/rfkill/rfkill%u/name", event.idx);
+ 
+ 	fd = open(sysname, O_RDONLY);
+ 	if (fd < 0)
+-- 
+2.31.1
+
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index ad1ab4bdd9d8..14fe65c930af 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -3,7 +3,7 @@ AUX gnuradio-3.8.2.0-lamda-gr-qtgui.patch 11510 BLAKE2B 17154b93d39517cdd0b66079
 AUX gnuradio-3.8.2.0-lamda-gr-uhd.patch 3748 BLAKE2B bfda3afe8dcc5b872a86379d6d3aaad53e57ed10aa394f7b36abbe27e69886fe876f5cb9ba03489f5cb4e0362e782f01bacf9956b3709f21ef0c7841ee2b2e04 SHA512 ea69d44b66b2962327141173d4b66add7885f3ece2302fceb3e5cf294f9502b0e6ac34dd28b9b7ff1b3faa024552be70334629c28e596fc4c621f89fec1c4ab5
 AUX gnuradio-3.8.2.0-lamda-most-components.patch 14122 BLAKE2B 30e63140ced2fdfd9712051ae6d758f2de57511bfdea972364c37d70c1eaf6e41921ad4e14e8f005be53016d8613e1c524b529c7b0e2476afc103edb49cfd946 SHA512 86f5f3ed6856fd183e71af1e6a94bc7e4310842f48a1ae7ed85b79d7a1ff86ebe84027bf24c3dc14a47c28335cc5edc321a7fce1ce24bcb26c0d7432e7aab4f7
 AUX gnuradio-3.8.2.0-lamda-set-msg-handlers.patch 14027 BLAKE2B 5a4a248264df514991343c4eb134c3f3fca2c2e11a5b4eeb63eaa1d0d16a45d87b9a9edebbe30dafeec6488926a7be7ab44d8c15b3c5529000fb488dc7b2dff4 SHA512 6d62d0fc8c06d0df6c046fc69c0280ba1dd2a2f409694c48af67cc6ee72b82d492ef86d10f6d44e4a053f54da187a5dcdc370a82358f2a8595bd37dd8d15eb02
-DIST gnuradio-3.8.2.0.tar.xz 2438736 BLAKE2B 93eabff578cd6b3b6587a6aa083095c787323ebf87a447d61999813e7e5e48b414d080a4fc02d01dabaa9378d42e3a210451a9109fc202991ebda8d1c9669676 SHA512 33930f62762cd9e3d1038b4a903f01e7ab33129732d207c126a89c1f1e719e9d656a94cdcbf3f6010f8476fedacee639c8a12444c41cdd56ad9fbace7863a170
-EBUILD gnuradio-3.8.2.0-r1.ebuild 6376 BLAKE2B 4dcf3dcbf4edb17f4b2858ea1b5a8a7a51b524a2af2a1f11d354b551a5d43f9d95e6937add2cbcdefe4c6383275a236f09256b3e32fc318ba24c570c14516ff9 SHA512 91716ba532ed8da357459acdf449b3672f3337cc88f2f315809a6b68aa4100f7c584ab676da0d6683e3fdcbe3a4662a49949f5cbd2c5b674f3b4f7c300f0993f
-EBUILD gnuradio-9999.ebuild 5963 BLAKE2B aac6b88b11bc51d78f622dd3ca6294805f5bcc7897cd007bc164f98f59b595b4defa1f661d64cf458c6eaaec563b6d58c9b4e4be4c6b01c57caf2c96330cf577 SHA512 642d080c623856f5b97c0a900a1d80df05c60d710ec8cde620fa3409574052b5f25081301148e377ad4a4a6ab7c329395bac85fd6a34c1286a459d2fed2943a3
+DIST gnuradio-3.8.3.1.tar.gz 3394001 BLAKE2B 3d1da3b005e03b01c563c1ce4a323cf14917a59eb4e2d6ff1ec36446c3b5b8786ea521976534003c0c8cb7849ab5ba4647fae4ef5794b138da768ac931dd7119 SHA512 f22311274e93a4c150dff5cb617802fa70f18bc259139be0b41fdaee5d9b95781743f906d6e3833601afe5de2b0476e0daac8f3bc9ea22932a90c875bfe79204
+EBUILD gnuradio-3.8.3.1.ebuild 6115 BLAKE2B 95a4129cea2b525222a8cd998765337798aceb7cdf513ddea9d79a69287bb5b9d022121d9e19cc644515616de7f64828a93654ed4e42a39a6ac623a2f416e70a SHA512 00f69d0d140312ae462b26d7deddabd262c9958f76308f3c32b2cd27d418fcb1527cc969af5cf3c0ff6124fd5ce5021c8175b687c1f1881deff4265a872b7135
+EBUILD gnuradio-9999.ebuild 5975 BLAKE2B 76f3be3c1c87c7dee97d43ff546f7b589c3986ba085c62e6a5e43e3d9c88f1927195f7714f90d98f55059e2332d67ef522cd2f7629a402d4cb392a3d7038259c SHA512 1dc35be323b616167438dc4c78d6db9c82736de84ea68b4a9a6e7b4168d2b258ba9e0a15b74b079178c532e62dee5dfae0bc2d826b69cb9a5d2c70fdff675bbc
 MISC metadata.xml 1675 BLAKE2B c0516cecbf29957943db289755528adcf96feb74b158bf53f922bc1819ac60e534fc4b369bd9630c5ad2af2db16822cfed395bebf2e93f971500da9ee0ce3eee SHA512 59f6b35212155ebee3c63166de0edbd9d0190b016e40e0e1cb9955ac6b6dde12c174fcf2da9c6feb4758ac2646c4498bde759f3205fe91e7f1f1377e13da10d3
diff --git a/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild b/net-wireless/gnuradio/gnuradio-3.8.3.1.ebuild
index 5184863b7539..9f0a184fbeca 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.2.0-r1.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.3.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} =~ "9999" ]]; then
 	EGIT_BRANCH="maint-3.8"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
+	SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -47,15 +47,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
-	dev-libs/log4cpp
+	dev-libs/log4cpp:=
 	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
-	sci-libs/mpir
+	sci-libs/mpir:=
 	sci-libs/volk:=
 	alsa? ( media-libs/alsa-lib:= )
 	ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') )
 	fec? (
-		sci-libs/gsl
+		sci-libs/gsl:=
 		dev-python/scipy
 	)
 	filter? ( dev-python/scipy )
@@ -91,11 +91,12 @@ RDEPEND="${PYTHON_DEPS}
 		media-sound/gsm
 		>=media-libs/codec2-0.8.1:=
 	)
-	wavelet? ( sci-libs/gsl
-			dev-libs/gmp
-			sci-libs/lapack
-			)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	wavelet? (
+		sci-libs/gsl:=
+		dev-libs/gmp:=
+		sci-libs/lapack
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11:= )
 "
 
 #That's right, it can't build if gnuradio 3.7 is installed
@@ -114,14 +115,6 @@ DEPEND="${RDEPEND}
 	zeromq? ( net-libs/cppzmq )
 "
 
-PATCHES=(
-	"${FILESDIR}/gnuradio-3.8.2.0-lamda-gr-qtgui.patch"
-	"${FILESDIR}/gnuradio-3.8.2.0-lamda-gr-uhd.patch"
-	"${FILESDIR}/gnuradio-3.8.2.0-lamda-most-components.patch"
-	"${FILESDIR}/gnuradio-3.8.2.0-lamda-set-msg-handlers.patch"
-	"${FILESDIR}/gnuradio-3.8.2.0-3967.patch"
-)
-
 src_prepare() {
 	xdg_environment_reset #534582
 
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index fe28bc5dbdb4..c7bc68e24c4f 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -47,14 +47,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
-	dev-libs/log4cpp
+	dev-libs/log4cpp:=
 	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
 	sci-libs/fftw:3.0=
-	sci-libs/mpir
-	sci-libs/volk
+	sci-libs/mpir:=
+	sci-libs/volk:=
 	alsa? ( media-libs/alsa-lib:= )
 	fec? (
-		sci-libs/gsl
+		sci-libs/gsl:=
 		dev-python/scipy
 	)
 	filter? ( dev-python/scipy )
@@ -90,11 +90,12 @@ RDEPEND="${PYTHON_DEPS}
 		media-sound/gsm
 		>=media-libs/codec2-0.8.1
 	)
-	wavelet? ( sci-libs/gsl
-			dev-libs/gmp
-			sci-libs/lapack
-			)
-	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	wavelet? (
+		sci-libs/gsl:=
+		dev-libs/gmp:=
+		sci-libs/lapack
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11:= )
 "
 
 #That's right, it can't build if gnuradio 3.7 is installed
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index a1092e0e5c74..1abeadbd0ece 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,7 +1,5 @@
 AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8b34c86877b65b4909523bd80bf1d1a7ab86fa1676f777a49a670a456a2b4babdcbbee7063e6fd8b6a24a025b92d43632d580fa8ab329 SHA512 0d763dbbd510f273fbe937bf51a07cda2f2d9e53dcfdb64d210f3c85c51e6995223cf13d81d94b90dc7dc0fddde8fc8ea6f30d23b652edf8945fee08c494b1f0
-DIST gr-osmosdr-0.2.0.tar.gz 251163 BLAKE2B 036a4439c5c27ae3143ef3be6e76f94bf3e0524509ffc58ad19379fa0adc9477bd704b7e88fffd46ed9e5528ae539d875b4e496a77ea392e8eef117fc57a3af1 SHA512 96eb8ff0a05cf0d5b49384cdc80e0a3d924ba452485acbe852266fd73a5335668b40454421d9f5a52ea610f7100557e51d6a5d9cf6931fe68e8757eb5f02d126
 DIST gr-osmosdr-0.2.3.tar.gz 252727 BLAKE2B 04fe86496c09a274058bfd812fc14d7843d7e9db2648cf2cf5292e50494a859e22b1ab211f7078f2b6964c786c5f5ad5c3c9d2dd44ec5fc96d240b96f2cb63f4 SHA512 3c82a39972a309aa5b023b9c5e61f1fc80b797380b7a6c6c23cd4fe278cfaba3ab3019f32d38ebc01300868bb892f6aaaa7f12c9ee9b7ab5ba3e38817a40bf3e
-EBUILD gr-osmosdr-0.2.0.ebuild 1964 BLAKE2B 7ceb253bdef62ea518c6bac2e29115dc03be39b33a775ba3df64fc43796c21a395d104ce8a7846c8a1c2c6d13720b5501082f974fad14d211c441ad8c8e3506b SHA512 776a288c814c3ac7677306aa0d2e81edc9fb80aa44cdb6586a2d1eb73937e4deb85ab93df93bb680a006469794ddf2834430e86a9c8a2e010eae0061d77758cc
 EBUILD gr-osmosdr-0.2.3.ebuild 2121 BLAKE2B 6eb8e91b6c0b430885c76eb14c9b9bf70587be05708b7aff8f78301bae00896fcc783c88c36ef5e185172973d1412f5bbf29c76a9db4cfaa2fa1ce5aff1f394e SHA512 97b732c54da626e2e373e54e6f685563cfaf54b869c48d42fcecbd04666b46ece2fe7670721cb568366029861c7913d6867fd371c35a621309e088c7bb8a4c90
 EBUILD gr-osmosdr-9999.ebuild 2041 BLAKE2B b7db74e84655125c662912fa83cf89423d5195c950d888a4dfce0b941e05982d3bef69a8e2eaf976b510c664f3685258ba67f01b95c54e2695355307cca4878f SHA512 095675d49a45e32f95178ad909c61bf0f811ecf01c0889f2dfe0119fe0e66416f883e64af0451b5833d64267b76bf6f0ce46e996564441d5358b1e7ff165fde2
-MISC metadata.xml 972 BLAKE2B f74851bbd10231ba483924bac8c7610096905bfc6e045b23456d74956a2b0f6dcb27c9ea9cc05902b06b2e2efde3aa49905f733045e4a3c1c13e95842edcc1a7 SHA512 d8861f09b73ae23ba92d49339d662b738abbaab0428c20509c347cb852432842352f22a6beb764e2118679db3a22fd6892261dd8093ab4cd1c5b7a7cd19e8276
+MISC metadata.xml 896 BLAKE2B 41475e63c14db74f379a64e1ea69d0df55429cba98546c98e59f3600bbafc8706179d87f7b2d7ab0a67dae0ee6bb8b19f03c0f9cf94d7e7299ba76edfdb7e2ad SHA512 d1ae627c803cbfaab58d2b4b025fae6135bd143726e804868960ae823536f9cd1e85f6aa37763e93f51d647b78ec1b82b384cdfac79ac64a3043e6ccb9e7f32e
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
deleted file mode 100644
index 672ccb93921f..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/osmocom/gr-osmosdr.git"
-else
-	SRC_URI="https://github.com/osmocom/gr-osmosdr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspy bladerf hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
-	sci-libs/volk
-	airspy? ( net-wireless/airspy )
-	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_SINGLE_USEDEP}] )
-	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
-	sdrplay? ( net-wireless/sdrplay )
-	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		-DENABLE_AIRSPY="$(usex airspy)"
-		-DENABLE_BLADERF="$(usex bladerf)"
-		-DENABLE_HACKRF="$(usex hackrf)"
-		-DENABLE_IQBALANCE="$(usex iqbalance)"
-		-DENABLE_MIRI="$(usex mirisdr)"
-		-DENABLE_PYTHON="$(usex python)"
-		-DENABLE_RTL="$(usex rtlsdr)"
-		-DENABLE_RTL_TCP="$(usex rtlsdr)"
-		-DENABLE_SOAPY="$(usex soapy)"
-		-DENABLE_UHD="$(usex uhd)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use python; then
-		python_fix_shebang "${ED}"/usr/bin
-		python_optimize
-	fi
-	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
-}
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index cc8249dcdf23..35f70255350b 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -10,7 +10,6 @@
 	<flag name="bladerf">Build with Nuand BladeRF support</flag>
 	<flag name="hackrf">Build with Great Scott Gadgets HackRF support</flag>
 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
-	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
 	<flag name="sdrplay">Enable support for SDRplay devices through <pkg>net-wireless/sdrplay</pkg></flag>
 	<flag name="soapy">Build with SoapySDR support</flag>
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 3691a5bb2b4a..7b7f8951ee9c 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -2,8 +2,10 @@ AUX hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
 AUX hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch 2284 BLAKE2B 0c454ca976d2ee538a874f1a4f583434bdf3abe6c5d20517f3350d9852c0f50849ae1ad4611acecf5a754339678e4952b8c9ae1abb783e06cffa615b36464d06 SHA512 00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c
 AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch 1553 BLAKE2B 736e51142cf4402cc8aa6858022fda23ea5f37ba256bc922349365ff4824322db31ea04add04d1b55d0d41f4cb0272de8dcf44ae4671309e808cc4f4a57fe6ac SHA512 69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0
 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
+AUX hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch 3839 BLAKE2B 943ccc90d23c60eef15a336108d14e74909ecb782f772145ee48d049806c289c42867999e489fdfc0795846bf41a756303e6da81f4624d26043c618b8485cf43 SHA512 88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1
 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 7550 BLAKE2B e779c6986b7205fe7499809eed0bd3b129b20b9c7d87b5ccbadd68df852b5142fd119ee8be4cd7f20c3b199399cfcebf1b2e37bbc333266e827592a9a89d3bf3 SHA512 df47ee822e74a0f6638846693bd54250e39b750d7e010a037a7e44020adf5f662d860b63c19d307a76f0a34bf75082d746c442768e32a51050156737995f459e
-EBUILD hostapd-9999.ebuild 7554 BLAKE2B 35f31a8f1c76573552f13c8f1370eea464f33ee865be1b669d7e947081cbfc2abb6b82fe9857b62ff8fbc0c2ea396d402ca4580ced38d3851c92f3c435591697 SHA512 898bfa0c1df91d394c83f9c22f1c6eef6202172f7b7651f7d39e73fbc0ebe7ba1ed8fc7c5fa818dc082e1665b66f87ee4d4d3feccbc90631b9cd4295b4538fb6
-MISC metadata.xml 1106 BLAKE2B 4b92b2eaa73222e60eb079522620e58991393296da9e981c742cd2b20fa38a5984c8c7b3d6242f0a27770af32caff148089eaa1ace27b4a152a751557ac0e0b9 SHA512 b0b6e8a9f72e01534770876d5a656360397d48d3736ec6aa5f799e65d414be4291729f78b4f2ebea1a2c55510d337adc0ae709021b3d360deef04f0ea2e32002
+EBUILD hostapd-2.9-r3.ebuild 7504 BLAKE2B 7d74aaa531264ff0d04fa19a17e19633dd1b72e95289bc3bb812924583da12d7da4d9b00adf155995f9dcb3a9c46917363f816b1f6e9b9daadbb8ef138797c3d SHA512 0dd1ab1500f4983b080ddd79d899092e998ae9a111c469be554a27747c7f896ccfba148385f90e72660d1949fb2f46117733b44bd0005684110edec1058b8938
+EBUILD hostapd-2.9-r4.ebuild 7667 BLAKE2B 7f7268cbfc7a67f41a4e11fa136066a45b14fff697cb89e7bae58624351a086bbb412f59f2a375fd04e05d47db0b68bda5ff77c55b3a53092f345c6b95157d0e SHA512 c5a8f6854bd6cafd30e7cad6f97a8f5de15afc214ddf6d54dff5c4f375f702d73a7a2c95a7b3aa13b8498b1bb3526fa95c253e2e0751f20fc3379bb12cb26020
+EBUILD hostapd-9999.ebuild 7128 BLAKE2B ddb2bbe4264737d17b92d23a1011274449d93ada1917dc231f403498955081bcd8cb942513589e60d0402a6d50257d2a924bc7ae269e669fef4dce2f28c23214 SHA512 6725675b1c839bb0bc5f9a0335d48372f01792a9520ba1e0af531cabbba4a314f0b469cadabc439c69751afd558fa14a85e8253ca53ca0c7c3531ce53b36d6a8
+MISC metadata.xml 1016 BLAKE2B 2582e31954d531776cdd315747006e1744c9a9f61faf6c73f251f8174d92e061a9dadb71152b9f666e210fe5478a5fe351bcd109b2804d94dfc268fc53004939 SHA512 27b8f32edde034f776c1538fd8e223f6963ab2a0bd760a9a3d5a3a08dd2c8549e990bfcaf5f197be47c4b92897ed13f07b111dec609a56c4268c1a659e493df1
diff --git a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
new file mode 100644
index 000000000000..8c8ba9335504
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
@@ -0,0 +1,115 @@
+From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Sat, 13 Mar 2021 18:19:31 +0200
+Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters
+
+The supported hash algorithms do not use AlgorithmIdentifier parameters.
+However, there are implementations that include NULL parameters in
+addition to ones that omit the parameters. Previous implementation did
+not check the parameters value at all which supported both these cases,
+but did not reject any other unexpected information.
+
+Use strict validation of digest algorithm parameters and reject any
+unexpected value when validating a signature. This is needed to prevent
+potential forging attacks.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/tls/pkcs1.c  | 21 +++++++++++++++++++++
+ src/tls/x509v3.c | 20 ++++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
+index bbdb0d7..5761dfe 100644
+--- a/src/tls/pkcs1.c
++++ b/src/tls/pkcs1.c
+@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+ 		os_free(decrypted);
+ 		return -1;
+ 	}
++	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo",
++		    hdr.payload, hdr.length);
+ 
+ 	pos = hdr.payload;
+ 	end = pos + hdr.length;
+@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+ 		os_free(decrypted);
+ 		return -1;
+ 	}
++	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier",
++		    hdr.payload, hdr.length);
+ 	da_end = hdr.payload + hdr.length;
+ 
+ 	if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
+@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
+ 		os_free(decrypted);
+ 		return -1;
+ 	}
++	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters",
++		    next, da_end - next);
++
++	/*
++	 * RFC 5754: The correct encoding for the SHA2 algorithms would be to
++	 * omit the parameters, but there are implementation that encode these
++	 * as a NULL element. Allow these two cases and reject anything else.
++	 */
++	if (da_end > next &&
++	    (asn1_get_next(next, da_end - next, &hdr) < 0 ||
++	     !asn1_is_null(&hdr) ||
++	     hdr.payload + hdr.length != da_end)) {
++		wpa_printf(MSG_DEBUG,
++			   "PKCS #1: Unexpected digest algorithm parameters");
++		os_free(decrypted);
++		return -1;
++	}
+ 
+ 	if (!asn1_oid_equal(&oid, hash_alg)) {
+ 		char txt[100], txt2[100];
+diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
+index a8944dd..df337ec 100644
+--- a/src/tls/x509v3.c
++++ b/src/tls/x509v3.c
+@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer,
+ 		os_free(data);
+ 		return -1;
+ 	}
++	wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length);
+ 
+ 	pos = hdr.payload;
+ 	end = pos + hdr.length;
+@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer,
+ 		os_free(data);
+ 		return -1;
+ 	}
++	wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier",
++		    hdr.payload, hdr.length);
+ 	da_end = hdr.payload + hdr.length;
+ 
+ 	if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
+@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer,
+ 		os_free(data);
+ 		return -1;
+ 	}
++	wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters",
++		    next, da_end - next);
++
++	/*
++	 * RFC 5754: The correct encoding for the SHA2 algorithms would be to
++	 * omit the parameters, but there are implementation that encode these
++	 * as a NULL element. Allow these two cases and reject anything else.
++	 */
++	if (da_end > next &&
++	    (asn1_get_next(next, da_end - next, &hdr) < 0 ||
++	     !asn1_is_null(&hdr) ||
++	     hdr.payload + hdr.length != da_end)) {
++		wpa_printf(MSG_DEBUG,
++			   "X509: Unexpected digest algorithm parameters");
++		os_free(data);
++		return -1;
++	}
+ 
+ 	if (x509_sha1_oid(&oid)) {
+ 		if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) {
+-- 
+cgit v0.12
+
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index 7a63076e50a7..174b3dd6157a 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -28,30 +28,29 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-		internal-tls? ( dev-libs/libtommath )
-		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-
+	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}"
 
 pkg_pretend() {
 	if use internal-tls; then
-			ewarn "internal-tls implementation is experimental and provides fewer features"
+		ewarn "internal-tls implementation is experimental and provides fewer features"
 	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
@@ -63,12 +62,12 @@ src_prepare() {
 	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"
+	# CVE-2019-16275 (bug #696032)
+	eapply "${FILESDIR}"/${P}-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
 
@@ -77,7 +76,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local CONFIG="${S}/.config"
+	local CONFIG="${S}"/.config
 
 	restore_config "${CONFIG}"
 	if [[ -f "${CONFIG}" ]]; then
@@ -233,20 +232,18 @@ src_install() {
 	docinto examples
 	dodoc wired.conf
 
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
+	insinto /etc/log.d/conf/services/
+	doins logwatch/${PN}.conf
 
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
+	exeinto /etc/log.d/scripts/services/
+	doexe logwatch/${PN}
 
 	save_config .config
 }
 
 pkg_postinst() {
 	einfo
-	einfo "If you are running openRC you need to follow this instructions:"
+	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}."
@@ -267,7 +264,7 @@ pkg_postinst() {
 
 	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 "read the README-WPS file in /usr/share/doc/${PF}"
 		einfo "for info on how to use WPS"
 	fi
 }
diff --git a/net-wireless/hostapd/hostapd-2.9-r4.ebuild b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
new file mode 100644
index 000000000000..4130241a64ce
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9-r4.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+S="${S}/${PN}"
+
+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 netlink sqlite +suiteb +wps +crda"
+
+DEPEND="
+	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}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		ewarn "internal-tls implementation is experimental and provides fewer features"
+	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}"/${P}-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
+	# CVE-2021-30004 (bug #780135)
+	eapply "${FILESDIR}"/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.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
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG} || die
+
+	# EAP authentication methods
+	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} || die
+		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
+	fi
+
+	if use internal-tls ; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
+	else
+		# SSL authentication methods
+		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} || 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} || 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} || die
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
+
+	# misc
+	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_OCV=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} || die
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		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} || die
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default
+}
+
+src_compile() {
+	emake V=1
+
+	if ! 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 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
+
+	insinto /etc/log.d/conf/services/
+	doins logwatch/${PN}.conf
+
+	exeinto /etc/log.d/scripts/services/
+	doexe logwatch/${PN}
+
+	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/${PF}"
+		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 515d2b26e214..6149f90b94e0 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -28,30 +28,29 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda"
+IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
 
 DEPEND="
-		internal-tls? ( dev-libs/libtommath )
-		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
-
+	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}"
 
 pkg_pretend() {
 	if use internal-tls; then
-			ewarn "internal-tls implementation is experimental and provides fewer features"
+		ewarn "internal-tls implementation is experimental and provides fewer features"
 	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
@@ -60,24 +59,16 @@ src_unpack() {
 src_prepare() {
 	# Allow users to apply patches to src/drivers for example,
 	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
+	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
+	popd &>/dev/null || die
 
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
 		"${S}/hostapd.conf" || die
 }
 
 src_configure() {
-	local CONFIG="${S}/.config"
+	local CONFIG="${S}"/.config
 
 	restore_config "${CONFIG}"
 	if [[ -f "${CONFIG}" ]]; then
@@ -162,6 +153,7 @@ src_configure() {
 	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
 	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
 	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+	echo "CONFIG_OCV=y" >> ${CONFIG} || die
 	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
 	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
 	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
@@ -202,7 +194,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if  use internal-tls; then
+	if ! use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -233,20 +225,18 @@ src_install() {
 	docinto examples
 	dodoc wired.conf
 
-	if use logwatch; then
-		insinto /etc/log.d/conf/services/
-		doins logwatch/${PN}.conf
+	insinto /etc/log.d/conf/services/
+	doins logwatch/${PN}.conf
 
-		exeinto /etc/log.d/scripts/services/
-		doexe logwatch/${PN}
-	fi
+	exeinto /etc/log.d/scripts/services/
+	doexe logwatch/${PN}
 
 	save_config .config
 }
 
 pkg_postinst() {
 	einfo
-	einfo "If you are running openRC you need to follow this instructions:"
+	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}."
@@ -267,7 +257,7 @@ pkg_postinst() {
 
 	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 "read the README-WPS file in /usr/share/doc/${PF}"
 		einfo "for info on how to use WPS"
 	fi
 }
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index d518c0ca0889..563ee67435f0 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -9,8 +9,6 @@
 	<use>
 		<flag name="crda">Add CRDA support</flag>
 		<flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL or GnuTLS</flag>
-		<flag name="logwatch">Install support files for 
-			<pkg>sys-apps/logwatch</pkg></flag>
 		<flag name="netlink">Adding support for using netlink to create VLANs</flag>
 		<flag name="suiteb">Adding support for NSA Suite B Cryptography</flag>
 		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 03be51a2b849..559e0358de8a 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,9 +1,9 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.13.tar.xz 927880 BLAKE2B 0ff1d0c0a4dfd08bfea602e8a76fbf7d9078f5b665b90cd6cdf49ed589fd8c43151a3938313ab877653348a6862ae19d228feeea44d441efe17324ff1c5b9aa5 SHA512 7da9d28bf6f1f2ce55c6cd3bedd927580245789ccd3b67bc44d4768ac74e1793f912b12029662fadd6d6f15da68f337553efc05d886d3be04956d2db0d85f01c
 DIST iwd-1.14.tar.xz 933764 BLAKE2B edc6a925872afb6b98f5bbe16fc1cb6b8459a1aff33ec1f9e2d6bd45e605e34debaffa3048b6506cd3e8006c57d6efc9ae341f73050668454ad85fe7e6b4f256 SHA512 bff9b5a744e8eb4e285f28d976e9335d2c85b57fc1eb023c3aa9442e451523b3b9f080d2c02fc5432735c398857b64d115ed2929dd4bb910925cbf18df0b0874
-EBUILD iwd-1.13.ebuild 4832 BLAKE2B dee7e7f2cf199c2a7c66d6b8bf2bf698bf2ddab27389ec957232451f3649f13b5c9291a4ee4e1eff17a67ee15c57b0795bbd664574351e9ba1bc7810c376690a SHA512 68fbe4c0bc424e8cf38cbe8374ca925e304a2f3a36a7affb8894aeb4a430025060accb8863d1f0ce98093f30bed16c5f346a9d32b068106d0c87acdf3461a4a5
-EBUILD iwd-1.14.ebuild 4934 BLAKE2B 6e4b3cb2cce0b875b5ec0b390fd59b7ce73ef68ecbff3be03fe57a150ad218e3ff69c6bc52e8982495398e89f5e4c6cdb615a07495a47a8137ec9437de9c0c38 SHA512 781397a8e2fa8e11dab6cec705f1bc433d178b89b9b8baaa5ca6a389fde794b8d54c7f3b4150b625088e3a010d2aa034eed2de92663df021a3593aad06e769c2
+DIST iwd-1.15.tar.xz 940724 BLAKE2B 6dae8a71e15136bcc9d8bb44cc6b152848207d89af2f447f48e834a3feda72a0a018dd1db3cb3a0e92c834cb2a19d8f9e4a9c900d91f96df378772d220205d65 SHA512 71e1f5f1b9d4e09a158b9bf801cee8af5ed8a19a3e80ad677e28ccab29ae10a79ebb7dbeaed60dd24283b6a40dbda8c212400b6d5ac659ed6056588a8663f0d4
+EBUILD iwd-1.14.ebuild 4928 BLAKE2B a562a3ec297608b899413a35973b37da935260225be99a7eb864deaa0c2d960edf07e7d98620d68868c660e964a0a93daf179531c1caf3f1e687160c984e7cc2 SHA512 cbca49ef774352a05f7fc52e285d7ef494838a281c08d2c2f9276187e38dd8450c28ba5243fed7a4a2515b37562b21bc3bc013bc2333769b04f89fe2a4ab31cc
+EBUILD iwd-1.15.ebuild 4934 BLAKE2B f2edb470ebceb31d24b7ce68a3f41a26c76fe728f0a4a0faf93984013fa4adfbddf319770f10e69a8be62f79bff8949826962b04e06ede4f738badbf9ab63418 SHA512 d7f68296316fd0a40dafc426daacde4dd56cf1fc1aa8e1c9d7e1b5dabb55a8e8e27a7ed28cff09ece612ba6ed679775c0bbbf37542fcb88915380391487ca749
 EBUILD iwd-9999.ebuild 4930 BLAKE2B ef4e6abb91312e52edc376f99664863d83ff87340a7a83e617b826d48fd85c8b70c95e0929a1c3461ec03bc45724ace0f287ce5b03cb381e6221b9414f38b93e SHA512 485aaca5116e7f13b5a76816bf0b98731c95f305b69e40ae717bad2da2760b8759eb2043c8f6888fa790854ed5f8b0039d920572af5e6396fd297aa2e2d06256
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/iwd-1.14.ebuild b/net-wireless/iwd/iwd-1.14.ebuild
index 02a955c8d7b2..c7e2a2446fc7 100644
--- a/net-wireless/iwd/iwd-1.14.ebuild
+++ b/net-wireless/iwd/iwd-1.14.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/net-wireless/iwd/iwd-1.13.ebuild b/net-wireless/iwd/iwd-1.15.ebuild
index b7176338196d..2197a22c78c3 100644
--- a/net-wireless/iwd/iwd-1.13.ebuild
+++ b/net-wireless/iwd/iwd-1.15.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.39"
+ELL_REQ="0.41"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -13,7 +13,8 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
@@ -150,8 +151,12 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
+src_compile() {
+	emake ${MYRST2MAN}
+}
+
 src_install() {
-	default
+	emake DESTDIR="${D}" ${MYRST2MAN} install
 	keepdir /var/lib/${PN}
 
 	newinitd "${FILESDIR}/iwd.initd-r1" iwd
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index ed8f65e76dd5..e1f0feaed16d 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -4,7 +4,9 @@ AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69ac
 AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2020-12-R3.tar.xz 9887764 BLAKE2B 4d011a13888f6a60d34ddcbc47d83c01debf73307da7d26c28034b15ad6dde2d8ae7741b4104d250ff112be242af0cbbcff612fc172d67d404d14b3d0ef688f3 SHA512 6c4c95a9963977d5a383e34f662f814a803d0d36d7dbc35d3d0a42d3e67c20e8d46357df0ee544b8dd3c7f527bd43ef9c0d913577d4979f261764fc9761cd6d1
 DIST kismet-2021-05-R1.tar.xz 10611692 BLAKE2B fc0a145005440c8af5320488e1a4bfe808ad8aeba614c9294b511a8da70ec2d51dbfd2ecc840c9af84e0222967200bb82856b2e008e39f015b455be131f89484 SHA512 edca956c9c04f99e06a09dc23216a908fbac68637246d73430b2d9d3a3ba1c2e8099d263819073d24494dce17bd36c83a2f51c648430a6eea3db7332b07e2fba
+DIST kismet-2021-06-R1.tar.xz 10616368 BLAKE2B 22c216355b31224f41991f6caa6ad86cd2549982196cf0dd6f89ef88f92d85f57bd12100a74ebbe3e0cee0140da4bd545b548382d55a4c3ac1403504680c9ca3 SHA512 88d92e2ef3f0513a3a00b573012edbd115f92e5f28f884aead5ab049fad97b328222c2f3cbb49d80c5fcfdab2212934532cf41c100c4d0a5e94c932e1c5e8352
 EBUILD kismet-2020.12.3.ebuild 5090 BLAKE2B 19a1e715659b6a459d17842dd2e1aa9ba12d32ca387c8975203540cecddaef426b23c3eb1bd99eba27eb34408ca23ecbf4c58b619158cf6316a778b7ddc1178e SHA512 7da5c4482f2e8826ef7b6c499a3b74f89d2c77e42a3985ee4b365f3af876a881db2c21be40e2bfa0cbe7093e0bdbfbd6f8c3210c91cedc6cf38faee8dc3824f1
-EBUILD kismet-2021.05.1.ebuild 5932 BLAKE2B ed3c5e21bff6d354a0d30e6915f37d251bb38fedf217dadccabffaff2f7d9fb24849ec774a62c5f123d3fade02517153e8ee4c578ef94e09e0c1cd6814416598 SHA512 da81b3ae3cca95ebb544c439ac15e7ae18847be69ba33e38baa57667b90228696f1ed11f2e33b22c2af5026d061511e654c64f6bc8922b24d86c69946e5e7c1f
+EBUILD kismet-2021.05.1.ebuild 5929 BLAKE2B 0a51d634288261f70b2c4119539720692f1e230bcc382d50d11eb8661e9bd3785b77f7651072c4430151cc04a18c6429630982b410898a6d65106c26dd2b8633 SHA512 120d91f4f3075a93cc224c15d7ea54679a76f08d3b60bd712cef50526fbf1fd8f8e51ebd4d4cf2c89698e3de2e8b58b655ebf2239d887303db977df72b80ce7c
+EBUILD kismet-2021.06.1.ebuild 5932 BLAKE2B ed3c5e21bff6d354a0d30e6915f37d251bb38fedf217dadccabffaff2f7d9fb24849ec774a62c5f123d3fade02517153e8ee4c578ef94e09e0c1cd6814416598 SHA512 da81b3ae3cca95ebb544c439ac15e7ae18847be69ba33e38baa57667b90228696f1ed11f2e33b22c2af5026d061511e654c64f6bc8922b24d86c69946e5e7c1f
 EBUILD kismet-9999.ebuild 5932 BLAKE2B ed3c5e21bff6d354a0d30e6915f37d251bb38fedf217dadccabffaff2f7d9fb24849ec774a62c5f123d3fade02517153e8ee4c578ef94e09e0c1cd6814416598 SHA512 da81b3ae3cca95ebb544c439ac15e7ae18847be69ba33e38baa57667b90228696f1ed11f2e33b22c2af5026d061511e654c64f6bc8922b24d86c69946e5e7c1f
 MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/kismet-2021.05.1.ebuild b/net-wireless/kismet/kismet-2021.05.1.ebuild
index d75e2d985726..a01ea62aafbb 100644
--- a/net-wireless/kismet/kismet-2021.05.1.ebuild
+++ b/net-wireless/kismet/kismet-2021.05.1.ebuild
@@ -25,7 +25,7 @@ else
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
diff --git a/net-wireless/kismet/kismet-2021.06.1.ebuild b/net-wireless/kismet/kismet-2021.06.1.ebuild
new file mode 100644
index 000000000000..d75e2d985726
--- /dev/null
+++ b/net-wireless/kismet/kismet-2021.06.1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools multilib python-single-r1 udev systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/${PN}.git"
+	inherit git-r3
+	RESTRICT="strip"
+else
+	MY_P=${P/\./-}
+	MY_P=${MY_P/_beta/-BETA}
+	MY_P=${MY_P/./-R}
+	S=${WORKDIR}/${MY_P/BETA/beta}
+
+	#normally we want an official release
+	SRC_URI="https://www.kismetwireless.net/code/${MY_P}.tar.xz"
+
+	#but sometimes we want a git commit
+	#COMMIT="9ca7e469cf115469f392db7436816151867e1654"
+	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+fi
+
+DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
+HOMEPAGE="https://www.kismetwireless.net"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="libusb lm-sensors networkmanager +pcre rtlsdr selinux +suid ubertooth udev"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="
+	${PYTHON_DEPS}
+	acct-user/kismet
+	acct-group/kismet
+	networkmanager? ( net-misc/networkmanager:= )
+	dev-libs/glib:=
+	dev-libs/elfutils:=
+	sys-libs/zlib:=
+	dev-db/sqlite:=
+	net-libs/libmicrohttpd:=
+	net-libs/libwebsockets:=[client]
+	kernel_linux? ( sys-libs/libcap
+			dev-libs/libnl:3
+			net-libs/libpcap
+			)
+	libusb? ( virtual/libusb:1 )
+	dev-libs/protobuf-c:=
+	dev-libs/protobuf:=
+	$(python_gen_cond_dep '
+		dev-python/protobuf-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/websockets[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-libs/ncurses:=
+	lm-sensors? ( sys-apps/lm-sensors )
+	pcre? ( dev-libs/libpcre )
+	suid? ( sys-libs/libcap )
+	ubertooth? ( net-wireless/ubertooth:= )
+	"
+
+DEPEND="${CDEPEND}
+	dev-libs/boost
+	dev-libs/libfmt
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+	')
+	selinux? ( sec-policy/selinux-kismet )
+"
+PDEPEND="
+	rtlsdr? (
+		$(python_gen_cond_dep '
+			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		')
+		net-wireless/rtl-sdr
+	)"
+
+src_prepare() {
+	sed -i -e "s:^\(logtemplate\)=\(.*\):\1=/tmp/\2:" \
+		conf/kismet_logging.conf || die
+
+	#this was added to quiet macosx builds but it makes gcc builds noisier
+	sed -i -e 's#-Wno-unknown-warning-option ##g' Makefile.inc.in || die
+
+	#sed -i -e 's#root#kismet#g' packaging/systemd/kismet.service.in
+
+	rm -r boost || die
+	rm -r fmt || die
+
+	#dev-libs/jsoncpp
+	#rm -r json || die
+	#sed -i 's#"json/json.h"#<json/json.h>#' jsoncpp.cc kis_net_beast_httpd.h \
+	#	log_tools/kismetdb_clean.cc log_tools/kismetdb_dump_devices.cc \
+	#	log_tools/kismetdb_statistics.cc log_tools/kismetdb_to_gpx.cc \
+	#	log_tools/kismetdb_to_kml.cc log_tools/kismetdb_to_pcap.cc \
+	#	log_tools/kismetdb_to_wiglecsv.cc trackedcomponent.h \
+	#	trackedelement.h trackedelement_workers.h
+
+	# Don't strip and set correct mangrp
+	sed -i -e 's| -s||g' \
+		-e 's|@mangrp@|root|g' Makefile.in || die
+
+	eapply_user
+
+	#just use set to fix setup.py
+	find . -name "Makefile.in" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+	find . -name "Makefile" -exec sed -i 's#setup.py install#setup.py install --root=$(DESTDIR)#' {} + || die
+
+	if [ "${PV}" = "9999" ]; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable libusb libusb) \
+		$(use_enable pcre) \
+		$(use_enable lm-sensors lmsensors) \
+		$(use_enable networkmanager libnm) \
+		$(use_enable ubertooth) \
+		--sysconfdir=/etc/kismet \
+		--disable-optimization
+}
+
+src_install() {
+	emake DESTDIR="${D}" commoninstall
+	python_optimize
+	emake DESTDIR="${D}" forceconfigs
+	use udev && udev_dorules packaging/udev/*.rules
+
+	insinto /usr/share/${PN}
+	doins Makefile.inc
+	if [ "${PV}" = "9999" ];then
+		doins "${FILESDIR}"/gdb
+		dobin "${FILESDIR}"/kismet-gdb
+	fi
+
+	dodoc CHANGELOG README*
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
+	systemd_dounit packaging/systemd/kismet.service
+}
+
+pkg_preinst() {
+	if use suid; then
+		fowners root:kismet /usr/bin/kismet_cap_linux_bluetooth
+		fowners root:kismet /usr/bin/kismet_cap_linux_wifi
+		fowners root:kismet /usr/bin/kismet_cap_pcapfile
+		# Need to set the permissions after chowning.
+		# See chown(2)
+		fperms 4550 /usr/bin/kismet_cap_linux_bluetooth
+		fperms 4550 /usr/bin/kismet_cap_linux_wifi
+		fperms 4550 /usr/bin/kismet_cap_pcapfile
+		elog "Kismet has been installed with a setuid-root helper binary"
+		elog "to enable minimal-root operation.  Users need to be part of"
+		elog "the 'kismet' group to perform captures from physical devices."
+	fi
+	if ! use suid; then
+		ewarn "It is highly discouraged to run a sniffer as root,"
+		ewarn "Please consider enabling the suid use flag and adding"
+		ewarn "your user to the kismet group."
+	fi
+}
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf 2> /dev/null)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/rfkill/Manifest b/net-wireless/rfkill/Manifest
index acbab7310c5a..edb5d6424653 100644
--- a/net-wireless/rfkill/Manifest
+++ b/net-wireless/rfkill/Manifest
@@ -3,4 +3,4 @@ DIST rfkill-1.0.tar.xz 7228 BLAKE2B 045bcb83f5d6b89945846d5d80b1c45e8c18227ad73f
 EBUILD rfkill-0.5-r2.ebuild 594 BLAKE2B a3cb6f4efd145ce098433d12f23acdb4c5350f829a030695724149030c49d5d6cafe905f705db107dd75b6684a446b6586ec29e1561735e0e01166924e63d398 SHA512 ab19a9a642aaddb7cc5eb56efa0d02a3b029d0bab2b82ecc9aa8e193cfef7170b25f16b907327640eea25e352bd019123cef890fbfdbc50cb5e2f6c2b09e3466
 EBUILD rfkill-0.5-r3.ebuild 683 BLAKE2B 4aaf9443790ae89161ce2c2e6e7694ff2d5e4471d753db842549fee0e251857a08dedc14fcd5bbcc8121a87ba53558480074097ccb4e0ab1b6e59b845f4acf44 SHA512 7a798f04998604d75a2e84c52ed8780502373898611565c07cfc87435ee33e081e517fb6d56b24672272c39dd96a38e45beb2811eda0a1aee1f0441054aa5bc7
 EBUILD rfkill-1.0.ebuild 667 BLAKE2B bb65687e0498b59d05cc0f39ccff71ae5476839cd9c8641df13235d3b6803f9a384a8a33684a2d1fa4d1ce62b5315b8ff4eab5ad1aa19df050f6f8503234e624 SHA512 c4026f2e0d6e893ef44b42ca7a202340a58dc4f2d51ce1b2a0391b4d1e5d24a42019293a9d6ef7dd0b35f74bf4fa7428e5e486e7fa9bf69b0351b66913cfdfa8
-MISC metadata.xml 354 BLAKE2B 60b0bd47a3e5d40932d0e34b3253f62d82db4362c7cb9afcd6cebb4b19e257bf3b0ea43eac26ba603f7979096efca7820b73d086f1ac7fdd829453006aa4760c SHA512 a20e530ace90b8649cb2c22ea255049aa31142a7b1c839f1f112ab0cfc22927c1d7508625e92b2e13ae2fcb65e8f2088ea16ba1194069911741c5eba45293e17
+MISC metadata.xml 248 BLAKE2B 6ac75601482b81c501ce3246925439cc634c7b74250eb51aed1f0b5d44ecf8b48583c09a749e76a1e57078036b1e0be43b95bf4688aa0b534c9010b865994e9a SHA512 e5f288839463187f348677fb5535ced4a2a6423beee0dc8f67258e194bad469eb6c65319b370f24f4727503dfa7c6039e5bdb7527341d495bfc0e49ae586ba99
diff --git a/net-wireless/rfkill/metadata.xml b/net-wireless/rfkill/metadata.xml
index c41c87f63b1c..4ce4d8942dbe 100644
--- a/net-wireless/rfkill/metadata.xml
+++ b/net-wireless/rfkill/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>zerochaos@gentoo.org</email>
 		<name> Rick Farina</name>
 	</maintainer>
diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest
index e08d0392da69..a656aa3bc952 100644
--- a/net-wireless/soapysdr/Manifest
+++ b/net-wireless/soapysdr/Manifest
@@ -1,4 +1,4 @@
 DIST soapysdr-0.7.2.tar.gz 124607 BLAKE2B 534480574e2085bddea52141f26e0da8c70157e2c89a0af1236f3d1eb5b996d4ae5231cd209c610fc22d099bd9db665c4c7aea54081eeca2bb293b9eb1fe7c8e SHA512 2454b9b6bf4542f3bce2c6a8e1c886cee9179ca0e13e3c1e22817a05ef671428a3cb8fea69e496c8b62573f360c248508edf3d0871ec5063dfac8211b122d371
-EBUILD soapysdr-0.7.2.ebuild 1284 BLAKE2B 6c395bc3222efc37af19e0541ea5d439532ff0ce00d7f1c275335dc0d24d389f65650daa2be60242ed154864f97c9c3a7a5a0789105a3a545fd184f387fcce90 SHA512 d98bace9cc739259095ae34ae809c3e5a9eb1842877e806fa943da25014bfd99b5c31822360c80fda5f1704b57308b3ecbb786a831aace997722a7c5bea7ebad
-EBUILD soapysdr-9999.ebuild 1284 BLAKE2B 6c395bc3222efc37af19e0541ea5d439532ff0ce00d7f1c275335dc0d24d389f65650daa2be60242ed154864f97c9c3a7a5a0789105a3a545fd184f387fcce90 SHA512 d98bace9cc739259095ae34ae809c3e5a9eb1842877e806fa943da25014bfd99b5c31822360c80fda5f1704b57308b3ecbb786a831aace997722a7c5bea7ebad
+EBUILD soapysdr-0.7.2.ebuild 1311 BLAKE2B 7ecf6db0f217bd6a8cbc28d538ec986d08dbfba0515394bdbf217ac0b8d8cf92a515d11075e2d591c37d7f834d40441ffee906cffca9a09f976acc1c72a716d1 SHA512 947208cd5c1e16964af2e1e45770a1bbe936f0b98b908098da90c561e3b1c377b5b7c33a0d6ce3fad4ec28fc7618b602e65781b3d19b42d916cf96a41b343536
+EBUILD soapysdr-9999.ebuild 1311 BLAKE2B 7ecf6db0f217bd6a8cbc28d538ec986d08dbfba0515394bdbf217ac0b8d8cf92a515d11075e2d591c37d7f834d40441ffee906cffca9a09f976acc1c72a716d1 SHA512 947208cd5c1e16964af2e1e45770a1bbe936f0b98b908098da90c561e3b1c377b5b7c33a0d6ce3fad4ec28fc7618b602e65781b3d19b42d916cf96a41b343536
 MISC metadata.xml 775 BLAKE2B dbcad63785d9af5b1f2f93775c645f78e6344a2c47fe0ed1f71ab47d9945be2885e4becb2d9b329e145b035cf3af2f50daacc56175126d2fc3b6feae5e4579a7 SHA512 8805602022441e46c239411c7050ae3c4ef954c796a4293f3fb2eb0ff6cbc87a47eb554b89a29c22622e088f6cb232f05c154c0d6f8f864b35cc5f9c2a292862
diff --git a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild b/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
index ffd714150f92..0d446573c63d 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.2.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
@@ -53,5 +53,8 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_optimize
+
+	if use python; then
+		python_foreach_impl python_optimize
+	fi
 }
diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild
index ffd714150f92..0d446573c63d 100644
--- a/net-wireless/soapysdr/soapysdr-9999.ebuild
+++ b/net-wireless/soapysdr/soapysdr-9999.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
@@ -53,5 +53,8 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_optimize
+
+	if use python; then
+		python_foreach_impl python_optimize
+	fi
 }
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index c08855b4390c..8d764950a360 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,9 +1,10 @@
 AUX uhd-3.13.1.0-tinfo.patch 2099 BLAKE2B d48ed54fbff7350aaf33a2551ae891384365a66406becf5b315ac14075675da5e3098c7ca8e64f056035e617d84c0ac6695d065c56665c8cc03c8db07bbef31b SHA512 170c77f04d759fd4a2148c04b85adb48c10d5b1ed6363aaf6c3a78ad79c8055ee65434eec7b26db4cb540a5405d2a6d902a2ef4cf60152032128f05ef1e0adf5
+AUX uhd-4.0.0.0-boost-1.76.patch 2412 BLAKE2B dec44ca0a3e743627c9d68f822623b16325c0829df96e513b9096f3ff03d949fe61a6d5975c302703c178dd0e5090807f4d4c1fa299ce45f5507fa19d23fee4d SHA512 29f554ee4ad1340e0652a6e697340b27f6aa5b1a750c2d67c6068db5d995f325662f13090ec92f7c3e3120f4b4f70690e439fe1884076e083dac5f2cbb1c1681
 AUX uhd-4.0.0.0-tinfo.patch 2163 BLAKE2B b1575290096e85c107772963deaed3f85b8612ad1e1b7b8a800e01d036822e18866cb35249321ad27cfe1c90291894463f0186692f8c20ca8f6ae2242301cc0f SHA512 289c720f465a78f20626c5b17605fe06f33634f225cd3d84834a6fb46448d5e11812fe5997a07141f87f014abb26e3d08afdba0c36335f7640c5db290269439c
 DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
 DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
 DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
 DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
 EBUILD uhd-3.15.0.0-r100.ebuild 3802 BLAKE2B 913430d31161f9aaaa280a4510790f0a7d7e63dd07d6debd36e1e5a1d22d28a65ce17b74480fccc3bc5b0d67984077ff4dcb77bb4a48850d4d3675c8950b680c SHA512 17106d5787eda6052445d0dd5646b6697c7a79443d6aad01cc12ba2789e9b04cb7340d0465c5ea3f40349dda965281077dec02eacef33015fbfe4ea091b18cf2
-EBUILD uhd-4.0.0.0.ebuild 3745 BLAKE2B 77717fc97e06df5f7151e31527b999cae4b5a8a6a78d45657ddded2749167f550d6e57dacde2cd9b35b3b5d0db34e42494d2af7b0b2c674033d310047a040f2e SHA512 c41b71bd82ab0c9d603334db6be2f3023f3b3953848d8af55f1ff2a8d383ce8bcebcdafe1fe0f50f1c687f38bea149f533bd9d6049e3d398ed71452b1711788d
+EBUILD uhd-4.0.0.0.ebuild 3738 BLAKE2B 15d8634d0bfca5d15a8f89f7c5304a3b7d035fc4cef4e3c9feed8c1c10f54a96fbbdb7a0e69cf266db76906373a086d81c55121580d7336b93682c3e98a35d5b SHA512 dfb24cfafaa754c08f5a9aa0c6a8b839e1b0be6df70a7660990702b1105efc3952aef2979c6876c10dd61a8f12841a7d2d5f3d77900c17e4e5bb347a6972973e
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch b/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
new file mode 100644
index 000000000000..123a01bca56e
--- /dev/null
+++ b/net-wireless/uhd/files/uhd-4.0.0.0-boost-1.76.patch
@@ -0,0 +1,59 @@
+From b05285b3853493436f71eb4192365b818005b0af Mon Sep 17 00:00:00 2001
+From: loqs <loqs@users.noreply.github.com>
+Date: Tue, 25 May 2021 22:43:07 +0100
+Subject: [PATCH] Fix Boost 1.76.0 incompatibility
+
+Fixes EttusResearch/uhd/issues/437
+---
+ host/lib/usrp/cores/rx_dsp_core_3000.cpp      | 1 +
+ host/lib/usrp/cores/rx_frontend_core_3000.cpp | 1 +
+ host/lib/usrp/usrp2/usrp2_impl.cpp            | 5 ++---
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+index ff431fd41..53f3fee69 100644
+--- a/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
+diff --git a/lib/usrp/cores/rx_frontend_core_3000.cpp b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+index abbe64b13..d51fea2ca 100644
+--- a/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+ 
+ using namespace uhd;
+diff --git a/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
+index c2514ae02..28aa11083 100644
+--- a/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -17,6 +17,8 @@
+ #include <uhdlib/usrp/common/apply_corrections.hpp>
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/format.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+@@ -948,9 +950,6 @@ meta_range_t usrp2_impl::get_tx_dsp_freq_range(const std::string& mb)
+     return meta_range_t(-dac_rate / 2, +dac_rate / 2, dsp_range_step);
+ }
+ 
+-#include <boost/math/special_functions/round.hpp>
+-#include <boost/math/special_functions/sign.hpp>
+-
+ void usrp2_impl::update_clock_source(const std::string& mb, const std::string& source)
+ {
+     // NOTICE: U2_REG_MISC_CTRL_CLOCK is on the wb clock, and cannot be set from fifo_ctrl
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.0.0.0.ebuild
index 25a3b44949ee..2515af186bab 100644
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND}
 	app-arch/gzip
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.0.0.0-tinfo.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
+	"${FILESDIR}/${PN}-4.0.0.0-boost-1.76.patch"
+)
 
 S="${WORKDIR}/${P}/host"
 
@@ -70,7 +73,6 @@ src_configure() {
 	mycmakeargs=(
 		-DENABLE_LIBUHD=ON
 		-DENABLE_C_API=ON
-		-DENABLE_LIBERIO=OFF
 		-DENABLE_MAN_PAGES=ON
 		-DENABLE_MAN_PAGE_COMPRESSION=OFF
 		-DENABLE_EXAMPLES="$(usex examples)"
@@ -85,7 +87,6 @@ src_configure() {
 		-DENABLE_USRP1="$(usex usrp1)"
 		-DENABLE_USRP2="$(usex usrp2)"
 		-DENABLE_X300="$(usex x300)"
-		-DENABLE_N230="$(usex n230)"
 		-DENABLE_MPMD="$(usex mpmd)"
 		-DENABLE_OCTOCLOCK="$(usex octoclock)"
 		-DPYTHON_EXECUTABLE="${PYTHON}"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index e717bffd93ce..8c379e4ed40f 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,7 +4,9 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9
 DIST unifi-6.0.45.zip 147691229 BLAKE2B ad8e34e4934449151b0244bb32e2ce81e2506f228c995e72c2756279ce22f1ce06d44c37f1cfd6156cee0d03066e36d99f98b56d2a1c759ee98ada6569b8309e SHA512 6b2aebf33b6e2114a2b274ce332e2bd88a30406e3a21bc66dc0eddee3ee27ee2e4d3948dea73ff85289cbc2ed0e4f2b646e095091c54120f718b5fb2f0b35943
 DIST unifi-6.1.71.zip 152149341 BLAKE2B 85b7753aa516e8f44baf8df9c21343c2af33f890e034d373817a41459fed3934abcc4690420307fb743a8096a9b57e027d3809c1e9c7ec45183de4d5ed2364d2 SHA512 eb874ae24a2dd2214a6f1a1f8ad4b9d298edf2ad0f7b1d83b95290ba866b586c92a6ba79f825b2decdb7f298ddc350d994f3af5b72e446e49dd0ddcf4f707f4e
 DIST unifi-6.2.25.zip 152753893 BLAKE2B 1c597e025e73faae5db524a868cfab49feb5f4b9bbd5d823950bce23981521d6d88135ddfb148e30b7c2e00f89b176b065e0635c3e3b0c6a888d1ea688e148c6 SHA512 fe11aa9bf495cfede03d217f6a7f31ac0a2dc11a72dbec56e8a4e465545858d8524d47e9f5677dd917968c0f316a0fe4ceb049f26c15e2fee428e736929bbd9f
+DIST unifi-6.2.26.zip 152767218 BLAKE2B 8351b9c0b2088006560ca3896df0b05d78cb9ca669ad32b1d1a73ef22f4329618b44585bff9a26a841b3d28997bc345708df9820149de91b3fc1df99693c3a74 SHA512 fccffca9bcb31a1da2c389e83ea9a48e4cde6d958368d4d623d459bae095b57a4d7946086b0ac0e4dff5c4c565961ed2c11f7bc2dfbf8b5c6d590fb32af351e8
 EBUILD unifi-6.0.45.ebuild 1577 BLAKE2B ebb712e31ade637fbdbd445d8d372bdd5e2340c98a756157dca7de7ee9f458f953e874f319b24cabcbbcd296243c84bd508dc6023d45cec091c7bca7d75338af SHA512 58e932a2579de089f3fdab42fc409528755aa16f3770e26f4e09c941e3368c2702aef779df5f8e44e193a395325704f55f23b80d4b9bf94dc1de2059f1e3550e
 EBUILD unifi-6.1.71.ebuild 1577 BLAKE2B ef8e790411b63a19def6b2922e1be8fe789417e8cb5a0b4d1cd07313d8682d9bb6670423015ae0b5f7612d3cd5a5ee78500dc3a54221e3f354c0130300956532 SHA512 34b3b5a977a79fbdb587cd5ae2c0b2086933c531cc4a8cfded03ae16d3f8859e7ce988dfb5195ce8a7679f61d1db63969a8c5163bd70a4d2011e963ee27c90bc
 EBUILD unifi-6.2.25.ebuild 1576 BLAKE2B d92b515fe4595b87c3b203e1d47280915b388c7d8df7cb655bb8c05bfc02ebcf0ce6715707febac2d7fbcc49a1bee9da8abe925166dc1120081021db35b0916a SHA512 cfc783909c0b2ef70acb0fc8fd4d5859cd0c603484cf244a76d7d8d16aa3707a82b173c0f5a42e500b425bcab8e3a359d9c08d3301fd0cf67ac15621851849a6
+EBUILD unifi-6.2.26.ebuild 1577 BLAKE2B 7b1c71b56f5c6d85a08dd876c828dd191af9c766128b3bb7b567726692fd5c7c288e19eb2f69ec6628d6f32e1ee435b55597a2b50a6a57a3e99dbaa6d3edaa31 SHA512 fbae90859e8b6f83d776783345d82f863dc5bc1a758fe783e9e35eb6d6d623aad149a35da2f022d5658b158a3e757de65b6f812dd39794232a77780f55a42c7b
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.2.26.ebuild b/net-wireless/unifi/unifi-6.2.26.ebuild
new file mode 100644
index 000000000000..c9f6735aac6a
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.2.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Set this var for any releases except stable
+RC_SUFFIX="-a79cb15f05"
+
+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/$(ver_cut 1-2)"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/urh/Manifest b/net-wireless/urh/Manifest
index 7321f2b9d8fd..e1a646a0e860 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -1,4 +1,4 @@
-DIST urh-2.9.1.tar.gz 13407618 BLAKE2B 2412ed66ad2e80852417a7a0ec1080123dd3804d11535481e302d1c9932c8d770aa2a602ca0368f36b88d2780c9f843c882bc066ff204e9ea14daec6aed21f41 SHA512 e6982a665775c74673b2f409ba2ca42466312dd952ad0ba575405389c1a1274b03e6dde32338a6746d76b25c53018e2ec59f986687dcb18cf95b7087d631ee80
-EBUILD urh-2.9.1.ebuild 1475 BLAKE2B bf471264062ea282055a101ba6c57fb0c2448b2bf08f1f4be1c26a9db44ea1d5e3d97bfa87f681ece5f4053737200bc2573cfeb0d413f42aa52d6f84c11f54ef SHA512 a893508bef2e4c7567f0aa890eec63dbd8fa03837f38fbb0025aa60cb315bd1963056c1141eb3b5a60f8eb9b044be576760f8ad85810e1570b9ee61cd7e709fb
-EBUILD urh-9999.ebuild 1475 BLAKE2B bf471264062ea282055a101ba6c57fb0c2448b2bf08f1f4be1c26a9db44ea1d5e3d97bfa87f681ece5f4053737200bc2573cfeb0d413f42aa52d6f84c11f54ef SHA512 a893508bef2e4c7567f0aa890eec63dbd8fa03837f38fbb0025aa60cb315bd1963056c1141eb3b5a60f8eb9b044be576760f8ad85810e1570b9ee61cd7e709fb
+DIST urh-2.9.2.tar.gz 13408784 BLAKE2B 7219b7284556d5c6f4365306bd0d0b8e7bd70524f212faef9b23acb6db30d5ac6eb1a6f5814041a7a6fbf76677d0172aa488abe804fd3cf54c13441b1a99a027 SHA512 4cf0ae173be467257d64f9d27aad52ffa73ef3a1b428e8bb8ca5d5647ddca48418f0625cc14b93f434ecb92095162a560f0a89e4e378fc98c38393af44425854
+EBUILD urh-2.9.2.ebuild 1476 BLAKE2B bfe10f39a88da673524c0882ef1d44633e8b7f549034cb5ddc25ce8d91dbc09554c07307d1c497f8339ac99e049b4f8f0cecdcdea7a7e369509ed36b2b441305 SHA512 63683e32f5ceee2ee4ec7bca817fbf64bb650a253cbc5bfb7e04d6720c21a87efd24197eecefb11534fc2d3d4f5111d3241cfca740a525bc2a219a463e24e47b
+EBUILD urh-9999.ebuild 1476 BLAKE2B bfe10f39a88da673524c0882ef1d44633e8b7f549034cb5ddc25ce8d91dbc09554c07307d1c497f8339ac99e049b4f8f0cecdcdea7a7e369509ed36b2b441305 SHA512 63683e32f5ceee2ee4ec7bca817fbf64bb650a253cbc5bfb7e04d6720c21a87efd24197eecefb11534fc2d3d4f5111d3241cfca740a525bc2a219a463e24e47b
 MISC metadata.xml 1290 BLAKE2B 9664aac1a7b063842d1f57257434bc423f4cd4681794d44ab404ff3b4ad8c9eced45a3909b65129abb3578d35e5def63e90a9b44cdc01753c8b9bd4046764270 SHA512 0e0944b7a7a8e4ba62ce1ba177f8d5d180f019d4c3b6535af6fba418b0e7e7ef6295ded4e0d804fc4c357a6eb207340f3999100798c9fbc7ab8f2b22af8e62ec
diff --git a/net-wireless/urh/urh-2.9.1.ebuild b/net-wireless/urh/urh-2.9.2.ebuild
index af2edd861acc..83929531f23e 100644
--- a/net-wireless/urh/urh-2.9.1.ebuild
+++ b/net-wireless/urh/urh-2.9.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
diff --git a/net-wireless/urh/urh-9999.ebuild b/net-wireless/urh/urh-9999.ebuild
index af2edd861acc..83929531f23e 100644
--- a/net-wireless/urh/urh-9999.ebuild
+++ b/net-wireless/urh/urh-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index d69a4b5255e2..7115da224fec 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,4 +1,4 @@
-AUX wavemon-0.9.3-build.patch 1383 BLAKE2B 3c578fa5a08c8659706728b5612e22c991f2e6901e905f17c83743aad806023308c8ac8f73ef1af58a7f14b0382e3cab3a962aee616cf9883eb756d7bc9b6048 SHA512 61fb96ab56921dea52e4b834a29cb0a512a92db5b3c495c127a7d5e0a5a6a5d9d825bb2e474fc0bdf40c515ecb52cc163c0667283dd54d5417a16f52753045ec
+AUX wavemon-0.9.3-build.patch 1712 BLAKE2B f23fa28006e0361660c74cfb1628adecd3c9f48ddcf6adc98a9bcfe20614757bd5d416828a7c78a70090e70f24875b667207e154c272edc12a3d0a8eaa8047d3 SHA512 32b839ef6270de5e94e9a16ffb74d9696dec2411ccc05da3a377cb32a1ad127455eaf6ab3a8b1c9ff3af3f6c03d9566b51de08e4100c611c2d2f3f7e5dcf7290
 DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1
-EBUILD wavemon-0.9.3.ebuild 1132 BLAKE2B 0a44b0b9cf12a5930cadbf908f65d3c4a14e9a5e27aa4b430b404736c33f85ca971f3ed134a1633fb63152a04321e092c5eca8deaa718c103f29e04dfbc2f156 SHA512 20f1a13c34e2f62ff76ecc28f820ceb11dffbb6cc98bd4d83cd01c9ed1966cc1390d908f4465867454ef4d85ba1f032ee28dbc0deecb17c8dedcd77fe1d67ba5
+EBUILD wavemon-0.9.3-r1.ebuild 1132 BLAKE2B 0a44b0b9cf12a5930cadbf908f65d3c4a14e9a5e27aa4b430b404736c33f85ca971f3ed134a1633fb63152a04321e092c5eca8deaa718c103f29e04dfbc2f156 SHA512 20f1a13c34e2f62ff76ecc28f820ceb11dffbb6cc98bd4d83cd01c9ed1966cc1390d908f4465867454ef4d85ba1f032ee28dbc0deecb17c8dedcd77fe1d67ba5
 MISC metadata.xml 475 BLAKE2B fd9357bdeff8d0f970ed373cec1708ea354e2549f5b1d746de9caad75c07b6191e3d575e6991d4f779101241c005f449be70bc2c4587975c0d3ade282de56153 SHA512 b10e521fff91543cc53bee7c4f10d874a5301c4615afe337d8c1ff04e19d710908ebca632cce65d9a680d8892e0a4ef0f069ebdd8e84bef65643b48be024dcbe
diff --git a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
index 74b09271a0f2..7cc054efefa4 100644
--- a/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
+++ b/net-wireless/wavemon/files/wavemon-0.9.3-build.patch
@@ -1,5 +1,5 @@
 --- a/configure.ac	2020-12-26 17:44:01.616731241 +0100
-+++ b/configure.ac	2020-12-26 17:45:02.447292151 +0100
++++ b/configure.ac	2021-05-09 21:57:37.000000000 +0000
 @@ -8,8 +8,6 @@
  AC_CONFIG_AUX_DIR([config])
  AC_CONFIG_FILES([Makefile])
@@ -18,14 +18,17 @@
  # Checks for header files.
  AC_HEADER_STDC
  AC_HEADER_TIME
-@@ -29,6 +31,7 @@
- 		  net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
- 		 [], [AC_MSG_ERROR($ac_header not found)])
- AC_CHECK_HEADERS([ncursesw/curses.h])
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
+@@ -54,8 +54,8 @@
+ # Tests involving libraries
+ AC_CHECK_LIB([m], [pow], [],              [AC_MSG_ERROR(math library not found)])
+ AC_CHECK_LIB([ncursesw], [waddstr],
+-	     [],
+-	     [AC_CHECK_LIB([ncurses], [waddstr], [], [AC_MSG_ERROR(ncurses library not found)])])
++	     [PKG_CHECK_MODULES([ncursesw], [ncursesw], [LIBS="$LIBS $ncursesw_LIBS"], [])],
++	     [AC_CHECK_LIB([ncurses], [waddstr], [PKG_CHECK_MODULES([ncurses], [ncurses], [LIBS="$LIBS $ncurses_LIBS"], [])], [AC_MSG_ERROR(ncurses library not found)])])
+ AC_CHECK_LIB([pthread], [pthread_create], [CFLAGS="$CFLAGS -pthread"],
+ 					  [AC_MSG_ERROR(pthread library not found)])
  
- # linux/if.h needs 'struct sockaddr'
- # linux/wireless.h in turn depends on linux/if.h
 --- a/Makefile.in	2017-07-14 21:35:18.154423280 +0300
 +++ b/Makefile.in	2017-07-14 21:35:34.613402738 +0300
 @@ -9,7 +9,7 @@
diff --git a/net-wireless/wavemon/wavemon-0.9.3.ebuild b/net-wireless/wavemon/wavemon-0.9.3-r1.ebuild
index 30c2880e24fc..30c2880e24fc 100644
--- a/net-wireless/wavemon/wavemon-0.9.3.ebuild
+++ b/net-wireless/wavemon/wavemon-0.9.3-r1.ebuild
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index b557abb73def..2c541417573f 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -12,7 +12,9 @@ AUX wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
 AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f649489afd1636105cdddc29d58d45659c5368cc177f919ce94a7e2b5a9ed3fe8ddccd1fba3d059d270bae1a8 SHA512 6bbb9d4f6132b3d4e20cd65f27245ccadd60712ef5794261499f882057a930a393297e491d8147e04e30c0a53645af0eb3514332587118c19b5594f23f1d62ad
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
+DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 284fdeaf6328c35b1f5e88075c62c3b008ec2c400b0cc163a59d9cf8d7c356c3e58f8798e5bade102259d2e5be2ed298b63a0001d0a4ab71d90604a8ee8bf274 SHA512 80e4950ddc99d1134a29a3e5a39767c756f7c9f9f283749e688db3435184631f0384b78954f926724ceff86c96d05b4fb042160265e9d00f976a96e864b7ecc5
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
 EBUILD wpa_supplicant-2.9-r2.ebuild 12057 BLAKE2B 0a322c75b7a2628af450929b846d61f18fc2c833523ab137a29f88e34fe3c66104c5c3bad737b7cba126f386ae232a3dc5478b787fdf4b13a9bad299778da0b7 SHA512 470dc00cf15c7bc4d6ee9e5cceef45e839e4e745b0c2e6daed07e99b8fdc9f5526a1ef468ca1de243de7cba3c875a8722aa0fba9725b84fe365dba7c7822389d
+EBUILD wpa_supplicant-2.9-r3.ebuild 12430 BLAKE2B 1ce08a4999af69aee576f856c8eb7a05ff4ab273c7dd628fe37203c6d563cc1939c094eb01389e26edb1ca1b12408cefbc007cbae96140b66cc2a3a0af33744d SHA512 09c50ecd3280ef185d55c6a91fa5788f54c3bfa0ee3c0e1143b075fc215003dea3095dadb38b9bf0912c5431cdb65710241e3553fb791c5292333136393f8fbf
 EBUILD wpa_supplicant-9999.ebuild 11934 BLAKE2B 92cee24388350fefc91478b101c5ab030a258ef0a6856142c73914013ccb10ded4626c2c4284898c0745a280b792d423a2072b47c2324d7e6368b11a3737a194 SHA512 912a56f0a4c2f551b5597055ab7a79e22ad70aead8ad4e58efacca117dcd4a9ce33b050452786633886b184b0ca1eebd9b43b2cc8a406d8cc6c781caaf496f35
 MISC metadata.xml 1676 BLAKE2B f58705c6f4646675662468a497d1b0dbd7bb2c6870cd1b93b2fe186824da40c120e64b767acc470c2ddbf055af57d56f6d3d739267c5ff165d9c26a0969d3ec2 SHA512 fb5a6c37dd832b8af73b209e677735e583353a5542b24e9df1cda698bcec3702d10aa47cc4efbfb8df67122ad3dc6ad4c8ca6440579df68f67ff9f64e483852c
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
new file mode 100644
index 000000000000..84b17a276725
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r3.ebuild
@@ -0,0 +1,475 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2"
+fi
+
+SLOT="0"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 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
+# at least for now.
+REQUIRED_USE="
+	macsec? ( !privsep )
+	privsep? ( !macsec )
+	broadcom-sta? ( !fils !mesh !mbo )
+"
+
+DEPEND="
+	>=dev-libs/openssl-1.0.2k:0=[bindist=]
+	dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		dev-libs/libnl:3
+		net-wireless/crda
+		eap-sim? ( sys-apps/pcsc-lite )
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+"
+BDEPEND="virtual/pkgconfig"
+
+DOC_CONTENTS="
+	If this is a clean installation of wpa_supplicant, you
+	have to create a configuration file named
+	${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf
+	An example configuration file is available for reference in
+	${EROOT}/usr/share/doc/${PF}/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+			if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
+				echo "$CONFIG_PARAM=$setting" >>.config
+			fi
+		else
+			#ensure item commented out
+			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+		fi
+}
+
+src_prepare() {
+	default
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# People seem to take the example configuration file too literally (bug #102361)
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}" || die
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die
+	fi
+
+	# bug (320097)
+	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+
+	## Security patches
+	# CVE-2019-16275 (bug #696030)
+	eapply "${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+	# 2020-2, 2021-1 security advisories (bug #768759)
+	eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/security-{2020-2,2021-1}/*.patch
+	# CVE-2021-30004 (bug #780138)
+	eapply "${WORKDIR}"/wpa_supplicant-2.9-r3-patches/misc/CVE-2021-30004.patch
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC PKG_CONFIG
+
+	cp defconfig .config || die
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config MATCH_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+	Kconfig_style_config HT_OVERRIDES
+	Kconfig_style_config VHT_OVERRIDES
+	Kconfig_style_config OCV
+	Kconfig_style_config TLSV11
+	Kconfig_style_config TLSV12
+	Kconfig_style_config GETRANDOM
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	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
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	else
+		Kconfig_style_config CTRL_IFACE_DBUS n
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW n
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
+	fi
+
+	if use eapol-test ; then
+		Kconfig_style_config EAPOL_TEST
+	fi
+
+	# Enable support for writing debug info to a log file and syslog.
+	Kconfig_style_config DEBUG_FILE
+	Kconfig_style_config DEBUG_SYSLOG
+
+	if use hs2-0 ; then
+		Kconfig_style_config INTERWORKING
+		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
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	Kconfig_style_config TLS openssl
+	Kconfig_style_config FST
+	if ! use bindist ; then
+		Kconfig_style_config EAP_PWD
+		if use fils; then
+			Kconfig_style_config FILS
+			Kconfig_style_config FILS_SK_PFS
+		fi
+		if use mesh; then
+			Kconfig_style_config MESH
+		else
+			Kconfig_style_config MESH n
+		fi
+		#WPA3
+		Kconfig_style_config OWE
+		Kconfig_style_config SAE
+		Kconfig_style_config DPP
+		Kconfig_style_config SUITEB192
+		Kconfig_style_config SUITEB
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	else
+		Kconfig_style_config SMARTCARD n
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use macsec ; then
+			#requires something, no idea what
+			#Kconfig_style_config DRIVER_MACSEC_QCA
+			Kconfig_style_config DRIVER_MACSEC_LINUX
+			Kconfig_style_config MACSEC
+		fi
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		Kconfig_style_config DRIVER_BSD
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		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
+	if use ap ; then
+		Kconfig_style_config AP
+	else
+		Kconfig_style_config AP n
+	fi
+
+	# Enable essentials for AP/P2P
+	if use ap || use p2p ; then
+		# Enabling HT support (802.11n)
+		Kconfig_style_config IEEE80211N
+
+		# Enabling VHT support (802.11ac)
+		Kconfig_style_config IEEE80211AC
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	if use privsep ; then
+		Kconfig_style_config PRIVSEP
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# 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
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt5 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		eqmake5 wpa_gui.pro
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1 BINDIR=/usr/sbin
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt5; then
+		einfo "Building wpa_gui"
+		emake -C "${S}"/wpa_gui-qt4
+	fi
+
+	if use eapol-test ; then
+		emake eapol_test
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	use privsep && dosbin wpa_priv
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym ../usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	readme.gentoo_create_doc
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	newdoc .config build-config
+
+	if [ "${PV}" != "9999" ]; then
+		doman doc/docbook/*.{5,8}
+	fi
+
+	if use qt5 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		domenu wpa_gui-qt4/wpa_gui.desktop
+	else
+		rm "${ED}"/usr/share/man/man8/wpa_gui.8
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null || die
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.w1.wpa_supplicant1.service
+		popd > /dev/null || die
+
+		# This unit relies on dbus support, bug 538600.
+		systemd_dounit systemd/wpa_supplicant.service
+	fi
+
+	if use eapol-test ; then
+		dobin eapol_test
+	fi
+
+	systemd_dounit "systemd/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}"/etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${EROOT}/etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${EROOT}/etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	if use bindist; then
+		ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
+		ewarn "This is incredibly undesirable"
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${EROOT}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${EROOT}"/etc/systemd/system/network.target.wants/${fn} \
+				"${EROOT}"/etc/systemd/system/multi-user.target.wants/ || die
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+
+	systemd_reenable wpa_supplicant.service
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /net-wireless
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)