13 files changed, 16 insertions, 211 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 9dc0829169d6..0a87db6bb2cd 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index c16ca811670f..df8b6c5dc349 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -1,4 +1,3 @@
-AUX crda-1.1.3-missing-include.patch 231 BLAKE2B 5bbc51cc0dc4dc553aa017b3557372a7cdc507fa09da7220794d9db2806ce969baba27360d822b9bc8be5dfb521a5fd6a7c0347c5013233e9642852024dcedb7 SHA512 d24f11a36e798e1da7951efbcd3925d7728a2519c75ff289bfaadc92090f17fb5b9b21010ad960fadfffe6c949b63eddc2b8282508fd5947486f31495cca2afc
 AUX crda-3.18-cflags.patch 895 BLAKE2B 0a8d8acb268ff58656a5b66a77744c14fd9f92fd6a660132f2a86a88a3cd5bde4bf39709c38f2705fe999bca312a991304b673d4d12a540cecffd1fcc4ec5cc1 SHA512 c4914cd0d4b0d3f0d16aaf4ff3cd91f961870bc0376f90998b1ec149f145dd347ff79763e8da12b5865a1c6e507a0ee8d306886ffe96fa80426c3bd914a5889d
 AUX crda-3.18-ldflags.patch 388 BLAKE2B 57d3ce3fccba1db8ad8bbfae2ba8e8dcd03bdd94c424761902bc2ea552c006c3e4ef1d8b913f095ba3601895bc29917d01c1e8f046a159b2b006b174bed7bf62 SHA512 3a53d3567fa9b3ff85d4e443124ea2637e5eb489ade4f160d8f1de92553a3a33c3eb9f9d80005ceac03b50e5c4aa7f0990bca3547c145644ab66985548c32e9f
 AUX crda-3.18-libreg-link.patch 908 BLAKE2B 60d9307ba43235cbce089835ae7406313b9f68a90fbe503130e81fb423e04d3f257e1a1d78db9fef605e42a4d9571c54e8ac9cb8a2569d3c3cd3f5c6d542a295 SHA512 41c98f1e4ca0ae3d22b08086eb54aefd4ec95fed5a6e5fafd55fb6a9b9649ec18f5f65003a1424cf59bf99e266fddf110c92d9e46a4b40a18be5931fc7bbbbeb
@@ -6,10 +5,6 @@ AUX crda-3.18-libressl.patch 410 BLAKE2B c341e349348eb7ce1ca3979865a2a984e44e627
 AUX crda-3.18-no-ldconfig.patch 748 BLAKE2B 1ef8aff911a5f4af14fb321782cfb40abc8a946dc80af95ec2c2d50e509f318d84be36190c5b899c882b6173617746600b04bf6d0c282a59c568c44e2f255d16 SHA512 faea7d4bfc0b1a4a674cb6c285975805985dc4211c43ca47da38102cb79a1d6d770aa6267e85d811998f9a13799335cfb6116f272ed40c4ecd6b3f813ca93a28
 AUX crda-3.18-no-werror.patch 916 BLAKE2B 2e7c79e14ae0ab05cbf032f104747eeea0df165197ba1ff8039fb14de43880894b03e59e14fe2d906b7f99c8d910cef701c1abcb68d9558cfd37d4455ce03501 SHA512 ab521bbc47826bb9356c8b96bee24f6e6d7f03a98036398627e840b89e7245329115664fc740d2b3c0d3a497ef638e3be3fa9d1e991a7e03a0753e078c8019e9
 AUX crda-3.18-openssl-1.1.0-compatibility.patch 8782 BLAKE2B 7906eedd86aca173199ec957516167cf940d41da668cc7c5b5935232984f88960c1e00c87dfcd03c7d068cdb9168525378c46e1c52b28a9714d14cddce9240df SHA512 417a67139f61c467cd13274d0e6ad1542107dbb00765beed5becccdb64ac0228236498241e1fba9dfd4a5e1acb04ee583c435b699cca9b6a6461e5b7e86328cb
-AUX crda-3.18-openssl.patch 1601 BLAKE2B 49c22bc12d3b1da7d4ef8cecc8f167ec8e0a76c6f71de151457006deeef49dca7ce9a550ab33f379d36421c029b4bd59934e1cf835c34a970845313b5aca37a0 SHA512 0ffd2b51689ee30b064494022127eb7933c9dfe6f90189ef4b6209f7f733813026da0b2cb7fcf473fa81549515355b7f5b285ce759a3f3053f95b290550a71fe
-DIST crda-1.1.3.tar.bz2 38697 BLAKE2B 5ca68362a134e6f5fad1a450edc3cfc083686d45750dbfdd04821f30e18873f86870d97fd796d1ea4dfc79f74f65dc548562890dcfc21f224ac76006878aea41 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed
 DIST crda-3.18.tar.xz 61516 BLAKE2B 76feac7fcf85b03b39bfe78de444515f54cd513041f81f7588cd7866e5bf072d000ad0c8df181ccacde7fc8125ed04ece00d5d9d3013df759b5f9fd05f8cfd56 SHA512 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
-EBUILD crda-1.1.3-r1.ebuild 1611 BLAKE2B 9e28635e093a1746b5b8d27cab156400f6aa7597054395058c0d91722d358ca581fb871b29d8e1a7bdf992b75903464006b2afa3ed001c75fd31adac9c0ae0e8 SHA512 de63b4c8ffdcb047c6d2dead406734e2cf1a3275918a88d64ff58cc0e27870f9355e3011d690609b92d18db09d788c0f65e673b1508c3f6efba58e8262a66e61
-EBUILD crda-3.18-r1.ebuild 2070 BLAKE2B 50b262cb62ee430d28e11383e53e8840d82f453d0cdaba60a1968f8dada923788f2679c5592ebd9a5b12ae6a3b471c9d7a55a6d61fa538cb17b6769caa6408c4 SHA512 5794efc8708aeeda30e03f17b22c47e03dc9d6a9274f52d18d5de94c4d3582cf427aaba77edee13f4183ec144609072276b11dbdf9433a9ca96028e3c0ec31ec
 EBUILD crda-3.18-r3.ebuild 2160 BLAKE2B 2ec9011409bb23ece341fdebac90f07b1489b6b211b4cf1c96dbb6077d9ae5804ad55ac11a8f16465b98515b15a4d0681e7ec1f07094d9d0f63734bc9e4283a3 SHA512 c08a38bbf714889e08f1865517fab94ee679c89117ba929c12f4441a634dd414710e8765ccf424d1718083b41851ad544f095a27cf29ba800178982bebac0ddc
 MISC metadata.xml 341 BLAKE2B 3164318aaf0c333f739b8c863660b2b77844b0aa7cdca818358f566dd6cfbf585e1b6661373e58e6c1116771cb4f23c962e27b24bf325cd415ee23a035d5d8a2 SHA512 ca1f9e4b85c7921ab86bf2b5c6be5c8ad07ec900ec23e0c602cc63e815c4e0036fc3ab03470debf645b4f3d444d986f16f9a120af56193d902150e15156f9d59
diff --git a/net-wireless/crda/crda-1.1.3-r1.ebuild b/net-wireless/crda/crda-1.1.3-r1.ebuild
deleted file mode 100644
index 89fd5c5fa4df..000000000000
--- a/net-wireless/crda/crda-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs python-any-r1 udev
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.kernel.org/en/developers/Regulatory"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0=
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
-	virtual/pkgconfig"
-
-python_check_deps() {
-	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-missing-include.patch
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-_emake() {
-	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
-	# that look like it should change it).  We want to use /usr/lib/
-	# anyways as this file is not ABI specific and we want to share it
-	# among all ABIs rather than pointlessly duplicate it.
-	#
-	# The trailing slash on SBINDIR is required by the source.
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		SBINDIR='$(PREFIX)/sbin/' \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN=/usr/lib/crda/regulatory.bin \
-		USE_OPENSSL=1 \
-		CC="$(tc-getCC)" \
-		V=1 \
-		"$@"
-}
-
-src_compile() {
-	_emake all_noverify
-}
-
-src_test() {
-	_emake verify
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/crda-3.18-r1.ebuild b/net-wireless/crda/crda-3.18-r1.ebuild
deleted file mode 100644
index b5394b975e71..000000000000
--- a/net-wireless/crda/crda-3.18-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs python-any-r1 udev
-
-DESCRIPTION="Central Regulatory Domain Agent for wireless networks"
-HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/crda"
-SRC_URI="http://linuxwireless.org/download/crda/${P}.tar.xz
-	mirror://kernel/software/network/crda/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE="gcrypt libressl"
-
-RDEPEND="!gcrypt? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	dev-libs/libnl:3
-	net-wireless/wireless-regdb"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]')
-	virtual/pkgconfig"
-
-python_check_deps() {
-	has_version --host-root "dev-python/m2crypto[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.18-no-ldconfig.patch
-	epatch "${FILESDIR}"/${PN}-3.18-no-werror.patch
-	epatch "${FILESDIR}"/${PN}-3.18-openssl.patch
-	epatch "${FILESDIR}"/${PN}-3.18-cflags.patch
-	epatch "${FILESDIR}"/${PN}-3.18-libreg-link.patch #542436
-	sed -i \
-		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
-		Makefile || die
-}
-
-_emake() {
-	# The source hardcodes /usr/lib/crda/ paths (ignoring all make vars
-	# that look like it should change it).  We want to use /usr/lib/
-	# anyways as this file is not ABI specific and we want to share it
-	# among all ABIs rather than pointlessly duplicate it.
-	#
-	# The trailing slash on SBINDIR is required by the source.
-	emake \
-		PREFIX="${EPREFIX}/usr" \
-		SBINDIR='$(PREFIX)/sbin/' \
-		LIBDIR='$(PREFIX)/'"$(get_libdir)" \
-		UDEV_RULE_DIR="$(get_udevdir)/rules.d" \
-		REG_BIN="${SYSROOT}"/usr/lib/crda/regulatory.bin \
-		USE_OPENSSL=$(usex gcrypt 0 1) \
-		CC="$(tc-getCC)" \
-		V=1 \
-		WERROR= \
-		"$@"
-}
-
-src_compile() {
-	_emake all_noverify
-}
-
-src_test() {
-	_emake verify
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	keepdir /etc/wireless-regdb/pubkeys
-}
diff --git a/net-wireless/crda/files/crda-1.1.3-missing-include.patch b/net-wireless/crda/files/crda-1.1.3-missing-include.patch
deleted file mode 100644
index a472e238f66f..000000000000
--- a/net-wireless/crda/files/crda-1.1.3-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/reglib.c b/reglib.c
-index bc81974..1fafd37 100644
---- a/reglib.c
-+++ b/reglib.c
-@@ -9,6 +9,7 @@
- #include <fcntl.h>
- #include <stdbool.h>
- #include <unistd.h>
-+#include <string.h>
- 
- #include <arpa/inet.h> /* ntohl */
diff --git a/net-wireless/crda/files/crda-3.18-openssl.patch b/net-wireless/crda/files/crda-3.18-openssl.patch
deleted file mode 100644
index 9147e862ee5a..000000000000
--- a/net-wireless/crda/files/crda-3.18-openssl.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From af009b7599d705a1023d7bc95c485e5a8776d2b8 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 4 Mar 2015 14:07:37 -0500
-Subject: [PATCH] fix openssl generation
-
-This file uses BN_ULONG but doesn't include the openssl headers leading
-to build failures:
-keys-ssl.c:2:8: error: unknown type name 'BN_ULONG'
- static BN_ULONG e_0[1] = {
-
-The large unqualified constants also break building:
-keys-ssl.c:8:2: warning: overflow in implicit constant conversion [-Woverflow]
-  0x63a2705416a0d8e1, 0xdc9fca11c8ba757b,
-  ^
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- utils/key2pub.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/utils/key2pub.py b/utils/key2pub.py
-index 3e84cd2..c504aca 100755
---- a/utils/key2pub.py
-+++ b/utils/key2pub.py
-@@ -24,7 +24,7 @@ def print_ssl_64(output, name, val):
-     for v1, v2, v3, v4, v5, v6, v7, v8 in vnew:
-         if not idx:
-             output.write('\t')
--        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
-+        output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2xULL, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8)))
-         idx += 1
-         if idx == 2:
-             idx = 0
-@@ -60,6 +60,7 @@ def print_ssl_32(output, name, val):
- def print_ssl(output, name, val):
-     import struct
-     output.write('#include <stdint.h>\n')
-+    output.write('#include <openssl/bn.h>\n')
-     if len(struct.pack('@L', 0)) == 8:
-         return print_ssl_64(output, name, val)
-     else:
--- 
-2.3.1
-
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 05c47d501422..f39e0ceb0a9e 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -3,6 +3,6 @@ AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600
 DIST iwd-0.17.tar.xz 720500 BLAKE2B 8bd931421663b71eb7bbdc4a72e10fe325ede4a3d075a8d477ee80040f23d3a8645f1c8c24f8c5f3e615049273968ea48687bcbc5480d05af3aabf135d0e7118 SHA512 fcec43cb9d470dec783fcafd8485e2e25f7c5ccc4283bc58c299fb816609b4e03ca241f1fe9f73025a08863e89ae8d7b7ceb6ae02524eb681a61079c5a28534a
 DIST iwd-0.18.tar.xz 738168 BLAKE2B b37bde01952542583d82439639c39c06a1a5b6c359bbd092e631be6d25975498eb9bad9f71f3eeaa4b571e9d195e6f1113b17f758f386d49e6ee2d2cf071387f SHA512 0eb5558f7bafe521aaf80f24e5818c1fb0dfa6445c671c4454d3a4f67f97643a1232709b1e9c376cbe09dd7ba521651e1e46328cce0bfe1befe15668d6081cd6
 EBUILD iwd-0.17.ebuild 2861 BLAKE2B c5e1d4a9828a20c30d45434d88b72ffce6598a000e005b6273a61d6d7d714667167501030ac67509a58363e4976b7cdcb0cdecde04cf596145ffbba657f1cead SHA512 fb1341de4cf116a5cbbc3f20cd7fa6b83b905564a60b5dd23fefd7b07f2d738c4c1d45a6206a812bbfd1fc9c2d3f3cd6305810ccfc8e27977b06a0a683cd74b2
-EBUILD iwd-0.18.ebuild 3805 BLAKE2B 3c5b74b16d08bfa3cdfd22218e49d0250dfeecf45b22a635cdee871db03c1902410f629df2185ea3360472b0e87cc8a7f7ce828b548001697242ef3d873e3d83 SHA512 d760823d5e7a9f8ff0389eaecc6e3dbe2a660e8d04c7cdf1ddceb560f8e806dae2659040c92474bfed0f0ce1102ab7601a3772255ab4718170bebd74b9471f41
+EBUILD iwd-0.18.ebuild 3818 BLAKE2B 7f9b8f253b53380f4bf1e5edb7af7aade64ee89ceef0d62546eaaf6d63f04f3c90f7d021def8a00191427ddaf293388334e8ed2419cfd3ded52a60a94084a693 SHA512 1267fccb115d704b2fd9d6412628b05a90df7193292e5b1c2624de5775b78215de94a9c9bb00a3e3563f88a9134fa02f6a0fa96308deb5ef8c339b6c1b09414a
 EBUILD iwd-9999.ebuild 2854 BLAKE2B 06f93df8287f832865068dceb4fab0663077a9dc70fd638ad8a8d011ff7500bfce80525e0cb50a1c26aff2289aa8db26b9be7aa54cb8e7ba3e91983b3ca689e1 SHA512 867781ef69f9486ed2ab971e38ff5c88de76508a08604977836ec8d81e0a3588749af4cb47219a1332ac294e310e5f2dfd598c40e11c30268f0b59d320496cc1
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/iwd-0.18.ebuild b/net-wireless/iwd/iwd-0.18.ebuild
index b1e62ae86e3b..cee477d005ed 100644
--- a/net-wireless/iwd/iwd-0.18.ebuild
+++ b/net-wireless/iwd/iwd-0.18.ebuild
@@ -68,7 +68,7 @@ pkg_pretend() {
 		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
 	fi
 
-	if use cpu_flags_x86_ssse3; then
+	if use cpu_flags_x86_ssse3 && use amd64; then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
 		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
 		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest
index 6ec34f911faf..4249fc5359e7 100644
--- a/net-wireless/wireless-regdb/Manifest
+++ b/net-wireless/wireless-regdb/Manifest
@@ -1,5 +1,5 @@
-DIST wireless-regdb-2018.10.24.tar.xz 23296 BLAKE2B d9fd3da8ff91514e671d14e3caed628f9bc7e338227b5f1164523f4c8125ae9abe2b998d026f8aaa612fda60ea4bdf3817f9808935cda984e137a75fb5b3ddde SHA512 1bf295a759c8807178eea8b421a2276f23eac8fc51742386867e8589e297f78a8466c011995daaa40b288ffb1db875142f124d93ce637a8967e548e9b5ce2174
 DIST wireless-regdb-2019.03.01.tar.xz 23196 BLAKE2B 804ad05a0270df58dd89eb7193f8b568b5534abfc52b35f519e27cfa1f1922db457c77477b3014bd6b48cdd1bbe9e859a6508afa848cf01efbbf6b20d10c4984 SHA512 f0b94e1f661d86f4fcd39384588e10d7353ad085563ddc40a98446b416ce0d7bd0cbe34f1d9620ac45a33f16b7bfe58419da915061942cd5f51d5a3bf9809d72
-EBUILD wireless-regdb-20181024.ebuild 1073 BLAKE2B 493b37398960a9ae1e08f9bbbbd95e20ee5c777f26ff0e1e6baef77a5d130656cfbdfbb0c6fbda79479a7241b3f798f4c81741fd8b940602aeceb725a46b7429 SHA512 4069e29d136f4181ad80623827506bb972c2f5219260530f7f4f0c79991580aa43d0ad7fe0caf3eab7c7a5589ad0b467e90bbeb54902823ccc81252657ca3b0b
+DIST wireless-regdb-2019.06.03.tar.xz 23176 BLAKE2B 46ed9c25103a57d2370f07035f27ffd89d6a65cdccb22d283aef524aff60b669f21dd4a4dd78c68229a443640a5fd0faa1ad6917e712181881d4b27ead74f480 SHA512 73209ca28c59d6760349ffb713f550300e80db1592bae52b6d252ac9401fa2bb2ace7e6c30cf55df7541da9cef4c8587f3790f7aa34529552468e4b63a3d8fdb
 EBUILD wireless-regdb-20190301.ebuild 1072 BLAKE2B 01bb8430f1e4867ec1b68b11544a0d104ea419e7ad6910d0f17e670635f81b830340f6661b9fda172659273a462f4a18f2196bd7cb1a0725830d60cddc737e79 SHA512 99eb1e6196130b621c83819968c269f36994e0f6c85f8e42a03647af15acd5b8da38a5206f3e88678821981e3fe59da33345120ac5609f09c0c2b49c0cb451af
+EBUILD wireless-regdb-20190603.ebuild 1072 BLAKE2B 01bb8430f1e4867ec1b68b11544a0d104ea419e7ad6910d0f17e670635f81b830340f6661b9fda172659273a462f4a18f2196bd7cb1a0725830d60cddc737e79 SHA512 99eb1e6196130b621c83819968c269f36994e0f6c85f8e42a03647af15acd5b8da38a5206f3e88678821981e3fe59da33345120ac5609f09c0c2b49c0cb451af
 MISC metadata.xml 457 BLAKE2B b9df8d376a76636ad2c8b8e78414889163936311a12421871a57d28c83c249da98a275b37a9b4a32ab979b194eb2ca000f34503dfe01a18c7c61e4044478ffd6 SHA512 0ee51061d82f0d81f263b479b1932666109450df0bf8c72faca8881f0417f2940245a0099ddc785526b95dcfffcc255de8a07f27356239781921dec10827c4bd
diff --git a/net-wireless/wireless-regdb/wireless-regdb-20181024.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20190603.ebuild
index 29d121a15679..d38887cb9ee6 100644
--- a/net-wireless/wireless-regdb/wireless-regdb-20181024.ebuild
+++ b/net-wireless/wireless-regdb/wireless-regdb-20190603.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 44a9fe8ac0dc..d3d6c42ca44a 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -22,6 +22,6 @@ DIST wpa_supplicant-2.8.tar.gz 3155904 BLAKE2B 260b4830949a3e051ef4f33f279b3b225
 EBUILD wpa_supplicant-2.6-r10.ebuild 12647 BLAKE2B 1c79f30a1746cb72ca4a8dd1353fc943731ab13633ec963f53f36ddf8c75a64bc738e9be75a059d174e05f85693b251de413f8733d47392de53c8bdbcd8bec75 SHA512 dca78957810df5fd52a1a4bbc7fdb5460dad19b2388124ef90c4616e4684eeac01ea60f0436d9c81ad168ac7acf5f56011270a0972fc42da58d2731539993ba8
 EBUILD wpa_supplicant-2.7-r1.ebuild 11750 BLAKE2B eb1e7a72330890822359cc0d006957cd6e25723bc063ee739148a9923aa5d966287e5f35049190dbf730f116025bfc960545561d869ca8d06ad35a92c88bbd26 SHA512 b9bd97e080835f1aeec619cab60e5bf23382b6a91bead57373edef72064b53945ee4722ec4ebd23ce8d5d95d342a56f72d9c508910176d890e796067802b1746
 EBUILD wpa_supplicant-2.7-r3.ebuild 11552 BLAKE2B 2634e6f8bf06e5a9f65dc52194334bda1b89fafc5db5d5c080840944c58431d8271eac507d3ae33ea9496ca05bffa76d2852231ae39032f697feb297ec895b9b SHA512 83fef1ecea3a7b21a995920018a63b4cd3f3f5019573aaa559faae16bf8550e4fd4f1b26fb96d3f94dead411067f11ffc444a37728883bedb73e493f1a476d69
-EBUILD wpa_supplicant-2.8.ebuild 11488 BLAKE2B 60d9bb625804d9b4fffc57fc5411375779d1eecc66cfb6fa5390b2111753a8caf4d17f13ed0532512f0a8e8fd2972c6bb00b5c56f3c212f7194468b08603f3fd SHA512 be7f3e6427b251d3a95820dc8ad663da424e5f7e72f3cc56eb4c69564be79f13ce56a4f03205fd00da6f9c790884ab3bc8fd43bc395b95174f4c8d20b412947a
-EBUILD wpa_supplicant-9999.ebuild 11222 BLAKE2B ca6d09a2f3180b689d8de30977c5aa0f02ba6c5936e5c844fcd44e13f3a368b86a0bba1686fb5009f37a8e7213ba9f94df0107f5173635fb404e0b38e9c93e32 SHA512 70627970bb212a003c7584b12f2541fa4e0e237c98b85693908e07a23932e24baaa88f0ce9ba3a1cc834b0d0fde094eeae2d248874399b738eac49a32d7ebfe4
+EBUILD wpa_supplicant-2.8-r1.ebuild 11627 BLAKE2B defe69a18774aac46f7666a6a32b4dfc76241022640b218b86982ef42014c63303f8df1dd2a10d3cc898b03abcba0506ec968a4e9f23ac8b8c72c7a09b9d2f47 SHA512 78f196f1c9868ffd2e82f865911bc702dac7badafe497d92c810520e07b3194392e828d51e2ee7b676ca56180f4e396f008cd54c1185597312be79e2989abd89
+EBUILD wpa_supplicant-9999.ebuild 11361 BLAKE2B cbac3abdabd5438ce306317f5b8616d93feaf4260fada105e8ac452f70a131696e4f956f1bc09a07005856548648838f634f3d967beec7c4c393f5257c25b282 SHA512 29a6025e9ce15f9e27465dcc155d6089dccc2e0b6e2422c4acd3ae715d5657e043377c6534d9fa3f4f2dc89fc08e4fab90a1424c411dccfc59491580c9405c74
 MISC metadata.xml 1523 BLAKE2B 50ad101e8ccf8a08b6c778c5108c518b81f2d28770f7cf4b770aa92a7a16da5806354bfe4ac1342fdb7a1f1fdf943272507f9c7308c5f421e2ee7d7d20c70266 SHA512 3ea8bfd877e93ebe91a75f989fe09e11546d76ffbea1ddf559de0829d6728cd4bdac64321971011eccd673e8dfdd446bf4a67e4619f07c3f8330816d5a815ee2
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
index 69128d52bd29..52bb73740689 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.8.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.8-r1.ebuild
@@ -168,6 +168,10 @@ src_configure() {
 		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
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index d5ae9e59fef2..98c75f3618e1 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -168,6 +168,10 @@ src_configure() {
 		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