gentoo resync : 06.04.2022

4 files changed, 4 insertions, 102 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 0dd34787f114..a1fd5156731f 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,12 +1,10 @@
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
-AUX unifi.initd-r2 480 BLAKE2B 9ff5b854bbf831a47485f20a1893bc10ee28fad118e429f0cf057a2182d44259148cbefc05fb9d860c4060110404e4864db678bdfc519155a83cf2dbe8015a8d SHA512 970aee9cb04115c1efcba212949c1e68bb99d838f1cc5360873b13c5e97a60ca45db34f122c2a2e634770256e5a167796db2d15420d6e201df8403cddf3a8c52
+AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fafb4f5a5671edc522fb13872ec64c168173667cfc072cd0fde5fbaa236109a4c49947ddfd3fd429f SHA512 734aa8b93e057579470e59a287d68f219f510f73479add86d3bfc32d73ca495644d40d9323e2b00a448ee7b519f9a60d3150057c00398165108b572999e70b67
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 AUX unifi.service-r1 237 BLAKE2B 19d38b04924c9236a104323b18d423484a16159d123d573a85ec9fb4749b7c5a0b5926430f5477ab32929b7bf9bbb458e1c683ac64ab799d438791cb7e742001 SHA512 2fd33d12b95057446641d3e5cb9bba332f6089fc0019706758b47d24cda16254750d69dc76794a3b58de4cc160070f559294285c4be2829df101c670db9b39d6
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
-DIST unifi-7.0.23.zip 160854754 BLAKE2B efbca0e4157f2399046bca1de985b44793392e9cb24e07e9bb9af63380f06fa88f4317688ddb4a11a9b3c925a525282c980c5e84e4cb89e9a7c00c7dd6175d4e SHA512 9f1762e82a51cccc48e7742cf3ddb62cc2cd3718166d495a2d47c80f7a36444646c85d1efdafb805a76b7c2e0318802b1ccaee6ec7f378371a85ff51ef49392c
 DIST unifi-7.0.25.zip 160864941 BLAKE2B b38f7894484485e0f61a08d9b822efb518078f7cd3cd9b2cf33d99c97b3e0c134279272804f2fd8591f21db7e289a9532f00b4b8d4e77b499330f3d689ec52e7 SHA512 2237a9e6cd97cc22c0a21ab89c11432f1f96f2d74b121cbebe63f2d5ab6ad4cc690b058c32f21774c5def28be7f927df98e45314ab145b1f19127da9beda9fc1
 EBUILD unifi-6.5.55.ebuild 2224 BLAKE2B 30612188b7ed5e51f00ef64bed1679d20db432e929f753374d5b71fd39e6f950a4d4a2f8299d353eb54fac00a49a5baaa91c9a89d47926a86ed48c4f039707d3 SHA512 1b43d2cf6a80ee306f8388d38d160aaa979ed43009cbb8e57e983a73122d9c277cafe9efb67e5937676e95eb808facad1de89f2f66748d1b9eb491c75e320a6d
-EBUILD unifi-7.0.23.ebuild 2457 BLAKE2B 72814f7f3282ccbc2bf8ebc2f8bdb1ae29cc3cab29dfc3b7aebce5fec94408524e77f0ec1c2a769c9ab2c09253617966cf481f05e60a53b8325fb244ad466f62 SHA512 5f85def426858772e60b04f11c05c5a4859422570f8fd49609a2c1a420ca6635911eb776f2ecaa07db619569705594d25cd9c9e2ddb17428f3a29aa5049b6e4e
-EBUILD unifi-7.0.25.ebuild 2457 BLAKE2B b0af9968c5acbf3e191f7afb321fa88da8d66c0b604b5b78c893a83f8987921c8242971230aed8b607811ee5ed61e61e4203b2b0226e0a9c20b3d79cc3eb5f88 SHA512 83091a137a4d663bbc3e13ce6dc5c09448e2a03c859a43fb898692f902556699c6c33fb7ea62a0e82976039cacb73c4455cf44725a9c41d00727d4558fad8f81
+EBUILD unifi-7.0.25-r1.ebuild 2472 BLAKE2B bbc925dbfdc96c33c5cef1f11e59b6170c8026660c96bec5282336d9c0601febdbf658c9d652b928739bbabb3aed5ecdb0f6fbfd709f024cf4a1c8aa421f5bf6 SHA512 0f28c97f18d1ab089a21530f0c0da39214a3d2518169363f61482f5ced49268fddf338bae26d67d2458ecc1d607b8f82f2190117251dec7383b8b0a6b64564b0
 MISC metadata.xml 579 BLAKE2B 4c18ad9f1d440c5d2fcb1460666ba738b04108d14f30d47b046213412ad324e6d942971959b98f8eaad08485fef2e441d89cc5b77e3a6696f8f339e7822b9f1b SHA512 6a562914d527a80b5737b1e121f21a71b086612b876274b38bbf6ceeb2aee94983327c84c23ffaf7a738cce0cd20f16581c0b99f5448105269302a1ebc3b8c3c
diff --git a/net-wireless/unifi/files/unifi.initd-r2 b/net-wireless/unifi/files/unifi.initd-r2
index ccab8df7fd7a..a92172fffb97 100644
--- a/net-wireless/unifi/files/unifi.initd-r2
+++ b/net-wireless/unifi/files/unifi.initd-r2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 unifi_exec="/usr/bin/unifi"
diff --git a/net-wireless/unifi/unifi-7.0.23.ebuild b/net-wireless/unifi/unifi-7.0.23.ebuild
deleted file mode 100644
index ecf6140adc85..000000000000
--- a/net-wireless/unifi/unifi-7.0.23.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 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="-5eeb859f85"
-
-inherit java-pkg-2 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
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:1.8
-"
-
-BDEPEND="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_compile() {
-	:;
-}
-
-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
-
-	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=' --jar ace.jar --pwd '/usr/lib/unifi'
-
-	newinitd "${FILESDIR}"/unifi.initd-r2 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service-r1
-
-	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-7.0.25.ebuild b/net-wireless/unifi/unifi-7.0.25-r1.ebuild
index 32242007eae1..24936b556d77 100644
--- a/net-wireless/unifi/unifi-7.0.25.ebuild
+++ b/net-wireless/unifi/unifi-7.0.25-r1.ebuild
@@ -85,7 +85,7 @@ src_install() {
 	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
 
 	newinitd "${FILESDIR}"/unifi.initd-r2 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service-r1
+	systemd_newunit "${FILESDIR}"/unifi.service-r1 unifi.service
 
 	newconfd "${FILESDIR}"/unifi.confd unifi