commit: 7c38df7f779b35d4e0752863b779ca40ad51ae65 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Tue Jun 11 20:18:25 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 11 20:42:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c38df7f
sci-electronics/kicad: add 8.0.3, enable Python-3.12, fix qa_python `dosym` installs a symlink into $ED, we want to create a symlink inside $BUILD_DIR. This unbreaks the qa_python test. Bug: https://bugs.gentoo.org/931207 Closes: https://bugs.gentoo.org/933497 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> sci-electronics/kicad/Manifest | 1 + .../kicad/{kicad-9999.ebuild => kicad-8.0.3.ebuild} | 11 ++++++++--- sci-electronics/kicad/kicad-9999.ebuild | 11 ++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 10997a18105d..145c40253349 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -4,3 +4,4 @@ DIST kicad-7.0.7.tar.bz2 44055973 BLAKE2B 4169e111b8d2086572aa2979f09a8119dbc9ca 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 +DIST kicad-8.0.3.tar.bz2 72936035 BLAKE2B 667d6bc2e3a3f7ccc7a22a63d22702e6886404a86bca6ca2acdd5181c7046995332bb70f1fca9d25b20d9a7e1a9545488d00fb8d2ca70fd479a989ccea6c856f SHA512 14921827120381e749d094d2a76c850d2bee394c496859df3f4550a32b678a9523199a745e199f7c874ef85b2e8279129578e666c16932fbbcb1ba98c4e62b34 diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-8.0.3.ebuild similarity index 95% copy from sci-electronics/kicad/kicad-9999.ebuild copy to sci-electronics/kicad/kicad-8.0.3.ebuild index 83bf7ead3a08..71443e470a09 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-8.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WX_GTK_VER="3.2-gtk3" inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils @@ -11,7 +11,7 @@ inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-func DESCRIPTION="Electronic Schematic and PCB design tools" HOMEPAGE="https://www.kicad.org"; -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"; inherit git-r3 else @@ -141,7 +141,12 @@ src_compile() { src_test() { # Test cannot find library in Portage's sandbox. Let's create a link so test can run. mkdir -p "${BUILD_DIR}/qa/eeschema/" || die - dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + + export CMAKE_SKIP_TESTS=( + qa_pcbnew + qa_cli + ) # LD_LIBRARY_PATH is there to help it pick up the just-built libraries LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \ diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 83bf7ead3a08..71443e470a09 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) WX_GTK_VER="3.2-gtk3" inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils @@ -11,7 +11,7 @@ inherit check-reqs cmake flag-o-matic optfeature python-single-r1 toolchain-func DESCRIPTION="Electronic Schematic and PCB design tools" HOMEPAGE="https://www.kicad.org"; -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git"; inherit git-r3 else @@ -141,7 +141,12 @@ src_compile() { src_test() { # Test cannot find library in Portage's sandbox. Let's create a link so test can run. mkdir -p "${BUILD_DIR}/qa/eeschema/" || die - dosym "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + ln -s "${BUILD_DIR}/eeschema/_eeschema.kiface" "${BUILD_DIR}/qa/eeschema/_eeschema.kiface" || die + + export CMAKE_SKIP_TESTS=( + qa_pcbnew + qa_cli + ) # LD_LIBRARY_PATH is there to help it pick up the just-built libraries LD_LIBRARY_PATH="${BUILD_DIR}/common:${BUILD_DIR}/common/gal:${BUILD_DIR}/3d-viewer/3d_cache/sg:${LD_LIBRARY_PATH}" \
