gentoo resync : 02.08.2019

30 files changed, 221 insertions, 392 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 0820989cbe80..72db22500812 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index a701df44ea90..1cea57214d3c 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,9 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.1.tar.xz 950296 BLAKE2B 10113bf9bd6744d6aaa5e4d0912d87ba11ace36027acfb10802988ad7c7458dbe2c092095148277f437a8dac68f93c017da53a0925a2c3e8c24e0400db567c87 SHA512 bde7dffc369a7204e2c0e05005f3c1cb97760b3d8625342fe69a5b5c729d6b90eabeca37c679c56f73499f1dbc17ccc15800b4e6e48e717f0e306083525981e9
-DIST blueman-2.1.beta1.tar.xz 948440 BLAKE2B da1c6935b47b498d8fa2681c9672381bb6242f8fd752f28d2f2874dd4b602927044db1a291246dfd4c0931d934cc32b2516680cb963fec948fa9452d08d69671 SHA512 c7f04f6d65c9228660efc6e4d2e417eef8dd08f1f703a16270fc883f40be2b7d8f1d7e8728f3a0523b854bfef7fed18b58eb8cdae697d9890a76c220ee2b818b
-DIST blueman-2.1.tar.xz 950124 BLAKE2B e357d8b56e7fa20a03b401585c0bd9680e5138363ec9894c4aaa51c3082fa83f0d2c6ae2f4911c1fab23aa0eab30bd070ec4b97abf997a0cf55365d26f1b7782 SHA512 b675b9edc4fbf4c27f48d3e59bafbe555e59d6d21f7f9358fdd5741b1c7584490010cc5f53f812a7640f0c45aaa29ec4a946548b2a33dfddd7dcad4cce54400c
 EBUILD blueman-2.1.1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
-EBUILD blueman-2.1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
-EBUILD blueman-2.1_beta1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
 EBUILD blueman-9999.ebuild 2757 BLAKE2B 30cb997a1c7473786e45728aa447c1c3b3329d8285033b26115bd29342b731201747ce80eb45004df82f5661fdc534c1ecb2ce37363ed5409500ad86bb604ed5 SHA512 02cb66900dddb5a3cecd25c24f20eef45daea1eae5f6fde4b44e17da5e795c530e6ed00c5a89a2ff7620409d152cccb752a6fef05668b8757e404e5ec04469e1
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1.ebuild b/net-wireless/blueman/blueman-2.1.ebuild
deleted file mode 100644
index 6f86023ac9c9..000000000000
--- a/net-wireless/blueman/blueman-2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-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
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	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
-			sys-apps/iproute2
-		)
-		|| (
-			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"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	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
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(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
-
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.1_beta1.ebuild b/net-wireless/blueman/blueman-2.1_beta1.ebuild
deleted file mode 100644
index 6f86023ac9c9..000000000000
--- a/net-wireless/blueman/blueman-2.1_beta1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-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
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-
-DEPEND="
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	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
-			sys-apps/iproute2
-		)
-		|| (
-			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"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	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
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(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
-
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 0d8d07875c3b..90d2db5e5baf 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -11,5 +11,5 @@ AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e59907
 DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd4a223d44442ce28cee85a3a736bfbf5ee9d74372fa6366dc1102bf86babada608966a8c30b1c2537859a3741c289cabbc76026 SHA512 6d33e8bc67e50dc0d4cee3fa080402a51ddc8b6549f19b6c272de7dc51604eab23f909322f01aaca8a834abdc3cfd0bf24bb8623071af0cf0611d7427c9d8e9a
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.50-r2.ebuild 8157 BLAKE2B 8156c32dd8c0df0f84e48971a23f1bfabcbee9dee023390d4e8b0747ef2cf895811fb097242e3eb7402f1b716b2f18b5ed5eefd8929e1e2f5df46c0f401630cf SHA512 ef118fbbedad97e9a99601f60cdd32c02eab7ae782ab875c8126ed921a00ff8117cc3f31628605b08ff1169ebe1858b26b80e9b3ff36ca0c3216cc7ca9acdc7f
-EBUILD bluez-5.50-r3.ebuild 7996 BLAKE2B 4844279d257362db6d13ea9bea16ccbd7ab0d3d4dd834dfcca6517d5a4501abe8ddb4074aaadbfe4676a95a432549d3de448506d67a43e1f0ae3adcbf36cdbc0 SHA512 e18dd9adb8088cf98b07c4ba86e6babf376f59b4a374d9120e1a62e20cdc3d362c0a4b58a8be507f4f110128b69b0dd3602b54ca788257304303a2b988907cd3
+EBUILD bluez-5.50-r3.ebuild 7990 BLAKE2B a909e6b969f90d3602db76fbf1614df14507cce2ca6b131f36fd5617033083b7a7fbe3f97bf315d85d9438b9b5f30d5ed82f1ad2601707378c19204af3f85ebc SHA512 b0d65fa1383bbb03dfa5db4c5b24880ddace37b200bb00fd68c49d3609c6505b4f502fdaab0d56576b05f4f75278372932de98f70b00f11c9ba26e317d911ceb
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.50-r3.ebuild b/net-wireless/bluez/bluez-5.50-r3.ebuild
index c613f12d2fdb..c590e2ced4dd 100644
--- a/net-wireless/bluez/bluez-5.50-r3.ebuild
+++ b/net-wireless/bluez/bluez-5.50-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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="btpclient cups doc debug deprecated extra-tools experimental +mesh midi +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 65d108de374d..2f39e19a87b8 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
-DIST chirp-daily-20190429.tar.gz 855701 BLAKE2B 155fcfe26ca0f827b67578003bece8235f6a6e54641bbc14b0006c9866a9307ca5b5573a3964b2f8848a81b6046bb0f7d19a9873ca950bf8e67e57d18025d71b SHA512 8c939f5fe608ac9f5fccdc41e39b16854cb5edb2afdedd87b9048f1288364147605e9683c173e2d9feb3d974d77505ec07191879fe8c75baceb0fa43f6c0d9dc
-EBUILD chirp-20190429.ebuild 1136 BLAKE2B 37c63e5caba2ea329dfc650932331ca2b7f3fd1dd8019bf4052d5063b7076213cc414cb06f59d5069105c9ee56fd699d17e07cf165df7fc7a3021ee2fbd0c934 SHA512 c7796d56d8ae00ae87b29ecd654951e2ecc86f914064c19b031a9efdd2bee7b8b9ece38d7e22556c8fc533a13fc1e0c9aef161de9926b70b33e1eea69d33d196
+DIST chirp-daily-20190718.tar.gz 898961 BLAKE2B 323864540c0f6fd5602034f6ccb40d7bf983d21f8a802c9d837843de07979d50ce3633de3d713a444629a4207957ae9fd505e40ab74b9c0325275d803af97b12 SHA512 c43eebaae2eb55d4cf2196c9d72d093652923020651f5c9a2117d2b43cd60e2004a06e471bc5d5d786effabe864804ab59d5006e3b3153c8872db010c540be12
+EBUILD chirp-20190718.ebuild 1136 BLAKE2B 37c63e5caba2ea329dfc650932331ca2b7f3fd1dd8019bf4052d5063b7076213cc414cb06f59d5069105c9ee56fd699d17e07cf165df7fc7a3021ee2fbd0c934 SHA512 c7796d56d8ae00ae87b29ecd654951e2ecc86f914064c19b031a9efdd2bee7b8b9ece38d7e22556c8fc533a13fc1e0c9aef161de9926b70b33e1eea69d33d196
 EBUILD chirp-99999999.ebuild 1139 BLAKE2B ddd873216fe53fd35ff3f7395d05b3c95cc5434e326de6abe65bf3a928e6f9fd9f0def0d00609c1be53b76376ba14f257aba68d270803fbe7c8412052252ba68 SHA512 7b49e6b80c1a6acea83085a3eeb2c2e5172b93fc90ed5d0e87b63e742c98ca32a9bdcb8252a5ba990244abddee9e25abae042675bd3f59a148ddfb6531964fb9
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20190429.ebuild b/net-wireless/chirp/chirp-20190718.ebuild
index fe466120796c..fe466120796c 100644
--- a/net-wireless/chirp/chirp-20190429.ebuild
+++ b/net-wireless/chirp/chirp-20190718.ebuild
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 4efcceefa8ea..479ece369d81 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -2,6 +2,6 @@ DIST hostapd-2.7.tar.gz 2101166 BLAKE2B 4e88b7f0d2c57a02edf4214bb35efa08e87a2cbd
 DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 29e331d8ebb52732d2548734fe9ea55d8401826da7a35962705335da7d81232c785ffa89d77e8ee848148d82bea1d9141cc4d515706eebacb267754829cf7ed6 SHA512 5a352517470912bcb87755a592238eac2d814a7089d4ba1ecb7969f172dbb746a4e9a6c0d47c0d7c4a6a86b04b14ac39147d729fdf3163371c1067490a4897aa
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.7-r2.ebuild 6765 BLAKE2B b0556b1554c2ade33dafef61827a16b4169e1a8414729cccc20da3759eecc43b9899df0bf1cddf36bc1eb162d68049c942f5706f3bc6fb261887b8f8fe164c44 SHA512 9c9c6b861e819cb1c651186eac4f4a3a2dd4458c3ea2bd6fdd44470a5d332222c0c9793065871036d61e77649ff83609281f9b6efcb7fac8346de4dedfc3b5ed
-EBUILD hostapd-2.8.ebuild 6684 BLAKE2B da1d343e042bd280212fc3f5dcb0e80efbc8a1ef6cca6903cdb6bf232420593dd7c11fdbf7d6321e586a55488473ca53fcf66884d4b79bd50ec21c8adc53b4c3 SHA512 eceaef1d077d9fa0a71beabe7a79af627b328b55048659cdf017fe1175881c5b1f838611a0d4281e198a03a3c101293552b102242cac3e081eb1a87516afa26c
+EBUILD hostapd-2.8.ebuild 6682 BLAKE2B f7b0f129334d7d784f89de6fbcc2086f347ad740ba2daec570f721c109871239cbf6fd4f2d894d358b128cc497d368046aa05a6e0a6705f7ba79d5ca98a69416 SHA512 e23c2e753f91b69da5e4b5fa49b9683c92c8df5af17f5d457f2e8639fb0cee1f96490a81d914d592dc3fb74ad61d0e79528045edb401d33c8828045ebc4f7e08
 EBUILD hostapd-9999.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
 MISC metadata.xml 973 BLAKE2B 009e9b39aa6c7d1d6da4421ec1d0c4610a64b136b497f92dc5a822ab54449720cfacb9ce898fc2015cdcf741939acb46aa8797e13c80079ce424f5f6bfbde8be SHA512 19a5d72d11eee955856bde7065a784d1942b2c55adbb154e1af432c693763beedb1541d119ba6c0d7b5e2f37e13a3aa915b13def6c9ee651b6f4f7f8e85a57e5
diff --git a/net-wireless/hostapd/hostapd-2.8.ebuild b/net-wireless/hostapd/hostapd-2.8.ebuild
index 5cb3cb8b6dd9..631b845e31aa 100644
--- a/net-wireless/hostapd/hostapd-2.8.ebuild
+++ b/net-wireless/hostapd/hostapd-2.8.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 4b32401aecf9..2ddcd2a8376a 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -1,11 +1,12 @@
 AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27eaf48f292fc1a926c5f36031b9f93154e453fe1a1ca85e3988eac625334ee1fb75433de289413a0347ed2f92624d061e4fed SHA512 4bc4832e1f15c3917b67ff80d8b054b6a8aca9a8b03cf3f78cfb2a9b45fdb1f2f2785c2864cfb31bb05cf4da9adca3f96b6df47667107430a7020814ed07549b
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
-AUX kismet.confd-r1 516 BLAKE2B ece6cb105b23a69f2a00e934bbb43c9e8b68dd0704111c54eeb011be8c202cf5e2e533281b4a59a789886838ce7c9192c506823a397f7ab2ee95bc3237397159 SHA512 25c3cc550c53a1798fe4330c716d5c5e933f016c1b29b2ff1d79683254798cf75ef818bf5feb3a84c7e7ef10de4dd15254529e558005acf6ccdf69d9a324d209
+AUX kismet.confd-r2 380 BLAKE2B 2c0006ba52ca2c49cb167599be8b12b10bcd23b99eeb69acce520c1f6af59138279665b5d8decc9e4cdd504305ff81f035e171c2e253baacf00f68d35b372567 SHA512 fe3042a130350afd122b2ae5d962d986d13f1184da7d453aba095bb86a9529f201e851a5cf29ab13c9a14075e0d9972f0aa467cbf553bd02209cc102b7d1689f
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
-AUX kismet.initd-r1 597 BLAKE2B 07adebfd969a7f7f7ed4868049ec9d40470cee0b1158ff4dd934f68ef335f1e07fe128c40f02f92b432e43690590165cd62fb97c3a73ac996edacaaf9a5fbf5f SHA512 15df53b4e42dc71527d05f3243606b521b6700cd2e97f56a9ede77cd4e2cc2eeacc5089fbc5735da970e0e3ae9cb65d93d267c7069c72f6ffb2cd417f7550e4a
+AUX kismet.initd-r2 495 BLAKE2B 6d495c1fe5582921a67acf411fc65f6f3b3d832017e9354e09a3b39b8af67193e519a9da838cd26e80e80a6e145cde879089adb56ea34810a2d42c588fac7d28 SHA512 4066adc3b5ae455fb1305f4d5ac71604e90b2e1e6210fef10036229f4917dbf40dd8853f8e9dc2accc1457e4fd95f28f13ba39b56e066df365d7d186b3ea25b6
+AUX kismet.initd-r3 332 BLAKE2B e3d4987a41acf7b76aa0a08da7d11bb7c49807a5f60e4540620a34cf3bb8fc71e076ffdfad4b35699b2158c3376a691c3ca6ea1236f4f9eb3c24fc77eed4ab71 SHA512 0d5ff74553e122d645985ead839f48e5edd716bc510e505798938a705e14276a97bbd5ca2dfbf784ef044fa7b12064068ec03b8839dd8237794e17f6715f6231
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
+DIST kismet-2019-08-R1.tar.xz 3030764 BLAKE2B bf9db5d7a35c3426832def9c1f974644f325a6714084b1dc2fabdf7b8155d767419683a39ce34f390dc8c9de2adf047d1f8016b9b48a789765294ec4aed0ea2f SHA512 2a512af192e153fbc361fdb0e83c40feb98c4905bf6556010191d04e5f2c5d290c0545f756b67100a63de6bc2995c9e15b56f5ca38fd1220031c25d87a27db7a
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
-EBUILD kismet-2019.05.1.ebuild 3426 BLAKE2B 411ab8cb5c085ea6031df9dd1abeeae2693826a096f914474aa02f3a84a442f180962b09ef933b16b496dcde8a04f8304d4ce8c5a1ab09eeaea151e1328ebf2e SHA512 34a1e6c9d617bf5bcedf2d56f28311ecead912db0d6ace211198a14c7dc79f86ace08973e40b9cf762051ccac4c81f948a1c6352a77855cd4f08ebc9bcc9b00c
-EBUILD kismet-9999.ebuild 3474 BLAKE2B fb18e8bba589b80ea7f6f557da68a59090767f584ee9959e53db1fdaf6b96db52b359b1d2da8dc51142ff8924733c2235a169cc6cf570de930a39b03aefd4441 SHA512 ffdd06ce01efccee7e869ae9aad50247c70d3a8a5e6955f785fa3ef5d3445f7e8b24b957b0dd1a02c2a3a3349702047e9530b55d6c8aba4dfac3e7d94bd72aae
+EBUILD kismet-2019.08.1.ebuild 4659 BLAKE2B 1ce31f04f1f23944d18dc7d84bca3b1ff636fbb409382c52d7009cec3415b8917aa06ba4599dcbf4cebdc5b157d487d6ce8bf6bcdb8fad482ddb53921ec714ad SHA512 eccd26e64e69a7b3d6c0f9943554e1c4726603f800d3eb78feaa0ff066e8bb1ae1fdba1eac9ae85cf85b639d46360737f338173078530f05bbb4b4e813a8bf21
+EBUILD kismet-9999.ebuild 4659 BLAKE2B 1ce31f04f1f23944d18dc7d84bca3b1ff636fbb409382c52d7009cec3415b8917aa06ba4599dcbf4cebdc5b157d487d6ce8bf6bcdb8fad482ddb53921ec714ad SHA512 eccd26e64e69a7b3d6c0f9943554e1c4726603f800d3eb78feaa0ff066e8bb1ae1fdba1eac9ae85cf85b639d46360737f338173078530f05bbb4b4e813a8bf21
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/files/kismet.confd-r1 b/net-wireless/kismet/files/kismet.confd-r1
deleted file mode 100644
index 42f617372ff5..000000000000
--- a/net-wireless/kismet/files/kismet.confd-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
-
-# Kismet configuration is done in /etc/kismet*.conf
-# It is recommended to put user config in /etc/kismet_site.conf
-# where kismet updates won't try to overwrite it.
-
-# To use the kismet init script, you must have "logtemplate" set to a location
-# that is writable by the user assigned by "suiduser".
-# e.g.
-# suiduser=foo
-# logtemplate=%h/kismet_log/%n-%d-%i.%l
-
-# Options to pass to kismet, see `kismet --help`
-KISMET_SERVER_OPTIONS="--no-ncurses"
diff --git a/net-wireless/kismet/files/kismet.confd-r2 b/net-wireless/kismet/files/kismet.confd-r2
new file mode 100644
index 000000000000..40da851cbf00
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.confd-r2
@@ -0,0 +1,11 @@
+# /etc/conf.d/kismet - configuration file for /etc/init.d/kismet
+
+# Kismet configuration is done in /etc/kismet/kismet_site.conf
+
+# To use the kismet init script, you must have "logtemplate" set to a location
+# e.g.
+# log_template=%h/kismet_log/%n-%d-%i.%l
+
+# Options to pass to kismet_server, see `kismet --help`
+# --no-ncurses is passed unconditionally
+KISMET_SERVER_OPTIONS=""
diff --git a/net-wireless/kismet/files/kismet.initd-r1 b/net-wireless/kismet/files/kismet.initd-r2
index 4c1891611967..bc4374e68016 100644
--- a/net-wireless/kismet/files/kismet.initd-r1
+++ b/net-wireless/kismet/files/kismet.initd-r2
@@ -2,25 +2,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-checkconfig() {
-	if [ ! -e /etc/kismet.conf ]; then
-		eerror "Configuration file /etc/kismet.conf not found"
-		return 1
-	fi
-}
-
 start() {
-	checkconfig || return 1
-
-	ebegin "Starting kismet server"
+	ebegin "Starting kismet"
 	start-stop-daemon --start --quiet --pidfile /run/kismet.pid \
 		--background --make-pidfile --exec /usr/bin/kismet \
-		-- ${KISMET_SERVER_OPTIONS}
+    -1 /var/log/kismet.log -2 /var/log/kismet.log \
+		-- --no-ncurses ${KISMET_SERVER_OPTIONS}
 	eend ${?}
 }
 
 stop() {
-	ebegin "Stopping kismet server"
+	ebegin "Stopping kismet"
 	start-stop-daemon --stop --quiet --pidfile /run/kismet.pid
 	eend ${?}
 }
diff --git a/net-wireless/kismet/files/kismet.initd-r3 b/net-wireless/kismet/files/kismet.initd-r3
new file mode 100644
index 000000000000..dce3158973f7
--- /dev/null
+++ b/net-wireless/kismet/files/kismet.initd-r3
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="kismet"
+command="/usr/bin/kismet"
+command_args="--no-ncurses ${KISMET_SERVER_OPTIONS}"
+supervisor="supervise-daemon"
+output_log="/var/log/kismet.log"
+error_log="${output_log}"
+pidfile="/run/kismet.pid"
diff --git a/net-wireless/kismet/kismet-2019.05.1.ebuild b/net-wireless/kismet/kismet-2019.08.1.ebuild
index a4d105b452e9..72387056e698 100644
--- a/net-wireless/kismet/kismet-2019.05.1.ebuild
+++ b/net-wireless/kismet/kismet-2019.08.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils multilib user python-single-r1
 
@@ -62,6 +62,7 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	selinux? ( sec-policy/selinux-kismet )
 "
 
@@ -90,6 +91,7 @@ src_configure() {
 		$(use_enable lm_sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
+		--sysconfdir=/etc/kismet \
 		--disable-optimization
 }
 
@@ -102,8 +104,8 @@ src_install() {
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd kismet
-	newconfd "${FILESDIR}"/${PN}.confd kismet
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
 }
 
 pkg_preinst() {
@@ -127,3 +129,33 @@ pkg_preinst() {
 		ewarn "your user to the kismet group."
 	fi
 }
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 9361c44b1797..72387056e698 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils multilib user python-single-r1
 
@@ -25,7 +25,7 @@ else
 	#SRC_URI="https://github.com/kismetwireless/kismet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	#S="${WORKDIR}/${PN}-${COMMIT}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 fi
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
@@ -91,6 +91,7 @@ src_configure() {
 		$(use_enable lm_sensors lmsensors) \
 		$(use_enable mousejack libusb) \
 		$(use_enable networkmanager libnm) \
+		--sysconfdir=/etc/kismet \
 		--disable-optimization
 }
 
@@ -103,8 +104,8 @@ src_install() {
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
 	dodoc CHANGELOG README*
-	newinitd "${FILESDIR}"/${PN}.initd-r1 kismet
-	newconfd "${FILESDIR}"/${PN}.confd-r1 kismet
+	newinitd "${FILESDIR}"/${PN}.initd-r3 kismet
+	newconfd "${FILESDIR}"/${PN}.confd-r2 kismet
 }
 
 pkg_preinst() {
@@ -128,3 +129,33 @@ pkg_preinst() {
 		ewarn "your user to the kismet group."
 	fi
 }
+
+migrate_config() {
+	einfo "Kismet Configuration files are now read from /etc/kismet/"
+	if [ -n "$(ls ${EROOT}/etc/kismet_*.conf)" ]; then
+		ewarn "Files at /etc/kismet_*.conf will not be read and should be removed"
+		ewarn "Please keep user specific settings in /etc/kismet/kismet_site.conf"
+	fi
+	if [ -f "${EROOT}/etc/kismet_site.conf" ] && [ ! -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		mv /etc/kismet_site.conf /etc/kismet/kismet_site.conf || die "Failed to migrate kismet_site.conf to new location"
+		ewarn "Your /etc/kismet_site.conf file has been automatically moved to /etc/kismet/kismet_site.conf"
+	elif [ -f "${EROOT}/etc/kismet_site.conf" ] && [ -f "${EROOT}/etc/kismet/kismet_site.conf" ]; then
+		ewarn "Both /etc/kismet_site.conf and /etc/kismet/kismet_site.conf exist, please migrate needed bits"
+		ewarn "into /etc/kismet/kismet_site.conf and remove /etc/kismet_site.conf"
+	fi
+}
+
+pkg_postinst() {
+	if [ -n "${REPLACING_VERSIONS}" ]; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test ${v} -lt 2019.07.2 ; then
+				migrate_config
+				break
+			fi
+			if ver_test ${v} -eq 9999 ; then
+				migrate_config
+				break
+			fi
+		done
+	fi
+}
diff --git a/net-wireless/rfcat/Manifest b/net-wireless/rfcat/Manifest
index 687f7e03138e..9214cfc2982f 100644
--- a/net-wireless/rfcat/Manifest
+++ b/net-wireless/rfcat/Manifest
@@ -2,7 +2,9 @@ DIST RfCatChronosCCBootloader-170313.hex 49806 BLAKE2B 5a742393b1236b77c5a5391a1
 DIST RfCatDonsCCBootloader-170313.hex 49664 BLAKE2B 9936f4a5b1262f4abb5e8d38205af909d2640170b24499f9f3e9f6320501fa4f1e438d859dde59b1b8425dfaad8743fed0a0e1fd2b66fbcff9e22b97362f65b9 SHA512 c3fe9a14135a24a44d8c9d193278850a1ba41085f4225397fe21f47e9a874bf1cdaec080acb57d3b086ce05132711df8e6e4cb63b7eacf7d2c24fcafe4dff1f2
 DIST RfCatYS1CCBootloader-170313.hex 50208 BLAKE2B 9df19800d5c0c5a4b8c99f550c758c14d9e3d6dab1f3ed58f65b7577720989eec113f2f243d0d5686a7137398d833374da38faae6ed1ba95836bbebb3448a417 SHA512 6b51aed7ca3ae916137056df711c0f8f76de7f30dec48227da226a7c8814fdded5a1d544f746c74423f69289bae90276b425f7b44a7ad4af5dd96994efc385e2
 DIST immeSniff-170508.hex 38770 BLAKE2B fd34fee85ee6bf893234939cab9794c34f9302e37d86636116e544ca39e368ed8b6015ae2efa80c49ad56722b1fa573897e0b93ca4d5b2e6496c9f92c9c761d6 SHA512 3f06693fc893071adfb75e510da4d5c47752480896e449f893141b4db43dc7fb859dc25ab368d742ae612ebda085f199bcd8e18c9f5fa6f58c6b6204defc7b5f
+DIST rfcat-0.0.190423.tar.gz 334587 BLAKE2B da565d3272262b876763cb65da1f03fa2edd13c423dc23b1bfa91453ce4a8c1629e2f61f79dfaae3137ffbf3d85daec588a97a74db17149e677bef619e5d38ff SHA512 2c44ee933d5a47f3cf83b85c423b10ee044ce37a9e11f8bab0bf8c9734d8d8cac4744cec456eb1c12ad397b72194af7010f4b99aae95b42759bc63eb7b737532
 DIST rfcat_170508.tgz 462440 BLAKE2B 20d4b875be7caeb8263e3582c101a2402527b2f4f54feceba49bf01f65d268f3f9537c42a9a40502a6e232c7d828b6be27d899e979509c607c1160a71aa3677a SHA512 79f960ee6b8c2d66cb17ca69216041bb9679b0d38579feb3ab59bbb6e41337b29c4ad30a6d03b2de4c58eeeff5f22fe26412a670da5278e81a47a2ec3d699f60
 EBUILD rfcat-0.0.170508.ebuild 1381 BLAKE2B 06c89b4f5b5edbc0f9569fbe13e3c51b68e81775d77d8e03a7e8f2bb6ded0d567a46329171bdb8f83fdaf5db2e156d1337b37412565d05a0eb9331d37e83a7d6 SHA512 5957e81e866b1ecafa618c435da3790e1a540f31d8d893c42314f9339af4e9bd8a0158be50e8404b54efbc2fee29638369935291be5b6452b4085f880165ca45
-EBUILD rfcat-9999.ebuild 1423 BLAKE2B 91ea201c358d8c121fc5726873fee1d61d085c80a2f02c1d0a5d2711d98774971ef77daeef87ce6758a638051728f7da8d7fc1431c3214571ffa5154f75388eb SHA512 aed3e045cc64cd5a54161dca37bb3159d89eff5e35387975d95656abfc633f72ee252ecd264a7fa5804b56ce43087d9aa487e049e34e44f4d8932276fc653cab
+EBUILD rfcat-0.0.190423.ebuild 1485 BLAKE2B 29e5db161de76c854e02bce6dbf97283881b34357b2e751938aed0df4f4e7c1477ae4074013a3fc19ed88bf76c541729682fffdf19c79c1c1d08e412d8293132 SHA512 45ed01a14d008eb4aa791d8431ce681fe9b91eeae57ef66cf9ba5df55aa1a41d025d8a0d76f3dec5d3313367cf68a64aa53f9de375237d9c401e8fb36060c1ec
+EBUILD rfcat-9999.ebuild 1485 BLAKE2B 3781bc95018bbd58ea843a9aef8bb74beb35f11ae3c5a45b55cb1c31e9954a1fb2eb9528b0f2f3ab58174d51bcd92d80708a28652d13f0781c1f3530bb4ee75e SHA512 14d416a96bd25bcb6a0f78a1b0113f01f11050eacd7ec47fe6e547bb2e47e287c054654848f7e0c94beeed13da21872d681a26d21f88c1dc1101e5d1ba9acc29
 MISC metadata.xml 332 BLAKE2B f434ada12078111a24ebbf48d22c9820bd2c4f93c86b90a75e3e31b62dada319d35260ca469b9e8931abfd34416b9018c55e6a246ba9f29b793f32eb30e3bfce SHA512 c99ea897c8e261d0fe784a70e40fa34d11e5ed1600ff1a24c5b0a3618430c9509d94755ec3c4e76e656c62cc51502b6345f0de7713f9a3dc213ef00bb5fce468
diff --git a/net-wireless/rfcat/rfcat-0.0.190423.ebuild b/net-wireless/rfcat/rfcat-0.0.190423.ebuild
new file mode 100644
index 000000000000..644402fa8044
--- /dev/null
+++ b/net-wireless/rfcat/rfcat-0.0.190423.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="The swiss army knife of subGHz"
+HOMEPAGE="https://github.com/atlas0fd00m/rfcat.git"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/atlas0fd00m/rfcat.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	DATE="170508"
+	FIRMWARE_DATE="170313"
+	COMMIT="109f887fc816021a2cb2875dce62ab9cad02c5f3"
+	SRC_URI="https://github.com/atlas0fd00m/rfcat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz \
+		https://bitbucket.org/atlas0fd00m/rfcat/downloads/immeSniff-${DATE}.hex \
+		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatChronosCCBootloader-${FIRMWARE_DATE}.hex \
+		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatDonsCCBootloader-${FIRMWARE_DATE}.hex \
+		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatYS1CCBootloader-${FIRMWARE_DATE}.hex"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+#DEPEND="dev-embedded/sdcc"
+#RDEPEND="${DEPEND}"
+PDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	if [ "${PV}" != "9999" ]; then
+		insinto /usr/share/rfcat
+		doins "${DISTDIR}"/*.hex
+	fi
+}
+
+pkg_postinst() {
+	if [ "${PV}" = "9999" ]; then
+		ewarn "Right now, this only installs the rfcat host tools, nothing related to firmware"
+	else
+		einfo "Pre-compiled firmwares from upstream are installed in /usr/share/rfcat"
+	fi
+}
diff --git a/net-wireless/rfcat/rfcat-9999.ebuild b/net-wireless/rfcat/rfcat-9999.ebuild
index a2f1584d251c..c5a88d6cf870 100644
--- a/net-wireless/rfcat/rfcat-9999.ebuild
+++ b/net-wireless/rfcat/rfcat-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="The swiss army knife of subGHz"
-HOMEPAGE="https://bitbucket.org/atlas0fd00m/rfcat/"
+HOMEPAGE="https://github.com/atlas0fd00m/rfcat.git"
 
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/atlas0fd00m/rfcat.git"
@@ -16,13 +16,14 @@ if [ "${PV}" = "9999" ]; then
 else
 	DATE="170508"
 	FIRMWARE_DATE="170313"
-	SRC_URI="https://bitbucket.org/atlas0fd00m/rfcat/downloads/rfcat_${DATE}.tgz \
+	COMMIT="109f887fc816021a2cb2875dce62ab9cad02c5f3"
+	SRC_URI="https://github.com/atlas0fd00m/rfcat/archive/${COMMIT}.tar.gz -> ${P}.tar.gz \
 		https://bitbucket.org/atlas0fd00m/rfcat/downloads/immeSniff-${DATE}.hex \
 		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatChronosCCBootloader-${FIRMWARE_DATE}.hex \
 		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatDonsCCBootloader-${FIRMWARE_DATE}.hex \
 		https://bitbucket.org/atlas0fd00m/rfcat/downloads/RfCatYS1CCBootloader-${FIRMWARE_DATE}.hex"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}_${DATE}"
+	S="${WORKDIR}/${PN}_${COMMIT}"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 623d7fd1e876..4cf8c445d4d3 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,8 +1,10 @@
+AUX rtl_tcp.confd 138 BLAKE2B 04df300f0add96490ab861d99301b53ae45d414891f808780f79ef7c6c1cd7b0a48696510933b0cb8fc04c65ef4b2cd23109bcf266472225a8ee4a2ff430d404 SHA512 48324164cc7adab2e7c7f44b45a3a590ef9bcb161b4f6b22a94b4c4abf989b353a37c7b28ad1d81ffdff96dda84c10ba36bc9948f70a6b1f1c767394dc03ab77
+AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0e54e65fc8fe0c4b1ed8c1c6d4ea5991736fa232d26bb17b3e31fa8e6d01c111ec4ccae4c9df924 SHA512 7ac01b0568b1c12e906ae0d102708070b9aacca97d590b61d80125dac9f84587438fe5b582765552d37b0a9b730e00fca8894f8d5ff0c6a518fa2fb5dd4fb407
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
 DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 EBUILD rtl-sdr-0.5.4.ebuild 1162 BLAKE2B f3088c38e3f3307f4c4320a034c5cd573c5578ffc9f83d1994a1773c7c3f91846055201c46ba55926967fc9c2312077020d6e39351c3fda2d89995f4900360af SHA512 68bc4fa2d8fa2bcacded03f85c6d68ebdc4600d4440fc366991940e2e5a54362088b50f7bc58a4b152bb1edb7b3f24f86e3354f0ce9e391486e1cfecee5c75bb
-EBUILD rtl-sdr-0.6.0.ebuild 1060 BLAKE2B 7c05d7f7c635c13c3bcedd8f09b55f6361e59df7768b5bc6744acc3180deee5ccdc6e99ae21d61d5ddc9075b4515d10781abc61c61529b9c4b08a4039f3dd5d0 SHA512 83408c4cd34ae6d3402eb825008221e62134369ce775ee8475f34ee6c47d20ef7200be36f75b17c43b485695f76bef145b0fad423aa33348f98ab308201c977d
-EBUILD rtl-sdr-9999.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
+EBUILD rtl-sdr-0.6.0-r1.ebuild 1196 BLAKE2B 52e330ebbc9346c31e4bfaad5bc0ce286abed677b28c7aec72e051f529c4be891366d37849a862fa8dbd8a15488c48bdc2f94d6eeef1a5737707121857109393 SHA512 7648585844be8debb91a1638c345732929c49a592647a621dfce9884427a55accf308d2af95ee4646b4b27480daeffee0ac204a5405f12bfc935ae30b87223d7
+EBUILD rtl-sdr-9999.ebuild 1286 BLAKE2B 1ce9eb249cd692aab7eeee1b05012045444a0b0d578ee28c50da6918c20f9d57aab75b6947a2a8851062c8616e83f35e559f7435d0be6aaaac1ea4b17e0c343b SHA512 3a7bb8fa0c794507b5b3feed3707455676e1e9551aaf400a0f602db4ea005ac3837f6d643456adafab79605226c8b13b7b924498314e51b51f36f8e1a2167b27
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/rtl-sdr/files/rtl_tcp.confd b/net-wireless/rtl-sdr/files/rtl_tcp.confd
new file mode 100644
index 000000000000..530e89fc940d
--- /dev/null
+++ b/net-wireless/rtl-sdr/files/rtl_tcp.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/rtl_tcp - configuration file for /etc/init.d/rtl_tcp
+
+# Options to pass to rtl_tcp, see `rtl_tcp -h`
+#RTL_TCP_OPTIONS="-d0"
diff --git a/net-wireless/rtl-sdr/files/rtl_tcp.initd b/net-wireless/rtl-sdr/files/rtl_tcp.initd
new file mode 100644
index 000000000000..2e4d07b8c28a
--- /dev/null
+++ b/net-wireless/rtl-sdr/files/rtl_tcp.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting rtl_tcp"
+	start-stop-daemon --start --quiet --pidfile /run/rtl_tcp.pid \
+		--background --make-pidfile --exec /usr/bin/rtl_tcp \
+    -1 /var/log/rtl_tcp.log -2 /var/log/rtl_tcp.log \
+		-- ${RTL_TCP_OPTIONS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping rtl_tcp"
+	start-stop-daemon --stop --quiet --pidfile /run/rtl_tcp.pid
+	eend ${?}
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
index a6d38d237ac6..59c56f84f78b 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.6.0.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0-r1.ebuild
@@ -44,6 +44,12 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
 pkg_postinst() {
 	elog "Only users in the usb group can capture."
 	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index cb32ad203bb9..5b9fb0899d30 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,11 +41,17 @@ src_configure() {
 	mycmakeargs=(
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		-DLIB_INSTALL_DIR=$(get_libdir)
 	)
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
 pkg_postinst() {
 	elog "Only users in the usb group can capture."
 	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 1afe1dd6b22e..55b5b5e7bb86 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,16 +2,14 @@ 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.23.zip 91775246 BLAKE2B 842ffd4c63b19d480fa29330fa66245cbfdd840f719d5c9e1bd59972f7dba6d2a425c22097a3afa01aab719bdad162dced938e1406716a7892a6a30e58797f61 SHA512 be4a4f855b741dcd86f46a082838a770c1b622f8f1e860f1005e8fbf55306a28de98a3ba2a704af21e6badd7d342465520c42e481b2bec50ec4439d8f784edc3
-DIST unifi-5.10.24.zip 91779832 BLAKE2B 2e20b10036d185b2fa282b0bf3f1b7538482a5ed07c334f1d681957abc7e63a6de97709c2c35fb4b1e2186351b3fd47460d6c21be5483301b0ff008ade97bb63 SHA512 db71422339ab93cd285ae62715c4066075d6602f16767e765461e1121d75f44c348f10ddd0033626b35e199df4da7b6e26efe350e8052eab0ee98471939d44b6
 DIST unifi-5.10.25.zip 91781146 BLAKE2B 3a4166f3d96c1fe0e7a9afd7e85266e6dacaa4bad44af1cfd72cd22f8a2f5fae4ca4534c5ae09ca50ddc216e067e5e5598e0cc3ea1bcb96802b7379dca03426b SHA512 2a88c8640b10c2b596c40c3e4594062f9828db3e2be5dd159dcf7275b3796c7ef8714c60c27de980672fb1ccc88e9fa7640fc74e61e6d994e3fb1214d0e0bd48
-DIST unifi-5.11.26.zip 111562451 BLAKE2B f4a7788f8ff14e2eadc0da28fdf11c54ff22ada8bfc7300dc07aa87058d9d207b66d3687625c27920f60b46035756c49b69342740dd28cb51f2ad427f7d7d550 SHA512 3704e1b19b73a3c572a3695b21ecfae5948fed0ebfb305f234865c096688b5a87f4ca9c59ba79d28d1ab8571ecd61c555196a4b2a21e870797fd0bbd71fe4b5d
+DIST unifi-5.10.26.zip 91777116 BLAKE2B a07f296aa55204d0c1be055f0c54901824eaf2341548ae3a4de95faa496f5e38e19cd62974da09abfad5756889506db4dda1aa8803e0f87036ebfb3205c47c10 SHA512 3722c83b810e3ddce6c82d8b8119717b00213d5052baf66288299311fe6f7e8c5a5c5dbdae871a166bcfeb1e70c69f2ed4f34dea702d50e69d1a1a8eacea4594
 DIST unifi-5.11.29.zip 111460891 BLAKE2B 5740b760570d8bc94c54c679e846cefcaff6e36a5c07921e997df0bfc8b994803c35c3d486d2130cae21c8731156728e2a95cc62e033bf4c28ef485347ba1a35 SHA512 73ddf723e9e6de8dc95c33a54eaa82bcc11304488fe2e6dfadb2eaf906f34997b7815def8ec765f460fab6a77a311aaf617aba27bbee5636205ca45c3d4bd486
+DIST unifi-5.11.34.zip 112196079 BLAKE2B 2d1d691f54edd7ef744f55696cac90f471e5fc6d8c3aeda1ebf54f53c985a81c3e959e6db8942fce70dcecff70aa799948cffb34a50391552501bb9738bd45f6 SHA512 66768c79db741bbab6de608f7c355550dd0db43807d85e3babc0fe921d1e7533548ee4f07dd033309b422ba1c24fa22186d503f6e8ac5785301aac0507e5bfbf
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.10.23.ebuild 1834 BLAKE2B 419a9012af3f4d2911f12e5877e28309c3d1ff9d935f69bff2c4ff0276c46225d1268fb895238df249f9c76bcb70e69743f5fb893e1e6d21e846b2f7254d1911 SHA512 a83f56a8f2efbcc108c2b4b4ccdaffded74d59341167f672a2a70a85b97cf5d529f587ca4ba34a4fe5268e51c84e0edfde2886122c4cc62ef50ad7c973ce8998
-EBUILD unifi-5.10.24.ebuild 1845 BLAKE2B 3431d95023bf22aef529f93f9bcbcec4ef64eb6c6385c0e31d235efbbb50c7a82e68280ee9a4f4c67f432d259a99fa773316c1ea16ed7bb1d2f11598ebc3f43b SHA512 e5821ab30f7f72dd545b8d5a83182a5773e99efa26ea238d6969a4b23442d4f2e1db9b0355d5fee484579793f4caa5f7744da8a4c482373dfdcb6ac659b9a484
-EBUILD unifi-5.10.25.ebuild 1845 BLAKE2B 46cb683f4ad5051dc140269e45fee9c12f68aff575455475927e5803ace8d644af0de4134761036761b8bc81bdcebabfea9bc8b97a747035344c6ea36818c9b7 SHA512 f0963fed5968e4fc4d34e533f371476f9c4dcad87de7df23bff893b14928e563d569f26ee81acd21256c9b3a65a61ee2d40a730ae1c2f7593670f29795fc032c
-EBUILD unifi-5.11.26.ebuild 1835 BLAKE2B 0e5689f5ffeefdb88be719ea6ba00f7dfc7f396000729bc8b928095ee2c99074634b8cae30b279c2615846d09b5321d1571817d9a7c1750f25b20009ce57b0ea SHA512 80195ede8f3062cb0fcb0ff6b5cde659d72f93abbf2f6294a9733eea3854ea2e44844f76f4bd61e5f73139c2300a3c314eff704e4ca9b17a640ff351e100aca3
+EBUILD unifi-5.10.25.ebuild 1832 BLAKE2B 0391c965a650f7ba24efea5123407d38fd1bd9559c2f39b64c36f0044ab7a4eefbfe98a8d4165966e81f435bb137add9892ec08f4fe3917fb7206ad3e9cd56c7 SHA512 9bf367781e46c9cc8fcad0be0eed59a848a822825555b87eddc9e36941e66861a9ae7f229f263532eced0376e4154d35183a1bdcadc3bda77f9b7a8547d8b6bf
+EBUILD unifi-5.10.26.ebuild 1843 BLAKE2B 92109fd98d1975d1f07b6d66b7965709609571f8cc6f5b8eebdcd24157fd6233b21ba74c17b3454aa99c8ec2273944b9af24939476c9f1b42de871a0c6c4da29 SHA512 1dec9b15ae11c83c9f71843616299e52a665a5d50342844b72a648ece714b3db10f06ae7205ba11b44d052dd5be6b1cfd23160a1fee1d01cad830c357b2c40ac
 EBUILD unifi-5.11.29.ebuild 1835 BLAKE2B 43c185328afa9fc09e4bb2f7673c4c5eea8ad0870406a85f20881362da9b340855451042840b315747b4df845c257463f824a56d24785dc8d9ca1f85e9e4a6e9 SHA512 f3ecce832cda4ea9e01080dbd408870129bb16bc12459fae6933a1013c59f65240fdb82de720661e2302f44d98be44b5f0e06b303a2930fe9e855d2264825bf8
+EBUILD unifi-5.11.34.ebuild 1833 BLAKE2B 1ee401a867e4cf795158fe4cacf86abafe59c3dc08dfb10a4fbbeaeee2748c7f701b54f205f978ff428affc334509bc421a162c8a54d7be3f7b18c5373840199 SHA512 bd39aed325aa62db6a3ded26726f011f39723557c11dcf92fdfd216123f9d7789c6dfc4866f79bf1e224b8f08e977d961f6d3bc7ea1f300d2798a4d2f838f1e5
 EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.10.23.ebuild b/net-wireless/unifi/unifi-5.10.23.ebuild
deleted file mode 100644
index d81e854e96f2..000000000000
--- a/net-wireless/unifi/unifi-5.10.23.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.25.ebuild b/net-wireless/unifi/unifi-5.10.25.ebuild
index 0d6895425acf..716df55f9fed 100644
--- a/net-wireless/unifi/unifi-5.10.25.ebuild
+++ b/net-wireless/unifi/unifi-5.10.25.ebuild
@@ -4,15 +4,15 @@
 EAPI=6
 
 # Used when it's an unstable, beta or release candidate
-RC_SUFFIX="-48e13746e9"
+#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"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
 SLOT="0/5.10"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-5.10.24.ebuild b/net-wireless/unifi/unifi-5.10.26.ebuild
index f05b3f52c3bc..d486ab031275 100644
--- a/net-wireless/unifi/unifi-5.10.24.ebuild
+++ b/net-wireless/unifi/unifi-5.10.26.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 # Used when it's an unstable, beta or release candidate
-RC_SUFFIX="-fc15f0fdf1"
+RC_SUFFIX="-7fbb9ab8c4"
 
 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"
+SRC_URI="https://dl.ui.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"
diff --git a/net-wireless/unifi/unifi-5.11.26.ebuild b/net-wireless/unifi/unifi-5.11.34.ebuild
index e7bf09eafeee..9effce3ccae7 100644
--- a/net-wireless/unifi/unifi-5.11.26.ebuild
+++ b/net-wireless/unifi/unifi-5.11.34.ebuild
@@ -4,13 +4,13 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-1ecdee774d"
+RC_SUFFIX="-2def560057"
 
 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"
+SRC_URI="https://dl.ui.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"