gentoo resync : 03.11.2019

32 files changed, 916 insertions, 369 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7af2684159ad..be40a8209776 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 1a08840a6ac3..873f26986134 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -7,6 +7,8 @@ AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb364657
 AUX bluez-5.39-systemd-quote.patch 1298 BLAKE2B c06a96ffee4f40d574765f7f5b58ba3544fe9862bf4d64d45be0dcbfe1446cb8cdca150402e44117f44b973d7041fd66f01088d843d35d0d6538ccf169551923 SHA512 a31a93934b3ad5d55633ab8ac0878f3cd8bda0ca7836a8912b444f88fe8c71183d25a6e3f36d962cc68da6d2776837b4bf660efb17d379c4003a092c313e69ba
 AUX bluez-5.50-btpclient-header.patch 345 BLAKE2B 0418270a696b9a682a3f74f35af64152fbf005dd3abf0230b03d673632f2e5a8b2874c11b9adbfd1733fb601eb5aea02da9028894041e200f99121e41dff855a SHA512 eba5462c20a37905ab8491b6812cd5dd8229280a56fcf24b3a2624a871d14a0377697f93588d02fa03ed422f953072109ea76b544173b97d874b9190de060a97
 AUX bluez-5.50-sink-connect.patch 2275 BLAKE2B ae03cc1c04774867d72602735554cdb377f3aa25165cd6a681a1996d30a9d0c51463d3d2a366049840ced9d805c1c3827ceaa69d619b5357fb21c1a708950064 SHA512 7fbb45e37b842cc6e8bbc98f19d5582c697c01c42000deacee6ea5554699669bd5ec23acba33cff994edd2b7d2865274905e074117b9a04334e9670bc8d6a386
+AUX bluez-5.51-disconnect-timeout.patch 3053 BLAKE2B 3a9d503c688731931627df00e04c0e6f14ac71fe00d72cc3926d8fea1ee63a3034d87a706766b64c08680a0e15d96b812d0f3b12058ab05c5c14dd43f5be2771 SHA512 b7eb3e9205a37a34d7334078dee2580f5159319bf03c5d4601ff39c403d5e3e641bbf250da6622e10d0b059c9223d590e1935166bd66420d2dc6a32a420263a8
+AUX bluez-5.51-include-limits-h.patch 1490 BLAKE2B 084d0780638497594088f374da7a7f4c790eb5c4a539031e7b5e282a4ec49c44b6fb60ebbb636629d333463386d8da353012863ddc08804775a81285fa18ba54 SHA512 f23475af0d9641ed2ae2b62b8cc186a123d6f1f26556caa51e5615fe6b544a60c6dee425c05facfe3a881afecc8f22c7f370b8cdf25e09c4690c22202705a677
 AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad8303ed0dc10831ab9023665436cfa9c47f8ccab7f83ab2b46ca8369ce53c5084ba7bf649c3ea89779882af SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2
 AUX bluez-udevadm-path-r1.patch 564 BLAKE2B 0b4dc12f55ab60d254aa3365baf35186a5913026dbfcbc3da41c113b3c423c81189b87016dabcb2c505b684cad376d10d10df9aa17558b8fd022928995931e0e SHA512 d9b0dd452258e425802cf5ad4980a77796be79e94bf6ce641927c5ab7ea1117ce6589063f3a0b96bf25e81303234279a09d58484fec49cfc6aa1db46f245f9c6
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
@@ -16,5 +18,6 @@ DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 DIST bluez-5.51.tar.xz 1941904 BLAKE2B e8580388961c99305c6f723160e726232a097067815a88a056c1569c55c2ea410004cf92572afbef9b782807d8a940503b4501f9c6046cacac35136fbbe580a8 SHA512 8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f
 EBUILD bluez-5.50-r3.ebuild 8001 BLAKE2B 53a60e148a3db4c9eaff57ea07b0b1b5d12fb758e520569d0e553c28006826fe855771a2dd8e36ce32a5fb2c8e5002ff8a670e3cfe7e5ef7f70420c17b129db2 SHA512 6e9937151b6514d2ddb34426400a4f4a96c983b0996588bc3b82073e188c34419f70a1d78bbb34d68ac8e7d369fa111a9e5c27647b3cb6322fe0123803afb0a1
-EBUILD bluez-5.51.ebuild 9082 BLAKE2B 1e5ba81fa700f4fc6ae4aa538d4113f36852ea3f890777e05d3d61ad99d3def6eb00be9f789529f555f21e9d83818c2f2d3c0e5e42ec1ac93db40af2b46a3aad SHA512 81fbae889430f555b3d208529abddb5214565ca34de56e68418a0806487237ac2b151ef7c37b55fc7a889d0724ff3990b98a128a257ab097c51fa0dce76b69e2
+EBUILD bluez-5.51-r1.ebuild 9434 BLAKE2B b8e40bb9cc3957cdf5e108cf63e65b41f76c8da6e1d3aab12993cdd37e35cefc0eb8a3229fc47f67e5a414e596d69f4063d491a6c61bc38382cb4a0eab861ba7 SHA512 689e1eb8767450445196b30b5c0c8549b4fd92ade581362f62e9a0516a58c8d5f7134478aa2d37a7f3f56eb47f465df4d241cd135d1b6e9cfdc3eab7025e132e
+EBUILD bluez-5.51.ebuild 9260 BLAKE2B a78010b25abe822fa29daaa7bdb2fc750291ae967d4b369648b0c6f70fcab7ab60e1a610842f5304c5be2a3f64d84a7bec1a9e8abe9ada41e565ace6cb28c59e SHA512 42dfce2e99346621955ad32e19307e7f9b303a14e5f89b77a9d581133e73881260633acb6a0d8fb9b8e32192eac8a13efdb30e4cdc03d4bcd169760139f428d6
 MISC metadata.xml 1211 BLAKE2B 5e605af395041afd8b790d21b33b816ce3b960458375d51243e8a763302ce1fdc69da2ffd119966c88c261f3e13fd9b48241c2955eebc78d64da887599bb9830 SHA512 c35cd78b8f49fe1142f2ae203571e558a8d45d435eeb7a5e57260192869658d5c39c4f671f99225cdb1530309a7bdea37d572522d8fe9d5354b1e25f5ffd556f
diff --git a/net-wireless/bluez/bluez-5.51-r1.ebuild b/net-wireless/bluez/bluez-5.51-r1.ebuild
new file mode 100644
index 000000000000..1bf47c399e05
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.51-r1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1 readme.gentoo-r1 systemd udev multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+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
+# 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} )
+"
+
+TEST_DEPS="${PYTHON_DEPS}
+	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${TEST_DEPS} )
+"
+DEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/hwids-20121202.2
+	btpclient? ( >=dev-libs/ell-0.14 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.14
+		dev-libs/json-c:=
+		sys-libs/readline:0=
+	)
+	midi? ( media-libs/alsa-lib )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? (
+		>=sys-apps/dbus-1.6:=[user-session=]
+		sys-apps/systemd
+	)
+	!systemd? ( >=sys-apps/dbus-1.6:= )
+	udev? ( >=virtual/udev-172 )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	# https://bugs.gentoo.org/539844
+	"${FILESDIR}"/${PN}-udevadm-path-r1.patch
+
+	# build: Quote systemd variable names, bug #527432
+	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
+	"${FILESDIR}"/${PN}-5.39-systemd-quote.patch
+
+	# Include limits.h for PATH_MAX
+	# https://marc.info/?l=linux-bluetooth&m=157156119320950&w=2
+	# https://bugs.gentoo.org/695940
+	"${FILESDIR}"/${PN}-5.51-include-limits-h.patch
+
+	# audio: Fix cancelling disconnect timeout (from 'master')
+	# https://marc.info/?l=linux-bluetooth&m=157047663920714&w=2
+	"${FILESDIR}"/${P}-disconnect-timeout.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+)
+
+pkg_setup() {
+	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
+	if ! use user-session || ! use systemd; then
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch
+	fi
+
+	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
+	# https://bugs.gentoo.org/618548
+	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
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--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 btpclient) \
+		$(multilib_native_use_enable btpclient external-ell) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable mesh external-ell) \
+		$(multilib_native_use_enable midi) \
+		$(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
+			dobin tools/btmgmt
+			# gatttool is only built with readline, bug #530776
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1141909
+			# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=720486
+			# https://bugs.archlinux.org/task/37686
+			dobin attrib/gatttool
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
+		fi
+
+		# Not installed by default after being built, bug #666756
+		use btpclient && dobin tools/btpclient
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# Few are 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
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/agent.py || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/test-mesh || 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-pkgincludeHEADERS \
+			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
+	if use user-session && use systemd; then
+		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+	fi
+
+	find "${D}" -name '*.la' -type f -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
+	# Setup auto enable as Fedora does for allowing to use
+	# keyboards/mouse as soon as possible
+	sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' src/main.conf || die
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	# Install .json files as examples to be used by meshctl
+	if use mesh; then
+		dodoc tools/mesh/*.json
+		local DOC_CONTENTS="Some example .json files were installed into
+		/usr/share/doc/${PF} to be used with meshctl. Feel free to
+		uncompress and copy them to ~/.config/meshctl to use them."
+		readme.gentoo_create_doc
+	fi
+
+	# From Fedora:
+	# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
+	# as found on some Atom based x86 hardware
+	udev_dorules "${FILESDIR}/69-btattach-bcm.rules"
+	systemd_newunit "${FILESDIR}/btattach-bcm_at.service" "btattach-bcm@.service"
+	exeinto /usr/libexec/bluetooth
+	doexe "${FILESDIR}/btattach-bcm-service.sh"
+}
+
+pkg_postinst() {
+	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"
+	use mesh && readme.gentoo_print_elog
+}
diff --git a/net-wireless/bluez/bluez-5.51.ebuild b/net-wireless/bluez/bluez-5.51.ebuild
index 00a51cb60471..eff855210bfb 100644
--- a/net-wireless/bluez/bluez-5.51.ebuild
+++ b/net-wireless/bluez/bluez-5.51.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/bluetooth/${P}.tar.xz"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 x86"
 IUSE="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
@@ -69,6 +69,11 @@ PATCHES=(
 	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
 	"${FILESDIR}"/${PN}-5.39-systemd-quote.patch
 
+	# Include limits.h for PATH_MAX
+	# https://marc.info/?l=linux-bluetooth&m=157156119320950&w=2
+	# https://bugs.gentoo.org/695940
+	"${FILESDIR}"/${PN}-5.51-include-limits-h.patch
+
 	# Fedora patches
 	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
 	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
diff --git a/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch b/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch
new file mode 100644
index 000000000000..2f6e7c8c4d95
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.51-disconnect-timeout.patch
@@ -0,0 +1,104 @@
+From 52faac4648500dd45c06b6aa41f1be426c43a125 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Fri, 11 Oct 2019 15:40:04 +0300
+Subject: audio: Fix cancelling disconnect timeout
+
+If AVDTP session has been connected but no stream has been setup calls
+to service->connect would return -EBUSY to avoid stream setup collision
+but it also takes a reference to the session cancelling the disconnect
+timeout and disabling the stream_setup logic that would attempt to
+estabilish a stream.
+---
+ profiles/audio/sink.c   | 25 ++++++++++++-------------
+ profiles/audio/source.c | 25 ++++++++++++-------------
+ 2 files changed, 24 insertions(+), 26 deletions(-)
+
+diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c
+index 7cac21034..966440534 100644
+--- a/profiles/audio/sink.c
++++ b/profiles/audio/sink.c
+@@ -256,11 +256,18 @@ gboolean sink_setup_stream(struct btd_service *service, struct avdtp *session)
+ 	if (sink->connect_id > 0 || sink->disconnect_id > 0)
+ 		return FALSE;
+ 
+-	if (session && !sink->session)
+-		sink->session = avdtp_ref(session);
+-
+-	if (!sink->session)
+-		return FALSE;
++	if (!sink->session) {
++		if (session)
++			sink->session = avdtp_ref(session);
++		else
++			sink->session = a2dp_avdtp_get(
++					btd_service_get_device(service));
++
++		if (!sink->session) {
++			DBG("Unable to get a session");
++			return FALSE;
++		}
++	}
+ 
+ 	sink->connect_id = a2dp_discover(sink->session, discovery_complete,
+ 								sink);
+@@ -274,14 +281,6 @@ int sink_connect(struct btd_service *service)
+ {
+ 	struct sink *sink = btd_service_get_user_data(service);
+ 
+-	if (!sink->session)
+-		sink->session = a2dp_avdtp_get(btd_service_get_device(service));
+-
+-	if (!sink->session) {
+-		DBG("Unable to get a session");
+-		return -EIO;
+-	}
+-
+ 	if (sink->connect_id > 0 || sink->disconnect_id > 0)
+ 		return -EBUSY;
+ 
+diff --git a/profiles/audio/source.c b/profiles/audio/source.c
+index 4081e1970..0ac20fe40 100644
+--- a/profiles/audio/source.c
++++ b/profiles/audio/source.c
+@@ -257,11 +257,18 @@ gboolean source_setup_stream(struct btd_service *service,
+ 	if (source->connect_id > 0 || source->disconnect_id > 0)
+ 		return FALSE;
+ 
+-	if (session && !source->session)
+-		source->session = avdtp_ref(session);
+-
+-	if (!source->session)
+-		return FALSE;
++	if (!source->session) {
++		if (session)
++			source->session = avdtp_ref(session);
++		else
++			source->session = a2dp_avdtp_get(
++					btd_service_get_device(service));
++
++		if (!source->session) {
++			DBG("Unable to get a session");
++			return FALSE;
++		}
++	}
+ 
+ 	source->connect_id = a2dp_discover(source->session, discovery_complete,
+ 								source);
+@@ -275,14 +282,6 @@ int source_connect(struct btd_service *service)
+ {
+ 	struct source *source = btd_service_get_user_data(service);
+ 
+-	if (!source->session)
+-		source->session = a2dp_avdtp_get(btd_service_get_device(service));
+-
+-	if (!source->session) {
+-		DBG("Unable to get a session");
+-		return -EIO;
+-	}
+-
+ 	if (source->connect_id > 0 || source->disconnect_id > 0)
+ 		return -EBUSY;
+ 
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch b/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch
new file mode 100644
index 000000000000..ccbc152a4ee1
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.51-include-limits-h.patch
@@ -0,0 +1,64 @@
+From 20128c5c95fbae93c9fd996d5ad2584cf6ad8032 Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Mon, 30 Sep 2019 18:35:56 -0500
+Subject: [PATCH] Include limits.h for PATH_MAX
+
+Signed-off-by: Jory Pratt <anarchy@gentoo.org>
+---
+ mesh/keyring.c          | 1 +
+ mesh/mesh-config-json.c | 1 +
+ mesh/node.c             | 1 +
+ mesh/util.c             | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/mesh/keyring.c b/mesh/keyring.c
+index 3a7f92f..9fa7d6b 100644
+--- a/mesh/keyring.c
++++ b/mesh/keyring.c
+@@ -24,6 +24,7 @@
+ #define _GNU_SOURCE
+ #include <fcntl.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <dirent.h>
+diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
+index cafa2fd..74ca495 100644
+--- a/mesh/mesh-config-json.c
++++ b/mesh/mesh-config-json.c
+@@ -27,6 +27,7 @@
+ #include <fcntl.h>
+ #include <ftw.h>
+ #include <libgen.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+diff --git a/mesh/node.c b/mesh/node.c
+index b6824f5..15dcb97 100644
+--- a/mesh/node.c
++++ b/mesh/node.c
+@@ -23,6 +23,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <dirent.h>
++#include <limits.h>
+ #include <stdio.h>
+ #include <sys/time.h>
+ 
+diff --git a/mesh/util.c b/mesh/util.c
+index 1455bde..986ba4b 100644
+--- a/mesh/util.c
++++ b/mesh/util.c
+@@ -25,6 +25,7 @@
+ #include <dirent.h>
+ #include <ftw.h>
+ #include <stdio.h>
++#include <limits.h>
+ #include <time.h>
+ #include <sys/time.h>
+ 
+-- 
+2.23.0
+
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 2f39e19a87b8..57b571815c90 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
-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
+DIST chirp-daily-20190925.tar.gz 863049 BLAKE2B 06085527c80659f3305ec7195e7126596ab5fcb23cd7f3f0b873ccc04cd8363cddab1bcd745174d03468db18b1c0859a1f6bad3d4d9ce4c9a46e8bd62530789a SHA512 1a5783b02bbe4544d5eb4a1b6140748d2364deb9581faddf3ebab656ed4df6edfc2b437866958f4146dad1fed6698dac0d0d0c708d561792903ae182d808f599
+EBUILD chirp-20190925.ebuild 1145 BLAKE2B 70b7ad1dfee4f5f36f19712b96101ea7369a5af8c56893871a7a72de72aee3eb2f7e75f5e80dd21bb6cc6a6959fa88f3e985080cb48110f046801929cbdb34dd SHA512 aa67f1abdc2e015ac1f48b6bf411be3ea0772962013a83a684cd1dec0dec6e67f383b8b3fbad8202c230574e3285362bd813471a0ad35eb8b839d8d1e0f61a4d
+EBUILD chirp-99999999.ebuild 1145 BLAKE2B 70b7ad1dfee4f5f36f19712b96101ea7369a5af8c56893871a7a72de72aee3eb2f7e75f5e80dd21bb6cc6a6959fa88f3e985080cb48110f046801929cbdb34dd SHA512 aa67f1abdc2e015ac1f48b6bf411be3ea0772962013a83a684cd1dec0dec6e67f383b8b3fbad8202c230574e3285362bd813471a0ad35eb8b839d8d1e0f61a4d
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20190718.ebuild b/net-wireless/chirp/chirp-20190925.ebuild
index fe466120796c..0bfe51e65750 100644
--- a/net-wireless/chirp/chirp-20190718.ebuild
+++ b/net-wireless/chirp/chirp-20190925.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == "99999999" ]] ; then
@@ -9,18 +9,18 @@ if [[ ${PV} == "99999999" ]] ; then
 	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
 fi
 
-inherit distutils-r1 ${SCM}
+inherit distutils-r1 xdg-utils ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
 HOMEPAGE="http://chirp.danplanet.com"
 
+RESTRICT="test"
 if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-daily-${PV}"
-	RESTRICT="test"
 fi
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-wireless/chirp/chirp-99999999.ebuild b/net-wireless/chirp/chirp-99999999.ebuild
index ef243acf8ac1..0bfe51e65750 100644
--- a/net-wireless/chirp/chirp-99999999.ebuild
+++ b/net-wireless/chirp/chirp-99999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == "99999999" ]] ; then
@@ -9,18 +9,18 @@ if [[ ${PV} == "99999999" ]] ; then
 	EHG_REPO_URI="http://d-rats.com/hg/chirp.hg"
 fi
 
-inherit distutils-r1 ${SCM}
+inherit distutils-r1 xdg-utils ${SCM}
 
 DESCRIPTION="Free open-source tool for programming your amateur radio"
 HOMEPAGE="http://chirp.danplanet.com"
 
+RESTRICT="test"
 if [[ ${PV} == "99999999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="http://trac.${PN}.danplanet.com/${PN}_daily/daily-${PV}/${PN}-daily-${PV}.tar.gz"
 	S="${WORKDIR}/${PN}-daily-${PV}"
-	RESTRICT="test"
 fi
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 8e9200b29d4a..13d6834447e2 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,7 +2,11 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 DIST iwd-0.21.tar.xz 793432 BLAKE2B d82b90dbc83a2953d9de82e5e3a031f4db21f4e707d630cf2762475d34ed97fe78c4cc16bb6fed6ec7343af6bbf89672c37c76a06ed7181b57c657607859f4ab SHA512 eca8847cb68bc52f33a2f50ce4cba9ee4cbd37ad989292a21d613afd3307b0dc974da56df49dc97aa65c9647e3497849d696d5a9fdc5c0d0443a141a0887b324
 DIST iwd-0.22.tar.xz 813324 BLAKE2B 690ac6edbcd07be3b84318c77b8be5bef570951d02a7a6be1cd70ff0a475077253dd8e6f3b5c8a0177e6294b6cb12042e302b6752e2631ddd7cebe829c0c9f9f SHA512 4fa9f8688a33663aad754a371e9c1c71161f394fc0d7c4a32ce3afe7e00efdca8f55f378a71ab32002bbe73538b1a092bc0f24c19912672d70d6b02fcc824fe0
+DIST iwd-0.23.tar.xz 817764 BLAKE2B 2eaf13778658558529d9395ce42d0cd87ff1ae17f7ccd57011ef5e5a7bd68a1b25a0b5b40c5cec10e5cc2304cb49e65b1031f12608feb0d1c30fda2fa9f706cb SHA512 e1ee8c2ca34836f8a971eb10ec79c02c2c3a683a183599839979aeb79e152ad0ef2a37520aeef05a3011c584f009bece158dbcd07841d1ab95138c743c7d11cc
+DIST iwd-1.0.tar.xz 819608 BLAKE2B 8e4187fe92efc3fd686d28cab49a39bcdbc6cbe311d0ef517539e1094d3251e2c92879df24576b0aa100ff0be4bc2496e4ba6a22bc73f1c945ef3bf2a18331a2 SHA512 ef1f840019e5d954e4e8fbedc0f91ca14a981f3e73345daa6f55ad458c048172b510ebec22f8d3b658f84c8d0383b8861ac03f06f16adbcd73d45062e48c11b8
 EBUILD iwd-0.21.ebuild 3824 BLAKE2B 2e8b98874265758ab013bec9be6ca070acfc91efd4bf3383a4566cd214ce8bd01f733f9e73b33ffacd39edeade6771fde394ac3274266296da972761f59d4cb2 SHA512 8c0fe2fab776ff7874af859c12cb32a31609dc0bb49ed6ef6949683d5a423e99c133baa23b2d8e0b4dd9d57233742994544d9d42dad6ab86e00cf532f2764c36
 EBUILD iwd-0.22.ebuild 3923 BLAKE2B 9907dd60efc4a6ee1084d675a830fba740acf0ae0a59283f93a4164ec14b0246ca27478a0b9850f89eb61d910dc2a55eabb940d7e205dac8d7e00918bab914b2 SHA512 7b7dd5b92438176bf3e091fdfef2a861c74b2a0f578cc2ac3429c235d8672972cb5d1eeb3d4cedef1f02766351ac259e444b8f4af49fac1f1af248771b34336a
-EBUILD iwd-9999.ebuild 3922 BLAKE2B 2d463908a0bf8d08ab99a8e84eac265f50feefe61987bf7f43d029a6185aad708b867a9dd7647300744cdb5c03c0b9bd2b4a793008ee81e0713d2720409f2ee5 SHA512 bf8deb15aa4a094efafb9920a47f2f97b41c564a8b7275cb0ec2f93a6e51ce917a555922963ac97034ab55a0391e813b99b2874680eeb733c933d24012a5960d
+EBUILD iwd-0.23-r1.ebuild 3922 BLAKE2B 98cfe13e23a7c4c00d1e645334f14c0e0886c68e9250ee8d24ed25b6a46ca89c22ad4e2ca1579ee6a36285b00d2773aa91d1c682d991232fd55a5795cc247108 SHA512 ff876a195bf573238b76205a41700e7a177016bcaaa03e4f88fc7f60d9f66aefe4def0197aff65a0c5ee0e92e0fc6681bb35027b053e3b2bfafa9d4cf5068d38
+EBUILD iwd-1.0-r1.ebuild 3986 BLAKE2B fa6310e8b259096ec83087298f49445b51f7a745f974c1dbe6cb4270ff7025092776c525264b88dd2eb295f9e946b375b0927266631b97df4ad7befb3e89c8a7 SHA512 73fc6144b5235f68c5df3ab5c3891d190315c78c2d60e0d273ee5f87ec93c524f3c08c3c800a8f96ff1708db786b5a76ca0e6814a56187db344ac1e479af9274
+EBUILD iwd-9999.ebuild 4316 BLAKE2B 0833cb4c21b062596648a21e680fa2fe6c3b08b31586b6683e07260303ed18054bb945450e6ac552ed5b6af8ddd2b20af6f5fb64635a50e6d8be62d590feff4f SHA512 be80e036dacd645c1972518bf24b4e3dc4893072363538b748e2bfafc6c1cbe719932cd01f36c61cf7406d12885fd3461373420cb063aaa744504ab52d3c056f
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-0.23-r1.ebuild b/net-wireless/iwd/iwd-0.23-r1.ebuild
new file mode 100644
index 000000000000..e249a29033b7
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.23-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic linux-info systemd
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+COMMON_DEPEND="~dev-libs/ell-0.25
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
+			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		$(use_enable ofono) \
+		$(use_enable wired) \
+		--enable-external-ell \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-1.0-r1.ebuild b/net-wireless/iwd/iwd-1.0-r1.ebuild
new file mode 100644
index 000000000000..353d6500a01d
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.0-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic linux-info systemd
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Wireless daemon for linux"
+HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+
+COMMON_DEPEND=">=dev-libs/ell-0.26
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )"
+
+RDEPEND="${COMMON_DEPEND}
+	net-wireless/wireless-regdb
+	crda? ( net-wireless/crda )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~ASYMMETRIC_KEY_TYPE
+		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
+		~CRYPTO_AES
+		~CRYPTO_ARC4
+		~CRYPTO_CBC
+		~CRYPTO_CMAC
+		~CRYPTO_DES
+		~CRYPTO_ECB
+		~CRYPTO_HMAC
+		~CRYPTO_MD4
+		~CRYPTO_MD5
+		~CRYPTO_RSA
+		~CRYPTO_SHA1
+		~CRYPTO_SHA256
+		~CRYPTO_SHA512
+		~CRYPTO_USER_API_HASH
+		~CRYPTO_USER_API_SKCIPHER
+		~KEY_DH_OPERATIONS
+		~PKCS7_MESSAGE_PARSER
+		~X509_CERTIFICATE_PARSER
+	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
+	if use amd64;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
+		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
+		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_aes;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
+		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
+	fi
+
+	if use cpu_flags_x86_ssse3 && use amd64; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
+		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
+		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
+	fi
+
+	if use kernel_linux && kernel_is -ge 4 20; then
+		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
+	fi
+
+	check_extra_config
+
+	if ! use crda; then
+		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
+			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
+		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fsigned-char"
+	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+		$(use_enable client) \
+		$(use_enable monitor) \
+		$(use_enable ofono) \
+		$(use_enable wired) \
+		--enable-external-ell \
+		--enable-systemd-service \
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
+		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d) \
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+}
+
+src_install() {
+	default
+	keepdir /var/lib/${PN}
+
+	newinitd "${FILESDIR}/iwd.initd" iwd
+
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
+	if [[ ${PV} == *9999* ]] ; then
+		exeinto /usr/share/iwd/scripts/
+		doexe test/*
+	fi
+}
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index 23be63d6ea2b..bef22a920493 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -2,11 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools flag-o-matic linux-info systemd
+inherit flag-o-matic linux-info systemd
+
+#Set this variable to the required external ell version
+ELL_REQ=""
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	inherit git-r3
+	inherit autotools git-r3
+	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
+	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
@@ -19,10 +23,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
-COMMON_DEPEND="~dev-libs/ell-9999
-	sys-apps/dbus
+COMMON_DEPEND="sys-apps/dbus
 	client? ( sys-libs/readline:0= )"
 
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+="~dev-libs/ell-${ELL_REQ}"
+
 RDEPEND="${COMMON_DEPEND}
 	net-wireless/wireless-regdb
 	crda? ( net-wireless/crda )"
@@ -86,8 +91,8 @@ pkg_pretend() {
 	check_extra_config
 
 	if ! use crda; then
-		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
-			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
+			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
 		then
 			ewarn ""
 			ewarn "REGULATORY DOMAIN PROBLEM:"
@@ -101,8 +106,8 @@ pkg_pretend() {
 
 src_unpack() {
 	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
-		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
+		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
+		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
 	else
 		default
 	fi
@@ -110,20 +115,26 @@ src_unpack() {
 
 src_prepare() {
 	default
-	eautoreconf
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
 	append-cflags "-fsigned-char"
-	econf --sysconfdir=/etc/iwd --localstatedir=/var \
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var \
 		$(use_enable client) \
 		$(use_enable monitor) \
 		$(use_enable ofono) \
 		$(use_enable wired) \
-		--enable-external-ell \
 		--enable-systemd-service \
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" \
+		--with-systemd-networkdir="$(systemd_get_utildir)/network"
+	)
+	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/net-wireless/reaver/Manifest b/net-wireless/reaver/Manifest
index b5e9a027b6c2..0994b99b79ff 100644
--- a/net-wireless/reaver/Manifest
+++ b/net-wireless/reaver/Manifest
@@ -1,8 +1,4 @@
-AUX reaver-1.4_cflags.patch 1096 BLAKE2B feb7b27659a4f8c3de2bb00208cbc37a4b2f8284877b5505c35eff8944928595cf5c74b0e723b1b2d46023a835cda9ede9b83bc30404c32a7aa5629df17a7c42 SHA512 da429eb6ed25304d21e29894b8f185ad5a36b429aefcfc20133cba1cabf43a2e1fceb94f2b2e1335a98b33c3e7fa9bdfd901e1bf05a80e8331d2d3da29a97043
-AUX reaver-1.4_memset.patch 413 BLAKE2B c144f7525943e0876cd0e717fce87e22e663b584b65af5c648b6cf4035b3b11305998d59e0d01b3976f4f83a39addbebd03d940e1fd0677df13b49d3c774d9a6 SHA512 66f71c475269098011d7db326f8e28f53767fef1a397a2996972a262ca9d8e4ee8b8ad148627bf48c4acdc4730001a40af9d98f7ce916d2611dc1e8d92a93409
-AUX reaver-1.4_parallel-make.patch 1074 BLAKE2B a4f36781138a2430a4830f9bda1a22d8a156c12671263ef5ac034a458fb69af8c7c2a6c6e8e50570b6eee044160f1666b823667b36e8db2c9af9205f8836a50b SHA512 96bf54c8e50f2a4013beccfe13bbd07a99e18a6059411ddcd3e5dd4ac6af6e82008e8d8601ca29b3013b761f88a10a7d873ff46898634ef2cfb9db18fc2fa86a
-AUX reaver-1.4_var_db.patch 405 BLAKE2B 63a3fdcbd8ab6f640a0950c9d817cf281f9fc40dd6d6fa6abe37c3c99c036d4c806f1a9a063841fa969545e580d40e96ece15e7ef5e593a84cba71f3d34084ab SHA512 fa79135c59e25afaa254efb6029d1d87bbc2a00a778e4969b916b3cf428a784d61ba871048f297eba473af0ed4a0b1d56da00b045b69875711e127057d1d6efc
-AUX reaver-1.4_wps_registrar.patch 422 BLAKE2B 978fa05e7ffd86e876866f63fcf48fe0ba81ae066fd6c849693570b89a1a90e6f090de2c207abcd733a7b6bdcae4ce0769859081b295e2602c32cfa905bfa474 SHA512 226f6748026f7d8662eb04089a4265ce6dec0cdaeb7e054de2108922c873270d88ccf86aeea6bd1ff03031c3b77ef6e276b4012fa0110447856cafa5a80a523d
-DIST reaver-1.4.tar.gz 766603 BLAKE2B 4a488364718a17ec29c1d8da4bc7032b65e4597b89c2949e7108d625276e60d0b424f3b87a3d6baa30d5909ac206d6f7793f5e4514c307cc54784386ce5ce422 SHA512 59f2d6f8aa6228988ce5d1c102d9a48b2a23e582ff3d9afe39d7c9717b7e4be059362fdd21a3e5f5d59948df1a7616acdaa6df20f139e9c5aa9bd673f764dfbc
-EBUILD reaver-1.4-r3.ebuild 964 BLAKE2B a00975cc61ca9a7cd605917ded7f980a7f394352e915194565d84ebd69185ed676640ceabdd46ad135148c21ed2d2019daa62129cc786ffb5a341ce4ae207a7e SHA512 fafceaf8cb57fde5d76c9044f982196932f2168b5706fe22f689b17e61db1c71c44995dd90d9b4e3eb920a4762b0b446c8d87aef6b5fb8185859680edf0157e3
+AUX reaver-1.6.5-confdir.patch 281 BLAKE2B d8c1b89bf6a5291b75b99182a2a9b2149f6f83191fa5c0586ef5780acbc6e7d5fcf496f9b1f4715df0a3f7b097073e9a1a80ddc218c96d285aa297ddb595e1cd SHA512 36e2ede41de78573dae93727cee30c7f4031edce6b485d940a3f30209573e21be06d3e75ffb8239105e383bbd849fb728dc9ce9d28c5bab7d85b1b9526a67f5f
+DIST reaver-1.6.5.tar.gz 479441 BLAKE2B 21a1c54da559be4346b0c874947e982ea49ec6f20e612e3699d25524d49681a197a2a8cad0a31dd8dba919d065de48082572a471aa4f736397066edf7f7d8a43 SHA512 3e70d9fffefee3f6d60e72d7d7b1da91032e184c7d27f94b9f26e2260b7274d491f2e41f8056b386a211b9838d21afc6b65a8a826d310b51fc1065fa9e135dc0
+EBUILD reaver-1.6.5.ebuild 724 BLAKE2B a49ce91b2bc68438ab73917f2262e567edfa227de7528cd408c8b1cbaf8177672de9b234ae2776b5c53b719966a02410d86095302b1acbb9fab44911e55bcd33 SHA512 6402633b4819bb1f1036d1c7925e5002ac74025096bfcc4324f878cc486a907501a08548de4092e4a40853b9a6da1998ecfb68ddc2ae5227441c00efa7ae471b
 MISC metadata.xml 461 BLAKE2B b23d4c4b8865ca1c58140486368ee2f4daa29d67af27cc5cce63c137d652c4d28b131140807735e9a5125790cc53629eeef074705278c5a550073d92c3447894 SHA512 503400e6ae36b1819015f51f0e5e01d7ba3c18c0133d625f3c35242dcaef5cd5ce72d57caf1b18892dee2865fcd1af1313f42140f360c249f2048874985d5d5d
diff --git a/net-wireless/reaver/files/reaver-1.4_cflags.patch b/net-wireless/reaver/files/reaver-1.4_cflags.patch
deleted file mode 100644
index e4e1da718d64..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_cflags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/wps/Makefile
-+++ b/src/wps/Makefile
-@@ -1,34 +1,34 @@
--CC=gcc
-+CC?=gcc
- INC=-I../utils -I ../
- 
- all: wps_attr_build.o wps_attr_parse.o wps_attr_process.o wps.o wps_common.o wps_dev_attr.o wps_enrollee.o wps_registrar.o wps_ufd.o
- 
- wps_attr_build.o:
--	$(CC) $(INC) wps_attr_build.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_build.c -c
- 
- wps_attr_parse.o:
--	$(CC) $(INC) wps_attr_parse.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_parse.c -c
- 
- wps_attr_process.o:
--	$(CC) $(INC) wps_attr_process.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_attr_process.c -c
- 
- wps.o:
--	$(CC) $(INC) wps.c -c
-+	$(CC) $(CFLAGS) $(INC) wps.c -c
- 
- wps_common.o:
--	$(CC) $(INC) wps_common.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_common.c -c
- 
- wps_dev_attr.o:
--	$(CC) $(INC) wps_dev_attr.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_dev_attr.c -c
- 
- wps_enrollee.o:
--	$(CC) $(INC) wps_enrollee.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_enrollee.c -c
- 
- wps_registrar.o:
--	$(CC) $(INC) wps_registrar.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_registrar.c -c
- 
- wps_ufd.o:
--	$(CC) $(INC) wps_ufd.c -c
-+	$(CC) $(CFLAGS) $(INC) wps_ufd.c -c
- 
- clean:
- 	rm -f *.o
diff --git a/net-wireless/reaver/files/reaver-1.4_memset.patch b/net-wireless/reaver/files/reaver-1.4_memset.patch
deleted file mode 100644
index 782910a3f0f5..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_memset.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/crypto/md5-internal.c
-+++ b/src/crypto/md5-internal.c
-@@ -188,7 +188,7 @@
-     MD5Transform(ctx->buf, (u32 *) ctx->in);
-     byteReverse((unsigned char *) ctx->buf, 4);
-     os_memcpy(digest, ctx->buf, 16);
--    os_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
-+    os_memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
- }
- 
- /* The four core functions - F1 is optimized somewhat */
diff --git a/net-wireless/reaver/files/reaver-1.4_parallel-make.patch b/net-wireless/reaver/files/reaver-1.4_parallel-make.patch
deleted file mode 100644
index f880cd7562b4..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_parallel-make.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -16,22 +16,22 @@
- 	$(CC) $(CFLAGS) $(INC) wpscrack.c *.o $(LDFLAGS) -o reaver
- 
- libwps.o:
--	(cd $(LIBWPS_DIR) && make)
-+	(cd $(LIBWPS_DIR) && $(MAKE))
- 
- wps: libutils libcrypto
--	(cd wps && make)
-+	(cd wps && $(MAKE))
- 
- libutils:
--	(cd utils && make)
-+	(cd utils && $(MAKE))
- 
- libcrypto: libtls
--	(cd crypto && make)
-+	(cd crypto && $(MAKE))
- 
- libtls:
--	(cd tls && make)
-+	(cd tls && $(MAKE))
- 
- libiw:
--	(cd lwe && make BUILD_STATIC=y libiw.a)
-+	(cd lwe && $(MAKE) BUILD_STATIC=y libiw.a)
- 
- init.o:
- 	$(CC) $(CFLAGS) init.c -c
-@@ -93,12 +93,12 @@
- clean:
- 	rm -f *~ *.o reaver wash
- 	rm -rf *.cache config.status config.log
--	(cd utils && make clean)
--	(cd tls && make clean)
--	(cd crypto && make clean)
--	(cd wps && make clean)
--	(cd lwe && make realclean)
--	(cd $(LIBWPS_DIR) && make clean)
-+	(cd utils && $(MAKE) clean)
-+	(cd tls && $(MAKE) clean)
-+	(cd crypto && $(MAKE) clean)
-+	(cd wps && $(MAKE) clean)
-+	(cd lwe && $(MAKE) realclean)
-+	(cd $(LIBWPS_DIR) && $(MAKE) clean)
- 	rm -f Makefile config.h
- 
- cleanbin: 
diff --git a/net-wireless/reaver/files/reaver-1.4_var_db.patch b/net-wireless/reaver/files/reaver-1.4_var_db.patch
deleted file mode 100644
index de4317b59ffc..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_var_db.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -3,7 +3,7 @@ LIBWPS_DIR=libwps
- INC=-I$(LIBWPS_DIR)
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--CONFDIR=@sysconfdir@/@target@
-+CONFDIR=/var/db/reaver
- CFLAGS=-DCONF_DIR='"$(CONFDIR)"' -DREAVER_DATABASE='"$(CONFDIR)/reaver.db"' @CFLAGS@
- LDFLAGS=$(LIBWPS_DIR)/*.o wps/*.o tls/bignum.o tls/libtls.a utils/libutils.a crypto/libcrypto.a lwe/libiw.a @LDFLAGS@
- 
diff --git a/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch b/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
deleted file mode 100644
index cc9fe6b774e8..000000000000
--- a/net-wireless/reaver/files/reaver-1.4_wps_registrar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/wps/wps_registrar.c
-+++ b/wps/wps_registrar.c
-@@ -1469,7 +1469,7 @@
- 
- 	wpa_printf(MSG_DEBUG, "WPS: Building Message M4");
- 
--	wpa_printf(MSG_DEBUG, "WPS: Dev Password Len: %d", wps->dev_password_len);
-+	wpa_printf(MSG_DEBUG, "WPS: Dev Password Len: %zd", wps->dev_password_len);
- 	wpa_printf(MSG_DEBUG, "WPS: Dev Password: %s", wps->dev_password);
- 
- 	wps_derive_psk(wps, wps->dev_password, wps->dev_password_len);
diff --git a/net-wireless/reaver/files/reaver-1.6.5-confdir.patch b/net-wireless/reaver/files/reaver-1.6.5-confdir.patch
new file mode 100644
index 000000000000..d5673d82452b
--- /dev/null
+++ b/net-wireless/reaver/files/reaver-1.6.5-confdir.patch
@@ -0,0 +1,10 @@
+--- src/config.mak.in	2019-10-25 23:32:43.196353940 +0300
++++ src/config.mak.in	2019-10-25 23:32:33.935249226 +0300
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-CONFDIR=@localstatedir@/lib/@target@
++CONFDIR=@localstatedir@/@target@
+ 
+ CC=@CC@
+ CFLAGS_USER=@CFLAGS@
diff --git a/net-wireless/reaver/reaver-1.4-r3.ebuild b/net-wireless/reaver/reaver-1.4-r3.ebuild
deleted file mode 100644
index 2769fa2548fc..000000000000
--- a/net-wireless/reaver/reaver-1.4-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-inherit autotools-utils
-
-DESCRIPTION="Brute force attack against Wifi Protected Setup"
-HOMEPAGE="https://code.google.com/p/reaver-wps/"
-SRC_URI="https://reaver-wps.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	net-libs/libpcap
-	dev-db/sqlite:3
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_cflags.patch
-	"${FILESDIR}"/${P}_memset.patch
-	"${FILESDIR}"/${P}_parallel-make.patch
-	"${FILESDIR}"/${P}_var_db.patch
-	"${FILESDIR}"/${P}_wps_registrar.patch
-)
-
-src_compile() {
-	emake V=1
-
-	# doman accept only uncompressed files #619966
-	gzip -d ../docs/reaver.1.gz || die
-}
-
-src_install() {
-	dobin wash reaver
-
-	insinto "/var/db/reaver"
-	doins reaver.db
-
-	doman ../docs/reaver.1
-	dodoc ../docs/README ../docs/README.REAVER ../docs/README.WASH
-}
diff --git a/net-wireless/reaver/reaver-1.6.5.ebuild b/net-wireless/reaver/reaver-1.6.5.ebuild
new file mode 100644
index 000000000000..dd1c5685b545
--- /dev/null
+++ b/net-wireless/reaver/reaver-1.6.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="reaver-wps-fork-t6x"
+
+DESCRIPTION="Brute force attack against Wifi Protected Setup"
+HOMEPAGE="https://github.com/t6x/${MY_PN}"
+SRC_URI="https://github.com/t6x/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}/src"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-confdir.patch
+)
+
+src_install() {
+	# Upstream's Makefile does the same but in non-standard way.
+	dobin wash reaver
+
+	doman ../docs/reaver.1
+	dodoc ../docs/README ../docs/README.REAVER ../docs/README.WASH
+
+	keepdir /var/lib/reaver
+}
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
new file mode 100644
index 000000000000..2d4af5bf36ff
--- /dev/null
+++ b/net-wireless/srslte/Manifest
@@ -0,0 +1,3 @@
+DIST srslte-19.06.tar.gz 2269154 BLAKE2B 54f0bef69ebc58210b7a5cffa46e8b5fc9c2dab491c3d414847a9757f993bea1efa409edf31346e78d5b88b6076b0216b013362a66259601e6af62bee483b292 SHA512 b6b097734502f1fb0e82cd398e4c43e81f1f18a3e67fc6e0e4d84d24c2f6972483a82653daa97fe60beb313e7c4d1346d99e1fdec5554a080277a3894479ed47
+EBUILD srslte-19.06.ebuild 1013 BLAKE2B 82e268c6deb5b7d4fa7c31e4d1ff89f996846a285edc0b81012cd583018fdc6cd6b42f0a238a27840f69732e7249d74e2ebf65e214234a4d5d1ae222e432534f SHA512 470abcbcee6a0cf7d1c1b6877ef6c0e832a58fd9f7cb3f70786b1e482bf0c35fa6fdc69575e8ccfa8d8aef8a2fba7f66d4b151a722e0a6ef47149f258942c49b
+MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/metadata.xml b/net-wireless/srslte/metadata.xml
new file mode 100644
index 000000000000..04c0836aaf67
--- /dev/null
+++ b/net-wireless/srslte/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
+	<use>
+		<flag name="uhd">support Ettus Research hardware</flag>
+		<flag name="bladerf">support Nuand BladeRF hardware</flag>
+		<flag name="soapysdr">use soapysdr to support various hardware</flag>
+		<flag name="simcard">support hardware sim cards</flag>
+		<flag name="zeromq">enable zeromq message passing</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-wireless/srslte/srslte-19.06.ebuild b/net-wireless/srslte/srslte-19.06.ebuild
new file mode 100644
index 000000000000..69be1795d758
--- /dev/null
+++ b/net-wireless/srslte/srslte-19.06.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils vcs-snapshot
+
+MY_PV=${PV/./_}
+
+DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
+HOMEPAGE="http://www.softwareradiosystems.com"
+SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bladerf simcard soapysdr uhd zeromq"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/libconfig
+	net-misc/lksctp-tools
+	net-libs/mbedtls
+	sci-libs/fftw:*
+	bladerf? ( net-wireless/bladerf:= )
+	simcard? ( sys-apps/pcsc-lite )
+	soapysdr? ( net-wireless/soapysdr:= )
+	uhd? ( net-wireless/uhd:= )
+	zeromq? ( net-libs/zeromq )
+
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index f25e5d4da784..fe8b30ad5922 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,17 +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.11.46.zip 112381219 BLAKE2B 7f73cf5db1d132af85fd54dda36cb82cedddae1d3c8e84282f9dcfe0766a839f165d17a8292096bfe976ccced1e29173476de9042f96cdc2c15c4edf24ee9c65 SHA512 41b03ebbbb49089bd40e3e715d7c9a447b42a6df61a2d3551175ae55b85010fd896318909f394bb166bd7a8e9fd7611439158a8141df349acf3b4980bbe9dd6b
 DIST unifi-5.11.50.zip 112355461 BLAKE2B 5d63c3a0488a1da7ed696993982728cd1b7449d7af65ee1a49d065fd928feef5628a84d5add7d670ddc5bed3d9df2084fd0905a417cde22737dd74de15a74b39 SHA512 509e54b1237a41bea08d96eaa9efacbd45d823dc4e2d6965ac577aab159bf907378322aa6ad15a776dd0fc725a6737951f2d4cdafe073443a18e36d2d4827ead
 DIST unifi-5.11.52.zip 114092809 BLAKE2B 902dec158ba60fa424ff0b59b53776aeabc3f1ae7a9b88e549f0d62974e280b51ce5b8bb3eac150c1d75e4b0816b46bb19bd953e987bf6d8a58c3e271efdaea3 SHA512 887b25c22d7ac7a14854b95007794a63c200717fdfec791be5e1b03fe4bda1c44a05767d44f55062c691b922e54fa8c183b249407c30fb2d596906e00fa969e0
-DIST unifi-5.12.13.zip 114644574 BLAKE2B 4a2217c7696f23a7602a89bb3eaf0c58094b23331ed60f210e3626c2f194dbc272de18dd0e46fe1cc829e0adb1fb704a8b00191039573544e0111dfd1e2b6cb1 SHA512 4af685239df47891adb93afd95ad53fd89f85bc3f0c9346b91dbafabdbca57113eddb2b317a5342c93d44b250637d16d740fda34df35851f3466277abd814bac
-DIST unifi-5.12.16.zip 114676348 BLAKE2B 82d0ade4541d102648aa6938c050e23e68c91b40b35d0f5a68113f4be844f0fc5a00c82c4d7286552f7d076fc3bbe79f32b9bc8f6aa51a7609993d7cd4231c34 SHA512 e1320bfa54f6419c079d485ccf902be69de1322c5090e0b1a7f7ffec85f7ef8b3516a6e2d9571d9c2403da0444b611601037d3a211f32bee3dc8d59a6ce9f48f
+DIST unifi-5.12.19.zip 114660558 BLAKE2B bc4437e03d1cc9613456a6eaddc20cac9c294326c60e456843220dbb0b4cf4f6e97679006beb1144ae97931019c65c51f555148ff1656805dde11ef2613bdc6c SHA512 60c7ff9a8a9906aaa63650c64c8a5b7905cbe5b34c6657b5f40f38f6d96458f23c3a84bf68eb4fd1f48e3b231113a451e69afaa23233feabd4eed67f94a8c735
+DIST unifi-5.12.22.zip 114666138 BLAKE2B 836de0621a0241cfedf25d48bbd28651968ff57218cbe32f192bbac996756f4d99cbe0454e41fb4b8354d8731a7546a78c5698b1b880ccdda251c6d4dc495ada SHA512 c86b586408cc3117263d62e218d5e5ba989d120b38da42acfa8f14461b65d3e739ac8111fa3b13f2c93c0026b3b049af1e29cb7d381085ff54e596c0efe0c60e
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
-EBUILD unifi-5.11.46.ebuild 1832 BLAKE2B e47b011986e7abc36e9df65eea9fcc1fb56a19dadc78a18c74699043cd0024b7d74676efcf9882e70d19247435ce0ff8e28dcc23ea905c4562b6285aae3685be SHA512 9b9cfc432580c3ecc8b8e79f73a5549f54fb6b46b23ff29ead84b85cc360bb091b278210d57e5889b319d3fa5c0a4a066fa01f4a85eab1e12b2c443f70c33bce
-EBUILD unifi-5.11.50.ebuild 1789 BLAKE2B cef87423291b5aad60062454c901b3436e12963bc4c801467d8393e15c729aaf6b04a7ddc2e5ab3df42c1442ab0867c5af4c567002f058bac6226628f18ed939 SHA512 482c4add6b3c11cc3889f50913068edd41a3ca16a527a9454b904047aa68bf12fc90d2d8b485215d8db1bb4b9e1b7791c997fcc7dafcb13759fd568ab2ba29c9
+EBUILD unifi-5.11.50.ebuild 1788 BLAKE2B 0442f79c210215f57a7ccbb34ab3028afaeacc8fe815b9db3884d52f4258ef9c7c33f384b83fe1a1e3b799bb29e80222b9c0235b5c6cee19b3cae936555645a2 SHA512 690ab29955c3fd78bdf462409519431dd23e1eba3673dee645f152b2efc1097fceb8a94da385a40ba39983682761137c69e0511a2d7a949381a29bad86740a4b
 EBUILD unifi-5.11.52.ebuild 1789 BLAKE2B b2c72b01604753f3c95c76a58dce04c91ca396f406f94661a9950ea4dd6358b8bd24fce709c4426027e2fcc9628ae2cdde5b272694c5b2ca8b9d1051feab7513 SHA512 426d583f22031a9ec95267341dca5f38e3f60577a0560a618cd64d9169f42a4a90cb311d67e8bc70690232806dbbb3688790e784eb9ce9137a8a5a02c7ba749f
-EBUILD unifi-5.12.13.ebuild 1789 BLAKE2B 5527f3ce00ebe570486481356d384158c999cecd4ef01b82accb4034a18ca31331f28ccf5a0c3d67f42ce444806000937bbd0b84666733fac858e355c87c3789 SHA512 18b24e1a3b4b08dea056b1a8ee58c0b4282f0b9c345dc97925987bd00988c13aa7822bfe5944aa567da8efcf283fbf6b211d97986a697c353a5dcb0b516f1695
-EBUILD unifi-5.12.16.ebuild 1789 BLAKE2B d58fa10a52eff42f011eff0ad64ca095d1a9182cecbab5479a600300c15907cb359c27812cab8e539d4bbcbe4685d615b63609215ab1e777e59512a2ae779de9 SHA512 07506d368b575a65a7610b59ea61482b8648c57498628f946eb1958bb371437a6f3540634799ed963049216dbc4caa7e40d5c04f99ba8f0904fcf2f29b1616a6
-EBUILD unifi-5.6.42-r1.ebuild 1668 BLAKE2B 0db78f1241b651079c1c37326ef9c5414037c1bf192b344d55f9fd03a7af8f1cfc709f80b7257b9930f6c19d7cb77ec52e2cb5b492a571a60098436672c9514d SHA512 952253c6e51ac78796c7ee7729f75c1eaf0fa997832b60aaa7e9d73d0f6d3f444e632cd81550637733bf21ec1013d0a974edf12897dfc2fe70157403363eba86
-EBUILD unifi-5.6.42.ebuild 1721 BLAKE2B 04efda4b528074a4b01f11d9cdb45237d64ec6af9846f8d30e2c5fe1564990467f6e0e6c4fa76e77e06007239f1f338d509f5759ed9baccd93ee8f2f70b39a63 SHA512 6e1b3ae4df8cb47c142ee14e5bb92a3c21dd5a97caeaa665bba0e201a9ffefb913f24420967944c09e3dcf516c667af566ecbd7404a254146fa2022a496f6788
+EBUILD unifi-5.12.19.ebuild 1789 BLAKE2B cfe08c6073453bc9cc685572507149a31430a368120359117061595bd00d0c66e544b2b57a28d1f1c40e90bfef0073f43b39ae5e986306895768c24f9fe6c7a6 SHA512 3f3752b19d9198b9868140a785b87cfa6bdf55de25b881ad7c63d4267286f95498508aee8571b924b346b085d76f084bcd3af38e4cdc224461f237214850b4d0
+EBUILD unifi-5.12.22.ebuild 1789 BLAKE2B fca28504c7fa80b7b02cc55437baee8052608ee9a530339d94ba0d8b625932243e5ca49b858293dfd441e3ac88f827a36a112da21934a5ad87abb5a4ffb5413d SHA512 5d40cbf09540a092cc4df01e8a69da3847f421dad5da484f46569dc800b872ebdca87ab0533e137b8c9eecd5e16a349258c8e30bf4e19d0bebeb3d44ac83c68f
+EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 MISC metadata.xml 802 BLAKE2B cf4248b03b6b0f5ecee40ab09e9d7fe718c8a3478aeb5814faa489b74080b19fa20b0db05b7910523c68297d2fc00a56d4b16822367811b52fbdbd2cf707962a SHA512 8071155df75634be1db52068b17960b194f47c8a1ca38f23fe4397df8c3156123c6023cab0d33db4dce1b0763beaa096ba6f745671c3078be637dad6ef63abf5
diff --git a/net-wireless/unifi/unifi-5.11.46.ebuild b/net-wireless/unifi/unifi-5.11.46.ebuild
deleted file mode 100644
index f2852c904098..000000000000
--- a/net-wireless/unifi/unifi-5.11.46.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
-
-# Set this var for any releases except stable
-RC_SUFFIX="-a5113ebc10"
-
-inherit systemd user
-
-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.11"
-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.11.50.ebuild b/net-wireless/unifi/unifi-5.11.50.ebuild
index f6e16df92f33..4ea6772d70e6 100644
--- a/net-wireless/unifi/unifi-5.11.50.ebuild
+++ b/net-wireless/unifi/unifi-5.11.50.ebuild
@@ -12,7 +12,7 @@ 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"
+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.11"
 IUSE="systemd"
diff --git a/net-wireless/unifi/unifi-5.12.16.ebuild b/net-wireless/unifi/unifi-5.12.19.ebuild
index 61f68ecb90d9..a5c43ce46736 100644
--- a/net-wireless/unifi/unifi-5.12.16.ebuild
+++ b/net-wireless/unifi/unifi-5.12.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-949a431d7a"
+RC_SUFFIX="-98bbc5381e"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.12.13.ebuild b/net-wireless/unifi/unifi-5.12.22.ebuild
index 19b3b64c5cc5..158a4c2d1ed8 100644
--- a/net-wireless/unifi/unifi-5.12.13.ebuild
+++ b/net-wireless/unifi/unifi-5.12.22.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-a94c374f1a"
+RC_SUFFIX="-478dfbf57c"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-5.6.42-r1.ebuild b/net-wireless/unifi/unifi-5.6.42-r1.ebuild
index 0fc70f86f8ec..33839d8b5a94 100644
--- a/net-wireless/unifi/unifi-5.6.42-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.6.42-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+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.6"
 
diff --git a/net-wireless/unifi/unifi-5.6.42.ebuild b/net-wireless/unifi/unifi-5.6.42.ebuild
deleted file mode 100644
index 989ef2ce57a1..000000000000
--- a/net-wireless/unifi/unifi-5.6.42.ebuild
+++ /dev/null
@@ -1,70 +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.6"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/armhf lib/native/{Mac,Windows} || die
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}