gentoo auto-resync : 06:08:2023 - 03:21:27

5 files changed, 20 insertions, 114 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 43fe84231402..154dd635330d 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,10 +6,8 @@ AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fa
 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.3.83.zip 185572238 BLAKE2B 2e2fa581bc53dcbd75660e5875e8de25df19ee2233c31d5429c5d05468be315e6e68fd92dcd8d19cd7088d4f1574c5cb12f5b0e6b3b49d62dee4dc43b25e7a85 SHA512 ae7bd0e5deff9fceb831be7d652c333d06f1b2a9b40411e1e72607558b01b33814590601c991742a7627eb7a15ec33d5ea0ca1f8d7d2103f348db592f61aaca7
-DIST unifi-7.4.156.zip 167385370 BLAKE2B 4228911702267e9ebbdcabfbe773f0e2d3597d2e012be72c51d19b352fcd57756ac7e9a9d8b64b46ef1e590bfd36cc768f1afd0a0e09b321fc75bb6a3b8a5baa SHA512 903695360ec06f30fcf9133540cf0bcbc134a67c641e9ea75acc1fd1d34bbc17b80f024bdce1a217454816117c5e08400c8a2e5a3ce2b9cf5b76b39a4b4bb3be
 DIST unifi-7.4.162.zip 167673550 BLAKE2B 1e7dc5fa47353b3db68be9f2f26d457be9c6b64059d32d42fba2f6f3e3a8c2fef8fa3e1aab8561d74e2dcb8a57888ce1325eeaa681623349e9de972571727218 SHA512 a7600c01e861e30ecc588c12aab4455722fcb307dc58a7c27741a7df863a0f8dbdd397c33811ffb099468c391a82386c70fde71517f7dc6cc9727c7ec55c0fe5
-EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
-EBUILD unifi-7.3.83.ebuild 2748 BLAKE2B 17476b2bd16b1fba0eac32a581147cfe24aaf675fdea78136ae8fc2ce68c1118189243778374a8b77db38154c4b7612474c94550d1e6f496abe4b3ffcc1dc3a6 SHA512 8f0f5506d8ef4fae4c591cc6ea876b34f0ea16b2fe1236536820921202ff2e5f4d83802a6d54d8de08d82d485ea9f04e85a1b71ba91cbe993d435bb1baf6fd81
-EBUILD unifi-7.4.156.ebuild 2687 BLAKE2B fbb3429f29986754e1dcfdb2aa3e397d79f3124bdf566cb363ce3f6a84d562af1a9f7941d94b8d0780e2536dcaba95c135a982e6fa86e29ff965d6291c535f29 SHA512 a10f30baeb74f953393384922cf9d99ddc69c2d2e6ef034b4368b8f23a816f7168341db8c7a0d7a83d2a15d1dfa2f1365e71b570937f25035ea5186adfc3965b
-EBUILD unifi-7.4.162.ebuild 2688 BLAKE2B c8719d26b82c88616f752259b5bd96740cb565f347d9d8c2cecb42bbdc1aed0aa3a800ea18ada5339ac58e2ff6b1689ccdf66d8dadae859a1e4954168ba99a52 SHA512 cdb58de6676b83ea540edd1b7f1c6834467e793e4b0985895da129d1d8408c4ee588a23ba9d3634384a895a2d90388951d0fe480c55d457365f10f8c50acdc85
+EBUILD unifi-6.5.55-r2.ebuild 2487 BLAKE2B 32f355cfa0223b1161372a38085082ccf40888192ce9159bfcaaeec0f8dd85e73a124eef2b5bfda559c693159af92f6e44fd67888126094561d7711b011b150e SHA512 5ff01a288d1d67c7e25e37bc03549b698f1a8feffcac404fbbae0880e9707210de6c1ac454058913496f7dadec80006a311d4e88ce713c34265521717ae8b72b
+EBUILD unifi-7.3.83.ebuild 2764 BLAKE2B 7cc3f4c8afe2a18ce87952d3b4658b930508b96aa8a256cbe1c8fa73bb426094b8a395ce7fee1f0d1c25a6db541248cf0faea0c020c2658038339cb4619ac1c7 SHA512 90231e073d5e95f489c724bf014dc44b821c7c55579ff0076d1c21aae2b85ca2c73a9c55f716d1cfee5ef753068b59f438eef058120fb2467917dce161b339ac
+EBUILD unifi-7.4.162.ebuild 2703 BLAKE2B 8982e50fff348e55864e623b58147913da0b9734a01ab93bd8153d570fcc2a4468a11cf4b977607315835a6a85701c35f022a885fa399c32f63990d753bb2353 SHA512 088fd7ee83ef7a7c108cbc4d68747519cf88a04e34208c91305de4323f2736a37839f3541e827f28aac226649eec6cd602162ed30e498eb934540f5be0b12e4d
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-6.5.55-r2.ebuild b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
index 248c2222fb5a..ec2a20c228d4 100644
--- a/net-wireless/unifi/unifi-6.5.55-r2.ebuild
+++ b/net-wireless/unifi/unifi-6.5.55-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -82,7 +82,11 @@ src_install() {
 	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'
+	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_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
diff --git a/net-wireless/unifi/unifi-7.3.83.ebuild b/net-wireless/unifi/unifi-7.3.83.ebuild
index 6626a69d1455..90eeeedd6154 100644
--- a/net-wireless/unifi/unifi-7.3.83.ebuild
+++ b/net-wireless/unifi/unifi-7.3.83.ebuild
@@ -83,7 +83,11 @@ src_install() {
 	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'
+	java-pkg_dolauncher \
+		unifi \
+		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' \
+		--jar ace.jar \
+		--pwd '/usr/lib/unifi'
 
 	if use system-mongodb; then
 		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
diff --git a/net-wireless/unifi/unifi-7.4.156.ebuild b/net-wireless/unifi/unifi-7.4.156.ebuild
deleted file mode 100644
index 4834d6b2f68d..000000000000
--- a/net-wireless/unifi/unifi-7.4.156.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 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="-6ee9e412d1"
-
-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"
-
-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 system-mongodb"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	acct-group/unifi
-	acct-user/unifi
-	dev-db/mongodb
-	virtual/jre:11
-"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-src_prepare() {
-	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 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=' --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
-}
diff --git a/net-wireless/unifi/unifi-7.4.162.ebuild b/net-wireless/unifi/unifi-7.4.162.ebuild
index 59ec33b5b242..4321c206aa24 100644
--- a/net-wireless/unifi/unifi-7.4.162.ebuild
+++ b/net-wireless/unifi/unifi-7.4.162.ebuild
@@ -13,7 +13,7 @@ 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"
+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 system-mongodb"
@@ -80,7 +80,11 @@ src_install() {
 	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'
+	java-pkg_dolauncher \
+		unifi \
+		--java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' \
+		--jar ace.jar \
+		--pwd '/usr/lib/unifi'
 
 	if use system-mongodb; then
 		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service