gentoo resync : 22.12.2021

12 files changed, 14 insertions, 239 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index b5135ab23748..8e298c2fa2a3 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 20da54dce591..8cd8dafe7fd9 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,6 +1,6 @@
 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 3110 BLAKE2B 371e7ec1dff77a07b1da0096617fd0159e021e93c144723b72bf0a9f14fc8f307c887359d48d4d5a08f0887165c6ebfe056b0729d0e932d8864734293db6c536 SHA512 00dcbe6cfca8f8d06757efb52bd8ef518bfa2cda1a4ca29a2461fc82d5dc5e7d3454f98feec530c195c0c08bc6cab2240245f9d513ec0d6053949d1975d32647
+EBUILD aircrack-ng-1.6_p20200722-r1.ebuild 3107 BLAKE2B d36f436ec00410e1713ec869d5b3dc6b5fff239e536edc7adf1eb457ddc05dd08524af96759f9c5aaca34721135b50787b6e53698a54a1aa87e4e7460dc454d1 SHA512 7e22695d8f81aed26aa6741487cbdd96965042762507110d499f4ad4182b4bef62cbffa94a8a168b54565d765385d24ed7783efd39f283ed6644136ec5129ceb
 EBUILD aircrack-ng-1.6_p20200722.ebuild 3041 BLAKE2B 5d328c629911ce056e1fe69c5f26cc78be3eb1107dc0fffb1a2479e8ca70d485d7517fb45a9ca680e8d8d735c6a07c272729c4291f360911cefc4d14a0e85dbe SHA512 8021b4735879a2e161735570d0449e54f9c3edec40307ea991376c0b2cf37f6f8739fa83068a0bb25f957522bfa56ba0c983c68b2cd6f3b43957304cfc513554
 EBUILD aircrack-ng-9999.ebuild 2884 BLAKE2B ed54ac92d75c1c1b6c5f08de0730f7d65b53a7a4805edffae880de577b0c18dcdee132d7811affcc5091d3e0a042f521924f013141e43210e8982fa7ce1fcbd7 SHA512 556433bfc754a0578eef2ce61cf2dc5cb9866311e7f767b9d1b77fcc4a959581b4e66861191d06f4926990072fce31c860db30a955ba1100ce9f6f553441cfc9
 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 3e29615b279a..aba4869d9ca4 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
@@ -19,7 +19,7 @@ else
 	COMMIT="5a02ac4818b30d2e87b3e18e497a5f9e5319394f"
 	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 12dfdef79005..66ee50d9b661 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -3,10 +3,9 @@ AUX 0001-Revert-attrib-Make-use-of-bt_att_resend.patch 4975 BLAKE2B 4e2e8a7bb9f5
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
 AUX bluetooth-conf.d 21 BLAKE2B 7c94e499438f441fc18f0b50178e707982ac91871a74b2e7a35c9930d32441a89f742993e993e3003f9bcb5e3ee9adde2ab1cbe33b27245b1b1e91e7c3dc1a0b SHA512 45befd3fb42ea3462fa6e1ee9f3ee9591e197d4925a4c9df6733bacfe44cf44f54ed3aad6fd7a6a2953da54b93460a1cf0ea1cadf0d7e47f811e4c3182af74d5
 AUX bluetooth-init.d-r5 313 BLAKE2B 6bad1b9a75de5927ab22a229d6ce18247b32a79b994078338eff33df7f74a7dc4a5266212f6d0150101600e3a864a9b64ce6a576208218750bfbe88bc5911baa SHA512 95aff192be6207047fc01b42754bcd34d5cd7f82c16486fdd81bb1d14be040e4f3e9bafd8dc2f4e8b87bf1eb50f6634f526feaf2b38c0c6807f40784d84dac96
-AUX bluez-5.60-glibc-2.34.patch 1511 BLAKE2B 59035b078414358bf3ab66f92884dcef1d3795780d3ecad2d036dbfe7ee78dab027c9eb34185013ab89f5cbe2a6a0006e4d9420217f3231e27aafd2c5b92a9ec SHA512 ea78ae3771be72b269626c0c119d8d8f8d9b0874379bfd3ada58c9087aac3c55a7ab52a08503964aa397c03791beb918362bc35d0e87e74f5feca0c30bac0e0b
 AUX bluez-5.62-fix-disconnecting.patch 2244 BLAKE2B fe2d3b975adda9422ac8bfd41c1cedc70cafd363982e4a415b057498e83feaf989fff7fe78fcbfa9b4fcdb1c1629347bd6380259ef71bf8c5ac78386b7990231 SHA512 2cf7b4929ab2f8f7e68546ba15ab7f74bcb748f741d6d6cc189ead14becd3403d0d6393b0645fccd215da3aee90360db28cd327802cf2ff3212f0487edaa3e95
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 DIST bluez-5.62.tar.xz 2149348 BLAKE2B db99b36a230fc0be15275d2eda9864b686326ba50648f66b19087ea4309a76d234ab4f1dcb6975f1513a898978b1d5b9332542f5dcee22efd898b79658434a70 SHA512 8fb0b81e1d929d3eee3d70f457ce75dbcff4c2a8a728247fc950bbe11e84d83582345bfd433d2e2df7b5588eb0e42f286658a83c7332be84819d9df49a5707e8
 EBUILD bluez-5.62-r2.ebuild 9103 BLAKE2B cf83b34b46fcbaecb4d1a2d2e583b34d67534d18bf7ceeacbee589fda4d2d3bb9be4aa6bde8cbbce3311106c55e14d3eb7136c1c86cf4943dc3b8b8e9d161963 SHA512 750e391d3dc10225288037537624bd53aea605581a3a0124979d846e7e54147b72913e2c182a4e571699c33246473a42f5e56e6af578db38e256248954a9ee66
-EBUILD bluez-5.62-r3.ebuild 9484 BLAKE2B 6bec6be42a51b9d3ce5b02851700231465fe6e5c24e64533b43081317f3159daf9456e4a2061d2578d9e71765c7e93cc593d89b3d4e2ef6e1671607065546560 SHA512 f31bafe6f0ea6edc73621318e7bb03332823084196f4dfb89f9ab4f6c38282e2b142da0b585fa0732417119d7659b8835b94b8eb35230fae357ef33ee242cb1b
+EBUILD bluez-5.62-r3.ebuild 9518 BLAKE2B 6094902d7b691ee93c3d45b808cd3af6967f870188cbef2dcf509880a53ae08a343255535876af6162eb4cdda610c8f8672e803cb665d015c4c22a2e5e4937ea SHA512 4e552fde3a2350bf26aceea56f79881d8d7b751d723c70e29618cf6b81a0ffe12fa2aa9ecfeebcdda6fe24a322c0425ab232c715e7081eb8a976dbd983d3b133
 MISC metadata.xml 1099 BLAKE2B 75b6db1d43b75f9b22ce5fb6ec640e2e06b2f2575ff75441318a2076b8486ed7d81a62714540c61ab3a35198113538546b9aa71d05ef4cd7106c8a7f09c13029 SHA512 6e4a7bba7102b4850a938ba0f6feec9cd12488d4b440b19982751c2a742b33a565933fae3967080c060e5b5eb51d90268abc87a2c0a2efb7f4c773020c29462a
diff --git a/net-wireless/bluez/bluez-5.62-r3.ebuild b/net-wireless/bluez/bluez-5.62-r3.ebuild
index 0068b5bad6aa..71035af2f830 100644
--- a/net-wireless/bluez/bluez-5.62-r3.ebuild
+++ b/net-wireless/bluez/bluez-5.62-r3.ebuild
@@ -12,12 +12,13 @@ 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"
+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} )
diff --git a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch b/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
deleted file mode 100644
index 1e846100285d..000000000000
--- a/net-wireless/bluez/files/bluez-5.60-glibc-2.34.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 124dee151746b4a8a2e8a7194af78f2c82f75d79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 3 Mar 2021 08:57:36 +0100
-Subject: [PATCH] media: rename local function conflicting with pause(2)
-
-profiles/audio/media.c:1284:13: error: conflicting types for 'pause'; have '_Bool(void *)'
- 1284 | static bool pause(void *user_data)
-      |             ^~~~~
-In file included from /usr/include/bits/sigstksz.h:24,
-                 from /usr/include/signal.h:315,
-                 from /usr/include/glib-2.0/glib/gbacktrace.h:36,
-                 from /usr/include/glib-2.0/glib.h:34,
-                 from profiles/audio/media.c:21:
-/usr/include/unistd.h:478:12: note: previous declaration of 'pause' with type 'int(void)'
-  478 | extern int pause (void);
-      |            ^~~~~
----
- profiles/audio/media.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/profiles/audio/media.c b/profiles/audio/media.c
-index c84bbe22dc..3d8c4b69c3 100644
---- a/profiles/audio/media.c
-+++ b/profiles/audio/media.c
-@@ -1281,7 +1281,7 @@ static bool stop(void *user_data)
- 	return media_player_send(mp, "Stop");
- }
- 
--static bool pause(void *user_data)
-+static bool pause_play(void *user_data)
- {
- 	struct media_player *mp = user_data;
- 
-@@ -1331,7 +1331,7 @@ static struct avrcp_player_cb player_cb = {
- 	.set_volume = set_volume,
- 	.play = play,
- 	.stop = stop,
--	.pause = pause,
-+	.pause = pause_play,
- 	.next = next,
- 	.previous = previous,
- };
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index ea448a65f559..afa89a2a4a0b 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,10 +1,6 @@
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-DIST unifi-6.4.54.zip 158992649 BLAKE2B 90f98b1349a5fca3e6d85ef42823c5beaff0a3ac4697622a0387259421fdcfa891b094acb66f798a97b4397a27d477d6fe10d53bed03e15081f4d63abafb9d8e SHA512 d0502f87fe6827cdfabbffce7c7b0159aaad2ac032b59d04d5f233ada279fb90d5e21e043de518260c3380c7e23ff561f04040433a441866421dbe9b2db540c0
-DIST unifi-6.5.51.zip 157715310 BLAKE2B bd5b05b291a9b050ca4bc118f2336a2416f5224fd07fe8712a58842abfb04fcbe2b33beab30ba7ba9af14c853983068878e1927236a196d0597d7919e420cafa SHA512 858ca72a17a221cf4c01b032bab590c6d30c8a9dd02197dc9ebb8b30335e58c53296be7c4fc22e2e218cc7fed0ba5080eeb603e245b4821c34623593511bb4be
-DIST unifi-6.5.53.zip 157731104 BLAKE2B d23f9b5a96b8f6e7e72ac71d9bc1e2fb0d552beef0f1009d6c21237fc6b28dbd90c728d4cd188d10e2f5ecda7b608991393d2a055b23c67be5c4072f3288b28d SHA512 b0abfd12719335a542affa06958489af241054277092a72d7f6bb22f14fd2169b4c4a4cfef0f1c9cd80fe7203d733f5bc25ea753253cec5f6f29042eed1cb44e
-EBUILD unifi-6.4.54-r1.ebuild 2225 BLAKE2B 66d6358769e7aeeb192570472795930e99424ea64eaaa2dbd7df07657b0f0b3784ba9ec76f2d8c9ec9c58b6e7ba4cec089fccfbc0ddf9cd36f654f11a9968b02 SHA512 f28e32885c82ab4958d9bd2d61f72c89e61117885661df2abbea3160fad1eb5888b04d335bd9618c6328e7a37900145e059adc21f6e3e6a014e77e6e6c007dc0
-EBUILD unifi-6.5.51.ebuild 2226 BLAKE2B 4fb60bf47b1e4979988fa2ff41d630468db231788c86722f97126eb000730e01d57861154fc2ac422065b4fb0f1ce7dd4d508e41bebc50e77d368d3042b58bcc SHA512 03496d18706d1252899228fc3efa09ac8fc15c2e2d7854fff921dc36d24accdfe999ff2ac08c96ebafd75045ec502de5bffb0576cda4d25cea14c5082e12fcc5
-EBUILD unifi-6.5.53.ebuild 2141 BLAKE2B b5956b1709ff4ffe60c8d873d2f4420e2979269f827556a54426663cc88f2a814a3361999cc2ce0b62ab98fe82df51735c531b9f1836503f77ac66cb0469a8b5 SHA512 06d6a698ad27ea6ee43153eb7989ba2f4cfc6fb8ebc3aa2b9c01942e5c762de61bfc9d06a3256e53c0ef23ba1fc932fd0f2da6742347824b8812d9b5359371a9
+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
diff --git a/net-wireless/unifi/unifi-6.5.51.ebuild b/net-wireless/unifi/unifi-6.5.51.ebuild
deleted file mode 100644
index 42cce95e88a9..000000000000
--- a/net-wireless/unifi/unifi-6.5.51.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Set this var for any releases except stable
-RC_SUFFIX="-2767b412a8"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="-* ~amd64 ~arm64"
-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)"
-IUSE="systemd"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Mac and Windows
-	rm -r lib/native/{Mac,Windows} || die
-
-	if [[ ${CHOST} != aarch64* ]]; then
-		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
-	fi
-	if [[ ${CHOST} != armv7* ]]; then
-		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
-	fi
-	if [[ ${CHOST} != x86_64* ]]; then
-		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
-	fi
-
-	if [[ ${CHOST} == aarch64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-	if [[ ${CHOST} == armv7* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/armv7/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_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.5.53.ebuild b/net-wireless/unifi/unifi-6.5.53.ebuild
deleted file mode 100644
index 530357decd7a..000000000000
--- a/net-wireless/unifi/unifi-6.5.53.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}/UniFi.unix.zip -> ${P}.zip"
-S="${WORKDIR}/UniFi"
-
-KEYWORDS="-* ~amd64 ~arm64"
-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)"
-IUSE="systemd"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	# Remove unneeded files Mac and Windows
-	rm -r lib/native/{Mac,Windows} || die
-
-	if [[ ${CHOST} != aarch64* ]]; then
-		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
-	fi
-	if [[ ${CHOST} != armv7* ]]; then
-		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
-	fi
-	if [[ ${CHOST} != x86_64* ]]; then
-		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
-	fi
-
-	if [[ ${CHOST} == aarch64* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
-		fi
-	fi
-	if [[ ${CHOST} == armv7* ]]; then
-		if ! use systemd; then
-			rm lib/native/Linux/armv7/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_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.4.54-r1.ebuild b/net-wireless/unifi/unifi-6.5.55.ebuild
index 595d47830d86..707826628a0b 100644
--- a/net-wireless/unifi/unifi-6.4.54-r1.ebuild
+++ b/net-wireless/unifi/unifi-6.5.55.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Set this var for any releases except stable
-RC_SUFFIX="-bdf9275f33"
+RC_SUFFIX="-1d0581c00d"
 
 inherit systemd
 
 DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
 
 KEYWORDS="-* amd64 ~arm64"
 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)"
 IUSE="systemd"
+RESTRICT="bindist mirror"
 
 RDEPEND="
 	acct-group/unifi
@@ -24,11 +26,7 @@ RDEPEND="
 	virtual/jre:1.8
 "
 
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
+BDEPEND="app-arch/unzip"
 
 DOCS=( "readme.txt" )
 
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 563e78693e9b..0c231bb861f4 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -16,6 +16,6 @@ DIST wpa_supplicant-2.9-r3-patches.tar.bz2 5266 BLAKE2B 284fdeaf6328c35b1f5e8807
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
 EBUILD wpa_supplicant-2.9-r4.ebuild 12060 BLAKE2B 8843c2e43a7b0dee34d5b5e02488ca23b16a4876f69112fc18f8d46c8c86ecc1cef522fd7e157ab60a93d54a9b5603ea6a65f2ebac9fdcfb5da32b9c45f6ec35 SHA512 ddbdf6269775a13c726f727b0df4f1049f890165bedd4072ab031c00cde051964c62a7e6265acfab439fdf256f968a543bba825359e893bacf1e4d44b6c232b9
 EBUILD wpa_supplicant-2.9-r5.ebuild 12434 BLAKE2B 523199b19036417f6bf5ee7062444b85709393470ad03a331f4a47c2150cb463abb6da50d4c3ccef4b78e39ce194778eb00ee312ead5285d8b5be838d61fdbe2 SHA512 51faaa0f6264cb140e609429152fdee361603dbc21abae230e1d24041e58decfda7c6f107d3e9bee8218d75bca979668f70fc379b39397599ac87ae364afe064
-EBUILD wpa_supplicant-2.9-r8.ebuild 13054 BLAKE2B a7fc2107457365ab51c9c9289f2b7f666abcc277e17f34ee9647c30169855082ae203f9f846a4f1eb93f6fd5947ba92b3d99fc4115ee139c8b8bab5ebf08c202 SHA512 2d31c4f67e4a7edbab432525ed814914b6008913fc54cae0515268a7990979e8266ee0339a50f4f4e7bdd3b75fa27abefcb72b2d2b38e05de0c0b32ba90fe8fa
+EBUILD wpa_supplicant-2.9-r8.ebuild 13048 BLAKE2B 353dc1e5804f16cb0c3a1adb15080bfd4aeb3863cbc6ea3ecd9873bf30a88d857036403c34b45ab8556fdde73b3e4b9685d1fc162fce8e002e6c87e9253165f5 SHA512 dddb74bb5e5b231571e9939744955e327f4cf3ce74d4bd6c8598e9c2d4d7063da499fe8d8a0b76009a45c76dc115d2d1f630c3509763c914340ad0805cfce775
 EBUILD wpa_supplicant-9999.ebuild 12656 BLAKE2B f97f6fecfdfc766489cfc9fa9d1d47edaf8b857b8d8c23ea903bd1fb2861b7a2a18c8d3042fe5c763b70ea9b58390e4d309606b070e269dead9a9402e7b3d740 SHA512 c8c389adfee5b84a2cac9fe5cb2163e850df93365e01bdcbc15f6bccbd5329ae296631aa2a4cc6505ea31fe402728caf0d5e4216e415e02c479a4ca13c76dbf2
 MISC metadata.xml 1804 BLAKE2B d8e5383b6ff9511bc0541725d2c6e8b114f4619d27d6d96b09e868925ebf20fa1e63476218c3b42e1c01af695492879c4e428cf2ae34ea139bca21ef46bd4b4f SHA512 1fc0ccf65262195d6f8896fc0414cb5a4203b3b659bff68bac3ad449eec77d3ce071b7453c636eb16d666199770fd2c65d4b45aca20d14f32b9e0874ec676e70
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
index 6c1e2d23ae78..8c0150f8694d 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r8.ebuild
@@ -13,7 +13,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 	SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.9-r3-patches.tar.bz2"
 fi