gentoo resync : 16.02.1018

11 files changed, 15 insertions, 264 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 285519f1ec45..7d038d05865c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 2a9379d25b79..e23eb1a45d6f 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,5 +1,3 @@
-AUX aircrack-ng-1.2-no-force-stack-protector.patch 2245 BLAKE2B a7f200711a4e24cc92d4626d24c62abe11a2d378e8876a801a516aa2023b7aa7566c868e890186cebf9dacecc59037b23c39380b1b435b0f0985a02f939ccfec SHA512 35e5f717bc3b90507a879bbd4ffd3bb88c7bc98676abac1241cbc50dbb1bcf2c53e5c45514b643d7ad7d86d0b74e662803de155ae6bbf430a1fdb32e50682068
-AUX aircrack-ng-1.2_rc4-openssl.patch 1227 BLAKE2B ac474222d14a25d6ea4f95c313f0f660940cdacd0ed4295e869a91a81f30284a669fd1e49959d1f6c7fd0c015cbc93464181b3e79571751d400400323b276934 SHA512 142542996e83f729bf8c7e77ac0d4be428b60368c7c005c2dda6c7fe7d45cbe029381523059566a35f1c8d748c0aaf9e46086cbf9ce429f22b2c61ae78a6ba1c
 AUX aircrack-ng-1.3-8812au.patch 7279 BLAKE2B 80ce8246b2719bf897c22d727beb3fe71d58e9866e35e9d4930535b4695044d9183d4e7f781c97ed5ab3dd45e59453d10239482073baa75f3b2c9be0e02556b9 SHA512 53cecc21d6b091e3ebbd2c163a918513382d35697f7df5e2462a774863e3cbbfdecd5aebe341b9b62bb1987ee8d22acbd962526e78b6f6537185bcb286ffcbc3
 DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
 DIST aircrack-ng-1.3.tar.gz 4501507 BLAKE2B ae73303fbc0c632faa2468d5fbf0daa318767633bf92571cc53fd79d8df518c1fc03ad83397e12585a804f0171e3fe3865c070ccdb39cb43ae46edbfc880b37e SHA512 0c2376ac702cd36021b9017b40c5af9466c5689832a0e40debcb8c0a2cd13ec942170930903c4e2e06678c429a89cd4d78ab43e925b707f816bf48d6c9514ec9
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch
deleted file mode 100644
index d4688b84d2ef..000000000000
--- a/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001
-From: Joseph Benden <joe@benden.us>
-Date: Mon, 16 Apr 2018 11:26:23 -0700
-Subject: [PATCH] autotools: The flag --without-opt should skip stack protector
- flags. (#1864)
-
----
- build/m4/aircrack_ng_compiler.m4 | 28 ++++++++++++++++------------
- 1 file changed, 16 insertions(+), 12 deletions(-)
-
-diff --git a/build/m4/aircrack_ng_compiler.m4 b/build/m4/aircrack_ng_compiler.m4
-index 0fb19726..8a973dbf 100644
---- a/build/m4/aircrack_ng_compiler.m4
-+++ b/build/m4/aircrack_ng_compiler.m4
-@@ -108,19 +108,23 @@ case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
-             CYGWIN*|MSYS*|cygwin*|msys*)
-                 ;;
-             *)
--                AS_IF([test "x$gcc_over49" = "xno"], [
--                    AS_IF([test "x$gcc_over41" = "xyes"], [
--                        AX_CHECK_COMPILE_FLAG([-fstack-protector], [
--                            AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags])
--                        ])
--                    ], [])
--                ], [])
-+                case $with_opt in
-+                    yes | "")
-+                        AS_IF([test "x$gcc_over49" = "xno"], [
-+                            AS_IF([test "x$gcc_over41" = "xyes"], [
-+                                AX_CHECK_COMPILE_FLAG([-fstack-protector], [
-+                                    AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags])
-+                                ])
-+                            ], [])
-+                        ], [])
- 
--                AS_IF([test "x$gcc_over49" = "xyes"], [
--                    AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [
--                        AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags])
--                    ])
--                ], [])
-+                        AS_IF([test "x$gcc_over49" = "xyes"], [
-+                            AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [
-+                                AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags])
-+                            ])
-+                        ], [])
-+                        ;;
-+                esac
-                 ;;
-         esac
-         ;;
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch
deleted file mode 100644
index a83f622d3a60..000000000000
--- a/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: a/src/crypto.c
-===================================================================
---- a/src/crypto.c	(revision 2881)
-+++ b/src/crypto.c	(revision 2882)
-@@ -288,7 +288,15 @@
- void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) {
- 	int i;
- 	unsigned char pke[100];
-+	#if defined(USE_GCRYPT) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+		#define HMAC_USE_NO_PTR
-+	#endif
-+
-+	#ifdef HMAC_USE_NO_PTR
- 	HMAC_CTX ctx;
-+	#else
-+	HMAC_CTX * ctx;
-+	#endif
- 
- 	memcpy( pke, "Pairwise key expansion", 23 );
- 
-@@ -314,6 +322,7 @@
- 		memcpy( pke + 67, ap->wpa.snonce, 32 );
- 	}
- 
-+	#ifdef HMAC_USE_NO_PTR
- 	HMAC_CTX_init(&ctx);
- 	HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL);
- 	for(i = 0; i < 4; i++ )
-@@ -325,6 +334,20 @@
- 		HMAC_Final(&ctx, ptk + i*20, NULL);
- 	}
- 	HMAC_CTX_cleanup(&ctx);
-+	#else
-+	ctx = HMAC_CTX_new();
-+	HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL);
-+	for(i = 0; i < 4; i++ )
-+	{
-+		pke[99] = i;
-+		//HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
-+		HMAC_Init_ex(ctx, 0, 0, 0, 0);
-+		HMAC_Update(ctx, pke, 100);
-+		HMAC_Final(ctx, ptk + i*20, NULL);
-+	}
-+	HMAC_CTX_free(ctx);
-+	#endif
-+	#undef HMAC_USE_NO_PTR
- 
- 	if( ap->wpa.keyver == 1 )
- 	{
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 895697587dec..cc687bb2ed28 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,16 +2,12 @@ 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.11.zip 91776743 BLAKE2B 68774ce69859db5568447db502d993e5f0e88832ebd026558797634cf9ae98405eaeca2ceaa4d61bdd6de28c02e349391111b481d29ab3acc45036fe28696a33 SHA512 a8820b8d77c77c7c88bebe3172433114682cb1444dd8d472c06ffb23268d1119234ab02822fc215b1a578d6d832d3d8d5dd6e04cc0889bd711289d00b2ca34bd
 DIST unifi-5.10.12.zip 91787840 BLAKE2B e024f1d782dce5d2c88598c092c86d5d5761282154b323497e027b04091400d2db09f6da81ca8d637a51840613e8fca98d1c2d8c5e6fede71a2cb0c790efd950 SHA512 ba4b5322137f7fec0990105d66efbd290ef33218db432824dc9ae6af736a59188eed77c074e680c248d260c39e7974956bbd2492c6af2be3465276a9cc77ba48
-DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
+DIST unifi-5.10.16.zip 91777321 BLAKE2B ac039b8e0d9835a0228805fb9a4935ae4e4d07360133bc564cda42046eae33042576710e4e282e81e18ce822156c0f870faf58ec5d20bdb7642947ee00345ad0 SHA512 b28b6988971467dbdb34c480a5c83ebd402a4f989c3e1ef33478886b802758e077809712e818b04167325d06465b05ea8718f0b18248d328fd8f31f3e43a1817
+DIST unifi-5.10.17.zip 91799643 BLAKE2B d24f3477df720c8f679df8c49a976f30ce070300a7d2fa3cd230a1b87b85d64bae3de89aa5a938ef9573291fefdec5f44bcf51fb64794df03e81a79ef904a39c SHA512 ebc0ba24ff8542691c3bc228a2d9a16dc6f54fa570e72f6c8985942cf6d023e5e1b5a0fb0912dbda1a1f43709ba56dbfefeded69c0f2d92b772dfe250808502c
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
-DIST unifi-5.9.29.zip 105327499 BLAKE2B 9c5c1cb804231b72521fce968cb1240b7c64e75621eb6577fe09f43186e90347339159e0cb95e772a936d4d6e82b2ae77126c263fbf25ab244db7e5639972c45 SHA512 f00ba9470d78fa5922e81a5ff2e53927d2a2ec7d08ab543abf4b236ff9fb8761b060083025fc410f72c0ff48c75c915dd3561a3869dc4a2de0f8900e19af0976
-DIST unifi-5.9.32.zip 105373782 BLAKE2B c15b576fe745f1d8f2783a50a0265378a0b4947654ab79e1ba2526dfade73eb83890118d8a97d1d186539a428fc6705943e19cecde583b73c2f098575f3496f0 SHA512 c0269c9e9be723eb19dc541dbb7547b284082792c41c6a8012b677ca83e562848024b95ebd6dbae95042bde07c41375907fd9b47e725f3ae8ece661bcd77a71a
-EBUILD unifi-5.10.11.ebuild 1846 BLAKE2B 082d38c1259fd142815b1d907ff7527e653137c53a9fcd8a14bafa9d9622d3166f07dc0def0246509fafcbf13bc55e50b9d25ade4f2d514334177f203888d0c4 SHA512 91e98c597156f043536e8f27686245c625d6f97c4556f41fee2fb74d50364ec2fae08e4386ea3c0d0424c4d948b2da78d9b61583ba2fa29652c0e886a7152951
-EBUILD unifi-5.10.12.ebuild 1846 BLAKE2B 87a5e0cce00ce37fd3029ef7be14688e0228561e04c040b417e18ca723f06bf523bbe57fb9071cc701aede072de540c8970b98bb57d056e40a32e6d63d67f494 SHA512 a40b4fe2d6ab8e09e5b5fcc02cfa44b8dbc7b6b302813ff4396f69e748c3642a7d1246c736fa70fb947635dd04d4215a531ce717643d8f08ccd44170354043ce
-EBUILD unifi-5.6.39-r1.ebuild 1721 BLAKE2B b3d2d6df884e5fdc1f09c191dda26eeb71cc05b4f2d51c3556d2b6bee834639f616d542a994f95a6c58bce8b9ae8374ace94d448751fed7fb5058dbdf8a6d67d SHA512 c7b7e8d2196319abacf2094ace35e5fdcb56feb9f22939b28839cc0bab8c40e6f7fe9e16cf2c8ae4992e64e9578f7bff7fcfe0011558c93625e73173b6cc992c
-EBUILD unifi-5.6.40.ebuild 1732 BLAKE2B 083dba38eb9f1007a2c596704d71b1e3064b1029e9c761c4603e32da466d8718d7a6f1cb4ce7a229916c1d89efd253539147acfbcfa43ca7cdbbeb2549ac2d73 SHA512 974837d60c8f133c8c266c0c7f51fdc7ce08f9ac51cb1f70126ba952e314927878a8200ac437a938296640cfd905e9e19266ba30fd6b3af8a62272738d6c92cb
-EBUILD unifi-5.9.29.ebuild 1845 BLAKE2B 68f13e0a721aba2a1ca2c6ad497dd5668337d1431979540549183491be516f3e976c05e57168b7388dd7959e872c6a648152b8038da8f708200de29991006678 SHA512 d52c718bcdd4062ead97594992fb089d34d35a87bfe6e22191c79c05f522da8bf5a75c1614c0f03c34cc756817df898a4c1371bec96ff8683410bbe5b9ca0a34
-EBUILD unifi-5.9.32.ebuild 1845 BLAKE2B 8e4eb5cac8fef454d7f5dbb50b6330fa9d272182587bd98050f1cc94f560343ebb87065af168574ff70b9bf6e3d88411c587dc2317384ca4762f4a1a8febab55 SHA512 69d79578a2d7e0baea6f8bc0da54008b492d78872204c9f5011b985d8dd9bf9ef70b28302eb973c0fc0d36387714e7f0a376862289aed905bd3ceb6d64039769
+EBUILD unifi-5.10.12.ebuild 1835 BLAKE2B 05967e03bc45cf5e285b62015f6275005c70a3a4f7edb1ccaef3e5f2862ab0a4f2b606e8f37bf1907aad15199f3fcf735ae0f799edc283d4d78fd06fb7785e26 SHA512 eadbf42d4857fbf899bd3c86be14ff84d80a1627d36e6348fbb6aa84f2e790e6cf6ca8ccfe3a4d554fe6c8be9a8c242344d4897db9107e18959e5e656ce989a6
+EBUILD unifi-5.10.16.ebuild 1846 BLAKE2B d5ba866d183127c36c96365774209e7ab9d9c819e24f6069bd4db32050b1945feb3f095bc89a344470b0d0392ed3b48e7dff6bb1de9b5a9ad77594cd269c59ed SHA512 6aa3240500c0108709368eca9a24302255d6e03a6663fff1280d548fc2d83477db5a61ffb6e14ec5cc2e4f0a682e24a004b595edb7dca5af54727f6de65cc5d6
+EBUILD unifi-5.10.17.ebuild 1836 BLAKE2B 894dc4bd62ff92bb4f1c94bcc0514277610c44bf88bb19033528fd5718811ae34821f2df21beb4c0d6bb04aa8960a1d383ce49d487fe52b415540e011a1c7d7c SHA512 5f18f2800318cca007cf97dc17ffae796cbab60d3a3bf899c59ae19dcbc407076d4be49e6febc5f8f62e17fb97b33e578ca91c927a8b0d2bb9d92235d99aff5b
+EBUILD unifi-5.6.40.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.10.12.ebuild b/net-wireless/unifi/unifi-5.10.12.ebuild
index eaa8d8f6a565..27baa577f0bf 100644
--- a/net-wireless/unifi/unifi-5.10.12.ebuild
+++ b/net-wireless/unifi/unifi-5.10.12.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-20644d4901"
+#RC_SUFFIX=""
 
 inherit systemd user
 
@@ -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.10.11.ebuild b/net-wireless/unifi/unifi-5.10.16.ebuild
index 4010245a87b1..9502b8d13bd6 100644
--- a/net-wireless/unifi/unifi-5.10.11.ebuild
+++ b/net-wireless/unifi/unifi-5.10.16.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-6e1800b9b9"
+RC_SUFFIX="-dc97e0cd90"
 
 inherit systemd user
 
diff --git a/net-wireless/unifi/unifi-5.9.32.ebuild b/net-wireless/unifi/unifi-5.10.17.ebuild
index bb328b127d20..053a81552b9f 100644
--- a/net-wireless/unifi/unifi-5.9.32.ebuild
+++ b/net-wireless/unifi/unifi-5.10.17.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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="-016da0b7c1"
+#RC_SUFFIX=""
 
 inherit systemd user
 
@@ -14,7 +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.9"
+SLOT="0/5.10"
 IUSE="systemd"
 
 RDEPEND="dev-db/mongodb
diff --git a/net-wireless/unifi/unifi-5.6.39-r1.ebuild b/net-wireless/unifi/unifi-5.6.39-r1.ebuild
deleted file mode 100644
index ef6294999094..000000000000
--- a/net-wireless/unifi/unifi-5.6.39-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 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.6"
-
-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/armhf 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.6.40.ebuild b/net-wireless/unifi/unifi-5.6.40.ebuild
index d99b14431c09..989ef2ce57a1 100644
--- a/net-wireless/unifi/unifi-5.6.40.ebuild
+++ b/net-wireless/unifi/unifi-5.6.40.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# 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="-508ed3ce93"
+#RC_SUFFIX=""
 
 inherit systemd user
 
@@ -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.6"
 
diff --git a/net-wireless/unifi/unifi-5.9.29.ebuild b/net-wireless/unifi/unifi-5.9.29.ebuild
deleted file mode 100644
index fab1784a2951..000000000000
--- a/net-wireless/unifi/unifi-5.9.29.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 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="-04b5d20997"
-
-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.9"
-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
-}