gentoo resync : 28.04.2021

3 files changed, 26 insertions, 48 deletions

diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 43a4e5929ac3..b557abb73def 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -13,6 +13,6 @@ AUX wpa_supplicant-conf.d 291 BLAKE2B 348e7d21fe01d2fdd2117adf22444557fa3d401f64
 AUX wpa_supplicant-init.d 1250 BLAKE2B 159ebbd5a3552cbd8fdd6d48984c3a511e77cf1e140f56fc1d3e6b16454351a270e566dd7fc4717b92251193bdf59a77f57fc3fdd1d53b067f2e5253796c041b SHA512 f7439937a11d7a91eee98ab9e16a4853ce8e27395970007ae60ca9a8b1852fadc4a37ee0bf81d7e4806c545f70b139f26942ed1630db070abe8fe8e5ce752403
 AUX wpa_supplicant.conf 183 BLAKE2B ea25d56f366783548b8d4bc14615d89d1c9cff1e6535992d14fa2f87a095b6c7226fbdf6b2d2ecd5fdcc13fb413fc56d5294f906c840ab3f9386c99ea69139fc SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8
 DIST wpa_supplicant-2.9.tar.gz 3231785 BLAKE2B f1e2a5cb37b02d5c74116b5bc7f67c47d85f916c972cbd6b881d63a317161294a37c8517aabe6c74f9617c762aaa76d869f318af311473160e87bac8ac2a1807 SHA512 37a33f22cab9d27084fbef29856eaea0f692ff339c5b38bd32402dccf293cb849afd4a870cd3b5ca78179f0102f4011ce2f3444a53dc41dc75a5863b0a2226c8
-EBUILD wpa_supplicant-2.9-r2.ebuild 12439 BLAKE2B 3ac6d96d56ee8767bfdd507862aaa2f60c4482b4ed955979c65baf7f4fdc0061ce154efa901a41c578c5240d2ef450264335c529d2eb5f1ea736e738f2fff79e SHA512 570b15faa813a746cbb011d0cfb3178a97bc535e1bc9c93e4c98001f470cf3c82f695ec39dfca2222727b03e0cdb804c583853afd9e276828552ebd394ba6a9f
-EBUILD wpa_supplicant-9999.ebuild 12316 BLAKE2B a1158ceda4d673c1dd26a1233f8ffa15d9984740166e0172aa03ddf85d9ae775afd85bc0088fdd6b11786c856f92fc9fd432f8bcda770e854ce1f0ec425d093f SHA512 99206c8ac91209d7f49e6210cd68e80293e47250474392bd445b02755243b934da248232059319ec8f862cc33f2c3363e776ecf36a8d18245111ec6dd6b23161
+EBUILD wpa_supplicant-2.9-r2.ebuild 12057 BLAKE2B 0a322c75b7a2628af450929b846d61f18fc2c833523ab137a29f88e34fe3c66104c5c3bad737b7cba126f386ae232a3dc5478b787fdf4b13a9bad299778da0b7 SHA512 470dc00cf15c7bc4d6ee9e5cceef45e839e4e745b0c2e6daed07e99b8fdc9f5526a1ef468ca1de243de7cba3c875a8722aa0fba9725b84fe365dba7c7822389d
+EBUILD wpa_supplicant-9999.ebuild 11934 BLAKE2B 92cee24388350fefc91478b101c5ab030a258ef0a6856142c73914013ccb10ded4626c2c4284898c0745a280b792d423a2072b47c2324d7e6368b11a3737a194 SHA512 912a56f0a4c2f551b5597055ab7a79e22ad70aead8ad4e58efacca117dcd4a9ce33b050452786633886b184b0ca1eebd9b43b2cc8a406d8cc6c781caaf496f35
 MISC metadata.xml 1676 BLAKE2B f58705c6f4646675662468a497d1b0dbd7bb2c6870cd1b93b2fe186824da40c120e64b767acc470c2ddbf055af57d56f6d3d739267c5ff165d9c26a0969d3ec2 SHA512 fb5a6c37dd832b8af73b209e677735e583353a5542b24e9df1cda698bcec3702d10aa47cc4efbfb8df67122ad3dc6ad4c8ca6440579df68f67ff9f64e483852c
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
index 3705130f5574..95e04bf79861 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-2.9-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/"
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -29,7 +29,9 @@ REQUIRED_USE="
 	broadcom-sta? ( !fils !mesh !mbo )
 "
 
-CDEPEND="dbus? ( sys-apps/dbus )
+DEPEND="
+	>=dev-libs/openssl-1.0.2k:0=[bindist=]
+	dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		dev-libs/libnl:3
 		net-wireless/crda
@@ -46,15 +48,11 @@ CDEPEND="dbus? ( sys-apps/dbus )
 		sys-libs/ncurses:0=
 		sys-libs/readline:0=
 	)
-	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
 "
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-networkmanager )
 "
+BDEPEND="virtual/pkgconfig"
 
 DOC_CONTENTS="
 	If this is a clean installation of wpa_supplicant, you
@@ -134,7 +132,7 @@ src_prepare() {
 
 src_configure() {
 	# Toolchain setup
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	cp defconfig .config || die
 
@@ -235,7 +233,7 @@ src_configure() {
 
 	Kconfig_style_config TLS openssl
 	Kconfig_style_config FST
-	if ! use bindist || use libressl; then
+	if ! use bindist ; then
 		Kconfig_style_config EAP_PWD
 		if use fils; then
 			Kconfig_style_config FILS
@@ -251,8 +249,6 @@ src_configure() {
 		Kconfig_style_config SAE
 		Kconfig_style_config DPP
 		Kconfig_style_config SUITEB192
-	fi
-	if ! use bindist && ! use libressl; then
 		Kconfig_style_config SUITEB
 	fi
 
@@ -452,15 +448,8 @@ pkg_postinst() {
 	fi
 
 	if use bindist; then
-		if ! use libressl; then
-			ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
-			ewarn "This is incredibly undesirable"
-		fi
-	fi
-	if use libressl; then
-		ewarn "Libressl doesn't support SUITEB (part of WPA3)"
-		ewarn "but it does support SUITEB192 (the upgraded strength version of the same)"
-		ewarn "You probably don't care.  Patches welcome"
+		ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
+		ewarn "This is incredibly undesirable"
 	fi
 
 	# Mea culpa, feel free to remove that after some time --mgorny.
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
index c91b6d2f5624..f4d4302d5eec 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils qmake-utils systemd toolchain-funcs readme.gentoo-r1 desktop
+inherit desktop qmake-utils readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers"
 HOMEPAGE="https://w1.fi/wpa_supplicant/"
@@ -18,7 +18,7 @@ else
 fi
 
 SLOT="0"
-IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 libressl macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
+IUSE="ap bindist broadcom-sta dbus eap-sim eapol-test fasteap +fils +hs2-0 macsec +mbo +mesh p2p privsep ps3 qt5 readline selinux smartcard tdls uncommon-eap-types wimax wps kernel_linux kernel_FreeBSD"
 
 # CONFIG_PRIVSEP=y does not have sufficient support for the new driver
 # interface functions used for MACsec, so this combination cannot be used
@@ -29,7 +29,9 @@ REQUIRED_USE="
 	broadcom-sta? ( !fils !mesh !mbo )
 "
 
-CDEPEND="dbus? ( sys-apps/dbus )
+DEPEND="
+	>=dev-libs/openssl-1.0.2k:0=[bindist=]
+	dbus? ( sys-apps/dbus )
 	kernel_linux? (
 		dev-libs/libnl:3
 		net-wireless/crda
@@ -46,15 +48,11 @@ CDEPEND="dbus? ( sys-apps/dbus )
 		sys-libs/ncurses:0=
 		sys-libs/readline:0=
 	)
-	!libressl? ( >=dev-libs/openssl-1.0.2k:0=[bindist=] )
-	libressl? ( dev-libs/libressl:0= )
 "
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-networkmanager )
 "
+BDEPEND="virtual/pkgconfig"
 
 DOC_CONTENTS="
 	If this is a clean installation of wpa_supplicant, you
@@ -131,7 +129,7 @@ src_prepare() {
 
 src_configure() {
 	# Toolchain setup
-	tc-export CC
+	tc-export CC PKG_CONFIG
 
 	cp defconfig .config || die
 
@@ -232,7 +230,7 @@ src_configure() {
 
 	Kconfig_style_config TLS openssl
 	Kconfig_style_config FST
-	if ! use bindist || use libressl; then
+	if ! use bindist ; then
 		Kconfig_style_config EAP_PWD
 		if use fils; then
 			Kconfig_style_config FILS
@@ -248,8 +246,6 @@ src_configure() {
 		Kconfig_style_config SAE
 		Kconfig_style_config DPP
 		Kconfig_style_config SUITEB192
-	fi
-	if ! use bindist && ! use libressl; then
 		Kconfig_style_config SUITEB
 	fi
 
@@ -449,15 +445,8 @@ pkg_postinst() {
 	fi
 
 	if use bindist; then
-		if ! use libressl; then
-			ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
-			ewarn "This is incredibly undesirable"
-		fi
-	fi
-	if use libressl; then
-		ewarn "Libressl doesn't support SUITEB (part of WPA3)"
-		ewarn "but it does support SUITEB192 (the upgraded strength version of the same)"
-		ewarn "You probably don't care.  Patches welcome"
+		ewarn "Using bindist use flag presently breaks WPA3 (specifically SAE, OWE, DPP, and FILS)."
+		ewarn "This is incredibly undesirable"
 	fi
 
 	# Mea culpa, feel free to remove that after some time --mgorny.