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

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

commit:     19b6f6cbd7125dc7230952009383c97b41c7810b
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 13:55:12 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 13:57:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b6f6cb

net-wireless/unifi: bump to 5.10.25 & 5.11.29, drop old

Closes: https://bugs.gentoo.org/687620
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 net-wireless/unifi/Manifest                        |  5 +-
 .../{unifi-5.10.21.ebuild => unifi-5.10.25.ebuild} |  6 +-
 .../{unifi-5.11.18.ebuild => unifi-5.11.29.ebuild} |  4 +-
 net-wireless/unifi/unifi-5.6.40.ebuild             | 70 ----------------------
 4 files changed, 7 insertions(+), 78 deletions(-)

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 34327ef91a2..9cd8a790c94 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,7 +1,6 @@
-DIST unifi-5.10.21.zip 91783841 BLAKE2B 92d4c886fe10e65a3517ab8ee21ca999751e8ac35d8d7a9c1355a586f2ac31ccd12b4337673308a620866757fa4e4d34a559ed1ec23f04bfe07eb2a16f1018d3 SHA512 239493242d73347639eb99bcb3d01f852cddebd33efd5687759e6520f6f36e7c152588321d0464f63f3369927e48070d62dcb5cfaee74fb16cbceda8725b0a9a
 DIST unifi-5.10.23.zip 91775246 BLAKE2B 842ffd4c63b19d480fa29330fa66245cbfdd840f719d5c9e1bd59972f7dba6d2a425c22097a3afa01aab719bdad162dced938e1406716a7892a6a30e58797f61 SHA512 be4a4f855b741dcd86f46a082838a770c1b622f8f1e860f1005e8fbf55306a28de98a3ba2a704af21e6badd7d342465520c42e481b2bec50ec4439d8f784edc3
 DIST unifi-5.10.24.zip 91779832 BLAKE2B 2e20b10036d185b2fa282b0bf3f1b7538482a5ed07c334f1d681957abc7e63a6de97709c2c35fb4b1e2186351b3fd47460d6c21be5483301b0ff008ade97bb63 SHA512 db71422339ab93cd285ae62715c4066075d6602f16767e765461e1121d75f44c348f10ddd0033626b35e199df4da7b6e26efe350e8052eab0ee98471939d44b6
-DIST unifi-5.11.18.zip 99865634 BLAKE2B 41403e420441793685cb27347238e5e8243083fef2386401be05705571921d0d0317c2b786080b8b2181dda76324cc0592f03729460c732d5b454d22f6682e49 SHA512 33c332a3719c8500fc918d93a40dddb1465e108b13faa969e311a47ed5781842297700293cefad6a13feb2ae267a11b929c103352e055a78d392c8b8c1bbac16
+DIST unifi-5.10.25.zip 91781146 BLAKE2B 3a4166f3d96c1fe0e7a9afd7e85266e6dacaa4bad44af1cfd72cd22f8a2f5fae4ca4534c5ae09ca50ddc216e067e5e5598e0cc3ea1bcb96802b7379dca03426b SHA512 2a88c8640b10c2b596c40c3e4594062f9828db3e2be5dd159dcf7275b3796c7ef8714c60c27de980672fb1ccc88e9fa7640fc74e61e6d994e3fb1214d0e0bd48
 DIST unifi-5.11.26.zip 111562451 BLAKE2B f4a7788f8ff14e2eadc0da28fdf11c54ff22ada8bfc7300dc07aa87058d9d207b66d3687625c27920f60b46035756c49b69342740dd28cb51f2ad427f7d7d550 SHA512 3704e1b19b73a3c572a3695b21ecfae5948fed0ebfb305f234865c096688b5a87f4ca9c59ba79d28d1ab8571ecd61c555196a4b2a21e870797fd0bbd71fe4b5d
-DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
+DIST unifi-5.11.29.zip 111460891 BLAKE2B 5740b760570d8bc94c54c679e846cefcaff6e36a5c07921e997df0bfc8b994803c35c3d486d2130cae21c8731156728e2a95cc62e033bf4c28ef485347ba1a35 SHA512 73ddf723e9e6de8dc95c33a54eaa82bcc11304488fe2e6dfadb2eaf906f34997b7815def8ec765f460fab6a77a311aaf617aba27bbee5636205ca45c3d4bd486
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989

diff --git a/net-wireless/unifi/unifi-5.10.21.ebuild b/net-wireless/unifi/unifi-5.10.25.ebuild
similarity index 94%
rename from net-wireless/unifi/unifi-5.10.21.ebuild
rename to net-wireless/unifi/unifi-5.10.25.ebuild
index 9a5e5ad2579..0d6895425ac 100644
--- a/net-wireless/unifi/unifi-5.10.21.ebuild
+++ b/net-wireless/unifi/unifi-5.10.25.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-77f3252525"
+# Used when it's an unstable, beta or release candidate
+RC_SUFFIX="-48e13746e9"
 
 inherit systemd user
 
@@ -12,7 +12,7 @@ DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
 HOMEPAGE="https://www.ubnt.com"
 SRC_URI="https://dl.ubnt.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/5.10"
 IUSE="systemd"

diff --git a/net-wireless/unifi/unifi-5.11.18.ebuild b/net-wireless/unifi/unifi-5.11.29.ebuild
similarity index 95%
rename from net-wireless/unifi/unifi-5.11.18.ebuild
rename to net-wireless/unifi/unifi-5.11.29.ebuild
index 16cf23cf51d..2949de79f39 100644
--- a/net-wireless/unifi/unifi-5.11.18.ebuild
+++ b/net-wireless/unifi/unifi-5.11.29.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-996baf2ca5"
+# Set this var for any releases except stable
+RC_SUFFIX="-633651c4a7"
 
 inherit systemd user
 

diff --git a/net-wireless/unifi/unifi-5.6.40.ebuild b/net-wireless/unifi/unifi-5.6.40.ebuild
deleted file mode 100644
index 989ef2ce57a..00000000000
--- a/net-wireless/unifi/unifi-5.6.40.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-#RC_SUFFIX=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.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.6"
-
-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/armhf lib/native/{Mac,Windows} || die
-
-	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
-}