Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/
Date: Mon, 07 Feb 2022 20:47:10
Message-Id: 1644266809.bbc8951f368fa53f26423ca26976f15aee2da99d.asturm@gentoo
1 commit: bbc8951f368fa53f26423ca26976f15aee2da99d
2 Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
3 AuthorDate: Mon Feb 7 11:10:52 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 7 20:46:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc8951f
7
8 sci-electronics/kicad: Disable sci-libs/oce usage
9
10 OCE is an unmaintained fork of sci-libs/opencascade and is going to be
11 dropped. KiCAD still can be built and used with OCCT for 3D modeling.
12
13 Bug: https://bugs.gentoo.org/832625
14 Package-Manager: Portage-3.0.30, Repoman-3.0.3
15 Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
16 Closes: https://github.com/gentoo/gentoo/pull/24108
17 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
18
19 .../kicad/{kicad-5.1.12.ebuild => kicad-5.1.12-r1.ebuild} | 7 ++-----
20 sci-electronics/kicad/metadata.xml | 1 -
21 2 files changed, 2 insertions(+), 6 deletions(-)
22
23 diff --git a/sci-electronics/kicad/kicad-5.1.12.ebuild b/sci-electronics/kicad/kicad-5.1.12-r1.ebuild
24 similarity index 96%
25 rename from sci-electronics/kicad/kicad-5.1.12.ebuild
26 rename to sci-electronics/kicad/kicad-5.1.12-r1.ebuild
27 index 3957488f0a2b..733f5b237d03 100644
28 --- a/sci-electronics/kicad/kicad-5.1.12.ebuild
29 +++ b/sci-electronics/kicad/kicad-5.1.12-r1.ebuild
30 @@ -1,4 +1,4 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 +# Copyright 1999-2022 Gentoo Authors
33 # Distributed under the terms of the GNU General Public License v2
34
35 EAPI=8
36 @@ -16,11 +16,10 @@ SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2"
37 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
38 SLOT="0"
39 KEYWORDS="~amd64 ~arm64 ~x86"
40 -IUSE="doc examples github +ngspice occ +oce openmp +python"
41 +IUSE="doc examples github +ngspice +occ openmp +python"
42
43 REQUIRED_USE="
44 python? ( ${PYTHON_REQUIRED_USE} )
45 - ?? ( occ oce )
46 "
47
48 COMMON_DEPEND="
49 @@ -37,7 +36,6 @@ COMMON_DEPEND="
50 >sci-electronics/ngspice-27[shared]
51 )
52 occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] )
53 - oce? ( sci-libs/oce )
54 python? (
55 $(python_gen_cond_dep '
56 >=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}]
57 @@ -103,7 +101,6 @@ src_configure() {
58 -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)"
59 -DKICAD_SPICE="$(usex ngspice)"
60 -DKICAD_USE_OCC="$(usex occ)"
61 - -DKICAD_USE_OCE="$(usex oce)"
62 -DKICAD_INSTALL_DEMOS="$(usex examples)"
63 -DCMAKE_SKIP_RPATH="ON"
64 )
65
66 diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
67 index 09d8f72c361a..cd956ca81c5d 100644
68 --- a/sci-electronics/kicad/metadata.xml
69 +++ b/sci-electronics/kicad/metadata.xml
70 @@ -13,7 +13,6 @@
71 <flag name="github">Add github support into PCB editor</flag>
72 <flag name="ngspice">Enable circuit simulation</flag>
73 <flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag>
74 - <flag name="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag>
75 <flag name="python">Enable python scripting support</flag>
76 <flag name="pcm">Enable plugin content manager</flag>
77 </use>