gentoo resync : 13.10.2019

6 files changed, 13 insertions, 93 deletions

diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 2afd755159de..f25e5d4da784 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -3,22 +3,16 @@ AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb857
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
-DIST unifi-5.11.47.zip 112374653 BLAKE2B 42e981f526dcdc7f7c35b7884aaa81cd96de4105d8700e8f8625a1fbd14640d248d46153328dbc852591f96221ab5753b65e2038d948a3d5b091f17b3e47e4bb SHA512 ec2a1f8e3a3c3bf5cf8ab25ece9ee164fbaaeef4b03585d2ff9add74a34992a24fe0becbd28b212b470d4fd87eea67e4291724addc8b12e5d1c463a73817569c
-<<<<<<< HEAD
-=======
-DIST unifi-5.11.48.zip 112379777 BLAKE2B da30a094350229aebdda958a966412a350c918d6d6cef775fce675bb139cb13f27dc5e3efbd7b68eb0a1b75adb11f9352cf330ca45af89bb9690c9d4a2505e8c SHA512 f09e2fd280cc6c1859d89536f9c517308c6945f7f4b38f9ef46a8231551284049baf50309ecc3cf7f9523b5c9f85758a56ee2520652c10ad22035491d8ee32d9
->>>>>>> next
-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.11.52.zip 114092809 BLAKE2B 902dec158ba60fa424ff0b59b53776aeabc3f1ae7a9b88e549f0d62974e280b51ce5b8bb3eac150c1d75e4b0816b46bb19bd953e987bf6d8a58c3e271efdaea3 SHA512 887b25c22d7ac7a14854b95007794a63c200717fdfec791be5e1b03fe4bda1c44a05767d44f55062c691b922e54fa8c183b249407c30fb2d596906e00fa969e0
+DIST unifi-5.12.13.zip 114644574 BLAKE2B 4a2217c7696f23a7602a89bb3eaf0c58094b23331ed60f210e3626c2f194dbc272de18dd0e46fe1cc829e0adb1fb704a8b00191039573544e0111dfd1e2b6cb1 SHA512 4af685239df47891adb93afd95ad53fd89f85bc3f0c9346b91dbafabdbca57113eddb2b317a5342c93d44b250637d16d740fda34df35851f3466277abd814bac
+DIST unifi-5.12.16.zip 114676348 BLAKE2B 82d0ade4541d102648aa6938c050e23e68c91b40b35d0f5a68113f4be844f0fc5a00c82c4d7286552f7d076fc3bbe79f32b9bc8f6aa51a7609993d7cd4231c34 SHA512 e1320bfa54f6419c079d485ccf902be69de1322c5090e0b1a7f7ffec85f7ef8b3516a6e2d9571d9c2403da0444b611601037d3a211f32bee3dc8d59a6ce9f48f
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.11.46-r1.ebuild 1789 BLAKE2B ec4e389a2bc3acfc0cf52a7d6bbc4e07efcfe38821a3a51b3c6295f4e736a0e1bae4e9e65f8886769e6b2f9bc22efb8cd26873c2d5847ca3a74d37b1e4b33b5f SHA512 2c1721e731fd9e800ffc331c1e79fa0fddfae5f29815b8780312a2b560ca7734b90f48502f267eb568f57320fe0c22c0a7efe233867c91c9bc48c987b9ee3342
 EBUILD unifi-5.11.46.ebuild 1832 BLAKE2B e47b011986e7abc36e9df65eea9fcc1fb56a19dadc78a18c74699043cd0024b7d74676efcf9882e70d19247435ce0ff8e28dcc23ea905c4562b6285aae3685be SHA512 9b9cfc432580c3ecc8b8e79f73a5549f54fb6b46b23ff29ead84b85cc360bb091b278210d57e5889b319d3fa5c0a4a066fa01f4a85eab1e12b2c443f70c33bce
-EBUILD unifi-5.11.47.ebuild 1789 BLAKE2B f60faeba740a9e49e0bf313f62bbf6fcfa437652616206ae266518d39f330a0c5f01ae00de74139c4e5557dad0f13615e128230fcace4d0369d29a743462ce83 SHA512 7f10f359e1cd77333a4e59845fb844476ef973d968164361f0a0879a32da8c3427fec5692aeb06f66324177b464554a4d96bfeee520fbeeec752054fd0f0dc89
-<<<<<<< HEAD
-=======
-EBUILD unifi-5.11.48.ebuild 1789 BLAKE2B d656f824d3312769b225b7e65e4c9abe2e9be318520c47c3794e87a96ef5d9deac9e763d981b8c27627802cd694e4bdd9b83d3a9de4d64a74a3af856ef01b4cb SHA512 0d75d95541a097cb0885d98bb4529688ef7513df7d28f793a2e4ecb679ac531384288db5cd1dc9db66c9ce8453d57d1d3efdb0a9aa642c8e64e81b0dc415ffde
->>>>>>> next
-EBUILD unifi-5.12.5-r1.ebuild 1789 BLAKE2B a2cc863351a4d4a0d4b210931a86de25220357d8479a86f13b3bbeadaf4e451af2f82b90ab433fb05154d70d678ebdc5db92cdd0e2f353ac9dc00022d2c45bd9 SHA512 8bfbd9d2cab24b2584880f42c2fd60748520147868c134ae34c4af8e1ead24501ddde7c4460a2884ded81dcd4ed8965f6274e1417eecc2742ff79af7d2b595d5
-EBUILD unifi-5.12.5.ebuild 1833 BLAKE2B f9e7cae98e23b3525c628d0e987884f2e211d806073a97824bed45e4fb43dd131a849489d5c0bbb64cd7b865db71e600b9926a7b8ab38c70f2aa7e37e90dbb01 SHA512 46c149a06ee68e3e89a2ec3404c8eb501299649c2fd58a33a053d72caa85fc66cb1c6334e338d4aedcc3c3bee4bb18ae6468a2cdd882e46a213bb578cfc05d8d
+EBUILD unifi-5.11.50.ebuild 1789 BLAKE2B cef87423291b5aad60062454c901b3436e12963bc4c801467d8393e15c729aaf6b04a7ddc2e5ab3df42c1442ab0867c5af4c567002f058bac6226628f18ed939 SHA512 482c4add6b3c11cc3889f50913068edd41a3ca16a527a9454b904047aa68bf12fc90d2d8b485215d8db1bb4b9e1b7791c997fcc7dafcb13759fd568ab2ba29c9
+EBUILD unifi-5.11.52.ebuild 1789 BLAKE2B b2c72b01604753f3c95c76a58dce04c91ca396f406f94661a9950ea4dd6358b8bd24fce709c4426027e2fcc9628ae2cdde5b272694c5b2ca8b9d1051feab7513 SHA512 426d583f22031a9ec95267341dca5f38e3f60577a0560a618cd64d9169f42a4a90cb311d67e8bc70690232806dbbb3688790e784eb9ce9137a8a5a02c7ba749f
+EBUILD unifi-5.12.13.ebuild 1789 BLAKE2B 5527f3ce00ebe570486481356d384158c999cecd4ef01b82accb4034a18ca31331f28ccf5a0c3d67f42ce444806000937bbd0b84666733fac858e355c87c3789 SHA512 18b24e1a3b4b08dea056b1a8ee58c0b4282f0b9c345dc97925987bd00988c13aa7822bfe5944aa567da8efcf283fbf6b211d97986a697c353a5dcb0b516f1695
+EBUILD unifi-5.12.16.ebuild 1789 BLAKE2B d58fa10a52eff42f011eff0ad64ca095d1a9182cecbab5479a600300c15907cb359c27812cab8e539d4bbcbe4685d615b63609215ab1e777e59512a2ae779de9 SHA512 07506d368b575a65a7610b59ea61482b8648c57498628f946eb1958bb371437a6f3540634799ed963049216dbc4caa7e40d5c04f99ba8f0904fcf2f29b1616a6
 EBUILD unifi-5.6.42-r1.ebuild 1668 BLAKE2B 0db78f1241b651079c1c37326ef9c5414037c1bf192b344d55f9fd03a7af8f1cfc709f80b7257b9930f6c19d7cb77ec52e2cb5b492a571a60098436672c9514d SHA512 952253c6e51ac78796c7ee7729f75c1eaf0fa997832b60aaa7e9d73d0f6d3f444e632cd81550637733bf21ec1013d0a974edf12897dfc2fe70157403363eba86
 EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 802 BLAKE2B cf4248b03b6b0f5ecee40ab09e9d7fe718c8a3478aeb5814faa489b74080b19fa20b0db05b7910523c68297d2fc00a56d4b16822367811b52fbdbd2cf707962a SHA512 8071155df75634be1db52068b17960b194f47c8a1ca38f23fe4397df8c3156123c6023cab0d33db4dce1b0763beaa096ba6f745671c3078be637dad6ef63abf5
diff --git a/net-wireless/unifi/unifi-5.11.46-r1.ebuild b/net-wireless/unifi/unifi-5.11.50.ebuild
index efe877dff671..f6e16df92f33 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.11.47.ebuild b/net-wireless/unifi/unifi-5.11.52.ebuild
index dd8f7198dd79..5a12db360e52 100644
--- a/net-wireless/unifi/unifi-5.11.47.ebuild
+++ b/net-wireless/unifi/unifi-5.11.52.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-248db21f47"
+RC_SUFFIX="-3b4f13d722"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.12.5-r1.ebuild b/net-wireless/unifi/unifi-5.12.13.ebuild
index 8abd17d3590a..19b3b64c5cc5 100644
--- a/net-wireless/unifi/unifi-5.12.5-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.12.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-802c4da1a2"
+RC_SUFFIX="-a94c374f1a"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.11.48.ebuild b/net-wireless/unifi/unifi-5.12.16.ebuild
index 793968b05c2a..61f68ecb90d9 100644
--- a/net-wireless/unifi/unifi-5.11.48.ebuild
+++ b/net-wireless/unifi/unifi-5.12.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-0023c8f3bf"
+RC_SUFFIX="-949a431d7a"
 
 inherit systemd
 
@@ -14,7 +14,7 @@ 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"
+SLOT="0/5.12"
 IUSE="systemd"
 
 RDEPEND="
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 545a8e5589ea..000000000000
--- 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
-}