Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/
Date: Fri, 01 Nov 2019 16:24:02
Message-Id: 1572625376.4d2aad521b971030313c2733cc38124eb4eb5450.bkohler@gentoo
1 commit: 4d2aad521b971030313c2733cc38124eb4eb5450
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 1 16:17:44 2019 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 1 16:22:56 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2aad52
7
8 net-wireless/iwd: add conditional ell dep
9
10 This will help unify live & release ebuilds a bit more. Live ebuilds
11 using internal ell will leave this var unset, but release ebuilds will
12 set it to the required ell release.
13
14 Package-Manager: Portage-2.3.78, Repoman-2.3.17
15 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
16
17 net-wireless/iwd/iwd-9999.ebuild | 8 ++++++--
18 1 file changed, 6 insertions(+), 2 deletions(-)
19
20 diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild
21 index 73b6abfd6a4..3a599ccce34 100644
22 --- a/net-wireless/iwd/iwd-9999.ebuild
23 +++ b/net-wireless/iwd/iwd-9999.ebuild
24 @@ -4,6 +4,9 @@
25 EAPI=6
26 inherit flag-o-matic linux-info systemd
27
28 +#Set this variable to the required external ell version
29 +ELL_REQ=""
30 +
31 if [[ ${PV} == *9999* ]]; then
32 inherit autotools git-r3
33 IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git"
34 @@ -20,10 +23,11 @@ LICENSE="GPL-2"
35 SLOT="0"
36 IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3"
37
38 -COMMON_DEPEND="~dev-libs/ell-9999
39 - sys-apps/dbus
40 +COMMON_DEPEND="sys-apps/dbus
41 client? ( sys-libs/readline:0= )"
42
43 +[[ -z "${ELL_REQ}" ]] || COMMON_DEPEND+="~dev-libs/ell-${ELL_REQ}"
44 +
45 RDEPEND="${COMMON_DEPEND}
46 net-wireless/wireless-regdb
47 crda? ( net-wireless/crda )"