10 files changed, 369 insertions, 8 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 28bcc6f53a9f..581366243e3c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 3f25e707eb66..932b7bf70411 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,10 +1,13 @@
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch 698 BLAKE2B 41f16a7227518616160aecd016f462f2e636166ddc546aa4fe099e3c6146648b2e0985b97b97eeb3941ebb8666a9ba83803dc773e3d752adc1177c50e7073390 SHA512 144cfa6b1608c59cd49f23871d3fb63fd4b4d08bd0a5fe51ce775218d8d46ef22bd11e2ae3b571d42b7571bbbfe1d5b5e7e49864f1e147242ecddb1c3976b611
+AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch 611 BLAKE2B a89b870f9b7669a6bd8d8efa56f0d88e0d4d738a21c8109645eda31bd7383a02634ed24e613d647999917cba057099cf1f106320d6752964dcb0b846f368edc8 SHA512 0b73595a050d7d59d299eabd36944cd81cbe22beb3d70146c3ec0155c2ec3163c719c09a30b44784e8c311306ee376375e6a29bee4e55748aa4f599b874ffa34
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
 AUX bluez-5.78-musl-1.2.5.patch 8604 BLAKE2B 03d961af3e05de95a7c14aa8bbbb70baebd521a433ff7cbcede2532d2db10792718f4d0df024a39cbb23a53a2a1b1a42b23dac2a9ec1069d6c0292bce34ccd03 SHA512 29fe6de760478943622700217a0648738cd5b42e354fcf6866ada2cbe24de5212ff0489c3f349ca25ea7538f4efbbebeb453f7d789c41e10b982ee968638e1c8
+AUX bluez-5.79-musl-gdbus.patch 695 BLAKE2B c9c3dc790e9bbc5cddd6295aefb7d33f648dac64d1af41612cde440f5f1110c6a5a8a004fe2e3d6bcb82a9b55d528ca0e3186df8ae22c47021fc3c8931859811 SHA512 5dbbae8193987abaf8db982435aeac9ba6f69e5491d5c553985fce13d5b548929c0a363341a45708ea7e6d7dc656d6d9c3f4669ab860ea038df43c29f2b70796
+AUX bluez-disable-test-vcp.patch 704 BLAKE2B f60e0dde73c024b9347c026906642c040bc17c5af7818a9328e1c86151ef47f91e903945199119390d8cd072cda62a85b4ee525a6289226032eb1baf5db94e7a SHA512 e7a07f26d92caaf11a457a8504219973da0aa80f2c97b36af2135aa36f7f4b52978f632c9c5123d66d71b4b65a780710dea802ca0dcaabc5c051f7b7d21763cf
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
-DIST bluez-5.77.tar.xz 2432176 BLAKE2B 9c1a8c78ad11a79080af12333338a6b75189ac51f8c49545de9eede8544fea531a7d8f50676f6e26c84289828fe8327bbc3e5b50ad4d9c08822cf0353a82ecaf SHA512 cf0faba4ddbfe6cc3c2d86cbd809483ed82327cbd7e4970ef53cf19053de7b355a505cab88844aebe7a6aa1947ec7a366250d3cbf48cf309db413d287289ff99
 DIST bluez-5.78.tar.xz 2441672 BLAKE2B 7fe65e926b2a692fcf96bb9c694c42ad8c0bd2d19bf534427128bfbd1eb4d9e3e63f2bdc4659ee8654967a0ac7866a561bc4bd4656d19e0dcb7cc5ce976eb6b2 SHA512 0c591a42742c167ff51e088d898b751f11cb4808ec2f17d9a85bc247a32d4fe18fa17503d188ffad6d9393ad590574518055abe5beeb788aca07d5ba957e4e4d
-EBUILD bluez-5.77.ebuild 8589 BLAKE2B 5fe0431297fd7a7ff8439d8097346917c9af21a59b0b133c8be168e15dd0eb74aed6979b7db2ee7b25aa4cd0734f38428d4cd6a2f76213c2391b5d7eed15d3f3 SHA512 209d2fdac38bbee4b055987b591edae4d5f85ba3835b82914ccecde17a1ffb1f1321f1159acc36b39cf341c3c450b716a388c56744ec750c08e1e818cb17a0a1
+DIST bluez-5.79.tar.xz 2457612 BLAKE2B e908bc000b45832845a09ea7e906d39e107e4934fef4efc9a78b278b7f8ae914ed3a573ef53512de7076a3b1ca8115634fb502cb8d1d0c8516febe05f9e059f8 SHA512 74d47b1eb9b9904798f5c8093674743a14a509d22c33003cf253a1ab0c11a564e6a10a808e087e3fb7f3589d3cba1868ec9bf2923703cdc36a293c95af1d0d76
 EBUILD bluez-5.78.ebuild 8693 BLAKE2B a5173d38c85234b3b3c78c203302b2bd367d732463f85a074cb641ddd1c65aceb6922584cfcac3b6ba0d844d6341fe61129b9b941675c4dbc78b88aba8a591a9 SHA512 b830ea9b58822c14543c3221c2d0c58212c78e34576560b8d3db12d6aa92749c53c509f2bdb579f72defc7c01f3c9d98869d138f1a9e743296daeea4ee0a51df
+EBUILD bluez-5.79.ebuild 8878 BLAKE2B 9e4b64c650c1935b91795ce1bcee41f4f97c5f92346efbe4a5ad1edcb6a1c9778fd6da16263b8f11ccad386e23db2399abc1b27d97b541d483c7aaee09f0a124 SHA512 6a576cb2045eefda39616a9be38c9cb3fc2049dfdf0ee4bd8c9990bd3d63c42691c8f443bf9153e7f1e6e1367a957690df78a7a534cdf17dffaf082ba969d1bd
 MISC metadata.xml 1150 BLAKE2B 830a8e0c89fcc18af92e063ceb3632c97eed9f7424ac5214dd4c853b142d03bba6d629b86fc41ecc28a450a9b7989a21faaae1b95654cb8f16ce2ceb3a97e025 SHA512 44e4489f48634d1b1ff300ccba0f7caa74b76ac7325d38d395ee53763906743f7b622b028a01d32e963952a23da560c16b8cd6771a9001ba90845b59293a6101
diff --git a/net-wireless/bluez/bluez-5.77.ebuild b/net-wireless/bluez/bluez-5.79.ebuild
index 096d50f4d62f..fbcd5d01a0d6 100644
--- a/net-wireless/bluez/bluez-5.77.ebuild
+++ b/net-wireless/bluez/bluez-5.79.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{9..13} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit autotools flag-o-matic linux-info python-single-r1 systemd udev multilib-minimal #readme.gentoo-r1
 
@@ -12,8 +12,8 @@ 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 ~loong ~mips ppc ppc64 ~riscv x86"
-IUSE="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +obex +readline selinux systemd test test-programs +udev"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="btpclient cups doc debug deprecated extra-tools experimental man +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
@@ -33,8 +33,8 @@ TEST_DEPS="${PYTHON_DEPS}
 	')
 "
 BDEPEND="
-	dev-python/docutils
 	virtual/pkgconfig
+	man? ( dev-python/docutils )
 	test? ( ${TEST_DEPS} )
 "
 DEPEND="
@@ -66,6 +66,13 @@ PATCHES=(
 	# https://bugs.gentoo.org/539844
 	# https://github.com/bluez/bluez/issues/268
 	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# https://github.com/bluez/bluez/commit/9d69dba21f1e46b34cdd8ae27fec11d0803907ee
+	"${FILESDIR}"/${P}-musl-gdbus.patch
+
+	# https://bugs.gentoo.org/928365
+	# https://github.com/bluez/bluez/issues/726
+	"${FILESDIR}"/${PN}-disable-test-vcp.patch
 )
 
 pkg_setup() {
@@ -101,7 +108,7 @@ src_prepare() {
 	default
 
 	# https://github.com/bluez/bluez/issues/806
-	eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r3.patch
+	eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
 
 	eautoreconf
 
@@ -137,7 +144,6 @@ multilib_src_configure() {
 		--enable-threads \
 		--enable-library \
 		--enable-tools \
-		--enable-manpages \
 		--enable-monitor \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
@@ -146,6 +152,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable cups) \
 		$(multilib_native_use_enable deprecated) \
 		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable man manpages) \
 		$(multilib_native_use_enable mesh) \
 		$(multilib_native_use_enable mesh external-ell) \
 		$(multilib_native_use_enable midi) \
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
new file mode 100644
index 000000000000..80c9046626e4
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r4.patch
@@ -0,0 +1,20 @@
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -4,15 +4,14 @@
+ if SYSTEMD
+ systemduserunit_DATA += obexd/src/obex.service
+ 
+-dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
+-dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-
+ obexd-add-service-symlink:
+ 	$(LN_S) -f obex.service $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
+ 
+ obexd-remove-service-symlink:
+ 	rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
+ else
++dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
++dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+ obexd-add-service-symlink:
+ obexd-remove-service-symlink:
+ endif
diff --git a/net-wireless/bluez/files/bluez-5.79-musl-gdbus.patch b/net-wireless/bluez/files/bluez-5.79-musl-gdbus.patch
new file mode 100644
index 000000000000..c2b9474f45a0
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.79-musl-gdbus.patch
@@ -0,0 +1,27 @@
+From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= <gudni.m.g@gmail.com>
+Date: Sat, 2 Nov 2024 16:10:18 +0000
+Subject: [PATCH] gdbus: define MAX_INPUT for musl
+
+This is the same solution as was done in src/shared/util.c
+---
+ gdbus/object.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/gdbus/object.c b/gdbus/object.c
+index 84f116bf1..7b0476f1a 100644
+--- a/gdbus/object.c
++++ b/gdbus/object.c
+@@ -20,6 +20,12 @@
+ #include <dbus/dbus.h>
+ 
+ #include "gdbus.h"
++
++/* define MAX_INPUT for musl */
++#ifndef MAX_INPUT
++#define MAX_INPUT _POSIX_MAX_INPUT
++#endif
++
+ #include "src/shared/util.h"
+ 
+ #define info(fmt...)
diff --git a/net-wireless/bluez/files/bluez-disable-test-vcp.patch b/net-wireless/bluez/files/bluez-disable-test-vcp.patch
new file mode 100644
index 000000000000..ffbdbddea17a
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-disable-test-vcp.patch
@@ -0,0 +1,24 @@
+From 1d5a2ec8eb96e9186aeb2826927057ddc7a9d0a6 Mon Sep 17 00:00:00 2001
+From: macmpi <16296055+macmpi@users.noreply.github.com>
+Date: Wed, 17 Jan 2024 09:34:28 +0100
+Subject: [PATCH] disable test_aics_unit_testcases
+
+fails on x86-64
+https://github.com/bluez/bluez/issues/726
+---
+ unit/test-vcp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unit/test-vcp.c b/unit/test-vcp.c
+index 6a61ea2c44..3886177758 100644
+--- a/unit/test-vcp.c
++++ b/unit/test-vcp.c
+@@ -2754,7 +2754,7 @@ int main(int argc, char *argv[])
+ 	tester_init(&argc, &argv);
+ 
+ 	test_vocs_unit_testcases();
+-	test_aics_unit_testcases();
++//	test_aics_unit_testcases(); test fails on x86-64
+ 
+ 	return tester_run();
+ }
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 105bdf7b6481..285446fdda17 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,7 +2,9 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-2.22.tar.xz 1095092 BLAKE2B 69db8bf4d0c5dae0d3b569f7f04f2361b3b3eef0ba5084d5c12684a9d18611611708ac077efe2df2085c7352273d28fe23c7e1145883c513cb4fdfed0f1f835e SHA512 fca6f50b849e6b4fc18a8cf0163e0d532f09b71e593d37f21bdc1b4878bddd7c96b481a3bb45ee6d36f4b1fd2ad76e428f9d1dd1b64ba77545227d3740b1a210
 DIST iwd-3.0.tar.xz 1096812 BLAKE2B a459a1d27a03631897a40c958dcf5ba451d09a1621207beaca20002e4056b0b72eade0b1cfbf26d3365346fbe204720841175f9f1e5370482375314c4a74b851 SHA512 d3c02fb034c471358817dc3f72eb0b96570004e042b704eee619a4ef44881486cfcfe9dfeedd0ff4ac9f70d07a5e68ce5626dc1f7f68fa190887d96f781bd0cd
+DIST iwd-3.1.tar.xz 1097252 BLAKE2B 2529ab4bba1b831f2720349bf2324f4eb2d89ab288a7a7063ed20fcf31d40380fc7ef684eb8eeb1c60d37523a497c539174f9ffb873f416d431090ae9bc6f3e0 SHA512 e0b04cf6d0f21356c959455d79f76ec7fe0101c036e06ca7d31a8318b802f79e04eb7b6c1aba8ba7f85cbcdd25885a765f9c99c1a3229d62d3428c049386ed45
 EBUILD iwd-2.22.ebuild 4126 BLAKE2B c11be9060c2a82bace4e08a6efc480b929528f899be0129c6fcf25e9f6b3af9417093ee9a10462dcc008ac287e0fd9243b2e830eca22ca20a035f626863453d6 SHA512 379569ea25937e57b3b9f8529d85ded177752a33dbde6fce921edea6f7b4f7b528f407f641d98d58b2e54b0df1b54d896a76bd18bbf70823a6b3f1a874e0ffaf
 EBUILD iwd-3.0.ebuild 4132 BLAKE2B 161e800653ec7d026ee242d2ffef2578f02cdce60a3a68bf9a9ddfe655873f91e7ce0d0655bec2c11bf89cc57e12c2b4d35c0270f28956abb8a1c4f6049d9372 SHA512 318c57cb8a4ffbbd4b6f19f49a76446bd4e72b3cc69df422a7e93913d244c4b7436c659457d319e5ae768b3fe04a1fa1dbfebda04cb8e737a9b06310678ba875
+EBUILD iwd-3.1.ebuild 4132 BLAKE2B 3c442108eca9a3741fba0faa7462c040c87adb4bfbb713b1c34d16813165ad5ea14358e8ab36b05380868cf89b58c45c2873a1591988a7a5379e5738d97d6421 SHA512 9fda7c414aff32c28fcea2b1646a35aac66ed67a064ccfe3c5b8ae973848a470a44ca540102a037b33137d2b25de5a09c1b10394ba255af728fd56443fbfd73e
 EBUILD iwd-9999.ebuild 4128 BLAKE2B 87520b1e69bddd0844e79343475a929aa1cac55669949bf60e9602d14bbc8ae4817d6260d2d4a69efcf21face015b1a809d680c1ed5428afc0ed583434159079 SHA512 9ef3d68bc3b0da527364af1aec3dfc0af37965e64f302aa6b830f38c087fe2f73f7cd6ef33f8b6da95ae76ab691dea929b108e4b5c124a188d4af7cb51aaf07a
 MISC metadata.xml 717 BLAKE2B 4619afbff3a4275ff2307476c044c1a4f7c2a14ec4fbeec0db02cd35d8ec98a5d3febcde34dbc43a358129d02369ee6178e02d3938b7cace99946a963d235d99 SHA512 46809c9157af3809f720d38e71e900bb4ee8418f79030cda45e7c4547dca9f2f3b5932c5b481c44ae6bbfd0b48c0997106ada3be30ef5f2110cc287738f24473
diff --git a/net-wireless/iwd/iwd-3.1.ebuild b/net-wireless/iwd/iwd-3.1.ebuild
new file mode 100644
index 000000000000..48f0d7987bd3
--- /dev/null
+++ b/net-wireless/iwd/iwd-3.1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ="0.70"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
+else
+	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	MYRST2MAN="RST2MAN=:"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client cpu_flags_x86_aes cpu_flags_x86_ssse3 +monitor ofono selinux standalone systemd wired"
+
+DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
+
+[[ -z "${ELL_REQ}" ]] || DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/netdev
+	net-wireless/wireless-regdb
+	selinux? ( sec-policy/selinux-networkmanager )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+[[ ${PV} == *9999* ]] && BDEPEND+=" dev-python/docutils"
+
+pkg_setup() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~RFKILL
+		~X509_CERTIFICATE_PARSER
+	"
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
+
+	sed -e "s:Exec=/bin/false:Exec=${EPREFIX}/usr/libexec/iwd:g" -i src/net.connman.iwd.service || die
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		"$(use_enable client)"
+		"$(use_enable monitor)"
+		"$(use_enable ofono)"
+		"$(use_enable wired)"
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake "${MYRST2MAN}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" "${MYRST2MAN}" install
+	keepdir "/var/lib/${PN}"
+
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		cat << EOF > "${iwdconf}"
+[General]
+EnableNetworkConfiguration=true
+
+[Network]
+NameResolvingService=$(usex systemd systemd resolvconf)
+EOF
+		dodir /etc/conf.d
+		echo "rc_provide=\"net\"" > "${ED}"/etc/conf.d/iwd
+	fi
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 28eb1067e942..4d23799259bf 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,5 +5,7 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67
 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550
 DIST unifi-8.5.6.zip 169180361 BLAKE2B 945fb693d41301205647297f257dc7f8fb915421e0b40234d7e424993dfa58e50414d128cadb9792d824ca5e76716315a899331f33d6730957f25125806024ba SHA512 ff5f477be142fc9ea650cff4bf8eed3622bee60fa1513857000831eefd730bff9432aa218b3ae54ee1ac5ee592eb7ced4a4fc00347a353cb8529f2a9a8735e94
+DIST unifi-8.6.9.zip 166991856 BLAKE2B 93581e020b3f240614dfc02c058d732f33a7cd30696a50b7f3f1155b77688d1ade5179ebc6ea8e9870a6b21ce405576334dcba96ea6020b20bfec7441fdfbedb SHA512 61a4ddb5e3214f92cd8645c5c134181d3ee31354af7d7be237cee68138c9d807769d26ef608266d35f0d432c02d40cf59bfbe875839cce3046186e40714df5d1
 EBUILD unifi-8.5.6.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
+EBUILD unifi-8.6.9.ebuild 2666 BLAKE2B 20c2e21008e49fd27c8f7ed0e26ccdf2127a9ec1b1783db350b228bf2df88112531f06d815145f4c5c79117846639f3ff0ed16a059295191992a051e383897bc SHA512 549582cffb9b5d8de9238babf45cdcdbebea04a26bf8b02d7311eb8b9603919c795837c53ff3097858ebc2bdb8122a3ef23ea8b9e6018cdaa4bb179843b1e414
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-8.6.9.ebuild b/net-wireless/unifi/unifi-8.6.9.ebuild
new file mode 100644
index 000000000000..ed01ef5545ac
--- /dev/null
+++ b/net-wireless/unifi/unifi-8.6.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+# RC_SUFFIX="-"
+
+inherit java-pkg-2 readme.gentoo-r1 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"
+S="${WORKDIR}/UniFi"
+
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="-* ~amd64 ~arm64"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:17
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="
+	usr/lib/unifi/lib/native/Linux/aarch64/*.so
+	usr/lib/unifi/lib/native/Linux/x86_64/*.so
+"
+
+src_prepare() {
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	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
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher \
+		unifi \
+		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp \
+			-Djava.library.path= \
+			--add-opens java.base/java.lang=ALL-UNNAMED \
+			--add-opens java.base/java.time=ALL-UNNAMED \
+			--add-opens java.base/sun.security.util=ALL-UNNAMED \
+			--add-opens java.base/java.io=ALL-UNNAMED \
+			--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED' \
+		--jar ace.jar \
+		--pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}