commit: bff1eea4f29713b27c65d7004e64ab311e70f69c Author: Huang Rui <vowstar <AT> gmail <DOT> com> AuthorDate: Wed Feb 28 08:32:49 2024 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Wed Feb 28 11:00:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff1eea4
sci-electronics/kicad: Add telemetry USE flag and fix QA settings - Introduce 'telemetry' USE flag in IUSE - Configure build to use telemetry based on USE flag - Update QA tests configuration with KICAD_SPICE_QA Thanks to @dlan17 and @zpuskas for their improvements to the ebuilds Closes: https://github.com/gentoo/gentoo/pull/35548 Signed-off-by: Huang Rui <vowstar <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> sci-electronics/kicad/kicad-8.0.0.ebuild | 5 ++++- sci-electronics/kicad/kicad-9999.ebuild | 10 ++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sci-electronics/kicad/kicad-8.0.0.ebuild b/sci-electronics/kicad/kicad-8.0.0.ebuild index 29cf2fd62499..779a6ba220c5 100644 --- a/sci-electronics/kicad/kicad-8.0.0.ebuild +++ b/sci-electronics/kicad/kicad-8.0.0.ebuild @@ -28,7 +28,7 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples nls openmp test" +IUSE="doc examples nls openmp telemetry test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -115,6 +115,9 @@ src_configure() { -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + -DKICAD_USE_SENTRY="$(usex telemetry)" + + -DKICAD_SPICE_QA="$(usex test)" -DKICAD_BUILD_QA_TESTS="$(usex test)" ) diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index e2e4708508d6..779a6ba220c5 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 nls openmp test" +IUSE="doc examples nls openmp telemetry test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -41,7 +41,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-db/unixODBC dev-libs/boost:=[context,nls] - dev-libs/libgit2 + dev-libs/libgit2:= media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 @@ -76,10 +76,6 @@ fi CHECKREQS_DISK_BUILD="1500M" -PATCHES=( - "${FILESDIR}"/${PN}-7.0.0-werror.patch -) - pkg_setup() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -119,6 +115,8 @@ src_configure() { -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + -DKICAD_USE_SENTRY="$(usex telemetry)" + -DKICAD_SPICE_QA="$(usex test)" -DKICAD_BUILD_QA_TESTS="$(usex test)" )
