diff options
author | Zoltan Puskas <zoltan@sinustrom.info> | 2023-07-06 03:27:46 -0700 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-07-18 20:13:19 +0100 |
commit | 886a3319f85d6e36f4536bca1bc915e2cd541f4e (patch) | |
tree | daf3686bee47c3fc6d386feaff22e2e636b3b4cd /sci-electronics | |
parent | sci-electronics/kicad: drop 6.0.9-r1 (diff) | |
download | gentoo-886a3319f85d6e36f4536bca1bc915e2cd541f4e.tar.gz gentoo-886a3319f85d6e36f4536bca1bc915e2cd541f4e.tar.bz2 gentoo-886a3319f85d6e36f4536bca1bc915e2cd541f4e.zip |
sci-electronics/kicad: drop 6.0.11
Signed-off-by: Zoltan Puskas <zoltan@sinustrom.info>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/kicad/Manifest | 1 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch | 12 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch | 30 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-scripts-install-fix.patch | 12 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-6.0.11.ebuild | 175 | ||||
-rw-r--r-- | sci-electronics/kicad/metadata.xml | 2 |
6 files changed, 0 insertions, 232 deletions
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index b66d5d8111fa..7fde7c4c5fd8 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,4 +1,3 @@ -DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e SHA512 9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec SHA512 6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516 DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f SHA512 04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4 DIST kicad-7.0.6.tar.bz2 43548452 BLAKE2B 90fa15d67f5629266755c469208baa486f41003a9b6ff32c7b7a0707967d54dbc3410d332f0ab1fde91c6045c345b34d1e27585feb265386e58447aea464a93f SHA512 492e6f4997eefda03eb371ec92c1a971cc37e16cb18f4ead08db22370048f6e2fce332c58d5eac64554808bf15738ebd18cf8f3664eacd6d3066a35268f3ec6a diff --git a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch deleted file mode 100644 index cce508c1e888..000000000000 --- a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp kicad-6.0.6-new/common/tool/tool_manager.cpp ---- kicad-6.0.6/common/tool/tool_manager.cpp 2022-06-17 18:11:16.000000000 -0700 -+++ kicad-6.0.6-new/common/tool/tool_manager.cpp 2022-06-20 00:17:13.548239632 -0700 -@@ -902,7 +902,7 @@ - m_menuOwner = -1; - - // Restore cursor settings -- for( auto cursorSetting : m_cursorSettings ) -+ for( auto const& cursorSetting : m_cursorSettings ) - { - auto it = m_toolIdIndex.find( cursorSetting.first ); - wxASSERT( it != m_toolIdIndex.end() ); diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch deleted file mode 100644 index f1047cb9dee5..000000000000 --- a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/892499 -https://gitlab.com/kicad/code/kicad/-/commit/8c324f1fc8f7fcdb5e8f494da3d45997001fab4a - -From 8c324f1fc8f7fcdb5e8f494da3d45997001fab4a Mon Sep 17 00:00:00 2001 -From: jean-pierre charras <jp.charras@wanadoo.fr> -Date: Tue, 20 Dec 2022 12:46:19 +0100 -Subject: [PATCH] Fix a missing include. Fixes #13216 - https://gitlab.com/kicad/code/kicad/issues/13216 - ---- a/pcb_calculator/eserie.h -+++ b/pcb_calculator/eserie.h -@@ -2,7 +2,7 @@ - * This program source code file is part of KiCad, a free EDA CAD application. - * - * Copyright (C) 2020 <janvi@veith.net> -- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors. -+ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors. - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the -@@ -21,6 +21,7 @@ - #include <array> - #include <vector> - #include <string> -+#include <cstdint> - - /** - * E-Values derived from a geometric sequence formula by Charles Renard were already --- -GitLab diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch deleted file mode 100644 index d52a05d3bcf5..000000000000 --- a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt ---- kicad-6.0.2-orig/CMakeLists.txt 2022-02-10 16:29:07.000000000 -0800 -+++ kicad-6.0.2/CMakeLists.txt 2022-02-13 20:09:37.244713966 -0800 -@@ -950,7 +950,7 @@ - ### - if( UNIX AND NOT APPLE ) - install( DIRECTORY scripts -- DESTINATION ${KICAD_DOCS} -+ DESTINATION ${KICAD_BIN}/scripts - COMPONENT resources - PATTERN "*.bat" EXCLUDE - ) diff --git a/sci-electronics/kicad/kicad-6.0.11.ebuild b/sci-electronics/kicad/kicad-6.0.11.ebuild deleted file mode 100644 index 7e4168d52685..000000000000 --- a/sci-electronics/kicad/kicad-6.0.11.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -WX_GTK_VER="3.0-gtk3" - -inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets xdg-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="https://www.kicad.org" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git" - inherit git-r3 -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.bz2" - S="${WORKDIR}/${PN}-${MY_PV}" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - fi -fi - -# BSD for bundled pybind -LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" -SLOT="0" -IUSE="doc examples ngspice nls openmp +occ +pcm" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Contains bundled pybind but it's patched for wx -# 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=" - dev-libs/boost:=[context,nls] - <dev-python/wxpython-4.2.0 - media-libs/freeglut - media-libs/glew:0= - >=media-libs/glm-0.9.9.1 - media-libs/mesa[X(+)] - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30 - x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - $(python_gen_cond_dep ' - dev-libs/boost:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) - 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 - doc? ( app-doc/doxygen )" - -if [[ ${PV} == 9999 ]] ; then - # x11-misc-util/macros only required on live ebuilds - BDEPEND+=" >=x11-misc/util-macros-1.18" -fi - -CHECKREQS_DISK_BUILD="900M" - -PATCHES=( - "${FILESDIR}/${PN}-scripts-install-fix.patch" - "${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch" - "${FILESDIR}/${PN}-6.0.9-gcc-13.patch" -) - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - python-single-r1_pkg_setup - setup-wxwidgets - check-reqs_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - default_src_unpack - fi -} - -src_configure() { - xdg_environment_reset - - local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" - - -DKICAD_SCRIPTING_WXPYTHON=ON - - # Merged from separate -i18n package, bug #830274 - -DKICAD_BUILD_I18N="$(usex nls)" - -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" - - -DPYTHON_DEST="$(python_get_sitedir)" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -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 - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use doc; then - cmake_src_compile doxygen-docs - fi -} - -src_test() { - # Test cannot find library in Portage's sandbox. Let's create a link so test can run. - ln -s "${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 -} - -src_install() { - cmake_src_install - python_optimize - - if use doc ; then - dodoc uncrustify.cfg - cd Documentation || die - dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. - fi -} - -pkg_postinst() { - optfeature "Component symbols library" sci-electronics/kicad-symbols - optfeature "Component footprints library" sci-electronics/kicad-footprints - optfeature "3D models of components " sci-electronics/kicad-packages3d - optfeature "Project templates" sci-electronics/kicad-templates - optfeature "Extended documentation" app-doc/kicad-doc - optfeature "Creating 3D models of components" media-gfx/wings - - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update -} diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml index 36c0a94d2d79..693935b54ebc 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -11,8 +11,6 @@ </maintainer> <use> <flag name="ngspice">Enable circuit simulation</flag> - <flag name="occ">Enable viewing 3D rendering of designs via <pkg>sci-libs/opencascade</pkg></flag> - <flag name="pcm">Enable plugin content manager</flag> </use> <longdescription> Kicad is an open source (GPL) software for the creation of electronic |