gentoo resync : 31.05.2021

3 files changed, 2 insertions, 72 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index c4bd67fabe99..e717bffd93ce 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,10 +3,8 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-6.0.45.zip 147691229 BLAKE2B ad8e34e4934449151b0244bb32e2ce81e2506f228c995e72c2756279ce22f1ce06d44c37f1cfd6156cee0d03066e36d99f98b56d2a1c759ee98ada6569b8309e SHA512 6b2aebf33b6e2114a2b274ce332e2bd88a30406e3a21bc66dc0eddee3ee27ee2e4d3948dea73ff85289cbc2ed0e4f2b646e095091c54120f718b5fb2f0b35943
 DIST unifi-6.1.71.zip 152149341 BLAKE2B 85b7753aa516e8f44baf8df9c21343c2af33f890e034d373817a41459fed3934abcc4690420307fb743a8096a9b57e027d3809c1e9c7ec45183de4d5ed2364d2 SHA512 eb874ae24a2dd2214a6f1a1f8ad4b9d298edf2ad0f7b1d83b95290ba866b586c92a6ba79f825b2decdb7f298ddc350d994f3af5b72e446e49dd0ddcf4f707f4e
-DIST unifi-6.2.23.zip 152757410 BLAKE2B 52b8ec76869175359a7a31e64c6cb61ba21eae00105e2d83ca025306416a2c39a01570dfb2e1024d81c9cb7b4c5aa076d6e8a54dfaabceb2d761f25ee3f0d7b8 SHA512 e86c658aa8d0a6f3e3795d85a4d1e66b9ffa006a2a5380750f5e97184630cf033180ad9ef6352232ab8f2e8090a5f239884b0731b09623179216db4a0508d146
 DIST unifi-6.2.25.zip 152753893 BLAKE2B 1c597e025e73faae5db524a868cfab49feb5f4b9bbd5d823950bce23981521d6d88135ddfb148e30b7c2e00f89b176b065e0635c3e3b0c6a888d1ea688e148c6 SHA512 fe11aa9bf495cfede03d217f6a7f31ac0a2dc11a72dbec56e8a4e465545858d8524d47e9f5677dd917968c0f316a0fe4ceb049f26c15e2fee428e736929bbd9f
 EBUILD unifi-6.0.45.ebuild 1577 BLAKE2B ebb712e31ade637fbdbd445d8d372bdd5e2340c98a756157dca7de7ee9f458f953e874f319b24cabcbbcd296243c84bd508dc6023d45cec091c7bca7d75338af SHA512 58e932a2579de089f3fdab42fc409528755aa16f3770e26f4e09c941e3368c2702aef779df5f8e44e193a395325704f55f23b80d4b9bf94dc1de2059f1e3550e
 EBUILD unifi-6.1.71.ebuild 1577 BLAKE2B ef8e790411b63a19def6b2922e1be8fe789417e8cb5a0b4d1cd07313d8682d9bb6670423015ae0b5f7612d3cd5a5ee78500dc3a54221e3f354c0130300956532 SHA512 34b3b5a977a79fbdb587cd5ae2c0b2086933c531cc4a8cfded03ae16d3f8859e7ce988dfb5195ce8a7679f61d1db63969a8c5163bd70a4d2011e963ee27c90bc
-EBUILD unifi-6.2.23.ebuild 1577 BLAKE2B ce38e34a8c0dd726102bac9d3bdf364c0a43fcd099579230c74085fe67568741002453614baf5328dd49270e73980337762927a1486bb50dfd08938b5b991301 SHA512 6a5a669633611504010d7072ed4baecee595e2ef54f06a9313da95e27911726c188333034edd9ee651f91323e8dd3574e250e741cfe73b200a858aeb17b046c7
-EBUILD unifi-6.2.25.ebuild 1577 BLAKE2B c0b5a4595a49f4f7f2b04b2cbd20b51c6ce25a2981f0326c6ae4dc3a7900fe08f977908b4166b64c817f294b12e380ddaefb28d62bbb843274b6f65e7f622b62 SHA512 fa2e7450d76afe645bdc7ef7550bff3d49524de8a6dfdb3cdae0b416b4f2398e76449970a355bd02d411b5d74bb5eacec11603bbef5be607cdb75cfd602e37a7
+EBUILD unifi-6.2.25.ebuild 1576 BLAKE2B d92b515fe4595b87c3b203e1d47280915b388c7d8df7cb655bb8c05bfc02ebcf0ce6715707febac2d7fbcc49a1bee9da8abe925166dc1120081021db35b0916a SHA512 cfc783909c0b2ef70acb0fc8fd4d5859cd0c603484cf244a76d7d8d16aa3707a82b173c0f5a42e500b425bcab8e3a359d9c08d3301fd0cf67ac15621851849a6
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-6.2.23.ebuild b/net-wireless/unifi/unifi-6.2.23.ebuild
deleted file mode 100644
index ded0e6febddc..000000000000
--- a/net-wireless/unifi/unifi-6.2.23.ebuild
+++ /dev/null
@@ -1,68 +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="-d3a253013f"
-
-inherit systemd
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/$(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 Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/lib/unifi
-	doins -r bin dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-6.2.25.ebuild b/net-wireless/unifi/unifi-6.2.25.ebuild
index 1cee5a6d3074..50d23081c62c 100644
--- a/net-wireless/unifi/unifi-6.2.25.ebuild
+++ b/net-wireless/unifi/unifi-6.2.25.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="systemd"