gentoo resync : 25.01.2020

11 files changed, 313 insertions, 8 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 97109fd05b36..c93e38e2d54c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 704effb53474..bdb819351e32 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,7 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.1.tar.xz 950296 BLAKE2B 10113bf9bd6744d6aaa5e4d0912d87ba11ace36027acfb10802988ad7c7458dbe2c092095148277f437a8dac68f93c017da53a0925a2c3e8c24e0400db567c87 SHA512 bde7dffc369a7204e2c0e05005f3c1cb97760b3d8625342fe69a5b5c729d6b90eabeca37c679c56f73499f1dbc17ccc15800b4e6e48e717f0e306083525981e9
+DIST blueman-2.1.2.tar.xz 950296 BLAKE2B dec19174813a76d5abb941b7a93257428175961c4f05709e5c1ba304302b4163a61cde2ae5938f40053ea43298ee8ac483cd0439c80ce76bae41a95b3dc8d5ac SHA512 44d397d3a9d154d05b5231e18e624bf1ca33c690be5eeb448620ba4882110306925b78dbbbd815384ee3faeff147d2b042c01be28fb1b43568924c9657484527
 EBUILD blueman-2.1.1-r1.ebuild 2984 BLAKE2B 355d255cf2e5880ac71d3d5bb55c545216cc88fb3cfcebab7024dcb9fc324240644a0122d58b33affe9b3fc610612366383ed83e05af930a96b9ccb9e55b29f8 SHA512 5d111c7fc6ad83c1ca593f0e22ef4496b481fc03850c62aceacb8500bc8952b203f96f4c85122e7546999a3f9e6fed0f7977d5c06871e04c00bfbbc025f53a1c
+EBUILD blueman-2.1.2.ebuild 2984 BLAKE2B 355d255cf2e5880ac71d3d5bb55c545216cc88fb3cfcebab7024dcb9fc324240644a0122d58b33affe9b3fc610612366383ed83e05af930a96b9ccb9e55b29f8 SHA512 5d111c7fc6ad83c1ca593f0e22ef4496b481fc03850c62aceacb8500bc8952b203f96f4c85122e7546999a3f9e6fed0f7977d5c06871e04c00bfbbc025f53a1c
 EBUILD blueman-9999.ebuild 2984 BLAKE2B 355d255cf2e5880ac71d3d5bb55c545216cc88fb3cfcebab7024dcb9fc324240644a0122d58b33affe9b3fc610612366383ed83e05af930a96b9ccb9e55b29f8 SHA512 5d111c7fc6ad83c1ca593f0e22ef4496b481fc03850c62aceacb8500bc8952b203f96f4c85122e7546999a3f9e6fed0f7977d5c06871e04c00bfbbc025f53a1c
 MISC metadata.xml 608 BLAKE2B 1acb5842f719f99063f933022cc9b093b83ce38554b9137732825a3df761dbb9fb03f1f494a870c874a7703d6a7e5c6b6b1a24f85912a327f4576b29b4294093 SHA512 35a67e2952bb587c7fd4c62e464986127799696a645c0b01df5b77a43343c86fe1f994f9401fcd1957eb76f59ff61b5806fa1910a280e5ce62e7a0e8164f65e6
diff --git a/net-wireless/blueman/blueman-2.1.2.ebuild b/net-wireless/blueman/blueman-2.1.2.ebuild
new file mode 100644
index 000000000000..36efcd261c60
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.1.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
+HOMEPAGE="https://github.com/blueman-project/blueman"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
+	S=${WORKDIR}/${P/_/.}
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+# icons are GPL-2
+# source files are mixed GPL-3+ and GPL-2+
+LICENSE="GPL-3+ GPL-2"
+SLOT="0"
+IUSE="appindicator network nls policykit pulseaudio"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-wireless/bluez-5:=
+	${PYTHON_DEPS}"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_MULTI_USEDEP}]
+	')
+	virtual/pkgconfig
+	nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+	')
+	sys-apps/dbus
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	|| (
+		x11-themes/adwaita-icon-theme
+		x11-themes/faenza-icon-theme
+		x11-themes/mate-icon-theme
+	)
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	network? (
+		net-firewall/iptables
+		|| (
+			sys-apps/net-tools
+			sys-apps/iproute2
+		)
+		|| (
+			net-dns/dnsmasq
+			net-misc/dhcp
+			>=net-misc/networkmanager-0.8
+		)
+	)
+	policykit? ( sys-auth/polkit )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio[bluetooth]
+			media-sound/pulseaudio-modules-bt
+		)
+	)
+	!net-wireless/gnome-bluetooth
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	if use network; then
+		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
+			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# replace py-compile to fix py3
+	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
+}
+
+src_configure() {
+	local myconf=(
+		--docdir=/usr/share/doc/${PF}
+		--disable-runtime-deps-check
+		--disable-static
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
+		$(use_enable appindicator)
+		$(use_enable policykit polkit)
+		$(use_enable nls)
+		$(use_enable pulseaudio)
+		# thunar integration is a single data file with no extra deps
+		# so install it unconditionally
+		--enable-thunar-sendto
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use policykit; then
+		# Allow users in plugdev group to modify connections
+		insinto /usr/share/polkit-1/rules.d
+		doins "${FILESDIR}/01-org.blueman.rules"
+	fi
+
+	rm "${D}"/$(python_get_sitedir)/*.la || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 5625541c2a7f..c0d522d17a9e 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -5,8 +5,8 @@ DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd
 DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 56aebd5ea61abd48723ed0c16050a05c3c8e328ac2a91307b00d8705ddcac0c713d74b946491bdd763abd5d2432d07cd51a85a4d365ef3c8d51eb255e682e326 SHA512 952c5bbf3ae38e2a935cd8dbd20f2f7aed4ab8c0492e3bc10ebed2b9eb1f11bb2caf84c035cd3d88f7703e84f1e58d8aa0a66290623c7b75e59b43a85de44549
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c SHA512 f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3 SHA512 cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5185 BLAKE2B 62bbbfaf2b1eb52c03e52b64eed81a8eb8277443f7d96ad3db5d8b37988ea7ef7c8385234df9a16177d2f9c9cf71b095ea0684d7f4fc737c46502dfdf318c8ff SHA512 b5fbdb677e9e9b9e24c220cdc6e5e536419f8323a93771c750b1d737fc5df7095b60d0fad113e510c9e804a1f882cc08f0170cf37b3c3428dc2d602a72181588
-EBUILD gnuradio-3.7.13.5.ebuild 7562 BLAKE2B bb7bc0cbd9459e328ac7421ac307093068bd50f36d65a1a86d0e05d894683dae6a25639de6ccba2d5c641ef25733932d625b3872e46a166d1f887383a391e28e SHA512 3035dc04e101c4469bcfa442987e6b3b317979027bc7ceb35c059f4b5772398ce7511cfd9cf201c269f91a97b69f234186a18bccd8e7491da4ec757b04e0bfb0
+EBUILD gnuradio-3.6.5.1-r3.ebuild 5185 BLAKE2B 62bbbfaf2b1eb52c03e52b64eed81a8eb8277443f7d96ad3db5d8b37988ea7ef7c8385234df9a16177d2f9c9cf71b095ea0684d7f4fc737c46502dfdf318c8ff SHA512 b5fbdb677e9e9b9e24c220cdc6e5e536419f8323a93771c750b1d737fc5df7095b60d0fad113e510c9e804a1f882cc08f0170cf37b3c3428dc2d602a72181588
+EBUILD gnuradio-3.7.13.5-r1.ebuild 7562 BLAKE2B bb7bc0cbd9459e328ac7421ac307093068bd50f36d65a1a86d0e05d894683dae6a25639de6ccba2d5c641ef25733932d625b3872e46a166d1f887383a391e28e SHA512 3035dc04e101c4469bcfa442987e6b3b317979027bc7ceb35c059f4b5772398ce7511cfd9cf201c269f91a97b69f234186a18bccd8e7491da4ec757b04e0bfb0
 EBUILD gnuradio-3.7.9999.ebuild 7044 BLAKE2B 8790023c7e47ae868bffc857e311981dd8a6ac47d399390bcaf09d25bbcdf3afcbc4a15a747019ff70248c4de009e44075b22abc4b8e7d2909839391d3c2a1d5 SHA512 72b0636cbb1b32b0fb625ce67b21206d741852065cebb5dcca4cbc9ebe7e55d75c896516aa69a3c894816611a35bb4c2674a0211251b833f974504084bf73c4f
 EBUILD gnuradio-9999.ebuild 7021 BLAKE2B a87f63b767d5f9ca490e3a2d3c2bff872cfd67052a4dab9b56a4dd76a4b698ea9aa775575f9ccf1326c3b25baf6676ad924716b289a4d540211a1ba0c8e98836 SHA512 343e65b89adaab9eeb5488da797ab7e62ba4502d0de6b54234a31c08c2b91e7c0cd06fbd07e7b12fb5d8dcd492cfedc6837de9d65534814bfbfd25d3ba237f9b
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
index 5c9dcc316787..5c9dcc316787 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r3.ebuild
diff --git a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild b/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
index afa455f35653..afa455f35653 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.13.5.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.13.5-r1.ebuild
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 6119589f3a2a..de25c721ad2e 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,6 +1,8 @@
 AUX ead.initd 243 BLAKE2B dcd843a764c28064eb6bb6c0be6c64482df0ab0fa01e14831f0060719bfe0038ca75d9b0e79d78a234627a15c53da16151094c6cc6d48a049ae6ac3c9b1714a2 SHA512 1b39b25736a11870f5e740b5702b6f18b1714cc06df7e3462cd74d116cfaa82175801f336141f3fdf86be33aa97fcebf32d9c080d80419bbc548ad540ab7bd7d
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
+AUX iwd.initd-r1 290 BLAKE2B ea7a6a51ab0fe4f83a748e61e245cf2d7abac898431bf84d9f30c56a7706828dd8e1544ecd61931f52fd5f52791abb0cfe07c685c297f560fe257b8769bfd6e6 SHA512 be44fb430252cf51e192b7b09a05302e1b9edfc4ebb7c5a357d912d727f25afc165b02752f9c51a9056e86471a12f3d2cfa384560b417d5303a93b5c4dff0a28
 DIST iwd-1.4.tar.xz 830548 BLAKE2B 2d03767a5308c72206aefbafce39a241e353c1ef8751758d0a336a7ad5b86ef02062da037db423b805810eb45a9467628cd241682a63835b63e3ea920f39ace9 SHA512 3b06fa24666e7cf37353d95d0e9abc41b8be921ae7313c014f20f704fe7919d154d6a5441c6d87d4cd08ee65e15218ec01f4ff4aafc7e4a358faf3ca4a6dcb18
-EBUILD iwd-1.4.ebuild 4216 BLAKE2B 9c1ccfc66a1729ff89a9f691e00fbbe2af7d90404029c7aa49985328d8a4bc74529442da624da24b3bf72bd04958f616ec19554e686cc4d107303aa6f9c1c720 SHA512 a1ddfe3fabb1e52d231bac6f2535b0dcb0bb91e6e8fe470c518fc45b3af6a0cde7f20a680a63ba1a469d7180215e71d424146744d946466c44f140c58d8fddf3
-EBUILD iwd-9999.ebuild 4200 BLAKE2B 697ce8df87935e75c6e08d58c9a54670c1671e5fa4524edd79953da6851bbadafd32bfb46eaab31f188650648324664e807c2c6ec2b89cb3ecfd4531e49a972d SHA512 32f68684283fb36d60620ef9c8258f3abb8be9fa021439bc9108066e80b76c2ebc532954d6258d93044d4b0a63a5434f88a9aef0134c1b65c35c8a3f5c833524
+EBUILD iwd-1.4-r1.ebuild 4219 BLAKE2B 36f70ad55bc4c2832fcb182999f26ab236ef852c31292c0943d7efb880bb5f8616ba38a84ce47c973c562111d116f2d68c0f55a55c563c7bb44fb3ab5b8ed575 SHA512 af3820df6cbd44468e4f5a109e051cbfdcfd0b05e6666958f5c906963a40a4b27a3e3b0cb5beb0b64b9716e26becd26d430bad75417bf49b688d2f81ad7539ff
+EBUILD iwd-1.4.ebuild 4212 BLAKE2B 5cea209cdf68eba162df00cd033054c22a13733991dca59b217095a1a49099edc47fff59aafbfbba4de4d03d909432a5059ae1a2d5718481f34ea04f6cf25bca SHA512 def9a32ffec626f8338cd02c27ef3fd1df1e2de0fbad0f6a190aef5abdbd0d031bf696e06dbf59d5a433822ef0b1d344b952f7c88b197f6c1caf4c7e9d3df77f
+EBUILD iwd-9999.ebuild 4203 BLAKE2B a3804e0c45f950489b07e6c4a710f3722148287314539b33887f9b39c87510b27a3632a57b6dd419b7a4dbf575b1d137b64c9506b72508dee09851ef3c63a987 SHA512 87e22d525b0cc8288d28dbc0429cd5588a341ba3a18f4450afe382d3f0cd46a39e92dd913d39d5772438e21c879906f5a51a1a3e44cdcd1f1765880c9100c6cb
 MISC metadata.xml 623 BLAKE2B 59adc818adaf90dcb719531a1fde1507d2fb5f3ef33ad7f45ce39876e0e008cd2dc931da58c6d4092c1c57ebc8bfed704a0a7acf92548620c009202e274e76d7 SHA512 3253bfe989a6393d984fb25db1eb1576c670dde4af9aa1b6a4e34673a493b4869f70d1cb1bb502e2d28be8cf15dc595e5e594b7c988752aa9405b0b680a3273b
diff --git a/net-wireless/iwd/files/iwd.initd-r1 b/net-wireless/iwd/files/iwd.initd-r1
new file mode 100644
index 000000000000..873d569b6559
--- /dev/null
+++ b/net-wireless/iwd/files/iwd.initd-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/iwd.pid"
+command="/usr/libexec/iwd"
+command_background="yes"
+
+depend() {
+	need dbus
+	after bootmisc modules
+	before dns dhcpcd net
+	keyword -shutdown
+}
diff --git a/net-wireless/iwd/iwd-1.4-r1.ebuild b/net-wireless/iwd/iwd-1.4-r1.ebuild
new file mode 100644
index 000000000000..74fdff31c597
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.4-r1.ebuild
@@ -0,0 +1,153 @@
+# 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.27"
+
+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
+		~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.4.ebuild b/net-wireless/iwd/iwd-1.4.ebuild
index a27df2f13a45..6a604916fe72 100644
--- a/net-wireless/iwd/iwd-1.4.ebuild
+++ b/net-wireless/iwd/iwd-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	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"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index de16c9f1b93c..d27e39a56fe7 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -140,7 +140,7 @@ src_install() {
 	default
 	keepdir /var/lib/${PN}
 
-	newinitd "${FILESDIR}/iwd.initd" iwd
+	newinitd "${FILESDIR}/iwd.initd-r1" iwd
 
 	if use wired;then
 		newinitd "${FILESDIR}/ead.initd" ead