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

[Ben Kohler]

commit:     a385b768c95602affef6b80db5a184a48afff6ae
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  8 19:14:37 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 19:14:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a385b768

net-wireless/unifi: bump to 5.9.22, prune old

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 net-wireless/unifi/Manifest                        |  2 +-
 net-wireless/unifi/unifi-5.9.16.ebuild             | 69 ----------------------
 .../{unifi-5.9.20.ebuild => unifi-5.9.22.ebuild}   |  6 +-
 3 files changed, 6 insertions(+), 71 deletions(-)

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index a0ed5229d4b..9447cafff58 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,5 +1,5 @@
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 
377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216
 SHA512 
456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
 DIST unifi-5.8.25.zip 80091828 BLAKE2B 
f675ff304c2e7a87da7ed02bd4873015a1155949e6b3b2b4561db06565197e1660512cbea118a50bd975de7d6268a090fad6742e3a82bb4fdf20f19f39099ae2
 SHA512 
4572ebe55971d14ca76f39cf298eedf879c4ad597ac87e4fe13167f8219b8f822f3478002ccda7ca1d72daba05efa52932e6d163c1e2b5ac5d289020e351044f
 DIST unifi-5.8.28.zip 80106124 BLAKE2B 
9cf6a433bf22d6946572f277759f032f9c7ac3bcc853deaacf2b858d95609f9cb6bbceb2258224db5a56b5d161daec0ff18320ecf3bc589ce045426d3ca9ed3c
 SHA512 
b76bff822971896d7b0a0837aba6075aaa60a185dc25a8849ec12b34b36a9ffdb84cf3c71ec65ad81bcd068aa9917574eee109582bad341bf2edd0ffca00acd6
-DIST unifi-5.9.16.zip 103019203 BLAKE2B 
0108626a318a728757b3cebed20f55e6059a7c28ebedd7331d760e2a0b90226656cd5fd919b7759ebd7335f5f58c5cfdcf2775dd1f55bf960e41b136cf867a32
 SHA512 
dadac87b1f7c4c33b0df2f6593fd8de16d82876777b35df63da273741240e7881559b7ccea5a1dbc05d5d386bfd8fd8e908be09f390f044b2001b1b7d358a49f
 DIST unifi-5.9.20.zip 103033996 BLAKE2B 
25058eb76580afadcfb0a49ab6cb654afd56084a3b912cc151e78a0b9c571d89d774a0a5fd80c9354a9d4fa80cc32076b67c1e7b1a79102a1eeb4208922e43ff
 SHA512 
cd6c886f14e912abf4d94db8ef6bab63d2c5d70c7116e00457d1c43331f66882a3dd3d8e6b5769d17981bd9d7d3417448c4cdf5cf456b4e035a602431debc578
+DIST unifi-5.9.22.zip 103036220 BLAKE2B 
1f9df10787a9b5c52ddf786a478dc6a1a08be8f1cb36e4112906294510c2e7f85f5288f9a1bb1796b9902b40b17036ef5051dc4e7d0c970647d0cdab1362ad1b
 SHA512 
9287cfee865aff9cb5612b8559a318d288253206da3a16f7f490146be63886fdd84d686f9e3cfd7c150af3aebcc9fbf3ef99102ca427717742e770578cbc3b47

diff --git a/net-wireless/unifi/unifi-5.9.16.ebuild 
b/net-wireless/unifi/unifi-5.9.16.ebuild
deleted file mode 100644
index 75e6ef93473..00000000000
--- a/net-wireless/unifi/unifi-5.9.16.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="-23dd7b8e57"
-
-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"
-
-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.9"
-
-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
-
-       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.9.20.ebuild 
b/net-wireless/unifi/unifi-5.9.22.ebuild
similarity index 93%
rename from net-wireless/unifi/unifi-5.9.20.ebuild
rename to net-wireless/unifi/unifi-5.9.22.ebuild
index b07e93928b2..945b5eba0c3 100644
--- a/net-wireless/unifi/unifi-5.9.20.ebuild
+++ b/net-wireless/unifi/unifi-5.9.22.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-5975c092ea"
+RC_SUFFIX="-d2a4718971"
 
 inherit systemd user
 
@@ -15,6 +15,7 @@ 
SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 KEYWORDS="~amd64 ~x86"
 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.9"
+IUSE="systemd"
 
 RDEPEND="dev-db/mongodb
        virtual/jre:1.8"
@@ -37,6 +38,9 @@ pkg_setup() {
 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
 }