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 9E397138334 for ; Tue, 24 Sep 2019 15:31:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBB02E084A; Tue, 24 Sep 2019 15:31:37 +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 B268AE084A for ; Tue, 24 Sep 2019 15:31:37 +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 60D0334B517 for ; Tue, 24 Sep 2019 15:31:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD0CA7E7 for ; Tue, 24 Sep 2019 15:31:34 +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: <1569339083.8728d4c5ee2991eca35d949f52fb9d32ab6dce9a.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: 8728d4c5ee2991eca35d949f52fb9d32ab6dce9a X-VCS-Branch: master Date: Tue, 24 Sep 2019 15:31:34 +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: bf7d969e-f8e1-4aaf-b7c5-33cec15c4527 X-Archives-Hash: 7dfe67e0bc66b727992b5bd1f71b984a commit: 8728d4c5ee2991eca35d949f52fb9d32ab6dce9a Author: Ben Kohler gentoo org> AuthorDate: Tue Sep 24 15:30:29 2019 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Sep 24 15:31:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8728d4c5 net-wireless/iwd: live ebuild tweaks Added new dep on docutils for man page generation. Changed all 9999 conditionals to *9999* for future-proofing and consistency. Introduced COMMON_DEPEND & reorganized deps. Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Ben Kohler gentoo.org> net-wireless/iwd/iwd-9999.ebuild | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/net-wireless/iwd/iwd-9999.ebuild b/net-wireless/iwd/iwd-9999.ebuild index bed12522f62..e1dc339b4d2 100644 --- a/net-wireless/iwd/iwd-9999.ebuild +++ b/net-wireless/iwd/iwd-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 inherit autotools flag-o-matic linux-info systemd -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/wireless/iwd.git" inherit git-r3 else @@ -19,15 +19,19 @@ LICENSE="GPL-2" SLOT="0" IUSE="+client +crda +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3" -RDEPEND=">=dev-libs/ell-0.21 - net-wireless/wireless-regdb +COMMON_DEPEND=">=dev-libs/ell-0.21 sys-apps/dbus - client? ( sys-libs/readline:0= ) + client? ( sys-libs/readline:0= )" + +RDEPEND="${COMMON_DEPEND} + net-wireless/wireless-regdb crda? ( net-wireless/crda )" -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} virtual/pkgconfig" +[[ ${PV} == *9999* ]] && DEPEND+=" dev-python/docutils" + pkg_pretend() { CONFIG_CHECK=" ~ASYMMETRIC_KEY_TYPE @@ -96,7 +100,7 @@ pkg_pretend() { } src_unpack() { - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999* ]] ; then git-r3_src_unpack git clone git://git.kernel.org/pub/scm/libs/ell/ell.git "${WORKDIR}"/ell else @@ -132,7 +136,7 @@ src_install() { newinitd "${FILESDIR}/ead.initd" ead fi - if [[ ${PV} == "9999" ]] ; then + if [[ ${PV} == *9999* ]] ; then exeinto /usr/share/iwd/scripts/ doexe test/* fi