gentoo resync : 19.03.2019

21 files changed, 88 insertions, 692 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e13e31eef263..e6275a59af30 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 0f38c919da49..b51285e8a51c 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,7 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.1.alpha2.tar.xz 977344 BLAKE2B c5d3d0a96c1220596647ade310263342cdaaeef511a2fb36973d182025330a29b41fb805ce54e10a2f48c1c66312006858789233f8f0a93923952bb03ac32b19 SHA512 bde4922a93087d07fd99b165255ded8d9465866e62662f644beaafe363d5618a107abbd9d951cfbd034b02b6ece11fb8117efdd5d453632e4a2fea13d3825643
 DIST blueman-2.1.alpha3.tar.xz 977724 BLAKE2B a1b02956249c65bb9dc870f9585f917b17e99d570c2a3f05f505de9ea4ec004ff9ad5d88e958ec84566fdcf0f3fe6cf1965dcdc050241feedbd08fff98d18b22 SHA512 e2ad9aff87148e522705872829e9c4c78a1bfbe29e102b69b1f1f56348743343cb543eaac4c21e157aa579b76f023ca9164700a4a08848f55f17d025cead23a6
-EBUILD blueman-2.1_alpha2.ebuild 2817 BLAKE2B 446b85073e847ed47bfc1623c10b5b151d3de3af1338560adc8bc537beb778dd32745d7ed86e02a6911ce518c73c7eeeb43e700547a2f753d8e07620199a9533 SHA512 ed4c1c4f42651c54f7cbe63fcf4366d2f7a28a13cf758f5e216fbe067ba82d9e249443ab57ba56f03752e2a00a872130957e6420fb2f069b07ff040bd2bf58ed
 EBUILD blueman-2.1_alpha3.ebuild 2785 BLAKE2B 8a35b7340dfeb9674e85779a5a5a889530b42a878a3c566717bb9502df1bc6eb947eaa38b2e25d6c1b3e3ad179030eb860b90a2972d9b8c70ea7e3b778da7f44 SHA512 085da03a8375815c0e6085e9799c71d0066e2de0afb36dd4f5e79eaee2e3f63c6120538594742cd4c269bfab843c2c96e84b7799014e51a7d98d788fb1b2ad95
 EBUILD blueman-9999.ebuild 2754 BLAKE2B 8fc46c72adbe3b42c2a470fc008d9f9c1c8d768eb282044ee75536aee8dc33336bde23dec439cf24f4d7f46dd43a6d3dce61cb83f4d058b439f8eae3fc0ec23e SHA512 a95f90357111e98aa0bea3674404192bd713d051441aaa725d60d090bb3eb0c399bba4dd867c724946821946ffd2240fe37b62b203d47d35befab499ac8d1e94
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1_alpha2.ebuild b/net-wireless/blueman/blueman-2.1_alpha2.ebuild
deleted file mode 100644
index b87f40169f17..000000000000
--- a/net-wireless/blueman/blueman-2.1_alpha2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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,3_6,3_7} )
-inherit gnome2-utils linux-info python-single-r1 systemd
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-COMMON_DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-firewall/iptables
-		sys-apps/net-tools
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	!net-wireless/gnome-bluetooth
-"
-
-S=${WORKDIR}/${P/_/.}
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--docdir=/usr/share/doc/${PF}
-		--disable-runtime-deps-check
-		--disable-static
-		# TODO: replace upstream with sane system/user unitdir getters
-		--with-systemdunitdir="$(systemd_get_utildir)"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	python_fix_shebang "${D}"
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index f8975cd12545..9e8d91a86e46 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -11,5 +11,4 @@ DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c04
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.49-r1.ebuild 8102 BLAKE2B 92d5688a2b0c476e2ca5767faec68442f8624b482f407db1af683d812e51149e6d8c1fe943b54c31e83227b3819b0d89ea3866a67b27ef5dd3cde27c942609a1 SHA512 20eaed74b8c10cce8dbd116c6be91c2d32f239c7e9fb9a04098e1f16e5a43f85916b9d6567abed9804bca50879ca080d4e9c6abdf45eaa5fb354effe4ca16ea0
 EBUILD bluez-5.50-r1.ebuild 8103 BLAKE2B 55df48942edd09750576e10deca7cee2aafe57e2267d5916265d83ff2cdfd167c0388d288b7020dc4f058ffdb0fd23b53abf6bc7f07daf197395b8a23cf32d44 SHA512 27e8ee599955d2b21eaa3b13f01684550b5e5b3d52d7dc52edf623346d40fdfed20d4096f852acdc9b6ee052c8249bad3ae293609a6e7ac6b6965183ba045426
-EBUILD bluez-5.50.ebuild 8034 BLAKE2B 40c26daeb9815f19adbe23cf616d5e55f9df5808c8bb953e020c084f96102b8e0ffeb70d0a1ce455b3c138e94b0cea283150a55cdf6c214dc688e22715fc6484 SHA512 11cd1e2e38c6facf7f9c7a973225eec7b5f811b16713cd0a832cf12f151da4c37b9ae032dae21359c2060e14eedc8edfeac40d3bfd7ff14d4573bb479252d276
 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
deleted file mode 100644
index b6088a7fad22..000000000000
--- a/net-wireless/bluez/bluez-5.50.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 arm ~hppa ~mips ~ppc ~ppc64 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
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-	user-session? ( systemd )
-"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.6:=[user-session=]
-	>=sys-apps/hwids-20121202.2
-	alsa? ( media-libs/alsa-lib )
-	btpclient? ( >=dev-libs/ell-0.3 )
-	cups? ( net-print/cups:= )
-	mesh? (
-		>=dev-libs/ell-0.3
-		dev-libs/json-c:=
-		sys-libs/readline:0= )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-172 )
-"
-TEST_DEPS="${PYTHON_DEPS}
-	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? (	${TEST_DEPS} )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-DOC_CONTENTS="
-	If you want to control your bluetooth devices as a non-root user,
-	please remember to add you to plugdev group.
-"
-
-PATCHES=(
-	# Use static group "plugdev" to not force people to become root for
-	# controlling the devices.
-	"${FILESDIR}"/${PN}-plugdev.patch
-
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	"${FILESDIR}"/${PN}-udevadm-path.patch
-
-	# build: Quote systemd variable names, bug #527432
-	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
-	"${FILESDIR}"/${PN}-5.39-systemd-quote.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# ???
-	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-)
-
-pkg_setup() {
-	enewgroup plugdev
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	# btpclient disabled because we don't have ell library in the tree
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--disable-btpclient \
-		--enable-datafiles \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable alsa midi) \
-		$(multilib_native_use_enable btpclient) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also that tools can break"
-			ewarn "without previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			# gatttool is only built with readline, bug #530776
-			dobin attrib/gatttool
-			dobin tools/btmgmt
-		fi
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# example-gatt-client is the only one needing
-			# python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3
-			# for runtime
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	! use systemd && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	! use systemd && readme.gentoo_print_elog
-
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 9a40e37280dd..c7171fc281de 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -21,7 +21,7 @@ EBUILD hostapd-2.6-r5.ebuild 7249 BLAKE2B e4fdb49c073fce962fb8a53658606f78cbbba5
 EBUILD hostapd-2.6-r6.ebuild 7337 BLAKE2B 7870dfd94d57afa9bb4aa1bfbebf7028f65e720543e0ed1b68af770f82b0346681f4938f774722aebf2b8a7c18422bd4a7a03df881eb38f17b1032fcdc205d31 SHA512 0e7e8b30cb75a0892388de7b51051f13747e2cbcbe2658eba39fc59beea1abd459f695bdb068a43e84d49ae898667592485979081af0a601d57511bc021aac18
 EBUILD hostapd-2.6_p20180822.ebuild 6690 BLAKE2B 9940744f17fc3c78d5ff1492328f460fb7c1eb2c14973691e85a262f5e4287b7dd7829e77b5e3597657d2efb342c145673d0ca1337551744310989b31f0ef084 SHA512 ee943e7fc1687015821d8f7020da43639bb763eee3f6f8d60fd51fa51cf71363838b68674659eff1054f46a33d800979c3ad6b63bd029876ab627751c377933b
 EBUILD hostapd-2.7-r1.ebuild 6759 BLAKE2B 86dca46bdc70fae7136278bcd2b9682462517171cfcea0c0fd6b260cc21916003162612f0440081ece61924f6dbd16f98646c51b2aa8b4b14a9ed0849746dfd4 SHA512 e0a452ce4572eb2b788cbb1ce010dbdf5a13c53eaddf240ed944968325966f9686de9ee90f68e45838d558a7983df2fc0aafe220ad50defb0e3d43bf3dc08831
-EBUILD hostapd-2.7-r2.ebuild 6762 BLAKE2B 31f5b8162a726c2408a4d8dcd96c15c76f17cadf494ba034a03ca0609e7b476d799623e4c3f8c6e7395f2490958d55b6b82b6446151594c7e17d885c012d21a3 SHA512 64aea75bf0951d1c7b7240a87373f390357c773de0fad9581d3e30aedbcc6d3de1f8b5ad967eb99378d2129436d4878076ece3619b69172743275538bc0ad651
+EBUILD hostapd-2.7-r2.ebuild 6760 BLAKE2B 17ba61f1fa2edde1192cb93fea7cde170c74b9072dd77467aa72410805c523229f728a8b348d0d1085d510f0e2d8a3bc28de51ebfc15b2ed29736585b711d307 SHA512 6a0bd84deeb0c27e81013e97aa048ec9a21ca48fe4f3527bc7945ffc60c855912662eb1349eac48bb14c7bbcc490698e2c67f1cda0b0f32ed8305c02a26ce343
 EBUILD hostapd-2.7.ebuild 6687 BLAKE2B b2b7e706f026f8f50d30e2f488a76223f2d4dc050b5d5a08c15f5849cb309adde6512694236adce500763ef8d4b585a74ae4864288a4aed883d2d2d44afd8856 SHA512 84e4e4cc9ad900a1698f6cf3590931d255fef742ddfcdcbf02f8692b74a07ed1c71c308e8ba577456bc7e9294a278a0af2b229488eb7f5180ec9005cae67e479
 EBUILD hostapd-9999.ebuild 6680 BLAKE2B 1394519b2cd30fc9a204b1981be5d082940ce244dd3b498faa7b2f94028b9e97358b9ba0a0b8dba3997e5da608ed449258a029e00878d4c11b65ee0a412327e1 SHA512 6b7dc62f8a450e9fb747a3daf850e014cccb25177362cb19e64b259ee301ae71dc6f795008fc0765d37254c267fbedef8763da4e5c460a9139d22c50669e3597
 MISC metadata.xml 973 BLAKE2B 009e9b39aa6c7d1d6da4421ec1d0c4610a64b136b497f92dc5a822ab54449720cfacb9ce898fc2015cdcf741939acb46aa8797e13c80079ce424f5f6bfbde8be SHA512 19a5d72d11eee955856bde7065a784d1942b2c55adbb154e1af432c693763beedb1541d119ba6c0d7b5e2f37e13a3aa915b13def6c9ee651b6f4f7f8e85a57e5
diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 8db8ecf612d9..20f40c4c4906 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+	KEYWORDS="amd64 ~arm ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index a017da1cb5f0..1f43541d8fb2 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,6 +1,4 @@
 AUX fix-setuptools.patch 2415 BLAKE2B 880353193f8ba3285b3e91c60a2938b2c67d0b91fd6cfb47504f5bfdba75a29e4c8f3d7b47d5ef2a7b2fdbc2f0587002f7ec58fa80b68919c949ad01498416ad SHA512 fa73125ad86b98513e6112efc5bf8a78a41aa804dc526d304eb89f1f3b53b2298bba2025860f12f74523dffc623a8f68027de48e19fd83afba0f39b6d720179d
-AUX fix-setuptools2.patch 2239 BLAKE2B 9d5ace68d76f4d1de1688055d98cd28257c776705f8337efc3a919118f1fa27597495255dc4e247f4f7a18d33769d5c2a47f66f728b2d67fc1bb2dbc92bc7cdb SHA512 6bbcee8f546753ad45532b73586d67f5ca4e155a583a823d7d9fb0d9a5401048ccb0049bda0bfa03a8cfdca36d25026902ff4401deb51e1e477760fa3e7d16a0
-AUX fix-setuptools3.patch 2239 BLAKE2B 318461d6ea1e23118af2df5ef2b03bd3ca9b335f873c0c2104fdf3468e3527b6cb0e7e37ee0581df58ebbf9f2d8d0e9bb844d707487d72ccef563a7a7fbe54fc SHA512 1f88590e43addd679757bceedf3b75ed5f19960295e7139c0e67afb0884019f939fa6c22f03dce4176669d5631e6ee1539db47319dc7d476b2a4ec4c8ca6b8fa
 AUX fix-setuptools4.patch 3328 BLAKE2B 5af5c05b74b332455fccc891fd254317c57f0d126cbfa60aef1ac7cbadab28ecb48bd1b6e31510d117f29a0d4e2807beb4fea756147f1fe26d88bb4c8ce225f6 SHA512 f4c68953a9a1880d7294bedba3c645e40de48b5cf9159cb99287a2147de4bbee2a808ad29041acd8d2a0e6a488549c315ea678addce8fd6f37ade33d30615234
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
@@ -11,5 +9,5 @@ DIST kismet-2019-01-BETA2.tar.xz 3096084 BLAKE2B 77f0497721bb1a6c2af2dd91b5d2a89
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2018.08_beta1-r4.ebuild 3007 BLAKE2B 09460af93a5ee5d50b628f8dcf4a9ad466d30c4cb7e617bc60d5fa89a7d1c4fdb169e48c9a4ca1fa01ca92396cf99a86e1f1597b7dd1943e3a90078ce3ee84d8 SHA512 19131fd383d48f4e394b01e180fded41767b64b57ee63a0e046334c143fc63472ba0f4c71bcd21419a270a7f7fd558c5c2d700c9f91c71fd7fe099b48733fce7
 EBUILD kismet-2019.01_beta2.ebuild 2921 BLAKE2B 11169d4d133617c1e5cbeb39b47c030c67a16ae3548d01dd68d00e5f7817a5304e282942efb104f29b0d8c511aad9ae2490c324f8dec9c4bd8f1c9f6da53216c SHA512 68da40db9264a6c65d44bfa3445b7fd1bcf05766aef78dd0e6a9a68c14a6405ad304c232aa9e2b6a5905008bf5223ce2beffe181ffdabecd68e4347bae2a04a9
-EBUILD kismet-9999.ebuild 3126 BLAKE2B 27bab26e0582e2ee4b7aaf236eb9e2b99fc435bc8371777715b815114e098d4c612f1e0ebb8dfb47ac2f369007a4044c9974731665d40382fea483c56e0fcf22 SHA512 474d30d650ed50fca528be9cce9fa549552cae7921796eedbaf62bc69f6a01b0b37a7f6aafd6fc452c2942da047d463b696dfbe919bf7b734fbcd6c7a2174296
+EBUILD kismet-9999.ebuild 3146 BLAKE2B 1ef3ebd4ea292fab0077146a78404152df5d36704fec921e4f1fa5d1de87ed96fcb2695c8061648c42ca3ec771080714b2e0d8209b799f9cc443419a1ce7c04f SHA512 b4fb2e129776569209e0116e94c7b686e30b407543ea01cfef3aca39caea4fcdd2f6205e7310b9365a2de5acc4d8a6e90a1bd8924d38f63de82be9770b5b32cd
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/files/fix-setuptools2.patch b/net-wireless/kismet/files/fix-setuptools2.patch
deleted file mode 100644
index 2f72b258af99..000000000000
--- a/net-wireless/kismet/files/fix-setuptools2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
-index 97fb50b7..492f6a90 100644
---- a/capture_freaklabs_zigbee/Makefile.in
-+++ b/capture_freaklabs_zigbee/Makefile.in
-@@ -6,7 +6,7 @@ all:
- 	$(PYTHON3) ./setup.py build
- 
- install:
--	$(PYTHON3) ./setup.py install
-+	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 
- clean:
-diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
-index 2e82ac5f..fa4314b2 100644
---- a/capture_sdr_rtl433/Makefile.in
-+++ b/capture_sdr_rtl433/Makefile.in
-@@ -7,7 +7,7 @@ all:
- 	$(PYTHON3) ./setup.py build
- 
- install:
--	$(PYTHON3) ./setup.py install
-+	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
- 	# These are now part of the setup.py install
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
-diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
-index 4dc83d11..4bf912b3 100644
---- a/python_modules/KismetExternal/Makefile
-+++ b/python_modules/KismetExternal/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON3) ./setup.py build
- 	
- install:
--	$(PYTHON3) ./setup.py install
-+	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
- 
- protobuf:
- 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
-diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
-index 910ca9d9..cafd3902 100644
---- a/python_modules/KismetLog/Makefile
-+++ b/python_modules/KismetLog/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON3) ./setup.py build
- 	
- install:
--	$(PYTHON3) ./setup.py install
-+	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON3) ./setup.py clean
-diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
-index 910ca9d9..cafd3902 100644
---- a/python_modules/KismetRest/Makefile
-+++ b/python_modules/KismetRest/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON3) ./setup.py build
- 	
- install:
--	$(PYTHON3) ./setup.py install
-+	$(PYTHON3) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON3) ./setup.py clean
diff --git a/net-wireless/kismet/files/fix-setuptools3.patch b/net-wireless/kismet/files/fix-setuptools3.patch
deleted file mode 100644
index 4e9787d8aa99..000000000000
--- a/net-wireless/kismet/files/fix-setuptools3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/capture_freaklabs_zigbee/Makefile.in b/capture_freaklabs_zigbee/Makefile.in
-index cfbf99b0..c2e68453 100644
---- a/capture_freaklabs_zigbee/Makefile.in
-+++ b/capture_freaklabs_zigbee/Makefile.in
-@@ -6,7 +6,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 
- clean:
-diff --git a/capture_sdr_rtl433/Makefile.in b/capture_sdr_rtl433/Makefile.in
-index e33f7de5..e1be587d 100644
---- a/capture_sdr_rtl433/Makefile.in
-+++ b/capture_sdr_rtl433/Makefile.in
-@@ -7,7 +7,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 	# These are now part of the setup.py install
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MONITOR_BIN) $(BIN)/$(MONITOR_BIN)
- 	# $(INSTALL) -o $(INSTUSR) -g $(INSTGRP) $(MQTTMONITOR_BIN) $(BIN)/$(MQTTMONITOR_BIN)
-diff --git a/python_modules/KismetExternal/Makefile b/python_modules/KismetExternal/Makefile
-index 036541a0..fc660dfe 100644
---- a/python_modules/KismetExternal/Makefile
-+++ b/python_modules/KismetExternal/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- protobuf:
- 	$(PROTOCBIN) -I ../../protobuf_definitions --python_out=./KismetExternal ../../protobuf_definitions/*.proto
-diff --git a/python_modules/KismetLog/Makefile b/python_modules/KismetLog/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetLog/Makefile
-+++ b/python_modules/KismetLog/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON2) ./setup.py clean
-diff --git a/python_modules/KismetRest/Makefile b/python_modules/KismetRest/Makefile
-index d0d6f784..60e1eac1 100644
---- a/python_modules/KismetRest/Makefile
-+++ b/python_modules/KismetRest/Makefile
-@@ -4,7 +4,7 @@ all:
- 	$(PYTHON2) ./setup.py build
- 	
- install:
--	$(PYTHON2) ./setup.py install
-+	$(PYTHON2) ./setup.py install --root=$(DESTDIR)
- 
- clean:
- 	@-$(PYTHON2) ./setup.py clean
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 767c4fda0636..6997c2c83f34 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -90,6 +90,7 @@ src_install() {
 
 	insinto /usr/share/${PN}
 	doins -r log_tools
+	doins Makefile.inc
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
diff --git a/net-wireless/kismetdb/Manifest b/net-wireless/kismetdb/Manifest
index 3536b72c8d4f..549a681f95cf 100644
--- a/net-wireless/kismetdb/Manifest
+++ b/net-wireless/kismetdb/Manifest
@@ -1,2 +1,4 @@
-EBUILD kismetdb-9999.ebuild 566 BLAKE2B 2f16ac614b566fdc5d83f6c5edc47fb86ef3682092eef7ab747ffcd2bc2bbbe1695b5a8b0987a9c1e83008b624a0dfe58a1f1154835423abdafcc63bbbbbfead SHA512 8179b4b00cabfd6399a512d2296ade4d5f66bb3e281d13c663bca36e57cc94272fe4805517021401c2e5111f1469f32906376caef8cb376f54b1d530780bfaa6
+DIST kismetdb-2019.03.01.tar.gz 29115 BLAKE2B 2ff59518faa2fa4d689af901ae017b73dbe137f8e6ddf2bc897b297a9c87348110e682d181244506526cabf9febdee7956587f4c2988ec6fc5a80b0224b41239 SHA512 5b886ff5c133aea0c5d53bddaefd201061e6866987338f61623787b79397a396198fa3ba68a08e5728fa571bd2fb250eaf7b5ee785a165f4b1ba818f412d4bb3
+EBUILD kismetdb-2019.03.01.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
+EBUILD kismetdb-9999.ebuild 710 BLAKE2B 2bc009bb6d5e49cb711c02a14c85b882f3d6b057e58c99c1ee59d2ef5ca2f6402cd19761ec8fde0585f20c206dea8abdc36c9a084183fd23516672441ba026c9 SHA512 32025e8f40220ae66908eddd1bca7389778e969449830b1deb73e04997e7d16b7e800ddf4e945c20cc369c58274d69013fece956e3348f5f0e497fcc9a6c9b95
 MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetdb/kismetdb-2019.03.01.ebuild b/net-wireless/kismetdb/kismetdb-2019.03.01.ebuild
new file mode 100644
index 000000000000..a0a5fee7f90e
--- /dev/null
+++ b/net-wireless/kismetdb/kismetdb-2019.03.01.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Kismetdb database log helper library"
+HOMEPAGE="https://kismetwireless.net/"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/python-kismet-db.git"
+else
+	SRC_URI="https://github.com/kismetwireless/python-kismet-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/python-kismet-db-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/simplekml[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND=""
diff --git a/net-wireless/kismetdb/kismetdb-9999.ebuild b/net-wireless/kismetdb/kismetdb-9999.ebuild
index dd3d3fc39717..a0a5fee7f90e 100644
--- a/net-wireless/kismetdb/kismetdb-9999.ebuild
+++ b/net-wireless/kismetdb/kismetdb-9999.ebuild
@@ -4,23 +4,24 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
-inherit git-r3 distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Kismetdb database log helper library"
 HOMEPAGE="https://kismetwireless.net/"
-SRC_URI=""
-EGIT_REPO_URI="https://www.kismetwireless.net/git/python-kismet-db.git"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://www.kismetwireless.net/git/python-kismet-db.git"
+else
+	SRC_URI="https://github.com/kismetwireless/python-kismet-db/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/python-kismet-db-${PV}"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
-DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]"
+DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/simplekml[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 BDEPEND=""
-
-src_prepare() {
-	sed -i 's#, "simplekml"##' setup.py
-	distutils-r1_src_prepare
-}
diff --git a/net-wireless/kismetmobiledashboard/Manifest b/net-wireless/kismetmobiledashboard/Manifest
new file mode 100644
index 000000000000..78575c6dfb9d
--- /dev/null
+++ b/net-wireless/kismetmobiledashboard/Manifest
@@ -0,0 +1,2 @@
+EBUILD kismetmobiledashboard-9999.ebuild 573 BLAKE2B 33abe1b6de426b8f1660d0e7e13db31c4c65a33cb40c8b18e1d33bd1d4879f3a96a06da83ea44eecf2117bd1bbc7c87efd21f03d9104411185da0a81d3325fb9 SHA512 4b8aaa569006a5d491ceff41c5cef4be1305b4494533709bf9ec3a090ba36455fcdf5515527300deb6f66c4f966783a15c6118ec64ddefca399d5b29e7e440b5
+MISC metadata.xml 247 BLAKE2B 0aa7491a8e9a68ed7ad1c53c8442fd44a9dbdfbd7ef0662e838195b44ce72a77f5dc3b846cf9951bb61de78e05aac37649b78dd4c27e304780e1223d607a4252 SHA512 3344e220b20caad7bc32141ad5d51630ff0738ab14608334576638297fdd2a48d5169ef54fb33e36d27bd448d92f8ef9e41880df388521efd4a2c58d102c7c69
diff --git a/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild
new file mode 100644
index 000000000000..12e0b4cc7b3e
--- /dev/null
+++ b/net-wireless/kismetmobiledashboard/kismetmobiledashboard-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+inherit git-r3
+
+DESCRIPTION="Mobile UI for kismet"
+HOMEPAGE="https://github.com/elkentaro/KismetMobileDashboard"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/elkentaro/KismetMobileDashboard.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_compile() {
+	KIS_SRC_DIR="/usr/share/kismet" emake
+}
+
+src_install() {
+	DESTDIR="${ED}" KIS_SRC_DIR="/usr/share/kismet" emake install
+}
diff --git a/net-wireless/kismetmobiledashboard/metadata.xml b/net-wireless/kismetmobiledashboard/metadata.xml
new file mode 100644
index 000000000000..2b9b4266ca5b
--- /dev/null
+++ b/net-wireless/kismetmobiledashboard/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 43ea5a4d4107..6171f6d73ce1 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,14 +2,10 @@ AUX mongod-wrapper 302 BLAKE2B ae5ae5ead5b7a7876a60a8b4e2d65a7881a6fc29a514643ca
 AUX unifi.confd 222 BLAKE2B 3b566a4667b4138f5ad8da53099342708949becfaaa2e5bdb85779f2b39675c0e234f21d57ea0a9ee1c13b41003682823fc5b2ad5132b57ddb4730fdeccb3691 SHA512 20e67959a0f22c7ef1aebcae5248ce76b9049b24e531e560ed0b9eb6b86b7ae10c57ce41517c9276fa11cb05ddc27e8a69b80350d0b8c5590fbe23152f676cc6
 AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463c94742f8f76d5c96adc84358e93a3b014fb2fcfc9c227af8c6f57dbfe993e6d7bbf1248ea763fc1 SHA512 d09e1b10bcc94d8459bc842bc6b94e06f8a7876bc3fe45b704e914c46bb66fc5ef03c78d51507f176450a0fbb199a5a2492a7c01cd27edf68de748f43ea1a3d4
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
-DIST unifi-5.10.12.zip 91787840 BLAKE2B e024f1d782dce5d2c88598c092c86d5d5761282154b323497e027b04091400d2db09f6da81ca8d637a51840613e8fca98d1c2d8c5e6fede71a2cb0c790efd950 SHA512 ba4b5322137f7fec0990105d66efbd290ef33218db432824dc9ae6af736a59188eed77c074e680c248d260c39e7974956bbd2492c6af2be3465276a9cc77ba48
-DIST unifi-5.10.16.zip 91777321 BLAKE2B ac039b8e0d9835a0228805fb9a4935ae4e4d07360133bc564cda42046eae33042576710e4e282e81e18ce822156c0f870faf58ec5d20bdb7642947ee00345ad0 SHA512 b28b6988971467dbdb34c480a5c83ebd402a4f989c3e1ef33478886b802758e077809712e818b04167325d06465b05ea8718f0b18248d328fd8f31f3e43a1817
-DIST unifi-5.10.17.zip 91799643 BLAKE2B d24f3477df720c8f679df8c49a976f30ce070300a7d2fa3cd230a1b87b85d64bae3de89aa5a938ef9573291fefdec5f44bcf51fb64794df03e81a79ef904a39c SHA512 ebc0ba24ff8542691c3bc228a2d9a16dc6f54fa570e72f6c8985942cf6d023e5e1b5a0fb0912dbda1a1f43709ba56dbfefeded69c0f2d92b772dfe250808502c
 DIST unifi-5.10.19.zip 91782631 BLAKE2B d77b93a5a12ce492873fa744bbb20c5265425b46ebeb0394ff2a0d0cc74d37f933e473f1ba284c687f2d38cb81d2a11b25ab982e6e01397c9282b387e4c3a150 SHA512 b94a82c1a2c151056d60b47a234b45cc82f20f9fa8e198ae630bea0f9a429daa6a3fcb05d31470b974a49d345b54826e57e4ebd4ec06c43436987ebff14c2bce
+DIST unifi-5.10.20.zip 91796706 BLAKE2B 0b425d423a9ffde722549681ecf67b07e01f497c232ff4d760cbc5d61f43a94e753bc5c018739414d169a704fceb16f5844230434519b3645acd5ef42dcb7ce5 SHA512 e43141177d5ad017925bd2cb8315ae4308df96d7185b895b1fd0042bb80da1c04beb143b5265a0d72efc2515be4db0c6ca37cab4fea5a1ccac837b10c2d4b4f6
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
-EBUILD unifi-5.10.12.ebuild 1835 BLAKE2B 05967e03bc45cf5e285b62015f6275005c70a3a4f7edb1ccaef3e5f2862ab0a4f2b606e8f37bf1907aad15199f3fcf735ae0f799edc283d4d78fd06fb7785e26 SHA512 eadbf42d4857fbf899bd3c86be14ff84d80a1627d36e6348fbb6aa84f2e790e6cf6ca8ccfe3a4d554fe6c8be9a8c242344d4897db9107e18959e5e656ce989a6
-EBUILD unifi-5.10.16.ebuild 1846 BLAKE2B d5ba866d183127c36c96365774209e7ab9d9c819e24f6069bd4db32050b1945feb3f095bc89a344470b0d0392ed3b48e7dff6bb1de9b5a9ad77594cd269c59ed SHA512 6aa3240500c0108709368eca9a24302255d6e03a6663fff1280d548fc2d83477db5a61ffb6e14ec5cc2e4f0a682e24a004b595edb7dca5af54727f6de65cc5d6
-EBUILD unifi-5.10.17.ebuild 1835 BLAKE2B 05967e03bc45cf5e285b62015f6275005c70a3a4f7edb1ccaef3e5f2862ab0a4f2b606e8f37bf1907aad15199f3fcf735ae0f799edc283d4d78fd06fb7785e26 SHA512 eadbf42d4857fbf899bd3c86be14ff84d80a1627d36e6348fbb6aa84f2e790e6cf6ca8ccfe3a4d554fe6c8be9a8c242344d4897db9107e18959e5e656ce989a6
 EBUILD unifi-5.10.19.ebuild 1835 BLAKE2B 05967e03bc45cf5e285b62015f6275005c70a3a4f7edb1ccaef3e5f2862ab0a4f2b606e8f37bf1907aad15199f3fcf735ae0f799edc283d4d78fd06fb7785e26 SHA512 eadbf42d4857fbf899bd3c86be14ff84d80a1627d36e6348fbb6aa84f2e790e6cf6ca8ccfe3a4d554fe6c8be9a8c242344d4897db9107e18959e5e656ce989a6
+EBUILD unifi-5.10.20.ebuild 1834 BLAKE2B 3d56bade4dce79c6c3a769f150d04c054a35d96fe911bf4e9af2cad0746c972828317cd28c674bb4884849297e1c9853e81efbb3ae0fcab0e25abee20e0a972f SHA512 aeea508ac3bb4879e4ab2ebb8f7820c2bdf7d06b565b28cc563c8bb90afcba33c3e75e35317ee87f162df64e334e52ace38cac15c1c645bf6c6b1ae28455440c
 EBUILD unifi-5.6.40.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.10.16.ebuild b/net-wireless/unifi/unifi-5.10.16.ebuild
deleted file mode 100644
index 9502b8d13bd6..000000000000
--- a/net-wireless/unifi/unifi-5.10.16.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-dc97e0cd90"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.10"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.10.17.ebuild b/net-wireless/unifi/unifi-5.10.17.ebuild
deleted file mode 100644
index 27baa577f0bf..000000000000
--- a/net-wireless/unifi/unifi-5.10.17.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Used, when it's an unstable, beta or release candidate
-#RC_SUFFIX=""
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.10"
-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
-}
diff --git a/net-wireless/unifi/unifi-5.10.12.ebuild b/net-wireless/unifi/unifi-5.10.20.ebuild
index 27baa577f0bf..113130277815 100644
--- a/net-wireless/unifi/unifi-5.10.12.ebuild
+++ b/net-wireless/unifi/unifi-5.10.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-#RC_SUFFIX=""
+RC_SUFFIX=""
 
 inherit systemd user