net-wireless/iwd: restore ia64 keywords & sync misc changes to 9999

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Ben Kohler <bkohler@gentoo.org>

2 files changed, 33 insertions, 6 deletions

diff --git a/net-wireless/iwd/iwd-0.18.ebuild b/net-wireless/iwd/iwd-0.18.ebuild
index cee477d005ed..cfed4d7d2162 100644
--- a/net-wireless/iwd/iwd-0.18.ebuild
+++ b/net-wireless/iwd/iwd-0.18.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~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 93969ee59cb0..bed12522f623 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/network/wireless/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Wireless daemon for linux"
@@ -17,10 +17,13 @@ HOMEPAGE="https://git.kernel.org/pub/scm/network/wireless/iwd.git/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
+IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
 
-RDEPEND="sys-apps/dbus
-	client? ( sys-libs/readline:0= )"
+RDEPEND=">=dev-libs/ell-0.21
+	net-wireless/wireless-regdb
+	sys-apps/dbus
+	client? ( sys-libs/readline:0= )
+	crda? ( net-wireless/crda )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -29,6 +32,7 @@ pkg_pretend() {
 	CONFIG_CHECK="
 		~ASYMMETRIC_KEY_TYPE
 		~ASYMMETRIC_PUBLIC_KEY_SUBTYPE
+		~CFG80211
 		~CRYPTO_AES
 		~CRYPTO_ARC4
 		~CRYPTO_CBC
@@ -48,6 +52,11 @@ pkg_pretend() {
 		~PKCS7_MESSAGE_PARSER
 		~X509_CERTIFICATE_PARSER
 	"
+	if use crda;then
+		CONFIG_CHECK="${CONFIG_CHECK} ~CFG80211_CRDA_SUPPORT"
+		WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support"
+	fi
+
 	if use amd64;then
 		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_AES_X86_64 ~CRYPTO_DES3_EDE_X86_64"
 		WARNING_CRYPTO_AES_X86_64="CRYPTO_AES_X86_64: enable for increased performance"
@@ -59,7 +68,7 @@ pkg_pretend() {
 		WARNING_CRYPTO_AES_NI_INTEL="CRYPTO_AES_NI_INTEL: enable for increased performance"
 	fi
 
-	if use cpu_flags_x86_ssse3; then
+	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"
@@ -71,6 +80,19 @@ pkg_pretend() {
 	fi
 
 	check_extra_config
+
+	if ! use crda; then
+		if [[ $(getfilevar CONFIG_CFG80211 /usr/src/linux/.config) == y ]] \
+			&& [[ $(getfilevar CONFIG_EXTRA_FIRMWARE /usr/src/linux/.config) != *regulatory.db* ]]
+		then
+			ewarn ""
+			ewarn "REGULATORY DOMAIN PROBLEM:"
+			ewarn "With CONFIG_CFG80211=y (built-in), the driver won't be able to load regulatory.db from"
+			ewarn " /lib/firmware, resulting in broken regulatory domain support.  Please set CONFIG_CFG80211=m"
+			ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE."
+			ewarn ""
+		fi
+	fi
 }
 
 src_unpack() {
@@ -94,6 +116,7 @@ src_configure() {
 		$(use_enable monitor) \
 		$(use_enable ofono) \
 		$(use_enable wired) \
+		--enable-external-ell \
 		--enable-systemd-service \
 		--with-systemd-unitdir="$(systemd_get_systemunitdir)" \
 		--with-systemd-modloaddir=$(_systemd_get_dir modulesloaddir /usr/lib/modules-load.d)
@@ -105,6 +128,10 @@ src_install() {
 
 	newinitd "${FILESDIR}/iwd.initd" iwd
 
+	if use wired;then
+		newinitd "${FILESDIR}/ead.initd" ead
+	fi
+
 	if [[ ${PV} == "9999" ]] ; then
 		exeinto /usr/share/iwd/scripts/
 		doexe test/*