gentoo resync : 12.03.2021

18 files changed, 471 insertions, 72 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 527823df09b0..7783f98e5e99 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 08a0f9f4668b..9991aa9678eb 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -6,5 +6,7 @@ AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a591
 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.ebuild 9656 BLAKE2B a92958e82b380201e90e694aa62d8c0988250411d9e6a62e13baf6ac105afc20074d0fef619e528b24f3b6383deb375da0152faee16d25c7ae25cc617d51e58e SHA512 212bb331d14bdd1f080a34221132267e3c5adfa17d51692d6fe8172dc6c2b9215c62ef114e1ad0e78eb276add76cba37b7e650e7b385a14572a32aba30cc2ba0
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.56.ebuild b/net-wireless/bluez/bluez-5.56.ebuild
new file mode 100644
index 000000000000..0607b615fd76
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.56.ebuild
@@ -0,0 +1,299 @@
+# 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
+)
+
+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
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	eautoreconf
+
+	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-r4 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
+
+	# From Fedora:
+	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
+	# as found on some Atom based x86 hardware
+	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
+	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
+	exeinto /usr/libexec/bluetooth
+	doexe "${FILESDIR}/btattach-bcm-service.sh"
+}
+
+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/broadcom-sta/Manifest b/net-wireless/broadcom-sta/Manifest
index b209d8f8250d..ffda12708403 100644
--- a/net-wireless/broadcom-sta/Manifest
+++ b/net-wireless/broadcom-sta/Manifest
@@ -14,5 +14,5 @@ AUX broadcom-sta-6.30.223.271-r5-linux-5.6.patch 3056 BLAKE2B 3842420d177c7faf6a
 DIST README-broadcom-sta-6.30.223.271.txt 17216 BLAKE2B af6db6e129911d1589d7d6cb7166bee32ce1ca98a4e5c9b3515a44e48681d8a7a7a6b697419b2bcd9c46f0f4ca1f7ece632b63531b4a4ecd91df4f9dddf043c9 SHA512 672ecc5afcd8535a9f8beb4baea5a40c584b7682844e9ff0e4f66b7406b42118a99dce1fcd580118187fdc506781334b8243082def2b78dce916d90c55ab3663
 DIST hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz 2869247 BLAKE2B 2e3189c468cec50b1a980452a4b2bd0f9657d9adf6fae2a95a8b1c2d1df2f5f6beb4cb903f72f444eddf823fe4375299864cd62191c9d59c4f77598b5d3aa246 SHA512 0361ba30d97bcb1dedf46c11ef1b9a16f09cde3faa6be87b3ccc28679f34183c2fdf511e7c3b5c26b304f6961da454ccf71844b92bbb2f25aa876249496a2f1b
 DIST hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz 2928541 BLAKE2B e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a SHA512 6855781f7c69a9aecb9461932423688964879d5a4df571f01ae7adaa7bf21a410bef839605d555afb6c8f4eec92fe8510af6cb120930095617ff6cdcccedaf17
-EBUILD broadcom-sta-6.30.223.271-r6.ebuild 3817 BLAKE2B 4817e0b2188686ba4af9982cfa269898348f25a2d18f1f8547f929fb94f52ae60b95a9fb3e3316500bdf8a5f5556c3ae818b4e5c3a15e87e56292cdfc1150014 SHA512 936c80d538fa007c564a268d2db37cd982c287e5c7be6b31ce4895e38d4cfb5b573750d1b0f0f93a6ebceda19991ff983aef17f5c503d9d8e4be4dfbee93a9e5
+EBUILD broadcom-sta-6.30.223.271-r6.ebuild 3786 BLAKE2B 7627c32318bdabab52afc7fc0f8f95b1b51987472e174a3a946a47c8f7b2163d6652ab9db37d3081daaced6c7788e0e0bacd1c4ef369407a988bfc7b762f5eef SHA512 e42332ca7445a32cc93553a3c50c172e234fbea03813c84589ff35ad8a202d873781b7d656c5370ea8fefa1a758d775030d4d6f1721a0ceaf07c7fd9406c410a
 MISC metadata.xml 249 BLAKE2B 4a3b51bf90b3ec35dd72dca3b3c73fb89d3e3d08c0989cd7939205ae9d655200886882c2de26146caac3f42ff06ab4a898b85325bd80e69f39491bf4c34ae89e SHA512 4211cb5a85b6a437c0d1727891123af70f296e685c9d59ead2032abbe19d3828fb83d59e559056455ad8b9aadd6136141ab7f9edaff2d55ce2d86b1d698722ce
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
index b84669a99696..a75c785b2671 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils linux-info linux-mod
+
+inherit linux-info linux-mod
 
 DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
 HOMEPAGE="https://www.broadcom.com/support/802.11"
@@ -10,6 +11,7 @@ SRC_BASE="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35
 SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
 	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
 	https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+S="${WORKDIR}"
 
 LICENSE="Broadcom"
 KEYWORDS="-* ~amd64 ~x86"
@@ -17,9 +19,22 @@ KEYWORDS="-* ~amd64 ~x86"
 RESTRICT="mirror"
 
 DEPEND="virtual/linux-sources"
-RDEPEND=""
 
-S="${WORKDIR}"
+PATCHES=(
+	"${FILESDIR}/${PN}-6.30.223.141-makefile.patch"
+	"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch"
+	"${FILESDIR}/${PN}-6.30.223.141-gcc.patch"
+	"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
+	"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch"
+)
 
 MODULE_NAMES="wl(net/wireless)"
 MODULESD_WL_ALIASES=("wlan0 wl")
@@ -71,22 +86,6 @@ pkg_setup() {
 	BUILD_TARGETS="wl.ko"
 }
 
-PATCHES=(
-		"${FILESDIR}/${PN}-6.30.223.141-makefile.patch"
-		"${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch"
-		"${FILESDIR}/${PN}-6.30.223.141-gcc.patch"
-		"${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r2-linux-4.3-v2.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.7.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.8.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.11.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.12.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r4-linux-4.15.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.1.patch"
-		"${FILESDIR}/${PN}-6.30.223.271-r5-linux-5.6.patch"
-)
-
 src_install() {
 	linux-mod_src_install
 
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index d6bdcc1d1887..4cb6cc946c6f 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -2,5 +2,5 @@ AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f
 DIST gnome-bluetooth-3.34.1.tar.xz 354568 BLAKE2B 53e0f4d172e12ba1fec8dae476929fadaab2fd0a8e8ac063debbe516f925a3bb04c9000012fc2e143baf00c7bbdd4f2bd31bd64e674c1851e4ec544ab9c058a5 SHA512 3e0080bbeeddc144fdcf6b4f0d59b0885fd5881aee670d2e5dffd4ede9b0f988358ad0e815ba86add8b7fd5e93e1f8fc7bfacd10b8d69606aa569fd67356be08
 DIST gnome-bluetooth-3.34.3.tar.xz 353032 BLAKE2B fbf75328780d54307ebf6f8d9d58080060d05b3d76665e3c09f3d2bbc033dbda87a7d4eb43d8fe751955f8240febc13d0446cab1bac085c4a73e9c4e9ff25033 SHA512 a20985576fbc0594a198c8f58e6098db24c73454a9dfc0f5f47581a1bfc0a72e3f0d2592f4a01593c5ed132e4924d934d4d65fd501d274f3b032e1e548794272
 EBUILD gnome-bluetooth-3.34.1.ebuild 1416 BLAKE2B 41cdc757dd5c02b43f6966adc9bb5d783f9991463a86be613df87db1ab15d3c958ab5a2984cccc3b6b41d9e81bb11daf31fc27455fb22e6fe523ad0e3e4f70f7 SHA512 60951a8e75b57c2efb3afee9b99495431f8b8f4468a46d0a5fb54049e528007058735fae3914a7875731c86901a40197ec9d57af6fb8d5308c0fad2de578c301
-EBUILD gnome-bluetooth-3.34.3.ebuild 1392 BLAKE2B 6f26781267bc3a587d3fab4810cf197390efe0c94062d74d429e2bfd0f895a5e50c4fc3ef03ccfe4a38c2bd8f8e786afd1e08f369b8ab88bbbbff88d80506dbb SHA512 a174a97cc49657d58c39963db5bd8ff5bbf88dbebfa321a4509233e3f3b031fb9195d47d4714c14fcdcd2455e50596a0b2957ee7c3b38f3807869fad090f4148
+EBUILD gnome-bluetooth-3.34.3.ebuild 1391 BLAKE2B eeb8b0ab3c80b669b6cad439f01e12048ac8186f72a3088e986f2548f8136f3d67e4278960d387bc524836bc30d0830089a8f65844f7180fdc831d081646818f SHA512 cfa4c0d416a55232cdeb36f131e7eef071acadf1865704ec32aac9182456a4898d17ce18c380705e421ff47318b9b4da4202fda6fba919ae9278388d3d0a1ea3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
index 29311e2afa0f..7c54fde9613e 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.3.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="2/13" # subslot = libgnome-bluetooth soname version
 IUSE="gtk-doc +introspection"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 87332bdf37ea..d148bad8b0a5 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -2,5 +2,5 @@ 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
 EBUILD kismet-2020.12.3.ebuild 5097 BLAKE2B 7a5a3939be0bc5e004500324f3804eac1742939cb212e6a6f1deb6aa70590139e2b0f7431cb8ba12c749b31c5e26ff687fed4d7e48be720f97cae868f481de1b SHA512 37295c7b656f9de82beeed6a6378181c3349cfdb56d05f88d1b04bc6bb5c8c63b378b406f5e014bed5b58d9a0493913f03560d2e258785337e8b97336fc85a6d
-EBUILD kismet-9999.ebuild 5355 BLAKE2B b483c152788f21ca19bdf2a41ef189143ad3755aa3b17da05d2ccea72a37cc053d6d07a39a9ed9abe652697f7de97cefe6f3188ce1140be7543684fb40e01946 SHA512 2c6939da6128cfd6d94d212f10b14ef1a61318ca09eddc9d9530b7c890c095fa91a7915c15e39dd26e9a8e61a765145f2b451e8e842ef033bebb896f4ed2d87d
+EBUILD kismet-9999.ebuild 5846 BLAKE2B dc9e2ad2a872de120206c462f76c6c257d4c1313fec5c15778a442d5a18574bfe8dc006c969b4dbb3db920a8415902b1611750963229fe82df4674036df7c41f SHA512 7d48795d419b03bdeaac641871103d6ed0973b87262e6c1eab66b5fea4ee68faf72d1dafa8b39d8c1305d61219b46a858474d2d6f2d2411594cd5ffbeb052316
 MISC metadata.xml 786 BLAKE2B 86f38600535248d3b03f57ea796b57d7cc5ea04c2e35095702b586574740105efdd3710ab05e15c2faef640c7a5ddeb835cd4055e3426591129ab5802a2708b2 SHA512 a6ff91e31ed15b2e6fb381210b654c1a1195699c466d36af838c9ec4d560d632a194ff7597f167cd8281ad9908d75eb39aef5a73d7dc59fdf2020aaf5359a0f8
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 56c0fe0667c0..b3b3a3de29a8 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -66,6 +66,8 @@ CDEPEND="
 	"
 
 DEPEND="${CDEPEND}
+	dev-libs/boost
+	dev-libs/libfmt
 	virtual/pkgconfig
 "
 
@@ -92,6 +94,18 @@ src_prepare() {
 
 	#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
diff --git a/net-wireless/neard/Manifest b/net-wireless/neard/Manifest
index 3280f0d0990a..f7260938cdfc 100644
--- a/net-wireless/neard/Manifest
+++ b/net-wireless/neard/Manifest
@@ -1,5 +1,5 @@
 AUX neard.confd 274 BLAKE2B f61cc6b061a146899aabd430e3e5c082da57a8e413600a748ae23959dd4ff5668d39b17222c7c22f0cf6f990e289e8dd21287142e9d4bf21e7bdd4d15beb05ec SHA512 d696911f7e5f33f6b2a0f6508c73676998a3bfaebbda02386dc08d9149d525bf211bfcf9836276d070f31288ef84540ef1bce3d68119d4439089297c079392ef
 AUX neard.rc 417 BLAKE2B cdbd53502cebf7ac732830d5266fca64e7bfb8ec06caf660e026ec8bd9413375495e630b27e0e0b97997aab5313c5a215059c1624fd350e8b25e59bd5563c578 SHA512 68459f7dfc9bdcc6b450770d76c0ffa4b0adb248476c801317f8a8cc7c2dc9e41dea4fcf9425b9d667821037d923fb8368acb72540cc63478dd45e21ba9215d5
-DIST neard-0.15.tar.xz 368196 BLAKE2B e23d144229ad7550927b45af715050d158ceb1ee163ef49f1d0269d92bfbd5afcd63c1b698b7f55b471caf2cc1a351a78fef4dd6d7748e26422ae43dbd8b3899 SHA512 daaa001a305f0d200bb03bf614c938256fa5c07d480bf820d5e83da80d930e060b5bb6a09234f1c3f7ecbd3cb0af378a1de675dd4dcd99b728677430e0cd111d
-EBUILD neard-0.15-r1.ebuild 839 BLAKE2B d3d0df32d5686a869fee824ee07af4fbef389597008cc5fe6ce074ca7c757c80bf5c5899198845e50fd41871dd1bcb436a07b1665545dc48ce56d2cf8caa7a9e SHA512 263173b906ed0734f089c23c3fe3d5d446a1582daf7e05106c5e602e9130cbdd7ada55e0d3a42bc16e953a18f31bd1345e12eba4604fbc7afdfa0dac20469eb0
-MISC metadata.xml 247 BLAKE2B 3af5a6a98b5737f4b55191850c41fad5c3ea1aabb85140efa70c728008d84b855803f2b0648e5c4d8f7494ccf407eee85a7a095971796c12b2d98833cd4855e8 SHA512 863541182875c927594f5ff837151d030db4786803ddc8f59fa5564687692b9985df1f15e8494ff947d555c541bc3a877edf1c2407a38f037a65a2076ac2eddd
+DIST neard-0.16.tar.xz 379436 BLAKE2B 8432200eafa2d7517d768ef160e2d2f8db698119ea047d505d7212b1c2d46087223b71749a4c855bf7e7ff43f73d4aa6d67fab272909dbb3236b312ee3b911be SHA512 d0fd5dcfd19db64e65e4149c76979bc7a438240aa6840b35059fde41a8a84a2424274577de964a925e76cd013d21796f69f5361012b6ac79c546d0abdcfed2a6
+EBUILD neard-0.16.ebuild 1037 BLAKE2B b2300e0b6c1f44ddb212c2a7f1717a695de4af053ee24668c2e343fa9ca5789028caacb89356417910836f4203a610be18f3f886fa2a1440b5a43b52a5b8450f SHA512 9dc87058f01364b7b236f9691c56151207f001effcc7efe0cc0e15a8a90d3d29dd24dba222521e69c2b5a4b917dd498f3879450ebede7135fa90eca52528101d
+MISC metadata.xml 264 BLAKE2B e0a334cbf423516e5797fc80d89e221b6ae768e987374c14211903eb404ac2dfe8bd7854eb4d56181cf63b82e72cf3a862fed8a2cd0e26b30a164c5b70e2efb2 SHA512 30462002733c5b204781aaec52b38d78edbb567f02916f5c1d2e417d9d4758b8e69b174b2c73bf145d458b6a6ca529bc3d38955f479be69557ed57ebe0b913d3
diff --git a/net-wireless/neard/metadata.xml b/net-wireless/neard/metadata.xml
index 896eadb2b4df..2d25d4a14ba4 100644
--- a/net-wireless/neard/metadata.xml
+++ b/net-wireless/neard/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
- <flag name="tools">build and install extra helper utilities</flag>
-</use>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build and install 'nfctool' for further NFC debugging</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-wireless/neard/neard-0.15-r1.ebuild b/net-wireless/neard/neard-0.15-r1.ebuild
deleted file mode 100644
index 1316fa9d39c2..000000000000
--- a/net-wireless/neard/neard-0.15-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Near Field Communication (NFC) management daemon"
-HOMEPAGE="https://01.org/linux-nfc/"
-SRC_URI="https://www.kernel.org/pub/linux/network/nfc/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="tools systemd"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	dev-libs/libnl
-	systemd? ( sys-apps/systemd:0 )
-	>=sys-apps/dbus-1.2.24"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable systemd) $(use_enable tools)
-}
-
-src_install() {
-	default
-
-	# Patch for this has been sent upstream.  Do it manually
-	# to avoid having to rebuild autotools. #580876
-	mv "${ED}"/usr/include/version.h "${ED}"/usr/include/near/ || die
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-wireless/neard/neard-0.16.ebuild b/net-wireless/neard/neard-0.16.ebuild
new file mode 100644
index 000000000000..7ec240979082
--- /dev/null
+++ b/net-wireless/neard/neard-0.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Near Field Communication (NFC) management daemon"
+HOMEPAGE="https://01.org/linux-nfc/"
+SRC_URI="https://www.kernel.org/pub/linux/network/nfc/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="tools systemd"
+
+RDEPEND="
+	 dev-libs/libnl:3=
+	 sys-apps/dbus
+	 sys-libs/glibc
+	 systemd? ( sys-apps/systemd:0 )
+"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	 # Workaround for >= GCC-10
+	 append-cflags -fcommon
+
+	 local myeconfargs=(
+		  --disable-optimization
+		  --enable-ese
+		  --enable-pie
+		  $(use_enable systemd)
+		  $(use_enable tools)
+	 )
+	 econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	 default
+
+	 # Patch for this has been sent upstream.  Do it manually
+	 # to avoid having to rebuild autotools. #580876
+	 mv "${ED}"/usr/include/version.h "${ED}"/usr/include/near/ || die
+
+	 newinitd "${FILESDIR}"/neard.rc neard
+	 newconfd "${FILESDIR}"/neard.confd neard
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 1f8b08219c7d..f98dd275ca49 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,8 +3,10 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-6.0.45.zip 147691229 BLAKE2B ad8e34e4934449151b0244bb32e2ce81e2506f228c995e72c2756279ce22f1ce06d44c37f1cfd6156cee0d03066e36d99f98b56d2a1c759ee98ada6569b8309e SHA512 6b2aebf33b6e2114a2b274ce332e2bd88a30406e3a21bc66dc0eddee3ee27ee2e4d3948dea73ff85289cbc2ed0e4f2b646e095091c54120f718b5fb2f0b35943
 DIST unifi-6.1.61.zip 152081465 BLAKE2B 821af3772db56eb4ae850302c86b91015a64cf61b00f3086b2b438579d229c0d5167beb9bda90bf6e26819dd1b334ec80c17b81c2bced16ea0730ffbcc711824 SHA512 a7d9beb789796cebc7a553fcb654c659880c76dc58803044388d6d789b8b4bc193e7a6a3da1bda981e0ea049a8015a70e04ebb2e69371c70f7abb457bebaa54f
-DIST unifi-6.1.64.zip 152150220 BLAKE2B bcae2baf9e544bf3ed19e7d71676f46860b592f8e9c0d74507f5c5fb41cb399a5ae47198d06495d1994e7ab94d87c20a7f717511887a69af61d4f930c4980cef SHA512 5a247386667067a3d79983a95f436e84e50db6c60eac13d5214342527507a7c2c427491afedc951c4ea06bbc2eaf417cab4585c2f2959cbaf5d556a5c4a0b16d
+DIST unifi-6.1.67.zip 152163973 BLAKE2B 15f25b525f0b1bec4041d69817fcb7ab346e0b90e2c7ffebf390c45fcd7763be8f95b89f4884ce97fe1ffa024c6e8a34b5b731b4cc79f137d3bcfaed8af3fc1a SHA512 339efa414e2c2189b51fe8e8e868533117a6acb513758babb98f9b90b163a6df7034147ac56bee1e872dbff74fe2813183e02e0a13796f43e621b2c1cdef1a1a
+DIST unifi-6.1.69.zip 152157626 BLAKE2B 5c94680cbe82e48c09e9b131c2faa5a1dec71553796f38dc33c8ed3e055c9652b6311dd5675affb46b3159392653dde1fe08cf15366f52fdf6a216788f16042a SHA512 a887c18abe07f2ad6b1e472b30935acbf171f52295390c1860bc9ee5eb9e6882a2a1364a30e1e019404c0242a1f63aa1d4031ff60a4a8cf2a4c921ac4565defc
 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.64.ebuild 1566 BLAKE2B 8ed4f64580fc5108bab19732c4f513880b37fc82340d10f60e84eec5e65356720d68c475fa24e7aebe0daf700994749b08764e3b5b9dd513ca268fc06de6f43a SHA512 21e72bce633000213e05c7a2673206e59bb91fa333f093d58bf766c0c7fb389f08202c5250050df96c265a21ad59edd855aa77a52123d4400d47148a5e8e3268
+EBUILD unifi-6.1.67.ebuild 1566 BLAKE2B a39869c0c6736619f5b2c1a041cff46bed4c6cf07371337f601b2f2fa509d7ec0f85b6ac906cdd50eedc430102eb688612844068a94c9b3dc6b9c7e12201162f SHA512 76702bd4146637385d0a0da32671ecd3f45ca31bcaf77382f351d282b60b997eb6ac74e93db5f4a2cae58d3418c5660e8f7c899b51f6f4a41798edd35188cc9e
+EBUILD unifi-6.1.69.ebuild 1566 BLAKE2B 16148233b935bc1c34599b71009dc8c2f0cd168f8775efcc58b9f464d650b98abfb06574fa748020167f78cfeaf57d0b87b8a898e4a5e1870735a738486c1203 SHA512 7517e618f1bb537f58536bdf19baa340983f4957aed0c0c9c6d124922767e636194725f7c6522ece00473aab0dced22f3c6fea4ec87e1efc980c396c8672a082
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.1.64.ebuild b/net-wireless/unifi/unifi-6.1.67.ebuild
index f26be73f38c5..0395c3814f86 100644
--- a/net-wireless/unifi/unifi-6.1.64.ebuild
+++ b/net-wireless/unifi/unifi-6.1.67.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-b895661d78"
+RC_SUFFIX="-72b68abfe3"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.1.69.ebuild b/net-wireless/unifi/unifi-6.1.69.ebuild
new file mode 100644
index 000000000000..93cbbb9e9672
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.1.69.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="-70ab3ef777"
+
+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/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index df0bae35dbce..1088ca0eb664 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,4 +1,4 @@
 AUX wireless-tools-29-asneeded.patch 478 BLAKE2B 0006e74821cc068918450ed6598ec8dbb00bba9b5b232c866f54569609001f245e004cf377be9fb355850f8d9df2ba5f7fc47b33b8aeeb45fa9e4315a69a51fc SHA512 1b1d7e0f833fd0f6587f7d175d7d8597c637782bf37b4800e5d8e3c736a0755c0073b8f9876ea75b95be3735116f051ca40dc617818d5b7f8de61a54d66dc48d
 DIST wireless_tools.30.pre9.tar.gz 348477 BLAKE2B 7ff1f14b464aac6204e86c3f1dcd0f8acc4ea89d11feaf4700e75518dc990945a18a931a9dad76f12dd796c983aaf9b766fd57e9cdcfac57f71dcc3bbe332aa7 SHA512 0561923bca075af4754d21e1be303cbd1ce3558cb6481c9c12bc7d330a353acf8ad81a822488570e859480287999c3bb2a698c993556a92f0699743e0a527ff1
-EBUILD wireless-tools-30_pre9-r1.ebuild 1776 BLAKE2B 05271ab15e9fc49a63454a9099477ee4532bd31e276bf42ab72ed25f0c8049f9903f6d55c350bccae5bd4323b0616d6be5a01f0b27418c79ae441e153cd95796 SHA512 d1a44e968ca19424d81e0c8d7f8188b61227ea6929db3e45eacb8ca4faaea2c125f3179e2d16005319e6ebdd3a101ab2659c820765a25f6030a2363d6c856406
+EBUILD wireless-tools-30_pre9-r1.ebuild 1775 BLAKE2B 0cc2e5ba3d7f4fbe10deb09b507062350832b39093842c1912a94204ad1baa1c8cefc1d51e5139f6ef285d39208c29f165dfb9869d814e1edbbc50f0bb97c16f SHA512 77abea2fd23252c3487991657a24dc786678eaf6b18dbfbc50b9c0084a922321161980361041f696532c7ff1e94adedff1f985d6122fe6943970579d52f0e635
 MISC metadata.xml 696 BLAKE2B 2c86a6b20efe956414c0715a4ee1155554bd0c7a95bd5e7707890dbecc54e174929a54d009ba18ebda191ff36d0ed88b477cba50076566ea77ed5cac704bf576 SHA512 1884e22d6147a86977b30f4e95751498ce92306fd807a7f4a1187181ffa7b76f896eca921af26fa0ecab74fedccded36a1c103135d0282ca47263b3a637f777c
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
index b43c43b91367..a0cfe2670adb 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre9-r1.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"
@@ -15,7 +15,7 @@ SRC_URI="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="multicall"
 
 DEPEND="sys-apps/sed"