diff options
author | Zoltan Puskas <zoltan@sinustrom.info> | 2023-07-26 08:05:18 -0700 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-08-09 06:11:10 +0100 |
commit | 690c2ea6683607554f187b8c8841b2c67a03b4ab (patch) | |
tree | 2c7ebcf012fc0eaf862d53d58781b82b82ea9c36 /sci-electronics | |
parent | dev-util/meson: add 1.2.1 (diff) | |
download | gentoo-690c2ea6683607554f187b8c8841b2c67a03b4ab.tar.gz gentoo-690c2ea6683607554f187b8c8841b2c67a03b4ab.tar.bz2 gentoo-690c2ea6683607554f187b8c8841b2c67a03b4ab.zip |
sci-electronics/kicad: Make spice simulator mandatory
Upstream has dropped conditional build of ngspice since apparently KiCad
does not function well without it anyway. While 7.0.6 still has the flag
let's not allow turning it off to prevent issues for the users.
Closes: https://bugs.gentoo.org/910550
Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/kicad/kicad-7.0.6-r1.ebuild (renamed from sci-electronics/kicad/kicad-7.0.6.ebuild) | 8 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-9999.ebuild | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sci-electronics/kicad/kicad-7.0.6.ebuild b/sci-electronics/kicad/kicad-7.0.6-r1.ebuild index c63f7a8ec2cf..7cfafda8dab1 100644 --- a/sci-electronics/kicad/kicad-7.0.6.ebuild +++ b/sci-electronics/kicad/kicad-7.0.6-r1.ebuild @@ -28,7 +28,7 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice nls openmp" +IUSE="doc examples nls openmp" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -47,15 +47,13 @@ COMMON_DEPEND=" >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + >sci-electronics/ngspice-27[shared] sys-libs/zlib $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) nls? ( sys-devel/gettext ) @@ -111,8 +109,6 @@ src_configure() { -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_INSTALL_DEMOS="$(usex examples)" -DCMAKE_SKIP_RPATH="ON" diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index c63f7a8ec2cf..7cfafda8dab1 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -28,7 +28,7 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice nls openmp" +IUSE="doc examples nls openmp" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -47,15 +47,13 @@ COMMON_DEPEND=" >=x11-libs/cairo-1.8.8:= >=x11-libs/pixman-0.30 x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + >sci-electronics/ngspice-27[shared] sys-libs/zlib $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] ~dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) nls? ( sys-devel/gettext ) @@ -111,8 +109,6 @@ src_configure() { -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_INSTALL_DEMOS="$(usex examples)" -DCMAKE_SKIP_RPATH="ON" |