gentoo resync : 18.05.2019

8 files changed, 46 insertions, 479 deletions

diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index b69a4b01a0b5..c7e2c4e53185 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,12 +1,8 @@
-AUX iwd-have_config_h-fix.patch 2719 BLAKE2B 1b7f2bd3a58f269f44db3664d9d9aea12d5b9c9d0ed1bde656a51e6a97b12319b71c43432a80e18dec0deebf1ea7da93c03b144f2c1bf558fe810795adcf2eea SHA512 8b0f29ca370a781b452dd7a33d04d7ecd5a5fa02aa8d4e7863fec16bcd739f47319981ff62e372ec0838cd94c21c66f7c259a1074ebdf7efbc0562b1d5522d4c
+AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
-DIST iwd-0.14.tar.xz 700844 BLAKE2B 69f3a1e5ead28cb602e7638e44d2a42a1b25831b837bf5f1d3436d3832a0548da7c3afe9f748688c194cf9e9bc5ea9303924ca1d36dea36d9e2233c245fc25eb SHA512 91713b3cbe8830abb95705e67c7b66f1ced368fe83eeaad36170da9df22b965e97485068e9342e09291aee669890de8f328e33fc3f092ba45097f523d83c7484
-DIST iwd-0.16.tar.xz 717880 BLAKE2B b4d1f3ebfc2f98920b205aefdf340cd55d803967a2b776e0798f1728cbd78e6be9b862f77b423ef2555b5f990341ef9b1e6f2aaf7460f08f37205a7edbaeda82 SHA512 33b10516fb203eb92651e18ebff8448874452fad9425470bf4306b4d75a512d386561ed4fcd251c54175ac6953e29f6574175e4e9b18c88e55009f670f29ddb1
 DIST iwd-0.17.tar.xz 720500 BLAKE2B 8bd931421663b71eb7bbdc4a72e10fe325ede4a3d075a8d477ee80040f23d3a8645f1c8c24f8c5f3e615049273968ea48687bcbc5480d05af3aabf135d0e7118 SHA512 fcec43cb9d470dec783fcafd8485e2e25f7c5ccc4283bc58c299fb816609b4e03ca241f1fe9f73025a08863e89ae8d7b7ceb6ae02524eb681a61079c5a28534a
-EBUILD iwd-0.14-r1.ebuild 2652 BLAKE2B cb88827c197d5968827d0c397ba6bbf3e8e88223dd4a015d3f2a4f8490cce34ddb59a7bd9c6587bf9845b051be5c500a6ae66c940318a412ec5f389dd80fc72d SHA512 af3ac14678611104d0cc7d623b81fac240a593fcb7d87e8eebd63b000d8e1ae9d2e47cc0a3f37ad207b7b8d798040e64c7caa0e163651355da6e80da1014de1c
-EBUILD iwd-0.14.ebuild 2615 BLAKE2B c14acea16c834b36a420fb17e3bec2533fed073d1cd6406b6a786a1a2e31cb28851cfe8160034c4201fb0c62b9df05dbf0a3cade9377934da4badf3308f12643 SHA512 beb3e69e994ca383530bdd8660d0ea1f33d04ce2cee13a84d1addc0fbf9f3ed0d3c8b1078c3c02e2ca89ee4b104c04a3812fa710b904fe8ad497908dbd156d05
-EBUILD iwd-0.16.ebuild 2909 BLAKE2B 1923b128df85fbfb4979c8d7558ec7a24b3df3342b03de1a818808f298ef998d4df8dad7ec1e4412293984a115cf3ee70291c26b5588b642bd6c295c89f4e59e SHA512 516e0e4917f18b58d18c647430d01ffdda5beb5e1c909c0b537014718d33194fe53042014bcaf853aff29904f71cbd35ca64899772fa8fcd8bceaa4a8bd86118
-EBUILD iwd-0.17-r1.ebuild 2888 BLAKE2B bc32d342d643b7b0b653bbcd1f5f1ffee33b47239c4766c1f23a05b95dc2203196c8f38130dcaf1e8b0465916e5de552ad7b03ef711e0f221e1cbe964d9b482a SHA512 3e5915506ade402d413fe739bf1f8f5ae7fedea42f5a3f0b3a3ec70c4977189d98a278a51f5bb0a711b236a7ff906b963575cbb78c2558527e1f6ff781ca8423
+DIST iwd-0.18.tar.xz 738168 BLAKE2B b37bde01952542583d82439639c39c06a1a5b6c359bbd092e631be6d25975498eb9bad9f71f3eeaa4b571e9d195e6f1113b17f758f386d49e6ee2d2cf071387f SHA512 0eb5558f7bafe521aaf80f24e5818c1fb0dfa6445c671c4454d3a4f67f97643a1232709b1e9c376cbe09dd7ba521651e1e46328cce0bfe1befe15668d6081cd6
 EBUILD iwd-0.17.ebuild 2854 BLAKE2B 06f93df8287f832865068dceb4fab0663077a9dc70fd638ad8a8d011ff7500bfce80525e0cb50a1c26aff2289aa8db26b9be7aa54cb8e7ba3e91983b3ca689e1 SHA512 867781ef69f9486ed2ab971e38ff5c88de76508a08604977836ec8d81e0a3588749af4cb47219a1332ac294e310e5f2dfd598c40e11c30268f0b59d320496cc1
+EBUILD iwd-0.18.ebuild 3798 BLAKE2B 80da5037232d27a1e8fdb39807eb426eaec3372a0f3d9151c6861bfef8ef959f4555ee522863c626a302447e7fa3ace98ec66d04c96d3451e4ef55e3ba87fb0e SHA512 b77f776a9c079af6e34854d44c687ca97770a91f92805174a2ebf9a4091815f67b85139151c884af5b888f5551e846ee0b5f8d57cc5070e7623151c1307a4b95
 EBUILD iwd-9999.ebuild 2854 BLAKE2B 06f93df8287f832865068dceb4fab0663077a9dc70fd638ad8a8d011ff7500bfce80525e0cb50a1c26aff2289aa8db26b9be7aa54cb8e7ba3e91983b3ca689e1 SHA512 867781ef69f9486ed2ab971e38ff5c88de76508a08604977836ec8d81e0a3588749af4cb47219a1332ac294e310e5f2dfd598c40e11c30268f0b59d320496cc1
-MISC metadata.xml 507 BLAKE2B fbe55ec45043cda66a6e67c2fe1c74963f555888bea54648c555a856c2c7b2b416adfdd27f8e36e87fb6159900ae3688ef343f327346bf28475556ec82704ec2 SHA512 31f01f5a9f5076bd8280fff136dac3ddac33c22997246cbe8d63df401a1c4c97ef66e0b081d3698c63ec34548d839c00eaaa165cbec53b5ad31fc5f07e8dfbff
+MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/files/ead.initd b/net-wireless/iwd/files/ead.initd
new file mode 100644
index 000000000000..b1bbcd92fbb8
--- /dev/null
+++ b/net-wireless/iwd/files/ead.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/ead.pid"
+command="/usr/libexec/ead"
+command_background="yes"
+
+depend() {
+	need dbus
+	keyword -shutdown
+}
diff --git a/net-wireless/iwd/files/iwd-have_config_h-fix.patch b/net-wireless/iwd/files/iwd-have_config_h-fix.patch
deleted file mode 100644
index 45ad8655127c..000000000000
--- a/net-wireless/iwd/files/iwd-have_config_h-fix.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 23041a44dd6c3fcaa18e5cb3f63140e3cb76d6b8 Mon Sep 17 00:00:00 2001
-From: Marcel Holtmann <marcel@holtmann.org>
-Date: Thu, 4 Apr 2019 14:02:38 +0200
-Subject: build: Add missing HAVE_CONFIG_H guards and include config.h
-
----
- plugins/ofono.c         | 4 ++++
- plugins/sim_hardcoded.c | 5 +++++
- src/eap-mschapv2.c      | 4 ++++
- src/nl80211util.c       | 4 ++++
- src/plugin.c            | 4 ++++
- src/sae.c               | 4 ++++
- src/simauth.c           | 4 ++++
- src/simutil.c           | 4 ++++
- 8 files changed, 33 insertions(+)
-
-diff --git a/plugins/ofono.c b/plugins/ofono.c
-index 077045ff..fc2561f6 100644
---- a/plugins/ofono.c
-+++ b/plugins/ofono.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <stdio.h>
- #include <ctype.h>
- #include <stdio.h>
-diff --git a/plugins/sim_hardcoded.c b/plugins/sim_hardcoded.c
-index b5ea6b09..6e87f347 100644
---- a/plugins/sim_hardcoded.c
-+++ b/plugins/sim_hardcoded.c
-@@ -19,6 +19,11 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  *
-  */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <errno.h>
- 
- #include <ell/ell.h>
-diff --git a/src/eap-mschapv2.c b/src/eap-mschapv2.c
-index 78404e22..e1f4ab5d 100644
---- a/src/eap-mschapv2.c
-+++ b/src/eap-mschapv2.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
-diff --git a/src/nl80211util.c b/src/nl80211util.c
-index 0d690e86..a9c3914a 100644
---- a/src/nl80211util.c
-+++ b/src/nl80211util.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <linux/if_ether.h>
- #include <ell/ell.h>
- 
-diff --git a/src/plugin.c b/src/plugin.c
-index 2d96f657..a62fb033 100644
---- a/src/plugin.c
-+++ b/src/plugin.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <fnmatch.h>
- 
- #include <ell/ell.h>
-diff --git a/src/sae.c b/src/sae.c
-index 782a3069..cab004bd 100644
---- a/src/sae.c
-+++ b/src/sae.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ell/ell.h>
- 
- #include "src/util.h"
-diff --git a/src/simauth.c b/src/simauth.c
-index 5ed4dde7..4244304a 100644
---- a/src/simauth.c
-+++ b/src/simauth.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
-diff --git a/src/simutil.c b/src/simutil.c
-index 8de0645f..f0542c71 100644
---- a/src/simutil.c
-+++ b/src/simutil.c
-@@ -20,6 +20,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <ctype.h>
- #include <stdio.h>
- #include <errno.h>
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/net-wireless/iwd/iwd-0.14-r1.ebuild b/net-wireless/iwd/iwd-0.14-r1.ebuild
deleted file mode 100644
index bf525992339c..000000000000
--- a/net-wireless/iwd/iwd-0.14-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-RDEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~X509_CERTIFICATE_PARSER
-	"
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	econf --sysconfdir=/etc/iwd --localstatedir=/var \
-		$(use_enable client) \
-		$(use_enable monitor) \
-		$(use_enable ofono) \
-		$(use_enable wired) \
-		--enable-systemd-service \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd" iwd
-
-	if [[ ${PV} == "9999" ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-0.14.ebuild b/net-wireless/iwd/iwd-0.14.ebuild
deleted file mode 100644
index 5af13d86f0c9..000000000000
--- a/net-wireless/iwd/iwd-0.14.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-RDEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~X509_CERTIFICATE_PARSER
-	"
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/iwd --localstatedir=/var \
-		$(use_enable client) \
-		$(use_enable monitor) \
-		$(use_enable ofono) \
-		$(use_enable wired) \
-		--enable-systemd-service \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd" iwd
-
-	if [[ ${PV} == "9999" ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-0.16.ebuild b/net-wireless/iwd/iwd-0.16.ebuild
deleted file mode 100644
index dac6f5ea824f..000000000000
--- a/net-wireless/iwd/iwd-0.16.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic linux-info systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-PATCHES=( "${FILESDIR}/iwd-have_config_h-fix.patch" )
-
-RDEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~X509_CERTIFICATE_PARSER
-	"
-	if use amd64;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
-		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	econf --sysconfdir=/etc/iwd --localstatedir=/var \
-		$(use_enable client) \
-		$(use_enable monitor) \
-		$(use_enable ofono) \
-		$(use_enable wired) \
-		--enable-systemd-service \
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
-		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd" iwd
-
-	if [[ ${PV} == "9999" ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-0.17-r1.ebuild b/net-wireless/iwd/iwd-0.18.ebuild
index 416fab3d97bb..f5b667cf75fc 100644
--- a/net-wireless/iwd/iwd-0.17-r1.ebuild
+++ b/net-wireless/iwd/iwd-0.18.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
@@ -17,11 +17,13 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
-RDEPEND=">=dev-libs/ell-0.18
+RDEPEND=">=dev-libs/ell-0.20
+	net-wireless/wireless-regdb
 	sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
+	client? ( sys-libs/readline:0= )
+	crda? ( net-wireless/crda )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -30,6 +32,7 @@ pkg_pretend() {
 	CONFIG_CHECK="
 		~ASYMMETRIC_KEY_TYPE
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
 		~CRYPTO_AES
 		~CRYPTO_ARC4
 		~CRYPTO_CBC
@@ -49,6 +52,11 @@ pkg_pretend() {
 		~PKCS7_MESSAGE_PARSER
 		~X509_CERTIFICATE_PARSER
 	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
 	if use amd64;then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
 		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
@@ -72,6 +80,19 @@ pkg_pretend() {
 	fi
 
 	check_extra_config
+
+	if ! use crda; then
+		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
+			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
 }
 
 src_unpack() {
@@ -107,6 +128,10 @@ src_install() {
 
 	newinitd "${FILESDIR}/iwd.initd" iwd
 
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
 	if [[ ${PV} == "9999" ]] ; then
 		exeinto /usr/share/iwd/scripts/
 		doexe test/*
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
index cd5c5ab59023..b8cd886617b9 100644
--- a/net-wireless/iwd/metadata.xml
+++ b/net-wireless/iwd/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name='client'>Enable iwctl client tool</flag>
+		<flag name='crda'>Use net-wireless/crda for regulatory domain loading instead of in-kernel (4.15+) support</flag>
 		<flag name='monitor'>Enable iwmon monitor tool</flag>
 		<flag name='ofono'>Enable support for oFono SIM authentication</flag>
 		<flag name='wired'>Enable ethernet authentication daemon</flag>