commit: af776366a29213cc6fdbcd990c59aceb65911dea
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 18:26:38 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 18:26:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af776366
net-wireless/iwd: revbump 0.23 for strict ell dep, drop old
iwd-0.23 actually needs ~ell-0.25, it will segfault with 0.26. Keeping
iwd-0.23 since NetworkManager doesn't work with 1.0 yet. Drop old
revisions with incorrect deps.
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../iwd/{iwd-0.23.ebuild => iwd-0.23-r1.ebuild} | 2 +-
net-wireless/iwd/iwd-1.0.ebuild | 144 ---------------------
2 files changed, 1 insertion(+), 145 deletions(-)
diff --git a/net-wireless/iwd/iwd-0.23.ebuild
b/net-wireless/iwd/iwd-0.23-r1.ebuild
similarity index 99%
rename from net-wireless/iwd/iwd-0.23.ebuild
rename to net-wireless/iwd/iwd-0.23-r1.ebuild
index e8302612e25..e249a29033b 100644
--- a/net-wireless/iwd/iwd-0.23.ebuild
+++ b/net-wireless/iwd/iwd-0.23-r1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
-COMMON_DEPEND=">=dev-libs/ell-0.25
+COMMON_DEPEND="~dev-libs/ell-0.25
sys-apps/dbus
client? ( sys-libs/readline:0= )"
diff --git a/net-wireless/iwd/iwd-1.0.ebuild b/net-wireless/iwd/iwd-1.0.ebuild
deleted file mode 100644
index ba253b60989..00000000000
--- a/net-wireless/iwd/iwd-1.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic 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 ~arm64 ~ia64 ~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=">=dev-libs/ell-0.25
- sys-apps/dbus
- client? ( sys-libs/readline:0= )"
-
-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_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 && 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 [[ $(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() {
- 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() {
- append-cflags "-fsigned-char"
- econf --sysconfdir=/etc/iwd --localstatedir=/var \
- $(use_enable client) \
- $(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) \
- --with-systemd-networkdir="$(systemd_get_utildir)/network"
-}
-
-src_install() {
- default
- keepdir /var/lib/${PN}
-
- 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/*
- fi
-}
