From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2554F138334 for ; Fri, 1 Nov 2019 16:24:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37F95E0877; Fri, 1 Nov 2019 16:24:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FD63E0877 for ; Fri, 1 Nov 2019 16:24:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 16C1134C667 for ; Fri, 1 Nov 2019 16:23:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D053F8A6 for ; Fri, 1 Nov 2019 16:23:54 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1572625376.4d2aad521b971030313c2733cc38124eb4eb5450.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/iwd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/iwd/iwd-9999.ebuild X-VCS-Directories: net-wireless/iwd/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 4d2aad521b971030313c2733cc38124eb4eb5450 X-VCS-Branch: master Date: Fri, 1 Nov 2019 16:23:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55bec5ca-5b50-42d9-9ea5-4ceaf9c343dd X-Archives-Hash: 441497ce2970ccdf6c6e75dbefa9a909 commit: 4d2aad521b971030313c2733cc38124eb4eb5450 Author: Ben Kohler gentoo org> AuthorDate: Fri Nov 1 16:17:44 2019 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Nov 1 16:22:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d2aad52 net-wireless/iwd: add conditional ell dep This will help unify live & release ebuilds a bit more. Live ebuilds using internal ell will leave this var unset, but release ebuilds will set it to the required ell release. Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-9999.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index 73b6abfd6a4..3a599ccce34 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -4,6 +4,9 @@ EAPI=6 inherit flag-o-matic linux-info systemd +#Set this variable to the required external ell version +ELL_REQ="" + if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 IWD_EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git" @@ -20,10 +23,11 @@ LICENSE="GPL-2" SLOT="0" IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" -COMMON_DEPEND="~dev-libs/ell-9999 - sys-apps/dbus +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 )"