[gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/

["Ben Kohler" <bkohler@gentoo.org>]

commit:     2bc3a8802dd93269fef17cdf780fbc8eb748a647
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 16:07:05 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 16:07:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc3a880

net-wireless/unifi: bump to 6.1.26, drop old

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-wireless/unifi/Manifest                        |  4 +-
 net-wireless/unifi/unifi-6.0.33.ebuild             | 68 ----------------------
 net-wireless/unifi/unifi-6.0.36.ebuild             | 68 ----------------------
 .../{unifi-6.1.23.ebuild => unifi-6.1.26.ebuild}   |  2 +-
 4 files changed, 2 insertions(+), 140 deletions(-)

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 3c0d8c1c8a0..885e8e359d5 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,7 +1,5 @@
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 DIST unifi-6.0.28.zip 227017958 BLAKE2B cf70d5cbcefcf2a89f1a38763898d3f59f4be1b99b5cca7a7393a6e8ef705090aeb60f59c0a67b95ae967ff575da0749bbf327d53247c1a7128f01043145bebc SHA512 edb332ccc6624f73c77976a564c157d37f2a11068c2f8af1fa98209efb3b4e01922ab75309f85e5bd053ec50e9eeb433fcaa22bb2c0a27a6ee4de8946a876d46
-DIST unifi-6.0.33.zip 229743711 BLAKE2B da2a0275f2744c13a3414c8397ab321eaebc3c05da1d117cec2cbcbefe684c8695a8e62dfa853413559943bdd823b49dd6b6e242fd922419004562354b528903 SHA512 ee6d95c2d2254343c1ee69d543099f1b01ba8b702de5dca3715cfd1aebca10eaeba1477679e28b18374e7dd2f8fb2a545a7d660b1700d9d21f5d4d21be3360a3
 DIST unifi-6.0.34.zip 230272618 BLAKE2B c591bd1b51c00e7d01ca75e27c956f3867047499436193a509d9d29594afa4c82c89f36c6884a10a7eb705ee4b1e5bfa345a0592d1dac4011298b4a564f21b12 SHA512 3806962c6e173240d519b395b15946d6a62fe569ef36c8c2681aed746ecd357bd747be5188ffaf51d2641fa997f953a8efbc7ce9a1bdd786605b262bbe7eeaf8
-DIST unifi-6.0.36.zip 232051560 BLAKE2B 94a2780c40588c2afb64993d839dedb6064f437cdf29cd6dd9124ef3944ae25d1942f3eed0ea080007800575b37d9063b3f007b91d02bc30d35179cb4263d873 SHA512 bab68b649c84cf62e4e646c62a8adf8006ab6d434907352f3970e7c81c779b4dcbaf8d1b5558cf69e7daede9c96fe0b02216700cb62de5659cf496dc899ec2ee
-DIST unifi-6.1.23.zip 235365469 BLAKE2B 950f34ee30155c77c82886d22bf18d89473339c7b94d51381983ce1635a1c1774b702b2da6f8d6120c59e1909735ede55198225d5b0614976ef02dd8daddd711 SHA512 a6851964fe28e79c3fc30bee5b6e694b52afbb8f14f6f6aa349ddac82f57177765ddf6480973798a0f3af23c9d3308e4580c57d132abaf947b7fa0bb818ba207
 DIST unifi-6.1.25.zip 235499342 BLAKE2B 77de866d2c04136b32e06698f3c20563dc68cf1bf5d260a23cad46ee208c5d4012d788c67dc3324578d2c944e8eceecf6b5473f4d77304e10ee15a3b14286fc7 SHA512 0eb916f06546a5b33da664ada77391a69d21c9ec4545244a1a6f55ceeb7546fe77a07a121df03ba606e98ddbd23429207f86bb5b2c24ddfb3174eb2d00c5daaf
+DIST unifi-6.1.26.zip 243498936 BLAKE2B 72a17f02279ecedd8f876df85167824a03abebb2816e68fcbfff11923b00c1e0b80b7357e48a4e044f0835e3e0054bd0ab034bd8fb3d67289bf61b4804ce9a87 SHA512 9ea5a7307ad507f08e4d39805bdf776eaa50895513e4c086d94527e28ae93b1f97e3d1b23ff314ed03ea560638b8cb44fc16bf4ff8f7746035e8b5de9b31321b

diff --git a/net-wireless/unifi/unifi-6.0.33.ebuild b/net-wireless/unifi/unifi-6.0.33.ebuild
deleted file mode 100644
index 79e78a03317..00000000000
--- a/net-wireless/unifi/unifi-6.0.33.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-de74cf6ccb"
-
-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/6.0"
-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.0.36.ebuild b/net-wireless/unifi/unifi-6.0.36.ebuild
deleted file mode 100644
index 7c4f171b97d..00000000000
--- a/net-wireless/unifi/unifi-6.0.36.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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="-35c9dd953e"
-
-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/6.0"
-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.1.23.ebuild b/net-wireless/unifi/unifi-6.1.26.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-6.1.23.ebuild
rename to net-wireless/unifi/unifi-6.1.26.ebuild
index e4e14bc04e6..6663cad8121 100644
--- a/net-wireless/unifi/unifi-6.1.23.ebuild
+++ b/net-wireless/unifi/unifi-6.1.26.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # Set this var for any releases except stable
-RC_SUFFIX="-091dfa86dd"
+RC_SUFFIX="-a072032c50"
 
 inherit systemd