gentoo resync : 16.09.2020

9 files changed, 84 insertions, 649 deletions

diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index c73d2e04f5d3..996289cf196b 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -2,15 +2,9 @@ AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060
 AUX iwd-1.8-eapol-prevent-key-reinstallation.patch 2575 BLAKE2B 1e9683e551178ff54f31f9c8e861afb4b1cbe6d2f11188043d2bc6075fb21fe2637db4b13a4b93c900b9450034d28088e525e42ff0cfea08341fb056c7c74fc2 SHA512 e39965ae121e42ff17c1cc05539af1d9005748d05c0fe2ff4ef7884c3b224973a30875961476ecaad7f6f7567e79dd33bc854be05a71b37c4c05a19e2b60fced
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
-DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
-DIST iwd-1.6.tar.xz 844900 BLAKE2B 97d7162da88f550383ce9b3348b18e4e2e241242d7bf1eb99a904ca496afb8db287bcb426942246824e71a68127c38cf947b7f427f845eee2aa9ba6b4caa184c SHA512 79541672d55078daff0809841f99862ac538174aba8d9b0fb356cfa0b7e025538d9a84f79c35d2ef93114d8476273c3c72890f59cbee807b2bd0b85c0f4b9b55
-DIST iwd-1.7.tar.xz 846040 BLAKE2B a765513da5482ab5856d1d47c3b302dc65efe3b10f444f263ee11a24df716bb46237aa689538e11dd5b9744cfcf0cd00ff5ab5cd11e37a56c9ad85cf7361b177 SHA512 3012a7725a909737b48c803289513138d057dec3b99f98a7de91eef0eb58e145537809e7ed84afddc4f061d27d5e448f1fc9d6ac2a748d496bf97656baab48ad
 DIST iwd-1.8.tar.xz 865668 BLAKE2B ba1be5c1658df950fe28deca6b8c3c9482eda260fbd05f721cb34cadcb2852768086e65e7c74940bc6ddd345d1438624b59bdfe4b6a5323dd122a0cd397008d7 SHA512 f1caa330b3ff18b4598efec596a4b9a22887833218a90d19d59717503679eff71fdb990cb63bd74b8f1523197a366cd803d799259e8002e5cde2745b03d51d8e
-EBUILD iwd-1.5.ebuild 4213 BLAKE2B afe140abb9952750957c147736baa5b23d085e6899a03a814719fcddce419ddda4d76138e79641346c0d71ed2b70c4b4fb3b07cfe768a3beadff435171d28d88 SHA512 b580d7c67914ad4b0a1e99977358d7ccaacc854984c4c066f2bfb23bb54a8b011ff9ea500a5748d78b0ccd5ef658d55051c6a899cb6b0f172badf712e031bc96
-EBUILD iwd-1.6.ebuild 4230 BLAKE2B 209a21ab5524456d539af9164a986a25f367c0b2e380fc98cd88017ebac0f34369832259919afea695b34a9b39e04b637ea3584e78cb60f3b71c9e7dc5a9c073 SHA512 a1a99b605f0393828cea5077b6d4f2babb637e2028b2f41c7e809bb2ed86ec2c4a8e3c9c29e2dff39d9e72af3a258d9e24c723df41a0932b0d50ce0a8be207bc
-EBUILD iwd-1.7-r1.ebuild 4222 BLAKE2B 494bb710cdc7b76bb702da467ce2bce7151cc27d239580b08bbd903b04c49375a10559353a69a2cb3b32abccef283d5cd5ef2882bd9d3840ac5f3dae81a7b4a5 SHA512 5c25dc76bbd4e014ecaf63b0b8cc400add7cc8c3cf9294df71ff1d60c1e5b7cff89eec6d7309a40008f2ae448a774a26c727b94aa97cf70316504cc642212f03
-EBUILD iwd-1.7.ebuild 4224 BLAKE2B 3690d838adf8a9f8bc9d3b11cd454cf2bf78196b40c50f7a029e2c8108cccce19ead0dd54f58d44207c647e1b9692633cdc5e281e592d16ef202102e9fca93f4 SHA512 4c30c9d78001a9ed7da673ad1704a0d967bfce1a6f011f434626739cab8b33a0564b1e42ddcc30a862364ac20828a8758b2da8cca89af100e2f1a5f9dc773075
-EBUILD iwd-1.8-r1.ebuild 4298 BLAKE2B 26cfb0821ef1086439e102e3aa88b36667e46192b16a7a2d9e7775426c41f6ef1b04a8848e3309fb55301da8a352dd0b2fcd42fa3f5d56da5e39f84217e14707 SHA512 f9b39f923767ff28291e4e1c0dbc24305e603f4ede7ddab5cd6329be04dedd4bbf92c39b3aafbf58d7706660f35a9490dd91ee0fd864e914a3dce65e014fa9d7
-EBUILD iwd-1.8.ebuild 4226 BLAKE2B 6dae3dc8f42e562c84213f9edab1059c15d3bc0ee861f1ff8b20fa85deaac58b2c5b3ef45d7dfdb46a7b0ab0b2fecdffe3f1e0ce73317862c7e0d3103dcdc672 SHA512 fb9bfb2166f8e01bc862adca01d7d09a7423c8e58770204609c9f12e94ed0e932d35922bb55946dfaf3be1740201c2da7e87476bd30796465b2d0e347b4b95af
-EBUILD iwd-9999.ebuild 4224 BLAKE2B 4fbeee6dd24638918ab7a9edf38658b62ef1d379b6a23b35e1079d9b23a8d3a38077125e38cb49c68d98e937cff92a6640b609029ec2b5457f8e8801cabb7063 SHA512 67d8d45988e608a9674c380a7645a365580bc0a5fd4d5bc95ee3a3e78833f4bfbe5b9d836f45e1fec77f20379c13ee26ebc708e0f8131dcac1e27da7b1dff938
-MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
+DIST iwd-1.9.tar.xz 883616 BLAKE2B 57dd4a6e00d73bcfb752e1bd3661e97251d1dab4c05638d148ae7031bff35d606063f79e575ed4d3d3a60ff5514eb3fc340e1eec4c2e7074bf8d6d4b79832f6d SHA512 d8762495f7f5a342476653c0cf64c31b3b41a3064a05c4fcf49b9faf4394b0d7a5db6aae6324896bdc8f7b104697fb4c4315f7073a4fde4fc87f8f55d932538b
+EBUILD iwd-1.8-r3.ebuild 4477 BLAKE2B d80632f00a31b5f1f751373701f80602d34e8fb8cec14316f5405a76af1df1cbed79f0b786d3f9e3e2bce2d54f7ee72ffcb0595455e9095c87c55b68b9f4b50f SHA512 d9b44088c2a4ddc0b42831ffca847daa1570d72583526a669c2178fff2a8d2c0cbf5415dc6f4d3edc2991fc588951e546de4b67449f721fa4e2ad71d2fd52e1e
+EBUILD iwd-1.9-r1.ebuild 4870 BLAKE2B 9e65385109c3d3125878351d0324c4fca5550487f67a34bedd69cd986552ea5dd40ee701696e041145be744124c8d78a888f8b5acd26d1c785efcd4f711c7c50 SHA512 d8188fa38f588b66355e89f42abf712670ad1d4dc07c5e8fd8e0345791d7cfbc3b9f1fe61db379d16c3fff76d9252b07d4309be0e60af672c4b2de5ff7986d6a
+EBUILD iwd-9999.ebuild 4866 BLAKE2B 56604e640edcc195e7590b17e5b390d2301cf99f222c7046393e50312decd6b162c9d204e33bb5984db3fcf109270ddac0445bf87da4cb7317722584709bdda9 SHA512 c0188ce813cc775f17fd9dfbfb2e0abd8de904a9d4f872750e3342cbe6559f06d8d0c50007e8b48c31a3066c26c3a3773ea4c4a3ee863151250cd58cf2e11b4d
+MISC metadata.xml 832 BLAKE2B 5f9e80bd6e64bb7542509fa934e5fba8f433781f35b0c5e3f0dcae48a4a4cd3ecf23312241358daeccc0429f8bd74651531b7d628ec19f6af16714027ff8ddc2 SHA512 06950191a98edb0453b80500c0c1b7ca879fea962cd13f5ad695923d866edb4aa99753750d67110eac0a790d8ddeff9154add4fc8793d34af35870e13e8a6464
diff --git a/net-wireless/iwd/iwd-1.7-r1.ebuild b/net-wireless/iwd/iwd-1.7-r1.ebuild
deleted file mode 100644
index 84c262950729..000000000000
--- a/net-wireless/iwd/iwd-1.7-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.31"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~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_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.7.ebuild b/net-wireless/iwd/iwd-1.7.ebuild
deleted file mode 100644
index f2b626e25c2e..000000000000
--- a/net-wireless/iwd/iwd-1.7.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.31"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_pretend() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~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_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.8-r1.ebuild b/net-wireless/iwd/iwd-1.8-r1.ebuild
deleted file mode 100644
index 61bd996e8df6..000000000000
--- a/net-wireless/iwd/iwd-1.8-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~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_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.5.ebuild b/net-wireless/iwd/iwd-1.8-r3.ebuild
index a6496aa4cc37..a8c6fbd6ae43 100644
--- a/net-wireless/iwd/iwd-1.5.ebuild
+++ b/net-wireless/iwd/iwd-1.8-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.28"
+ELL_REQ="0.32"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -37,7 +37,9 @@ DEPEND="${COMMON_DEPEND}
 
 [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
 
-pkg_pretend() {
+PATCHES=( "${FILESDIR}"/iwd-1.8-eapol-prevent-key-reinstallation.patch )
+
+pkg_setup() {
 	CONFIG_CHECK="
 		~ASYMMETRIC_KEY_TYPE
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
@@ -59,6 +61,7 @@ pkg_pretend() {
 		~CRYPTO_USER_API_SKCIPHER
 		~KEY_DH_OPERATIONS
 		~PKCS7_MESSAGE_PARSER
+		~RFKILL
 		~X509_CERTIFICATE_PARSER
 	"
 	if use crda;then
@@ -90,6 +93,10 @@ pkg_pretend() {
 	check_extra_config
 
 	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
 		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
 			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
 		then
diff --git a/net-wireless/iwd/iwd-1.8.ebuild b/net-wireless/iwd/iwd-1.8.ebuild
deleted file mode 100644
index 3e066268c2b2..000000000000
--- a/net-wireless/iwd/iwd-1.8.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic linux-info systemd
-
-#Set this variable to the required external ell version
-ELL_REQ="0.32"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit autotools git-r3
-	IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
-	ELL_EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Wireless daemon for linux"
-HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
-
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
-
-RDEPEND="${COMMON_DEPEND}
-	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
-
-pkg_setup() {
-	CONFIG_CHECK="
-		~ASYMMETRIC_KEY_TYPE
-		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
-		~CFG80211
-		~CRYPTO_AES
-		~CRYPTO_ARC4
-		~CRYPTO_CBC
-		~CRYPTO_CMAC
-		~CRYPTO_DES
-		~CRYPTO_ECB
-		~CRYPTO_HMAC
-		~CRYPTO_MD4
-		~CRYPTO_MD5
-		~CRYPTO_RSA
-		~CRYPTO_SHA1
-		~CRYPTO_SHA256
-		~CRYPTO_SHA512
-		~CRYPTO_USER_API_HASH
-		~CRYPTO_USER_API_SKCIPHER
-		~KEY_DH_OPERATIONS
-		~PKCS7_MESSAGE_PARSER
-		~RFKILL
-		~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_DES3_EDE_X86_64"
-		WARNING_CRYPTO_DES3_EDE_X86_64="CRYPTO_DES3_EDE_X86_64: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_aes;then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_NI_INTEL"
-		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
-	fi
-
-	if use cpu_flags_x86_ssse3 && use amd64; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_SHA1_SSSE3 ~CRYPTO_SHA256_SSSE3 ~CRYPTO_SHA512_SSSE3"
-		WARNING_CRYPTO_SHA1_SSSE3="CRYPTO_SHA1_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA256_SSSE3="CRYPTO_SHA256_SSSE3: enable for increased performance"
-		WARNING_CRYPTO_SHA512_SSSE3="CRYPTO_SHA512_SSSE3: enable for increased performance"
-	fi
-
-	if use kernel_linux && kernel_is -ge 4 20; then
-		CONFIG_CHECK="${CONFIG_CHECK} ~PKCS8_PRIVATE_KEY_PARSER"
-	fi
-
-	check_extra_config
-
-	if ! use crda; then
-		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
-			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
-		then
-			ewarn ""
-			ewarn "REGULATORY DOMAIN PROBLEM:"
-			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
-			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
-			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
-			ewarn ""
-		fi
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		EGIT_REPO_URI=${IWD_EGIT_REPO_URI} git-r3_src_unpack
-		EGIT_REPO_URI=${ELL_EGIT_REPO_URI} EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == *9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-cflags "-fsigned-char"
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/iwd --localstatedir="${EPREFIX}"/var
-		$(use_enable client)
-		$(use_enable monitor)
-		$(use_enable ofono)
-		$(use_enable wired)
-		--enable-systemd-service
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-systemd-modloaddir="${EPREFIX}/usr/lib/modules-load.d"
-		--with-systemd-networkdir="$(systemd_get_utildir)/network"
-	)
-	[[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/iwd.initd-r1" iwd
-
-	if use wired;then
-		newinitd "${FILESDIR}/ead.initd" ead
-	fi
-
-	if [[ ${PV} == *9999* ]] ; then
-		exeinto /usr/share/iwd/scripts/
-		doexe test/*
-	fi
-}
diff --git a/net-wireless/iwd/iwd-1.6.ebuild b/net-wireless/iwd/iwd-1.9-r1.ebuild
index 256d210e2560..d9b58be0e827 100644
--- a/net-wireless/iwd/iwd-1.6.ebuild
+++ b/net-wireless/iwd/iwd-1.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit flag-o-matic linux-info systemd
 
 #Set this variable to the required external ell version
-ELL_REQ="0.30"
+ELL_REQ="0.33"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit autotools git-r3
@@ -21,23 +21,34 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
 
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
+COMMON_DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
 
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
 
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
 
-pkg_pretend() {
+pkg_setup() {
 	CONFIG_CHECK="
 		~ASYMMETRIC_KEY_TYPE
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
@@ -91,6 +102,10 @@ pkg_pretend() {
 	check_extra_config
 
 	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
 		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
 			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
 		then
@@ -151,4 +166,14 @@ src_install() {
 		exeinto /usr/share/iwd/scripts/
 		doexe test/*
 	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
 }
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index 55d9df110e12..c17d39b08802 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -21,19 +21,30 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3
+standalone systemd"
 
-COMMON_DEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
+COMMON_DEPEND="
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+"
 
-[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" ~dev-libs/ell-${ELL_REQ}"
 
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${COMMON_DEPEND}
 	net-wireless/wireless-regdb
-	crda? ( net-wireless/crda )"
+	crda? ( net-wireless/crda )
+	standalone? (
+		systemd? ( sys-apps/systemd )
+		!systemd? ( virtual/resolvconf )
+	)
+"
 
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+DEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils"
 
@@ -91,6 +102,10 @@ pkg_setup() {
 	check_extra_config
 
 	if ! use crda; then
+		if use kernel_linux && kernel_is -lt 4 15; then
+			ewarn "POSSIBLE REGULATORY DOMAIN PROBLEM:"
+			ewarn "Regulatory domain support for kernels older than 4.15 requires crda."
+		fi
 		if linux_config_exists && linux_chkconfig_builtin CFG80211 &&
 			[[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]
 		then
@@ -151,4 +166,14 @@ src_install() {
 		exeinto /usr/share/iwd/scripts/
 		doexe test/*
 	fi
+
+	if use standalone ; then
+		local iwdconf="${ED}/etc/iwd/main.conf"
+		dodir /etc/iwd
+		echo "[General]" > "${iwdconf}"
+		echo "EnableNetworkConfiguration=true" >> "${iwdconf}"
+		echo "[Network]" >> "${iwdconf}"
+		echo "NameResolvingService=$(usex systemd systemd resolvconf)" >> "${iwdconf}"
+		echo "rc_provide=\"net\"" > ${ED}/etc/conf.d/iwd
+	fi
 }
diff --git a/net-wireless/iwd/metadata.xml b/net-wireless/iwd/metadata.xml
index b8cd886617b9..2b83f954fd84 100644
--- a/net-wireless/iwd/metadata.xml
+++ b/net-wireless/iwd/metadata.xml
@@ -10,6 +10,8 @@
 		<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='standalone'>Enable standalone mode with built-in DHCP client and DNS handling"</flag>
+		<flag name='systemd'>Use systemd-resolve rather than resolvconf for DNS handling in standalone mode</flag>
 		<flag name='wired'>Enable ethernet authentication daemon</flag>
 	</use>
 </pkgmetadata>