gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /net-wireless
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
41 files changed, 1165 insertions, 475 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index be40a8209776..66177688a94f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/airsnort/Manifest b/net-wireless/airsnort/Manifest
deleted file mode 100644
index cbe6ed4fa874..000000000000
--- a/net-wireless/airsnort/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST airsnort-0.2.7e.tar.gz 208383 BLAKE2B f9cb24a695e4d53aca88a9c82d45ac0b5b1460d6ea3cd6ebde10f5afa5886aed1c775652b5d5f06b36d0af47f6a774b54828a85fdfc811d4a5fe5ae0fbf21a90 SHA512 26cd3ab037b09f410d4542693644b13d2b9f42ec2248e00a31d2b150b2940eeb2f82f3bb712665a4c32e13ae9fc124ac09f953693f6c028d5328ba3191e0735a
-EBUILD airsnort-0.2.7e.ebuild 770 BLAKE2B ca40d262f5ffbb52df63034e5397328f1db9591f2759bded540d390b94faa758687a7edd0ca6ed34b9047969e8f88731d56bbef8e28b8ed05d98bcf78cec7eec SHA512 c3904a740a26f4f9d089af844c2800f804e6a3c85b05e5e1a2a257e2f891a6e17a8c1b2ad7ed9f663be27c498daeecd855baef55efb324565333c46858bccf57
-MISC metadata.xml 245 BLAKE2B 7b925e7d2e062a89c031948b3828ba4d1c8d279074d4cd57b8488016d9117edf1ace8791199342553a683d1cc05167790256587420c0be08baf1f6a2739be95f SHA512 c0e106672c8f9f4a9f2f15a9d353a23988e43d1259915e3fd6327752b71a5d264a33338e28ffc1a12d878f725b89dd0a0bc9278145ff74239ebbc0814617d817
diff --git a/net-wireless/airsnort/airsnort-0.2.7e.ebuild b/net-wireless/airsnort/airsnort-0.2.7e.ebuild
deleted file mode 100644
index c28ca2245ee1..000000000000
--- a/net-wireless/airsnort/airsnort-0.2.7e.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="802.11b Wireless Packet Sniffer/WEP Cracker"
-HOMEPAGE="http://airsnort.shmoo.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="=x11-libs/gtk+-2*
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README README.decrypt AUTHORS ChangeLog TODO faq.txt
-}
-
-pkg_postinst() {
-	elog "Make sure to emerge linux-wlan-ng if you want support"
-	elog "for Prism2 based cards in airsnort."
-
-	elog "Make sure to emerge orinoco if you want support"
-	elog "for Orinoco based cards in airsnort."
-}
diff --git a/net-wireless/airspy/Manifest b/net-wireless/airspy/Manifest
new file mode 100644
index 000000000000..9d48cec86e42
--- /dev/null
+++ b/net-wireless/airspy/Manifest
@@ -0,0 +1,4 @@
+DIST airspy-1.0.9.tar.gz 216852 BLAKE2B 14cc4743b4398fec6fc6defe257b38c620ccca812c8e4da580fe78a99ac0e7a1b104cc05e83ba7b1423586e182da1a77d152485c515f41b4a52ff533e19d9903 SHA512 95030a39f687b0b72115d0279725845637240d8e8639fc2fb7b4b79d24be7aec85243d6d0e0643af358e7b4cf1e81b55b3c093b888411a47c7ed8a59a2aa497c
+EBUILD airspy-1.0.9.ebuild 900 BLAKE2B 2e6a8c58f8ad873e13ee9201f0627d4af1c6fc30d96fdb846895654bb668edbdf65e3abcf30d0351d4652dec2a10f356eb48b417e204fbaf331fb9e2a6c7c0c3 SHA512 0094e6e17f2beac83d216f5a6289bbdded30a0f6815ff6a82b35b9d0823584f5374b621481b93cd8af51285ecd286314316e8ca889ee9e7a331770b842ca585c
+EBUILD airspy-9999.ebuild 900 BLAKE2B 7d020b5f1307c96b7fce20f3fe0627a7bbdaf3fe82bcefa42d7d4ee1448ec432eb1bf52b262841552ff1dc32c81926ed5e818c065de377d605addba87b34d3de SHA512 e2e785451d31c9c50319b7fa450b7ff43eccef35b2fb0dc7b76beecfee8e4534d5e295fa64633c2b53ec27187228b4bb77db357329ef17a140d062d3a8b213b2
+MISC metadata.xml 269 BLAKE2B 72553e955af556b065ed027a32c4922700b4b3273f0c5636499a497c818d7c7ae4c179a4a3639c2a0489608c3467b55ebf1fd4390db5258b481a005ff00a5369 SHA512 ca3be1fc750fde8fb5bd1a183635d166118966cbf4cae4fd99a3ecbe89a1992ced91d43e6eeafba0061b84f53fb1836eedf1e1d8947b95741c12c913bfa317f6
diff --git a/net-wireless/airspy/airspy-1.0.9.ebuild b/net-wireless/airspy/airspy-1.0.9.ebuild
new file mode 100644
index 000000000000..8a12043c0517
--- /dev/null
+++ b/net-wireless/airspy/airspy-1.0.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+
+inherit cmake-utils udev
+
+DESCRIPTION="Usemode driver and associated tools for airspy"
+HOMEPAGE="http://www.airspy.com"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/airspy/host.git"
+else
+	SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/airspyone_host-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+udev"
+
+DEPEND="virtual/udev
+		virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_UDEV_RULES=$(usex udev)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use udev; then
+		udev_newrules "${D}etc/udev/rules.d/52-airspy.rules" 52-airspy.rules
+		rm -rf "${D}etc"
+	fi
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+}
diff --git a/net-wireless/airspy/airspy-9999.ebuild b/net-wireless/airspy/airspy-9999.ebuild
new file mode 100644
index 000000000000..5c680532bf97
--- /dev/null
+++ b/net-wireless/airspy/airspy-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+
+inherit cmake-utils udev
+
+DESCRIPTION="Usemode driver and associated tools for airspy"
+HOMEPAGE="http://www.airspy.com"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/airspy/host.git"
+else
+	SRC_URI="https://github.com/airspy/host/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/airspyone_host-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+udev"
+
+DEPEND="virtual/udev
+		virtual/libusb:0"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_UDEV_RULES=$(usex udev)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use udev; then
+		udev_newrules "${D}etc/udev/rules.d/52-airspy.rules" 52-airspy.rules
+		rm -rf "${D}etc"
+	fi
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+}
diff --git a/net-wireless/airsnort/metadata.xml b/net-wireless/airspy/metadata.xml
index 793fb0efdb36..48e2501c039f 100644
--- a/net-wireless/airsnort/metadata.xml
+++ b/net-wireless/airspy/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">airsnort</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
 </pkgmetadata>
diff --git a/net-wireless/bcm43xx-fwcutter/Manifest b/net-wireless/bcm43xx-fwcutter/Manifest
index 199ea9cd9465..624152a7fcf1 100644
--- a/net-wireless/bcm43xx-fwcutter/Manifest
+++ b/net-wireless/bcm43xx-fwcutter/Manifest
@@ -1,3 +1,3 @@
 DIST bcm43xx-fwcutter-006.tar.bz2 27525 BLAKE2B 447b2ea368511f9a852e3b8323cf062881d41c37ce9b812881eb50d43936d5806e8f050bb29059b43a18d623e7f314fb629991cfdd1251943d15e5a7b461a1f6 SHA512 c85352ec4a50af92e4fbfe8b3fb6aa96ae1167b02c4246a867bf4409033df320c156453a19242b52e5cdbe2fa45a472282eb148b41fc13dea20243788d89e22a
-EBUILD bcm43xx-fwcutter-006.ebuild 970 BLAKE2B 3187c3187fe1cfbd4ad22412e1b1d005cb246de554fc81f4f7ec8c58e0db335e7bc3a52623ec913df2711d45ebad2c1868ed0dc17d50816c97392469e96ea564 SHA512 6906cc8c518f8dca67d50be3e9fa6d342002b21125f8fd89e2e02c5817eef00100a0a966f41a005255ede82091edbed983dc506bcafad65ace4cb6a040ae67fb
+EBUILD bcm43xx-fwcutter-006.ebuild 939 BLAKE2B ac9973029b3498f0a518db29dfcd5a5ee9a2b17bc501d2dfa2efbc3cf0c6a8b02b8bf5e506898b68aedc863d80cd6402fce8d4b9f0ccd3f1bed12bc0cdbb2118 SHA512 bd394730752005013e64a1180b312df5c8cae4a5d64555b6955c4173cf71e8c9aed858e61f0edb0d10b0c897eb408060c542ad2ddcd1e7791ca8481c94196d9d
 MISC metadata.xml 245 BLAKE2B 8e07a60629de7eebe0a80961485b0b014d1c34c4eaa1c1bea11bfe52743c699420920d6ff5e856875db644f5b896eacf68acb2ee8c1b412293b76b1d0cbdc79c SHA512 7d4de8859d1163ce6df658785501e0b7355a8eb06916e3c5f5c76e21f56c336d040ede25630068a0af983ae9eeb48ac2dbb6b2f3822f9a5e6e6bd8092e60b6cb
diff --git a/net-wireless/bcm43xx-fwcutter/bcm43xx-fwcutter-006.ebuild b/net-wireless/bcm43xx-fwcutter/bcm43xx-fwcutter-006.ebuild
index 0cf29ec49d4a..de0ef52c8c2f 100644
--- a/net-wireless/bcm43xx-fwcutter/bcm43xx-fwcutter-006.ebuild
+++ b/net-wireless/bcm43xx-fwcutter/bcm43xx-fwcutter-006.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=0
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://bcm43xx.berlios.de"
 #SRC_URI="mirror://berlios/bcm43xx/${P}.tar.bz2"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ppc ~ppc64 ~x86"
 IUSE=""
 
 src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
@@ -27,15 +27,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! [ -f /lib/firmware/${PN}_microcode2.fw ]; then
-		echo
-		einfo "You'll need to use bcm43xx-fwcutter to install the bcm43xx firmware."
-		einfo "Please read the bcm43xx-fwcutter readme for more details:"
-		einfo "README in /usr/share/doc/${P}"
-		echo
+	if [[ ! -f ${EROOT}/lib/firmware/${PN}_microcode2.fw ]]; then
+		elog "You'll need to use bcm43xx-fwcutter to install the bcm43xx firmware."
+		elog "Please read the bcm43xx-fwcutter readme for more details:"
+		elog "README in /usr/share/doc/${PF}"
+		elog
 	fi
 
-	einfo "Please read this forum thread for help and troubleshooting:"
-	einfo "https://forums.gentoo.org/viewtopic-t-409194.html"
-	echo
+	elog "Please read this forum thread for help and troubleshooting:"
+	elog "https://forums.gentoo.org/viewtopic-t-409194.html"
 }
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 1cea57214d3c..78a0627f2e9b 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.1.tar.xz 950296 BLAKE2B 10113bf9bd6744d6aaa5e4d0912d87ba11ace36027acfb10802988ad7c7458dbe2c092095148277f437a8dac68f93c017da53a0925a2c3e8c24e0400db567c87 SHA512 bde7dffc369a7204e2c0e05005f3c1cb97760b3d8625342fe69a5b5c729d6b90eabeca37c679c56f73499f1dbc17ccc15800b4e6e48e717f0e306083525981e9
-EBUILD blueman-2.1.1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
-EBUILD blueman-9999.ebuild 2757 BLAKE2B 30cb997a1c7473786e45728aa447c1c3b3329d8285033b26115bd29342b731201747ce80eb45004df82f5661fdc534c1ecb2ce37363ed5409500ad86bb604ed5 SHA512 02cb66900dddb5a3cecd25c24f20eef45daea1eae5f6fde4b44e17da5e795c530e6ed00c5a89a2ff7620409d152cccb752a6fef05668b8757e404e5ec04469e1
+EBUILD blueman-2.1.1.ebuild 2826 BLAKE2B 38500885fb7dfaf750539b65cf95c7e026ac299333afa19e69b5b8654aca8b5d5704802a29f79724d2624792f8c1ec2741a1d93214e03a5f3e99691f6420d43e SHA512 1eaf03b851010782da3e605ed7483ac5dcd12b622ad2da7decf07e8790dfc309f46bba28378010a4d8db5e92f817f683ee1b81bd30845e0cb15df356dbb64c84
+EBUILD blueman-9999.ebuild 2803 BLAKE2B ea725ce4274ab2492c619cf0635d5bd23ccba7779d95270f5b30d339985fbc4f8ddc1a98293afcfae81163bef4b96d5af7b65a18a7545b16b86114adc624c6da SHA512 17992351025084a18b019e9709057c0123a6f6c49beb26bcc78d54955fd843c4f34bd6fb086701218f59da48fe01d02cee4b0f1ad74f4d2dc464a09c1eae4c40
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1.1.ebuild b/net-wireless/blueman/blueman-2.1.1.ebuild
index 6f86023ac9c9..afa7dd91ce10 100644
--- a/net-wireless/blueman/blueman-2.1.1.ebuild
+++ b/net-wireless/blueman/blueman-2.1.1.ebuild
@@ -4,13 +4,13 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit gnome2-utils linux-info python-single-r1 systemd xdg-utils
+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 autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
 	KEYWORDS=""
 else
@@ -78,7 +78,8 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	# replace py-compile to fix py3
+	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
 }
 
 src_configure() {
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 685f3219bdb6..4e3c0edd40da 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -4,13 +4,13 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit gnome2-utils linux-info python-single-r1 systemd xdg-utils
+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 autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
 	KEYWORDS=""
 else
@@ -76,7 +76,8 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ ${PV} == 9999 ]] && eautoreconf
+	# replace py-compile to fix py3
+	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
 }
 
 src_configure() {
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 873f26986134..23563f052fa1 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,23 +1,18 @@
-AUX 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch 1907 BLAKE2B f930b3a5d1b928ec89f08a07c25acc4f0c77b43de1e389583a1d86b3b9e542ceb9d67a5d938fcddc91df7b2fff0364fb01b10a12c7a6606cba6ef0045b935d6c SHA512 17a0967ac291be3822e2be73912ab4c1720564bdce0765582e54bc0347d0477d38f82dbf0db9d660f982c35b3c2ea13dd37b22e18223d36745306c4c9d859423
 AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r1.patch 1909 BLAKE2B a4929ea456e63bb9e0de76885c4de9ffc7082bf869f46be61bba11c351a3de471b9fc93a4b2f094243f5d4c3bc172a9ff98c26c6d3530b75264cd64d6fade7a2 SHA512 5b278d603632685e31eeda6fe0bf32bd59536c6d8f2af221c3e39aa4a26bcbb6cb25d75822dbcf0a2ffb43f645b73a17bff1b62f40815c0f6243391ce24f5813
+AUX 0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1912 BLAKE2B c7226ccbf1b794b5f3d6504dcb6950bc7e7bd69995243d0e4cf30dfb161f95e15c18c96724f82916e8c83cac6ff255ed957b60c9ee9ad53e108c69eb509074d5 SHA512 65a970fa82ded9f6e97ef2f0d856010f96468cbd375447e1c47d6073be5a364f747b7b5ea93a0bc3b7dba0470dc8dccd9b5d1f6567f18b38042e424d3e06171b
 AUX 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch 1252 BLAKE2B ce6d00ea244d91e76b696e60ddb9096aa48572b68474f321f05b0e3e9525932e6fdaeacc3b141dc4b118d5fa305b7a0510e9c57c935e489a9c159dcd826ad870 SHA512 774f1d9cd49dd3fc0e9f02ad93876c59d78f88f149591f384cf5d2e3541d237ce390552c8bc2cb4d4ad7e5dcc295df49220565f0b0e686a2f8b3404f68323d32
-AUX 0004-agent-Assert-possible-infinite-loop.patch 583 BLAKE2B 22cd0d0b4c6c1859631e31bba434f368a1cec07128aa69ecb9003734292aa1349b5dfad87b0ac35e79d089459dd24ecc8cb8f7bd0147c52b2284c2340884ee93 SHA512 f3af46b27180f500c3f978799633b7a01a9d7720eafdb7a9fb108684161616b976b42d135a2358785830c26642ef7c2175d0f1fa3d6df898fe3bd5e77f6a191d
 AUX 69-btattach-bcm.rules 2141 BLAKE2B 07fe8306e29f05082a603bd5a4b9d51c8c23b4ed48eaeebd01591970c0e29ea37198abaa8725023fd00cd38c67451910b6028d6725be3aca5ed1c495e02555ee SHA512 ecf535d737b9f1dc7a077f2a13e3712c959c505a93c24f48d63b04db0d42f8feef3918d48b7db5e8e115574a9b62f47aaa9c3e77230cff682d3f35da2f09047e
 AUX bluetooth-init.d-r4 280 BLAKE2B ecb807dec050b7c754e87b43848292ffd68afb36465739462208d1564c59d59b3c8801dca5f9ba8547efc982d972cdaeef340403c82c9fa1ad8922b0396d29bd SHA512 05fd235483c65decc8badeca1b3ec60ae59f4881cc9125f6b148afe2cbc269a636df620b6bab72ce20b6b265c73074b1afef1029aecd884dc1dbb2694c0d16d9
 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
 AUX btattach-bcm-service.sh 935 BLAKE2B cae7d78269b56038883ff74ddc7c5a3238fe4399a37cbba5c414d0396f2aff7c2a4965b56a1125dc8568e7bc848011106ab993e4c1211e704f485259373ab65a SHA512 259d10df16f4b23364da971063345b25cbf7c6a1b9f2576d3ecbd48620675392601cba017a591af1f44fe8eff8ea0c8cabeafa8adbddeb3e1014f428d37d1690
 AUX btattach-bcm_at.service 132 BLAKE2B 0af9a066a8d08d917fe80676f460297e244152d88ee02774b1e30c50febdb3fa9838c3818b80fbbf9248020dce4e1e33e2babf15a18609fddc1fd61465ecb6ed SHA512 ca6c89a676386cdaad6bfdd8a80062abe217ebd2b4484a125e4b5d0832b2c03ebed986f1806ff785664c99e1244bc164f1d152e5015fc87e46f2f6d847567b29
-DIST bluez-5.50-fedora-backports.tar.xz 32232 BLAKE2B 35244036bbe18481e32bef2dcd4a223d44442ce28cee85a3a736bfbf5ee9d74372fa6366dc1102bf86babada608966a8c30b1c2537859a3741c289cabbc76026 SHA512 6d33e8bc67e50dc0d4cee3fa080402a51ddc8b6549f19b6c272de7dc51604eab23f909322f01aaca8a834abdc3cfd0bf24bb8623071af0cf0611d7427c9d8e9a
-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-r1.ebuild 9434 BLAKE2B b8e40bb9cc3957cdf5e108cf63e65b41f76c8da6e1d3aab12993cdd37e35cefc0eb8a3229fc47f67e5a414e596d69f4063d491a6c61bc38382cb4a0eab861ba7 SHA512 689e1eb8767450445196b30b5c0c8549b4fd92ade581362f62e9a0516a58c8d5f7134478aa2d37a7f3f56eb47f465df4d241cd135d1b6e9cfdc3eab7025e132e
+DIST bluez-5.52.tar.xz 1957504 BLAKE2B 670cdfb44eca1b184c0bd678bab34116f9172394b86fb69fa454f7bdcc1ae82c466a806879ddef96dddd6ae6cd31466b48f9e87113d43144659ae0c057b9def8 SHA512 9024481910d1dee85578bf3d7a4fc4be2bece516e6216c91aa1a7ac18537f092b47c41c4a5506ddd7e279599d58002e98203c5439745c01df4dbc22a75234c84
+EBUILD bluez-5.51-r2.ebuild 9276 BLAKE2B 875f4446babaf4912b041012330c29f15e3f33a67e518fcbbc401dc921844746a43add85a345eea75856278415aa58c328024ab471a310ba80693139cca0d0e1 SHA512 c3ebd26b81c88e1b0854cfc413df883ccfd3081be6d86a6a1b04bd65ae9f85ff195636f32e6125db7ad05c8650c6ac527804bf6e955be2560dc4a0468b60a922
 EBUILD bluez-5.51.ebuild 9260 BLAKE2B a78010b25abe822fa29daaa7bdb2fc750291ae967d4b369648b0c6f70fcab7ab60e1a610842f5304c5be2a3f64d84a7bec1a9e8abe9ada41e565ace6cb28c59e SHA512 42dfce2e99346621955ad32e19307e7f9b303a14e5f89b77a9d581133e73881260633acb6a0d8fb9b8e32192eac8a13efdb30e4cdc03d4bcd169760139f428d6
+EBUILD bluez-5.52.ebuild 8929 BLAKE2B 0ed238327ed0fcad43302382b3354960240470f5f3743aec506559880d12aaaaf7f3a2a9f238bb3b8255c355e5825b21635d9c2e74de50e4c740d4f06298e245 SHA512 126af2e44c535f1297b383ff732f92f117fdf8a9f5a9ff71e7b78bf62007a647967fc8d6c21274657a384429a4d6440f67062e66cb8d198784b5bb23a6d730aa
 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-r2.ebuild
index 1bf47c399e05..4dbfa735e30e 100644
--- a/net-wireless/bluez/bluez-5.51-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.51-r2.ebuild
@@ -65,10 +65,6 @@ PATCHES=(
 	# 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
@@ -102,7 +98,7 @@ src_prepare() {
 
 	# 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
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
 	fi
 
 	if use cups; then
diff --git a/net-wireless/bluez/bluez-5.50-r3.ebuild b/net-wireless/bluez/bluez-5.52.ebuild
index e6f8139acd8a..0529ab680d52 100644
--- a/net-wireless/bluez/bluez-5.50-r3.ebuild
+++ b/net-wireless/bluez/bluez-5.52.ebuild
@@ -2,20 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
 PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 systemd udev user multilib-minimal
+
+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
-	https://dev.gentoo.org/~pacho/${PN}/${P}-fedora-backports.tar.xz
-"
+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
@@ -38,10 +35,10 @@ BDEPEND="
 DEPEND="
 	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
 	>=sys-apps/hwids-20121202.2
-	btpclient? ( >=dev-libs/ell-0.3 )
+	btpclient? ( >=dev-libs/ell-0.26 )
 	cups? ( net-print/cups:= )
 	mesh? (
-		>=dev-libs/ell-0.3
+		>=dev-libs/ell-0.26
 		dev-libs/json-c:=
 		sys-libs/readline:0=
 	)
@@ -60,27 +57,17 @@ RDEPEND="${DEPEND}
 	test-programs? ( ${TEST_DEPS} )
 "
 
-PATCHES=(
-	# Fix missing header (fixed in 'master')
-	"${FILESDIR}"/${P}-btpclient-header.patch
-
-	# Fix switch to A2DP sink profile
-	"${FILESDIR}"/${P}-sink-connect.patch
+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
-
 	# Fedora patches
 	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
 	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# ???
-	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
 )
 
 pkg_setup() {
@@ -100,12 +87,9 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Apply Fedora backports
-	eapply "${WORKDIR}"/${P}-fedora-backports/*.patch
-
 	# 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-sessio.patch
+		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
 	fi
 
 	if use cups; then
@@ -115,6 +99,7 @@ src_prepare() {
 	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
@@ -153,10 +138,12 @@ multilib_src_configure() {
 		--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) \
@@ -198,9 +185,14 @@ multilib_src_install() {
 			# 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
-			dobin tools/btmgmt
+			# https://bugzilla.redhat.com/show_bug.cgi?id=1699680
+			dobin tools/avinfo
 		fi
 
 		# Not installed by default after being built, bug #666756
@@ -208,20 +200,22 @@ multilib_src_install() {
 
 		# Unittests are not that useful once installed, so make them optional
 		if use test-programs; then
-			# example-gatt-client is the only one needing
-			# python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3
-			# for runtime
+			# 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-includeHEADERS \
+			install-pkgincludeHEADERS \
 			install-libLTLIBRARIES \
 			install-pkgconfigDATA
 	fi
@@ -240,7 +234,7 @@ multilib_src_install_all() {
 		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
 	fi
 
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 
 	keepdir /var/lib/bluetooth
 
@@ -251,17 +245,37 @@ multilib_src_install_all() {
 	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."
+	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/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
index 1ea3e6f3e0c1..dcebaa007bc1 100644
--- a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch
@@ -20,11 +20,11 @@ index 3760867..142e7c3 100644
 +++ b/Makefile.obexd
 @@ -2,12 +2,12 @@
  if SYSTEMD
- systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunitdir = $(SYSTEMD_USERUNITDIR)
  systemduserunit_DATA = obexd/src/obex.service
 +endif
  
- dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
 -endif
  
@@ -51,7 +51,7 @@ index 0000000..9c815f2
 @@ -0,0 +1,4 @@
 +[D-BUS Service]
 +Name=org.bluez.obex
-+Exec=@libexecdir@/obexd
++Exec=@pkglibexecdir@/obexd
 +SystemdService=dbus-org.bluez.obex.service
 -- 
 1.8.3.1
diff --git a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch b/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
deleted file mode 100644
index 2746e0cdd2cb..000000000000
--- a/net-wireless/bluez/files/0004-agent-Assert-possible-infinite-loop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 67e5477687a2753d3f7b300bcfdc74464d8ad41f Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Mon, 9 Dec 2013 18:04:56 +0100
-Subject: [PATCH 4/5] agent: Assert possible infinite loop
-
----
- src/agent.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/agent.c b/src/agent.c
-index bcba969..b292881 100644
---- a/src/agent.c
-+++ b/src/agent.c
-@@ -203,6 +203,8 @@ void agent_unref(struct agent *agent)
- 	if (agent->ref > 0)
- 		return;
- 
-+	g_assert (agent->ref == 0);
-+
- 	if (agent->request) {
- 		DBusError err;
- 		agent_pincode_cb pincode_cb;
--- 
-1.8.4.2
-
diff --git a/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch b/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch
deleted file mode 100644
index 61a8e6a37424..000000000000
--- a/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nuar bluez-5.50/tools/btpclient.c bluez-5.50-fixed/tools/btpclient.c
---- bluez-5.50/tools/btpclient.c	2018-03-10 17:37:07.000000000 +0200
-+++ bluez-5.50-fixed/tools/btpclient.c	2018-11-18 09:54:38.916794492 +0200
-@@ -29,6 +29,7 @@
- #include <stdlib.h>
- #include <assert.h>
- #include <getopt.h>
-+#include <signal.h>
- 
- #include <ell/ell.h>
diff --git a/net-wireless/bluez/files/bluez-5.50-sink-connect.patch b/net-wireless/bluez/files/bluez-5.50-sink-connect.patch
deleted file mode 100644
index 2093b69a6554..000000000000
--- a/net-wireless/bluez/files/bluez-5.50-sink-connect.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 477ecca127c529611adbc53f08039cefaf86305d Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Tue, 26 Jun 2018 13:37:33 +0300
-Subject: policy: Add logic to connect a Sink
-
-If HFP/HSP HS connects and the device also supports a Sink connect it
-as well since some devices (e.g. Sony MW600) may not connect it
-automatically.
----
- plugins/policy.c | 39 +++++++++++++++++++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
-diff --git a/plugins/policy.c b/plugins/policy.c
-index 1f5a506a2..de51e58b9 100644
---- a/plugins/policy.c
-+++ b/plugins/policy.c
-@@ -297,6 +297,42 @@ static void sink_cb(struct btd_service *service, btd_service_state_t old_state,
- 	}
- }
- 
-+static void hs_cb(struct btd_service *service, btd_service_state_t old_state,
-+						btd_service_state_t new_state)
-+{
-+	struct btd_device *dev = btd_service_get_device(service);
-+	struct policy_data *data;
-+	struct btd_service *sink;
-+
-+	/* If the device supports Sink set a timer to connect it as well */
-+	sink = btd_device_get_service(dev, A2DP_SINK_UUID);
-+	if (sink == NULL)
-+		return;
-+
-+	data = policy_get_data(dev);
-+
-+	switch (new_state) {
-+	case BTD_SERVICE_STATE_UNAVAILABLE:
-+		break;
-+	case BTD_SERVICE_STATE_DISCONNECTED:
-+		break;
-+	case BTD_SERVICE_STATE_CONNECTING:
-+		break;
-+	case BTD_SERVICE_STATE_CONNECTED:
-+		/* Check if service initiate the connection then proceed
-+		 * immediately otherwise set timer
-+		 */
-+		if (old_state == BTD_SERVICE_STATE_CONNECTING)
-+			policy_connect(data, sink);
-+		else if (btd_service_get_state(sink) !=
-+						BTD_SERVICE_STATE_CONNECTED)
-+			policy_set_sink_timer(data);
-+		break;
-+	case BTD_SERVICE_STATE_DISCONNECTING:
-+		break;
-+	}
-+}
-+
- static gboolean policy_connect_tg(gpointer user_data)
- {
- 	struct policy_data *data = user_data;
-@@ -615,6 +651,9 @@ static void service_cb(struct btd_service *service,
- 		controller_cb(service, old_state, new_state);
- 	else if (g_str_equal(profile->remote_uuid, AVRCP_TARGET_UUID))
- 		target_cb(service, old_state, new_state);
-+	else if (g_str_equal(profile->remote_uuid, HFP_HS_UUID) ||
-+			g_str_equal(profile->remote_uuid, HSP_HS_UUID))
-+		hs_cb(service, old_state, new_state);
- 
- 	/*
- 	 * Return if the reconnection feature is not enabled (all
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/net-wireless/bluez/files/bluez-udevadm-path.patch b/net-wireless/bluez/files/bluez-udevadm-path.patch
deleted file mode 100644
index f9bbac5b9879..000000000000
--- a/net-wireless/bluez/files/bluez-udevadm-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tools/hid2hci.rules
-+++ b/tools/hid2hci.rules
-@@ -20,6 +20,7 @@
- # Unfortunately the only event seen is the BT device disappearing, so the mouse
- # device needs to be chased down on the USB bus.
- ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", ATTR{idVendor}=="413c", \
-+  ENV{REMOVE_CMD}="/usr/bin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"     \
-   ENV{REMOVE_CMD}="/sbin/udevadm trigger --action=change --subsystem-match=usb --property-match=HID2HCI_SWITCH=1"
- 
- # CSR devices
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f3fc8a024b8b..36213be94d40 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,7 +1,9 @@
+AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 DIST hostapd-2.8.tar.gz 2169018 BLAKE2B 29e331d8ebb52732d2548734fe9ea55d8401826da7a35962705335da7d81232c785ffa89d77e8ee848148d82bea1d9141cc4d515706eebacb267754829cf7ed6 SHA512 5a352517470912bcb87755a592238eac2d814a7089d4ba1ecb7969f172dbb746a4e9a6c0d47c0d7c4a6a86b04b14ac39147d729fdf3163371c1067490a4897aa
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.8.ebuild 6682 BLAKE2B f7b0f129334d7d784f89de6fbcc2086f347ad740ba2daec570f721c109871239cbf6fd4f2d894d358b128cc497d368046aa05a6e0a6705f7ba79d5ca98a69416 SHA512 e23c2e753f91b69da5e4b5fa49b9683c92c8df5af17f5d457f2e8639fb0cee1f96490a81d914d592dc3fb74ad61d0e79528045edb401d33c8828045ebc4f7e08
+EBUILD hostapd-2.9-r1.ebuild 6805 BLAKE2B 130361475a2ca8c701cf2ea30514b814fb3100bac8e75d7d3247c439db34ab920f2369ed816881c689894b7851499f0745b81616baecea728363fdb5e50f6a43 SHA512 b769616c2eb438d19fb812ac77a348c94fbf6ef0262fcf6f743557805482459fee6b07355fb4af9260cbcf52e7db32ee1931cc022ee4c8e0bc568ab6ac3e2a1a
 EBUILD hostapd-2.9.ebuild 6683 BLAKE2B ae53db361d4e846f2c1f08960235d69dda3d4162c9a261fa144dcb623751c9dec68285d00821e40afa707cffc08fc2474d47f7e28fee4fb1dc01425237a21571 SHA512 7912df1d03950951f7c5b80eaa262717939ac6347ecb0becf3e71bd81aa891a57ad16dec174c86d8a34cc2e5253d27cb9f7e4beb42887f784b9d05f733d484ee
 EBUILD hostapd-9999.ebuild 6687 BLAKE2B d9c80e418f9f19e44afe890ab9251ea0b3eba6e4c852ba2bb25ad17466801de9c4e52f960f3baa13be1b3de49a7cb7188ca9c23fe1b2128fdbd74e2e6a9e03f0 SHA512 f8f78876354cd9501d4260309b526c61c1e2d6b501f27fd539ff50a6c651f5fbf482be730360fffd4c8d168096349e15053eb8d21939f7dc5c4e33568af2b5ea
 MISC metadata.xml 1055 BLAKE2B f04ae6c0be8dbf9385cc0ce306a3aee69c0c07370e6574a88804ba0ed4cef38c81ec61ca6cac9b1810ce5d07ce6bd97f0dfec23b4737c4b092a12cda95799994 SHA512 afc6a14a55d177190797a6483fde1e6ea397ed43b60faf9d3bb919e5c9c68aaa75238d73a8e15d3a3450d916c6b5d9bc2cd8cf75fc4592cc99220128152a5867
diff --git a/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch b/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
new file mode 100644
index 000000000000..d764a9db016c
--- /dev/null
+++ b/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
@@ -0,0 +1,73 @@
+From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Thu, 29 Aug 2019 11:52:04 +0300
+Subject: [PATCH] AP: Silently ignore management frame from unexpected source
+ address
+
+Do not process any received Management frames with unexpected/invalid SA
+so that we do not add any state for unexpected STA addresses or end up
+sending out frames to unexpected destination. This prevents unexpected
+sequences where an unprotected frame might end up causing the AP to send
+out a response to another device and that other device processing the
+unexpected response.
+
+In particular, this prevents some potential denial of service cases
+where the unexpected response frame from the AP might result in a
+connected station dropping its association.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/ap/drv_callbacks.c | 13 +++++++++++++
+ src/ap/ieee802_11.c    | 12 ++++++++++++
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 31587685fe3b..34ca379edc3d 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ 			   "hostapd_notif_assoc: Skip event with no address");
+ 		return -1;
+ 	}
++
++	if (is_multicast_ether_addr(addr) ||
++	    is_zero_ether_addr(addr) ||
++	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
++		/* Do not process any frames with unexpected/invalid SA so that
++		 * we do not add any state for unexpected STA addresses or end
++		 * up sending out frames to unexpected destination. */
++		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
++			   " in received indication - ignore this indication silently",
++			   __func__, MAC2STR(addr));
++		return 0;
++	}
++
+ 	random_add_randomness(addr, ETH_ALEN);
+ 
+ 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index c85a28db44b7..e7065372e158 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
+ 	fc = le_to_host16(mgmt->frame_control);
+ 	stype = WLAN_FC_GET_STYPE(fc);
+ 
++	if (is_multicast_ether_addr(mgmt->sa) ||
++	    is_zero_ether_addr(mgmt->sa) ||
++	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
++		/* Do not process any frames with unexpected/invalid SA so that
++		 * we do not add any state for unexpected STA addresses or end
++		 * up sending out frames to unexpected destination. */
++		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
++			   " in received frame - ignore this frame silently",
++			   MAC2STR(mgmt->sa));
++		return 0;
++	}
++
+ 	if (stype == WLAN_FC_STYPE_BEACON) {
+ 		handle_beacon(hapd, mgmt, len, fi);
+ 		return 1;
+-- 
+2.20.1
+
diff --git a/net-wireless/hostapd/hostapd-2.9-r1.ebuild b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
new file mode 100644
index 000000000000..fd161a188961
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.9-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi"
+EXTRAS_VER="2.7-r2"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+
+if [[ $PV == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
+	else
+		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
+	fi
+	# Never stabilize snapshot ebuilds please
+	KEYWORDS="amd64 ~arm arm64 ~mips ~ppc x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	kernel_linux? (
+		dev-libs/libnl:3
+		crda? ( net-wireless/crda )
+	)
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
+src_unpack() {
+	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	# Allow users to apply patches to src/drivers for example,
+	# i.e. anything outside ${S}/${PN}
+	pushd ../ >/dev/null || die
+	default
+	#CVE-2019-16275 bug #696032
+	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+	popd >/dev/null || die
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf" || die
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+	if use internal-tls && ! use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
+		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
+	echo "CONFIG_FST=y" >> ${CONFIG}
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
+
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	emake V=1
+
+	if use libressl || ! use internal-tls; then
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
+	fi
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+	fperms -R 600 /etc/${PN}
+
+	dosbin ${PN}
+	dobin ${PN}_cli
+
+	if use libressl || ! use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
+
+	doman ${PN}{.8,_cli.1}
+
+	dodoc ChangeLog README
+	use wps && dodoc README-WPS
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/${PN}.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/${PN}
+	fi
+
+	save_config .config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/${PN}."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	einfo "the kernel source for the mac80211 driver. You should "
+	#	einfo "re-emerge ${PN} after upgrading your kernel source."
+	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
+}
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 13d6834447e2..23a77472ee3b 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -8,5 +8,5 @@ EBUILD iwd-0.21.ebuild 3824 BLAKE2B 2e8b98874265758ab013bec9be6ca070acfc91efd4bf
 EBUILD iwd-0.22.ebuild 3923 BLAKE2B 9907dd60efc4a6ee1084d675a830fba740acf0ae0a59283f93a4164ec14b0246ca27478a0b9850f89eb61d910dc2a55eabb940d7e205dac8d7e00918bab914b2 SHA512 7b7dd5b92438176bf3e091fdfef2a861c74b2a0f578cc2ac3429c235d8672972cb5d1eeb3d4cedef1f02766351ac259e444b8f4af49fac1f1af248771b34336a
 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
+EBUILD iwd-9999.ebuild 4300 BLAKE2B 70651fa1c8f013f41a8b4a8590019d6c09b9d34089b586accf84924ac97b23391f73200e67f2fe737d49d133974cecd17dbb5f7fbbce758cf69ff2b8db465cea SHA512 23e9ef6f4f4c31d7fd68dc3e4947b0fd0cbed493288906c47c46964a45710d93607dcc020490f286a7643bdfda7c63c5a7a694cf1ea447395917d2d918640aab
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index bef22a920493..1726ba28286c 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -123,14 +123,14 @@ src_prepare() {
 src_configure() {
 	append-cflags "-fsigned-char"
 	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var \
-		$(use_enable client) \
-		$(use_enable monitor) \
-		$(use_enable ofono) \
-		$(use_enable wired) \
-		--enable-systemd-service \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d" \
+		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
+		$(use_enable client)
+		$(use_enable monitor)
+		$(use_enable ofono)
+		$(use_enable wired)
+		--enable-systemd-service
+		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
+		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
 		--with-systemd-networkdir="$(systemd_get_utildir)/network"
 	)
 	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest
index 5d10cd2a0bf2..3ccd32a55e79 100644
--- a/net-wireless/nanovna-saver/Manifest
+++ b/net-wireless/nanovna-saver/Manifest
@@ -1,2 +1,4 @@
-EBUILD nanovna-saver-9999.ebuild 624 BLAKE2B b1e4f0267e973e44ba3d8a6c5f8a91acdc617687e3fb557e2a1809cb61e708d14cb097ffab96b69a530adb975e7132b2f2bac69a94a54260a9d74de1f380d67b SHA512 bba9f097ca18a344c5da2195f9c1facf2cc43dbdc692786a4466ba872dc37d8d0089ffcbba281dc70d93f29e7889a53642fab282610dd75f8873dc3cbef526c3
+DIST nanovna-saver-0.1.5.tar.gz 96346 BLAKE2B e3ae93df4c732f27dc7781068b6fba3abda81b84b1663953ddf5cbc043e45c273ccc1f25c81f0c02180ebfad8e0cd0d65411fc75f2c7124cfeed8b7ff0b71aff SHA512 cb230f17f45bff77bb60700e5a32d8fd577cfa2603a3bde03dbdebd20bc0c5c2acc1546560a08d0cb3c1abce5e7e6aef067e3805d5ec09e70aefb9e1a1f3a164
+EBUILD nanovna-saver-0.1.5.ebuild 713 BLAKE2B c1f93aac370127d2674fe24199416559e1d1753af4a50385ab45dd0e181c9317f30bbec4041a574ab1c93eb05bdaf9c45c05d1e2415653d2c93012ed4684ddbf SHA512 dedfad56370e346869ef44ecad4ccc7a3ba947f383026ba77d55a88c8055751141bf296ba2f016314db866dfd355c0e5d3fde8e7c1bf13635187eb42d7a28f06
+EBUILD nanovna-saver-9999.ebuild 713 BLAKE2B c1f93aac370127d2674fe24199416559e1d1753af4a50385ab45dd0e181c9317f30bbec4041a574ab1c93eb05bdaf9c45c05d1e2415653d2c93012ed4684ddbf SHA512 dedfad56370e346869ef44ecad4ccc7a3ba947f383026ba77d55a88c8055751141bf296ba2f016314db866dfd355c0e5d3fde8e7c1bf13635187eb42d7a28f06
 MISC metadata.xml 432 BLAKE2B a8869193d052dd0ec1fcae10641b19f61fe2faa2bfde6e60f9758b4da9620a316e9b318d11c778fcb0c1de1a2537f98587a8ec928bb814ae53b0160deef18be7 SHA512 0727e758f3cfd75ee8b54ac05636228fe6422ae5b8a0b0eb37f475abc075d30765b3452a05c9e99c56b8a25c378bebfce69462906910c86254f586203640dffe
diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
new file mode 100644
index 000000000000..eeb9302e2479
--- /dev/null
+++ b/net-wireless/nanovna-saver/nanovna-saver-0.1.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
+HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
+SRC_URI=""
+
+LICENSE="GPL-3+"
+SLOT="0"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND=""
diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
index 96b4a3691d7b..eeb9302e2479 100644
--- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
+++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_7 )
-inherit git-r3 distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA"
 HOMEPAGE="https://github.com/mihtjel/nanovna-saver"
@@ -11,8 +11,13 @@ SRC_URI=""
 
 LICENSE="GPL-3+"
 SLOT="0"
-EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
-KEYWORDS=""
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git"
+else
+	SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 IUSE=""
 
 DEPEND=""
@@ -21,8 +26,3 @@ RDEPEND="${DEPEND}
 	dev-python/PyQt5[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]"
 BDEPEND=""
-
-src_prepare() {
-	sed -i 's#==5.11.2##' setup.py
-	default
-}
diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index 2d4af5bf36ff..77c39e4eb4a6 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,3 +1,3 @@
-DIST srslte-19.06.tar.gz 2269154 BLAKE2B 54f0bef69ebc58210b7a5cffa46e8b5fc9c2dab491c3d414847a9757f993bea1efa409edf31346e78d5b88b6076b0216b013362a66259601e6af62bee483b292 SHA512 b6b097734502f1fb0e82cd398e4c43e81f1f18a3e67fc6e0e4d84d24c2f6972483a82653daa97fe60beb313e7c4d1346d99e1fdec5554a080277a3894479ed47
-EBUILD srslte-19.06.ebuild 1013 BLAKE2B 82e268c6deb5b7d4fa7c31e4d1ff89f996846a285edc0b81012cd583018fdc6cd6b42f0a238a27840f69732e7249d74e2ebf65e214234a4d5d1ae222e432534f SHA512 470abcbcee6a0cf7d1c1b6877ef6c0e832a58fd9f7cb3f70786b1e482bf0c35fa6fdc69575e8ccfa8d8aef8a2fba7f66d4b151a722e0a6ef47149f258942c49b
+DIST srslte-19.09.tar.gz 2372283 BLAKE2B 8d3b3cdfe777824c30e570f61ffddd1a9b1fd8136b6f67c2d54cbcfe089a1f55cc56d5b02ddb983c8a3e96af4228509b17a3c816b2d5196bc87bae29e14a625f SHA512 3516bb4aa027437420509eeca98e30f8f5c2bc7f8f1a606309587b70b51f2e6712c605155ec76a38868bf4c1f9007641c8c5b986c1cda76486bf3c4788eed888
+EBUILD srslte-19.09.ebuild 1013 BLAKE2B 82e268c6deb5b7d4fa7c31e4d1ff89f996846a285edc0b81012cd583018fdc6cd6b42f0a238a27840f69732e7249d74e2ebf65e214234a4d5d1ae222e432534f SHA512 470abcbcee6a0cf7d1c1b6877ef6c0e832a58fd9f7cb3f70786b1e482bf0c35fa6fdc69575e8ccfa8d8aef8a2fba7f66d4b151a722e0a6ef47149f258942c49b
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-19.06.ebuild b/net-wireless/srslte/srslte-19.09.ebuild
index 69be1795d758..69be1795d758 100644
--- a/net-wireless/srslte/srslte-19.06.ebuild
+++ b/net-wireless/srslte/srslte-19.09.ebuild
diff --git a/net-wireless/tempestsdr/Manifest b/net-wireless/tempestsdr/Manifest
new file mode 100644
index 000000000000..be47fe02864c
--- /dev/null
+++ b/net-wireless/tempestsdr/Manifest
@@ -0,0 +1,2 @@
+EBUILD tempestsdr-9999.ebuild 1242 BLAKE2B b1d2988f44db7626f74a95447184ffe99dead4f9d6cc5ad2e2002710f7de4a277997a841677db275aea6ce6900742c746be4e2c9063ccca8703ae08cc8ddcf50 SHA512 9baa825e8da6e4dafed6eff47e4b8e7389935b921225d952a80f28ed4a9fc624987cbb8b72e7ac37fecba7305288d5fe63e02e8c3341f634b8d45f795353f17d
+MISC metadata.xml 269 BLAKE2B 72553e955af556b065ed027a32c4922700b4b3273f0c5636499a497c818d7c7ae4c179a4a3639c2a0489608c3467b55ebf1fd4390db5258b481a005ff00a5369 SHA512 ca3be1fc750fde8fb5bd1a183635d166118966cbf4cae4fd99a3ecbe89a1992ced91d43e6eeafba0061b84f53fb1836eedf1e1d8947b95741c12c913bfa317f6
diff --git a/net-wireless/tempestsdr/metadata.xml b/net-wireless/tempestsdr/metadata.xml
new file mode 100644
index 000000000000..48e2501c039f
--- /dev/null
+++ b/net-wireless/tempestsdr/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>
diff --git a/net-wireless/tempestsdr/tempestsdr-9999.ebuild b/net-wireless/tempestsdr/tempestsdr-9999.ebuild
new file mode 100644
index 000000000000..167bdba6e6f6
--- /dev/null
+++ b/net-wireless/tempestsdr/tempestsdr-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 java-pkg-2
+
+DESCRIPTION="Remote video eavesdropping using a software-defined radio platform"
+HOMEPAGE="https://github.com/tanpc/TempestSDR"
+EGIT_REPO_URI="https://github.com/tanpc/TempestSDR.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7"
+BDEPEND=""
+
+src_prepare() {
+	sed -i -e 's#javah#javac -h .#' \
+		-e 's#-jni martin.tempest.core.TSDRLibrary##' \
+		-e 's#-o TSDRLibraryNDK.h#../src/martin/tempest/core/TSDRLibrary.java#' JavaGUI/jni/makefile || die
+	sed -i -e 's#TSDRLibraryNDK.h#martin_tempest_core_TSDRLibrary.h#g' JavaGUI/jni/TSDRLibraryNDK.c
+	#airspy mini support, but may degrade airspy support, needs testing
+	#sed -i -e 's#10e6#6e6#g' -e 's#10000000#6000000#g' TSDRPlugin_Airspy/src/TSDRPlugin_Airspy.cpp
+	default
+}
+
+src_compile() {
+	emake clean
+	#this absolutely breaks in wierd ways when built parallel
+	emake -j1 all
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins JavaGUI/JTempestSDR.jar
+	dodir /usr/bin
+	cat <<-EOF > "${ED}/usr/bin/tempestsdr"
+#!/bin/sh
+java -jar /usr/share/tempestsdr/JTempestSDR.jar
+EOF
+	fperms +x /usr/bin/tempestsdr
+}
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index fe8b30ad5922..5ffa52141410 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -2,14 +2,8 @@ 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.50.zip 112355461 BLAKE2B 5d63c3a0488a1da7ed696993982728cd1b7449d7af65ee1a49d065fd928feef5628a84d5add7d670ddc5bed3d9df2084fd0905a417cde22737dd74de15a74b39 SHA512 509e54b1237a41bea08d96eaa9efacbd45d823dc4e2d6965ac577aab159bf907378322aa6ad15a776dd0fc725a6737951f2d4cdafe073443a18e36d2d4827ead
-DIST unifi-5.11.52.zip 114092809 BLAKE2B 902dec158ba60fa424ff0b59b53776aeabc3f1ae7a9b88e549f0d62974e280b51ce5b8bb3eac150c1d75e4b0816b46bb19bd953e987bf6d8a58c3e271efdaea3 SHA512 887b25c22d7ac7a14854b95007794a63c200717fdfec791be5e1b03fe4bda1c44a05767d44f55062c691b922e54fa8c183b249407c30fb2d596906e00fa969e0
-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.50.ebuild 1788 BLAKE2B 0442f79c210215f57a7ccbb34ab3028afaeacc8fe815b9db3884d52f4258ef9c7c33f384b83fe1a1e3b799bb29e80222b9c0235b5c6cee19b3cae936555645a2 SHA512 690ab29955c3fd78bdf462409519431dd23e1eba3673dee645f152b2efc1097fceb8a94da385a40ba39983682761137c69e0511a2d7a949381a29bad86740a4b
-EBUILD unifi-5.11.52.ebuild 1789 BLAKE2B b2c72b01604753f3c95c76a58dce04c91ca396f406f94661a9950ea4dd6358b8bd24fce709c4426027e2fcc9628ae2cdde5b272694c5b2ca8b9d1051feab7513 SHA512 426d583f22031a9ec95267341dca5f38e3f60577a0560a618cd64d9169f42a4a90cb311d67e8bc70690232806dbbb3688790e784eb9ce9137a8a5a02c7ba749f
-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.12.22.ebuild 1788 BLAKE2B b9afe16fb74bed119cd83789d78876abbe2d75c1ef200da8c157347f7986a343b0764b9787664fe9fc075f8d8fc52f8ea6e3e2f7a32dd9860681dff87f896b04 SHA512 16628ed140df7559dad13b7b39ff77994496134bef7eaec542577e86394a9ef7169a06fa03b3d52d9ac7b9a755a0d3366cd9e6dac957667cc680a229013b76c6
 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.50.ebuild b/net-wireless/unifi/unifi-5.11.50.ebuild
deleted file mode 100644
index 4ea6772d70e6..000000000000
--- a/net-wireless/unifi/unifi-5.11.50.ebuild
+++ /dev/null
@@ -1,73 +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="-c9dac5377d"
-
-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.11"
-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() {
-	# 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.52.ebuild b/net-wireless/unifi/unifi-5.11.52.ebuild
deleted file mode 100644
index 5a12db360e52..000000000000
--- a/net-wireless/unifi/unifi-5.11.52.ebuild
+++ /dev/null
@@ -1,73 +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="-3b4f13d722"
-
-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.11"
-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() {
-	# 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.12.19.ebuild b/net-wireless/unifi/unifi-5.12.19.ebuild
deleted file mode 100644
index a5c43ce46736..000000000000
--- a/net-wireless/unifi/unifi-5.12.19.ebuild
+++ /dev/null
@@ -1,73 +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="-98bbc5381e"
-
-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.12"
-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() {
-	# 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.12.22.ebuild b/net-wireless/unifi/unifi-5.12.22.ebuild
index 158a4c2d1ed8..d23efc6ab867 100644
--- a/net-wireless/unifi/unifi-5.12.22.ebuild
+++ b/net-wireless/unifi/unifi-5.12.22.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.12"
 IUSE="systemd"
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index f9d858e47449..551ff3208bcb 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -13,6 +13,7 @@ AUX wpa_supplicant-2.6-libressl-compatibility.patch 3873 BLAKE2B 281029d49bd4267
 AUX wpa_supplicant-2.6-openssl-1.1.patch 1777 BLAKE2B 0c879e05aba224524919a3879cf5995bae9f973c5629079292cb17666151b981748d9e7ab8589da977cc2c04b96c232abba359446ee14b5a69742b865293f746 SHA512 638d1238387382bdd888158f4c97b2af13d16ec12db31e2d409957bf00fa45fbf3a1beb109c56c815b0dc64a861b17cccc4d7cc998110c772dd2d1bfa724efc5
 AUX wpa_supplicant-2.7-fix-undefined-remove-ie.patch 1115 BLAKE2B 207c8265f6819b9d956cd99cd1f1056d6fcdf6f857fc63150a9419ee83263e0173f2e8f00b061a4c48eb516cb1c3c00f5137a9bacb857dbe6d5e6f912d77c574 SHA512 5e790b3ae50f3d29cb38f73cff30f8994798e7bdbecc9f852def910a8150c1724c051bbb52603fa9c6818c950a5fe347bccd21848427f31f54d641ae40621c3f
 AUX wpa_supplicant-2.7-libressl.patch 1701 BLAKE2B e0d37967b15471641cd14ed54c1cf0456a1c1c347c35e693c0f4bf6f15f1689932c51ad8fdc3977c7ce4e5ad4a036c48eb7d3044871801d7582d2d5d170b371d SHA512 ec24051776991b0d3ac052d1c526c3e700708bd1105cf1885b4a4692344754874c636caf73abab36b54a8de8f5920a510125b51489d0ee5af31971ad52469d8c
+AUX wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f649489afd1636105cdddc29d58d45659c5368cc177f919ce94a7e2b5a9ed3fe8ddccd1fba3d059d270bae1a8 SHA512 6bbb9d4f6132b3d4e20cd65f27245ccadd60712ef5794261499f882057a930a393297e491d8147e04e30c0a53645af0eb3514332587118c19b5594f23f1d62ad
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
@@ -24,6 +25,7 @@ EBUILD wpa_supplicant-2.6-r10.ebuild 12637 BLAKE2B 6461f5db9a4174524d9939937a73a
 EBUILD wpa_supplicant-2.7-r1.ebuild 11740 BLAKE2B b0619e04c599161f54220e6aec3cb750095047b4b463c01dd0aac1e25b52afc7460dad373abb0cdc51ba45fc528f4773e8c7f9ea4e89d0d5bb677574808773d4 SHA512 334289db49c59f172e838a3c33a7a16903265c5d45762473f9ab3c329d73f77937c4bd545caba471a13c4831ba1e3bbbf3cedb58a32dbb0d2e842b0b165969a6
 EBUILD wpa_supplicant-2.7-r3.ebuild 11542 BLAKE2B bbbc734c6bea7237863739eec4e63585dcb09995fa66cc7a992dd842c85d192f9afa3364a45277bc70d3438980f7f37582dedb351ce3a24e24813b9f566a0f82 SHA512 e40aae436d4357566d6f098ff2dc5416264ee205456292e93ffc2618594b922fbfdb2922760af177efde170d59614d4441b9f61bfc9351e7ad691bd0c0bcaede
 EBUILD wpa_supplicant-2.8-r1.ebuild 11661 BLAKE2B 9df7321b8318959fd5741aa2b83d1305c4d4554a2b3a4d1ee35f745fd4128a67d529b5dd532c18a2dfcfd73210e656e925ef5116238856463187ce7a6837a288 SHA512 7cd5edaf38491aa44ef6f9c2384e07cb5ecf211c002f8c4b3843c418048437e1b784070714a735316e57af1b0cc01f6f4ef9d87db79829746b76e563ec9c6381
+EBUILD wpa_supplicant-2.9-r1.ebuild 12000 BLAKE2B f7996c1d42bd2ec22419a032fdf4f8d7f28f3f24a56d2ad7ff4056d744b47ab33adb245e74a765cdffd4283a0428a85d2a64dca6b2e63dce5aaa0c02182d16a0 SHA512 924c955244ee4ea274d4575cc878bee5a7f32557331c561265bb91b4f0135d221b710db09498412e4b9c7fb36535e398fc673771c8835622f4c2760fb997ab85
 EBUILD wpa_supplicant-2.9.ebuild 11873 BLAKE2B 30bc6201b56069f7324573cbc744b75bfaf4bbfdff5ecf1e8449968e9d1cea447b59277a0c6596612ded24c35cb09fd245bb42629893136793ded68b752fc93f SHA512 78e9289f0dca5d54fa33fa8fa6ad15f15d97f6add91798e7b36f8bdaade97eb8e7f47c206992b4719d3c94befa98ff0255438cc03314ccc7fc19fa64985918b7
 EBUILD wpa_supplicant-9999.ebuild 11351 BLAKE2B 0e4eb379cb2db7c74e298fe220e2fc2d0e6c7aa1479046bb19fb736fa56f1583dcb4e8f80a74fae9544c29024ff8bee08f0cf657ae67bccb8561a402f558810c SHA512 f9436603860527df244ccf4f00b105ed0a4e1879392f515fda120200893b7c6d4d04ad8511287cd096a54c72168b4c14b1393f45ab6e656dfe5a34fa6b917fba
 MISC metadata.xml 1523 BLAKE2B 50ad101e8ccf8a08b6c778c5108c518b81f2d28770f7cf4b770aa92a7a16da5806354bfe4ac1342fdb7a1f1fdf943272507f9c7308c5f421e2ee7d7d20c70266 SHA512 3ea8bfd877e93ebe91a75f989fe09e11546d76ffbea1ddf559de0829d6728cd4bdac64321971011eccd673e8dfdd446bf4a67e4619f07c3f8330816d5a815ee2
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
new file mode 100644
index 000000000000..d764a9db016c
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
@@ -0,0 +1,73 @@
+From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <j@w1.fi>
+Date: Thu, 29 Aug 2019 11:52:04 +0300
+Subject: [PATCH] AP: Silently ignore management frame from unexpected source
+ address
+
+Do not process any received Management frames with unexpected/invalid SA
+so that we do not add any state for unexpected STA addresses or end up
+sending out frames to unexpected destination. This prevents unexpected
+sequences where an unprotected frame might end up causing the AP to send
+out a response to another device and that other device processing the
+unexpected response.
+
+In particular, this prevents some potential denial of service cases
+where the unexpected response frame from the AP might result in a
+connected station dropping its association.
+
+Signed-off-by: Jouni Malinen <j@w1.fi>
+---
+ src/ap/drv_callbacks.c | 13 +++++++++++++
+ src/ap/ieee802_11.c    | 12 ++++++++++++
+ 2 files changed, 25 insertions(+)
+
+diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
+index 31587685fe3b..34ca379edc3d 100644
+--- a/src/ap/drv_callbacks.c
++++ b/src/ap/drv_callbacks.c
+@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ 			   "hostapd_notif_assoc: Skip event with no address");
+ 		return -1;
+ 	}
++
++	if (is_multicast_ether_addr(addr) ||
++	    is_zero_ether_addr(addr) ||
++	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
++		/* Do not process any frames with unexpected/invalid SA so that
++		 * we do not add any state for unexpected STA addresses or end
++		 * up sending out frames to unexpected destination. */
++		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
++			   " in received indication - ignore this indication silently",
++			   __func__, MAC2STR(addr));
++		return 0;
++	}
++
+ 	random_add_randomness(addr, ETH_ALEN);
+ 
+ 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
+index c85a28db44b7..e7065372e158 100644
+--- a/src/ap/ieee802_11.c
++++ b/src/ap/ieee802_11.c
+@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
+ 	fc = le_to_host16(mgmt->frame_control);
+ 	stype = WLAN_FC_GET_STYPE(fc);
+ 
++	if (is_multicast_ether_addr(mgmt->sa) ||
++	    is_zero_ether_addr(mgmt->sa) ||
++	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
++		/* Do not process any frames with unexpected/invalid SA so that
++		 * we do not add any state for unexpected STA addresses or end
++		 * up sending out frames to unexpected destination. */
++		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
++			   " in received frame - ignore this frame silently",
++			   MAC2STR(mgmt->sa));
++		return 0;
++	}
++
+ 	if (stype == WLAN_FC_STYPE_BEACON) {
+ 		handle_beacon(hapd, mgmt, len, fi);
+ 		return 1;
+-- 
+2.20.1
+
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
new file mode 100644
index 000000000000..6f8c8a43ccb3
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r1.ebuild
@@ -0,0 +1,461 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+else
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+fi
+
+SLOT="0"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap +fils +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+
+# CONFIG_PRIVSEP=y does not have sufficient support for the new driver
+# interface functions used for MACsec, so this combination cannot be used
+# at least for now.
+REQUIRED_USE="
+	macsec? ( !privsep )
+	privsep? ( !macsec )
+"
+
+CDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		dev-libs/libnl:3
+		net-wireless/crda
+		eap-sim? ( sys-apps/pcsc-lite )
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+"
+
+DOC_CONTENTS="
+	If this is a clean installation of wpa_supplicant, you
+	have to create a configuration file named
+	${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
+	An example configuration file is available for reference in
+	${EROOT%/}/usr/share/doc/${PF}/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+			if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
+				echo "$CONFIG_PARAM=$setting" >>.config
+			fi
+		else
+			#ensure item commented out
+			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+		fi
+}
+
+src_prepare() {
+	default
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# People seem to take the example configuration file too literally (bug #102361)
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}" || die
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die
+	fi
+
+	# bug (320097)
+	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+
+	#CVE-2019-16275 bug #696030
+	eapply "${FILESDIR}/wpa_supplicant-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	cp defconfig .config || die
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config MATCH_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+	Kconfig_style_config HT_OVERRIDES
+	Kconfig_style_config VHT_OVERRIDES
+	Kconfig_style_config OCV
+	Kconfig_style_config TLSV11
+	Kconfig_style_config TLSV12
+	Kconfig_style_config GETRANDOM
+	Kconfig_style_config MBO
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	Kconfig_style_config EAP_OTP
+	Kconfig_style_config EAP_PAX
+	Kconfig_style_config EAP_PSK
+	Kconfig_style_config IEEE8021X_EAPOL
+	Kconfig_style_config PKCS12
+	Kconfig_style_config PEERKEY
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	else
+		Kconfig_style_config CTRL_IFACE_DBUS n
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW n
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO n
+	fi
+
+	if use eapol_test ; then
+		Kconfig_style_config EAPOL_TEST
+	fi
+
+	# Enable support for writing debug info to a log file and syslog.
+	Kconfig_style_config DEBUG_FILE
+	Kconfig_style_config DEBUG_SYSLOG
+
+	if use hs2-0 ; then
+		Kconfig_style_config INTERWORKING
+		Kconfig_style_config HS20
+	fi
+
+	if use uncommon-eap-types; then
+		Kconfig_style_config EAP_GPSK
+		Kconfig_style_config EAP_SAKE
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	Kconfig_style_config TLS openssl
+	Kconfig_style_config FST
+	if ! use bindist || use libressl; then
+		Kconfig_style_config EAP_PWD
+		if use fils; then
+			Kconfig_style_config FILS
+			Kconfig_style_config FILS_SK_PFS
+		fi
+		# Enabling mesh networks.
+		Kconfig_style_config MESH
+		#WPA3
+		Kconfig_style_config OWE
+		Kconfig_style_config SAE
+		Kconfig_style_config DPP
+		Kconfig_style_config SUITEB192
+	fi
+	if ! use bindist && ! use libressl; then
+		Kconfig_style_config SUITEB
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	else
+		Kconfig_style_config SMARTCARD n
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use macsec ; then
+			#requires something, no idea what
+			#Kconfig_style_config DRIVER_MACSEC_QCA
+			Kconfig_style_config DRIVER_MACSEC_LINUX
+			Kconfig_style_config MACSEC
+		fi
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		Kconfig_style_config DRIVER_BSD
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		Kconfig_style_config WPS_NFC
+	else
+		Kconfig_style_config WPS n
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		Kconfig_style_config AP
+	else
+		Kconfig_style_config AP n
+	fi
+
+	# Enable essentials for AP/P2P
+	if use ap || use p2p ; then
+		# Enabling HT support (802.11n)
+		Kconfig_style_config IEEE80211N
+
+		# Enabling VHT support (802.11ac)
+		Kconfig_style_config IEEE80211AC
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	if use privsep ; then
+		Kconfig_style_config PRIVSEP
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt5 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		eqmake5 wpa_gui.pro
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1 BINDIR=/usr/sbin
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt5; then
+		einfo "Building wpa_gui"
+		emake -C "${S}"/wpa_gui-qt4
+	fi
+
+	if use eapol_test ; then
+		emake eapol_test
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	use privsep && dosbin wpa_priv
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym ../usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	readme.gentoo_create_doc
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	newdoc .config build-config
+
+	if [ "${PV}" != "9999" ]; then
+		doman doc/docbook/*.{5,8}
+	fi
+
+	if use qt5 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		domenu wpa_gui-qt4/wpa_gui.desktop
+	else
+		rm "${ED}"/usr/share/man/man8/wpa_gui.8
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null || die
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.w1.wpa_supplicant1.service
+		popd > /dev/null || die
+
+		# This unit relies on dbus support, bug 538600.
+		systemd_dounit systemd/wpa_supplicant.service
+	fi
+
+	if use eapol_test ; then
+		dobin eapol_test
+	fi
+
+	systemd_dounit "systemd/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${EROOT%/}/etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	if use bindist; then
+		if ! use libressl; then
+			ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
+			ewarn "This is incredibly undesirable"
+		fi
+	fi
+	if use libressl; then
+		ewarn "Libressl doesn't support SUITEB (part of WPA3)"
+		ewarn "but it does support SUITEB192 (the upgraded strength version of the same)"
+		ewarn "You probably don't care.  Patches welcome"
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
+				"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+
+	systemd_reenable wpa_supplicant.service
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /net-wireless
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)