[gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/

[Ben Kohler]

commit:     a2fe287d8d14eec542a5c3bf03bbed26273db13c
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 15:41:19 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 16:22:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fe287d

net-wireless/iwd: use internal ell for 9999 & ell path

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

 net-wireless/iwd/iwd-9999.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
index e6fd9bb55d3..73b6abfd6a4 100644
--- a/net-wireless/iwd/iwd-9999.ebuild
+++ b/net-wireless/iwd/iwd-9999.ebuild
@@ -103,7 +103,7 @@ pkg_pretend() {
 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=${S}/ell 
git-r3_src_unpack
+               EGIT_REPO_URI=${ELL_EGIT_REPO_URI} 
EGIT_CHECKOUT_DIR=${WORKDIR}/ell git-r3_src_unpack
        else
                default
        fi
@@ -118,16 +118,19 @@ src_prepare() {
 
 src_configure() {
        append-cflags "-fsigned-char"
-       econf --sysconfdir="${EPREFIX}"/etc/iwd 
--localstatedir="${EPREFIX}"/var \
+       local myeconfargs=(
+               --sysconfdir="${EPREFIX}"/etc/iwd 
--localstatedir="${EPREFIX}"/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"
+       )
+       [[ ${PV} == *9999* ]] || myeconfargs+=(--enable-external-ell)
+       econf "${myeconfargs[@]}"
 }
 
 src_install() {