gentoo resync : 04.05.2019

6 files changed, 7 insertions, 239 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index c2f703cb4cd3..8d11727539f3 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,20 +2,14 @@ AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca
 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.10.19.zip 91782631 BLAKE2B d77b93a5a12ce492873fa744bbb20c5265425b46ebeb0394ff2a0d0cc74d37f933e473f1ba284c687f2d38cb81d2a11b25ab982e6e01397c9282b387e4c3a150 SHA512 b94a82c1a2c151056d60b47a234b45cc82f20f9fa8e198ae630bea0f9a429daa6a3fcb05d31470b974a49d345b54826e57e4ebd4ec06c43436987ebff14c2bce
-DIST unifi-5.10.20.zip 91796706 BLAKE2B 0b425d423a9ffde722549681ecf67b07e01f497c232ff4d760cbc5d61f43a94e753bc5c018739414d169a704fceb16f5844230434519b3645acd5ef42dcb7ce5 SHA512 e43141177d5ad017925bd2cb8315ae4308df96d7185b895b1fd0042bb80da1c04beb143b5265a0d72efc2515be4db0c6ca37cab4fea5a1ccac837b10c2d4b4f6
 DIST unifi-5.10.21.zip 91783841 BLAKE2B 92d4c886fe10e65a3517ab8ee21ca999751e8ac35d8d7a9c1355a586f2ac31ccd12b4337673308a620866757fa4e4d34a559ed1ec23f04bfe07eb2a16f1018d3 SHA512 239493242d73347639eb99bcb3d01f852cddebd33efd5687759e6520f6f36e7c152588321d0464f63f3369927e48070d62dcb5cfaee74fb16cbceda8725b0a9a
-DIST unifi-5.10.22.zip 91773238 BLAKE2B 45ad8b5e08e84f56be4a12da584e6ea47d103f974b63d24180bbabb5db858797be1a776226b0e99cbcf71087fdfd018a0d563b5b7350a718980ebbf5ca9be1a0 SHA512 f5c058fc2fbe2bc80f501315e21228b0d0d9e712ff7f417f315297dae508f43a21effc7bb4f3a98c991ff1174c5819c60b0b29bc7ad95a3a8a448422edb14d77
 DIST unifi-5.10.23.zip 91775246 BLAKE2B 842ffd4c63b19d480fa29330fa66245cbfdd840f719d5c9e1bd59972f7dba6d2a425c22097a3afa01aab719bdad162dced938e1406716a7892a6a30e58797f61 SHA512 be4a4f855b741dcd86f46a082838a770c1b622f8f1e860f1005e8fbf55306a28de98a3ba2a704af21e6badd7d342465520c42e481b2bec50ec4439d8f784edc3
-DIST unifi-5.11.10.zip 99478808 BLAKE2B 0dd8f1c6aec105acaa41baa2f09c652ed7163dc6676427d8d13f4ecfee32140590bd006ec26def302b32af0c278dd50f630eed9e3241f7ea40c4895ce4c8c4a3 SHA512 57e2ad75519c484f0ff3b01ba7dfef0a015d7f6d4f5f3072df5735b4ed66ce722ba69504b360dfbf12ef593d83377213e1439066ca7507712b6280dfd3186bd2
 DIST unifi-5.11.18.zip 99865634 BLAKE2B 41403e420441793685cb27347238e5e8243083fef2386401be05705571921d0d0317c2b786080b8b2181dda76324cc0592f03729460c732d5b454d22f6682e49 SHA512 33c332a3719c8500fc918d93a40dddb1465e108b13faa969e311a47ed5781842297700293cefad6a13feb2ae267a11b929c103352e055a78d392c8b8c1bbac16
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
-EBUILD unifi-5.10.19.ebuild 1835 BLAKE2B 05967e03bc45cf5e285b62015f6275005c70a3a4f7edb1ccaef3e5f2862ab0a4f2b606e8f37bf1907aad15199f3fcf735ae0f799edc283d4d78fd06fb7785e26 SHA512 eadbf42d4857fbf899bd3c86be14ff84d80a1627d36e6348fbb6aa84f2e790e6cf6ca8ccfe3a4d554fe6c8be9a8c242344d4897db9107e18959e5e656ce989a6
-EBUILD unifi-5.10.20.ebuild 1834 BLAKE2B 3d56bade4dce79c6c3a769f150d04c054a35d96fe911bf4e9af2cad0746c972828317cd28c674bb4884849297e1c9853e81efbb3ae0fcab0e25abee20e0a972f SHA512 aeea508ac3bb4879e4ab2ebb8f7820c2bdf7d06b565b28cc563c8bb90afcba33c3e75e35317ee87f162df64e334e52ace38cac15c1c645bf6c6b1ae28455440c
-EBUILD unifi-5.10.21.ebuild 1846 BLAKE2B 6e69f1f19e589ad1c0f3cb3e712e3b62fd9d221f90ef324f0ddd4daa78b22f4d66e9866d94d31301fe3d7722aeb8a938e32d73e992e6a2f9622461fcbd25226e SHA512 3bad1ac3e182d2155f2825d6ce472a7fe42d52a4cd487fb82ddb0e490566fc55c3c89f6aaf01033ae62cee40117e4361ce335e14365399576d6ea84fa71be5a1
-EBUILD unifi-5.10.22.ebuild 1846 BLAKE2B a9dbae6d109c032fbf6a84943be1975a6425cf4d411e876232c01041c2d85b8f91ef9aaeb9b37ad2b44be6c7f9644300728ce5ddd2f2b146f0fc1ce4d03a7557 SHA512 9b05deee0cbbab32999d1aedc026893603308221fb0e0213204d69af4e7119c5a5ccd365ccb39e10e80515387d542f33a26705937119070e3835a5790beabd3a
+DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
+EBUILD unifi-5.10.21.ebuild 1845 BLAKE2B 2c5b5165cea1d75d627ed6302ff6d008d74cb85f55687ca129b1cf94f4b3150fd07d0ba0b02673b5f96b7cdd1f6ed1a03fcba27614d9994477f5ed2a9bb6f998 SHA512 4868f8b1475143ab02556d2b0e3ab8c5b61e7236d0cc3fb47c9f5e3c7416a01217eb20f6b4aae3eff0a644b9628805f8ce8ed867f5665ca83c308af93db7fe26
 EBUILD unifi-5.10.23.ebuild 1845 BLAKE2B 955c3f77ae3c78656da2eb17177d9642c37b36ee5b3fa60b832de3ce2be8c0434bd0644e7928bfbb9c4711d62fb717c73b38958845356743d8e5e6e4922f0aca SHA512 aaf91c6c1b388b707ad112e473e9453fd1d5e1cd700a48bb06fd4d12857492019eb17f16fef92d1608046d0df46a53a59e70f18ba7fe2fa2566478a19f3fa697
-EBUILD unifi-5.11.10-r1.ebuild 1846 BLAKE2B 138364ca4887cbb622c488301194314f9d7d1451bb46f7e39c93917e1571b0245bc4574e8ca7b5e163bbeac17284ee3f7436556dca244b5ea7bf30f1c86f8a91 SHA512 67a9145241203def3776d018355d407561a79b3273ddd7f7ae3d2cd2898211e8ef05108e2da08ab499435227165ba6686b1c7c756e0e8eb00f65b471c8f7577f
 EBUILD unifi-5.11.18.ebuild 1846 BLAKE2B 001f3756c66a102d3df5767a7b226b87af54fedca02caabf35d2ba8551c54cbb6cc5c62a0e740e23938ff8c885fc4555ae923cdb57bee73c0d3704de2e3fd460 SHA512 28779be98780d1280279b171b49cde0cb0d30d04c238f64662f3c3decc8b1464a238e5217bfdb6cffe4d91a665fe1a6bfdedfc8a81f937226f0553de3ba587ac
 EBUILD unifi-5.6.40.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
+EBUILD unifi-5.6.42.ebuild 1732 BLAKE2B 4648fd0ae05196b00855dcdcbfef9e04d3f0cc38a72450b8cee4bb46814d590fc6bfc7156a9feb666c0d252200c393c319166e9fa02a70d8ead6cddae7bc9d2a SHA512 6e1cbbc3473dec78f01a9f1798d712ad94b2bc9bbda591d429bbed500fe843264425fe7de258cce048f4c41324415c022dcba8fc1778f5936f94fa45418a3933
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.10.19.ebuild b/net-wireless/unifi/unifi-5.10.19.ebuild
deleted file mode 100644
index 27baa577f0bf..000000000000
--- a/net-wireless/unifi/unifi-5.10.19.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
-
-# 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.10"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.10.20.ebuild b/net-wireless/unifi/unifi-5.10.20.ebuild
deleted file mode 100644
index 113130277815..000000000000
--- a/net-wireless/unifi/unifi-5.10.20.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
-
-# 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.10"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.10.21.ebuild b/net-wireless/unifi/unifi-5.10.21.ebuild
index 144c4313d622..9a5e5ad25799 100644
--- a/net-wireless/unifi/unifi-5.10.21.ebuild
+++ b/net-wireless/unifi/unifi-5.10.21.ebuild
@@ -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.10-r1.ebuild b/net-wireless/unifi/unifi-5.11.10-r1.ebuild
deleted file mode 100644
index b02c17b3b8de..000000000000
--- a/net-wireless/unifi/unifi-5.11.10-r1.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
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-35d70ccf84"
-
-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.11"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.10.22.ebuild b/net-wireless/unifi/unifi-5.6.42.ebuild
index 6b1954f8da14..9a24e79de042 100644
--- a/net-wireless/unifi/unifi-5.10.22.ebuild
+++ b/net-wireless/unifi/unifi-5.6.42.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-3960e2894b"
+RC_SUFFIX="-790e8d05df"
 
 inherit systemd user
 
@@ -14,8 +14,7 @@ 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.10"
-IUSE="systemd"
+SLOT="0/5.6"
 
 RDEPEND="dev-db/mongodb
 	virtual/jre:1.8"
@@ -37,10 +36,7 @@ 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
+	rm -r lib/native/Linux/armhf lib/native/{Mac,Windows} || die
 
 	default
 }