gentoo resync : 25.04.2020

5 files changed, 12 insertions, 162 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 4b60745bc53e..03f393bff82c 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,19 +1,15 @@
-AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca9c7ea9e819d05dbcfb2c573be79140ad5fcab5e86a353e8ee591f581160e10ed9d8a011629bfa7d SHA512 4a799730074e4d2b0143bf77e9f7540819e042a7edcfc8bdc678a028c3752b1f96184f76d8a0557f6aeedbe333c91a1704aef8b8c873cce4abce6c3214ede3ce
+AUX mongod-wrapper 305 BLAKE2B 3bd1bfe831541e0e2c49b3875b23578e3b36307947ee7f0800b08331cd2f4aba627d9b263a06447c82da723bfba09f0cb5c682bb36a2e0e8c63d9360fe8fd0b0 SHA512 5089b8005978f97158353b12968f3994bd9d6ec66bbc899775846af297aba0fc938994f2ccb57c1f924af38781741b646dc70896029f9f86465043df3bd2fe19
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.12.35.zip 114691419 BLAKE2B 0400f78cbc880f52e8e352a1b8ef925c293b5a51137aaba89c4e26f7b213661e2b9e5caf09cfc6af0f74456e1217f4e2b8f398c11ebe32b1b6a17153cef9e920 SHA512 4e6b3726e5b6e43c1688fbdefe816eedb1cefc671bc9f861cc06f1c4f52a903670e033c2c5b2c66c5ed2c3f42e8f573e6245fe483a32a0df33283d46ccb5d96a
-DIST unifi-5.12.46.zip 115612217 BLAKE2B 86facd4f21cf66091acfb4bfa5155188b30b1a33848ff0c24c393abf53f5efb114aca86b43b6040961fd9afe6ba1e1a42280f20f48c21772f884edd52b10b25c SHA512 05135f75bf6484810ff66b58452ea8bca1c4e47d5fa7a955bdf9653777f80a7fa355bdaa6586e3a0d98bdcf69cce4e28cf3d14cf8204b82591ba6a08307deef3
-DIST unifi-5.12.60.zip 117404012 BLAKE2B 2ef8fbbf3c6be963929678e1e563ec4e8716e385a61ae770fdf275d166a8b0db3bdbbd043a61bf9aca347a2383712733de5b80712f2ce9201772956f1e6fd2a1 SHA512 d6c172f69b13941fa1c6a69dc1a21111995a94f9a42024c8814cbda6e68796a2244a08e6acd00dc5af45b68164157d1cd5d04b343aeb4086cbd71b72c5af2904
 DIST unifi-5.12.66.zip 117434749 BLAKE2B 6d48632b7add5f3943574decb66aeb209c570151ee4f1c4dca10feeff924ba1946bc7bd1aae8ce36ac0a20ce2765da9953ded073086a82fd59ed08a57e30965d SHA512 138882bd7a67900ff47e5b02644a7e1941aef98d49ee6e56fa41b462ffd2e92e073e8064bfd846f2c369ef3491b3adc3032dd2ca9b8980058ca88d1925367ca0
 DIST unifi-5.13.10.zip 126198214 BLAKE2B 168baabd0523091ee41b75809c9bbe9941ea0dd9fa97807c826ad1be3afee868ac0932b5068ddcbfd8cfd9c6e3c7838c663c7b248e9cd21ea90cac59e99ed99d SHA512 08d4053201671380c152597ed6a795f593a03b67488d3d21c1f1320bc2ca980e9985e86e45eb6ef5582184c371a33eedbecfc867aac6c9129f653b84c1a87fcc
-DIST unifi-5.13.9.zip 117147673 BLAKE2B d05f0e6d0bdada8e1e02f78f99d59f02e259f9c6f6e78827a7288520e393e0811f37501004b3914f5df4ec2065728b28d5a9eb3a376d1f83b174ab7e07215bea SHA512 363b8019ba0854c289b2ec375739d0a86353fd876f3b59c7d8dd191da40866433e2222d98c1888d5d45a5def1209c1c0d7be733a71c3f5749c7b4def682d195e
+DIST unifi-5.13.18.zip 150552474 BLAKE2B caec9f360b2db5d7e155ef29c7a6d5851a0c7de8a476a018b33a5423f0052fb46a55deadf74dba2d51763d4a675ea7b6ba2d9195087b9be7a9280ffe5c8b5c27 SHA512 deb08448d48a49be920f8e300117fe4326f8d1bb58117e5fbaddc6db268d514ebce85b605ec26248259e2be51b01605045c56e3f84bd7249bee25a08b4784535
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.12.35.ebuild 1777 BLAKE2B 84159e527fa3a125543f3335bb8fb17ceac1634ce143ffc262a2caf5c6da27e452ce6adf999a205b187bad5623fdde25f97bd83f46dd93ee448fd83c84ed4f50 SHA512 a4324b8391a72d073fb67b629326683335bafa66c013483f689c95fdd59caf7e4c697f2ee74d63ea68075a7660dc5e4034f7569043cc80e147a0df3fa4717f87
-EBUILD unifi-5.12.46.ebuild 1789 BLAKE2B 977f4d7e280eae27045fbdd0507862166579c4d029b35a6c39de7091ca15000510604f175859709183686956456d4d90b6bcb4c43cbbba59fdad99f100791429 SHA512 8bd4ffa29ba3c36b2fc0d9555aa9b06844ecf6d5e6bc1ce187187616fea96ac7e580f015accc671eaef6dbe70031a8c29553e563d4332483761f0194fd68166d
-EBUILD unifi-5.12.60.ebuild 1789 BLAKE2B 6ed0184ca911a3ce1f3f043e683768c7df6a21a3a4b5781f49c903d3f750ec869ae5dbaaad3f44cbb7b5c13ad0d8be6a6fec6fdefa0ddf38a83d3b85f11937e1 SHA512 71d2dcb21db8e1105293c827add5d5af4444546b8bad180a858e2961623bf464fa4f583286978bb05904bfb250da49eedccea681eea6aba3fddb54fb07446cf1
 EBUILD unifi-5.12.66.ebuild 1789 BLAKE2B 512679ecfc4f0b438db8ff1f7049c4ec8da2d64ddc3e07c22997a96aacccac966452c972b37468e27249e777fe9963e8626034f4108c34d8588e5872480d15c0 SHA512 4b4c0cae00f63bb28a2bf0d800b9703b653ef7ca54c5fc224b8bb9daf5431ff59f50bcf7ed076f9aa73c6d552691122026d7ab616801c808141b9b25113869a2
 EBUILD unifi-5.13.10.ebuild 1789 BLAKE2B 4161583b6433dab461180e7e22538b0860196efa57e87f4fbe85a128c8b684058e98c579559869be72b97c4ad4eb5b555719e8c6ee4060959bd3b833e87e2ccf SHA512 51cb921e0ff5e2307e122fc113ea63df0e318dec8767a96b91269f2d68c7a399878447232a32dc9b4ee7c2cfe36a9b3e63a0fcdee7250d747bc5b64c6259e403
-EBUILD unifi-5.13.9.ebuild 1789 BLAKE2B a0cda416e4a6f95c35ab8ab296b70f15f9191011db5652cd1be5a1b8f1e142c4cd050f994625c500fddfc4491a2cfbcfe91677b6736178625b6914b3d3af5769 SHA512 2152629d311b8b98997c20e434f79e5fd49200a962def20c0cb631be45460baaff26193585a1cd4b5d3226a4679b0699c2acc7027c2a197242c0c53f26dfa7eb
+EBUILD unifi-5.13.18.ebuild 1567 BLAKE2B 87a846f511bde38c1126e8d8ed242f6c9a6fea4b88a82f2b7ccdddf888bf14e9f2f0c8caa88130ec4003763243616ce4e59363af58e18e3d0ad1407e78e71e8f SHA512 63e0dbdc27bfd6e5e5ebb9cab20dbc444572be884cf97b50314aec04b5a79534c1e2118ab2f794500acbb239c2a0637071fdc9929017626274acc09e641728a9
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/files/mongod-wrapper b/net-wireless/unifi/files/mongod-wrapper
index 21637de50a0f..e8d65bb8aec9 100644
--- a/net-wireless/unifi/files/mongod-wrapper
+++ b/net-wireless/unifi/files/mongod-wrapper
@@ -2,5 +2,10 @@
 
 # Remove --nohttpinterface argument, since it does not exist on MongoDB >= 3.6.x anymore
 # See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-remove_nohttpinterface_arg=$(echo $* | sed -e 's/--nohttpinterface//')
-/usr/bin/mongod ${remove_nohttpinterface_arg}
+for arg do
+	shift
+	[ "${arg}" = "--nohttpinterface" ] && continue
+	set -- "$@" "${arg}"
+done
+
+exec /usr/bin/mongod "$@"
diff --git a/net-wireless/unifi/unifi-5.12.46.ebuild b/net-wireless/unifi/unifi-5.12.46.ebuild
deleted file mode 100644
index af5d172ef31a..000000000000
--- a/net-wireless/unifi/unifi-5.12.46.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="-d9f4b84b08"
-
-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.12"
-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.12.60.ebuild b/net-wireless/unifi/unifi-5.12.60.ebuild
deleted file mode 100644
index a311dd5a8da4..000000000000
--- a/net-wireless/unifi/unifi-5.12.60.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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="-e24b0812ee"
-
-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.12"
-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.13.9.ebuild b/net-wireless/unifi/unifi-5.13.18.ebuild
index bd0a105748fe..a17d29e674b1 100644
--- a/net-wireless/unifi/unifi-5.13.9.ebuild
+++ b/net-wireless/unifi/unifi-5.13.18.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-37cd925fb5"
+RC_SUFFIX="-b0197fba32"
 
 inherit systemd
 
@@ -45,13 +45,8 @@ src_prepare() {
 }
 
 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
+	doins -r bin dl lib webapps
 
 	diropts -o unifi -g unifi
 	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi