gentoo resync : 30.06.2018

43 files changed, 1267 insertions, 141 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 98b92906a035..7de61a90520a 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 035ea44efeb0..5260944d0152 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -12,7 +12,7 @@ DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02d
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
-EBUILD bluez-5.49-r1.ebuild 8104 BLAKE2B 614bf0fab42321ed4b96f92d5309895ff816805ed9405e758981bb0ebc48196a6c14b43349c62b531f19144971b2dab92a6bb1c12894bb8f041580aeb16a04e9 SHA512 cd3308db12790dc05180f0501319d22786150936ce574ec685000aab65fd3bc2c26291cea538afd1ee74c7825fc84618117264d6662376f56f8bda2acca6fda3
+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
 MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.49-r1.ebuild b/net-wireless/bluez/bluez-5.49-r1.ebuild
index ed09b204db99..b2be5a4fc777 100644
--- a/net-wireless/bluez/bluez-5.49-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.49-r1.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 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 x86"
 IUSE="alsa 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/chirp/Manifest b/net-wireless/chirp/Manifest
index 968baf521702..6e2c1ffa715c 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,6 +1,4 @@
-DIST chirp-daily-20170714.tar.gz 701208 BLAKE2B 2b73f605c86f9a7650f3dee05d2735d26583221206a824f1a0f0642a41ecbbc6e94e1b2b069c40cbb7a5d73d1219c719c896f75cc647f668eeded627af3bc279 SHA512 4ebc09142077fe2e17f4d01ce83babd07a55eb44db4f62358c1eaa341ffc983f7bacffa734caf1ec6973037571878bdb6d7b65fe6905681a1aa62ac0dee2a09c
-DIST chirp-daily-20180331.tar.gz 754495 BLAKE2B 81db154e784b0d01809e79b3eee6c518becb3760f85b606ab7bae174d77fdc5fee9fa81684cb1784e80f27abb909a1825519ea6e72fb2d69e9e4aa788deb3c53 SHA512 2ddcf8bcf5ff47639c06e5dce212e747fe7bc0bf3347da226a0d26c27748cbcc99726d6926c695d742d101376581e708a601129bac75687c5e92bc8a55863f3d
-EBUILD chirp-20170714.ebuild 1043 BLAKE2B 003a08c8574795d9bf453bef24bde2a6cec0d0c48ca3e412ba8feef0e54a10c11aee4ee226daff65eb7c0b9f1bd8719f4226e3d20a92f3d635a98f2a218718f3 SHA512 5db611b3be52f84db7f6821c9e321abdb2bf055dd015a2a677f0292bb06c08e8612cd7b9bd5e4a37299fc59b5df23e67e897560e2d5b0cfe286b3c5c38e1d630
-EBUILD chirp-20180331.ebuild 1043 BLAKE2B af0785d96477689c3be5b933220c2ee16f1fc4d0ad3c021c53926a899c576117e46a6ba2ce3ec90697694f69e38e6d22fbbeb20cf6b85e1d9e3c2ff2265cd679 SHA512 eeb9bc29822fb4e7b7942e7181a05c84b2b0cb2523a3b8e6c965a098394ce1fc7ed1a92700e9698bbf6bc95ae8b1d8181cba43a4a3e3b926b7d023fbffe1ece6
-EBUILD chirp-99999999.ebuild 1043 BLAKE2B 003a08c8574795d9bf453bef24bde2a6cec0d0c48ca3e412ba8feef0e54a10c11aee4ee226daff65eb7c0b9f1bd8719f4226e3d20a92f3d635a98f2a218718f3 SHA512 5db611b3be52f84db7f6821c9e321abdb2bf055dd015a2a677f0292bb06c08e8612cd7b9bd5e4a37299fc59b5df23e67e897560e2d5b0cfe286b3c5c38e1d630
+DIST chirp-daily-20180623.tar.gz 767246 BLAKE2B c842ade8f5d25ca44bbb9ffea09f32ad4f4c04747e5eb08ad2e533b6dc4fa323bdd8a1a1b47da44e50efa502e856dfa5da14fab6688d1dda470d13e219d08341 SHA512 2c82f575faaac7f922e4aae192f992f724be7dc6788f194e581a21238f21af3b554ae0c3bba08d34806d310b796a4f49ef96de97ba758c41cc55edf6e1a1566f
+EBUILD chirp-20180623.ebuild 1139 BLAKE2B ddd873216fe53fd35ff3f7395d05b3c95cc5434e326de6abe65bf3a928e6f9fd9f0def0d00609c1be53b76376ba14f257aba68d270803fbe7c8412052252ba68 SHA512 7b49e6b80c1a6acea83085a3eeb2c2e5172b93fc90ed5d0e87b63e742c98ca32a9bdcb8252a5ba990244abddee9e25abae042675bd3f59a148ddfb6531964fb9
+EBUILD chirp-99999999.ebuild 1139 BLAKE2B ddd873216fe53fd35ff3f7395d05b3c95cc5434e326de6abe65bf3a928e6f9fd9f0def0d00609c1be53b76376ba14f257aba68d270803fbe7c8412052252ba68 SHA512 7b49e6b80c1a6acea83085a3eeb2c2e5172b93fc90ed5d0e87b63e742c98ca32a9bdcb8252a5ba990244abddee9e25abae042675bd3f59a148ddfb6531964fb9
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20170714.ebuild b/net-wireless/chirp/chirp-20170714.ebuild
deleted file mode 100644
index ca6714578c8b..000000000000
--- a/net-wireless/chirp/chirp-20170714.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-if [[ ${PV} == "99999999" ]] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
-fi
-
-inherit distutils-r1 ${SCM}
-
-DESCRIPTION="Free open-source tool for programming your amateur radio"
-HOMEPAGE="http://chirp.danplanet.com"
-
-if [[ ${PV} == "99999999" ]] ; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-daily-${PV}"
-	RESTRICT="test"
-fi
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="radioreference"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python]"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	radioreference? ( dev-python/suds[${PYTHON_USEDEP}] )"
-
-src_prepare() {
-	sed -i -e "/share\/doc\/chirp/d" setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pushd tests > /dev/null
-	"${PYTHON}" run_tests || die
-	popd > /dev/null
-}
diff --git a/net-wireless/chirp/chirp-20180331.ebuild b/net-wireless/chirp/chirp-20180623.ebuild
index 556485ceac99..ef243acf8ac1 100644
--- a/net-wireless/chirp/chirp-20180331.ebuild
+++ b/net-wireless/chirp/chirp-20180623.ebuild
@@ -43,3 +43,11 @@ python_test() {
 	"${PYTHON}" run_tests || die
 	popd > /dev/null
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
index ca6714578c8b..ef243acf8ac1 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.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=6
@@ -43,3 +43,11 @@ python_test() {
 	"${PYTHON}" run_tests || die
 	popd > /dev/null
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 8171dcec2070..45a1ec906ac8 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,8 +2,11 @@ AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
+DIST gnuradio-3.7.12-qt5.tar.xz 31048 BLAKE2B 5665ecd7f5ab34852a0e2dc975c483331e7b547377adf8a4c38ab68a6e034d6ec9f009210f74bbf9a0fc76e214bd744558b267e853843f33f799bbf0a0f2a7fc SHA512 25da9415d7b7f9984075c2a8fcf092bc0585be550c0b9a7e6910d934fd3aab4be3135d7a2c83b01ce19b2ac8e0065ffb5ad1375fa29cc259d4dc2d1d92003f99
+DIST gnuradio-3.7.13.3.tar.gz 4544605 BLAKE2B f059e8af860b7c18573f0efa909f3bf2b36b4d7208e26dd18a1c9de8cbf40e0d9079336f4a5f48430790e28dc21f5150ad2294fa1d664889c07e849d236160a0 SHA512 e4bf63899678fd792bc08baa2db673b192dc823d6e586124538cbdf12e60a882847e72cfca7f52ef906d52038a9cb48a8b5891593c9db1cb172c4077a54d4056
 EBUILD gnuradio-3.6.5.1-r2.ebuild 5339 BLAKE2B 6e54dbf3381eed4556a52c1536ca36def8f724da6375140b06ddda7549c857d65ad029aa774326ab587edc82a0a804e009a72a6d12214bdfcacd2101608278ca SHA512 e632918a4543ea97158dd205548310bf268b295a69bbc288d1129c076c982b2bb87784ea7b519c0fa6a4fc7852cef2adbc444b68099a98929862105ea2351c7c
 EBUILD gnuradio-3.7.11-r3.ebuild 7029 BLAKE2B 3d38a4b4288ef2d5d12a7433ee2ec2bffbc2a5cfe6cd70eee57c3eaf701122712d618490a2b460d2110a283e81085c1c2a7ddb40fd7ef73f6045b5d7211fe36f SHA512 647158607c8137ffd4a09344da964d22b9b800d5fb10c63451548292f6e3a8d173dee9d140cd2e7405af06819bd9b136e9dfdca33971c16f7a97297391a6b98b
+EBUILD gnuradio-3.7.13.3.ebuild 6785 BLAKE2B 2038f1ce0bcffd0c44e1f2224b618103ea797c6423dcdc23b819da53bc6061673975165713296f4d18650771e9a44fb3b8ce102851d349fbfc75c1a4fe631351 SHA512 4c8317d911c7c0643e7f977f83696e8e3b939d9737cfdde5864779e05248ed58863dd81ba9a6eb80c10db4b023b1118d25705efd4a77d2585d839acfc1a97993
 EBUILD gnuradio-3.7.9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
 EBUILD gnuradio-3.8.9999.ebuild 6654 BLAKE2B 2ecf927d0469ecd721e929ba77db619949cac4e11f2a4ee62e292cbcc6ac5c0969d8eae1d01b52f67756e6cc5165cadde94b7907658c950e181dff0107d893d6 SHA512 3a839947f80f483dc6e78b9b453c1f455c4be58a7a67cbf2b116bba7f2364c53485c6695bb236704ff5286fc28310fa8324b6a428b7d55105b393087069e340e
 EBUILD gnuradio-9999.ebuild 7105 BLAKE2B 665ec0e3792d8543ae75134f8b475f17cbb534658220265248453c9c00351bbbb6029831b530a95fbf10ebe9ef9e3f3bd08c89d50890dfaf0cd5dea62177aecc SHA512 3d950e8f53160c2e33df4c43eeef9f0050cb53448f4dd92d4b0027a4c36d2dc48feee8f602a281e81fc86e5d37e5b0387e70a8cff7b692449422f1992ab51b0c
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild
new file mode 100644
index 000000000000..469c004b33d6
--- /dev/null
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+CMAKE_BUILD_TYPE="None"
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
+
+DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
+HOMEPAGE="https://www.gnuradio.org/"
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+if [[ ${PV} =~ "9999" ]]; then
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz
+			https://dev.gentoo.org/~zerochaos/patches/${PN}-3.7.12-qt5.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+if [[ ${PV} == "3.7.9999" ]]; then
+	EGIT_BRANCH="maint"
+elif [[ ${PV} == "3.8.9999" ]]; then
+	EGIT_BRANCH="next"
+fi
+
+IUSE="+audio +alsa atsc +analog +digital channels doc dtv examples fcd fec +filter grc jack log noaa oss pager performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet wxwidgets zeromq"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+		audio? ( || ( alsa oss jack portaudio ) )
+		alsa? ( audio )
+		oss? ( audio )
+		jack? ( audio )
+		portaudio? ( audio )
+		analog? ( filter )
+		digital? ( filter analog )
+		dtv? ( fec )
+		pager? ( filter analog )
+		qt5? ( filter )
+		uhd? ( filter analog )
+		fcd? ( || ( alsa oss ) )
+		wavelet? ( analog )
+		wxwidgets? ( filter analog )"
+
+# bug #348206
+# comedi? ( >=sci-electronics/comedilib-0.8 )
+# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669
+RDEPEND="${PYTHON_DEPS}
+	>=dev-lang/orc-0.4.12
+	dev-libs/boost:0=[${PYTHON_USEDEP}]
+	!<=dev-libs/boost-1.52.0-r6:0/1.52
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/fftw:3.0=
+	alsa? (
+		media-libs/alsa-lib:=
+	)
+	fcd? ( virtual/libusb:1 )
+	filter? ( sci-libs/scipy )
+	grc? (
+		dev-python/pygobject:*[cairo(+),${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+	jack? (
+		media-sound/jack-audio-connection-kit
+	)
+	log? ( dev-libs/log4cpp )
+	portaudio? (
+		>=media-libs/portaudio-19_pre
+	)
+	qt5? (
+		dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		x11-libs/qwt:6[qt5(+)]
+		dev-qt/qtwidgets:5
+	)
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	uhd? ( >=net-wireless/uhd-3.9.6:=[${PYTHON_USEDEP}] )
+	utils? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+	vocoder? ( media-sound/gsm )
+	wavelet? (
+		>=sci-libs/gsl-1.10
+	)
+	zeromq? ( >=net-libs/zeromq-2.1.11 )
+	"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	>=dev-lang/swig-3.0.5
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.7.1
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	grc? ( x11-misc/xdg-utils )
+	oss? ( virtual/os-headers )
+	test? ( >=dev-util/cppunit-1.9.14 )
+	zeromq? ( net-libs/cppzmq )
+"
+
+src_prepare() {
+	gnome2_environment_reset #534582
+
+	if [[ ${PV} == "3.8.9999" ]]; then
+		true
+	else
+		epatch "${FILESDIR}"/gnuradio-wxpy3.0-compat.patch
+	fi
+	# Useless UI element would require qt3support, bug #365019
+	sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die
+	epatch "${WORKDIR}"/qt5-maint-00*.patch
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	python_export PYTHON_SITEDIR
+	mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DENABLE_GNURADIO_RUNTIME=ON
+		-DENABLE_VOLK=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_GR_BLOCKS=ON
+		-DENABLE_GR_FFT=ON
+		-DENABLE_GR_AUDIO=ON
+		-DENABLE_GR_AUDIO_ALSA="$(usex alsa)"
+		-DENABLE_GR_ANALOG="$(usex analog)"
+		-DENABLE_GR_ATSC="$(usex atsc)"
+		-DENABLE_GR_CHANNELS="$(usex channels)"
+		-DENABLE_GR_DIGITAL="$(usex digital)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_SPHINX="$(usex doc)"
+		-DENABLE_GR_DTV="$(usex dtv)"
+		-DENABLE_GR_FCD="$(usex fcd)"
+		-DENABLE_GR_FEC="$(usex fec)"
+		-DENABLE_GR_FILTER="$(usex filter)"
+		-DENABLE_GRC="$(usex grc)"
+		-DENABLE_GR_AUDIO_JACK="$(usex jack)"
+		-DENABLE_GR_LOG="$(usex log)"
+		-DENABLE_GR_NOAA="$(usex noaa)"
+		-DENABLE_GR_AUDIO_OSS="$(usex oss)"
+		-DENABLE_GR_PAGER="$(usex pager)"
+		-DENABLE_ENABLE_PERFORMANCE_COUNTERS="$(usex performance-counters)"
+		-DENABLE_GR_AUDIO_PORTAUDIO="$(usex portaudio)"
+		-DENABLE_TESTING="$(usex test)"
+		-DENABLE_GR_TRELLIS="$(usex trellis)"
+		-DENABLE_GR_UHD="$(usex uhd)"
+		-DENABLE_GR_UTILS="$(usex utils)"
+		-DENABLE_GR_VOCODER="$(usex vocoder)"
+		-DENABLE_GR_WAVELET="$(usex wavelet)"
+		-DENABLE_GR_QTGUI="$(usex qt5)"
+		-DDESIRED_QT_VERSION="$(usex qt5 5)"
+		-DENABLE_GR_VIDEO_SDL="$(usex sdl)"
+		-DENABLE_GR_ZEROMQ="$(usex zeromq)"
+		-DENABLE_GR_CORE=ON
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DGR_PYTHON_DIR="${PYTHON_SITEDIR}"
+		-DGR_PKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	use vocoder && mycmakeargs+=( -DGR_USE_SYSTEM_LIBGSM=TRUE )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/
+		mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+	# It seems that the examples are always installed
+		rm -rf "${ED}"/usr/share/${PN}/examples || die
+	fi
+
+	if use doc || use examples; then
+		#this doesn't appear useful
+		rm -rf "${ED}"/usr/share/doc/${PF}/xml || die
+	fi
+
+	# We install the mimetypes to the correct locations from the ebuild
+	rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die
+	rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
+
+	# Install icons, menu items and mime-types for GRC
+	if use grc ; then
+		local fd_path="${S}/grc/scripts/freedesktop"
+		insinto /usr/share/mime/packages
+		doins "${fd_path}/${PN}-grc.xml"
+
+		domenu "${fd_path}/"*.desktop
+		doicon "${fd_path}/"*.png
+	fi
+
+	python_fix_shebang "${ED}"
+}
+
+src_test()
+{
+	ctest -E qtgui
+}
+
+pkg_postinst()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
+				|| die "icon resource installation failed"
+			xdg-icon-resource install --noupdate --context apps --size ${size} \
+				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \
+				|| die "icon resource installation failed"
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
+
+pkg_postrm()
+{
+	local GRC_ICON_SIZES="32 48 64 128 256"
+
+	if use grc ; then
+		xdg_desktop_database_update
+		xdg_mime_database_update
+		for size in ${GRC_ICON_SIZES} ; do
+			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
+				application-gnuradio-grc || ewarn "icon uninstall failed"
+			xdg-icon-resource uninstall --noupdate --context apps --size ${size} \
+				gnuradio-grc || ewarn "icon uninstall failed"
+
+		done
+		xdg-icon-resource forceupdate
+	fi
+}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 18452d1ce9cf..fa02adcb08df 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -12,7 +12,7 @@ AUX hostapd.service 213 BLAKE2B 0141aace8e6f807611e423e70cce437a5ae38a5fee8af74a
 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 6971 BLAKE2B dfca1c427efd1a849e9376406ddb5ae5940fddde1445a7a220d3b48867476b9e894e5842c1579f34afe5c4277b4332963283be03137519492d00e3df3084dfe0 SHA512 1787139f0a70d20cb1a9a8b0f82842e0b10645828472c3b032840f0c8bc3d9008409e41057ca7b0ea1d1e294357f9ca64f31ef85b855c9de18727375da73c045
+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
 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 d7fb2f58e5b8..a0403321ea59 100644
--- a/net-wireless/hostapd/hostapd-2.6-r4.ebuild
+++ b/net-wireless/hostapd/hostapd-2.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc x86"
+KEYWORDS="amd64 arm ~mips ppc x86"
 IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
 
 DEPEND="
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
new file mode 100644
index 000000000000..a02c471689b4
--- /dev/null
+++ b/net-wireless/iwd/Manifest
@@ -0,0 +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
+MISC metadata.xml 369 BLAKE2B ea1b7bead9ec1e6973bb454f6112bdf0edd7a325d0100debbc107e142d017696e4833c541ce8370bbce249429662668940d664d935eb8b2f7a84a1869b7da2f6 SHA512 665188c4c174fee98b91cbc21923d2e7c31d6ace4229d51808157eb2ca0cc9f51ac9c12f461047ef5c3b3dafd7cdccb6410835e9471b5da0c5bbffd6e651aa3e
diff --git a/net-wireless/iwd/files/iwd.initd b/net-wireless/iwd/files/iwd.initd
new file mode 100644
index 000000000000..12983c1ab2d0
--- /dev/null
+++ b/net-wireless/iwd/files/iwd.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/iwd.pid"
+command="/usr/libexec/iwd"
+command_background="yes"
+
+depend() {
+	need dbus
+	keyword -shutdown
+}
diff --git a/net-wireless/iwd/iwd-0.3.ebuild b/net-wireless/iwd/iwd-0.3.ebuild
new file mode 100644
index 000000000000..889f7da0e55e
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~CRYPTO_USER_API_SKCIPHER
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_RSA
+		~CRYPTO_AES
+		~CRYPTO_MD4
+		~CRYPTO_ECB
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~KEY_DH_OPERATIONS
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~X509_CERTIFICATE_PARSER
+		~PKCS7_MESSAGE_PARSER
+	"
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if [[ ${PV} == "9999" ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
new file mode 100644
index 000000000000..889f7da0e55e
--- /dev/null
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info systemd
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +monitor cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+RDEPEND="sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~CRYPTO_USER_API_SKCIPHER
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_RSA
+		~CRYPTO_AES
+		~CRYPTO_MD4
+		~CRYPTO_ECB
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~KEY_DH_OPERATIONS
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~X509_CERTIFICATE_PARSER
+		~PKCS7_MESSAGE_PARSER
+	"
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	check_extra_config
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if [[ ${PV} == "9999" ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
new file mode 100644
index 000000000000..96b6193f64c1
--- /dev/null
+++ b/net-wireless/iwd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<use>
+		<flag name='client'>Enable iwctl client tool</flag>
+		<flag name='monitor'>Enable iwmon monitor tool</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
index 962270ab7e49..898390bddaa2 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.ebuild 1403 BLAKE2B 66b89b6e494fc235048c44589fd116cfd81378b2b16e5bdb532fdc0bc50f9f0f14c0af7b93b6f4b6c14918b6122bb46357d874e25cc394840f3bfc1ba1b879b3 SHA512 78af6693f16e8b0615c9fc3297e206a9e415adfbfcc115daeb2d38d54f8966db87a985b5dadff4e5dd4a1b08a1d50b9a4f542cca63ed40eb98b219d21a25aa19
+EBUILD linssid-3.5-r1.ebuild 1406 BLAKE2B 759f763d6c11d68859b1eb770db89701d3dd03414146a897a364c62cc5bef8592c0c854e9a4ef7fcb7741d203a4d5847df8592e4e28fa0d71edd36e55d09cddf SHA512 a064b427702017c4eac7fdc83b6e3cce2fa736fec83d85540907e854f48f61fd440ba4c4e2a2799141797436e7b1d7852a509ba589dbc5c6ab9e489fb5e3f509
 MISC metadata.xml 870 BLAKE2B b769f54c91d56f89b67f1375f07eb9c7f72a80db1a05cf7998b83488204a4c07011aee881c3503ea0bdc60930a595c57301a01bb866ef46bc928e4d46a076815 SHA512 2f1248f1540ef58073808c08a87b3e813e2a50af2624f9230618626f3efc5a3f5719d4792e0c391d2fc1aa95770366cf510c9fd36689008ca1f8e0369763ed8e
diff --git a/net-wireless/linssid/linssid-3.5.ebuild b/net-wireless/linssid/linssid-3.5-r1.ebuild
index 8ea242d855ae..3b0e116ee02e 100644
--- a/net-wireless/linssid/linssid-3.5.ebuild
+++ b/net-wireless/linssid/linssid-3.5-r1.ebuild
@@ -19,7 +19,7 @@ DEPEND="dev-libs/boost:=
 	dev-qt/qtopengl:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	x11-libs/qwt:6[opengl,qt5,svg]"
+	x11-libs/qwt:6[opengl,qt5(+),svg]"
 
 RDEPEND="net-wireless/iw
 	x11-libs/libxkbcommon[X]
diff --git a/net-wireless/osmo-fl2k/Manifest b/net-wireless/osmo-fl2k/Manifest
index 2e4c3cab3c7b..43339ef727b7 100644
--- a/net-wireless/osmo-fl2k/Manifest
+++ b/net-wireless/osmo-fl2k/Manifest
@@ -1,4 +1,4 @@
 DIST osmo-fl2k-0.1.1.tar.gz 68811 BLAKE2B 6c1b602b47d5e0816d93750e0470ed4530e587341f28e2e93c3aef634d7108b981cc4a96b758d72796316f15e4401ef746b91a983f374e63103ac76d8b7168c1 SHA512 55b384e18cfa5a1ab660860874cc6f6256b812ee867c863b6cd12c67cfc3517632469fc1ed6b83a35c956aa5371e1198634a52b292b109da828bee60c23f5140
-EBUILD osmo-fl2k-0.1.1.ebuild 1152 BLAKE2B e8002dcf1cf686365dcd483cd3de9701cbd456f03803596a652122230c05fb897a12c1dc5958e5cf547cfbb58e2adb7e2d1d4ad7d06fee315543bcfd0cd97346 SHA512 0fd498db8a93602dfe79cc689d409b7bb0fac721b261f74ac6294b48c67f8ab6e8763cf47e5524d693556969de66f2c066d515fdc2e56f20a939acd76f208c4f
-EBUILD osmo-fl2k-9999.ebuild 1152 BLAKE2B e8002dcf1cf686365dcd483cd3de9701cbd456f03803596a652122230c05fb897a12c1dc5958e5cf547cfbb58e2adb7e2d1d4ad7d06fee315543bcfd0cd97346 SHA512 0fd498db8a93602dfe79cc689d409b7bb0fac721b261f74ac6294b48c67f8ab6e8763cf47e5524d693556969de66f2c066d515fdc2e56f20a939acd76f208c4f
+EBUILD osmo-fl2k-0.1.1.ebuild 1264 BLAKE2B ff9ee662871853ab86ec47263ba125e57652f00dd87c53b323e184f92a41bed72a8231429eeac148f4311936e3323b97059f564e3f0d94e7db80d4dba5f3a056 SHA512 c167f2335a11fbca68e8e2a195edc55d645119906cad7d640f52814436c5480c1e32d262842ff7e100f62ee4031b6ee253398bac5857f874ae76fc8fc3ae6d00
+EBUILD osmo-fl2k-9999.ebuild 1251 BLAKE2B b3db79c09a1aa4f31af789c7ba0ba965e24c8d127f2ef3782b439036165d889162958390c85aca171a91d95f0425c24358e68e9e605b47d9cfbacad579e21d53 SHA512 ea7dfcb433ee512beccc4adf3d81698fb8c086443ecf2a6bb317e01f6bc20d15202d734e909a29ed5998eb02cfb0394339d8cc84efddc0602fbc6c546a990e6c
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
index a0e0eed61e39..0df5cfc8b4b9 100644
--- a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
+++ b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils linux-info udev
+inherit cmake-utils flag-o-matic linux-info udev
 
 DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs"
 
@@ -38,6 +38,9 @@ src_configure() {
 		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
 		-DINSTALL_UDEV_RULES=OFF
 	)
+	#https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653
+	replace-flags -O0 -O2
+	replace-flags -Os -O2
 	cmake-utils_src_configure
 }
 
diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
index a0e0eed61e39..17e694cb18e9 100644
--- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
+++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild
@@ -38,6 +38,9 @@ src_configure() {
 		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
 		-DINSTALL_UDEV_RULES=OFF
 	)
+	#https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653
+	replace-flags -O0 -O2
+	replace-flags -Os -O2
 	cmake-utils_src_configure
 }
 
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index cb16e6c3a530..08f3350ee954 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,4 +1,4 @@
 DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571
-EBUILD ubertooth-2017.03.2.ebuild 2750 BLAKE2B de33843b0372138359825263a699b7bfa11816135290fa0cd475ded9f12b11e5ded21940fb6d3c7584f904ebc9f6d5741de3f319072b28ac5eb758cd9923c2fe SHA512 5dd2d912e23465333d144553a78b31d825635843be895f90bd2b77b5ea1730432979dffb630a1b6aedb49b0a98770a055591cbab66954c84f3f8d7c70a22dc75
-EBUILD ubertooth-9999.ebuild 2750 BLAKE2B de33843b0372138359825263a699b7bfa11816135290fa0cd475ded9f12b11e5ded21940fb6d3c7584f904ebc9f6d5741de3f319072b28ac5eb758cd9923c2fe SHA512 5dd2d912e23465333d144553a78b31d825635843be895f90bd2b77b5ea1730432979dffb630a1b6aedb49b0a98770a055591cbab66954c84f3f8d7c70a22dc75
-MISC metadata.xml 630 BLAKE2B 1a6481604a89ac1ef37523a73a465696b4251a6ad1ec57c3c284c4e259f40af2f840f8fd80a5630330aa72e144d6a8229f4733d9e29960eaed236eb12f70e3e3 SHA512 3f2dd60418ac563c549840085be0977e2f928abf14373aedc556131a23069e0993352e2a8b99013ff4fbca886beecbee57a493e4987baea27e117678691709ae
+EBUILD ubertooth-2017.03.2-r1.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
+EBUILD ubertooth-9999.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
+MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 181284625981..5a740733d13c 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="bluez">use bluez to support clock following and scanning</flag>
-		<flag name="specan">Enable the ubertooth spectrum analyzer</flag>
 		<flag name="ubertooth1-firmware">Build/install ubertooth1-firmware</flag>
 	</use>
 	<upstream>
diff --git a/net-wireless/ubertooth/ubertooth-2017.03.2.ebuild b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
index de2e949b8cb6..1341a9478aa6 100644
--- a/net-wireless/ubertooth/ubertooth-2017.03.2.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
@@ -1,28 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 multilib distutils-r1 cmake-utils udev
+inherit cmake-utils udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluez +specan static-libs +ubertooth1-firmware +udev"
-REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
 DEPEND="bluez? ( net-wireless/bluez:= )
 	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	specan? ( ${PYTHON_DEPS} )
 	static-libs? ( dev-libs/libusb[static-libs] )
 	virtual/libusb:1="
 RDEPEND="${DEPEND}
-	specan? ( >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
 	udev? ( virtual/udev )"
 
 MY_PV=${PV/\./-}
@@ -42,17 +35,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
-src_prepare() {
-	cmake-utils_src_prepare
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_prepare
-		popd
-	fi
-}
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DUSE_BLUEZ=$(usex bluez)
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DINSTALL_UDEV_RULES=$(usex udev)
@@ -67,16 +51,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -91,12 +65,6 @@ src_install() {
 	fi
 	popd
 
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_install
-		popd
-	fi
-
 	elog "Everyone can read from the ubertooth, but to talk to it"
 	elog "your user needs to be in the usb group."
 }
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index de2e949b8cb6..1341a9478aa6 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,28 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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 multilib distutils-r1 cmake-utils udev
+inherit cmake-utils udev
 
 HOMEPAGE="http://ubertooth.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+bluez +specan static-libs +ubertooth1-firmware +udev"
-REQUIRED_USE="specan? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
 DEPEND="bluez? ( net-wireless/bluez:= )
 	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	specan? ( ${PYTHON_DEPS} )
 	static-libs? ( dev-libs/libusb[static-libs] )
 	virtual/libusb:1="
 RDEPEND="${DEPEND}
-	specan? ( >=dev-qt/qtgui-4.7.2:4
-		>=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
 	udev? ( virtual/udev )"
 
 MY_PV=${PV/\./-}
@@ -42,17 +35,8 @@ DESCRIPTION="open source wireless development platform suitable for Bluetooth ex
 #readd firmware building, but do it right
 #USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
 
-src_prepare() {
-	cmake-utils_src_prepare
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_prepare
-		popd
-	fi
-}
-
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		-DUSE_BLUEZ=$(usex bluez)
 		-DBUILD_STATIC_LIB=$(usex static-libs)
 		-DINSTALL_UDEV_RULES=$(usex udev)
@@ -67,16 +51,6 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_compile
-		popd
-	fi
-}
-
 src_install() {
 	cmake-utils_src_install
 
@@ -91,12 +65,6 @@ src_install() {
 	fi
 	popd
 
-	if use specan; then
-		pushd python/specan_ui || die
-		distutils-r1_src_install
-		popd
-	fi
-
 	elog "Everyone can read from the ubertooth, but to talk to it"
 	elog "your user needs to be in the usb group."
 }
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
new file mode 100644
index 000000000000..32bfd8aae0db
--- /dev/null
+++ b/net-wireless/unifi/Manifest
@@ -0,0 +1,20 @@
+AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca9c7ea9e819d05dbcfb2c573be79140ad5fcab5e86a353e8ee591f581160e10ed9d8a011629bfa7d SHA512 4a799730074e4d2b0143bf77e9f7540819e042a7edcfc8bdc678a028c3752b1f96184f76d8a0557f6aeedbe333c91a1704aef8b8c873cce4abce6c3214ede3ce
+AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
+AUX unifi.initd 840 BLAKE2B 1c0210a44f96d4ab9ce23cdaa1d4307eafafdf4d8969c6917def008b965dc4e46daa6c681d38426ecbb3fdea8c137efe3d012eb0ecde696a2410d501b5cf54d2 SHA512 882d932e667d89557fb6302aa16e0720c0f868c8fdcfd093609b9a580a92359c5b4860429434c6d83bbfc57710f386458330e895f949ce55efb27483c2565e0f
+AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
+AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
+DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
+DIST unifi-5.7.28.zip 79362245 BLAKE2B 5edb7b92d602ba780b0fa7613360ada39f09b347b247945761af80d0180d4653b19cb5cd1d7bd11332a85de8481c4981b111e572cb755a83b676362494a5505c SHA512 f6ba667a2f0b5959ed715a190fdbdfe308ea256c2d485f96d43fe797912dfe6992cbaed95add5899293fabdd371c1814572bf1189a4ce93c632743dca40b87e3
+DIST unifi-5.8.23.zip 80086708 BLAKE2B ea7aec61d74132a47843084f1987e6e016c4fb1ec96d077dac2a9b122003274b0314927404468669a5d7cc0bdb6a307c97bca09f663b180d15bf18436b35408b SHA512 2b42df2a84574ac9e282c7ff59eb86ce29170ea7ef5957690dec8772c90acda3c08c633b3bceeac08bb73ff1460143207a64d2405de19436faf20a042849231b
+DIST unifi-5.8.24.zip 80086706 BLAKE2B 00530b5e141e9444120efeb6ea5b3106781fb5b15a1ade44b71675a726ae7245221af694b36a922a4d047f78567a7bd9e1354d6dde442dfccd58a49f87079403 SHA512 cf7145eeeed779893c1c9709eef7364154503dd1232f88cce38facc748426d19c5422decbd5e3a80d857a2d82969258045944b491c7b228467d8e4a7c29a0ec1
+DIST unifi-5.9.4.zip 102808708 BLAKE2B 3b1479bd65837667f2abff594426ecc3491475d1cf6d842d07cdc8868cabf59facc857263fcfb1ef30fdb8dbb4c0a037b7e04736b8debf0f4f795494fc62ee26 SHA512 01e2d8c2d48a552e3b5d03cb97b0241e0561a4c88e52f13ec2d2a8a8b7d75ba7d9eb7878e37876efe5581e439afaac359ae6e3e7b2bb3d0719ebdbb10b06778c
+EBUILD unifi-5.6.39-r1.ebuild 1729 BLAKE2B 77a4fb38b6e82763f83f072d595e3f39306aed4ce39f98bfe6783e85eb1c83ab0fc996e94d25b86cd4bad196ae898dace5eb7469147cb3394cda1699ffec1900 SHA512 4415d13c43c30238c756542f6931c12bb6cbcd0163cb6e2c522b6adef39f0c5d3c069d25facdb12575fc0463a8aa3fd479f3274009083a645139d656ce998ae2
+EBUILD unifi-5.6.39.ebuild 1726 BLAKE2B be5c3312dfb28320e32f2b01f9d4cbd997720b94da1a9bdd3395fe9fd975d472eda73eda175e4b0679bc320844aacc140622fd6b6339fa7dd4784588ee35b96f SHA512 60499cd250cc77eb1a9ae05932f55ce1d64ac61606a31cd515f8a603651ff1d0802e5644160d55ef6cf4072d620de81c49ca55c126950aa876fae8ac69a2e6d3
+EBUILD unifi-5.7.28-r1.ebuild 1750 BLAKE2B ab2381e2fce8a2e71723773acdb4bc0f8996c25663af28b580137f18e27dcaf511e8271b3249c87c062e530e6648049a034a174a523d2968485cbba3b0a6dd74 SHA512 e0c73eff569c7ed8d16ec9c2815312150f1abd3b058437a1449c0d01a4caa403d0f2878dc94ba4f8f3ecb97545232cf74e6abc586729e5c1f0691c978e52a581
+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.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
+MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/files/mongod-wrapper b/net-wireless/unifi/files/mongod-wrapper
new file mode 100755
index 000000000000..21637de50a0f
--- /dev/null
+++ b/net-wireless/unifi/files/mongod-wrapper
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Remove --nohttpinterface argument, since it does not exist on MongoDB >= 3.6.x anymore
+# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
+remove_nohttpinterface_arg=$(echo $* | sed -e 's/--nohttpinterface//')
+/usr/bin/mongod ${remove_nohttpinterface_arg}
diff --git a/net-wireless/unifi/files/unifi.confd b/net-wireless/unifi/files/unifi.confd
new file mode 100644
index 000000000000..580c18d332b7
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Specifies the path of an used Java runtime,
+# if it's not set, the system default is being used.
+# JAVA_HOME=""
diff --git a/net-wireless/unifi/files/unifi.initd b/net-wireless/unifi/files/unifi.initd
new file mode 100644
index 000000000000..48fd9dd3b4a4
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+ACE_LIB="lib/ace.jar"
+DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java
+JAVA_OPTS="-Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp"
+UNIFI_GROUP="unifi"
+UNIFI_PATH="/usr/lib/unifi"
+UNIFI_USER="unifi"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting UniFi Controller"
+	start-stop-daemon --start --quiet --background --user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping UniFi Controller"
+	start-stop-daemon --start --quiet --background --user ${UNIFI_USER} --group ${UNIFI_GROUP} --chdir ${UNIFI_PATH} --exec ${DAEMON} -- ${JAVA_OPTS} -jar ${ACE_LIB} stop
+	eend $?
+}
diff --git a/net-wireless/unifi/files/unifi.initd-r1 b/net-wireless/unifi/files/unifi.initd-r1
new file mode 100644
index 000000000000..2db36571dac0
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.initd-r1
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+ACE_LIB="lib/ace.jar"
+DAEMON="${JAVA_HOME-/etc/java-config-2/current-system-vm}"/bin/java
+JAVA_OPTS="-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path="
+UNIFI_PATH="/usr/lib/unifi"
+
+UNIFI_USER="unifi"
+UNIFI_GROUP="unifi"
+
+name="UniFi Controller"
+
+start_stop_daemon_args="--chdir ${UNIFI_PATH}"
+
+command="${DAEMON}"
+command_args="${JAVA_OPTS} -jar ${ACE_LIB} start"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+command_user="${UNIFI_USER}:${UNIFI_GROUP}"
+
+command_progress=true
+retry=TERM/60
diff --git a/net-wireless/unifi/files/unifi.service b/net-wireless/unifi/files/unifi.service
new file mode 100644
index 000000000000..00c00d7f3c9e
--- /dev/null
+++ b/net-wireless/unifi/files/unifi.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=UniFi Controller
+After=network-online.target
+
+[Service]
+Type=simple
+User=unifi
+Group=unifi
+WorkingDirectory=/usr/lib/unifi
+ExecStart=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar start
+ExecStop=/usr/bin/java -Djava.library.path= -Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -jar /usr/lib/unifi/lib/ace.jar stop
+
+[Install]
+WantedBy=network.target
diff --git a/net-wireless/unifi/metadata.xml b/net-wireless/unifi/metadata.xml
new file mode 100644
index 000000000000..57ba2066974e
--- /dev/null
+++ b/net-wireless/unifi/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		UniFi is a management controller software for Ubiquiti UniFi APs.
+		It's purpose is to configure and monitor all those APs.
+		Also all kind of statistics are collected, which can be accessed through UniFi.
+		There is also an internal RADIUS server, which can be used for WPA2-Enterprise.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-wireless/unifi/unifi-5.6.39-r1.ebuild b/net-wireless/unifi/unifi-5.6.39-r1.ebuild
new file mode 100644
index 000000000000..4f41ed02126f
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.6.39-r1.ebuild
@@ -0,0 +1,70 @@
+# 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.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.39.ebuild b/net-wireless/unifi/unifi-5.6.39.ebuild
new file mode 100644
index 000000000000..aeda8f7c164b
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.6.39.ebuild
@@ -0,0 +1,70 @@
+# 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.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 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.7.28-r1.ebuild b/net-wireless/unifi/unifi-5.7.28-r1.ebuild
new file mode 100644
index 000000000000..c164485244d9
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.7.28-r1.ebuild
@@ -0,0 +1,70 @@
+# 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="-5c442c6b54"
+
+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.7"
+
+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.7.28.ebuild b/net-wireless/unifi/unifi-5.7.28.ebuild
new file mode 100644
index 000000000000..bc8c89abc804
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.7.28.ebuild
@@ -0,0 +1,70 @@
+# 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="-5c442c6b54"
+
+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.7"
+
+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 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.8.23-r1.ebuild b/net-wireless/unifi/unifi-5.8.23-r1.ebuild
new file mode 100644
index 000000000000..0bf53df426d5
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.8.23-r1.ebuild
@@ -0,0 +1,70 @@
+# 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="-d5a5bbfda4"
+
+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"
+
+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.8.23.ebuild b/net-wireless/unifi/unifi-5.8.23.ebuild
new file mode 100644
index 000000000000..265ecf2d858d
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.8.23.ebuild
@@ -0,0 +1,70 @@
+# 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="-d5a5bbfda4"
+
+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"
+
+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 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.8.24.ebuild b/net-wireless/unifi/unifi-5.8.24.ebuild
new file mode 100644
index 000000000000..307f0db8a4f1
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.8.24.ebuild
@@ -0,0 +1,70 @@
+# 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"
+
+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.4-r1.ebuild b/net-wireless/unifi/unifi-5.9.4-r1.ebuild
new file mode 100644
index 000000000000..c678667c4e7f
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.9.4-r1.ebuild
@@ -0,0 +1,69 @@
+# 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="-b647df56b7"
+
+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.4.ebuild b/net-wireless/unifi/unifi-5.9.4.ebuild
new file mode 100644
index 000000000000..9ca7b2b27c36
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.9.4.ebuild
@@ -0,0 +1,69 @@
+# 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="-b647df56b7"
+
+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 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/urh/Manifest b/net-wireless/urh/Manifest
index a822a42f6ef3..d6263e336360 100644
--- a/net-wireless/urh/Manifest
+++ b/net-wireless/urh/Manifest
@@ -3,5 +3,5 @@ DIST urh-1.6.2.6.tar.gz 11690379 BLAKE2B b1e2de56e538389b10edd74cc180c870caf18b2
 DIST urh-1.6.4.1.tar.gz 14993226 BLAKE2B 97ce52430d7449b1ea0dfe57a0dbd95d9b84da03b15403dc16c46c45c3b656686622182306b3e70f48aee8ef09540c82639216d30f29a6e495fce5978299a272 SHA512 3e7d3a770c97f4a5653524a2844721336440724611e554ba2fb33529c99abd15206a14249c27bd7a9fd21b5f5c34f2719b64477e4ebc58fa64d94e211383e8e6
 EBUILD urh-1.5.5.ebuild 839 BLAKE2B 362b5970d519748bacde413d436e9e985511ad11a32e891bc4ce1a1e56687864cdc5787e791e76cbc55f7688ebd189d498f5db9707e32af059590ea51bff0a1f SHA512 a76ab165346f043d2e7cbe6b4ad0c15708642030349ea9d4d344ec1eb47a631a88bcbf95bac0344de87b2c42e3f00ab97228c260e5e2eac044d562afdf45c319
 EBUILD urh-1.6.2.6.ebuild 880 BLAKE2B 13971ab1212731e65bfe214bb65f57462fdcacd1744b5b24dc6c9777f488f990e91cba8cb9969f3ffa6d204791ba86a8f5d0242a51ed493bc76513df9b4896ed SHA512 cd54ee675f8597c3c4b16ccf26db4d31560fc5ddc2a85f631a00e210e48a3d1327ad4c5c6e6305edef3bfcda334b532867586e152b75ea4516bc4ff9ff3a5a1f
-EBUILD urh-1.6.4.1.ebuild 945 BLAKE2B ba0b5aabe9afc85efa696662ec0706e75442af80d8deff010ff40bcfe9b00dcd6ae50ee00d7987419cdb4c5860731e36890c8ffca1f4b7910500a206fc476f8a SHA512 d51e68cf0d035a636154f1a3a1b10d37f23cfd1acb41a3dd3a2eff1b3ca0037bc6b02931b92a766dbbabe415aa9a3c9997d86d2c6e01fde4be4544029c02b1f9
+EBUILD urh-1.6.4.1.ebuild 949 BLAKE2B b7bd4c51b6b14891177dd0a7653d19e21f9078b6d4b495c4ba188ceeaa8ecf7c41939524b7c91fbf695ae9b63f40056c61ebcdcea4ad8f16059182fb09d4461a SHA512 9a2f86c5f59d9e39b66803c40bfe7394a12581e6cbfbd2db419428af699c7ae0c9fd411bb0649da9e25cf5b1b5a81e6f0b284fe1119b85af19ed3a708f9b604b
 MISC metadata.xml 727 BLAKE2B e8c1b3a936a41ec1cc870f5442ae00b7c4f91f0fad5b1f9c33dc2d8823af15e0b8f308565b36460657708f5939cbc4919e29692b7eb2d673cfaad3e949a6e4a0 SHA512 758e887f3f8739002d49375ef6dc38cc88d1cb8f26aff19ce62773785523c02c2403bf6bc39222f7db50cd4db274a7edcb239b0a6c929740a30174f46f61a5bd
diff --git a/net-wireless/urh/urh-1.6.4.1.ebuild b/net-wireless/urh/urh-1.6.4.1.ebuild
index 526a67dc694f..2296db583261 100644
--- a/net-wireless/urh/urh-1.6.4.1.ebuild
+++ b/net-wireless/urh/urh-1.6.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="Universal Radio Hacker: investigate wireless protocols like a boss"