| 1 |
commit: 06501a0cf4ae65f885b8b1b83b0db413bc37d34d |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 23 17:11:04 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 23 17:15:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06501a0c |
| 7 |
|
| 8 |
sci-electronics/kicad-packages3d: fix deps/keyword order for 9999 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild | 10 +++++++--- |
| 13 |
.../kicad-packages3d/kicad-packages3d-9999.ebuild | 12 +++++++----- |
| 14 |
2 files changed, 14 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index a01ce4d34d88..7fa4fa86d8b6 100644 |
| 18 |
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild |
| 19 |
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-6.0.0_rc1.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2020 Gentoo Authors |
| 22 |
+# Copyright 1999-2021 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=7 |
| 26 |
@@ -17,7 +17,7 @@ else |
| 27 |
MY_PV="${PV/_rc/-rc}" |
| 28 |
MY_P="${PN}-${MY_PV}" |
| 29 |
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" |
| 30 |
- KEYWORDS="~amd64 ~x86 ~arm64" |
| 31 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
| 32 |
S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d" |
| 33 |
fi |
| 34 |
|
| 35 |
@@ -25,9 +25,13 @@ IUSE="+occ" |
| 36 |
LICENSE="CC-BY-SA-4.0" |
| 37 |
SLOT="0" |
| 38 |
|
| 39 |
-DEPEND="" |
| 40 |
RDEPEND=">=sci-electronics/kicad-5.1.0[occ=]" |
| 41 |
|
| 42 |
+if [[ ${PV} == 9999 ]] ; then |
| 43 |
+ # x11-misc-util/macros only required on live ebuilds |
| 44 |
+ BDEPEND=">=x11-misc/util-macros-1.18" |
| 45 |
+fi |
| 46 |
+ |
| 47 |
# TODO fix this (ezzieyguywuf) |
| 48 |
S="${WORKDIR}/${PN/3d/3D}-${MY_PV}-1080b6e565e56bae9be46db2278a1542092d7a2d" |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild |
| 52 |
index 2c4be3dd9690..e241c3447f5a 100644 |
| 53 |
--- a/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild |
| 54 |
+++ b/sci-electronics/kicad-packages3d/kicad-packages3d-9999.ebuild |
| 55 |
@@ -1,4 +1,4 @@ |
| 56 |
-# Copyright 1999-2020 Gentoo Authors |
| 57 |
+# Copyright 1999-2021 Gentoo Authors |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
|
| 60 |
EAPI=7 |
| 61 |
@@ -11,21 +11,23 @@ HOMEPAGE="https://gitlab.com/kicad/libraries/kicad-packages3D" |
| 62 |
if [[ ${PV} == 9999 ]]; then |
| 63 |
EGIT_REPO_URI="https://gitlab.com/kicad/libraries/kicad-packages3D.git" |
| 64 |
inherit git-r3 |
| 65 |
- # x11-misc-util/macros only required on live ebuilds |
| 66 |
- LIVE_DEPEND=">=x11-misc/util-macros-1.18" |
| 67 |
else |
| 68 |
MY_PV="${PV/_rc/-rc}" |
| 69 |
MY_P="${PN}-${MY_PV}" |
| 70 |
SRC_URI="https://gitlab.com/kicad/libraries/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz" |
| 71 |
S="${WORKDIR}/${PN/3d/3D}-${MY_PV}" # check for directory hash |
| 72 |
- KEYWORDS="~amd64 ~x86 ~arm64" |
| 73 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
| 74 |
fi |
| 75 |
|
| 76 |
IUSE="+occ" |
| 77 |
LICENSE="CC-BY-SA-4.0" |
| 78 |
SLOT="0" |
| 79 |
|
| 80 |
-DEPEND="" |
| 81 |
RDEPEND=">=sci-electronics/kicad-5.99[occ=]" |
| 82 |
|
| 83 |
+if [[ ${PV} == 9999 ]] ; then |
| 84 |
+ # x11-misc-util/macros only required on live ebuilds |
| 85 |
+ BDEPEND=">=x11-misc/util-macros-1.18" |
| 86 |
+fi |
| 87 |
+ |
| 88 |
CHECKREQS_DISK_BUILD="11G" |
Archives