gentoo resync : 27.03.2021

22 files changed, 558 insertions, 113 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index a5cf188b106b..07fbc2697534 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 9991aa9678eb..13c4a807bd24 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,12 +1,16 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
 AUX 69-btattach-bcm.rules 2141 BLAKE2B 07fe8306e29f05082a603bd5a4b9d51c8c23b4ed48eaeebd01591970c0e29ea37198abaa8725023fd00cd38c67451910b6028d6725be3aca5ed1c495e02555ee SHA512 ecf535d737b9f1dc7a077f2a13e3712c959c505a93c24f48d63b04db0d42f8feef3918d48b7db5e8e115574a9b62f47aaa9c3e77230cff682d3f35da2f09047e
+AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 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-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
 DIST bluez-5.55.tar.xz 2041428 BLAKE2B 7eee44063ea53188d35324bcc5b5f0539cf92a5934632743677bbf41822b8b79a899a82a93fd79887fe058e6f0c0e66ed8d5da46e5585682613bc1847cb009a8 SHA512 9423cb60d15a6f068838497a1eaea9f5a32d70c07191c313ba821a6919d6e0c436ada4f547cc5f2db5eacc0123429ad54851f57df2554f61fa293743ec14a033
 DIST bluez-5.56.tar.xz 2053080 BLAKE2B b901deae4047ebe96c034c20c9d7e6c275d3c1fd311dc57ed2f1f927d6e778b213af3e09caaeebbb11110f1733fc9bf341cf8f7c63a37aaa6b896607c0026d92 SHA512 b320ee9d49a516f5cecb5fbc410ba42e9127f44ebcfb95647f68bd5d300147d0eaf633f8e8d0678631a2184ea3afae7b01b5f228157328874fa2a87832ed0ae1
 EBUILD bluez-5.55.ebuild 9650 BLAKE2B 30746b26e632aee07a0480d11493a8f45b7236863454956cc42b9e5a7448b132cf906f3ed4fdf51fdee7ebbdf57b55dda77f20407c8fd3595dbd26338f48af51 SHA512 300c443a9b0a1e54902ee928e1cd34ee2eb3de36624c6d2e0c3f839cffe5415667c92049be539983d456526f94f733be5f54fd7fef06342f856ac94ced0be785
+EBUILD bluez-5.56-r1.ebuild 9551 BLAKE2B 752a728bbc6834f2a3698fd3b24fec59f155a6d9f631c52a3ea368b7b80723da73f7a7a9e079cce4dd027fb5dba9732eeeac492ed3b45c496437cdff1976dc3e SHA512 d5b6f9b73e9ac45a21e9e204e69f4fbcb3e511e91e9b927468d79549b8c0f4b069eb6d1d2d5bda80d013c98d0614784d17b200980bcd52d89e6ce3bc0ea516a5
 EBUILD bluez-5.56.ebuild 9656 BLAKE2B a92958e82b380201e90e694aa62d8c0988250411d9e6a62e13baf6ac105afc20074d0fef619e528b24f3b6383deb375da0152faee16d25c7ae25cc617d51e58e SHA512 212bb331d14bdd1f080a34221132267e3c5adfa17d51692d6fe8172dc6c2b9215c62ef114e1ad0e78eb276add76cba37b7e650e7b385a14572a32aba30cc2ba0
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.56-r1.ebuild b/net-wireless/bluez/bluez-5.56-r1.ebuild
new file mode 100644
index 000000000000..928432949d18
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.56-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.28 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.37
+		>=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=(
+	# 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
+
+	# avdtp: Fix removing all remote SEPs when loading from cache (from 'master')
+	"${FILESDIR}"/${P}-avdtp-disconnects.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/files/bluetooth-conf.d b/net-wireless/bluez/files/bluetooth-conf.d
new file mode 100644
index 000000000000..d5b5005ce7fc
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-conf.d
@@ -0,0 +1 @@
+#BLUETOOTH_OPTS="-E"
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r5 b/net-wireless/bluez/files/bluetooth-init.d-r5
new file mode 100644
index 000000000000..4d60234e0304
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-init.d-r5
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/bluetoothd.pid"
+command="/usr/libexec/bluetooth/bluetoothd"
+command_args="${BLUETOOTH_OPTS}"
+command_background=1
+
+depend() {
+	after coldplug
+	need dbus localmount hostname
+}
diff --git a/net-wireless/bluez/files/bluez-5.56-avdtp-disconnects.patch b/net-wireless/bluez/files/bluez-5.56-avdtp-disconnects.patch
new file mode 100644
index 000000000000..c2e34152748d
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.56-avdtp-disconnects.patch
@@ -0,0 +1,41 @@
+From 28ddec8d6b829e002fa268c07b71e4c564ba9e16 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Thu, 11 Mar 2021 07:36:07 -0800
+Subject: [PATCH] avdtp: Fix removing all remote SEPs when loading from cache
+
+If avdtp_discover is called after cache has been loaded it end up
+removing all remote SEPs as they have not been discovered yet.
+
+Fixes: https://github.com/bluez/bluez/issues/102
+---
+ profiles/audio/avdtp.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
+index 088ca58b3..1d5871c62 100644
+--- a/profiles/audio/avdtp.c
++++ b/profiles/audio/avdtp.c
+@@ -3381,10 +3381,18 @@ int avdtp_discover(struct avdtp *session, avdtp_discover_cb_t cb,
+ 	session->discover = g_new0(struct discover_callback, 1);
+ 
+ 	if (session->seps) {
+-		session->discover->cb = cb;
+-		session->discover->user_data = user_data;
+-		session->discover->id = g_idle_add(process_discover, session);
+-		return 0;
++		struct avdtp_remote_sep *sep = session->seps->data;
++
++		/* Check that SEP have been discovered as it may be loaded from
++		 * cache.
++		 */
++		if (sep->discovered) {
++			session->discover->cb = cb;
++			session->discover->user_data = user_data;
++			session->discover->id = g_idle_add(process_discover,
++								session);
++			return 0;
++		}
+ 	}
+ 
+ 	err = send_request(session, FALSE, NULL, AVDTP_DISCOVER, NULL, 0);
+
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 36226008d093..a1092e0e5c74 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -2,6 +2,6 @@ AUX gr-osmosdr-0.2.3-use_xtrx_open_string.patch 931 BLAKE2B 21df3d2ef163f7216ad8
 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 2086 BLAKE2B 3178cda82609c2a16a47056cc9fc0c7d53f46187e6ab0e19e8de102b1d9531c1c61b66e118cb74165d97cb599d51cd0eba2995924122eab912b6c2fb223cf895 SHA512 ecbc40d0c7133c763b4b72a8e227a92ec4d51210b853067c0e50ea3ae36f2f26bc4eb0130e901d02a3c02961cd9b72df794ad80f49f86b7afa51c786ed0453a5
+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
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
index ce9696dfe62d..f7033fd6e361 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.2.3.ebuild
@@ -23,6 +23,7 @@ IUSE="airspy bladerf hackrf iqbalance python rtlsdr sdrplay soapy uhd xtrx"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
+	dev-libs/log4cpp
 	=net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 	sci-libs/volk:=
 	airspy? ( net-wireless/airspy )
@@ -35,7 +36,9 @@ RDEPEND="${PYTHON_DEPS}
 	uhd? ( net-wireless/uhd:=[${PYTHON_SINGLE_USEDEP}] )
 	xtrx? ( net-wireless/libxtrx )
 	"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index 2fb24984321a..16a4c01f1e07 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,5 +1,7 @@
 AUX hackrf_easy_flash-r1 4265 BLAKE2B 19cf7bfc441acac27a9eb1cba149019196134decf44b01d915dc5e2f564b169f00933c8cf36b3ddbc5dac3612620095a7e7f37f2bc46c19b0d1d5a1ede2969fc SHA512 ee11fedf2a9991b09ffd7fe6189149bd6646711011d5eb40f3c7db090e79a5966d86f524378527fd3e6a14d87e3d94a493b88998dbc2276e26bf16bdb5a69210
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
+DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139
 EBUILD hackrf-tools-2018.01.1-r2.ebuild 1912 BLAKE2B c39a8df9077b3f03d924bc633ebcb6d260e53cda45a51a0c82974ca30804a513ed0ad3659605688747552440e7b03c7e1cd2a8c0db03cd20aefebe3cb4545b46 SHA512 869a05dc5ca5c367eef8fe0809277e8f05d040ef6da3ea0b7e4777629aae3c636743107404839068340ea97133f513cb820425aa93e4c313f6d2c64cbd0ae672
+EBUILD hackrf-tools-2021.03.1.ebuild 1917 BLAKE2B 336736f214b281f7825b2504ca9805fd59a940dd4647189258f98390f62238f4e3089830e470a392c63ec5fb1873b6b1e6328a35d64704d063cb499fd8495516 SHA512 a3e63bc305f9aa841180c10228874d17613493148cbed74a11527adf6372792559f33634cc992ca20be918065fb59dcb863d50b7bf2e770485921f8b9b4bbffe
 EBUILD hackrf-tools-9999.ebuild 1919 BLAKE2B 16777b893a526b5f55a339d714316a0342f5e211292538451fd57264cfefd8750ca3c4a5fb09901ab54445c42382752905797bf583c7283cc046cfe3954a05d2 SHA512 17a4c26dce1b384c9026cea475ae4effd0ba9706c9fd067e01d7bcfa0d2f6e730f06a2598d2df6e50432bb4b0bbf66da6a58b546340b61b1eaa89a1612c3bc55
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2021.03.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2021.03.1.ebuild
new file mode 100644
index 000000000000..391540f6c443
--- /dev/null
+++ b/net-wireless/hackrf-tools/hackrf-tools-2021.03.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="tools for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+	inherit git-r3
+	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
+	S="${WORKDIR}/hackrf/host/hackrf-tools"
+else
+	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
+	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="~net-libs/libhackrf-${PV}:=
+		sci-libs/fftw:3.0="
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake_src_install
+	newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
+	if [[ ${PV} != "9999" ]] ; then
+		insinto /usr/share/hackrf
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
+		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
+		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
+		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
+		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
+	else
+		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
+		ewarn "A hackrf-firmware ebuild is available in the pentoo overlay, if you feel adventurous."
+	fi
+}
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index cc937bd8ec65..3ec96b5cefe4 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -4,6 +4,6 @@ AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f3
 DIST iwd-1.11.tar.xz 907020 BLAKE2B 3b2c0922745c699ba01a2f46061246fbad6e2c7ea1a2f58cd13b5bf2169e9517652740f2dd872b5a274d74a5b8f1962c8e4696eabe5481a0c4783f202217599e SHA512 09c5e5e105b6107d88eff4238bf023f7bf1a408f522b9f84fac890c123bff2e124b937b81e1559db7fe0720f0ac423dc7d37c1b6d502fc4a7b7403fcd798e01d
 DIST iwd-1.12.tar.xz 923476 BLAKE2B 08bc5906573da11df5e63b812f2d374eaec7c605140675d8209d81bddecd96e05f10099c63f4f49d7957159dbf7654a5dd2191c8e6bcc1dace7bde6dba6cbf43 SHA512 f331a60430582269801cb01d4eca9957a200c5cfecff637941414eb6db4f077c2dbf824b776cd78ae57b27d442cdb8ec9b3ce8468c206387ea1eee2c9973fcaa
 EBUILD iwd-1.11.ebuild 4869 BLAKE2B c4e5b3c0a0601b8a561f7e78c202f667710110812829a9d21c7afff21ffde976132d0f7c5f3a1b5124c7e733437f4777bd982e7a2934d29ea7c57561e7da9043 SHA512 ea760d457c97ea0b66f9890bfa6e79c076e6b00c8a08e7b4f726de631303bf2391b1479bdca5e16ed41dfbbd59d4e8b2fab83bed2e5ba9a38eb79e5326a3aa35
-EBUILD iwd-1.12.ebuild 4875 BLAKE2B 0be71ea3c9df68883ec1404232922285863dd2ef8440f7155aab977e3ae0b76e2a06506d1f0640e7f5ad7b962ab761c9029368b6e0fdc23ce6d22c47127d0adf SHA512 e252cc9c24aa369b1ab9d44af316a82995b26dd7fb6f2e368411ae0a050c2093c2be2d08bedde10429304b1294fd1c13c6cd290baa0b5249524001d632f8abed
+EBUILD iwd-1.12.ebuild 4871 BLAKE2B 94ea7ca17dd7f0657e1d00cfde694c3e67432637392ead5bed728ce010e594b63d535de749a9a764d61cafd63122d6064144ef4e2c026462e847dcdaf5ea5842 SHA512 c633f688ffeb7e404f8466fdfcb0892ac8cecf1172cbfe6bc40943eb5588cf2980d72a2ed6182bd820abc6bf35716300f4ad31cfb98ba63661e63bec2b3b5f40
 EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
 MISC metadata.xml 832 BLAKE2B 904ff92a3b4e243fe9780fcb0ca0376c33f93669a77dbc8cfb345257dfec77057a54a41688b0cf5a9230a058d4e258096fa9664867b1c43dbc1bdc9662441838 SHA512 f8b8cb1b2d49159a23b8bfc27b6e54c0fd5509c16b6425881dd80f833586dde918f9a2d94a608b61689e30891c10780318197f10e703d9587a12179f98121442
diff --git a/net-wireless/iwd/iwd-1.12.ebuild b/net-wireless/iwd/iwd-1.12.ebuild
index 95e91fcbe292..802e4c744998 100644
--- a/net-wireless/iwd/iwd-1.12.ebuild
+++ b/net-wireless/iwd/iwd-1.12.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index d8f17b56a038..da465c1c875d 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,4 +1,4 @@
 DIST srslte-20.10.1.tar.gz 8098321 BLAKE2B 713cbe45c49baa416b96dc432982656fef92082f026392c890f447d09588a48aafab32f94a4d7ed982814d2d838224303895a0bd0276a90f5815f6d0707d9732 SHA512 a6e38ccdb02a7e129f51fbad258722f5cd1f568541627c3e9e70f9e92491279cb55c18ab0463bce94b0f5fc62f0868027a83beffc483bb3689f0838fbea91186
-EBUILD srslte-20.10.1-r1.ebuild 1281 BLAKE2B baa6646e268d10d3004aa8304381c961fca417de9620b5327ddf99bfaf2d00d2fc9a3552cc25f0678c19d9e124ef50c013e7df0714f62b36636b82c0bcd552c6 SHA512 2b73c09100584c7a47c22bcf5c52459693fdfe6879aaeca18166fbf7eb3c30669e76f31dc80120362b90e7ef7c6cadefcfcc2d10b90aa34d5c7d085e236e734d
-EBUILD srslte-9999.ebuild 1281 BLAKE2B baa6646e268d10d3004aa8304381c961fca417de9620b5327ddf99bfaf2d00d2fc9a3552cc25f0678c19d9e124ef50c013e7df0714f62b36636b82c0bcd552c6 SHA512 2b73c09100584c7a47c22bcf5c52459693fdfe6879aaeca18166fbf7eb3c30669e76f31dc80120362b90e7ef7c6cadefcfcc2d10b90aa34d5c7d085e236e734d
+EBUILD srslte-20.10.1-r2.ebuild 1303 BLAKE2B fe172c59869c9caec4d45431d51f7efc48b7808072a99022706355f9fc1cb6d5f3588772e5a2fca71eabfbd8680c1516bba0a7826444d38028af76499459f050 SHA512 408e8e29ab0b17e3e111fa1966a414dccc50606074ed1750c45f2fe9cc85802a8e1c4807eea7acd6bfaf4b2cfcd0e65b3bbcc1c4828ec4659055ced61a90fc87
+EBUILD srslte-9999.ebuild 1303 BLAKE2B fe172c59869c9caec4d45431d51f7efc48b7808072a99022706355f9fc1cb6d5f3588772e5a2fca71eabfbd8680c1516bba0a7826444d38028af76499459f050 SHA512 408e8e29ab0b17e3e111fa1966a414dccc50606074ed1750c45f2fe9cc85802a8e1c4807eea7acd6bfaf4b2cfcd0e65b3bbcc1c4828ec4659055ced61a90fc87
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-20.10.1-r1.ebuild b/net-wireless/srslte/srslte-20.10.1-r2.ebuild
index a0d7409fa528..02ff600dab82 100644
--- a/net-wireless/srslte/srslte-20.10.1-r1.ebuild
+++ b/net-wireless/srslte/srslte-20.10.1-r2.ebuild
@@ -26,7 +26,7 @@ IUSE="bladerf simcard soapysdr uhd zeromq"
 
 DEPEND="
 	dev-libs/boost:=
-	dev-libs/libconfig:=
+	dev-libs/libconfig:=[cxx]
 	net-misc/lksctp-tools
 	net-libs/mbedtls:=
 	sci-libs/fftw:3.0=
@@ -37,7 +37,7 @@ DEPEND="
 	zeromq? ( net-libs/zeromq:= )
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	sed -i '/ -Werror"/d' CMakeLists.txt || die
diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild
index a0d7409fa528..02ff600dab82 100644
--- a/net-wireless/srslte/srslte-9999.ebuild
+++ b/net-wireless/srslte/srslte-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="bladerf simcard soapysdr uhd zeromq"
 
 DEPEND="
 	dev-libs/boost:=
-	dev-libs/libconfig:=
+	dev-libs/libconfig:=[cxx]
 	net-misc/lksctp-tools
 	net-libs/mbedtls:=
 	sci-libs/fftw:3.0=
@@ -37,7 +37,7 @@ DEPEND="
 	zeromq? ( net-libs/zeromq:= )
 "
 RDEPEND="${DEPEND}"
-BDEPEND=""
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	sed -i '/ -Werror"/d' CMakeLists.txt || die
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 9139f20b2ccb..3872ff86f4a8 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,9 +6,13 @@ DIST unifi-6.1.61.zip 152081465 BLAKE2B 821af3772db56eb4ae850302c86b91015a64cf61
 DIST unifi-6.1.67.zip 152163973 BLAKE2B 15f25b525f0b1bec4041d69817fcb7ab346e0b90e2c7ffebf390c45fcd7763be8f95b89f4884ce97fe1ffa024c6e8a34b5b731b4cc79f137d3bcfaed8af3fc1a SHA512 339efa414e2c2189b51fe8e8e868533117a6acb513758babb98f9b90b163a6df7034147ac56bee1e872dbff74fe2813183e02e0a13796f43e621b2c1cdef1a1a
 DIST unifi-6.1.69.zip 152157626 BLAKE2B 5c94680cbe82e48c09e9b131c2faa5a1dec71553796f38dc33c8ed3e055c9652b6311dd5675affb46b3159392653dde1fe08cf15366f52fdf6a216788f16042a SHA512 a887c18abe07f2ad6b1e472b30935acbf171f52295390c1860bc9ee5eb9e6882a2a1364a30e1e019404c0242a1f63aa1d4031ff60a4a8cf2a4c921ac4565defc
 DIST unifi-6.1.70.zip 152163565 BLAKE2B 093cfbd01a0212ac69a826f156a3a5e3b8254848726a30bad042b192ff0860ea608f100a373af9e91084fb46b4a306433533955edf32baa29edd2c6309973a21 SHA512 5a7e0672e164fc709659dc7d6d3bfe410bb3ec54c216ae2a51eda8f14907dcf69099d41f5d0a67fa1fc8fe53f2f64a1f144bc3c1d65eeae051bb8ca4e6b15d86
+DIST unifi-6.1.71.zip 152149341 BLAKE2B 85b7753aa516e8f44baf8df9c21343c2af33f890e034d373817a41459fed3934abcc4690420307fb743a8096a9b57e027d3809c1e9c7ec45183de4d5ed2364d2 SHA512 eb874ae24a2dd2214a6f1a1f8ad4b9d298edf2ad0f7b1d83b95290ba866b586c92a6ba79f825b2decdb7f298ddc350d994f3af5b72e446e49dd0ddcf4f707f4e
+DIST unifi-6.2.12.zip 152747787 BLAKE2B 448d289be2d72c8403d75f34e89534aadb9e12e1a48f087fa78af1b556230aa1a6b8697ca90027100d4f0e7530333ba4152121b2567c4c78cc8310e2f6660530 SHA512 f06e71db954bb794cec44bc207c0544e455066fc8a86765ee0c6764af8fd37975cc8bcc1dd3c248ca557c4e625af32618f1717304062942f36794654984eb00c
 EBUILD unifi-6.0.45.ebuild 1565 BLAKE2B 2750bd1a561a8e7bd0287ef38ec7b6fa8a799dcec219493388c009da1d4c2def69d765a86514ff13f647d8148ff060106382030b039755a43dcc69dab38d3f2c SHA512 6c0526d1b855a49aa2a81f6d91d0a514e54c7332012cc114302c5b73956ac7855ce006b08fbcf2c650c9a05910b145e6068bd4562685408e6032ffa71ed6f624
 EBUILD unifi-6.1.61.ebuild 1565 BLAKE2B cb11c323af66312060ab88dbcdf29e93b641e9776f4664d84639af6466ed6cfcfc25d863ab1596d174acaa5f2d711d9ce79f6b5304968b50d7ab9b4e801ec552 SHA512 2323ea28c61fe5a9aaa160a5c2016bd6cda9cd2b22ebd5513aee6f943b9e5b459388c067245b44655a9a46c8e8d495cfc9f9491b45112c1254ebd37c47fb9198
 EBUILD unifi-6.1.67.ebuild 1566 BLAKE2B a39869c0c6736619f5b2c1a041cff46bed4c6cf07371337f601b2f2fa509d7ec0f85b6ac906cdd50eedc430102eb688612844068a94c9b3dc6b9c7e12201162f SHA512 76702bd4146637385d0a0da32671ecd3f45ca31bcaf77382f351d282b60b997eb6ac74e93db5f4a2cae58d3418c5660e8f7c899b51f6f4a41798edd35188cc9e
 EBUILD unifi-6.1.69.ebuild 1566 BLAKE2B 16148233b935bc1c34599b71009dc8c2f0cd168f8775efcc58b9f464d650b98abfb06574fa748020167f78cfeaf57d0b87b8a898e4a5e1870735a738486c1203 SHA512 7517e618f1bb537f58536bdf19baa340983f4957aed0c0c9c6d124922767e636194725f7c6522ece00473aab0dced22f3c6fea4ec87e1efc980c396c8672a082
 EBUILD unifi-6.1.70.ebuild 1566 BLAKE2B a78edb42d2ab712e71bfd1f2bcd5222d738a076b92a9627abfb7d6bd34a51a597b9bae191017ef7b8b7c42dd7a29bb6c271832b4d66177e85f64bfe718e4f045 SHA512 a74c3fedbd2fcc1329a58b052992935e68b35dfc0f7cf6ee4426a1ba87aa7ece2baf2b0f051e926eed07467ab7b76da0322f32e770349f53fbc2f845446094e8
+EBUILD unifi-6.1.71.ebuild 1566 BLAKE2B 92814ef60f9f9633b4237969369c34055cb00366f97306c69655893e553dafd8b0c14e47512bde42eaa415210e3faaa24888632b41af729c210c48cc3c437f42 SHA512 b9b4b363e899bfde968859f6a317590d0ce83622fc3d408e6535ae4c7c31bb51e8dd8580b51c54ef0bb72783692486380383d8e551c54920b5953c65a0eec96d
+EBUILD unifi-6.2.12.ebuild 1566 BLAKE2B 728b61055503047a25ff9004d56e65b4234196ddf4a480d83c8c3ab7b08c2f398115a693ced48157eae06db27a82ccb1bb4be59692c440ed9ec778a0298825c4 SHA512 038330cf4b376dffd3aa0a184ec6658f97ec9a0a2e31d032741c25a8af2f311018aeae6d0adaacda356b1e702bd2ba2c3d8eba19d837cfae1b5421c347f7fcae
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.1.71.ebuild b/net-wireless/unifi/unifi-6.1.71.ebuild
new file mode 100644
index 000000000000..7dec0d528413
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.71.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="-de70ef60fe"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/6.1"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/net-wireless/unifi/unifi-6.2.12.ebuild b/net-wireless/unifi/unifi-6.2.12.ebuild
new file mode 100644
index 000000000000..824e27de88c3
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.2.12.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="-585ff7fdff"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/6.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/wavemon/Manifest b/net-wireless/wavemon/Manifest
index edfffcfb6c67..d69a4b5255e2 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,6 +1,3 @@
-AUX wavemon-0.7.6-ncurses-tinfo.patch 669 BLAKE2B 78d027ef6ca14fda651cb6fa06563f9f60c339af8567b0e743dff2975b812198b4ad2166fa59fd28219dfd51c0983eb4890719718412459d733c78ae6154e0d9 SHA512 46e43f1eef87a4a81cf812f7e576f0c7d8e867fcda6494a81aaf5c45609ae0b4ef4f21f671cfc4d763700ae2eb198c7c8d3d52de95ec0416f9b1e675077de2a1
-AUX wavemon-0.8.0-build.patch 945 BLAKE2B 149355ed7a956d230014e8957efc71bff787d1c6890bd277fc64bfe83c8acdd8cb844d071cdabd0c470465443404b279a600d0dd02b9e8d136ed68d088a58015 SHA512 0c1463974431f51fea24ceb14de785012b89c7d8901d91a50979fdc07d2b11bf7980312b6006ec6f1d2bdaca768d2a947820b5fc6429d361dd6ad957b3798ac2
-AUX wavemon-0.9.1-build.patch 1407 BLAKE2B 55ab2df35083d2ce08c8a0b0a1a48605b0c7d62254cc0622a298cdd6bcbd61b3845f8175bdbb9505ec31032b3649fd4fb49cb2739c4456496f8366ff2df85422 SHA512 5364a9a35d7c4fc7dbf4822d177dfd39bb36405453aae5d5844a1b23291a3e83a7ffc4da9dcd7d7d5ae62ffd906626e47331148e4d1b5770626464b6865465e6
 AUX wavemon-0.9.3-build.patch 1383 BLAKE2B 3c578fa5a08c8659706728b5612e22c991f2e6901e905f17c83743aad806023308c8ac8f73ef1af58a7f14b0382e3cab3a962aee616cf9883eb756d7bc9b6048 SHA512 61fb96ab56921dea52e4b834a29cb0a512a92db5b3c495c127a7d5e0a5a6a5d9d825bb2e474fc0bdf40c515ecb52cc163c0667283dd54d5417a16f52753045ec
 DIST wavemon-0.9.3.tar.gz 220372 BLAKE2B 383e5462e6f3abf86b3604499764060927321018f9dfaef9b742d933e832e568249e41f348788184e125324f81672f2f2b2ff9ca970c215f95a80ec140e0ca11 SHA512 0e4f6db1dfd1915a3c0e1c9708eea501d7180e80df891d0c5a59bb72d48777731c67a256d2d7d6c748ade8e1a3efad9004f5e13971e0b4e16eefdd4f8c6fe1c1
 EBUILD wavemon-0.9.3.ebuild 1132 BLAKE2B 0a44b0b9cf12a5930cadbf908f65d3c4a14e9a5e27aa4b430b404736c33f85ca971f3ed134a1633fb63152a04321e092c5eca8deaa718c103f29e04dfbc2f156 SHA512 20f1a13c34e2f62ff76ecc28f820ceb11dffbb6cc98bd4d83cd01c9ed1966cc1390d908f4465867454ef4d85ba1f032ee28dbc0deecb17c8dedcd77fe1d67ba5
diff --git a/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch b/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
deleted file mode 100644
index e8d0af99587b..000000000000
--- a/net-wireless/wavemon/files/wavemon-0.7.6-ncurses-tinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -21,6 +21,7 @@
- AC_PROG_CC
- AC_PROG_CPP
- AC_PROG_INSTALL
-+PKG_PROG_PKG_CONFIG
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -52,7 +53,7 @@
- 
- # Tests involving libraries
- AC_CHECK_LIB([m], [pow], [],              [AC_MSG_ERROR(math library not found)])
--AC_CHECK_LIB([ncurses], [waddstr], [],    [AC_MSG_ERROR(ncurses library not found)])
-+PKG_CHECK_MODULES([ncurses], [ncurses], [LIBS="$LIBS $ncurses_LIBS"], AC_MSG_ERROR([ncurses is required but was not found]))
- AC_CHECK_LIB([pthread], [pthread_create], [CFLAGS="$CFLAGS -pthread"],
- 					  [AC_MSG_ERROR(pthread library not found)])
- AC_CHECK_LIB([cap], [cap_get_flag])
diff --git a/net-wireless/wavemon/files/wavemon-0.8.0-build.patch b/net-wireless/wavemon/files/wavemon-0.8.0-build.patch
deleted file mode 100644
index 373b27e3e255..000000000000
--- a/net-wireless/wavemon/files/wavemon-0.8.0-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,8 +15,6 @@
- AC_DEFINE_UNQUOTED([BUILD_DATE], ["`/bin/date`"],
- 		   [date wavemon was last configured and built])
- 
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
-diff -uarN a/Makefile.in b/Makefile.in
---- a/Makefile.in	2017-07-14 21:35:18.154423280 +0300
-+++ b/Makefile.in	2017-07-14 21:35:34.613402738 +0300
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
- 
- CC	 ?= @CC@
--CFLAGS	 ?= @CFLAGS@ @LIBNL3_CFLAGS@
-+CFLAGS	 = @CFLAGS@ @LIBNL3_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS  ?= @LDFLAGS@
- DEFS	 ?= @DEFS@
-@@ -25,8 +25,7 @@
- DOCS	= README.md NEWS THANKS AUTHORS COPYING ChangeLog
- 
- %.o: %.c $(HEADERS)
--	@echo ' CC  ' $<
--	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
- 
- all: @PACKAGE_NAME@
- @PACKAGE_NAME@: $(MAIN) $(OBJS)
diff --git a/net-wireless/wavemon/files/wavemon-0.9.1-build.patch b/net-wireless/wavemon/files/wavemon-0.9.1-build.patch
deleted file mode 100644
index 2a63694e10fc..000000000000
--- a/net-wireless/wavemon/files/wavemon-0.9.1-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/configure.ac	2020-05-17 14:27:27.982637232 +0200
-+++ b/configure.ac	2020-05-17 14:29:33.157206097 +0200
-@@ -8,8 +8,6 @@
- AC_CONFIG_AUX_DIR([config])
- AC_CONFIG_FILES([Makefile])
- 
--CFLAGS="-O2 -Wall"
--
- # wavemon is only supported on Linux, warn user about futile compilations
- AC_CANONICAL_HOST
- case "$host_os" in
-@@ -22,12 +20,15 @@
- AC_PROG_CPP
- AC_PROG_INSTALL
- 
-+PKG_PROG_PKG_CONFIG()
-+
- # Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_TIME
- AC_CHECK_HEADERS([ncurses.h fcntl.h netdb.h sys/ioctl.h sys/time.h unistd.h\
- 		  net/if_arp.h netinet/ether.h net/ethernet.h pthread.h],
- 		 [], [AC_MSG_ERROR($ac_header not found)])
-+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",)
- 
- # linux/if.h needs 'struct sockaddr'
- # linux/wireless.h in turn depends on linux/if.h
---- a/Makefile.in	2017-07-14 21:35:18.154423280 +0300
-+++ b/Makefile.in	2017-07-14 21:35:34.613402738 +0300
-@@ -9,7 +9,7 @@
- install-suid-root: exec_perms = 4755
- 
- CC	 ?= @CC@
--CFLAGS	 ?= @CFLAGS@ @LIBNL3_CFLAGS@
-+CFLAGS	 = @CFLAGS@ @LIBNL3_CFLAGS@
- CPPFLAGS ?= @CPPFLAGS@
- LDFLAGS  ?= @LDFLAGS@
- DEFS	 ?= @DEFS@
-@@ -25,8 +25,7 @@
- DOCS	= README.md NEWS THANKS AUTHORS COPYING ChangeLog
- 
- %.o: %.c $(HEADERS)
--	@echo ' CC  ' $<
--	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $<
- 
- all: @PACKAGE_NAME@
- @PACKAGE_NAME@: $(MAIN) $(OBJS)