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

["Sam James" <sam@gentoo.org>]

commit:     d743e5ab76315e7e39a94e533d36e80c1e75722b
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Thu Feb 16 05:35:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 05:09:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d743e5ab

sci-electronics/kicad: Update live ebuild

Fixed several issues with the kicad live ebuild, which will also
propagate into future kicad ebuilds with a version, namely:
- remove non-existent sci-electronics/kicad-i18n blocker
- clean up obsolete cmake options
- undconditionally build plugin content manager
- unconditionally depend on sci-libs/opencascade
- add sys-libs/zlib, net-misc/curl, and dev-db/unixODBC as dependencies
- increase minimal version of dev-lang/swig dependency
- change source tarball compression form gz to bz2

Closes: https://bugs.gentoo.org/879945

Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-electronics/kicad/kicad-9999.ebuild | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index f7c3c3e7254d..96825330a19f 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV="${PV/_rc/-rc}"
 	MY_P="${PN}-${MY_PV}"
-	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 
 	if [[ ${PV} != *_rc* ]] ; then
@@ -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 +occ +pcm"
+IUSE="doc examples +ngspice nls openmp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -36,15 +36,18 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # See https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
 # Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301
 COMMON_DEPEND="
-	!sci-electronics/kicad-i18n
+	dev-db/unixODBC
 	dev-libs/boost:=[context,nls]
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
 	media-libs/mesa[X(+)]
+	net-misc/curl
+	>=sci-libs/opencascade-7.3.0:0=
 	>=x11-libs/cairo-1.8.8:=
 	>=x11-libs/pixman-0.30
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	sys-libs/zlib
 	$(python_gen_cond_dep '
 		dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}]
 		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
@@ -56,15 +59,12 @@ COMMON_DEPEND="
 	nls? (
 		sys-devel/gettext
 	)
-	occ? (
-		>=sci-libs/opencascade-7.3.0:0=
-	)
 "
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	sci-electronics/electronics-menu
 "
-BDEPEND=">=dev-lang/swig-3.0
+BDEPEND=">=dev-lang/swig-4.0
 	doc? ( app-doc/doxygen )"
 
 if [[ ${PV} == 9999 ]] ; then
@@ -98,7 +98,6 @@ src_configure() {
 
 		-DKICAD_SCRIPTING_WXPYTHON=ON
 
-		# Merged from separate -i18n package, bug #830274
 		-DKICAD_BUILD_I18N="$(usex nls)"
 		-DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)"
 
@@ -108,14 +107,10 @@ src_configure() {
 		-DPYTHON_LIBRARY="$(python_get_library_path)"
 
 		-DKICAD_SPICE="$(usex ngspice)"
-		-DKICAD_PCM="$(usex pcm)"
 
-		-DKICAD_USE_OCC="$(usex occ)"
 		-DKICAD_INSTALL_DEMOS="$(usex examples)"
 		-DCMAKE_SKIP_RPATH="ON"
-	)
 
-	use occ && mycmakeargs+=(
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
 	)