gentoo resync : 12.08.2018

6 files changed, 9 insertions, 75 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 97e94835be4c..18b97ab62469 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 5df2a361baed..63e8a082a40b 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,7 +1,7 @@
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
-DIST iwd-0.3.tar.xz 642012 BLAKE2B 9bd43a13760cb32c2ead0e54b5e4389159a6a9a9780651435c8fb3d09859606a89aed6f163183a1027c8afefe05ef848c00104bf87cc223d25408f5405dffd33 SHA512 9c34d98ecae18955cc39cb7a58c0724b500902e2070ebbc1967fa4e2ed3633e01052a6bcb592b8bbb806307d8f0db8271a0ac7ad105f8a8f42915b8627e429f6
 DIST iwd-0.4.tar.xz 649484 BLAKE2B 7af09a39a6c19b6ebb466d1fba857a6b7acd00d47feefe7e5053ddcdb0a64e74b7bd96a777e46ebd188af7ff5b3c1ed24ff383d11612dcffcef1aa5f210e78f7 SHA512 55c469b4e675f0c47c91bc46f0a93b704d9f2893393262aca8fd983aee16a7a13a112e9df15a31561fe72a806439a9a93fcbe1721648f3eed9ef277f9339b770
-EBUILD iwd-0.3.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
+DIST iwd-0.6.tar.xz 654960 BLAKE2B b0617b7e1a0f75de61ecd94baf34bd416b24bbbe6730e52963a705f4f5cdc002fd9dafd6eb60405414e8f05ff249c7ffb0c08c2c2d69f4aa2611d1f61ab5a2fa SHA512 2ab6fe64e7adeb5306aeb28cff850ca65c1a26b71a24042392135e7476c528c528d36d59df6e0d0d42e93b261bdb4eff7ec891c0089914588a7c64b2ed42889e
 EBUILD iwd-0.4.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
+EBUILD iwd-0.6.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
 EBUILD iwd-9999.ebuild 2533 BLAKE2B 464db65d7668436bda8af9b909a3a77ebe8add30430a50675873d2ca4367fabffe90d01a307dc150656d0827d509a3a59bd52652dace14c149794d916a9e6fd9 SHA512 b0b997df430397fbd8639c412d761bfcbd57722f216821eb9619ebdbeac9275be9aed0a21d6d9616079908c39e0a308d8e8d602dedaeabebfe578e3e7863e3ba
 MISC metadata.xml 369 BLAKE2B ea1b7bead9ec1e6973bb454f6112bdf0edd7a325d0100debbc107e142d017696e4833c541ce8370bbce249429662668940d664d935eb8b2f7a84a1869b7da2f6 SHA512 665188c4c174fee98b91cbc21923d2e7c31d6ace4229d51808157eb2ca0cc9f51ac9c12f461047ef5c3b3dafd7cdccb6410835e9471b5da0c5bbffd6e651aa3e
diff --git a/net-wireless/iwd/iwd-0.3.ebuild b/net-wireless/iwd/iwd-0.6.ebuild
index fa3d32f34fab..fa3d32f34fab 100644
--- a/net-wireless/iwd/iwd-0.3.ebuild
+++ b/net-wireless/iwd/iwd-0.6.ebuild
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index aff6685b942e..c2ad36ca49f7 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,12 +5,11 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9
 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
 EBUILD unifi-5.6.39-r1.ebuild 1729 BLAKE2B 77a4fb38b6e82763f83f072d595e3f39306aed4ce39f98bfe6783e85eb1c83ab0fc996e94d25b86cd4bad196ae898dace5eb7469147cb3394cda1699ffec1900 SHA512 4415d13c43c30238c756542f6931c12bb6cbcd0163cb6e2c522b6adef39f0c5d3c069d25facdb12575fc0463a8aa3fd479f3274009083a645139d656ce998ae2
 EBUILD unifi-5.8.25.ebuild 1853 BLAKE2B dab351e3ae3b414f81d1b95bdef4d2a1fa406f804dc6d0331169e14138f5436d092803bb8ea86f7000b9d7a9b032dd1995da8130233c3f5db013a0e7bd7e1abf SHA512 cf2b4a2639c1bb4ef8cb73ca9bae37955f3d12e661f2fcf0187b1a880ff3eab67bab41b3292868940f27cf701eedc31a322cd19a0c80686e7bba5a9f7ebf2cc0
 EBUILD unifi-5.8.28.ebuild 1847 BLAKE2B 2165ff736cf596b62291a96d6a7d5967a70fbf3e060c68ed9e21d3658628a93c6f9df441ffd1d75774764a4556f0880dcd3b835767aad87eb2e3c00f9382a76c SHA512 61fc42af8101817953df870a384ce6e156093909f34930c40dcdbb9a3baa402c629ba850a97534384798e8603c33a6b720dec577418c50e039674f8f202515f2
-EBUILD unifi-5.9.16.ebuild 1727 BLAKE2B 892541030e230cf1eff9031e07a7ee31901b2d85ad0c21b8009bab3387fab1f84f4eecc2c841b5d36ca5f44e08e0f4b1b90a81a5f124eaeffc45d45e0424f3b1 SHA512 757ba4eee8b8d40af1d1153e7902ee23b5b632b1dc4eec8c92bb3f0800550ce54711c6a3e7881c26582fe16eefea794df735cafb34f4bff01eead51aad783238
 EBUILD unifi-5.9.20-r1.ebuild 1853 BLAKE2B 147e94e87d0857fb61737e817ff131ba8c9121fba93612be2424b9e0e668b4488e506c0fde9eede0cc7ebb37411a2871b349f359390204d6a6a38bade887d37a SHA512 ccb9dd1c4ae84d1ff2bc69cf6dd69ca13dcd5765380d2cddff76b3e5db7aac1535813e56147a2a51ef9c566fe1f4325286f5691f589a1139c96b3ff7f3c6c99b
-EBUILD unifi-5.9.20.ebuild 1750 BLAKE2B 47a382ab44005600eeefc3edcb9e4e2c06ed28e5da0be7a4ef5461752ce97c6d9ded0f4a194b2c76274d51655bc332c3c8486d28256ebe17a2887ab59501cd44 SHA512 a16c6a7d8d126f26f6272e83f008e33bd7b0969a3697d931a6fd517471ecfd6919a90722971d6c8d385da60727e6868ca11df23aacec8d9c172047028674e48f
+EBUILD unifi-5.9.22.ebuild 1853 BLAKE2B b19069311e9112dbdc45561fae214ca9d65e77bb715f7e1038d7ea501ac4879a4c494e1a9fa9e46661a5b640e64547ad1c740806aa2f06d4f7e70c69710d0228 SHA512 d2d73da5c6cb736dd1ca5787e361d2ea001341197c7044b35556bccd7a4dc8d43b1fc7dd07334b29d38919086248986a16ff1ced68d7c342b32785804ed14a45
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
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 75e6ef934730..000000000000
--- 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
index b07e93928b20..945b5eba0c38 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
 }