From aa3411e241a201d53a2689766fe419f2756819f3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 24 Mar 2019 17:22:19 +0000
Subject: gentoo resync : 24.03.2019

---
 net-wireless/Manifest.gz                           | Bin 17773 -> 17775 bytes
 net-wireless/aircrack-ng/Manifest                  |   2 +-
 net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild  |   4 +-
 net-wireless/hostapd/Manifest                      |   2 +-
 net-wireless/hostapd/hostapd-2.7-r2.ebuild         |   2 +-
 net-wireless/kismet/Manifest                       |   2 +-
 net-wireless/kismet/kismet-9999.ebuild             |   1 -
 net-wireless/ubertooth/Manifest                    |   8 +-
 .../ubertooth/ubertooth-2017.03.2-r1.ebuild        |  70 ----
 net-wireless/ubertooth/ubertooth-2018.08.1.ebuild  |   3 +-
 net-wireless/ubertooth/ubertooth-2018.12.1.ebuild  |  69 ++++
 net-wireless/ubertooth/ubertooth-9999.ebuild       |   3 +-
 net-wireless/wpa_supplicant/Manifest               |   9 +-
 net-wireless/wpa_supplicant/metadata.xml           |   1 +
 .../wpa_supplicant/wpa_supplicant-2.6-r6.ebuild    | 436 --------------------
 .../wpa_supplicant/wpa_supplicant-2.7-r1.ebuild    |   1 -
 .../wpa_supplicant/wpa_supplicant-2.7-r2.ebuild    | 435 ++++++++++++++++++++
 .../wpa_supplicant/wpa_supplicant-2.7.ebuild       | 456 ---------------------
 .../wpa_supplicant/wpa_supplicant-9999.ebuild      |  87 ++--
 19 files changed, 553 insertions(+), 1038 deletions(-)
 delete mode 100644 net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
 create mode 100644 net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
 delete mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
 create mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
 delete mode 100644 net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild

(limited to 'net-wireless')

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e6275a59af30..c1a50a0c91a2 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index e23eb1a45d6f..240f05803204 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -6,6 +6,6 @@ DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046
 EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3523 BLAKE2B eeda867b14d763a397287928b64217635a2b4b11250b98fc818ce0910c9fa9e30e68a78c02a741c79a653f6c9177d733caaae7e63748c20f29ebd6c4819f007f SHA512 151fec44861e17742ec7cbbbc7198eaf24f9cdd4ceee78902c248fced3ab6df49ed1da466b39f203201e9c9124b5e8b1042df75ef705a7024205c5276853a0d7
 EBUILD aircrack-ng-1.3-r3.ebuild 2910 BLAKE2B 46031550c7729538b0ccdab9e3a95cd175371032697afd74acf8de3181793bb6038914d3aa87acf50e4085b777fffd44f0c2461cfd30d368b74117f34c3c629b SHA512 6e49a5f36bd9b69bf60c8d047df89cc7a342687156a8bdde68ecf5f4e8365bf508706bb15a7e6a28d8bc9749f5da95e59894fffb7eccbc95c464872122337ba3
 EBUILD aircrack-ng-1.4.ebuild 2870 BLAKE2B ce4d27a79c4745d75064cda730b644a4359dd3235a23e8a78e6480a21b2ebe8055c63bb864de4aecc0f6f6d655dcfcdb21086d26c144b12745fe6d8577375191 SHA512 7f5ecbf1b7ba3f8a281dea31e92ade9c540663b130921d520c60f33d88136b3ad3d16a47977408e6a460346aea2f30ebd3d8718b3c5aadbf8e56815e5a95e268
-EBUILD aircrack-ng-1.5.2.ebuild 2909 BLAKE2B 606844ed33ae6ee1ad32b37dd7bd012dcb7fd2f12b07f62d9de89b5e2333707bbeb1568dd238362e5fdff83e0b75d91532fca41febe4166795d43db854a2f7e7 SHA512 7467d81d051f984b39f5736422dae811114ddd2e1b5a7f33110b50fb28c07a4f26c1de20c241daad1800648046adcdab3b61cdd1e9f22aeb9d95f31a3d2a094b
+EBUILD aircrack-ng-1.5.2.ebuild 2913 BLAKE2B 9f89e07be12a6c0f6f9bc988499de9d0745ce9bc5cf45eb52080cf011f9e8fa68c48e939fc54bbb9b0b553670e81283bfe8392f4bc2ce1a4e5b3e86825601c1a SHA512 1f6480f6654beaf168abe01b4f5219b12756b770bd0854dc996f754a32372857a2de2ea1abc33af26be0a0726815a4155f8bc6a17262ac4aa1d13796d95afcf4
 EBUILD aircrack-ng-9999.ebuild 2909 BLAKE2B 606844ed33ae6ee1ad32b37dd7bd012dcb7fd2f12b07f62d9de89b5e2333707bbeb1568dd238362e5fdff83e0b75d91532fca41febe4166795d43db854a2f7e7 SHA512 7467d81d051f984b39f5736422dae811114ddd2e1b5a7f33110b50fb28c07a4f26c1de20c241daad1800648046adcdab3b61cdd1e9f22aeb9d95f31a3d2a094b
 MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index 37faadada3ad..b0873bef12be 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
@@ -14,11 +14,11 @@ HOMEPAGE="http://www.aircrack-ng.org"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
 	MY_PV=${PV/_/-}
 	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index c7171fc281de..18cd0f878a79 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -21,7 +21,7 @@ EBUILD hostapd-2.6-r5.ebuild 7249 BLAKE2B e4fdb49c073fce962fb8a53658606f78cbbba5
 EBUILD hostapd-2.6-r6.ebuild 7337 BLAKE2B 7870dfd94d57afa9bb4aa1bfbebf7028f65e720543e0ed1b68af770f82b0346681f4938f774722aebf2b8a7c18422bd4a7a03df881eb38f17b1032fcdc205d31 SHA512 0e7e8b30cb75a0892388de7b51051f13747e2cbcbe2658eba39fc59beea1abd459f695bdb068a43e84d49ae898667592485979081af0a601d57511bc021aac18
 EBUILD hostapd-2.6_p20180822.ebuild 6690 BLAKE2B 9940744f17fc3c78d5ff1492328f460fb7c1eb2c14973691e85a262f5e4287b7dd7829e77b5e3597657d2efb342c145673d0ca1337551744310989b31f0ef084 SHA512 ee943e7fc1687015821d8f7020da43639bb763eee3f6f8d60fd51fa51cf71363838b68674659eff1054f46a33d800979c3ad6b63bd029876ab627751c377933b
 EBUILD hostapd-2.7-r1.ebuild 6759 BLAKE2B 86dca46bdc70fae7136278bcd2b9682462517171cfcea0c0fd6b260cc21916003162612f0440081ece61924f6dbd16f98646c51b2aa8b4b14a9ed0849746dfd4 SHA512 e0a452ce4572eb2b788cbb1ce010dbdf5a13c53eaddf240ed944968325966f9686de9ee90f68e45838d558a7983df2fc0aafe220ad50defb0e3d43bf3dc08831
-EBUILD hostapd-2.7-r2.ebuild 6760 BLAKE2B 17ba61f1fa2edde1192cb93fea7cde170c74b9072dd77467aa72410805c523229f728a8b348d0d1085d510f0e2d8a3bc28de51ebfc15b2ed29736585b711d307 SHA512 6a0bd84deeb0c27e81013e97aa048ec9a21ca48fe4f3527bc7945ffc60c855912662eb1349eac48bb14c7bbcc490698e2c67f1cda0b0f32ed8305c02a26ce343
+EBUILD hostapd-2.7-r2.ebuild 6759 BLAKE2B 3576c3762ae06e3b98422743323bc1ea1bfd99a3a9afa8f4b4bbbc2022c846143323c6980ee1a81190df87ac5d352af8c4a169bbc51cb88e74e78e7c44c13299 SHA512 e262cfa8227629f4edb0930943dd9a24d5bec65d04599100ad634208938e8acdf3b6fa1f8f193ef8a8b2ac6bddfadf340bef43626f2ab542fc5df3b596b8f546
 EBUILD hostapd-2.7.ebuild 6687 BLAKE2B b2b7e706f026f8f50d30e2f488a76223f2d4dc050b5d5a08c15f5849cb309adde6512694236adce500763ef8d4b585a74ae4864288a4aed883d2d2d44afd8856 SHA512 84e4e4cc9ad900a1698f6cf3590931d255fef742ddfcdcbf02f8692b74a07ed1c71c308e8ba577456bc7e9294a278a0af2b229488eb7f5180ec9005cae67e479
 EBUILD hostapd-9999.ebuild 6680 BLAKE2B 1394519b2cd30fc9a204b1981be5d082940ce244dd3b498faa7b2f94028b9e97358b9ba0a0b8dba3997e5da608ed449258a029e00878d4c11b65ee0a412327e1 SHA512 6b7dc62f8a450e9fb747a3daf850e014cccb25177362cb19e64b259ee301ae71dc6f795008fc0765d37254c267fbedef8763da4e5c460a9139d22c50669e3597
 MISC metadata.xml 973 BLAKE2B 009e9b39aa6c7d1d6da4421ec1d0c4610a64b136b497f92dc5a822ab54449720cfacb9ce898fc2015cdcf741939acb46aa8797e13c80079ce424f5f6bfbde8be SHA512 19a5d72d11eee955856bde7065a784d1942b2c55adbb154e1af432c693763beedb1541d119ba6c0d7b5e2f37e13a3aa915b13def6c9ee651b6f4f7f8e85a57e5
diff --git a/net-wireless/hostapd/hostapd-2.7-r2.ebuild b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
index 20f40c4c4906..4f062184baa3 100644
--- a/net-wireless/hostapd/hostapd-2.7-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.7-r2.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
 	# Never stabilize snapshot ebuilds please
-	KEYWORDS="amd64 ~arm ~mips ppc ~x86"
+	KEYWORDS="amd64 arm ~mips ppc ~x86"
 fi
 
 LICENSE="BSD"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 1f43541d8fb2..16f505e12906 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -9,5 +9,5 @@ DIST kismet-2019-01-BETA2.tar.xz 3096084 BLAKE2B 77f0497721bb1a6c2af2dd91b5d2a89
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2018.08_beta1-r4.ebuild 3007 BLAKE2B 09460af93a5ee5d50b628f8dcf4a9ad466d30c4cb7e617bc60d5fa89a7d1c4fdb169e48c9a4ca1fa01ca92396cf99a86e1f1597b7dd1943e3a90078ce3ee84d8 SHA512 19131fd383d48f4e394b01e180fded41767b64b57ee63a0e046334c143fc63472ba0f4c71bcd21419a270a7f7fd558c5c2d700c9f91c71fd7fe099b48733fce7
 EBUILD kismet-2019.01_beta2.ebuild 2921 BLAKE2B 11169d4d133617c1e5cbeb39b47c030c67a16ae3548d01dd68d00e5f7817a5304e282942efb104f29b0d8c511aad9ae2490c324f8dec9c4bd8f1c9f6da53216c SHA512 68da40db9264a6c65d44bfa3445b7fd1bcf05766aef78dd0e6a9a68c14a6405ad304c232aa9e2b6a5905008bf5223ce2beffe181ffdabecd68e4347bae2a04a9
-EBUILD kismet-9999.ebuild 3146 BLAKE2B 1ef3ebd4ea292fab0077146a78404152df5d36704fec921e4f1fa5d1de87ed96fcb2695c8061648c42ca3ec771080714b2e0d8209b799f9cc443419a1ce7c04f SHA512 b4fb2e129776569209e0116e94c7b686e30b407543ea01cfef3aca39caea4fcdd2f6205e7310b9365a2de5acc4d8a6e90a1bd8924d38f63de82be9770b5b32cd
+EBUILD kismet-9999.ebuild 3126 BLAKE2B bb5b7def4fd86634f978d0e7f5cdd0965d93c37fabfad7a8422c338929a7c84adc265c52629362951edd35c5b5d1a704a92c12b9e5949bdf992c849d54362b4b SHA512 34cbbe6efd9a375ca7bad1c245a0e55bfe27e1cd6a2fa21bff01eba3833c5548792c14f0243ff5bed7dce270f1ea4927c1af96e505b74577641306f1c6671fa0
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index 6997c2c83f34..ad9c0fbeb6cb 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -89,7 +89,6 @@ src_install() {
 	emake DESTDIR="${D}" forceconfigs
 
 	insinto /usr/share/${PN}
-	doins -r log_tools
 	doins Makefile.inc
 
 	#dodoc CHANGELOG RELEASENOTES.txt README* docs/DEVEL.client docs/README.newcore
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index e4bc8e31c354..a8f6ef0bfa0c 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,6 +1,6 @@
-DIST ubertooth-2017-03-R2.tar.xz 676124 BLAKE2B 1f82c9a6b4b2fcec84d5f69862f843ee4920eb0e17e61940aba48e118fe290f67777eed4bd9826c420e218ab433b94630abaf8793c845d2e68ff5587e8b73fbc SHA512 4806a6ac664ec9b78964caeb47f87a60db8f664c529e6e58bc1e5db4d858eaaa1ae51f0293f4a5227a102e556caf1611e97f6675147af4bc34e23646049e8571
 DIST ubertooth-2018-08-R1.tar.xz 701928 BLAKE2B 031d4178693a4c1734f72d5c7292ba58f0c74b9a57cc1841ecdec286d547994847dc7badabc3efce6eff9a34abe505d942b561bc3291b3cda0f29a42fa7dd340 SHA512 630707583b4fa0683d3f2a40e06697546897e603bd27842886897949ffeaff252d3b34040dee6b8b3319f9bed65eb706f57b885d7a6719fc9cb993e7c1d9c203
-EBUILD ubertooth-2017.03.2-r1.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
-EBUILD ubertooth-2018.08.1.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
-EBUILD ubertooth-9999.ebuild 2111 BLAKE2B 9e58bdc705487144ae10cb7e8f64d5f5f4f1195e3b23f9d6f873f7a1017ceb85841a8da896eaafb83276a2d99010f8ea6fdf700148d50349e73cb61698cd8026 SHA512 cab20dac721a6bc7bcfca4d8467caad68382d154718b2607507f7d91e9b4f4cc9c351f43859c5a4c66e22d48220a6df1779426459dc4f9fee2706f8f5a2b9672
+DIST ubertooth-2018-12-R1.tar.xz 704208 BLAKE2B 7a17830a0ed417a737d78aa22c5a6a270a67b350a3a5e9a0aebabd4b38547d8d35551e061ea3d5260996f8fe1a366c75c8773d5e3a6abf37a0930f93200da3fc SHA512 409fdb403d6a3fa84b92757e0fd8672b1403ba3d24888fbde4d6d6923d8e0796914c20d38e2fc58909f81fcb8a0b6290bcf91282bb02354c310e6e91ad85e23b
+EBUILD ubertooth-2018.08.1.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
+EBUILD ubertooth-2018.12.1.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
+EBUILD ubertooth-9999.ebuild 2095 BLAKE2B 581851bcaa23c0b37bcfc1adb7f7125efbf701c8cfe83cb812703fc556e212e368329f3f48f2c6d900471ad128ceee0696642ee7d840f0e9cd4485cfc4b6b94a SHA512 cc3c2a20af082cc9dbdcb59b0054c1050b96447ea493bbc650c49d82154104652b41ff038788b6a69cff99c559d749818576174208e97fa478ffd49728645faa
 MISC metadata.xml 562 BLAKE2B dea6d366f75fbf852510f4b7204d5b51f5d3e52ef0b55020fe3a67edc486ad757c4b388ed6de36611ba14084e985df57f7986c5cc4e17193a59c546608c6f92d SHA512 b266c4914480613ba2f64519152d73cb7c472755fbd378bd0e547d4e0cf2fe6069636e04bd64fd9c686ff42adcb126118936846d2cbc241f1cc081e28b390400
diff --git a/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild b/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
deleted file mode 100644
index 1341a9478aa6..000000000000
--- a/net-wireless/ubertooth/ubertooth-2017.03.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils udev
-
-HOMEPAGE="http://ubertooth.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+bluez static-libs +ubertooth1-firmware +udev"
-
-DEPEND="bluez? ( net-wireless/bluez:= )
-	>=net-libs/libbtbb-${PV}:=[static-libs?]
-	static-libs? ( dev-libs/libusb[static-libs] )
-	virtual/libusb:1="
-RDEPEND="${DEPEND}
-	udev? ( virtual/udev )"
-
-MY_PV=${PV/\./-}
-MY_PV=${MY_PV/./-R}
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}/${P}/host"
-else
-	S="${WORKDIR}/${PN}-${MY_PV}/host"
-	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
-
-#readd firmware building, but do it right
-#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_BLUEZ=$(usex bluez)
-		-DBUILD_STATIC_LIB=$(usex static-libs)
-		-DINSTALL_UDEV_RULES=$(usex udev)
-		-DENABLE_PYTHON=false
-	)
-	if use udev; then
-		mycmakeargs+=(
-			-DUDEV_RULES_GROUP=usb
-			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}
-	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
-	if [[ ${PV} == "9999" ]] ; then
-		ewarn "Firmware isn't available for git releases, we assume you are already"
-		ewarn "on the latest and/or can build your own."
-	else
-		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
-		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
-	fi
-	popd
-
-	elog "Everyone can read from the ubertooth, but to talk to it"
-	elog "your user needs to be in the usb group."
-}
diff --git a/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
index 1341a9478aa6..845ee09d3793 100644
--- a/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
+++ b/net-wireless/ubertooth/ubertooth-2018.08.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,6 @@ MY_PV=${MY_PV/./-R}
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}/${P}/host"
 else
 	S="${WORKDIR}/${PN}-${MY_PV}/host"
diff --git a/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
new file mode 100644
index 000000000000..845ee09d3793
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2018.12.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez static-libs +ubertooth1-firmware +udev"
+
+DEPEND="bluez? ( net-wireless/bluez:= )
+	>=net-libs/libbtbb-${PV}:=[static-libs?]
+	static-libs? ( dev-libs/libusb[static-libs] )
+	virtual/libusb:1="
+RDEPEND="${DEPEND}
+	udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/host"
+else
+	S="${WORKDIR}/${PN}-${MY_PV}/host"
+	SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_BLUEZ=$(usex bluez)
+		-DBUILD_STATIC_LIB=$(usex static-libs)
+		-DINSTALL_UDEV_RULES=$(usex udev)
+		-DENABLE_PYTHON=false
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/${PN}
+	pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+	if [[ ${PV} == "9999" ]] ; then
+		ewarn "Firmware isn't available for git releases, we assume you are already"
+		ewarn "on the latest and/or can build your own."
+	else
+		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+		use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
+	fi
+	popd
+
+	elog "Everyone can read from the ubertooth, but to talk to it"
+	elog "your user needs to be in the usb group."
+}
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index 1341a9478aa6..845ee09d3793 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,7 +23,6 @@ MY_PV=${MY_PV/./-R}
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}/${P}/host"
 else
 	S="${WORKDIR}/${PN}-${MY_PV}/host"
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 11661dd546a2..e4462ad901ff 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -19,8 +19,7 @@ AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535
 DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 99c61326c402f60b384fa6c9a7381e43d4d021d7e44537a6e05552909270f30997da91b690d8a30aa690f0d1ce0aed7798bd8bb8972fcf6830c282ccc91193ac SHA512 46442cddb6ca043b8b08d143908f149954c238e0f3a57a0df73ca4fab9c1acd91b078f3f26375a1d99cd1d65625986328018c735d8705882c8f91e389cad28a6
 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa SHA512 8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 EBUILD wpa_supplicant-2.6-r10.ebuild 12648 BLAKE2B c67a87d8edae237a17d8799fb79c2aad65da5ba6a8c80d2a8ad925542e8fb0494a5f7732a0b9e4915d64f564507c347559c459e29190e10713474b4d00c27afe SHA512 518d7f5ba4f7cd0587151af95024b8d42d7220677ba2fc73a7b29a7e6a5c47b0947e7c353d74f38fe46f17f5fe91dc6c4bd61688a8a4fe2769e55f7e48131a20
-EBUILD wpa_supplicant-2.6-r6.ebuild 11810 BLAKE2B 2c4dccf5392657392567b56598a9cf98ab968b34da44210a7608e1eda9e2eea3fbadcd6c51bbd6cffab841295cf49aa8f17d2602be537fc107b7d08370282955 SHA512 eb1a814b2cb50a5b0752061b3563c514c69c4bd637b83f9ee0e477310510869d05a1f5cbc9e2f3f894886e4309fc60c10d2f77b30adcba9d590bf9c8adde93eb
-EBUILD wpa_supplicant-2.7-r1.ebuild 11763 BLAKE2B fba2545d7c383f4df338dce069c1011c803efd2d2e70cf43efe26b46df4d72ab60856759febc13af936baae7ff7d159b16a4b304deaf318ee99991469e14802f SHA512 eacaaeb231b4dfc79ecd4e49cfd8fdbcb0e95aca7a497de4daf127581cd70c1935df7fa0e4c62fb2a518b3a20bfd486933cc63dbc829e53960cfbbcf66e59e16
-EBUILD wpa_supplicant-2.7.ebuild 11704 BLAKE2B ee03f052b3e896025970ae8be65aea336c3c0cee3eed18af4e0f6e8d5a91b1fe1a851954b3114fbdbb8a7cca99b193f9a84509e3ec0ff5cfeff6fa03d6b79d4a SHA512 ad8dedda2a83e5ba230a60b3e32471eba5334ebe7bb80f9e048a09c0701f29652ea4184d29a84736b4708db9325481056301fdff868b085e32f952577507e33b
-EBUILD wpa_supplicant-9999.ebuild 11604 BLAKE2B bba465e8a711a22fda12cfea28378e9cef2b0f634f1c268e55bd8da5a9f630f4ca0001709c54f37160a4aa1dcdd6888f6d20c18fcd53c2b843c7399c00f54b15 SHA512 005f63ab95bdd23156ba9a878fdd06dd119b9a4bf8de2a06a12e48c24851975f8a9d20ace85883184a5ca42289cbb60d578ff8ea1b2aabecde39b79ebf99e2da
-MISC metadata.xml 1387 BLAKE2B d18ad59ec0e7852ed299596a6217d705f3344b1e215875fa5eb4afb9aeb91d17edd77ed35e5cb83b6868b529d3c173574f7d1810f2f145c8398860f72b0792fe SHA512 ab26df54e5dc68ef0db3f654df1dbf144b38d78e63d11d428bd04a4b374c6b704b334e3812a4042b4827bdab887bebe6de24a82c05edb7df7d614d4d4b8925fb
+EBUILD wpa_supplicant-2.7-r1.ebuild 11750 BLAKE2B eb1e7a72330890822359cc0d006957cd6e25723bc063ee739148a9923aa5d966287e5f35049190dbf730f116025bfc960545561d869ca8d06ad35a92c88bbd26 SHA512 b9bd97e080835f1aeec619cab60e5bf23382b6a91bead57373edef72064b53945ee4722ec4ebd23ce8d5d95d342a56f72d9c508910176d890e796067802b1746
+EBUILD wpa_supplicant-2.7-r2.ebuild 11270 BLAKE2B 1ac5d009139055a44a2879354268e8a730b4fd7b6a925d3d9ff0e58f4191bb64a8813c4e1537a06cb692c7b38bd62dca3f5d849db7aed6d32dc5c1f2e27b4b6d SHA512 3bc2eb8541e3de4303b2f947ee1cd2e51dd8e684e073b89674f5ef2b8fb4d3dc88a38ff272ee1c36b3ad57d2728a0b2b65e894d2342c0ddd68fbb264f2cf264d
+EBUILD wpa_supplicant-9999.ebuild 11115 BLAKE2B 2472a9b7048cba9b89b3897688791c8ec58ad1d91eadecf96f457565af94a592412c508a1a2716f2dbb31c50ce36f2bfb7f51eac978fa80318b6ae07fe8b9e1d SHA512 44347702a69a244f3c6f599dfb0e59ec114d3a737b15ba1a25fce99ddfe8e3bae9a54429888d7f2cbb37ddbf09818135a94786abf842b2fd36cde6857d0ec4bf
+MISC metadata.xml 1445 BLAKE2B ef11ad35ecd137b01122d8545607e450ddffe4f015d91ac548f3e040a519aca1d08cf60c136a8a56fef7baccbc56d7acb884779c9e51b873906bce67a34155b7 SHA512 ed650c94e746ab3f4c8e6a2f105472f212053bc1c8934c2a1234740da0cdb75faa512d0d677557e1ca5ee38db1d1eba59f94ac63e3aaf83d8fa2b898989ce3e8
diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 885b7c3d6bbd..4d369c2c3865 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="eapol_test">Build and install eapol_test binary</flag>
 		<flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag>
 		<flag name="hs2-0">Add support for 802.11u and Passpoint for HotSpot 2.0</flag>
+		<flag name="macsec">Add support for wired macsec</flag>
 		<flag name="p2p">Add support for Wi-Fi Direct mode</flag>
 		<flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag>
 		<flag name="privsep">Enable wpa_priv privledge separation binary</flag>
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
deleted file mode 100644
index df073740892b..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.6-r6.ebuild
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/"
-SRC_URI="https://w1.fi/releases/${P}.tar.gz"
-LICENSE="|| ( GPL-2 BSD )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="ap dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
-
-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=
-	)
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.2k:0=[-bindist] )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	!ssl? ( dev-libs/libtommath )
-"
-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
-}
-
-pkg_setup() {
-	if use ssl ; then
-		if use gnutls && use libressl ; then
-			elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\""
-		fi
-	else
-		elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation"
-	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}/${P}-do-not-call-dbus-functions-with-NULL-path.patch"
-
-	# bug (596332 & 651314)
-	eapply "${FILESDIR}/${P}-libressl-compatibility.patch"
-
-	# https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"
-	eapply "${FILESDIR}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
-
-	# bug (640492)
-	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-}
-
-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
-
-	# 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 EAP_TLV
-	Kconfig_style_config EAP_EXE
-	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_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
-	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
-
-	# SSL authentication methods
-	if use ssl ; then
-		if use gnutls ; then
-			Kconfig_style_config TLS gnutls
-			Kconfig_style_config GNUTLS_EXTRA
-		else
-			Kconfig_style_config TLS openssl
-			Kconfig_style_config EAP_PWD
-
-			# Enabling mesh networks.
-			Kconfig_style_config MESH
-		fi
-	else
-		Kconfig_style_config TLS internal
-	fi
-
-	if use smartcard ; then
-		Kconfig_style_config SMARTCARD
-	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 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
-	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
-	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
-
-	doman doc/docbook/*.{5,8}
-
-	if use qt5 ; then
-		into /usr
-		dobin wpa_gui-qt4/wpa_gui
-		doicon wpa_gui-qt4/icons/wpa_gui.svg
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	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.epitest.hostap.WPASupplicant.service 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
-
-	# 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
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
index 16e14e933ddc..54a02a98ae6c 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
@@ -12,7 +12,6 @@ LICENSE="|| ( GPL-2 BSD )"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
new file mode 100644
index 000000000000..311119d282de
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r2.ebuild
@@ -0,0 +1,435 @@
+# 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 ~x86-fbsd"
+	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+fi
+
+SLOT="0"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+
+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"
+
+	# fix undefined reference to remove_ie()
+	eapply "${FILESDIR}/${P}-fix-undefined-remove-ie.patch"
+
+	# bug (672632)
+	eapply "${FILESDIR}/${P}-libressl.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+}
+
+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
+
+	# 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 EAP_TLV
+	Kconfig_style_config EAP_EXE
+	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_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
+	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; then
+		Kconfig_style_config EAP_PWD
+		Kconfig_style_config FILS
+		Kconfig_style_config FILS_SK_PFS
+		# Enabling mesh networks.
+		Kconfig_style_config MESH
+		#WPA3
+		Kconfig_style_config OWE
+		Kconfig_style_config SAE
+		Kconfig_style_config DPP
+		Kconfig_style_config SUITEB
+		Kconfig_style_config SUITEB192
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	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 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
+	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
+	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
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	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.epitest.hostap.WPASupplicant.service 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
+
+	# 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
+}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild
deleted file mode 100644
index 12a69aa090d4..000000000000
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.7.ebuild
+++ /dev/null
@@ -1,456 +0,0 @@
-# Copyright 1999-2018 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"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
-fi
-
-SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
-
-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=
-	)
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	!ssl? ( dev-libs/libtommath )
-"
-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
-}
-
-pkg_setup() {
-	if use ssl ; then
-		if use gnutls && use libressl ; then
-			elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\""
-		fi
-	else
-		elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation"
-	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"
-
-	# fix undefined reference to remove_ie()
-	eapply "${FILESDIR}/${P}-fix-undefined-remove-ie.patch"
-
-	# bug (640492)
-	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
-}
-
-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
-
-	# 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 EAP_TLV
-	Kconfig_style_config EAP_EXE
-	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_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
-	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
-
-	if use suiteb; then
-		Kconfig_style_config SUITEB
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		if use gnutls ; then
-			Kconfig_style_config TLS gnutls
-			Kconfig_style_config GNUTLS_EXTRA
-		else
-			#this fails for gnutls
-			Kconfig_style_config SUITEB192
-			Kconfig_style_config TLS openssl
-			if ! use bindist; then
-			  #this fails for gnutls
-			  Kconfig_style_config EAP_PWD
-			  # SAE fails on gnutls and everything below here needs SAE
-			  # Enabling mesh networks.
-			  Kconfig_style_config MESH
-			  #WPA3
-			  Kconfig_style_config OWE
-			  Kconfig_style_config SAE
-			  #we also need to disable FILS, except that isn't enabled yet
-			fi
-
-		fi
-	else
-		Kconfig_style_config TLS internal
-	fi
-
-	if use smartcard ; then
-		Kconfig_style_config SMARTCARD
-	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 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
-	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
-	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
-		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
-	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.epitest.hostap.WPASupplicant.service 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 || use gnutls; then
-		if ! use libressl; then
-			ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)."
-			ewarn "This is incredibly undesirable"
-		fi
-	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
-}
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index df34e7baa75c..e0e179eeae04 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,15 +12,13 @@ LICENSE="|| ( GPL-2 BSD )"
 if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
 fi
 
 SLOT="0"
-IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
-REQUIRED_USE="smartcard? ( ssl )"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap +hs2-0 libressl macsec p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 CDEPEND="dbus? ( sys-apps/dbus )
 	kernel_linux? (
@@ -39,17 +37,8 @@ CDEPEND="dbus? ( sys-apps/dbus )
 		sys-libs/ncurses:0=
 		sys-libs/readline:0=
 	)
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0=
-			net-libs/gnutls:=
-		)
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)
-	!ssl? ( dev-libs/libtommath )
+	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+	libressl? ( dev-libs/libressl:0= )
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
@@ -88,16 +77,6 @@ Kconfig_style_config() {
 		fi
 }
 
-pkg_setup() {
-	if use ssl ; then
-		if use gnutls && use libressl ; then
-			elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\""
-		fi
-	else
-		elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation"
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -154,6 +133,11 @@ src_configure() {
 	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
 
 	# Basic authentication methods
 	# NOTE: we don't set GPSK or SAKE as they conflict
@@ -225,34 +209,20 @@ src_configure() {
 		Kconfig_style_config WPA_CLI_EDIT
 	fi
 
-	if use suiteb; then
+	Kconfig_style_config TLS openssl
+	Kconfig_style_config FST
+	if ! use bindist; then
+		Kconfig_style_config EAP_PWD
+		Kconfig_style_config FILS
+		Kconfig_style_config FILS_SK_PFS
+		# Enabling mesh networks.
+		Kconfig_style_config MESH
+		#WPA3
+		Kconfig_style_config OWE
+		Kconfig_style_config SAE
+		Kconfig_style_config DPP
 		Kconfig_style_config SUITEB
-	fi
-
-	# SSL authentication methods
-	if use ssl ; then
-		if use gnutls ; then
-			Kconfig_style_config TLS gnutls
-			Kconfig_style_config GNUTLS_EXTRA
-		else
-			#this fails for gnutls
-			Kconfig_style_config SUITEB192
-			Kconfig_style_config TLS openssl
-			if ! use bindist; then
-			  #this fails for gnutls
-			  Kconfig_style_config EAP_PWD
-			  # SAE fails on gnutls and everything below here needs SAE
-			  # Enabling mesh networks.
-			  Kconfig_style_config MESH
-			  #WPA3
-			  Kconfig_style_config OWE
-			  Kconfig_style_config SAE
-			  #we also need to disable FILS, except that isn't enabled yet
-			fi
-
-		fi
-	else
-		Kconfig_style_config TLS internal
+		Kconfig_style_config SUITEB192
 	fi
 
 	if use smartcard ; then
@@ -273,6 +243,13 @@ src_configure() {
 		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
@@ -404,7 +381,7 @@ src_install() {
 		insinto /etc/dbus-1/system.d
 		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
 		insinto /usr/share/dbus-1/system-services
-		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+		doins fi.w1.wpa_supplicant1.service
 		popd > /dev/null || die
 
 		# This unit relies on dbus support, bug 538600.
@@ -429,9 +406,9 @@ pkg_postinst() {
 		ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
 	fi
 
-	if use bindist || use gnutls; then
+	if use bindist; then
 		if ! use libressl; then
-			ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)."
+			ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
 			ewarn "This is incredibly undesirable"
 		fi
 	fi
-- 
cgit v1.2.3