Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/
Date: Tue, 23 Nov 2021 17:27:33
Message-Id: 1637688440.e823d394b4b25c2439e57aeec85032ff0642590e.sam@gentoo
1 commit: e823d394b4b25c2439e57aeec85032ff0642590e
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 23 17:22:06 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 23 17:27:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e823d394
7
8 sci-electronics/kicad: fix LIVE_DEPEND logic
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sci-electronics/kicad/kicad-6.0.0_rc1.ebuild | 9 ++++++---
13 sci-electronics/kicad/kicad-9999.ebuild | 9 ++++++---
14 2 files changed, 12 insertions(+), 6 deletions(-)
15
16 diff --git a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
17 index d28c04025ecf..72984b65ce56 100644
18 --- a/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
19 +++ b/sci-electronics/kicad/kicad-6.0.0_rc1.ebuild
20 @@ -15,8 +15,6 @@ HOMEPAGE="https://www.kicad.org"
21 if [[ ${PV} == 9999 ]]; then
22 EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
23 inherit git-r3
24 - # x11-misc-util/macros only required on live ebuilds
25 - LIVE_DEPEND=">=x11-misc/util-macros-1.18"
26 else
27 MY_PV="${PV/_rc/-rc}"
28 MY_P="${PN}-${MY_PV}"
29 @@ -62,8 +60,13 @@ RDEPEND="${COMMON_DEPEND}
30 sci-electronics/electronics-menu
31 "
32 BDEPEND="doc? ( app-doc/doxygen )"
33 -CHECKREQS_DISK_BUILD="800M"
34
35 +if [[ ${PV} == 9999 ]] ; then
36 + # x11-misc-util/macros only required on live ebuilds
37 + BDEPEND+=" >=x11-misc/util-macros-1.18"
38 +fi
39 +
40 +CHECKREQS_DISK_BUILD="800M"
41 CAS_VERSION=7.5.3
42
43 pkg_setup() {
44
45 diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
46 index d28c04025ecf..72984b65ce56 100644
47 --- a/sci-electronics/kicad/kicad-9999.ebuild
48 +++ b/sci-electronics/kicad/kicad-9999.ebuild
49 @@ -15,8 +15,6 @@ HOMEPAGE="https://www.kicad.org"
50 if [[ ${PV} == 9999 ]]; then
51 EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"
52 inherit git-r3
53 - # x11-misc-util/macros only required on live ebuilds
54 - LIVE_DEPEND=">=x11-misc/util-macros-1.18"
55 else
56 MY_PV="${PV/_rc/-rc}"
57 MY_P="${PN}-${MY_PV}"
58 @@ -62,8 +60,13 @@ RDEPEND="${COMMON_DEPEND}
59 sci-electronics/electronics-menu
60 "
61 BDEPEND="doc? ( app-doc/doxygen )"
62 -CHECKREQS_DISK_BUILD="800M"
63
64 +if [[ ${PV} == 9999 ]] ; then
65 + # x11-misc-util/macros only required on live ebuilds
66 + BDEPEND+=" >=x11-misc/util-macros-1.18"
67 +fi
68 +
69 +CHECKREQS_DISK_BUILD="800M"
70 CAS_VERSION=7.5.3
71
72 pkg_setup() {