gentoo resync : 16.01.2021

21 files changed, 1342 insertions, 49 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index c02995af7f7b..3971e85e804c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 1e61baff95de..dae68a115fca 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,5 @@
 AUX aircrack-ng-1.6-hwdata.patch 921 BLAKE2B 0cbe038a33745cfb9bf873ea34627281d4a5f30e7f36595ef85490d4a13d281235f7e6cf09af1f0d7fea10fefda4a4ba76bcd8f0175520fb6b314c191dcd998e SHA512 cb2bcb89185555e827f3bc28135ac0fd025f3c9a7e770c779c4feb3737ae6a975c55ce041e31cb4409a9339b730b42d453eb62b5576709a79e42737abe5ffd1b
 DIST aircrack-ng-1.6_p20200722.tar.gz 7602785 BLAKE2B 67426a8f1d683fa374e8aa3dfd78ec860f622127f37080f0b3acba6fd7e05088203a60a9c7fd6265835b7b52697fd7d2660a5efb79c3c72d7098a081dd83ecfe SHA512 dc7c80099bdcd6c68c5e06e4668453c0c594c66d57079ed77c27467e4d2307ca63ea9671966e06feb6b698020b683f6830d401701e4472acbf0edb4f22bb1f75
-EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 2471 BLAKE2B feb9795c568e5e85deae43f3e4c3f75d90e4ee43d9c432abbfcc8bfbdf5062702f7aaf07d9ce7f22cf0937e61a3105d81dc3f101606522a03216c3a3da2d8e5a SHA512 24a09e3d256bed439bee9931dad1193c7cfe5816017f8d0b777e511232158bcddd4b2474b17153efe656ddfa51749b8c0406ffd625b19ed492d0da1b73b18730
-EBUILD aircrack-ng-9999.ebuild 2248 BLAKE2B 08bc959f2f557bdc29e59897a304262de7501ac08e20ed6f2c7942cd29e639e6c06a1f2045b7d24bca27bf93c5a56c5c4463d6c2a045e4e38b16b5859c541716 SHA512 474dfbbce5f8d1db26f26b4c827aad16472ce1b677700e74c70f4ee8766d91317300d646b6e8492c106358aab9ccfc95382c08889f844bdf39b1c981777ec589
+EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 2474 BLAKE2B ab71fe70a5817b57b22fc0a74fea4b0b2f8f6d6c6662ec350a817028c8d66f769f6e77591c02209037cc5b8eb8e99936ef0de7e82c3bce5316ce1318c710d2e5 SHA512 daaf64848114ebea39e5ec2ff370ef373d55bfc639213881c62a28e826ab790dae5c5a362864547b6d9639508cc42e510a9efe7cee5c8001483009d0205567de
+EBUILD aircrack-ng-9999.ebuild 2268 BLAKE2B 01671a7167087aa9975a67148af35936a457c3845e46c492123475fbfe535f45beb77d3811c002cf51ffb0570aa5cd474e1330b21d703f7f16e7072fffe137cd SHA512 78518c67116723c2d6e667986c9f0ef28168bd769096ec27477bee4087a2310c3babf22803a34edab5ae42be5b0d034faff33cb3b426c91fb1b3648ef79272d1
 MISC metadata.xml 1025 BLAKE2B 3ef3b53eb156de9ed98d8a6283b6950e6d2f184d1058139a94222b18d5695da805444d993d50d9fc9736c7035a3a20253679e06e5b64bb1c83f504aa4f0406b6 SHA512 bd9b04fb372175910512baba2320a91e9122dded0070f0498c82ae55716e4b5dc027ba7027086805ab9782283eb43ab0787e41a0a5b8c551e696511ac45bc291
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
index 6e2b86e4ec30..8019d52bc0a4 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 6ca26f493d03..e3aaf11f7fc8 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 DISTUTILS_OPTIONAL=1
 
 inherit toolchain-funcs distutils-r1 flag-o-matic autotools
@@ -27,6 +27,7 @@ IUSE="+airdrop-ng +airgraph-ng +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
 	sys-apps/hwloc:0=
+	dev-libs/libbsd
 	dev-libs/openssl:0=
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 66ee50d9b661..a66a43605635 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,11 +1,18 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b
 AUX 0001-Revert-attrib-Make-use-of-bt_att_resend.patch 4975 BLAKE2B 4e2e8a7bb9f5ef7913fbe69b76261ceeb061a10893c3f20c3eab2a155e18fd3bef58788798503f27afc7c97c46fad2014b91bb2c70c9ba11931ae5eb717fdad2 SHA512 f3d26fcb79d5448d12bb9495c24b99b13821b8672ed6d3568b01126baf4e439bd31bcdb9d295530a876db2f3d5b9369e033e2e9d7cc49771fa8579063074c1f0
+AUX 0001-hog-Fix-read-order-of-attributes-rediffed.patch 14751 BLAKE2B f327a76e9f9b2b1274db48d306746651ad81cfbc605480ee0f1798a505d0a2841f8e518b4503eb5ca6486c21855f1cd3e3a87de0904c02fe8cc527dffa42ccfd SHA512 421f7aa162bf7ad8915440ebddd17188c3d7deb79ccc9b0584c258a149bf9e80ebda6020a46367f15020fc973066795965854a10eba979fc8dd0773bf647a857
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
+AUX 0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch 2648 BLAKE2B aff471dec8eebf58be5127078233e566eabc13d41ad5b641e01a4310b012ec71cf7462c99f440328988daf2e5cbdcb39bbdbde2b257c48ce045cdaa3da65b9d5 SHA512 7f3cdf331cccd726bf3510b1782b849c0cdb34e4ff060d69f593eafe03dd79085ee2d64c5b4fcf059fe01e75cb74ba3556c41ea72577a2d26f5a65a6263aad6a
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.62-fix-disconnecting.patch 2244 BLAKE2B fe2d3b975adda9422ac8bfd41c1cedc70cafd363982e4a415b057498e83feaf989fff7fe78fcbfa9b4fcdb1c1629347bd6380259ef71bf8c5ac78386b7990231 SHA512 2cf7b4929ab2f8f7e68546ba15ab7f74bcb748f741d6d6cc189ead14becd3403d0d6393b0645fccd215da3aee90360db28cd327802cf2ff3212f0487edaa3e95
+AUX bluez-5.63-musl-limits.patch 558 BLAKE2B 2dd66c54aee0bd8bfe3fd530a4e29139d79f6eb153e06e13680df42f2a361274d6a8f0f80989b7962173d693f37d1cac8b16506267a1319e608382511cf4bfe1 SHA512 b752414c8219befb71e0f0a59fa33be5a0d2add2b89a0c8f90de13aef1815307e5f4b8f076d3778778ab3de6656fd50d59f621af50d9ed39695b5f7978660348
+AUX bluez-5.63-use-queue_push_tail.patch 938 BLAKE2B 2fc40087e8b362a331e0df9ba4c364a4f61b282ae8c7e51c6251a5550cc3df7f44b19e57e6ea4d80f536b718c6c5b73a93a385feff7382e9d6f0041827fc8442 SHA512 807a4b340df65b49a6e9ce5a2f7be6d84ec3588d13475f9607706cd8f6f6851ed9752357fd844aab28a18beaf2dd0ededfff05ff64d159613f2395a398de85a1
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
+DIST bluez-5.63.tar.xz 2169168 BLAKE2B 5393bb045a3cf05de164417ce7c98e271742ba752a58aa1ac43a758f2ad8608508e24ff59783d97aa6d5aebdc77e66d9aca94a6c8378cd3fd48fd22ce9d3b89d SHA512 1b8ce7b1bd9611873c27a762a60df580edeefe5424e8733a2067b9afb1a47915f9319849bc1eeee148f5b1f33977b7975e05867e8dbdf73d33cd68e6b99ca75b
 EBUILD bluez-5.62-r2.ebuild 9103 BLAKE2B cf83b34b46fcbaecb4d1a2d2e583b34d67534d18bf7ceeacbee589fda4d2d3bb9be4aa6bde8cbbce3311106c55e14d3eb7136c1c86cf4943dc3b8b8e9d161963 SHA512 750e391d3dc10225288037537624bd53aea605581a3a0124979d846e7e54147b72913e2c182a4e571699c33246473a42f5e56e6af578db38e256248954a9ee66
 EBUILD bluez-5.62-r3.ebuild 9518 BLAKE2B 6094902d7b691ee93c3d45b808cd3af6967f870188cbef2dcf509880a53ae08a343255535876af6162eb4cdda610c8f8672e803cb665d015c4c22a2e5e4937ea SHA512 4e552fde3a2350bf26aceea56f79881d8d7b751d723c70e29618cf6b81a0ffe12fa2aa9ecfeebcdda6fe24a322c0425ab232c715e7081eb8a976dbd983d3b133
+EBUILD bluez-5.63-r1.ebuild 9528 BLAKE2B f34f340268f324dc3de2a96acc32c1407d933e5186a2987072bb7afb412ce3fead50378805dc0b27d9c7cd427ce0fe0131fb5101c219c1af4d62db4a98816691 SHA512 5b2ed09edb772f167266f56cec1850d0bd926b3723be88c7dc97d8d5c093aff540324a45fa04252c5b2fd35938ce12947718dae04635b8bef3dcfc2fd1774f08
+EBUILD bluez-5.63.ebuild 9861 BLAKE2B 3e86ee3508fa787d0fc6deb115f50eafd0cebfde6f0685a0a443c318bf43d137a09d5f1d9f055987c646c55c1181145a81fccfcd20e1dd0ec9d8b2062e4e4aa4 SHA512 3a47f1e70463b54c62cbbdbfb100682926728ab950820c90fb41498758570b548202c81a2349e3321b8148ddb75e6a00850b7333e19229279e5450ae4d144a67
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.63-r1.ebuild b/net-wireless/bluez/bluez-5.63-r1.ebuild
new file mode 100644
index 000000000000..baad2b48deaf
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.63-r1.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~riscv ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
+
+# 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.
+# btpclient needs mesh, bug #790587
+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_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	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/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
+	# https://github.com/bluez/bluez/issues/268
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# https://github.com/bluez/bluez/issues/267
+	"${FILESDIR}"/${PN}-5.63-musl-limits.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# https://github.com/bluez/bluez/issues/220
+	"${FILESDIR}"/0001-hog-Fix-read-order-of-attributes-rediffed.patch
+	"${FILESDIR}"/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.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 ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~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_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC
+		~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS"
+	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 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 systemd; then
+		dosym obex.service /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.63.ebuild b/net-wireless/bluez/bluez-5.63.ebuild
new file mode 100644
index 000000000000..b2c07f35899e
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.63.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~riscv ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
+
+# 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.
+# btpclient needs mesh, bug #790587
+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_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	dev-python/docutils
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	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/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
+	# https://github.com/bluez/bluez/issues/268
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# https://github.com/bluez/bluez/issues/267
+	"${FILESDIR}"/${PN}-5.63-musl-limits.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# This reverts commit ac2c2e10b3adb432a572b618c6f53cabb6b3c80b. It
+	# causes problems with Logitech MX wireless input devices (see
+	# https://github.com/bluez/bluez/issues/220 )
+	#"${FILESDIR}"/0001-Revert-attrib-Make-use-of-bt_att_resend.patch
+	# Instead of reverting, try another fix that seems to work as
+	# reported in upstream bug
+	"${FILESDIR}"/${PN}-5.63-use-queue_push_tail.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 ~CRYPTO_USER_API_HASH ~CRYPTO_USER_API_SKCIPHER ~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_AES ~CRYPTO_CCM ~CRYPTO_AEAD ~CRYPTO_CMAC
+		~CRYPTO_MD5 ~CRYPTO_SHA1 ~KEY_DH_OPERATIONS"
+	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
+
+	# Skip test failing due to fixes for https://github.com/bluez/bluez/issues/220
+	sed -i -e 's:unit_tests += unit/test-hog::' Makefile.am || die
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	if ! 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 systemd; then
+		dosym obex.service /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/0001-hog-Fix-read-order-of-attributes-rediffed.patch b/net-wireless/bluez/files/0001-hog-Fix-read-order-of-attributes-rediffed.patch
new file mode 100644
index 000000000000..cd6dc44b5d3e
--- /dev/null
+++ b/net-wireless/bluez/files/0001-hog-Fix-read-order-of-attributes-rediffed.patch
@@ -0,0 +1,542 @@
+From 7fe38a17f6bee713fde587487fc224b0ae390e8f Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Mon, 10 Jan 2022 17:35:15 -0800
+Subject: [PATCH 1/2] hog: Fix read order of attributes
+
+The Report Map must be read after all other attributes otherwise the
+Kernel driver may start using UHID_SET_REPORT which requires the
+report->id to be known in order to resolve the attribute to send to.
+
+Fixes: https://github.com/bluez/bluez/issues/220
+---
+ profiles/input/hog-lib.c | 191 ++++++++++++++++++++++++---------------
+ 1 file changed, 119 insertions(+), 72 deletions(-)
+
+diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
+index d37caa1f1..beb19af70 100644
+--- a/profiles/input/hog-lib.c
++++ b/profiles/input/hog-lib.c
+@@ -90,6 +90,7 @@ struct bt_hog {
+ 	uint16_t		getrep_id;
+ 	unsigned int		setrep_att;
+ 	uint16_t		setrep_id;
++	unsigned int		report_map_id;
+ 	struct bt_scpp		*scpp;
+ 	struct bt_dis		*dis;
+ 	struct queue		*bas;
+@@ -146,13 +147,34 @@ static bool set_and_store_gatt_req(struct bt_hog *hog,
+ 	return queue_push_head(hog->gatt_op, req);
+ }
+ 
+-static void destroy_gatt_req(struct gatt_request *req)
++static void destroy_gatt_req(void *data)
+ {
+-	queue_remove(req->hog->gatt_op, req);
++	struct gatt_request *req = data;
++
+ 	bt_hog_unref(req->hog);
+ 	free(req);
+ }
+ 
++static void read_report_map(struct bt_hog *hog);
++
++static void remove_gatt_req(struct gatt_request *req, uint8_t status)
++{
++	struct bt_hog *hog = req->hog;
++
++	queue_remove(hog->gatt_op, req);
++
++	if (!status && queue_isempty(hog->gatt_op)) {
++		/* Report Map must be read last since that can result
++		 * in uhid being created and the driver may start to
++		 * use UHID_SET_REPORT which requires the report->id to
++		 * be known what attribute to send to.
++		 */
++		read_report_map(hog);
++	}
++
++	destroy_gatt_req(req);
++}
++
+ static void write_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
+ 					const uint8_t *value, size_t vlen,
+ 					GAttribResultFunc func,
+@@ -178,27 +200,31 @@ static void write_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
+ 	}
+ }
+ 
+-static void read_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
+-				GAttribResultFunc func, gpointer user_data)
++static unsigned int read_char(struct bt_hog *hog, GAttrib *attrib,
++				uint16_t handle, GAttribResultFunc func,
++				gpointer user_data)
+ {
+ 	struct gatt_request *req;
+ 	unsigned int id;
+ 
+ 	req = create_request(hog, user_data);
+ 	if (!req)
+-		return;
++		return 0;
+ 
+ 	id = gatt_read_char(attrib, handle, func, req);
+ 	if (!id) {
+ 		error("hog: Could not read char");
+-		return;
++		return 0;
+ 	}
+ 
+ 	if (!set_and_store_gatt_req(hog, req, id)) {
+ 		error("hog: Failed to queue read char req");
+ 		g_attrib_cancel(attrib, id);
+ 		free(req);
++		return 0;
+ 	}
++
++	return id;
+ }
+ 
+ static void discover_desc(struct bt_hog *hog, GAttrib *attrib,
+@@ -343,16 +369,14 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
+ 	struct report *report = req->user_data;
+ 	struct bt_hog *hog = report->hog;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Write report characteristic descriptor failed: %s",
+ 							att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	if (report->notifyid)
+-		return;
++		goto remove;
+ 
+ 	report->notifyid = g_attrib_register(hog->attrib,
+ 					ATT_OP_HANDLE_NOTIFY,
+@@ -360,6 +384,9 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
+ 					report_value_cb, report, NULL);
+ 
+ 	DBG("Report characteristic descriptor written: notifications enabled");
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void write_ccc(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
+@@ -379,14 +406,15 @@ static void ccc_read_cb(guint8 status, const guint8 *pdu, guint16 len,
+ 	struct gatt_request *req = user_data;
+ 	struct report *report = req->user_data;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Error reading CCC value: %s", att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	write_ccc(report->hog, report->hog->attrib, report->ccc_handle, report);
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static const char *type_to_string(uint8_t type)
+@@ -409,17 +437,15 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
+ 	struct gatt_request *req = user_data;
+ 	struct report *report = req->user_data;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Read Report Reference descriptor failed: %s",
+ 							att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	if (plen != 3) {
+ 		error("Malformed ATT read response");
+-		return;
++		goto remove;
+ 	}
+ 
+ 	report->id = pdu[1];
+@@ -432,6 +458,9 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
+ 	if (report->type == HOG_REPORT_TYPE_INPUT)
+ 		read_char(report->hog, report->hog->attrib, report->ccc_handle,
+ 							ccc_read_cb, report);
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
+@@ -442,12 +471,10 @@ static void discover_external_cb(uint8_t status, GSList *descs, void *user_data)
+ 	struct gatt_request *req = user_data;
+ 	struct bt_hog *hog = req->user_data;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Discover external descriptors failed: %s",
+ 							att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	for ( ; descs; descs = descs->next) {
+@@ -457,6 +484,9 @@ static void discover_external_cb(uint8_t status, GSList *descs, void *user_data)
+ 						external_report_reference_cb,
+ 						hog);
+ 	}
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void discover_external(struct bt_hog *hog, GAttrib *attrib,
+@@ -480,12 +510,10 @@ static void discover_report_cb(uint8_t status, GSList *descs, void *user_data)
+ 	struct report *report = req->user_data;
+ 	struct bt_hog *hog = report->hog;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Discover report descriptors failed: %s",
+ 							att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	for ( ; descs; descs = descs->next) {
+@@ -501,6 +529,9 @@ static void discover_report_cb(uint8_t status, GSList *descs, void *user_data)
+ 			break;
+ 		}
+ 	}
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void discover_report(struct bt_hog *hog, GAttrib *attrib,
+@@ -519,11 +550,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len,
+ 	struct gatt_request *req = user_data;
+ 	struct report *report = req->user_data;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Error reading Report value: %s", att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	if (report->value)
+@@ -531,6 +560,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len,
+ 
+ 	report->value = g_memdup2(pdu, len);
+ 	report->len = len;
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static int report_chrc_cmp(const void *data, const void *user_data)
+@@ -572,12 +604,11 @@ static void external_service_char_cb(uint8_t status, GSList *chars,
+ 	struct report *report;
+ 	GSList *l;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		const char *str = att_ecode2str(status);
++
+ 		DBG("Discover external service characteristic failed: %s", str);
+-		return;
++		goto remove;
+ 	}
+ 
+ 	for (l = chars; l; l = g_slist_next(l)) {
+@@ -595,6 +626,9 @@ static void external_service_char_cb(uint8_t status, GSList *chars,
+ 		end = (next ? next->handle - 1 : primary->range.end);
+ 		discover_report(hog, hog->attrib, start, end, report);
+ 	}
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
+@@ -605,17 +639,15 @@ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
+ 	uint16_t uuid16;
+ 	bt_uuid_t uuid;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Read External Report Reference descriptor failed: %s",
+ 							att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	if (plen != 3) {
+ 		error("Malformed ATT read response");
+-		return;
++		goto remove;
+ 	}
+ 
+ 	uuid16 = get_le16(&pdu[1]);
+@@ -624,11 +656,14 @@ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
+ 
+ 	/* Do not discover if is not a Report */
+ 	if (uuid16 != HOG_REPORT_UUID)
+-		return;
++		goto remove;
+ 
+ 	bt_uuid16_create(&uuid, uuid16);
+ 	discover_char(hog, hog->attrib, 0x0001, 0xffff, &uuid,
+ 					external_service_char_cb, hog);
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static int report_cmp(gconstpointer a, gconstpointer b)
+@@ -687,12 +722,10 @@ static void output_written_cb(guint8 status, const guint8 *pdu,
+ {
+ 	struct gatt_request *req = user_data;
+ 
+-	destroy_gatt_req(req);
+-
+-	if (status != 0) {
++	if (status != 0)
+ 		error("Write output report failed: %s", att_ecode2str(status));
+-		return;
+-	}
++
++	remove_gatt_req(req, status);
+ }
+ 
+ static void forward_report(struct uhid_event *ev, void *user_data)
+@@ -1056,7 +1089,7 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 	uint8_t value[HOG_REPORT_MAP_MAX_SIZE];
+ 	ssize_t vlen;
+ 
+-	destroy_gatt_req(req);
++	remove_gatt_req(req, status);
+ 
+ 	DBG("HoG inspecting report map");
+ 
+@@ -1081,6 +1114,19 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 	}
+ }
+ 
++static void read_report_map(struct bt_hog *hog)
++{
++	uint16_t handle;
++
++	if (!hog->report_map_attr || hog->uhid_created || hog->report_map_id)
++		return;
++
++	handle = gatt_db_attribute_get_handle(hog->report_map_attr);
++
++	hog->report_map_id = read_char(hog, hog->attrib, handle,
++						report_map_read_cb, hog);
++}
++
+ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 							gpointer user_data)
+ {
+@@ -1089,18 +1135,16 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 	uint8_t value[HID_INFO_SIZE];
+ 	ssize_t vlen;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("HID Information read failed: %s",
+ 						att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	vlen = dec_read_resp(pdu, plen, value, sizeof(value));
+ 	if (vlen != 4) {
+ 		error("ATT protocol error");
+-		return;
++		goto remove;
+ 	}
+ 
+ 	hog->bcdhid = get_le16(&value[0]);
+@@ -1109,6 +1153,9 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 
+ 	DBG("bcdHID: 0x%04X bCountryCode: 0x%02X Flags: 0x%02X",
+ 			hog->bcdhid, hog->bcountrycode, hog->flags);
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+@@ -1119,18 +1166,16 @@ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 	uint8_t value;
+ 	ssize_t vlen;
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status != 0) {
+ 		error("Protocol Mode characteristic read failed: %s",
+ 							att_ecode2str(status));
+-		return;
++		goto remove;
+ 	}
+ 
+ 	vlen = dec_read_resp(pdu, plen, &value, sizeof(value));
+ 	if (vlen < 0) {
+ 		error("ATT protocol error");
+-		return;
++		goto remove;
+ 	}
+ 
+ 	if (value == HOG_PROTO_MODE_BOOT) {
+@@ -1142,6 +1187,9 @@ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
+ 						sizeof(nval), NULL, NULL);
+ 	} else if (value == HOG_PROTO_MODE_REPORT)
+ 		DBG("HoG is operating in Report Protocol Mode");
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
+@@ -1155,14 +1203,12 @@ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
+ 	GSList *l;
+ 	uint16_t info_handle = 0, proto_mode_handle = 0;
+ 
+-	destroy_gatt_req(req);
+-
+ 	DBG("HoG inspecting characteristics");
+ 
+ 	if (status != 0) {
+-		const char *str = att_ecode2str(status);
+-		DBG("Discover all characteristics failed: %s", str);
+-		return;
++		DBG("Discover all characteristics failed: %s",
++					att_ecode2str(status));
++		goto remove;
+ 	}
+ 
+ 	bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
+@@ -1211,6 +1257,9 @@ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
+ 
+ 	if (info_handle)
+ 		read_char(hog, hog->attrib, info_handle, info_read_cb, hog);
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void report_free(void *data)
+@@ -1221,10 +1270,12 @@ static void report_free(void *data)
+ 	g_free(report);
+ }
+ 
+-static void cancel_gatt_req(struct gatt_request *req)
++static bool cancel_gatt_req(const void *data, const void *user_data)
+ {
+-	if (g_attrib_cancel(req->hog->attrib, req->id))
+-		destroy_gatt_req(req);
++	struct gatt_request *req = (void *) data;
++	const struct bt_hog *hog = user_data;
++
++	return g_attrib_cancel(hog->attrib, req->id);
+ }
+ 
+ static void hog_free(void *data)
+@@ -1386,13 +1437,9 @@ static void foreach_hog_chrc(struct gatt_db_attribute *attr, void *user_data)
+ 			 * UHID to optimize reconnection.
+ 			 */
+ 			uhid_create(hog, report_map.value, report_map.length);
+-		} else {
+-			read_char(hog, hog->attrib, value_handle,
+-						report_map_read_cb, hog);
+ 		}
+ 
+ 		gatt_db_service_foreach_desc(attr, foreach_hog_external, hog);
+-		return;
+ 	}
+ 
+ 	bt_uuid16_create(&info_uuid, HOG_INFO_UUID);
+@@ -1552,12 +1599,9 @@ static void find_included_cb(uint8_t status, GSList *services, void *user_data)
+ 
+ 	DBG("");
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status) {
+-		const char *str = att_ecode2str(status);
+-		DBG("Find included failed: %s", str);
+-		return;
++		DBG("Find included failed: %s", att_ecode2str(status));
++		goto remove;
+ 	}
+ 
+ 	for (l = services; l; l = l->next) {
+@@ -1566,6 +1610,9 @@ static void find_included_cb(uint8_t status, GSList *services, void *user_data)
+ 		DBG("included: handle %x, uuid %s",
+ 			include->handle, include->uuid);
+ 	}
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ static void hog_attach_scpp(struct bt_hog *hog, struct gatt_primary *primary)
+@@ -1640,17 +1687,14 @@ static void primary_cb(uint8_t status, GSList *services, void *user_data)
+ 
+ 	DBG("");
+ 
+-	destroy_gatt_req(req);
+-
+ 	if (status) {
+-		const char *str = att_ecode2str(status);
+-		DBG("Discover primary failed: %s", str);
+-		return;
++		DBG("Discover primary failed: %s", att_ecode2str(status));
++		goto remove;
+ 	}
+ 
+ 	if (!services) {
+ 		DBG("No primary service found");
+-		return;
++		goto remove;
+ 	}
+ 
+ 	for (l = services; l; l = l->next) {
+@@ -1674,6 +1718,9 @@ static void primary_cb(uint8_t status, GSList *services, void *user_data)
+ 		if (strcmp(primary->uuid, HOG_UUID) == 0)
+ 			hog_attach_hog(hog, primary);
+ 	}
++
++remove:
++	remove_gatt_req(req, status);
+ }
+ 
+ bool bt_hog_attach(struct bt_hog *hog, void *gatt)
+@@ -1790,7 +1837,7 @@ void bt_hog_detach(struct bt_hog *hog)
+ 	if (hog->dis)
+ 		bt_dis_detach(hog->dis);
+ 
+-	queue_foreach(hog->gatt_op, (void *) cancel_gatt_req, NULL);
++	queue_remove_all(hog->gatt_op, cancel_gatt_req, hog, destroy_gatt_req);
+ 	g_attrib_unref(hog->attrib);
+ 	hog->attrib = NULL;
+ 	uhid_destroy(hog);
+-- 
+2.34.1
+
diff --git a/net-wireless/bluez/files/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch b/net-wireless/bluez/files/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch
new file mode 100644
index 000000000000..f39775785f4a
--- /dev/null
+++ b/net-wireless/bluez/files/0002-hog-Add-input-queue-while-uhid-device-has-not-been-c-rediffed.patch
@@ -0,0 +1,90 @@
+From 33d13bbc5703185ab3f15e4429df324987f3f225 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Wed, 12 Jan 2022 14:07:36 -0800
+Subject: [PATCH 2/2] hog: Add input queue while uhid device has not been
+ created
+
+Since report map is only read after all reports it is possible to start
+receiving notifications before uhid has been created, so this adds a
+queue to store the events while the report map is pending and once uhid
+has been created dequeue the events.
+---
+ profiles/input/hog-lib.c | 32 +++++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
+index beb19af70..0b375feb8 100644
+--- a/profiles/input/hog-lib.c
++++ b/profiles/input/hog-lib.c
+@@ -98,6 +98,7 @@ struct bt_hog {
+ 	struct queue		*gatt_op;
+ 	struct gatt_db		*gatt_db;
+ 	struct gatt_db_attribute	*report_map_attr;
++	struct queue		*input;
+ };
+ 
+ struct report_map {
+@@ -355,11 +356,18 @@ static void report_value_cb(const guint8 *pdu, guint16 len, gpointer user_data)
+ 		ev.u.input.size = len;
+ 	}
+ 
+-	err = bt_uhid_send(hog->uhid, &ev);
+-	if (err < 0) {
+-		error("bt_uhid_send: %s (%d)", strerror(-err), -err);
++	/* If uhid had not been created yet queue up the input */
++	if (!hog->uhid_created) {
++		if (!hog->input)
++			hog->input = queue_new();
++
++		queue_push_tail(hog->input, g_memdup(&ev, sizeof(ev)));
+ 		return;
+ 	}
++
++	err = bt_uhid_send(hog->uhid, &ev);
++	if (err < 0)
++		error("bt_uhid_send: %s (%d)", strerror(-err), -err);
+ }
+ 
+ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
+@@ -993,6 +1001,21 @@ static char *item2string(char *str, uint8_t *buf, uint8_t len)
+ 	return str;
+ }
+ 
++static bool input_dequeue(const void *data, const void *match_data)
++{
++	const struct uhid_event *ev = data;
++	const struct bt_hog *hog = match_data;
++	int err;
++
++	err = bt_uhid_send(hog->uhid, ev);
++	if (err < 0) {
++		error("bt_uhid_send: %s (%d)", strerror(-err), -err);
++		return false;
++	}
++
++	return true;
++}
++
+ static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
+ 							ssize_t report_map_len)
+ {
+@@ -1072,6 +1095,8 @@ static void uhid_create(struct bt_hog *hog, uint8_t *report_map,
+ 	hog->uhid_created = true;
+ 
+ 	DBG("HoG created uHID device");
++
++	queue_remove_all(hog->input, input_dequeue, hog, free);
+ }
+ 
+ static void db_report_map_write_value_cb(struct gatt_db_attribute *attr,
+@@ -1284,6 +1309,7 @@ static void hog_free(void *data)
+ 
+ 	bt_hog_detach(hog);
+ 
++	queue_destroy(hog->input, free);
+ 	queue_destroy(hog->bas, (void *) bt_bas_unref);
+ 	g_slist_free_full(hog->instances, hog_free);
+ 
+-- 
+2.34.1
+
diff --git a/net-wireless/bluez/files/bluez-5.63-musl-limits.patch b/net-wireless/bluez/files/bluez-5.63-musl-limits.patch
new file mode 100644
index 000000000000..ebdffc3270b4
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.63-musl-limits.patch
@@ -0,0 +1,24 @@
+From e5dcac6abd6129829c4983d6635916cee8f1a627 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Sun, 12 Sep 2021 09:46:11 -0500
+Subject: [PATCH] include limits.h for PATH_MAX for musl support
+
+---
+ tools/mesh-cfgtest.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/mesh-cfgtest.c b/tools/mesh-cfgtest.c
+index fa0474f..bfc8e1b 100644
+--- a/tools/mesh-cfgtest.c
++++ b/tools/mesh-cfgtest.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ 
+ #include <ell/ell.h>
+ 
+-- 
+2.32.0
+
diff --git a/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
new file mode 100644
index 000000000000..6644e250cc48
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.63-use-queue_push_tail.patch
@@ -0,0 +1,27 @@
+From 7b41f0c38ab34c9a5eec1a70669d183535e86287 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Fri, 17 Dec 2021 14:05:50 +0100
+Subject: [PATCH] DRAFT shared/att: Use queue_push_tail for
+ BT_ATT_OP_READ_BLOB_REQ
+
+As repoorted by Christopher Schramm [1], this is supposed to fix #220.
+
+1: https://github.com/bluez/bluez/issues/220#issuecomment-996669412
+
+Suggested-by: Christopher Schramm <git@cschramm.eu>
+---
+ src/shared/att.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/shared/att.c b/src/shared/att.c
+index 169f726e4..5ce735a07 100644
+--- a/src/shared/att.c
++++ b/src/shared/att.c
+@@ -1653,7 +1653,6 @@ int bt_att_resend(struct bt_att *att, unsigned int id, uint8_t opcode,
+ 
+ 	switch (opcode) {
+ 	/* Only prepend requests that could be a continuation */
+-	case BT_ATT_OP_READ_BLOB_REQ:
+ 	case BT_ATT_OP_PREP_WRITE_REQ:
+ 	case BT_ATT_OP_EXEC_WRITE_REQ:
+ 		result = queue_push_head(att->req_queue, op);
diff --git a/net-wireless/liblms7002m/Manifest b/net-wireless/liblms7002m/Manifest
index 0062964c3e05..91eda8e1d28e 100644
--- a/net-wireless/liblms7002m/Manifest
+++ b/net-wireless/liblms7002m/Manifest
@@ -1,4 +1,4 @@
 DIST liblms7002m-0.0_p20200518.tar.gz 31413 BLAKE2B 8365734a60bba43597a8337d186021d92685dce068049817800176801aacf50f2eea0bc2cec62d406eb33393fd2252b22789a6b5b38b88748a5ae94d28c9243a SHA512 c684dca2652680f25c6ac089f0283899976b7f1075cfa11ff230ac4b2307357c3ef66e601eb8c97de5315738e08ff14a6dbd345d8c50df91e91ded2bb41f8988
-EBUILD liblms7002m-0.0_p20200518.ebuild 902 BLAKE2B 246ccf6d84870fee2a1b49728b82e8fd656f098d3dee9ac867fc472fbfcf1d8713596053a6fbbce29c17d4536390b27b8515558d70a87aaae53dc20bd1bfa60b SHA512 17bb417b2ff70c9862d7d26e9d82453ba4aeb3eff385cbe2289f7a7e2f34b9d2e1d3824ee3dbd52b257895a2658b8fdecd8fa178b06e96e6dcd31cf316f9b6e6
-EBUILD liblms7002m-9999.ebuild 903 BLAKE2B 5e4ad7a1b4761dcb6c2e69e9b92409a211b78acdf6e08328ec46bf4f51bcf4095e5365bb0b0fe8833e1384f3fc2fdbfbd8f6f8a968e485e75ecf82afc4de5782 SHA512 83e430c6cdc2820e8f01dc21f691842039b87215c5eb5fb5c121d0633fa70dba2eb577ecbfcec47d6b36fc12f280d78d1d7ad2aa220af7d4f9eaaa895f612038
-MISC metadata.xml 237 BLAKE2B 700831ccc8cba0795c03607f290511e90435d1e4a91646b3e7546b141aaf8d72cb92a7ae61eb97cc2332a571e0c449e637a0ffc4293becc413d7425aa80b6ec5 SHA512 07ea4128245202ee01451e7c0f16c61c9662e0b98d96a60b802cb222bf9f7a824cb93ff3c85f11648f560a077acf526f12eaff18384b12ed9a4b2e1eb2263ebf
+EBUILD liblms7002m-0.0_p20200518-r1.ebuild 902 BLAKE2B 11537f740bbf86fee0ba2877fd91d2d682fca70c37de8ec62fffc84eed85fd215c24dc4ea306ace5b88d25de7b16322bee6ec6f4953885fae8787c5771f665be SHA512 8e44655c91cd7e1e06032448bd44aa8df43e16345983a37bbbbfef7f32c207da19938ebb6d8769853cb745c1edf2c59e277fe06db6709300e62dd134b00371e6
+EBUILD liblms7002m-9999.ebuild 902 BLAKE2B 11537f740bbf86fee0ba2877fd91d2d682fca70c37de8ec62fffc84eed85fd215c24dc4ea306ace5b88d25de7b16322bee6ec6f4953885fae8787c5771f665be SHA512 8e44655c91cd7e1e06032448bd44aa8df43e16345983a37bbbbfef7f32c207da19938ebb6d8769853cb745c1edf2c59e277fe06db6709300e62dd134b00371e6
+MISC metadata.xml 324 BLAKE2B 191ca475f6aac35d191da09c50b786f619a26b20c098518f119471864382d42f1c05cae96a223f616e7a78508cfecc8c7a30ce434c15e9d6bac5076767847b2f SHA512 ed71758fbe63319830424ce9c91d9bb5d87b8ac2ac078eabfe2504a78b315ec762d014f40729069933a27ef9de9b6dc43cd5ec2df423280a77ffa18a5a312f80
diff --git a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild
index 06521a3518a2..d8e16b9374a8 100644
--- a/net-wireless/liblms7002m/liblms7002m-0.0_p20200518.ebuild
+++ b/net-wireless/liblms7002m/liblms7002m-0.0_p20200518-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-inherit cmake python-single-r1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
 
-DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
-HOMEPAGE="https://www.gnuradio.org/"
-LICENSE="GPL-3"
+DESCRIPTION="Compact LMS7002M library suitable for resource-limited MCUs"
+HOMEPAGE="https://github.com/xtrx-sdr/liblms7002m"
+LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
-if [[ ${PV} =~ "9999" ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xtrx-sdr/liblms7002m.git"
 	inherit git-r3
 else
@@ -21,12 +21,15 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+	')
+"
 
-RDEPEND="${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/cheetah3[${PYTHON_USEDEP}]')"
-DEPEND="${RDEPEND}"
+python_check_deps() {
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]"
+}
 
 src_configure() {
 	mycmakeargs=(
diff --git a/net-wireless/liblms7002m/liblms7002m-9999.ebuild b/net-wireless/liblms7002m/liblms7002m-9999.ebuild
index edd808aede06..d8e16b9374a8 100644
--- a/net-wireless/liblms7002m/liblms7002m-9999.ebuild
+++ b/net-wireless/liblms7002m/liblms7002m-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
 
-inherit cmake python-single-r1
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake python-any-r1
 
 DESCRIPTION="Compact LMS7002M library suitable for resource-limited MCUs"
 HOMEPAGE="https://github.com/xtrx-sdr/liblms7002m"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
-if [[ ${PV} =~ "9999" ]]; then
+if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xtrx-sdr/liblms7002m.git"
 	inherit git-r3
 else
@@ -21,12 +21,15 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+	')
+"
 
-RDEPEND="${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/cheetah3[${PYTHON_USEDEP}]')"
-DEPEND="${RDEPEND}"
+python_check_deps() {
+	has_version "dev-python/cheetah3[${PYTHON_USEDEP}]"
+}
 
 src_configure() {
 	mycmakeargs=(
diff --git a/net-wireless/liblms7002m/metadata.xml b/net-wireless/liblms7002m/metadata.xml
index 0f4d7d8abb50..b0594ad19f80 100644
--- a/net-wireless/liblms7002m/metadata.xml
+++ b/net-wireless/liblms7002m/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-	<email>radio@gentoo.org</email>
-	<name>Radio</name>
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">xtrx-sdr/liblms7002m</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index 3db0d4312910..4ddf8daa2300 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,6 +1,6 @@
 DIST lorcon-0.0_p20200214.tar.gz 506444 BLAKE2B 07faf66dad8acae5cd2c1ff60778a1c6a7116be449740d975dc79e0606c646cf2fd21f3b5752d8fc6d23848347ce3ff9e14e0068a8f929a0b35434af7fef7fda SHA512 794a973ccccdd2f214041373ecb1ac167698e4cdf23b69900ba9e589fd88bdb064105ceb6c23ebd1d499db83ad7f417e1cbc4cd26169f46636cee2eb4764e28a
 DIST lorcon-2020.06.06.tar.gz 506144 BLAKE2B 6fe0d3578b8f91ed9ed0ea12ce110afc6764b694c78c57935b835e4fb8e4c4c81e07f7a8b069583382e91ef760a07bdcf3f9aa51167add052ac1f3f8c0758155 SHA512 1f51dc221d01356b59fd615ebccabb6d00f1999fd9450f6f092f6234635e162f0407e203df9dde4f0f942691cd9395df30377478ec677c910c2d1603228cef30
-EBUILD lorcon-0.0_p20200214.ebuild 1498 BLAKE2B f9cd7d4092aa373d6634e554d93159f074321078178a31daf8c6565e8179633094621dd5c7fb7f8904b3cbd1282b77e547ed5699b1988cf8cb1c9dba2345c0fc SHA512 95ca9f94c6754d8aef1a76865e3eea199e040620665f9ffad3d2e5af2e63bd184468185df71ba8d2e6f2b5b7e8c56a7e6656c1b8a84f136debd90f1c1a390869
-EBUILD lorcon-2020.06.06.ebuild 1407 BLAKE2B d58837af81c5dac8d39e94d6d9edccb93feaaf6d68bac7d08cfb63928573ab6da0640da2547ba262d6faecbb37efa95f7007fc4705dd46316be860fa378a908f SHA512 db48a9153baf1904b7c0aad999f40649c04a852d80aec64ec73902ba21cbb9ac8184de7b95b55655b5702b04d58ec0bc570b8f2759f519a2e9d31076956a17bc
-EBUILD lorcon-9999.ebuild 1502 BLAKE2B ced150448b5b96cc27b5a0e1d21282f23c60238335425178715dcad697f2d0e2fd893afa7bddb5cb01188dec9ee20aa0fa6034452d3979439153a143c94f329c SHA512 d9f3921fdd549348129197fe4f39a05d5490227238023300285ee0f6030a6712a9d4d857df47e936ffb434e490fae8c2cb1670b5b77397d2abec2c76c2873560
+EBUILD lorcon-0.0_p20200214.ebuild 1501 BLAKE2B 12eab519090c19a67aebeacb1b5128a9ab507b6cc4c170c635e954bc35016be5b703dc14a81c7aa401cbd2b6539c6f0aa09e1bf8cf62aed78a24d76fdac31405 SHA512 a3802f89e39a049d8563b20a1e32f8634e9e1124f546cf9680616bbde5e655f747a5fd9714520da33cc4f9f9f900d720005b1804e640559cab755b0819bfc55c
+EBUILD lorcon-2020.06.06.ebuild 1410 BLAKE2B 0beb2db84d1058f35ecda9334f653f1e8de76d6df7e1ba83756d22a1b6a4b90f401107b1bca17b43df7383f391386564e110b5f03a39c0e36de6b980097d9250 SHA512 1113d2d5a775b5e78405f2b6133697789f8f038c313100b0a815e7d699e8301fe33caaafcba9ac90c0696e4aa0387bea06a6d3421cc3663f8d1db86f0610a1d2
+EBUILD lorcon-9999.ebuild 1505 BLAKE2B 61e390f22de1ba40a99fa05e9e1f5d14ca32e8f80625fb3306f91567f5e3babd9459decbab53818a65e17c5e5e1cd6dfd9adaffff140f8297393e8ed9f47728c SHA512 e116bfe848fe949a614892a961af69db47acb334296af4188f7ecd2a000b98deee84ce3e2491eb4728b526d771a4f7f7f9fcbc5aeed94b567e9c2785e7156a42
 MISC metadata.xml 242 BLAKE2B 759698f297aa1433159cc8d44fc0f8e77e3b9d1e812a023acbd581f105ed1e9d69eb5117e3da5961fb59e9120af6e584b92b0ae554518a6c4cfc171ae16ad48e SHA512 f80486dfc128933ad7de3d0105385fad5cc3566b4f901c3faa58168fcfef2d2827c9599e5b4d1fd164ee61609a9ec20730c8e11fa1ae010ee5862e6e5510e5dc
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
index db239c00f95b..1446bc1840cd 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9})
+PYTHON_COMPAT=( python3_{7,8,9,10})
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1
diff --git a/net-wireless/lorcon/lorcon-2020.06.06.ebuild b/net-wireless/lorcon/lorcon-2020.06.06.ebuild
index 20a4da501628..c9b4f070b6aa 100644
--- a/net-wireless/lorcon/lorcon-2020.06.06.ebuild
+++ b/net-wireless/lorcon/lorcon-2020.06.06.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9})
+PYTHON_COMPAT=( python3_{7,8,9,10})
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index 4a69d22d8690..80f35a3d8ffd 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9})
+PYTHON_COMPAT=( python3_{7,8,9,10})
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index afa89a2a4a0b..e626d910ef6b 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,4 +3,4 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 EBUILD unifi-6.5.55.ebuild 2224 BLAKE2B 30612188b7ed5e51f00ef64bed1679d20db432e929f753374d5b71fd39e6f950a4d4a2f8299d353eb54fac00a49a5baaa91c9a89d47926a86ed48c4f039707d3 SHA512 1b43d2cf6a80ee306f8388d38d160aaa979ed43009cbb8e57e983a73122d9c277cafe9efb67e5937676e95eb808facad1de89f2f66748d1b9eb491c75e320a6d
-MISC metadata.xml 684 BLAKE2B 3c8638e2b38691bc33fd9c9cb8a79bb9b7421ec5f6d01cb6411f8cfdf8451b37855662c6e9e0dd519eda4a08b0c8e7543c2f358bf78a9dc41d52ba0cf7664600 SHA512 2f5bc4a8d9ecc37c85c6685aa1f201678a0f1236d65d8f1c72137a4ffb03ed82ed0d44c6c7231405467f77b5dbcfb375477c8cb0c0a6d8924bac822391fc2f3c
+MISC metadata.xml 579 BLAKE2B 4c18ad9f1d440c5d2fcb1460666ba738b04108d14f30d47b046213412ad324e6d942971959b98f8eaad08485fef2e441d89cc5b77e3a6696f8f339e7822b9f1b SHA512 6a562914d527a80b5737b1e121f21a71b086612b876274b38bbf6ceeb2aee94983327c84c23ffaf7a738cce0cd20f16581c0b99f5448105269302a1ebc3b8c3c
diff --git a/net-wireless/unifi/metadata.xml b/net-wireless/unifi/metadata.xml
index e8af626aaf48..d81a3fef9a30 100644
--- a/net-wireless/unifi/metadata.xml
+++ b/net-wireless/unifi/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bkohler@gentoo.org</email>
-		<name>Ben Kohler</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>