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 <[email protected]> Signed-off-by: Sam James <[email protected]>
johu · Aug 9, 2023 · 690c2ea · 690c2ea
1 parent ccb73e4
commit 690c2ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/sci-electronics/kicad/kicad-7.0.6.ebuild → sci-electronics/kicad/kicad-7.0.6-r1.ebuild b/sci-electronics/kicad/kicad-7.0.6.ebuild → 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
@@ -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"