commit: e823d394b4b25c2439e57aeec85032ff0642590e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Nov 23 17:22:06 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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() {
