From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9547C158064 for ; Fri, 3 May 2024 12:51:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D341FE2ACE; Fri, 3 May 2024 12:51:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD563E2ACE for ; Fri, 3 May 2024 12:51:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3F533430ED for ; Fri, 3 May 2024 12:51:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB1E31765 for ; Fri, 3 May 2024 12:51:33 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1714740668.f1cce39266c87dd148a87b8deda5001e24a4e1c1.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-electronics/kicad/Manifest sci-electronics/kicad/kicad-8.0.2.ebuild sci-electronics/kicad/kicad-9999.ebuild X-VCS-Directories: sci-electronics/kicad/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: f1cce39266c87dd148a87b8deda5001e24a4e1c1 X-VCS-Branch: master Date: Fri, 3 May 2024 12:51:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bc759ef7-3611-4f19-9864-050b330de152 X-Archives-Hash: 61afd576db7fc69d94691958f116f824 commit: f1cce39266c87dd148a87b8deda5001e24a4e1c1 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri May 3 12:46:22 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Fri May 3 12:51:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cce392 sci-electronics/kicad: add 8.0.2 - compat with occt 8.0.2 - fix finding libs in tests - filter-lto - add missing dep on wxGTK[wayland] - drop USE=telemetry, this now requires configureing DSN at build time, upstream default is off, other distro's do not enable this, unclear what the DSN should be if enabled. Closes: https://bugs.gentoo.org/923351 Closes: https://bugs.gentoo.org/927226 Closes: https://bugs.gentoo.org/927482 Closes: https://bugs.gentoo.org/927952 Signed-off-by: Andrew Ammerlaan gentoo.org> sci-electronics/kicad/Manifest | 1 + .../kicad/{kicad-9999.ebuild => kicad-8.0.2.ebuild} | 16 ++++++++++------ sci-electronics/kicad/kicad-9999.ebuild | 16 ++++++++++------ 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 0465595250b9..10997a18105d 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -3,3 +3,4 @@ DIST kicad-7.0.11.tar.bz2 44083805 BLAKE2B d923581f49b3cf48776de56ba12ddc99e9422 DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9caf34790ec5e5f3e0972d0a2e93dab6a1c814dc35ae40d5962e7ba93bad83d5930e9dba9b9f2e52f307378519714 SHA512 82eff4a16847c657ae3102af7914539bf7404e8856ca8c94557533a3ddd7b40ff4571b351dab48349d503d413cf293880245a97238516add83e79890325f1067 DIST kicad-8.0.0.tar.bz2 72430414 BLAKE2B 52bad016249563d9668f08da2103e47c7db706e6749e23ff5c59fd423673db614a1c8681cd0e7927571fe157644e142929891647964c48f45b219e72166c3ebc SHA512 52e605c10fbac0a3c6208f92ab9e567de9074e41495db9619631765a0f20e2da23a2d45610bd367d943e8b4a2d72edf33456007aabcc1f7672b0bb1a93101ce0 DIST kicad-8.0.1.tar.bz2 72453098 BLAKE2B 67c6b69256566a176ae10affa7ac65879db71f5017dc24312eba904724b2b28caa56f6c82c697d27b34d94f9a8f5448307948e17f17c9750693b192afa3ffab9 SHA512 b6509bb4bfd1cbe87a2f409b70a8ba037a44fb039aaacd9d62868b43925382c0d3aab4c4f7e4bbd646b6ea7cf35fd7318f620a1c8c250c09251349357f2caf11 +DIST kicad-8.0.2.tar.bz2 72713030 BLAKE2B ba47a16b5c435970a45aef9988a5f6d218df043a5ce3547a191991ef63620125989e6218e97266a62c76ece604248bdf0652a10d423346fe3648c8ba240651c4 SHA512 192bcd494f00eccc430ddf9e9034f252bae177f06da81e730fb82f000a58bac9201d49ecba93c3bd17608b6df6a944beea85849050e306e11c1abfbd0028ff4a diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-8.0.2.ebuild similarity index 91% copy from sci-electronics/kicad/kicad-9999.ebuild copy to sci-electronics/kicad/kicad-8.0.2.ebuild index b006c9bf1a8d..296f53277dd1 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-8.0.2.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) WX_GTK_VER="3.2-gtk3" -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils DESCRIPTION="Electronic Schematic and PCB design tools" HOMEPAGE="https://www.kicad.org" @@ -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 telemetry test" +IUSE="doc examples nls openmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -53,7 +53,7 @@ COMMON_DEPEND=" >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib - >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,wayland] $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] @@ -96,6 +96,11 @@ src_unpack() { fi } +src_prepare() { + filter-lto # Bug 927482 + cmake_src_prepare +} + src_configure() { xdg_environment_reset @@ -119,8 +124,6 @@ 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)" ) @@ -141,7 +144,8 @@ src_test() { dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die # LD_LIBRARY_PATH is there to help it pick up the just-built libraries - LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test + LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \ + cmake_src_test } src_install() { diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index b006c9bf1a8d..296f53277dd1 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) WX_GTK_VER="3.2-gtk3" -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils DESCRIPTION="Electronic Schematic and PCB design tools" HOMEPAGE="https://www.kicad.org" @@ -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 telemetry test" +IUSE="doc examples nls openmp test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -53,7 +53,7 @@ COMMON_DEPEND=" >=x11-libs/pixman-0.30 >sci-electronics/ngspice-27[shared] sys-libs/zlib - >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] + >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,wayland] $(python_gen_cond_dep ' dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] >=dev-python/wxpython-4.2.0:*[${PYTHON_USEDEP}] @@ -96,6 +96,11 @@ src_unpack() { fi } +src_prepare() { + filter-lto # Bug 927482 + cmake_src_prepare +} + src_configure() { xdg_environment_reset @@ -119,8 +124,6 @@ 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)" ) @@ -141,7 +144,8 @@ src_test() { dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die # LD_LIBRARY_PATH is there to help it pick up the just-built libraries - LD_LIBRARY_PATH="${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" cmake_src_test + LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \ + cmake_src_test } src_install() {