7 files changed, 113 insertions, 37 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 4796e0282070..e70bfce8341e 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 1a901baac4c8..5a0ad8f4588c 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -10,6 +10,6 @@ EBUILD iwd-2.19-r1.ebuild 4132 BLAKE2B 7871fa8683b6ff214d01f5883183a22adf4a643d8
 EBUILD iwd-2.19.ebuild 4133 BLAKE2B 836977cfe3b766c61b1ca1c76d7ade35b28f82695caf67bca4af8c1e2bd11bc2c3dbe19ed9aab4600f4655d30d23c95a34fa9cc8698f16e7213658ea5b8c430d SHA512 1074d1b0026fb8b79cf5ba63fb90f42c4ff14c78107bf7844314c4b78f741b69aec886fc43125ca5eaf5380efbd514b0485e83f8f72d562ecdcb4abb8ecbde72
 EBUILD iwd-2.20.ebuild 4132 BLAKE2B 72bcba83f267c12320769f6404a9d450d9a80ac8252af7e30e38c5f77e461a7a99fc86777be3a68778db469820a1c1b073bd02550af0d3b16185c9c407c7b6e5 SHA512 ddc75730c7e733782efc526be03b60daacc092ef72bd3021b0e79f14bf278ec155339f4105a7ac8cf1c839f788e9a34eced03f546ce13e41ee0acfac53b7fa8a
 EBUILD iwd-2.21.ebuild 4132 BLAKE2B 161e800653ec7d026ee242d2ffef2578f02cdce60a3a68bf9a9ddfe655873f91e7ce0d0655bec2c11bf89cc57e12c2b4d35c0270f28956abb8a1c4f6049d9372 SHA512 318c57cb8a4ffbbd4b6f19f49a76446bd4e72b3cc69df422a7e93913d244c4b7436c659457d319e5ae768b3fe04a1fa1dbfebda04cb8e737a9b06310678ba875
-EBUILD iwd-2.22.ebuild 4132 BLAKE2B 161e800653ec7d026ee242d2ffef2578f02cdce60a3a68bf9a9ddfe655873f91e7ce0d0655bec2c11bf89cc57e12c2b4d35c0270f28956abb8a1c4f6049d9372 SHA512 318c57cb8a4ffbbd4b6f19f49a76446bd4e72b3cc69df422a7e93913d244c4b7436c659457d319e5ae768b3fe04a1fa1dbfebda04cb8e737a9b06310678ba875
+EBUILD iwd-2.22.ebuild 4130 BLAKE2B 4ba7807b20eb63c797151f10d5f8ad2ed5dcebe6773184e7080b37c9c899a26daf169eec215440f028c54652330369cad5b4e229bd44667e3f7a5a4546a40dc5 SHA512 45ac89f5214daa5a354fa90e11653e403f24a322267462f560dc28e067f81a373a3cde88b6f4f3785e971a25adad85b214d17d65f7335376e6fb2445e5872716
 EBUILD iwd-9999.ebuild 4128 BLAKE2B 87520b1e69bddd0844e79343475a929aa1cac55669949bf60e9602d14bbc8ae4817d6260d2d4a69efcf21face015b1a809d680c1ed5428afc0ed583434159079 SHA512 9ef3d68bc3b0da527364af1aec3dfc0af37965e64f302aa6b830f38c087fe2f73f7cd6ef33f8b6da95ae76ab691dea929b108e4b5c124a188d4af7cb51aaf07a
 MISC metadata.xml 717 BLAKE2B 4619afbff3a4275ff2307476c044c1a4f7c2a14ec4fbeec0db02cd35d8ec98a5d3febcde34dbc43a358129d02369ee6178e02d3938b7cace99946a963d235d99 SHA512 46809c9157af3809f720d38e71e900bb4ee8418f79030cda45e7c4547dca9f2f3b5932c5b481c44ae6bbfd0b48c0997106ada3be30ef5f2110cc287738f24473
diff --git a/net-wireless/iwd/iwd-2.22.ebuild b/net-wireless/iwd/iwd-2.22.ebuild
index 95ad12b6ce87..a47c3e0be5a4 100644
--- a/net-wireless/iwd/iwd-2.22.ebuild
+++ b/net-wireless/iwd/iwd-2.22.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86"
 	MYRST2MAN="RST2MAN=:"
 fi
 
diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index c20995fcb256..bf6993c987fd 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,4 +1,3 @@
-AUX qdmr-0.10.2-musl.patch 1192 BLAKE2B 8426b283ca468f16af35a36efe9dd5a73fff1caa4d3fa14ebfbce03c611f9c02400eb3c00374ee358fc9892d5a907f1de3c8770736c2b7806c3c607b38457a3b SHA512 773f6788c570cf60eabcb1b04b69be71f9ad875a59baa05b06892b690d1b01ca0390fc4618a7fe534d186e676be54b50f3b86342f208f9b75fb285f47a1af0b0
 DIST qdmr-0.11.3.tar.gz 6577404 BLAKE2B 7f9133e9620c5286492ee813907c47d550eba9368e801cd3939897381ed751788fa43337dbeb2cd1be5c4765c554ac5a031d9b4965c49dd1a521949d74b6f9f2 SHA512 4bb62cd84e8cce02f6582f854c4247c91f30271cc96856a4d1a55a4dbea5d2d9639e9db2df8b76f2ff196dddac1d7de3632627890617688037bd78085422e75e
 DIST qdmr-0.12.0.tar.gz 6905942 BLAKE2B 4452120860c8e4cc8e720161d90dd090affe43fa15965895e2e088f94856675811d3685933f25493b00eb2157ff58bef5481cb705cd92e7c9ef94a61fc877bdb SHA512 5cdb41c5d0234f8c1d4cfc4f75ea4e832c94f692320fe7714df1d0e893379b2c0939e004779a71cb601e696133d94d083d4e6062ab31916e9431bd14f6a60b6a
 EBUILD qdmr-0.11.3.ebuild 1429 BLAKE2B 829f27a10ad9cdef0b696b3efcc7d51be8c2ed84d213ce2fe2eb1b18c986f177b1b5db5e2dd810eb3d574192d845bcf7222399eab777870d143da253db397e2a SHA512 7e1be7b45555491097ecd3f6a8320750c19d6fd826e0b2274273ec7cb1307f7d1bc6b3b4eebc8c904dad04b01b4bb8cd91d61dcb96561e35ad86fb85a156cec4
diff --git a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch
deleted file mode 100644
index 21673cb4ebb2..000000000000
--- a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From eca81fba54b156707545967b78c823cc38b1b53f Mon Sep 17 00:00:00 2001
-From: Hannes Matuschek <hmatuschek@gmail.com>
-Date: Wed, 6 Apr 2022 15:29:02 +0200
-Subject: [PATCH] Fixed compilation issue under Genoo. Addresses #216.
-
----
- lib/radiolimits.cc | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/lib/radiolimits.cc b/lib/radiolimits.cc
-index b883cc8..eb72166 100644
---- a/lib/radiolimits.cc
-+++ b/lib/radiolimits.cc
-@@ -3,9 +3,10 @@
- #include "logger.hh"
- #include "config.hh"
- #include <QMetaProperty>
-+#include <ctype.h>
- 
- // Utility function to check string content for ASCII encoding
--inline bool isascii(const QString &text) {
-+inline bool qstring_is_ascii(const QString &text) {
-   foreach (QChar c, text) {
-     if ((c<0x1f) && (0x7f != c))
-       return false;
-@@ -205,7 +206,7 @@ RadioLimitString::verify(const ConfigItem *item, const QMetaProperty &prop, Radi
-         << ") is shorter than minimum size " << _minLen << ".";
-   }
- 
--  if ((ASCII == _encoding) && (! isascii(value))) {
-+  if ((ASCII == _encoding) && (! qstring_is_ascii(value))) {
-     auto &msg = context.newMessage();
-     msg << "Cannot encode string '" << value << "' in ASCII.";
-   }
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index da61cf860468..3274f4a2d6d5 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -8,8 +8,10 @@ DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee
 DIST unifi-7.5.187.zip 172434106 BLAKE2B db54079f30c9f61989ceb70474ea68559189804876000534c2a0165a9ef2324f92d19e7b055eaa31cd77e7bd90db0c29aa9f20953dc17a5c54cc646a5c862990 SHA512 703e29273412c497a5bea74210e8c409c629b81fee2badd3f116bbb31a2ca82942ff0281303c0da57757a85e44f4457ba3730deaba0a1f4cc2adc1eb5ace3276
 DIST unifi-8.3.32.zip 169676863 BLAKE2B 337d095e4ea434d22af78c93de1a14ac8ad6800286505242498ad513d424230208cf0e38c5df5185ad6480ff83d695837e8915067aa6026dc3faea49d245571e SHA512 f8ae2712c40957d308cc713b7f75cd9682da0b34f773293428ef6e8931629e5d365c8af4bc5503f96d0b751f4d996a1b8492cc443dc9a043c40105f38d9995c6
 DIST unifi-8.4.62.zip 169232688 BLAKE2B da25337a11ed549dd9bf85b786777327598c7a9f8db69303ee61edc0ae707074f431ed40ea99f154e32202ac5d28aa53dff6d247cc2983493e65b1e8b12713b9 SHA512 9a93db1786b3b6136ffdd46e5c6ed801f2762e81c972d0023de2aac9e3f6c8535e12416cfed9d7320175a39bc5dde9a95990a2251486b1243424af05f551584c
+DIST unifi-8.5.6.zip 169180361 BLAKE2B 945fb693d41301205647297f257dc7f8fb915421e0b40234d7e424993dfa58e50414d128cadb9792d824ca5e76716315a899331f33d6730957f25125806024ba SHA512 ff5f477be142fc9ea650cff4bf8eed3622bee60fa1513857000831eefd730bff9432aa218b3ae54ee1ac5ee592eb7ced4a4fc00347a353cb8529f2a9a8735e94
 EBUILD unifi-6.5.55-r2.ebuild 2535 BLAKE2B 2cfa249e33c6e13be327dd416862070f087e7998ef7219b2903a397c1419676b854576d059396276c03767b90a196fda451826df401525aba19014a54fa919df SHA512 2c15b0ff1eded12d1f2b99891f274d71d6dd9527d23440f8aacef8d76ccf66f6063b2ee136b503bd7b200258c812f648661fc40e54e958fe338ff0730cd2e0e3
 EBUILD unifi-7.5.187.ebuild 2673 BLAKE2B 4248580218eb10fc588ec60fea1c41344a84be3d9e464b9b85572afe9b3bc4326a9a13cded7fc20ae6043ab11d9d5b942226b39da9688898c84a323cc43a1a09 SHA512 445193da23f62a5420205c9988baca93ff3bb4e86b4b215b98fe911365fd6a602e606dab3ed1c1e5bffe3f1dde6b2442711b7ef1b5a0e62312ecefb0d90c7404
 EBUILD unifi-8.3.32.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
 EBUILD unifi-8.4.62.ebuild 2665 BLAKE2B 3b1815c1286abc5d874eeec60d586b56d574f090ae33f8c67ac03d14cb3c6c92a1fcdbee00e90b8883b6c9eaf816294f236a47d6c907923139b0c919f7538752 SHA512 8742007a954a4f531e3d01ce9a75c8b649547ad10430be416204185d7db24b59590299ae98f70765d85c3533ba1dee4b5d96a29d9c9bd75fdcc89800cc2d6e0d
+EBUILD unifi-8.5.6.ebuild 2666 BLAKE2B 20c2e21008e49fd27c8f7ed0e26ccdf2127a9ec1b1783db350b228bf2df88112531f06d815145f4c5c79117846639f3ff0ed16a059295191992a051e383897bc SHA512 549582cffb9b5d8de9238babf45cdcdbebea04a26bf8b02d7311eb8b9603919c795837c53ff3097858ebc2bdb8122a3ef23ea8b9e6018cdaa4bb179843b1e414
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-8.5.6.ebuild b/net-wireless/unifi/unifi-8.5.6.ebuild
new file mode 100644
index 000000000000..ed01ef5545ac
--- /dev/null
+++ b/net-wireless/unifi/unifi-8.5.6.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
+}