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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 544DD158086 for ; Tue, 23 Nov 2021 17:27:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B711E08CD; Tue, 23 Nov 2021 17:27:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 526B6E08CD for ; Tue, 23 Nov 2021 17:27:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57A6E342FBA for ; Tue, 23 Nov 2021 17:27:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E85931DA for ; Tue, 23 Nov 2021 17:27:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1637688440.e823d394b4b25c2439e57aeec85032ff0642590e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/kicad-6.0.0_rc1.ebuild sci-electronics/kicad/kicad-9999.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e823d394b4b25c2439e57aeec85032ff0642590e X-VCS-Branch: master Date: Tue, 23 Nov 2021 17:27:29 +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: fe99e959-5a1a-4470-b568-8ded04fb54f6 X-Archives-Hash: 7d498a5283bfa41979f8383ddc0f7172 commit: e823d394b4b25c2439e57aeec85032ff0642590e Author: Sam James gentoo org> AuthorDate: Tue Nov 23 17:22:06 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Nov 23 17:27:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e823d394 sci-electronics/kicad: fix LIVE_DEPEND logic Signed-off-by: Sam James gentoo.org> sci-electronics/kicad/kicad-6.0.0_rc1.ebuild | 9 ++++++--- sci-electronics/kicad/kicad-9999.ebuild | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild index d28c04025ecf..72984b65ce56 100644 --- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild +++ b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild @@ -15,8 +15,6 @@ HOMEPAGE="https://www.kicad.org" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git" inherit git-r3 - # x11-misc-util/macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" else MY_PV="${PV/_rc/-rc}" MY_P="${PN}-${MY_PV}" @@ -62,8 +60,13 @@ RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " BDEPEND="doc? ( app-doc/doxygen )" -CHECKREQS_DISK_BUILD="800M" +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND+=" >=x11-misc/util-macros-1.18" +fi + +CHECKREQS_DISK_BUILD="800M" CAS_VERSION=7.5.3 pkg_setup() { diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index d28c04025ecf..72984b65ce56 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -15,8 +15,6 @@ HOMEPAGE="https://www.kicad.org" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git" inherit git-r3 - # x11-misc-util/macros only required on live ebuilds - LIVE_DEPEND=">=x11-misc/util-macros-1.18" else MY_PV="${PV/_rc/-rc}" MY_P="${PN}-${MY_PV}" @@ -62,8 +60,13 @@ RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " BDEPEND="doc? ( app-doc/doxygen )" -CHECKREQS_DISK_BUILD="800M" +if [[ ${PV} == 9999 ]] ; then + # x11-misc-util/macros only required on live ebuilds + BDEPEND+=" >=x11-misc/util-macros-1.18" +fi + +CHECKREQS_DISK_BUILD="800M" CAS_VERSION=7.5.3 pkg_setup() {