From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- sci-electronics/kicad/Manifest | 6 +- sci-electronics/kicad/kicad-6.0.0-r1.ebuild | 167 --------------------------- sci-electronics/kicad/kicad-6.0.1.ebuild | 169 ++++++++++++++++++++++++++++ sci-electronics/kicad/kicad-9999.ebuild | 14 ++- 4 files changed, 180 insertions(+), 176 deletions(-) delete mode 100644 sci-electronics/kicad/kicad-6.0.0-r1.ebuild create mode 100644 sci-electronics/kicad/kicad-6.0.1.ebuild (limited to 'sci-electronics/kicad') diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 357acb711050..1536cab3bfff 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -3,8 +3,8 @@ AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636 AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea -DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50 +DIST kicad-6.0.1.tar.gz 44971453 BLAKE2B e9fcaf367efb544197fb2ce448b0d808bb79f166e73e5c6f4c7c0ef303ee1bed5697101883ad4945aea8a1a1cd3b868832ea1ebfb727dfc8bdf56ce4d177838e SHA512 a257c69e0515c6d0c709bb59f632daff6e1e2108e1b1d4553d0cde397d551c3bfd969471dc63efdb12d57202842e1f645026650e2a7ca2c8af8b7150ceaebb3d EBUILD kicad-5.1.12.ebuild 5198 BLAKE2B 3293a0a9b260c3a3bf635045a98977ae58b899402cb43e80c9d754df5d9d82859cefc6d56946e877ca10e32d1cde28b747c2fad43c52ae6e7997c8e510963abc SHA512 38c96f65d3f05610fefd77915d55619b86ebe5c508952138b28ac4da60dd3e98bb279a6d172d4b73466361aec16036cf96ff19af23a0555599e71c8c4e60bfc7 -EBUILD kicad-6.0.0-r1.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb -EBUILD kicad-9999.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb +EBUILD kicad-6.0.1.ebuild 4209 BLAKE2B 9f193aa3cf674656688480c7d9a0ccf29dee2773fc09535bb7cde1a212e20e9db2dbda1b61acd25051d1f67f3ec4badc8caa16020ac42c93c4bd738942eee2a1 SHA512 218dec868c50b64f21409f17c8ef3af90c180d737cd4c9feea49e66dba209bc6176dc92497a2efcab8a5995832e0eced0cf7342fc4486f8d80019b52dc39947a +EBUILD kicad-9999.ebuild 4199 BLAKE2B 9bbea2242664b97da6ea28557a430c0f4686b30d40295b53dd614fcec935fe4a091e5768c950d680dc7cf458887e4653fd656b9c6282067a378cfd8c5e06b9fa SHA512 d57ee12d1ffbd72153629e1ba1b875d3215c4a978b7b25c0b6ad1ca75b2026e803701fa29ea6217c9e7c2f197c9e6124e1c23fc5eed88a776188fcfd8dd13927 MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5 diff --git a/sci-electronics/kicad/kicad-6.0.0-r1.ebuild b/sci-electronics/kicad/kicad-6.0.0-r1.ebuild deleted file mode 100644 index ff3a92646a7e..000000000000 --- a/sci-electronics/kicad/kicad-6.0.0-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) -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.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${MY_PV}" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" - fi -fi - -# BSD for bundled pybind -LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" -SLOT="0" -IUSE="doc examples +ngspice 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 -COMMON_DEPEND=" - !sci-electronics/kicad-i18n - >=dev-libs/boost-1.61:=[context,nls] - 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-1.61:=[context,nls,python,${PYTHON_USEDEP}] - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) - occ? ( - >=sci-libs/opencascade-7.3.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="800M" -CAS_VERSION=7.5.3 - -pkg_setup() { - 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/${PF}" - - -DKICAD_SCRIPTING_WXPYTHON=ON - - # Merged from separate -i18n package, bug #830274 - -DKICAD_BUILD_I18N=ON - -DKICAD_I18N_UNIX_STRICT_PATH=ON - - -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 "Different languages for GUI" sci-electronics/kicad-i18n - 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/kicad-6.0.1.ebuild b/sci-electronics/kicad/kicad-6.0.1.ebuild new file mode 100644 index 000000000000..4efd1ddc6a91 --- /dev/null +++ b/sci-electronics/kicad/kicad-6.0.1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9} ) +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.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~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 +COMMON_DEPEND=" + !sci-electronics/kicad-i18n + >=dev-libs/boost-1.61:=[context,nls] + 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-1.61:=[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:= + ) +" +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" + +pkg_setup() { + 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 "Different languages for GUI" sci-electronics/kicad-i18n + 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/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index ff3a92646a7e..129d19372060 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9} ) WX_GTK_VER="3.0-gtk3" @@ -28,7 +28,7 @@ fi # BSD for bundled pybind LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD" SLOT="0" -IUSE="doc examples +ngspice openmp +occ +pcm" +IUSE="doc examples +ngspice nls openmp +occ +pcm" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -52,6 +52,9 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) + nls? ( + sys-devel/gettext + ) occ? ( >=sci-libs/opencascade-7.3.0:= ) @@ -68,8 +71,7 @@ if [[ ${PV} == 9999 ]] ; then BDEPEND+=" >=x11-misc/util-macros-1.18" fi -CHECKREQS_DISK_BUILD="800M" -CAS_VERSION=7.5.3 +CHECKREQS_DISK_BUILD="900M" pkg_setup() { use openmp && tc-check-openmp @@ -96,8 +98,8 @@ src_configure() { -DKICAD_SCRIPTING_WXPYTHON=ON # Merged from separate -i18n package, bug #830274 - -DKICAD_BUILD_I18N=ON - -DKICAD_I18N_UNIX_STRICT_PATH=ON + -DKICAD_BUILD_I18N="$(usex nls)" + -DKICAD_I18N_UNIX_STRICT_PATH="$(usex nls)" -DPYTHON_DEST="$(python_get_sitedir)" -DPYTHON_EXECUTABLE="${PYTHON}" -- cgit v1.2.3