Merge branch 'edge' into next

18 files changed, 229 insertions, 88 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 0f31482760ff..f9670e1b31ee 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index e0ffa4612c1f..1ca0da95bfbc 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,7 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.2.tar.xz 950296 BLAKE2B dec19174813a76d5abb941b7a93257428175961c4f05709e5c1ba304302b4163a61cde2ae5938f40053ea43298ee8ac483cd0439c80ce76bae41a95b3dc8d5ac SHA512 44d397d3a9d154d05b5231e18e624bf1ca33c690be5eeb448620ba4882110306925b78dbbbd815384ee3faeff147d2b042c01be28fb1b43568924c9657484527
-EBUILD blueman-2.1.2.ebuild 2952 BLAKE2B d0f5ae870fa21c35c091d6d095fb900765c2716a5a2ac7c06bfedc0332070acf4af91ffc2612e0e6f38d5b7d3ec8270a70ec2f10d05075acccd8321610eeca1e SHA512 cf9540afef232a8d2703573a8a144e603e36d0c2460a395cb6677b758d61512e1926e5e2c811600037131322bc1a6169a2be5dfdd9b0ff2e1d801fde9b615808
-EBUILD blueman-9999.ebuild 2952 BLAKE2B d0f5ae870fa21c35c091d6d095fb900765c2716a5a2ac7c06bfedc0332070acf4af91ffc2612e0e6f38d5b7d3ec8270a70ec2f10d05075acccd8321610eeca1e SHA512 cf9540afef232a8d2703573a8a144e603e36d0c2460a395cb6677b758d61512e1926e5e2c811600037131322bc1a6169a2be5dfdd9b0ff2e1d801fde9b615808
+DIST blueman-2.1.3.tar.xz 950772 BLAKE2B bec7c8da59b94e8f30ff5f41e057ae5662928a4469b46d0ad2b33521a9b3a5de94056f6f35440d90e05116b1dd83dcd2437f1c00fb6b9532c14ab0698716c57a SHA512 376007c6e857f0e10a4d5e4bc2a50f6d170d393389d3aa5d02728646bf27e2fe5c08fb835bb5432a980d2b6c70c348a0274015552be6229c15a89c34c0d105f2
+EBUILD blueman-2.1.2.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
+EBUILD blueman-2.1.3.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
+EBUILD blueman-9999.ebuild 2921 BLAKE2B d9f52b190c85a0257ac904d111c0c95b0d07f40fbbd1e0fd427fd761dbf5f3d698148af604a30df6e0913ae39eed0bce68ce59fb7c5dd9fd020bcf4e3da70953 SHA512 c5ef1d1ce0b26a19704f85d42250d00f3f82244c77b2a35569f48cb6db016f4b547b2145e30555323c061b6729aff65cc3bc11f9a82bf6ad5a22d41c5759274c
 MISC metadata.xml 498 BLAKE2B 09bb34c58c2be38b24d8fa0512f2dc2c0456b220d70d7a26a1df335dfa4320f5d4048294f4d0da96756f0456d4f1fd66f5d9d17f0f2856f0f23a02198d9a9956 SHA512 841624c8939029603a24fc35db8d1b4d0559eb499c37cd1601b55f6c28f192a736b1199f33710b0028013b5fcf83310456dd42e3ded7896592f54d72cc04dba5
diff --git a/net-wireless/blueman/blueman-2.1.2.ebuild b/net-wireless/blueman/blueman-2.1.2.ebuild
index af14a0fe84ea..8144b23c4cc1 100644
--- a/net-wireless/blueman/blueman-2.1.2.ebuild
+++ b/net-wireless/blueman/blueman-2.1.2.ebuild
@@ -69,7 +69,6 @@ RDEPEND="${DEPEND}
 			media-sound/pulseaudio-modules-bt
 		)
 	)
-	!net-wireless/gnome-bluetooth
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-wireless/blueman/blueman-2.1.3.ebuild b/net-wireless/blueman/blueman-2.1.3.ebuild
new file mode 100644
index 000000000000..8144b23c4cc1
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.1.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit autotools 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 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"
+	S=${WORKDIR}/${P/_/.}
+	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="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/bluez-5:=
+	${PYTHON_DEPS}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/pkgconfig
+	nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_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]
+			media-sound/pulseaudio-modules-bt
+		)
+	)
+"
+
+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
+	# replace py-compile to fix py3
+	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
+}
+
+src_configure() {
+	local myconf=(
+		--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-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index af14a0fe84ea..8144b23c4cc1 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -69,7 +69,6 @@ RDEPEND="${DEPEND}
 			media-sound/pulseaudio-modules-bt
 		)
 	)
-	!net-wireless/gnome-bluetooth
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 57b571815c90..431a684b38e1 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
-DIST chirp-daily-20190925.tar.gz 863049 BLAKE2B 06085527c80659f3305ec7195e7126596ab5fcb23cd7f3f0b873ccc04cd8363cddab1bcd745174d03468db18b1c0859a1f6bad3d4d9ce4c9a46e8bd62530789a SHA512 1a5783b02bbe4544d5eb4a1b6140748d2364deb9581faddf3ebab656ed4df6edfc2b437866958f4146dad1fed6698dac0d0d0c708d561792903ae182d808f599
-EBUILD chirp-20190925.ebuild 1145 BLAKE2B 70b7ad1dfee4f5f36f19712b96101ea7369a5af8c56893871a7a72de72aee3eb2f7e75f5e80dd21bb6cc6a6959fa88f3e985080cb48110f046801929cbdb34dd SHA512 aa67f1abdc2e015ac1f48b6bf411be3ea0772962013a83a684cd1dec0dec6e67f383b8b3fbad8202c230574e3285362bd813471a0ad35eb8b839d8d1e0f61a4d
+DIST chirp-daily-20200430.tar.gz 896763 BLAKE2B a0f318499e76ff9c297c4eeff381650d98ea03d20a0d20d7751485376a9299ba0f59aa88340a0f23cdf4bc70f0038b5376c2c78beb3bc593a09f7a7af22b9021 SHA512 f7b0d6d23df2b85d714c2fabefcc32cf5f30ceb7daca6a5982d47962a1fe4d4b210729d0d78cef28af4f21fcfbc9e4d0e6585b5e841220e9f8b5a7fcad1dd2b0
+EBUILD chirp-20200430.ebuild 1145 BLAKE2B 4a70c363ba60697332975eb4e70f83fa90f9ee7819a45d8c41978a7baa6a874eaafbd10f39050281a23e2be7f884168942fe8b7206dfa12761e0c994d7311a29 SHA512 1b59ac9bb05ade9654392d141f89a4b9cf68e284e0903f01ea1b969b4a88729d730d06b682f62ddd95384750ffcaf3c564aaee7a9caa0dec4e5a3cb443f0eb07
 EBUILD chirp-99999999.ebuild 1145 BLAKE2B 70b7ad1dfee4f5f36f19712b96101ea7369a5af8c56893871a7a72de72aee3eb2f7e75f5e80dd21bb6cc6a6959fa88f3e985080cb48110f046801929cbdb34dd SHA512 aa67f1abdc2e015ac1f48b6bf411be3ea0772962013a83a684cd1dec0dec6e67f383b8b3fbad8202c230574e3285362bd813471a0ad35eb8b839d8d1e0f61a4d
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20190925.ebuild b/net-wireless/chirp/chirp-20200430.ebuild
index 0bfe51e65750..b82274bfdd51 100644
--- a/net-wireless/chirp/chirp-20190925.ebuild
+++ b/net-wireless/chirp/chirp-20200430.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 63c433b2c7b1..4c2a2b7b1f8f 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,6 +1,4 @@
 AUX 61-gnome-bluetooth.rules 399 BLAKE2B ba3dd9fdc3834ce6a3460d8abff179d08c1258f7ba43e2350ed2c7e88aaf6fef4b06c51b6212650523c4de577cb3a85946bae9b955cf6c17a0c984431abd5d2b SHA512 74fd95e2afb3d3f13df72bb593ae6644a3a4975e43f5f50c622f14f756861596ef92aa331200d9fce6ff3976e8a1ed57e4053186b7a9716039ace971a6dfed0d
-DIST gnome-bluetooth-3.34.0.tar.xz 351232 BLAKE2B 5ed3a2edc4d0a494013c246ce4caa64cc343c08ceeca3fbdc809591c59a59a7e269b35ba2474f38bb9ae1aba7f7b47f2d164c2be49d3e59d1af538a77a7451ab SHA512 25c99f3ac4398b24c08018cdf41a124c94312bc0b1c7202c82918134ddbdea16d6ee0980536cb45deb42ae8fa25b6e86ad21870646235108583831bf5f00926e
 DIST gnome-bluetooth-3.34.1.tar.xz 354568 BLAKE2B 53e0f4d172e12ba1fec8dae476929fadaab2fd0a8e8ac063debbe516f925a3bb04c9000012fc2e143baf00c7bbdd4f2bd31bd64e674c1851e4ec544ab9c058a5 SHA512 3e0080bbeeddc144fdcf6b4f0d59b0885fd5881aee670d2e5dffd4ede9b0f988358ad0e815ba86add8b7fd5e93e1f8fc7bfacd10b8d69606aa569fd67356be08
-EBUILD gnome-bluetooth-3.34.0.ebuild 1417 BLAKE2B cce5e7d06f1ee47b524f583b180a6c6a08d727fb7901120b54383bfb075356f9a1baf636d7d7b5c6e7fbd1ccea751786bc82f1c87f969f19618a582cb5a679e8 SHA512 29aa1aec42c6208ebefe56f91f3aefdc9beff5c53ec3a4f5b5570e42bd0d215675c5ff10a8a389a8892735e3ce2be3522b586fbec279ff2f04deaf6ec3a5538d
 EBUILD gnome-bluetooth-3.34.1.ebuild 1417 BLAKE2B 5872967d80f0990faf599c704e1116ac12bc252859efdf52dee83b531f85a10336e084576d38ec88027cd252a9a6bb8db2a9943873780f0d430b91e30615f648 SHA512 c1f20c9cd2e4385e350e33586220c58e6d84f989462650a085faa6306662d41149e5446bcf9a7fadbfe6af4dcbfdba5ccf91d77d45b0d1ac26f49281d3f18ffa
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.0.ebuild
deleted file mode 100644
index fddec0bd3150..000000000000
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson udev xdg
-
-DESCRIPTION="Bluetooth graphical utilities integrated with GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
-
-LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
-SLOT="2/13" # subslot = libgnome-bluetooth soname version
-IUSE="gtk-doc +introspection"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.12:3[introspection?]
-	media-libs/libcanberra[gtk3]
-	>=x11-libs/libnotify-0.7.0
-	virtual/libudev
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${DEPEND}
-	acct-group/plugdev
-	virtual/udev
-	>=net-wireless/bluez-5
-"
-BDEPEND="
-	>=dev-util/meson-0.49.0
-	!net-wireless/bluez-gnome
-	dev-libs/libxml2:2
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.9 )
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dicon_update=false
-		$(meson_use gtk-doc gtk_doc)
-		$(meson_use introspection)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	udev_dorules "${FILESDIR}"/61-${PN}.rules
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	if ! has_version 'sys-auth/consolekit[acl]' && ! has_version 'sys-apps/systemd[acl]' ; then
-		elog "Don't forget to add yourself to the plugdev group "
-		elog "if you want to be able to control bluetooth transmitter."
-	fi
-}
diff --git a/net-wireless/hostap-utils/Manifest b/net-wireless/hostap-utils/Manifest
index f0fed7b25827..eb184b4c5d5f 100644
--- a/net-wireless/hostap-utils/Manifest
+++ b/net-wireless/hostap-utils/Manifest
@@ -1,4 +1,4 @@
-AUX hostap-utils-0.4.7-makefile.patch 861 BLAKE2B 2f6ba94c3452739a56be370eda165f895881f9ec98d242cb950fd1dd8e79835c972987bc58a506b745afac3e916e67367d0c419317a0464c6d3b1bd075149eef SHA512 8900dd62ba64965645ce57a90df26a9e23c44495513cc8fe414d92b425a24a081782a90a3eda4f01c7d922ebc334eb74c496f4dbb891422b7bc0a17c27afd32f
+AUX hostap-utils-0.4.7-makefile.patch 860 BLAKE2B e1f27d3da73e6cf0c9a6b2eb7ebf738e8dc67f0f815edceb8c317472f72abb7e72b29870a2be82e74a35084cb0dbc12eec5e11a6770baeb3d0a4295db40b7ac9 SHA512 a84f1c078538b6df6542b67e71e0ec97e7d3cd2624f0cbd56e5ff6f976b0504f4f0e2b6fd148148d36133aaa406fb31acde7d45d1e1c2f25f015c430128b97f0
 DIST hostap-utils-0.4.7.tar.gz 60782 BLAKE2B 6e56488df1bde9de13724df39606a8eb125a67d9f1b14e80fd58cc8ff5c5fd703713e565db49d82d00acacc0275c9ca38d38d81a026ccc30d27db82bf3d351a8 SHA512 1a54c5d84b02d2dc96c33d6463af775212e09a20ac85367184636d364f17a09e48f937417dd9c43148663d242b3fc5f2f13835ec5331bd0600ef31797c414d44
-EBUILD hostap-utils-0.4.7-r1.ebuild 645 BLAKE2B b26729ce1ccd8c8ef8d46e5efbb08cf3265616f935558ca3ddcc7c90d4598cf63b11546d142240987d7743a0d205d0ae9dbe191b3cc9b5306a31f32a4eb8f057 SHA512 7a31d2907c191729a55bdba3f6b4cad7f7da8a971f817a3873f25f67274b2ea7317065eba227c85665d094136012a6f2d25ab10f44fce62d0b945c198be1cffa
+EBUILD hostap-utils-0.4.7-r1.ebuild 606 BLAKE2B 02cc2fe590dbb87faf75a8e04badbf9c65357c66f15b17465a57934f714bbfbea69efc669998b4eaf0146d0261a83b5a59c36c03c334b8e3eb61543d34d17d77 SHA512 529434d9594023ecbaeae3c57d377ec49ff01889d88d64126f268483790fb22dc8cbad59c4a17c59b7db550e4ce0b5971837713ef106005d24eb355d88424dd5
 MISC metadata.xml 236 BLAKE2B edac1ea2c31bb8a5e334f9ce1ab76a4413aee84aa851f109afec729418c9e8164356c3faf55e1beb0317769da9642e645b94852d92b7cefa67c3a92a28f5cf2e SHA512 d002364fc624df1993a205281bab483edac8d8c5fe9831be50050b1f29fcb6f002a8d55e0aed6eab931f0c934084abe28d5ff922045045c524562006d10ee3af
diff --git a/net-wireless/hostap-utils/files/hostap-utils-0.4.7-makefile.patch b/net-wireless/hostap-utils/files/hostap-utils-0.4.7-makefile.patch
index 366a878b7b62..e6838ba27c2f 100644
--- a/net-wireless/hostap-utils/files/hostap-utils-0.4.7-makefile.patch
+++ b/net-wireless/hostap-utils/files/hostap-utils-0.4.7-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2012-11-20 12:16:39.747881769 +0400
-+++ Makefile	2012-11-20 12:17:39.248881307 +0400
+--- a/Makefile	2012-11-20 12:16:39.747881769 +0400
++++ b/Makefile 2012-11-20 12:17:39.248881307 +0400
 @@ -1,7 +1,3 @@
 -ifndef CFLAGS
 -CFLAGS = -O2 -Wall
diff --git a/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild b/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
index 8b830e0fbecb..81d045aa4f29 100644
--- a/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
+++ b/net-wireless/hostap-utils/hostap-utils-0.4.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit base toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Utilities for Intersil Prism2/2.5/3 based IEEE 802.11b wireless LAN products"
 HOMEPAGE="http://hostap.epitest.fi/"
@@ -13,11 +13,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
 PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 src_compile() {
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9617a452621e..a6e01b57458c 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -6,5 +6,5 @@ DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b45
 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-r1.ebuild 1203 BLAKE2B 5563cc60c1a70dd83e2b825db8ddc9e4d8e034c4e4a08b5af88f9394ee7b641a1e48590acaffb384682065be4f709211b642e00a7fc1a6d85866ff7d5e3e09a4 SHA512 d55c788bd0c20d2dbf711b7fd84ffef4a6364fa004c6d7477b4b312a1f299a63015616819ba445c03d46ca595625f7cc81cb3ba9b9a2b01c95dd463b79764efc
-EBUILD rtl-sdr-9999.ebuild 1286 BLAKE2B 1ce9eb249cd692aab7eeee1b05012045444a0b0d578ee28c50da6918c20f9d57aab75b6947a2a8851062c8616e83f35e559f7435d0be6aaaac1ea4b17e0c343b SHA512 3a7bb8fa0c794507b5b3feed3707455676e1e9551aaf400a0f602db4ea005ac3837f6d643456adafab79605226c8b13b7b924498314e51b51f36f8e1a2167b27
-MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
+EBUILD rtl-sdr-9999.ebuild 1334 BLAKE2B 950153d85e57be97a4abae9779f640808c991743f0c4a1efb07919706d08621e9116397b411d5d44cbd163453cca272a0175792505baf23a9ef9bc9b891641cc SHA512 292d0b626c50c672a62d4ab359504929fdc31328c17662e2b32c9268adf368eb01fffea252a626771b5abb1e61b37952bf5c2fac08020e2b3def9ac218b33102
+MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/metadata.xml b/net-wireless/rtl-sdr/metadata.xml
index 1570f891c6a3..0fd1a19caca6 100644
--- a/net-wireless/rtl-sdr/metadata.xml
+++ b/net-wireless/rtl-sdr/metadata.xml
@@ -5,4 +5,7 @@
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
+	<use>
+		<flag name="zerocopy">may cause a bus error on some ARM systems</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 5b9fb0899d30..2f3140b29d22 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils multilib
 
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+zerocopy"
 
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
@@ -41,6 +41,7 @@ src_configure() {
 	mycmakeargs=(
 		-DINSTALL_UDEV_RULES=OFF
 		-DDETACH_KERNEL_DRIVER=ON
+		-DENABLE_ZEROCOPY="$(usex zerocopy)"
 		-DLIB_INSTALL_DIR=$(get_libdir)
 	)
 	cmake-utils_src_configure
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 03f393bff82c..643edeee8227 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,12 +4,14 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.12.35.zip 114691419 BLAKE2B 0400f78cbc880f52e8e352a1b8ef925c293b5a51137aaba89c4e26f7b213661e2b9e5caf09cfc6af0f74456e1217f4e2b8f398c11ebe32b1b6a17153cef9e920 SHA512 4e6b3726e5b6e43c1688fbdefe816eedb1cefc671bc9f861cc06f1c4f52a903670e033c2c5b2c66c5ed2c3f42e8f573e6245fe483a32a0df33283d46ccb5d96a
 DIST unifi-5.12.66.zip 117434749 BLAKE2B 6d48632b7add5f3943574decb66aeb209c570151ee4f1c4dca10feeff924ba1946bc7bd1aae8ce36ac0a20ce2765da9953ded073086a82fd59ed08a57e30965d SHA512 138882bd7a67900ff47e5b02644a7e1941aef98d49ee6e56fa41b462ffd2e92e073e8064bfd846f2c369ef3491b3adc3032dd2ca9b8980058ca88d1925367ca0
-DIST unifi-5.13.10.zip 126198214 BLAKE2B 168baabd0523091ee41b75809c9bbe9941ea0dd9fa97807c826ad1be3afee868ac0932b5068ddcbfd8cfd9c6e3c7838c663c7b248e9cd21ea90cac59e99ed99d SHA512 08d4053201671380c152597ed6a795f593a03b67488d3d21c1f1320bc2ca980e9985e86e45eb6ef5582184c371a33eedbecfc867aac6c9129f653b84c1a87fcc
+DIST unifi-5.12.72.zip 117402382 BLAKE2B a847982972aecfc344b3054ac8364270f8de38452e818a9a575266550292fbc9fe5554937191cdfb208002a412e3fd7956a85ae9edc12fed65461a95ee801915 SHA512 a3764d4a3b39a16bc08c3206a8ceb37614d9bbd356e2e56f18eb33cc42de5c9cf21ed2a99689d0e5b794356163a0159911916513eed154b6c8ad0aee9db0e01b
 DIST unifi-5.13.18.zip 150552474 BLAKE2B caec9f360b2db5d7e155ef29c7a6d5851a0c7de8a476a018b33a5423f0052fb46a55deadf74dba2d51763d4a675ea7b6ba2d9195087b9be7a9280ffe5c8b5c27 SHA512 deb08448d48a49be920f8e300117fe4326f8d1bb58117e5fbaddc6db268d514ebce85b605ec26248259e2be51b01605045c56e3f84bd7249bee25a08b4784535
+DIST unifi-5.13.22.zip 150546130 BLAKE2B db82f7b95fe3dbda2f19d1361cccd25670325babc61c3d55b4d4e716b0fd2a5cb22e0ac45367b0a5fa975fdef35bfa050bf951bac6c5ce83ae8cf9aa205d5026 SHA512 9a0f5c85d2b4fbdc1f518da95bc5554473cb30e71e1c774e31a82d1579f973667945a3338746288ca98b95c02f3e73450a96295203e62f0e33ae57a7c6ef5d39
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 EBUILD unifi-5.12.35.ebuild 1777 BLAKE2B 84159e527fa3a125543f3335bb8fb17ceac1634ce143ffc262a2caf5c6da27e452ce6adf999a205b187bad5623fdde25f97bd83f46dd93ee448fd83c84ed4f50 SHA512 a4324b8391a72d073fb67b629326683335bafa66c013483f689c95fdd59caf7e4c697f2ee74d63ea68075a7660dc5e4034f7569043cc80e147a0df3fa4717f87
 EBUILD unifi-5.12.66.ebuild 1789 BLAKE2B 512679ecfc4f0b438db8ff1f7049c4ec8da2d64ddc3e07c22997a96aacccac966452c972b37468e27249e777fe9963e8626034f4108c34d8588e5872480d15c0 SHA512 4b4c0cae00f63bb28a2bf0d800b9703b653ef7ca54c5fc224b8bb9daf5431ff59f50bcf7ed076f9aa73c6d552691122026d7ab616801c808141b9b25113869a2
-EBUILD unifi-5.13.10.ebuild 1789 BLAKE2B 4161583b6433dab461180e7e22538b0860196efa57e87f4fbe85a128c8b684058e98c579559869be72b97c4ad4eb5b555719e8c6ee4060959bd3b833e87e2ccf SHA512 51cb921e0ff5e2307e122fc113ea63df0e318dec8767a96b91269f2d68c7a399878447232a32dc9b4ee7c2cfe36a9b3e63a0fcdee7250d747bc5b64c6259e403
+EBUILD unifi-5.12.72.ebuild 1789 BLAKE2B c23ff96cb68c881c35c6e83571dcadfe654c0c24e582c685cc4a2e77e6835baaa7838fbfeb647e0b8883613c780584bdca12667d9c4b7ca6114a6712d3dc4626 SHA512 22a2001966066a2d783d0b7db988045e1c4b63287c37b0ed72f442f8a235bcb270d8833db941498eb4bcef4faae24de15e2a0852834b7d124e94a06ae70c79e7
 EBUILD unifi-5.13.18.ebuild 1567 BLAKE2B 87a846f511bde38c1126e8d8ed242f6c9a6fea4b88a82f2b7ccdddf888bf14e9f2f0c8caa88130ec4003763243616ce4e59363af58e18e3d0ad1407e78e71e8f SHA512 63e0dbdc27bfd6e5e5ebb9cab20dbc444572be884cf97b50314aec04b5a79534c1e2118ab2f794500acbb239c2a0637071fdc9929017626274acc09e641728a9
+EBUILD unifi-5.13.22.ebuild 1567 BLAKE2B f1495f8d2d7be3e62d6e74766518c0ced0bea6dab8ee8d1cb5700d51bd1dbb8cb8b54616c3560d23c214d701b97fb50880163ea11dfd4eded8505a803132bb03 SHA512 26075e5d4356f9f7bb2a92ced7d7aa138f78d995fb143bf1339fd102eb47cdccfb9118f7fa1e8a59b7b63c4e406b442a241637d1c992edaace5e9624ca7eaec3
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.13.10.ebuild b/net-wireless/unifi/unifi-5.12.72.ebuild
index 800112ef51b8..338c9edad137 100644
--- a/net-wireless/unifi/unifi-5.13.10.ebuild
+++ b/net-wireless/unifi/unifi-5.12.72.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-202b4c03d0"
+RC_SUFFIX="-0bbca4291e"
 
 inherit systemd
 
@@ -14,7 +14,7 @@ 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"
-SLOT="0/5.13"
+SLOT="0/5.12"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/net-wireless/unifi/unifi-5.13.22.ebuild b/net-wireless/unifi/unifi-5.13.22.ebuild
new file mode 100644
index 000000000000..8ebdadaf0d3c
--- /dev/null
+++ b/net-wireless/unifi/unifi-5.13.22.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-3c75ba51cf"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+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"
+SLOT="0/5.13"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	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"
+
+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() {
+	insinto /usr/lib/unifi
+	doins -r bin 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
+}