Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/unifi/
Date: Mon, 30 Sep 2019 20:24:16
Message-Id: 1569875039.6bd68dcc8222a4e4c200b26db7393f2caacf3f35.bkohler@gentoo
commit:     6bd68dcc8222a4e4c200b26db7393f2caacf3f35
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 20:23:33 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Sep 30 20:23:59 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd68dcc

net-wireless/unifi: bump to 5.11.50 & 5.12.11, drop old

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

 net-wireless/unifi/Manifest                        |  5 +-
 net-wireless/unifi/unifi-5.11.47.ebuild            | 73 ---------------------
 net-wireless/unifi/unifi-5.11.48.ebuild            | 73 ---------------------
 ...nifi-5.11.46-r1.ebuild => unifi-5.11.50.ebuild} |  2 +-
 ...unifi-5.12.5-r1.ebuild => unifi-5.12.11.ebuild} |  2 +-
 net-wireless/unifi/unifi-5.12.5.ebuild             | 74 ----------------------
 6 files changed, 4 insertions(+), 225 deletions(-)

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index eca20d43496..c93ac4e4d0c 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,5 +1,4 @@
 DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
-DIST unifi-5.11.47.zip 112374653 BLAKE2B 42e981f526dcdc7f7c35b7884aaa81cd96de4105d8700e8f8625a1fbd14640d248d46153328dbc852591f96221ab5753b65e2038d948a3d5b091f17b3e47e4bb SHA512 ec2a1f8e3a3c3bf5cf8ab25ece9ee164fbaaeef4b03585d2ff9add74a34992a24fe0becbd28b212b470d4fd87eea67e4291724addc8b12e5d1c463a73817569c
-DIST unifi-5.11.48.zip 112379777 BLAKE2B da30a094350229aebdda958a966412a350c918d6d6cef775fce675bb139cb13f27dc5e3efbd7b68eb0a1b75adb11f9352cf330ca45af89bb9690c9d4a2505e8c SHA512 f09e2fd280cc6c1859d89536f9c517308c6945f7f4b38f9ef46a8231551284049baf50309ecc3cf7f9523b5c9f85758a56ee2520652c10ad22035491d8ee32d9
-DIST unifi-5.12.5.zip 113544662 BLAKE2B 7b79a1b107927fbb6ee2c7bb531901b5cedef0768146b369e8653e0e34e41758914b5108a01681e806c117dd80561091b6064bffe779e913774d61ff2fba369d SHA512 ff3ab833ce13889f1f6c2d1ee71f28bf8d48789c053c84b1f427e95e09aedb4d9f66a640a1891262f31300af50859581dc874a613f5f92b3bcf18b05c0140052
+DIST unifi-5.11.50.zip 112355461 BLAKE2B 5d63c3a0488a1da7ed696993982728cd1b7449d7af65ee1a49d065fd928feef5628a84d5add7d670ddc5bed3d9df2084fd0905a417cde22737dd74de15a74b39 SHA512 509e54b1237a41bea08d96eaa9efacbd45d823dc4e2d6965ac577aab159bf907378322aa6ad15a776dd0fc725a6737951f2d4cdafe073443a18e36d2d4827ead
+DIST unifi-5.12.11.zip 114358218 BLAKE2B 197a224154abdd0eab050ef4aabe9cd5a28e6705d165008f4456bd3c1279570a30a841e47458a9a5d355b2580d8715a032dd2385ee91a63f79961dd16113869a SHA512 7040017de149231d76d2a3346301401f4f28744983882517cf939a1cb7f4459e1fa41d377a9e4895a1a8c157e694274310a8fa78aa0d147d294fc7a0412a19ce
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989

diff --git a/net-wireless/unifi/unifi-5.11.47.ebuild b/net-wireless/unifi/unifi-5.11.47.ebuild
deleted file mode 100644
index dd8f7198dd7..00000000000
--- a/net-wireless/unifi/unifi-5.11.47.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-248db21f47"
-
-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/5.11"
-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() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r 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-5.11.48.ebuild b/net-wireless/unifi/unifi-5.11.48.ebuild
deleted file mode 100644
index 793968b05c2..00000000000
--- a/net-wireless/unifi/unifi-5.11.48.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-0023c8f3bf"
-
-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/5.11"
-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() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r 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-5.11.46-r1.ebuild b/net-wireless/unifi/unifi-5.11.50.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-5.11.46-r1.ebuild
rename to net-wireless/unifi/unifi-5.11.50.ebuild
index efe877dff67..f6e16df92f3 100644
--- a/net-wireless/unifi/unifi-5.11.46-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.11.50.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-a5113ebc10"
+RC_SUFFIX="-c9dac5377d"
 
 inherit systemd
 

diff --git a/net-wireless/unifi/unifi-5.12.5-r1.ebuild b/net-wireless/unifi/unifi-5.12.11.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-5.12.5-r1.ebuild
rename to net-wireless/unifi/unifi-5.12.11.ebuild
index 8abd17d3590..75d4c325875 100644
--- a/net-wireless/unifi/unifi-5.12.5-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.12.11.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-802c4da1a2"
+RC_SUFFIX="-f386af6a04"
 
 inherit systemd
 

diff --git a/net-wireless/unifi/unifi-5.12.5.ebuild b/net-wireless/unifi/unifi-5.12.5.ebuild
deleted file mode 100644
index 545a8e5589e..00000000000
--- a/net-wireless/unifi/unifi-5.12.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this var for any releases except stable
-RC_SUFFIX="-802c4da1a2"
-
-inherit systemd user
-
-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/5.12"
-IUSE="systemd"
-
-RDEPEND="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"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-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() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r 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
-}