[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad-packages3d/

[Sam James]

commit:     06501a0cf4ae65f885b8b1b83b0db413bc37d34d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 23 17:11:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 17:15:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06501a0c

sci-electronics/kicad-packages3d: fix deps/keyword order for 9999

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild       | 10 +++++++---
 .../kicad-packages3d/kicad-packages3d-9999.ebuild            | 12 +++++++-----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild 
b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
index a01ce4d34d88..7fa4fa86d8b6 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ else
        MY_PV="${PV/_rc/-rc}"
        MY_P="${PN}-${MY_PV}"
        
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz
 -> ${P}.tar.gz"
-       KEYWORDS="~amd64 ~x86 ~arm64"
+       KEYWORDS="~amd64 ~arm64 ~x86"
        
S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
 fi
 
@@ -25,9 +25,13 @@ IUSE="+occ"
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
 
-DEPEND=""
 RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]"
 
+if [[ ${PV} == 9999 ]] ; then
+       # x11-misc-util/macros only required on live ebuilds
+       BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
 # TODO fix this (ezzieyguywuf)
 S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d"
 

diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild 
b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
index 2c4be3dd9690..e241c3447f5a 100644
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,21 +11,23 @@ 
HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D";
 if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.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}"
        
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz
 -> ${P}.tar.gz"
        S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash
-       KEYWORDS="~amd64 ~x86 ~arm64"
+       KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 IUSE="+occ"
 LICENSE="CC-BY-SA-4.0"
 SLOT="0"
 
-DEPEND=""
 RDEPEND=">=sci-electronics/kicad-5.99[occ=]"
 
+if [[ ${PV} == 9999 ]] ; then
+       # x11-misc-util/macros only required on live ebuilds
+       BDEPEND=">=x11-misc/util-macros-1.18"
+fi
+
 CHECKREQS_DISK_BUILD="11G"