gentoo resync : 22.01.2019

17 files changed, 638 insertions, 241 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 1a48e5db26f1..93a2b7900e40 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 4e7254b90944..2a9379d25b79 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -8,6 +8,6 @@ DIST aircrack-ng-1.5.2.tar.gz 7138360 BLAKE2B cfc178d76273bb1cf6c34b1656a710d046
 EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3523 BLAKE2B eeda867b14d763a397287928b64217635a2b4b11250b98fc818ce0910c9fa9e30e68a78c02a741c79a653f6c9177d733caaae7e63748c20f29ebd6c4819f007f SHA512 151fec44861e17742ec7cbbbc7198eaf24f9cdd4ceee78902c248fced3ab6df49ed1da466b39f203201e9c9124b5e8b1042df75ef705a7024205c5276853a0d7
 EBUILD aircrack-ng-1.3-r3.ebuild 2910 BLAKE2B 46031550c7729538b0ccdab9e3a95cd175371032697afd74acf8de3181793bb6038914d3aa87acf50e4085b777fffd44f0c2461cfd30d368b74117f34c3c629b SHA512 6e49a5f36bd9b69bf60c8d047df89cc7a342687156a8bdde68ecf5f4e8365bf508706bb15a7e6a28d8bc9749f5da95e59894fffb7eccbc95c464872122337ba3
 EBUILD aircrack-ng-1.4.ebuild 2870 BLAKE2B ce4d27a79c4745d75064cda730b644a4359dd3235a23e8a78e6480a21b2ebe8055c63bb864de4aecc0f6f6d655dcfcdb21086d26c144b12745fe6d8577375191 SHA512 7f5ecbf1b7ba3f8a281dea31e92ade9c540663b130921d520c60f33d88136b3ad3d16a47977408e6a460346aea2f30ebd3d8718b3c5aadbf8e56815e5a95e268
-EBUILD aircrack-ng-1.5.2.ebuild 2870 BLAKE2B ce4d27a79c4745d75064cda730b644a4359dd3235a23e8a78e6480a21b2ebe8055c63bb864de4aecc0f6f6d655dcfcdb21086d26c144b12745fe6d8577375191 SHA512 7f5ecbf1b7ba3f8a281dea31e92ade9c540663b130921d520c60f33d88136b3ad3d16a47977408e6a460346aea2f30ebd3d8718b3c5aadbf8e56815e5a95e268
-EBUILD aircrack-ng-9999.ebuild 2870 BLAKE2B ce4d27a79c4745d75064cda730b644a4359dd3235a23e8a78e6480a21b2ebe8055c63bb864de4aecc0f6f6d655dcfcdb21086d26c144b12745fe6d8577375191 SHA512 7f5ecbf1b7ba3f8a281dea31e92ade9c540663b130921d520c60f33d88136b3ad3d16a47977408e6a460346aea2f30ebd3d8718b3c5aadbf8e56815e5a95e268
+EBUILD aircrack-ng-1.5.2.ebuild 2909 BLAKE2B 606844ed33ae6ee1ad32b37dd7bd012dcb7fd2f12b07f62d9de89b5e2333707bbeb1568dd238362e5fdff83e0b75d91532fca41febe4166795d43db854a2f7e7 SHA512 7467d81d051f984b39f5736422dae811114ddd2e1b5a7f33110b50fb28c07a4f26c1de20c241daad1800648046adcdab3b61cdd1e9f22aeb9d95f31a3d2a094b
+EBUILD aircrack-ng-9999.ebuild 2909 BLAKE2B 606844ed33ae6ee1ad32b37dd7bd012dcb7fd2f12b07f62d9de89b5e2333707bbeb1568dd238362e5fdff83e0b75d91532fca41febe4166795d43db854a2f7e7 SHA512 7467d81d051f984b39f5736422dae811114ddd2e1b5a7f33110b50fb28c07a4f26c1de20c241daad1800648046adcdab3b61cdd1e9f22aeb9d95f31a3d2a094b
 MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
index f5006d8091e0..37faadada3ad 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.5.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.5.2.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=7
@@ -57,6 +57,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		STATIC_LIBDIR_NAME="$(get_libdir)" \
 		--disable-asan \
 		--enable-shared \
 		--disable-static \
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index f5006d8091e0..37faadada3ad 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,6 +57,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		STATIC_LIBDIR_NAME="$(get_libdir)" \
 		--disable-asan \
 		--enable-shared \
 		--disable-static \
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 2b45faaf0712..9b78ce7dc15f 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -4,11 +4,12 @@ AUX 0004-agent-Assert-possible-infinite-loop.patch 583 BLAKE2B 22cd0d0b4c6c18596
 AUX bluetooth-init.d-r4 283 BLAKE2B 639679bb0156538e63e5e401a3063f8e72c2096b9ff9558e2e3289bd337dfb11c228010a50e40dd0a84ab2bb6f9cba69eb59b51b018d4983638dba4e3635e20c SHA512 155ec9c0deb82b1fc2218a0d23297ea1390b1ce0bcfffaf4b5ffbf5ee13fe4179b763edfcc6dec48c7a731a852d5307966090f35cc5caf28bbb8bee7dd01714a
 AUX bluez-5.39-systemd-quote.patch 1298 BLAKE2B c06a96ffee4f40d574765f7f5b58ba3544fe9862bf4d64d45be0dcbfe1446cb8cdca150402e44117f44b973d7041fd66f01088d843d35d0d6538ccf169551923 SHA512 a31a93934b3ad5d55633ab8ac0878f3cd8bda0ca7836a8912b444f88fe8c71183d25a6e3f36d962cc68da6d2776837b4bf660efb17d379c4003a092c313e69ba
 AUX bluez-5.49-crash-non-LE.patch 2281 BLAKE2B c9615f8f326980cc9cbcbefa3441a4aaa6a0390915a15de7af5a4b1b1bd533af0dde130d429dfed275df7fad2c24931ded91afb27f8631b77cbcb701423516a7 SHA512 0db340640a85c85d54afd257e4e9067e06073e071ff0215848fa8982ac1707fd0c9d21cbf634c5bfc38869a00598cf781fd91b073a6a933980e777fd1b0c5578
+AUX bluez-5.50-btpclient-header.patch 345 BLAKE2B 0418270a696b9a682a3f74f35af64152fbf005dd3abf0230b03d673632f2e5a8b2874c11b9adbfd1733fb601eb5aea02da9028894041e200f99121e41dff855a SHA512 eba5462c20a37905ab8491b6812cd5dd8229280a56fcf24b3a2624a871d14a0377697f93588d02fa03ed422f953072109ea76b544173b97d874b9190de060a97
 AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad8303ed0dc10831ab9023665436cfa9c47f8ccab7f83ab2b46ca8369ce53c5084ba7bf649c3ea89779882af SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.49-r1.ebuild 8102 BLAKE2B 92d5688a2b0c476e2ca5767faec68442f8624b482f407db1af683d812e51149e6d8c1fe943b54c31e83227b3819b0d89ea3866a67b27ef5dd3cde27c942609a1 SHA512 20eaed74b8c10cce8dbd116c6be91c2d32f239c7e9fb9a04098e1f16e5a43f85916b9d6567abed9804bca50879ca080d4e9c6abdf45eaa5fb354effe4ca16ea0
-EBUILD bluez-5.50-r1.ebuild 8018 BLAKE2B ce87ba452cc7c7cacd606a3f9330f356d530a6e776dadde432c5c58e5aa20109eacdc51b36b50b29fd17849c0742ee2c4a3fa72470dde4bbfc8b198500a3bb67 SHA512 9b3ca79b3d2761129ee8c2ee6099ec402e4923808415e9307ad3586c38648679d0f4a4db459d39738e05ac4d37ae58e054f9a6479432bffa9aa401e11ce8ace4
+EBUILD bluez-5.50-r1.ebuild 8104 BLAKE2B c90642be33d67c6e7cc777538d77ec750bbaee0f976964eeb15faca723c1a4af557c76f02d2f0fc5197f3c0aaf3f193c0c9aeb6e6fbb64aeae782009e581bd81 SHA512 10feef18faa7f317fda07ecbd41e6fe87c2f019918e87944c13343e3176fe060274c08192ac82cfb057380b2ef090fa21063caa66b7da148f98e9d09acee5507
 EBUILD bluez-5.50.ebuild 8034 BLAKE2B 40c26daeb9815f19adbe23cf616d5e55f9df5808c8bb953e020c084f96102b8e0ffeb70d0a1ce455b3c138e94b0cea283150a55cdf6c214dc688e22715fc6484 SHA512 11cd1e2e38c6facf7f9c7a973225eec7b5f811b16713cd0a832cf12f151da4c37b9ae032dae21359c2060e14eedc8edfeac40d3bfd7ff14d4573bb479252d276
 MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.50-r1.ebuild b/net-wireless/bluez/bluez-5.50-r1.ebuild
index 176d40c87d0c..677e62aad26b 100644
--- a/net-wireless/bluez/bluez-5.50-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.50-r1.ebuild
@@ -60,6 +60,9 @@ DOC_CONTENTS="
 "
 
 PATCHES=(
+	# Fix missing header (fixed in 'master')
+	"${FILESDIR}"/${P}-btpclient-header.patch
+
 	# Use static group "plugdev" to not force people to become root for
 	# controlling the devices.
 	"${FILESDIR}"/${PN}-plugdev.patch
diff --git a/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch b/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch
new file mode 100644
index 000000000000..61a8e6a37424
--- /dev/null
+++ b/net-wireless/bluez/files/bluez-5.50-btpclient-header.patch
@@ -0,0 +1,10 @@
+diff -Nuar bluez-5.50/tools/btpclient.c bluez-5.50-fixed/tools/btpclient.c
+--- bluez-5.50/tools/btpclient.c	2018-03-10 17:37:07.000000000 +0200
++++ bluez-5.50-fixed/tools/btpclient.c	2018-11-18 09:54:38.916794492 +0200
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <assert.h>
+ #include <getopt.h>
++#include <signal.h>
+ 
+ #include <ell/ell.h>
diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 89f1a4a378cc..3684f66870a6 100644
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,9 +1,11 @@
 AUX iwd.initd 246 BLAKE2B 02a422e96de99256e55f2ed86cfd9ed43bf93130021c523d0e4600ab1b7e34212a56def5ab2819c79e2d60cd63e70de4d7c31ae349326b9a15c35a025da4df29 SHA512 699f51082cb44d5ce52ea9dbb9adc4b0eeff945461c66ec4bfcb9d8f26fcc13aee3e7fe69b406d0a7e1ca89af24e655e830c7a61e028a1c0fff1ef8a2b3e153a
 DIST iwd-0.12.tar.xz 680608 BLAKE2B 112dc2917ccc21e14a15d356a56923587d591d6639131ff61089245b77f37d1b7c18a3bf38c872a8245e53c1ae347ac89d3a55cb1ec81dae12f1e34d8d81e391 SHA512 af9d724cbd6749fa2c116856f58d413098878d78f49d6212cc34cd79ea97d835c74aa55cdd804ce6ca5ab7393cc894d39851612fd989ca0cf2fc46a826b11364
 DIST iwd-0.13.tar.xz 689560 BLAKE2B 60c00e9edca7e8d4115a36a2d91c39e8c32ff234f03becaf60eb01bf34a2378d6f6b5968bc773257362e618531cb3392f1775168c31d5e3e9064927bd58d7eaf SHA512 91be8a15d986fba6939cc05be896b59e6986e1b20a56b2058d1a572d5f894861058f3075567e4dec193cef5b6b73a407c8114391d83792564efea8b5c989cc06
+DIST iwd-0.14.tar.xz 700844 BLAKE2B 69f3a1e5ead28cb602e7638e44d2a42a1b25831b837bf5f1d3436d3832a0548da7c3afe9f748688c194cf9e9bc5ea9303924ca1d36dea36d9e2233c245fc25eb SHA512 91713b3cbe8830abb95705e67c7b66f1ced368fe83eeaad36170da9df22b965e97485068e9342e09291aee669890de8f328e33fc3f092ba45097f523d83c7484
 DIST iwd-0.7.tar.xz 662984 BLAKE2B e6e7fa323749c8012c4df5f8f02f97523a37bcbb99d2a2f8c7678d4a1a73a3e24fc4321d53fb95f7fa325748f97b96e1a5f0fe0e956314eeb8534a8bc989a13f SHA512 e6029e33f43fda24f3ddb87b1bb878ad8926066380a0e71415e645bc4f8aa1a6aaa43d2482987b1d473c267fef6d5a2a676af80282ba4c77ab64605c348cabb1
 EBUILD iwd-0.12.ebuild 2608 BLAKE2B ccb6e01bad37ccd4180f3e03d193fc6308b4c3e4274c5da3001e0f4a387b2c3eabd037f5328dc3dc8b13098bb6b3d01edff45e6a986203c027fd20f15e27ef02 SHA512 243a0ed855c95e106676cfaf07e91a60775ebfb8cfab9a103b1a63c29498acf659eff5f971ddae6b3a13584bc71a2ddcbd1e70c4ae636bfd4390547f2f374d60
 EBUILD iwd-0.13.ebuild 2608 BLAKE2B ccb6e01bad37ccd4180f3e03d193fc6308b4c3e4274c5da3001e0f4a387b2c3eabd037f5328dc3dc8b13098bb6b3d01edff45e6a986203c027fd20f15e27ef02 SHA512 243a0ed855c95e106676cfaf07e91a60775ebfb8cfab9a103b1a63c29498acf659eff5f971ddae6b3a13584bc71a2ddcbd1e70c4ae636bfd4390547f2f374d60
+EBUILD iwd-0.14.ebuild 2608 BLAKE2B e694fa773a11db4278b1a7bdd5cf75930a01472dc943c9efb6de649595b2b5b3a2f88b82b291458954f85f469dbffefcf0a67991dcbbefc471bf912fa89dbc9f SHA512 2e5183f0076a6dc473b157cd73d0f605813e78fa5619de5dbc2b3f91ebd5bf0733643a91811891fe88544a526f419d219ec3c5478eefd45748052cba246782ce
 EBUILD iwd-0.7.ebuild 2548 BLAKE2B d86472e1847d88ae43573e5dd4724ee350fac2fd6ad27ef50f539444c9fdba1918458f2c9096575e99abd6aac2b32759a3754a12c2c4fba7c9cf892f978929d9 SHA512 baa5e785b36ac1e06ec4831d9650d1d1fba6733853563c3b900eb04154847d38874fe5d0b83fe13e780d7be832f7984d13b0e4045650cecacaa7580ba740f70c
 EBUILD iwd-9999.ebuild 2593 BLAKE2B 5b2f609acc02f398208c08a09202ce99f28ddb43db9267ed216b8929d62f1e800e97ecdc6a3a69bfcd90f63acfbae212b74f1591e87449d698f07d8f651b1863 SHA512 c7a1b372c49901c23e2960bec22eb7066858f464b4f75a669216dc2740a43b43bfae0097006009533c6636800881fb1fc051c24b55c9b08d2a1c83483de4cf7b
 MISC metadata.xml 507 BLAKE2B fbe55ec45043cda66a6e67c2fe1c74963f555888bea54648c555a856c2c7b2b416adfdd27f8e36e87fb6159900ae3688ef343f327346bf28475556ec82704ec2 SHA512 31f01f5a9f5076bd8280fff136dac3ddac33c22997246cbe8d63df401a1c4c97ef66e0b081d3698c63ec34548d839c00eaaa165cbec53b5ad31fc5f07e8dfbff
diff --git a/net-wireless/iwd/iwd-0.14.ebuild b/net-wireless/iwd/iwd-0.14.ebuild
new file mode 100644
index 000000000000..12912fa92344
--- /dev/null
+++ b/net-wireless/iwd/iwd-0.14.ebuild
@@ -0,0 +1,106 @@
+# 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 ~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/unifi/Manifest b/net-wireless/unifi/Manifest
index 7174eca1ee3a..e0ccdbd33143 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,15 +5,11 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9
 DIST unifi-5.10.5.zip 77373497 BLAKE2B 0716c2ce948a909959d52325d97f9fdbf867492e54bfc12f286659f825f3d5719d334612d71af4bad8d9f1ff076d418df54af8cea18019adbc32cb1972eb5ae6 SHA512 9c8da7fc8b1068a60e5702d377d9cfaa6ea8d90014c3b4e3478bfc0b6a3a1614853befa9cca08c78ebffcdaf4dad119b251c69c52eb8df44acdbe225a28b54ed
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
 DIST unifi-5.6.40.zip 63584069 BLAKE2B 9c241c7ef335b6e4d9ce1d53d8bf6a9b2e6a0c5b91d60f321100e67cc6201f1dc060398dc7af1ee014c47df194f64ddf1eb56a6c7ce53691251b4fd2937c5603 SHA512 d2e154ec6bdf24cfcb0e5154512a91dc0e601a2bfe7fcdda4c22b329b304b50315a42485daee8495a5076136055c2cf59ebe42b083221683168199e437589e9a
-DIST unifi-5.8.29.zip 80125147 BLAKE2B d7fcfd8ea5c29c79803f4ee715136a82fb69b3e69802a9a9c4b92e9d4c52d5a72eaeaa3b10405a4eb10df35f1a926c4fb51dcd0c30816d3e58efd15f48b2ea51 SHA512 8c69f406c632661fe713251304910016bed25c2bbabb3aef355626cf6ea6475ba9348d0bec4d2e0f64824190db4deff669ab748cb17cc289112ac07421b56128
-DIST unifi-5.8.30.zip 80120131 BLAKE2B c7e53ff047cd3fc6b0b551d8388a739adf86d0518a86c76aa1688534e2a708bdf9d38d30848ad6a41b03aea12de8f038cd5eb8e9186ecfa3c2a1b782464b7e21 SHA512 0d4a714ba875e17ce359b28e2a0a967366125971f021eb95f598c7e4860c03016afadcef0a4bb6e64f30b99afb790b65aaa166ccc31bb31f268412c1a1f1bffd
 DIST unifi-5.9.29.zip 105327499 BLAKE2B 9c5c1cb804231b72521fce968cb1240b7c64e75621eb6577fe09f43186e90347339159e0cb95e772a936d4d6e82b2ae77126c263fbf25ab244db7e5639972c45 SHA512 f00ba9470d78fa5922e81a5ff2e53927d2a2ec7d08ab543abf4b236ff9fb8761b060083025fc410f72c0ff48c75c915dd3561a3869dc4a2de0f8900e19af0976
 DIST unifi-5.9.32.zip 105373782 BLAKE2B c15b576fe745f1d8f2783a50a0265378a0b4947654ab79e1ba2526dfade73eb83890118d8a97d1d186539a428fc6705943e19cecde583b73c2f098575f3496f0 SHA512 c0269c9e9be723eb19dc541dbb7547b284082792c41c6a8012b677ca83e562848024b95ebd6dbae95042bde07c41375907fd9b47e725f3ae8ece661bcd77a71a
-EBUILD unifi-5.10.5.ebuild 1839 BLAKE2B 8cc8bc30720ecb67fee3d43abf8f31e02ad59491201d87cc9fd487f836353576007b851eca4e98150ffcaf939b7b8ce959367fbf4b9409c17010a5a222010369 SHA512 82d8a0ea4012506510f95c27e288883c757bd30035ab21a0aa819ce5aa9d8102589e23495e2e1e050a712a9cc844007a5f6fa0beb9f8bfa7030773ace02c15b1
+EBUILD unifi-5.10.5-r1.ebuild 1840 BLAKE2B 263e0cc678b5200f68fad6fea72e1ac1e48f89adf73337b7df1f7b194c21c85fac4960dd52cc0309eaf7c7cd468b60f9e5b4d6de6498076bb85238e1aa1e6d0b SHA512 5c68ef5a3c6a6f6b7e6d65cb0818062977a32a3a4c638cacddca1c2b49869cbf45e46971b6b4cbe8fcf98f662692e75833a23dac377987499b2f728ec7f2b25b
 EBUILD unifi-5.6.39-r1.ebuild 1721 BLAKE2B b3d2d6df884e5fdc1f09c191dda26eeb71cc05b4f2d51c3556d2b6bee834639f616d542a994f95a6c58bce8b9ae8374ace94d448751fed7fb5058dbdf8a6d67d SHA512 c7b7e8d2196319abacf2094ace35e5fdcb56feb9f22939b28839cc0bab8c40e6f7fe9e16cf2c8ae4992e64e9578f7bff7fcfe0011558c93625e73173b6cc992c
 EBUILD unifi-5.6.40.ebuild 1732 BLAKE2B 083dba38eb9f1007a2c596704d71b1e3064b1029e9c761c4603e32da466d8718d7a6f1cb4ce7a229916c1d89efd253539147acfbcfa43ca7cdbbeb2549ac2d73 SHA512 974837d60c8f133c8c266c0c7f51fdc7ce08f9ac51cb1f70126ba952e314927878a8200ac437a938296640cfd905e9e19266ba30fd6b3af8a62272738d6c92cb
-EBUILD unifi-5.8.29.ebuild 1839 BLAKE2B 970076efaa9aafedb1e93431fcb82c66ae001c3ff715ffbbe7544d0ed57d774ae92756fa905df8cd38cdc9d6d21114b6a664acd8ce93e60884b00a6da6ee078e SHA512 1c2b10eee5d1d11f6dac0642d72c3ad3c82b5b9fe843d5893e372930a70378365f3060eb42e9e62f037b0127346380250d7be2f61b3aa066b14c9956d24ca8b8
-EBUILD unifi-5.8.30.ebuild 1839 BLAKE2B b7cbb450654f49c4b110f0401b2e4aa2ebfc1e9b2e8ced942fb1d5da502c993df9e3f0ca2c7b0b1ccf57418417188bf2130041fa1e4829f0b5acbf6ebbf3cb94 SHA512 b102e3cfa16db09346e1649c8b82d6eef53ef96fa65497b84ca0aad08fca5cf00a4fe49eea21a9349cf4ca26cffa473db9363c943ebdc1bccbaa4e1660bb8491
 EBUILD unifi-5.9.29.ebuild 1845 BLAKE2B 68f13e0a721aba2a1ca2c6ad497dd5668337d1431979540549183491be516f3e976c05e57168b7388dd7959e872c6a648152b8038da8f708200de29991006678 SHA512 d52c718bcdd4062ead97594992fb089d34d35a87bfe6e22191c79c05f522da8bf5a75c1614c0f03c34cc756817df898a4c1371bec96ff8683410bbe5b9ca0a34
 EBUILD unifi-5.9.32.ebuild 1845 BLAKE2B 8e4eb5cac8fef454d7f5dbb50b6330fa9d272182587bd98050f1cc94f560343ebb87065af168574ff70b9bf6e3d88411c587dc2317384ca4762f4a1a8febab55 SHA512 69d79578a2d7e0baea6f8bc0da54008b492d78872204c9f5011b985d8dd9bf9ef70b28302eb973c0fc0d36387714e7f0a376862289aed905bd3ceb6d64039769
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.10.5.ebuild b/net-wireless/unifi/unifi-5.10.5-r1.ebuild
index 291cdbe3baf3..0d79c61ec816 100644
--- a/net-wireless/unifi/unifi-5.10.5.ebuild
+++ b/net-wireless/unifi/unifi-5.10.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
 
 KEYWORDS=""
 LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.9"
+SLOT="0/5.10"
 IUSE="systemd"
 
 RDEPEND="dev-db/mongodb
diff --git a/net-wireless/unifi/unifi-5.8.29.ebuild b/net-wireless/unifi/unifi-5.8.29.ebuild
deleted file mode 100644
index 2fee194c00ff..000000000000
--- a/net-wireless/unifi/unifi-5.8.29.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this for unstable, beta or release candidate
-RC_SUFFIX="-ff003bb0ce"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-IUSE="systemd"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/unifi/unifi-5.8.30.ebuild b/net-wireless/unifi/unifi-5.8.30.ebuild
deleted file mode 100644
index f9f4e147369a..000000000000
--- a/net-wireless/unifi/unifi-5.8.30.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Set this for unstable, beta or release candidate
-RC_SUFFIX="-d628c2e01d"
-
-inherit systemd user
-
-DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
-HOMEPAGE="https://www.ubnt.com"
-SRC_URI="https://dl.ubnt.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
-SLOT="0/5.8"
-IUSE="systemd"
-
-RDEPEND="dev-db/mongodb
-	virtual/jre:1.8"
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/UniFi"
-
-DOCS=( "readme.txt" )
-
-QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
-
-pkg_setup() {
-	enewgroup unifi
-	enewuser unifi -1 -1 /var/lib/unifi unifi
-}
-
-src_prepare() {
-	# Remove unneeded files Linux, Mac and Windows
-	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
-	if ! use systemd; then
-		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
-	fi
-
-	default
-}
-
-src_install() {
-	# Install MongoDB wrapper script, to avoid problems with >= 3.6.0
-	# See https://community.ubnt.com/t5/UniFi-Routing-Switching/MongoDB-3-6/td-p/2195435
-	exeinto /usr/lib/unifi/bin
-	newexe "${FILESDIR}"/mongod-wrapper mongod
-
-	insinto /usr/lib/unifi
-	doins -r dl lib webapps
-
-	diropts -o unifi -g unifi
-	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
-
-	for symlink in conf data run tmp work; do
-		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
-	done
-	dosym ../../../var/log/unifi /usr/lib/unifi/logs
-
-	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
-	systemd_dounit "${FILESDIR}"/unifi.service
-
-	newconfd "${FILESDIR}"/unifi.confd unifi
-
-	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
-	doenvd "${T}"/99unifi
-
-	einstalldocs
-}
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index d3ef9de00be4..11661dd546a2 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -10,9 +10,9 @@ AUX rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
 AUX wpa_cli.sh 1284 BLAKE2B 50757aa432bf714923d0ff5e2e8357bf3126c82dcfebbc2c342325ad97e3ca95a15ea138f9a55e5a7b9ac86cb2518c173e7d5186d5feb3e57ac762a71b11ef85 SHA512 250372231eda6f7228fcf76b13fc1b95637d0d9dec96b7bef820bfa1af1496f218909f521daf2ddb2ca81d0ebb3162500f833575b64d8d2b4820c247499e1c56
 AUX wpa_supplicant-2.6-do-not-call-dbus-functions-with-NULL-path.patch 486 BLAKE2B 877e15a45851331a1499cf8bc96fd514d88b6b270f54d52760e46cc7edbcc4b74a48a0271f0c93b546bb659203c56fdfba63b231757c21ca8ee6ade98406ac2e SHA512 dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed
 AUX wpa_supplicant-2.6-libressl-compatibility.patch 3873 BLAKE2B 281029d49bd4267df5913aa87b2e70741def66646f6cfbf5cf163e88522ae5bb933be3ed0df971ff2872a25a36584409feb0d22acf8254f446421201026b1ce8 SHA512 61c4cfeb119a9bc7ab1d4f690c1af5bce2def7836212469011c277ad4d97ab601d2a1efca7dc7bea433d974a8820aed7740e2cf047a0c63734d8a71e3df14e45
-AUX wpa_supplicant-2.6-libressl.patch 3003 BLAKE2B 49781bcb77e84912b8f46ec992da7c6b1b015cc793208e1f8afa6457991bcc1be130810d90671f0e53fa65dcebd4528c6e359f69a2576ee715317b796d31eec2 SHA512 2fb29ec14db2f33f8c011e1c2e98eef4d36b2e9f3b36f6058c390484ae5c64ad5d67aa25f138829503fabfac374bda24172871bdefef2a0566db963a5a362ec8
 AUX wpa_supplicant-2.6-openssl-1.1.patch 1777 BLAKE2B 0c879e05aba224524919a3879cf5995bae9f973c5629079292cb17666151b981748d9e7ab8589da977cc2c04b96c232abba359446ee14b5a69742b865293f746 SHA512 638d1238387382bdd888158f4c97b2af13d16ec12db31e2d409957bf00fa45fbf3a1beb109c56c815b0dc64a861b17cccc4d7cc998110c772dd2d1bfa724efc5
 AUX wpa_supplicant-2.7-fix-undefined-remove-ie.patch 1115 BLAKE2B 207c8265f6819b9d956cd99cd1f1056d6fcdf6f857fc63150a9419ee83263e0173f2e8f00b061a4c48eb516cb1c3c00f5137a9bacb857dbe6d5e6f912d77c574 SHA512 5e790b3ae50f3d29cb38f73cff30f8994798e7bdbecc9f852def910a8150c1724c051bbb52603fa9c6818c950a5fe347bccd21848427f31f54d641ae40621c3f
+AUX wpa_supplicant-2.7-libressl.patch 1701 BLAKE2B e0d37967b15471641cd14ed54c1cf0456a1c1c347c35e693c0f4bf6f15f1689932c51ad8fdc3977c7ce4e5ad4a036c48eb7d3044871801d7582d2d5d170b371d SHA512 ec24051776991b0d3ac052d1c526c3e700708bd1105cf1885b4a4692344754874c636caf73abab36b54a8de8f5920a510125b51489d0ee5af31971ad52469d8c
 AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f649489afd1636105cdddc29d58d45659c5368cc177f919ce94a7e2b5a9ed3fe8ddccd1fba3d059d270bae1a8 SHA512 6bbb9d4f6132b3d4e20cd65f27245ccadd60712ef5794261499f882057a930a393297e491d8147e04e30c0a53645af0eb3514332587118c19b5594f23f1d62ad
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
@@ -20,6 +20,7 @@ DIST wpa_supplicant-2.6.tar.gz 2753524 BLAKE2B 99c61326c402f60b384fa6c9a7381e43d
 DIST wpa_supplicant-2.7.tar.gz 3093713 BLAKE2B bbf961b6e13757e9d7bb8b9de1808382a551265cd2d54de14e24bde3567aa5298b48fdcd0df75db79189a051532c54b28eab5519c32fc8fc00459365b57039aa SHA512 8b6eb5b5f30d351c73db63d73c09f24028a18166246539b4a4f89f0d226fb42751afa2ff72296df33317f615150325d285e8e7bda30e0d88abcdc9637ab731d3
 EBUILD wpa_supplicant-2.6-r10.ebuild 12648 BLAKE2B c67a87d8edae237a17d8799fb79c2aad65da5ba6a8c80d2a8ad925542e8fb0494a5f7732a0b9e4915d64f564507c347559c459e29190e10713474b4d00c27afe SHA512 518d7f5ba4f7cd0587151af95024b8d42d7220677ba2fc73a7b29a7e6a5c47b0947e7c353d74f38fe46f17f5fe91dc6c4bd61688a8a4fe2769e55f7e48131a20
 EBUILD wpa_supplicant-2.6-r6.ebuild 11810 BLAKE2B 2c4dccf5392657392567b56598a9cf98ab968b34da44210a7608e1eda9e2eea3fbadcd6c51bbd6cffab841295cf49aa8f17d2602be537fc107b7d08370282955 SHA512 eb1a814b2cb50a5b0752061b3563c514c69c4bd637b83f9ee0e477310510869d05a1f5cbc9e2f3f894886e4309fc60c10d2f77b30adcba9d590bf9c8adde93eb
+EBUILD wpa_supplicant-2.7-r1.ebuild 11763 BLAKE2B fba2545d7c383f4df338dce069c1011c803efd2d2e70cf43efe26b46df4d72ab60856759febc13af936baae7ff7d159b16a4b304deaf318ee99991469e14802f SHA512 eacaaeb231b4dfc79ecd4e49cfd8fdbcb0e95aca7a497de4daf127581cd70c1935df7fa0e4c62fb2a518b3a20bfd486933cc63dbc829e53960cfbbcf66e59e16
 EBUILD wpa_supplicant-2.7.ebuild 11704 BLAKE2B ee03f052b3e896025970ae8be65aea336c3c0cee3eed18af4e0f6e8d5a91b1fe1a851954b3114fbdbb8a7cca99b193f9a84509e3ec0ff5cfeff6fa03d6b79d4a SHA512 ad8dedda2a83e5ba230a60b3e32471eba5334ebe7bb80f9e048a09c0701f29652ea4184d29a84736b4708db9325481056301fdff868b085e32f952577507e33b
 EBUILD wpa_supplicant-9999.ebuild 11604 BLAKE2B bba465e8a711a22fda12cfea28378e9cef2b0f634f1c268e55bd8da5a9f630f4ca0001709c54f37160a4aa1dcdd6888f6d20c18fcd53c2b843c7399c00f54b15 SHA512 005f63ab95bdd23156ba9a878fdd06dd119b9a4bf8de2a06a12e48c24851975f8a9d20ace85883184a5ca42289cbb60d578ff8ea1b2aabecde39b79ebf99e2da
 MISC metadata.xml 1387 BLAKE2B d18ad59ec0e7852ed299596a6217d705f3344b1e215875fa5eb4afb9aeb91d17edd77ed35e5cb83b6868b529d3c173574f7d1810f2f145c8398860f72b0792fe SHA512 ab26df54e5dc68ef0db3f654df1dbf144b38d78e63d11d428bd04a4b374c6b704b334e3812a4042b4827bdab887bebe6de24a82c05edb7df7d614d4d4b8925fb
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch
deleted file mode 100644
index 0394ab545b16..000000000000
--- a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.6-libressl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From d53b107120af86a0c711bac950bfc2fa728cb4e6 Mon Sep 17 00:00:00 2001
-From: Julian Ospald <hasufell@hasufell.de>
-Date: Fri, 7 Oct 2016 17:45:46 +0200
-Subject: [PATCH] Fix LibreSSL compatibility
-Upstream: pending, http://lists.infradead.org/pipermail/hostap/2016-October/036458.html
-
-This basically just follows
-587b0457e0238b7b1800d46f5cdd5e1d2b06732f
-with the same pattern, which was missed here.
-
-Signed-off-by: Julian Ospald <hasufell@hasufell.de>
----
- src/crypto/crypto_openssl.c | 4 ++--
- src/crypto/tls_openssl.c    | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
-index 19e0e2b..b3d1b07 100644
---- a/src/crypto/crypto_openssl.c
-+++ b/src/crypto/crypto_openssl.c
-@@ -611,7 +611,7 @@ void crypto_cipher_deinit(struct crypto_cipher *ctx)
- 
- void * dh5_init(struct wpabuf **priv, struct wpabuf **publ)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	DH *dh;
- 	struct wpabuf *pubkey = NULL, *privkey = NULL;
- 	size_t publen, privlen;
-@@ -712,7 +712,7 @@ err:
- 
- void * dh5_init_fixed(const struct wpabuf *priv, const struct wpabuf *publ)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	DH *dh;
- 
- 	dh = DH_new();
-diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
-index 23ac64b..a7d4880 100644
---- a/src/crypto/tls_openssl.c
-+++ b/src/crypto/tls_openssl.c
-@@ -919,7 +919,7 @@ void * tls_init(const struct tls_config *conf)
- 		}
- #endif /* OPENSSL_FIPS */
- #endif /* CONFIG_FIPS */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_load_error_strings();
- 		SSL_library_init();
- #ifndef OPENSSL_NO_SHA256
-@@ -1043,7 +1043,7 @@ void tls_deinit(void *ssl_ctx)
- 
- 	tls_openssl_ref_count--;
- 	if (tls_openssl_ref_count == 0) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_ENGINE
- 		ENGINE_cleanup();
- #endif /* OPENSSL_NO_ENGINE */
-@@ -2334,7 +2334,7 @@ static int tls_connection_client_cert(struct tls_connection *conn,
- 		return 0;
- 
- #ifdef PKCS12_FUNCS
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- 	/*
- 	 * Clear previously set extra chain certificates, if any, from PKCS#12
- 	 * processing in tls_parse_pkcs12() to allow OpenSSL to build a new
-@@ -3976,7 +3976,7 @@ int tls_connection_set_params(void *tls_ctx, struct tls_connection *conn,
- 		engine_id = "pkcs11";
- 
- #if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	if (params->flags & TLS_CONN_EAP_FAST) {
- 		wpa_printf(MSG_DEBUG,
- 			   "OpenSSL: Use TLSv1_method() for EAP-FAST");
--- 
-2.10.1
-
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-libressl.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-libressl.patch
new file mode 100644
index 000000000000..45a1cf3701f9
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-2.7-libressl.patch
@@ -0,0 +1,46 @@
+From 2643a056bb7d0737f63f42a11c308b2804d9ebe5 Mon Sep 17 00:00:00 2001
+From: Andrey Utkin <andrey_utkin@gentoo.org>
+Date: Tue, 11 Dec 2018 17:41:10 +0000
+Subject: [PATCH] Fix build with LibreSSL
+
+When using LibreSSL instead of OpenSSL, linkage of hostapd executable
+fails with the following error when using some LibreSSL versions
+
+    ../src/crypto/tls_openssl.o: In function `tls_verify_cb':
+    tls_openssl.c:(.text+0x1273): undefined reference to `ASN1_STRING_get0_data'
+    ../src/crypto/tls_openssl.o: In function `tls_connection_peer_serial_num':
+    tls_openssl.c:(.text+0x3023): undefined reference to `ASN1_STRING_get0_data'
+    collect2: error: ld returned 1 exit status
+    make: *** [Makefile:1278: hostapd] Error 1
+
+ASN1_STRING_get0_data is present in recent OpenSSL, but absent in some
+versions of LibreSSL (confirmed for version 2.6.5), so fallback needs to
+be defined in this case, just like for old OpenSSL.
+
+This patch was inspired by similar patches to other projects, such as
+spice-gtk, pjsip.
+
+Link: https://bugs.gentoo.org/672834
+Signed-off-by: Andrey Utkin <andrey_utkin@gentoo.org>
+---
+ src/crypto/tls_openssl.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c
+index 608818310..cb70e2c47 100644
+--- a/src/crypto/tls_openssl.c
++++ b/src/crypto/tls_openssl.c
+@@ -104,7 +104,9 @@ static size_t SSL_SESSION_get_master_key(const SSL_SESSION *session,
+ 
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++	(defined(LIBRESSL_VERSION_NUMBER) && \
++	 LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #ifdef CONFIG_SUITEB
+ static int RSA_bits(const RSA *r)
+ {
+-- 
+2.20.1
+
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
new file mode 100644
index 000000000000..16e14e933ddc
--- /dev/null
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.7-r1.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1
+
+DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
+HOMEPAGE="https://w1.fi/wpa_supplicant/"
+LICENSE="|| ( GPL-2 BSD )"
+
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://w1.fi/hostap.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	SRC_URI="https://w1.fi/releases/${P}.tar.gz"
+fi
+
+SLOT="0"
+IUSE="ap bindist dbus eap-sim eapol_test fasteap gnutls +hs2-0 libressl p2p privsep ps3 qt5 readline selinux smartcard ssl suiteb tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+REQUIRED_USE="smartcard? ( ssl )"
+
+CDEPEND="dbus? ( sys-apps/dbus )
+	kernel_linux? (
+		dev-libs/libnl:3
+		net-wireless/crda
+		eap-sim? ( sys-apps/pcsc-lite )
+	)
+	!kernel_linux? ( net-libs/libpcap )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)
+	readline? (
+		sys-libs/ncurses:0=
+		sys-libs/readline:0=
+	)
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt:0=
+			net-libs/gnutls:=
+		)
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	!ssl? ( dev-libs/libtommath )
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-networkmanager )
+"
+
+DOC_CONTENTS="
+	If this is a clean installation of wpa_supplicant, you
+	have to create a configuration file named
+	${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf
+	An example configuration file is available for reference in
+	${EROOT%/}/usr/share/doc/${PF}/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+
+Kconfig_style_config() {
+		#param 1 is CONFIG_* item
+		#param 2 is what to set it = to, defaulting in y
+		CONFIG_PARAM="${CONFIG_HEADER:-CONFIG_}$1"
+		setting="${2:-y}"
+
+		if [ ! $setting = n ]; then
+			#first remove any leading "# " if $2 is not n
+			sed -i "/^# *$CONFIG_PARAM=/s/^# *//" .config || echo "Kconfig_style_config error uncommenting $CONFIG_PARAM"
+			#set item = $setting (defaulting to y)
+			sed -i "/^$CONFIG_PARAM/s/=.*/=$setting/" .config || echo "Kconfig_style_config error setting $CONFIG_PARAM=$setting"
+			if [ -z "$( grep ^$CONFIG_PARAM= .config )" ] ; then
+				echo "$CONFIG_PARAM=$setting" >>.config
+			fi
+		else
+			#ensure item commented out
+			sed -i "/^$CONFIG_PARAM/s/$CONFIG_PARAM/# $CONFIG_PARAM/" .config || echo "Kconfig_style_config error commenting $CONFIG_PARAM"
+		fi
+}
+
+pkg_setup() {
+	if use ssl ; then
+		if use gnutls && use libressl ; then
+			elog "You have both 'gnutls' and 'libressl' USE flags enabled: defaulting to USE=\"gnutls\""
+		fi
+	else
+		elog "You have 'ssl' USE flag disabled: defaulting to internal TLS implementation"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD
+	sed -i \
+		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \
+		../src/l2_packet/l2_packet_freebsd.c || die
+
+	# People seem to take the example configuration file too literally (bug #102361)
+	sed -i \
+		-e "s:^\(opensc_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_engine_path\):#\1:" \
+		-e "s:^\(pkcs11_module_path\):#\1:" \
+		wpa_supplicant.conf || die
+
+	# Change configuration to match Gentoo locations (bug #143750)
+	sed -i \
+		-e "s:/usr/lib/opensc:/usr/$(get_libdir):" \
+		-e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \
+		wpa_supplicant.conf || die
+
+	# systemd entries to D-Bus service files (bug #372877)
+	echo 'SystemdService=wpa_supplicant.service' \
+		| tee -a dbus/*.service >/dev/null || die
+
+	cd "${WORKDIR}/${P}" || die
+
+	if use wimax; then
+		# generate-libeap-peer.patch comes before
+		# fix-undefined-reference-to-random_get_bytes.patch
+		eapply "${FILESDIR}/${P}-generate-libeap-peer.patch"
+
+		# multilib-strict fix (bug #373685)
+		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile || die
+	fi
+
+	# bug (320097)
+	eapply "${FILESDIR}/${PN}-2.6-do-not-call-dbus-functions-with-NULL-path.patch"
+
+	# fix undefined reference to remove_ie()
+	eapply "${FILESDIR}/${P}-fix-undefined-remove-ie.patch"
+
+	# bug (672632)
+	eapply "${FILESDIR}/${P}-libressl.patch"
+
+	# bug (640492)
+	sed -i 's#-Werror ##' wpa_supplicant/Makefile || die
+}
+
+src_configure() {
+	# Toolchain setup
+	tc-export CC
+
+	cp defconfig .config || die
+
+	# Basic setup
+	Kconfig_style_config CTRL_IFACE
+	Kconfig_style_config MATCH_IFACE
+	Kconfig_style_config BACKEND file
+	Kconfig_style_config IBSS_RSN
+	Kconfig_style_config IEEE80211W
+	Kconfig_style_config IEEE80211R
+
+	# Basic authentication methods
+	# NOTE: we don't set GPSK or SAKE as they conflict
+	# with the below options
+	Kconfig_style_config EAP_GTC
+	Kconfig_style_config EAP_MD5
+	Kconfig_style_config EAP_OTP
+	Kconfig_style_config EAP_PAX
+	Kconfig_style_config EAP_PSK
+	Kconfig_style_config EAP_TLV
+	Kconfig_style_config EAP_EXE
+	Kconfig_style_config IEEE8021X_EAPOL
+	Kconfig_style_config PKCS12
+	Kconfig_style_config PEERKEY
+	Kconfig_style_config EAP_LEAP
+	Kconfig_style_config EAP_MSCHAPV2
+	Kconfig_style_config EAP_PEAP
+	Kconfig_style_config EAP_TLS
+	Kconfig_style_config EAP_TTLS
+
+	# Enabling background scanning.
+	Kconfig_style_config BGSCAN_SIMPLE
+	Kconfig_style_config BGSCAN_LEARN
+
+	if use dbus ; then
+		Kconfig_style_config CTRL_IFACE_DBUS
+		Kconfig_style_config CTRL_IFACE_DBUS_NEW
+		Kconfig_style_config CTRL_IFACE_DBUS_INTRO
+	fi
+
+	if use eapol_test ; then
+		Kconfig_style_config EAPOL_TEST
+	fi
+
+	# Enable support for writing debug info to a log file and syslog.
+	Kconfig_style_config DEBUG_FILE
+	Kconfig_style_config DEBUG_SYSLOG
+
+	if use hs2-0 ; then
+		Kconfig_style_config INTERWORKING
+		Kconfig_style_config HS20
+	fi
+
+	if use uncommon-eap-types; then
+		Kconfig_style_config EAP_GPSK
+		Kconfig_style_config EAP_SAKE
+		Kconfig_style_config EAP_GPSK_SHA256
+		Kconfig_style_config EAP_IKEV2
+		Kconfig_style_config EAP_EKE
+	fi
+
+	if use eap-sim ; then
+		# Smart card authentication
+		Kconfig_style_config EAP_SIM
+		Kconfig_style_config EAP_AKA
+		Kconfig_style_config EAP_AKA_PRIME
+		Kconfig_style_config PCSC
+	fi
+
+	if use fasteap ; then
+		Kconfig_style_config EAP_FAST
+	fi
+
+	if use readline ; then
+		# readline/history support for wpa_cli
+		Kconfig_style_config READLINE
+	else
+		#internal line edit mode for wpa_cli
+		Kconfig_style_config WPA_CLI_EDIT
+	fi
+
+	if use suiteb; then
+		Kconfig_style_config SUITEB
+	fi
+
+	# SSL authentication methods
+	if use ssl ; then
+		if use gnutls ; then
+			Kconfig_style_config TLS gnutls
+			Kconfig_style_config GNUTLS_EXTRA
+		else
+			#this fails for gnutls
+			Kconfig_style_config SUITEB192
+			Kconfig_style_config TLS openssl
+			if ! use bindist; then
+			  #this fails for gnutls
+			  Kconfig_style_config EAP_PWD
+			  # SAE fails on gnutls and everything below here needs SAE
+			  # Enabling mesh networks.
+			  Kconfig_style_config MESH
+			  #WPA3
+			  Kconfig_style_config OWE
+			  Kconfig_style_config SAE
+			  #we also need to disable FILS, except that isn't enabled yet
+			fi
+
+		fi
+	else
+		Kconfig_style_config TLS internal
+	fi
+
+	if use smartcard ; then
+		Kconfig_style_config SMARTCARD
+	fi
+
+	if use tdls ; then
+		Kconfig_style_config TDLS
+	fi
+
+	if use kernel_linux ; then
+		# Linux specific drivers
+		Kconfig_style_config DRIVER_ATMEL
+		Kconfig_style_config DRIVER_HOSTAP
+		Kconfig_style_config DRIVER_IPW
+		Kconfig_style_config DRIVER_NL80211
+		Kconfig_style_config DRIVER_RALINK
+		Kconfig_style_config DRIVER_WEXT
+		Kconfig_style_config DRIVER_WIRED
+
+		if use ps3 ; then
+			Kconfig_style_config DRIVER_PS3
+		fi
+
+	elif use kernel_FreeBSD ; then
+		# FreeBSD specific driver
+		Kconfig_style_config DRIVER_BSD
+	fi
+
+	# Wi-Fi Protected Setup (WPS)
+	if use wps ; then
+		Kconfig_style_config WPS
+		Kconfig_style_config WPS2
+		# USB Flash Drive
+		Kconfig_style_config WPS_UFD
+		# External Registrar
+		Kconfig_style_config WPS_ER
+		# Universal Plug'n'Play
+		Kconfig_style_config WPS_UPNP
+		# Near Field Communication
+		Kconfig_style_config WPS_NFC
+	fi
+
+	# Wi-Fi Direct (WiDi)
+	if use p2p ; then
+		Kconfig_style_config P2P
+		Kconfig_style_config WIFI_DISPLAY
+	fi
+
+	# Access Point Mode
+	if use ap ; then
+		Kconfig_style_config AP
+	fi
+
+	# Enable essentials for AP/P2P
+	if use ap || use p2p ; then
+		# Enabling HT support (802.11n)
+		Kconfig_style_config IEEE80211N
+
+		# Enabling VHT support (802.11ac)
+		Kconfig_style_config IEEE80211AC
+	fi
+
+	# Enable mitigation against certain attacks against TKIP
+	Kconfig_style_config DELAYED_MIC_ERROR_REPORT
+
+	if use privsep ; then
+		Kconfig_style_config PRIVSEP
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Bug 382159
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		Kconfig_style_config LIBNL32
+	fi
+
+	if use qt5 ; then
+		pushd "${S}"/wpa_gui-qt4 > /dev/null || die
+		eqmake5 wpa_gui.pro
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	einfo "Building wpa_supplicant"
+	emake V=1 BINDIR=/usr/sbin
+
+	if use wimax; then
+		emake -C ../src/eap_peer clean
+		emake -C ../src/eap_peer
+	fi
+
+	if use qt5; then
+		einfo "Building wpa_gui"
+		emake -C "${S}"/wpa_gui-qt4
+	fi
+
+	if use eapol_test ; then
+		emake eapol_test
+	fi
+}
+
+src_install() {
+	dosbin wpa_supplicant
+	use privsep && dosbin wpa_priv
+	dobin wpa_cli wpa_passphrase
+
+	# baselayout-1 compat
+	if has_version "<sys-apps/baselayout-2.0.0"; then
+		dodir /sbin
+		dosym ../usr/sbin/wpa_supplicant /sbin/wpa_supplicant
+		dodir /bin
+		dosym ../usr/bin/wpa_cli /bin/wpa_cli
+	fi
+
+	if has_version ">=sys-apps/openrc-0.5.0"; then
+		newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant
+		newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant
+	fi
+
+	exeinto /etc/wpa_supplicant/
+	newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh
+
+	readme.gentoo_create_doc
+	dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \
+		wpa_supplicant.conf
+
+	newdoc .config build-config
+
+	if [ "${PV}" != "9999" ]; then
+		doman doc/docbook/*.{5,8}
+	fi
+
+	if use qt5 ; then
+		into /usr
+		dobin wpa_gui-qt4/wpa_gui
+		doicon wpa_gui-qt4/icons/wpa_gui.svg
+		make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;"
+	else
+		rm "${ED}"/usr/share/man/man8/wpa_gui.8
+	fi
+
+	use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install
+
+	if use dbus ; then
+		pushd "${S}"/dbus > /dev/null || die
+		insinto /etc/dbus-1/system.d
+		newins dbus-wpa_supplicant.conf wpa_supplicant.conf
+		insinto /usr/share/dbus-1/system-services
+		doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service
+		popd > /dev/null || die
+
+		# This unit relies on dbus support, bug 538600.
+		systemd_dounit systemd/wpa_supplicant.service
+	fi
+
+	if use eapol_test ; then
+		dobin eapol_test
+	fi
+
+	systemd_dounit "systemd/wpa_supplicant@.service"
+	systemd_dounit "systemd/wpa_supplicant-nl80211@.service"
+	systemd_dounit "systemd/wpa_supplicant-wired@.service"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT%/}"/etc/wpa_supplicant.conf ]] ; then
+		echo
+		ewarn "WARNING: your old configuration file ${EROOT%/}/etc/wpa_supplicant.conf"
+		ewarn "needs to be moved to ${EROOT%/}/etc/wpa_supplicant/wpa_supplicant.conf"
+	fi
+
+	if use bindist || use gnutls; then
+		if ! use libressl; then
+			ewarn "Using bindist or gnutls use flags presently breaks WPA3 (specifically SAE and OWE)."
+			ewarn "This is incredibly undesirable"
+		fi
+	fi
+
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	local fn
+	for fn in wpa_supplicant{,@wlan0}.service; do
+		if [[ -e "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} ]]
+		then
+			ebegin "Moving ${fn} to multi-user.target"
+			mv "${EROOT%/}"/etc/systemd/system/network.target.wants/${fn} \
+				"${EROOT%/}"/etc/systemd/system/multi-user.target.wants/ || die
+			eend ${?} \
+				"Please try to re-enable ${fn}"
+		fi
+	done
+
+	systemd_reenable wpa_supplicant.service
+}