gentoo resync : 07.07.2018

19 files changed, 285 insertions, 73 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7de61a90520a..cad9c3450c90 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 5260944d0152..6aa2d9264292 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -14,5 +14,5 @@ DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b6
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
 EBUILD bluez-5.49-r1.ebuild 8103 BLAKE2B 7c1b06c44f25ca8185ce8d809b6cecc76e79594aa43a713af6b717214ba51378aa9759981947661d90d4a86ad91555d7c06ed895c05a772295e7b19742416337 SHA512 4bb3e121cce2dccbc793a5deaef40afb891cedee091baba8f220b08f5379ff6ef491d83a0e3d0c8e21d0581464c5de39fa1cafd145f89b823940b2db2836461c
 EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e
-EBUILD bluez-5.50.ebuild 8023 BLAKE2B 8a4de0906a26274dda252538c2515e17531b70750ac70db439347fec2b44f19a11caba5de9be4f6f1e69e57ca3d309cf6ecc57a392db8be9cddfb9e56668cc36 SHA512 48348e8bb6e68935985cbdacb0854ed03b6adc48606303fa6be9fd91e7770557b0cd58e4059d9ad1ebb2ba65c966ec541e422d70c81e4d989f7cc292ef6d03fb
+EBUILD bluez-5.50.ebuild 8028 BLAKE2B b62e272587e4c6b3648505e509cfb8f4ba8f3457e0777f62fd77c4bea5570f4b511c03f29bd80ac36cacd28d9c493125e8cc5435224a679611aab2beedba9664 SHA512 ad8969e317f12a6c1bf2d1966cf5c40ffa3b87d87258adca745c6b953f09df9ecc7c33162a52f9780cdb075e8347aceb7a87c858fa693ac76ea2f9e8e1303098
 MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.50.ebuild b/net-wireless/bluez/bluez-5.50.ebuild
index e6b7d9974ddf..542b0577699c 100644
--- a/net-wireless/bluez/bluez-5.50.ebuild
+++ b/net-wireless/bluez/bluez-5.50.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~amd64 ~hppa ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
 IUSE="alsa +btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
 
 # Since this release all remaining extra-tools need readline support, but this could
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index fa02adcb08df..727dcf8f02b1 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -11,8 +11,9 @@ AUX hostapd-init.d 739 BLAKE2B 83c48748cf20c8ee7d1124d373ee565c724d4714bffc51262
 AUX hostapd.service 213 BLAKE2B 0141aace8e6f807611e423e70cce437a5ae38a5fee8af74a7284980a1c2f642f1e98d020f327dbe5591e9d68114f3ee966229fb6d8f5116fe7d9e2bd93bae7bd SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
 DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981 SHA512 cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
-EBUILD hostapd-2.6-r1.ebuild 6372 BLAKE2B a3202c1e11ca7d9fc252c2f4a0d3cdbde3eb06818a566bba57890e47347e71cc9553213146793c11c586c403a9d5020b14234ab6b2fbe949c5fc48774fc3eea2 SHA512 fec5dabf5ac3d4103f46d538bc45b7bb07b43755505a255989b0845cb0773c4ed39fb85977a9d73b2966095b5bb39118b2a464ce9a16d9b8ecb9ea8e243f7c95
-EBUILD hostapd-2.6-r4.ebuild 6969 BLAKE2B 585e8591a62387c2ff760a5da966ee54d75f49349c96234dfb61e94596a751bf53cb29d94bd27dc8383c6411375ccc8c2bb95e46b75f0426caaab639e3e64bb2 SHA512 9de83d659dd28cc0681408221abb7ae67c8888372e95655b790d91d46ec9af14cc70db5e12a558b585d71566582885918188e77b5e00497c31459fce0ee7774f
-EBUILD hostapd-2.6-r5.ebuild 7246 BLAKE2B 19db8237f3ca6da609333433f51cbe68a7be8242c5d11fabc7e55f6f66f607402dc59506cc24cfb34064b2d0258ccb45610b1f7299aaa35e624165a32d1c787c SHA512 54b77fffe854a8f214b4caac4a5e9d3d0bb650106afcdd02c6d2b13230fe7e1087438c80314f13f296f0d5c48590cbfdbb44204c98b2ca9846993d710323f8fa
-EBUILD hostapd-9999.ebuild 6521 BLAKE2B ba4b86417b619a1eded21f641c25378539f82c271b387f5f4e6387107be1a877377fa73dbfbf9795db4a0963b52509050f9e26a49352b1c7db7e614fbdd8edc0 SHA512 e7e3f699a205037bbbe9936af1766adf387a18d686edf25584a01b16290e9b06c715a4a3c4c5565de039b35c05a94f21560e4a03e04903b4a9fecf37fb021e4c
+DIST net-wireless_hostapd_2.6-r6_extras.tar.xz 11156 BLAKE2B 62205070d4dd081d4149616f1abb4f84105c77433464dc9fea41a3fa9f58cc09af99b4e6618657777e77759d33e38c8a5647537c0098e772f032a368b82be709 SHA512 c21155e16ef931e431cca54c0f83567915b511d7abe42a5b4a4475d40eda3616eb017f0a669fd7326bc4f410f9a8e174fb8e0619cb32631ab1ca22e6fad2c612
+EBUILD hostapd-2.6-r4.ebuild 6972 BLAKE2B b5eea637831e10463c9af560ae74f48ab045caa8d42b8889bc6acb79c6f63b33308b76a5438e5c998162cad6207a77e340ba94271de776c683fcb2634d148472 SHA512 bfe92a52d6f8f178f523a422af1ecc13298186866a0a962cad9b276c288d3b16573f49664be10c53e81386a5d0440d69b149a6fbd0a4e6c85157d37c2ed784f9
+EBUILD hostapd-2.6-r5.ebuild 7249 BLAKE2B e4fdb49c073fce962fb8a53658606f78cbbba589aa4290f92bdd8ff8c70bd6a68fd3fba1c5dcc9a05eea87e160d1c99193a5621021d8adf67538558e7bc63055 SHA512 bc156cb71b883acfba57332fb29e096d1582739ad7a5c64a01699edf26562a8cb95ebbd60f848c8b22d8926c386cd26eac58870f1956bd853f8c71d336ca90d3
+EBUILD hostapd-2.6-r6.ebuild 7337 BLAKE2B 7870dfd94d57afa9bb4aa1bfbebf7028f65e720543e0ed1b68af770f82b0346681f4938f774722aebf2b8a7c18422bd4a7a03df881eb38f17b1032fcdc205d31 SHA512 0e7e8b30cb75a0892388de7b51051f13747e2cbcbe2658eba39fc59beea1abd459f695bdb068a43e84d49ae898667592485979081af0a601d57511bc021aac18
+EBUILD hostapd-9999.ebuild 6524 BLAKE2B f57ef6a03202e748ea1f13c47551ecdb15eeca299aea622d46742da149f8bba637be57e281e853237ff2afb1a3069728e50bac2f5d84adbfb009e951ce006c2d SHA512 19f626b45a2fb0ddff761674a6bb0723b6d331df1c808f921a90514d2f84fa267da085f0f65a933dcfd4e88396c62a547b0e9aef48132140200450e15dc16e85
 MISC metadata.xml 1024 BLAKE2B bcec2660f99c07f069daa175482fd7f6bcd15c4e0db2818af130221a737577223642a5439c325c39b263fc7bcabe3f5b4676a8d3311678cd24a062ea3273575d SHA512 cdb85ed770340ca5cfc4efdf7566e7f358b7c921db5a69763c01b2c2dc90a5f3aeb4e62d862452ddf67646b0ac4698cdc34be826187fede76121cb0824f00b18
diff --git a/net-wireless/hostapd/hostapd-2.6-r4.ebuild b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
index a0403321ea59..6f00dd912468 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -82,7 +82,7 @@ src_configure() {
 	echo "CONFIG_ERP=y" >> ${CONFIG}
 	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-	if use internal-tls && !use libressl; then
+	if use internal-tls && ! use libressl; then
 		echo "CONFIG_TLS=internal" >> ${CONFIG}
 	else
 		# SSL authentication methods
@@ -183,7 +183,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if use libressl || !use internal-tls; then
+	if use libressl || ! use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -198,7 +198,7 @@ src_install() {
 	dosbin ${PN}
 	dobin ${PN}_cli
 
-	if use libressl || !use internal-tls; then
+	if use libressl || ! use internal-tls; then
 		dobin nt_password_hash hlr_auc_gw
 	fi
 
diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
index 67f105b8c77a..82e50e8b7f08 100644
--- a/net-wireless/hostapd/hostapd-2.6-r5.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -85,7 +85,7 @@ src_configure() {
 	echo "CONFIG_ERP=y" >> ${CONFIG}
 	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-	if use internal-tls && !use libressl; then
+	if use internal-tls && ! use libressl; then
 		echo "CONFIG_TLS=internal" >> ${CONFIG}
 	else
 		# SSL authentication methods
@@ -186,7 +186,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if use libressl || !use internal-tls; then
+	if use libressl || ! use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -201,7 +201,7 @@ src_install() {
 	dosbin ${PN}
 	dobin ${PN}_cli
 
-	if use libressl || !use internal-tls; then
+	if use libressl || ! use internal-tls; then
 		dobin nt_password_hash hlr_auc_gw
 	fi
 
diff --git a/net-wireless/hostapd/hostapd-2.6-r1.ebuild b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
index 8a0d613bea7d..484677f3913d 100644
--- a/net-wireless/hostapd/hostapd-2.6-r1.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r6.ebuild
@@ -3,20 +3,26 @@
 
 EAPI="6"
 
-inherit toolchain-funcs eutils systemd
-
-# bogus commit to force manifest regeneration #596462
+inherit toolchain-funcs eutils systemd savedconfig
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="http://hostap.epitest.fi"
-SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
+HOMEPAGE="http://w1.fi"
+EXTRAS_VER="2.6-r6"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc x86"
-IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda"
-
-DEPEND="ssl? ( dev-libs/openssl:*[-bindist] )
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
 	kernel_linux? (
 		dev-libs/libnl:3
 		crda? ( net-wireless/crda )
@@ -28,18 +34,35 @@ RDEPEND="${DEPEND}"
 
 S="${S}/${PN}"
 
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
 src_prepare() {
 	# Allow users to apply patches to src/drivers for example,
 	# i.e. anything outside ${S}/${PN}
 	pushd ../ >/dev/null || die
+
+	# Add LibreSSL compatibility patch bug (#567262)
+	eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
 	# https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+
+	eapply "${WORKDIR}/${EXTRAS_NAME}/nl80211-Fix-NL80211_ATTR_SMPS_MODE-encoding.patch"
+
 	default
 	popd >/dev/null || die
 
@@ -51,6 +74,12 @@ src_prepare() {
 src_configure() {
 	local CONFIG="${S}/.config"
 
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
 	# toolchain setup
 	echo "CC = $(tc-getCC)" > ${CONFIG}
 
@@ -59,7 +88,9 @@ src_configure() {
 	echo "CONFIG_ERP=y" >> ${CONFIG}
 	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-	if use ssl; then
+	if use internal-tls && ! use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
 		# SSL authentication methods
 		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
 		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
@@ -68,6 +99,7 @@ src_configure() {
 		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
 		echo "CONFIG_TLSV11=y" >> ${CONFIG}
 		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
 	fi
 
 	if use wps; then
@@ -91,7 +123,6 @@ src_configure() {
 	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
 	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
 	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
 
 	einfo "Enabling drivers: "
 
@@ -100,8 +131,6 @@ src_configure() {
 	einfo "  HostAP driver enabled"
 	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
 	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_PRISM54=y" >> ${CONFIG}
-	einfo "  Prism54 driver enabled"
 	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
 	einfo "  None driver enabled"
 
@@ -160,7 +189,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if use ssl; then
+	if use libressl || ! use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -175,11 +204,13 @@ src_install() {
 	dosbin ${PN}
 	dobin ${PN}_cli
 
-	use ssl && dobin nt_password_hash hlr_auc_gw
+	if use libressl || ! use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
 
-	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
 
 	doman ${PN}{.8,_cli.1}
 
@@ -196,6 +227,8 @@ src_install() {
 		exeinto /etc/log.d/scripts/services/
 		doexe logwatch/${PN}
 	fi
+
+	save_config .config
 }
 
 pkg_postinst() {
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 7cf65530325c..2b99c9ab8875 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -86,7 +86,7 @@ src_configure() {
 	echo "CONFIG_ERP=y" >> ${CONFIG}
 	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
 
-	if use internal-tls && !use libressl; then
+	if use internal-tls && ! use libressl; then
 		echo "CONFIG_TLS=internal" >> ${CONFIG}
 	else
 		# SSL authentication methods
@@ -187,7 +187,7 @@ src_configure() {
 src_compile() {
 	emake V=1
 
-	if use libressl || !use internal-tls; then
+	if use libressl || ! use internal-tls; then
 		emake V=1 nt_password_hash
 		emake V=1 hlr_auc_gw
 	fi
@@ -202,7 +202,7 @@ src_install() {
 	dosbin ${PN}
 	dobin ${PN}_cli
 
-	if use libressl || !use internal-tls; then
+	if use libressl || ! use internal-tls; then
 		dobin nt_password_hash hlr_auc_gw
 	fi
 
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index a02c471689b4..0f78ac4e1efc 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,5 +1,5 @@
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 DIST iwd-0.3.tar.xz 642012 BLAKE2B 9bd43a13760cb32c2ead0e54b5e4389159a6a9a9780651435c8fb3d09859606a89aed6f163183a1027c8afefe05ef848c00104bf87cc223d25408f5405dffd33 SHA512 9c34d98ecae18955cc39cb7a58c0724b500902e2070ebbc1967fa4e2ed3633e01052a6bcb592b8bbb806307d8f0db8271a0ac7ad105f8a8f42915b8627e429f6
-EBUILD iwd-0.3.ebuild 2426 BLAKE2B a876a6b5fcfb918226b5fd468cc93f01f659fd14774ab48b040a2453d3117348695950d5ebdcea371acfd308dda9305f2cfafe8cf2cbc65a64a0bb8cf369cb56 SHA512 060b06a5f6f39fa99e185c762aa34aa5f8988f6373020879d85cde1abcb1f882ee35fafa338e61b7aa2b32022382d3d8bcdab47ccaf5e1c36e65a46a350a9aa9
-EBUILD iwd-9999.ebuild 2426 BLAKE2B a876a6b5fcfb918226b5fd468cc93f01f659fd14774ab48b040a2453d3117348695950d5ebdcea371acfd308dda9305f2cfafe8cf2cbc65a64a0bb8cf369cb56 SHA512 060b06a5f6f39fa99e185c762aa34aa5f8988f6373020879d85cde1abcb1f882ee35fafa338e61b7aa2b32022382d3d8bcdab47ccaf5e1c36e65a46a350a9aa9
+EBUILD iwd-0.3.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.3.ebuild
index 889f7da0e55e..fa3d32f34fab 100644
--- a/net-wireless/iwd/iwd-0.3.ebuild
+++ b/net-wireless/iwd/iwd-0.3.ebuild
@@ -27,19 +27,26 @@ DEPEND="${RDEPEND}
 
 pkg_pretend() {
 	CONFIG_CHECK="
-		~CRYPTO_USER_API_SKCIPHER
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_RSA
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
 		~CRYPTO_AES
-		~CRYPTO_MD4
-		~CRYPTO_ECB
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
 		~CRYPTO_CMAC
 		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
 		~KEY_DH_OPERATIONS
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~X509_CERTIFICATE_PARSER
 		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
 	"
 	if use amd64;then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index 889f7da0e55e..fa3d32f34fab 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -27,19 +27,26 @@ DEPEND="${RDEPEND}
 
 pkg_pretend() {
 	CONFIG_CHECK="
-		~CRYPTO_USER_API_SKCIPHER
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_RSA
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
 		~CRYPTO_AES
-		~CRYPTO_MD4
-		~CRYPTO_ECB
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
 		~CRYPTO_CMAC
 		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
 		~KEY_DH_OPERATIONS
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~X509_CERTIFICATE_PARSER
 		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
 	"
 	if use amd64;then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 898390bddaa2..2a0af3c76b13 100644
--- a/net-wireless/linssid/Manifest
+++ b/net-wireless/linssid/Manifest
@@ -1,3 +1,3 @@
-DIST linssid_3.5.orig.tar.gz 396769 BLAKE2B f2d04af5d990a51cce8501309fcf14090e262b531ec6b914c3373d4bf0cb2d2bfed9ead81a21e2dfe5a3f7bf2cef3d400aadb216604317946a8dc4938298246a SHA512 874f428a6a6de34404b57601f016f9e417e75578ec5c5c0661fa614f2bde80d732132d31880f7b947a7178b0fcaf6b00bb3c317a652346d50009ce814b46f7b1
-EBUILD linssid-3.5-r1.ebuild 1406 BLAKE2B 759f763d6c11d68859b1eb770db89701d3dd03414146a897a364c62cc5bef8592c0c854e9a4ef7fcb7741d203a4d5847df8592e4e28fa0d71edd36e55d09cddf SHA512 a064b427702017c4eac7fdc83b6e3cce2fa736fec83d85540907e854f48f61fd440ba4c4e2a2799141797436e7b1d7852a509ba589dbc5c6ab9e489fb5e3f509
+DIST linssid_3.6.orig.tar.gz 397541 BLAKE2B 35d56cc9439a3a117200c59a03dad3a53bbecbe522a5592ba4cd6a5d37332c4b8c6ec065b7357643bda6b7b54462d720e3ee0b3efcb5a80e14c809330d84fc2b SHA512 066c890776a23d0e5fe8518826c64edc4b7d6dcef28cd7ce58f842e52b9e2b13517358ca6df636613abd1e860b20c6b542b5df165de1aa262e1e7db8a60e00e5
+EBUILD linssid-3.6.ebuild 1361 BLAKE2B 66b063fc1c26b202295d61f748e42b61843102ee1126463b6d4bd6993ea0458dba8aef9ef3f374490d1ad50933fde9c24547d04e50d2bf421dcae35409b136e8 SHA512 803adb84a9c424000ad90730a350563571c88378fade321b8f6d01e8ab9344a1e5855423ef8aca1a2401936795d4b712a7afff9c0bd3eb5bff76e120b4784d84
 MISC metadata.xml 870 BLAKE2B b769f54c91d56f89b67f1375f07eb9c7f72a80db1a05cf7998b83488204a4c07011aee881c3503ea0bdc60930a595c57301a01bb866ef46bc928e4d46a076815 SHA512 2f1248f1540ef58073808c08a87b3e813e2a50af2624f9230618626f3efc5a3f5719d4792e0c391d2fc1aa95770366cf510c9fd36689008ca1f8e0369763ed8e
diff --git a/net-wireless/linssid/linssid-3.5-r1.ebuild b/net-wireless/linssid/linssid-3.6.ebuild
index 3b0e116ee02e..79d6ce72d296 100644
--- a/net-wireless/linssid/linssid-3.5-r1.ebuild
+++ b/net-wireless/linssid/linssid-3.6.ebuild
@@ -37,9 +37,7 @@ src_prepare() {
 	sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro || die
 
 	# Fix lib path for x11-libs/qwt
-	if use amd64; then
-		sed -i -e "s/lib\/libqwt-qt5.so.6/\/$(get_libdir)\/libqwt6-qt5.so.6/" linssid-app.pro || die
-	fi
+	sed -i -e '/libqwt-qt5.so.6/c\LIBS += -lqwt6-qt5' linssid-app.pro || die
 
 	# Enable 'gksu' when a user don't want policykit
 	if ! use policykit; then
diff --git a/net-wireless/lorcon/Manifest b/net-wireless/lorcon/Manifest
index c06a24dd87fa..2a020b96b685 100644
--- a/net-wireless/lorcon/Manifest
+++ b/net-wireless/lorcon/Manifest
@@ -1,4 +1,6 @@
 DIST lorcon-0.0_p20150109.tar.xz 259788 BLAKE2B e3bd188642f7ef49fa3b7361bd659fdd47d6449598b5248412ad3d8e85e5d0b9c0f8d73fdcd3d0822f19a0d069bf0eeb832bed7bb38c418970d617c03387d1ce SHA512 acbd88477317475ca8555d579a1483ea5e5d9eac0f86ef7bde2592e007025070ca56c6cd43e814560e28165ac7b40bd86f2703a466faeca1619b8373dc2b625b
-EBUILD lorcon-0.0_p20150109.ebuild 1333 BLAKE2B 01035c713636accf57eda0827ef368e14a5c19d1603cfa175b008e031368f8b40021a180e6b33b060da77fae1570b5d3f7299332a9f2ff86f708517f1b41a4a6 SHA512 e59ba0d7bdb915f63ff2bd29c1a3eb87fabe6c0413c518588773da010b0a066057cc3e88cbab885c58a273c218f658fb30db60e7a0d82934a068e723cbbca6d0
-EBUILD lorcon-9999.ebuild 1337 BLAKE2B 1cc9d43594443219355da6fa8252db445c92298a158c5abc140bca185d4276b38da14ebf59b3448b9f13fcb9f3819476ae2829fc4b686937edd646b1ce4d186a SHA512 753e28a6f06c438449bbcc1c308d45f141bdbf2167319b16b9c25be29a6f8b8c738b65430cf6024cc84d264cd90eec535fe1731862cdf3fbc865d275737b3b4d
+DIST lorcon-0.0_p20180409.tar.gz 506177 BLAKE2B d4bea3e91ce506c6ba56221b4fc2e25ffd5ba979b905e66166c570adefc513ca51229fab5706276dbbd1bea68ee2c2802adf4eeefb1e5f0c593fada6cb39ab51 SHA512 7273b68fa4aa7418d9bab8b4651b93e315b9ea55657efa7d14ef444fda7e0e036267d319cda6676951e54b661391a77cc848778f859249a50847d33dac0b8ea9
+EBUILD lorcon-0.0_p20150109.ebuild 1333 BLAKE2B 5546a5ca92fe15423699d82cf1b29638ca3e4e2b6a77ac752801a7a7dee397ae95fe9604f38ee642a348f848b208e2ec80ce696e7d9481efb9273f32ed4bfe85 SHA512 7061ee2bb8da455a0e6e451b4ca5cbf024ad0ad4012cc0f35db48d2c30f5ba46b10970479ec141e028675a978eb3fb7ea93f2a1af1b57c089f078f47d49ad856
+EBUILD lorcon-0.0_p20180409-r1.ebuild 1936 BLAKE2B 6aa0e6103ae4dcc4d2c0020275ee94e21a2f370a82505b006688640dfd12ceb794086675b729d241b7ad974c53541a3ef2341486d810052ad99fc86a5862dc46 SHA512 eb7fd09cbc17a18c1feb06000c448fe122a794c6e3ae427c970ea71075d98407bccc8d3f3c7e1dceeb199167e514c40e202b795d7f79030caae5081a610f8222
+EBUILD lorcon-9999.ebuild 1936 BLAKE2B 6aa0e6103ae4dcc4d2c0020275ee94e21a2f370a82505b006688640dfd12ceb794086675b729d241b7ad974c53541a3ef2341486d810052ad99fc86a5862dc46 SHA512 eb7fd09cbc17a18c1feb06000c448fe122a794c6e3ae427c970ea71075d98407bccc8d3f3c7e1dceeb199167e514c40e202b795d7f79030caae5081a610f8222
 MISC metadata.xml 241 BLAKE2B 31d2e88c810d3facda6587f93bdc429e66b6ed90dc2c019dac1ece6da620b74dc4db8907a25d6559ff7a027f6b267774016686a56c5a5e67da4fbfa3cae7be6e SHA512 d308ccef737c1776c2d77c0761996ef272a5866f5d9ceeda4dd4ceede851a145f76281a29b4c4b154e5b10f1d57c9344010bfcf75ba52fb3f1b34a58e3c2053f
diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index c10482d2cdfb..702bd34a3a2d 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
new file mode 100644
index 000000000000..0348df635401
--- /dev/null
+++ b/net-wireless/lorcon/lorcon-0.0_p20180409-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1
+
+DESCRIPTION="A generic library for injecting 802.11 frames"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
+
+if [[ ${PV} == "9999" ]] ; then
+	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
+	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}"/${P}
+else
+	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="python"
+
+DEPEND="
+	python? ( ${PYTHON_DEPS} )
+	dev-libs/libnl:3=
+	net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		cp -R "${S}/" "${WORKDIR}/all"
+	fi
+	default_src_unpack
+}
+
+src_prepare() {
+	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
+	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
+	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
+	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
+	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
+	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
+	default
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	default_src_configure
+}
+
+src_compile() {
+	default_src_compile
+	if use python; then
+		LDFLAGS+=" -L${S}/.libs/"
+		cd pylorcon2 || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	if use python; then
+		cd pylorcon2 || die
+		distutils-r1_src_install
+	fi
+}
+
+src_test() {
+	:
+}
diff --git a/net-wireless/lorcon/lorcon-9999.ebuild b/net-wireless/lorcon/lorcon-9999.ebuild
index f0502097ecd1..0348df635401 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
@@ -9,14 +9,18 @@ DISTUTILS_OPTIONAL=1
 inherit distutils-r1
 
 DESCRIPTION="A generic library for injecting 802.11 frames"
-HOMEPAGE="http://802.11ninja.net/lorcon"
+HOMEPAGE="https://github.com/kismetwireless/lorcon"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://code.google.com/p/lorcon/"
+	#EGIT_REPO_URI="https://www.kismetwireless.net/lorcon.git"
+	EGIT_REPO_URI="https://github.com/kismetwireless/lorcon.git"
 	inherit git-r3
 	KEYWORDS=""
+	S="${WORKDIR}"/${P}
 else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+	GIT_HASH="d8637792f2e857f31849f29759c1022eb0518c83"
+	SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/"${PN}-${GIT_HASH}"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
@@ -32,8 +36,6 @@ RDEPEND="${DEPEND}"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-S="${WORKDIR}"/${P}
-
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-r3_src_unpack
@@ -44,6 +46,12 @@ src_unpack() {
 
 src_prepare() {
 	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.c
+	sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' pylorcon2/PyLorcon2.h
+	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.c
+	sed -i 's#<lorcon2/lorcon_packet.h>#"../lorcon_packet.h"#' pylorcon2/PyLorcon2.h
+	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.c
+	sed -i 's#<lorcon2/lorcon_multi.h>#"../lorcon_multi.h"#' pylorcon2/PyLorcon2.h
+	default
 	use python && distutils-r1_src_prepare
 }
 
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 32bfd8aae0db..05c21eb8e3b5 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -14,6 +14,7 @@ EBUILD unifi-5.7.28-r1.ebuild 1750 BLAKE2B ab2381e2fce8a2e71723773acdb4bc0f8996c
 EBUILD unifi-5.7.28.ebuild 1747 BLAKE2B 99733735bc4d4dda54b67fc97830dc72a873e2998f92b7e2164d0f4bea1bd3f0aec450dfe1902111cfa1125b0efc17fe11410d9047098dea60f0432a89f6b00b SHA512 eda3ebcd582130663514729c2fce08647027ad39b545bdf21be587e317cabef7ffc2a8b714f88336cc41503f5f7640525199cc2207bc7c617906230f226c7171
 EBUILD unifi-5.8.23-r1.ebuild 1750 BLAKE2B f179a377d37061f017715280b8231a4e7b8219dad6821200a05445f5e2d52830b03e1ebfd092aa4141ee5e0611e538816901aaa9c74b2613b5faa78637f4f178 SHA512 f707d8793cda6db537bac979768bc7399a0473e102b3f9f9fbffaeb72269121daa3bc4047ac9af2da08545332f1bbb58b5bad7361e8436c9e5f5ab39683001b0
 EBUILD unifi-5.8.23.ebuild 1747 BLAKE2B ff3016996e6e78398aa2d124d2e3f74f3f0563a3baf90a7c21cb653477817d64a32da6915edebde763b6d9f2c16c7af52e36d25d29569bcb5bd2b59a969b490a SHA512 e1ff8abdc93ee260b538750f3f184a6cdc6a68f2cdd4b23f0a58e3a5552cf88f63a167924608b34a07b3301131800a7f4d1cac96432c89a2d357a92603c059bf
+EBUILD unifi-5.8.24-r1.ebuild 1842 BLAKE2B 8466414f125504262ead905b6d90ac645b3876a5f8bb53b1fb3fed1a221575ca4632b6b3388f8326d92d8c6fae072ad68c21bd85ddf17c0823b2e5db7abda936 SHA512 42bcec2f8f3193bbcaa6569461917fce094135640ea4139b84d9d858d7d992b9fababc4287911cf2d40f322abbf7ea7df2d07a521200e9167f01b98da7fe426d
 EBUILD unifi-5.8.24.ebuild 1739 BLAKE2B eef3ca7c137f8f6e87395678d4560e14f0bc1c2f81ef6d7f8ec077fdf89016110fc9e3b588e0af3f619e40b8cc802e51db889279b6381a93ae0fcce102e840c2 SHA512 4c02705694d13aee8d582e2010de2feabc442e30397bc6ff2feaf0a5d703ecaadf6ef9e2a0b8c972cfb687acb93e6ac4b49a6d7288d3abf12a34d960bda76bd7
 EBUILD unifi-5.9.4-r1.ebuild 1727 BLAKE2B 8aca9dc5cd7ec20467bffd5f6d13a3818391383cb39b8bcc0f3b30fb4d4c26f8a3b92dfefc2c9b9b77d17a52a4d1bb1413ff51d6786f55cd910a666b13ebad96 SHA512 cd8b6b98ee2d203ae806572131c2985badf1e9252374ac7ef1051a97a99feb4b830bfe19ff60d09c450076c73f93948e9746a4115bd1285622e199bad4bc2926
 EBUILD unifi-5.9.4.ebuild 1724 BLAKE2B 1000c8803b9ec71ac2871fc0f7c3b3d20baa388807fc2f6c6b77689d6d55b0bb4cb31d57950fdd0cdca26ece065529a1c6c01526071b70e47827568679ec721a SHA512 5a5886ebc00a78e5c305f971d2eee93ef90de69f6bc0387be7be5f11ae17ecdd7c030f012087a08907fb7e2cb2e05a3206c9c5823c87034223b5c9e0b0c6af14
diff --git a/net-wireless/unifi/unifi-5.8.24-r1.ebuild b/net-wireless/unifi/unifi-5.8.24-r1.ebuild
new file mode 100644
index 000000000000..08791533777e
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.8.24-r1.ebuild
@@ -0,0 +1,74 @@
+# 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=""
+
+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 ~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.8"
+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
+}