net-wireless/iwd: bump to 1.6

Also relax the ~ell deps to >=ell

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

diff --git a/net-wireless/iwd/Manifest b/net-wireless/iwd/Manifest
index 592af8071614a369916d32e240f1bef79edaf952..3ffc37959acb9bfcf23427629c05ec0a9245dd6a 100644 (file)
--- a/net-wireless/iwd/Manifest
+++ b/net-wireless/iwd/Manifest
@@ -1,2 +1,3 @@
 DIST iwd-1.4.tar.xz 830548 BLAKE2B 2d03767a5308c72206aefbafce39a241e353c1ef8751758d0a336a7ad5b86ef02062da037db423b805810eb45a9467628cd241682a63835b63e3ea920f39ace9 SHA512 3b06fa24666e7cf37353d95d0e9abc41b8be921ae7313c014f20f704fe7919d154d6a5441c6d87d4cd08ee65e15218ec01f4ff4aafc7e4a358faf3ca4a6dcb18
 DIST iwd-1.5.tar.xz 834688 BLAKE2B b3d585963c93954e4038dd85e5d57b60d8baaa7028edb79b54d8650a400a149666140f6ba438ccccb5be2d67fc7b842f6272b5efc61d75a7d4dae333410625bb SHA512 55017941f2e100d644864d2ed0528c67a486da6ba2bf7782e9df019727ce0af53cdff37c53f6625e536aa756387dd4e0d20a169710da8c3ce00f615040c9da32
+DIST iwd-1.6.tar.xz 844900 BLAKE2B 97d7162da88f550383ce9b3348b18e4e2e241242d7bf1eb99a904ca496afb8db287bcb426942246824e71a68127c38cf947b7f427f845eee2aa9ba6b4caa184c SHA512 79541672d55078daff0809841f99862ac538174aba8d9b0fb356cfa0b7e025538d9a84f79c35d2ef93114d8476273c3c72890f59cbee807b2bd0b85c0f4b9b55

diff --git a/net-wireless/iwd/iwd-1.6.ebuild b/net-wireless/iwd/iwd-1.6.ebuild
new file mode 100644 (file)
index 0000000..edd6c14
--- /dev/null
+++ b/net-wireless/iwd/iwd-1.6.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.30"
+
+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-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index d27e39a56fe7e0bcb185d4b5eb6391d32eb36f5b..e9b67b976608f0b44a20ce795df4a61f0fba0e24 100644 (file)
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -26,7 +26,7 @@ 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}"
+[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+=" >=dev-libs/ell-${ELL_REQ}"
 
 RDEPEND="${COMMON_DEPEND}
        net-wireless/wireless-regdb