diff options
Diffstat (limited to 'sci-electronics/kicad')
-rw-r--r-- | sci-electronics/kicad/Manifest | 11 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-scripts-install-fix.patch | 12 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-5.1.12-r3.ebuild (renamed from sci-electronics/kicad/kicad-5.1.12.ebuild) | 32 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-6.0.2-r1.ebuild (renamed from sci-electronics/kicad/kicad-6.0.1.ebuild) | 9 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-9999.ebuild | 3 | ||||
-rw-r--r-- | sci-electronics/kicad/metadata.xml | 1 |
6 files changed, 35 insertions, 33 deletions
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 1536cab3bfff..dd35eb43b5a1 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -2,9 +2,10 @@ AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d33 AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd 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 +AUX kicad-scripts-install-fix.patch 442 BLAKE2B 321ca8c5e846023696576daea00aa827ad88a4c3e82d120bd07392892b61d0e63892732f5469b1fe1472eac9584175acbc7aa611171f6fb9285017826156b30c SHA512 5abb158ec7e8a5ef8049797886e26febc018499dd7f5c8defdf9104b59371efa05cbec8e19e8fe22295e8e54c30095d347cccfa4c43db62b6ac4eb07bb8a080e DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea -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.1.ebuild 4209 BLAKE2B 9f193aa3cf674656688480c7d9a0ccf29dee2773fc09535bb7cde1a212e20e9db2dbda1b61acd25051d1f67f3ec4badc8caa16020ac42c93c4bd738942eee2a1 SHA512 218dec868c50b64f21409f17c8ef3af90c180d737cd4c9feea49e66dba209bc6176dc92497a2efcab8a5995832e0eced0cf7342fc4486f8d80019b52dc39947a -EBUILD kicad-9999.ebuild 4199 BLAKE2B 9bbea2242664b97da6ea28557a430c0f4686b30d40295b53dd614fcec935fe4a091e5768c950d680dc7cf458887e4653fd656b9c6282067a378cfd8c5e06b9fa SHA512 d57ee12d1ffbd72153629e1ba1b875d3215c4a978b7b25c0b6ad1ca75b2026e803701fa29ea6217c9e7c2f197c9e6124e1c23fc5eed88a776188fcfd8dd13927 -MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5 +DIST kicad-6.0.2.tar.gz 45003563 BLAKE2B 5f6d4fa5af30ba80a3316652112e3624338f0f38352993f0a31588572913d8abb282b8515854235df28ce4b6c4b5255ea03dd6ef81baa3dd080e2ba1fbf57990 SHA512 f21742aee1fe15bb181c7ce5675a0fa7d521b66fa79febd8c8b550abd487a1c122359ed8c8e6dc8bbc8867be339ae4cebe977a3f8e62d8bc40e675e9cc297962 +EBUILD kicad-5.1.12-r3.ebuild 4761 BLAKE2B 284b69c45c30f57275dee607d934030d97bc5c5491099db8eb13278524f61a61911ef540d805a4fc5d4f4361764c8268aa3f3a44004527962ce950cb2b873c2d SHA512 cd7faedd477a30d332b858aad0d1d2a4ef015642ec6a4165d2f03413954119ed4ce68fad6e1a6380d5be7a4a5fcdda6834ada1782137a7b1b7bdd7c0eab2aadd +EBUILD kicad-6.0.2-r1.ebuild 4365 BLAKE2B a21ec4b0534529799ca451a7016383eed57211c87daa806cb0007c3a1990542df4b4dfdbea9735bf7b2a60a02f33ad389a4e6fa9326c7a10f05321c78d04a81e SHA512 a47c8344bc8368d452c949eee060479a21d0b2ac04fca3c9ad3c78082bb19654db9ad0cbfbdb1eaa7d1c419eab5257e6039542f590e6ac97dab69c6076f4da93 +EBUILD kicad-9999.ebuild 4288 BLAKE2B f8ef5cd6f731cfed3a93986ba240e5272f706f33d1ab9a89a7ecb7bb9c77b5b635a106be381b3eb5300c52ca637a294137c39736fc5a05fdfffa2e053b920886 SHA512 aa1d909d5d23de7ca3406ad612d53aaf4f98d7df8cf5cdee6ebb1c645e535fe71ea3db0c023a8f00f1e2022cf4f4ff70372155563f1ed772c5427c7aeaf45f13 +MISC metadata.xml 1047 BLAKE2B 1ed5807dc4f194f6f66e6e0743fe186dd046128bfec2fd3e2a72919e4cf714b0ac6d1ba7da0764ce0b4202eb0a068e5c3e261dfcccf309198400e8be009b7845 SHA512 dc7b727047452b1398fe4029c3b7e70826074733be7c1f2c6c2d485948380da208561a738427d0a5f8a67dbec07593c529b4f8b6690b8a5de7b3bb291576ab59 diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch new file mode 100644 index 000000000000..d52a05d3bcf5 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch @@ -0,0 +1,12 @@ +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-5.1.12.ebuild b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild index 3957488f0a2b..34fef8a30277 100644 --- a/sci-electronics/kicad/kicad-5.1.12.ebuild +++ b/sci-electronics/kicad/kicad-5.1.12-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,13 +16,12 @@ SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="GPL-2+ GPL-3+ Boost-1.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples github +ngspice occ +oce openmp +python" +IUSE="doc examples github +ngspice +occ openmp +python" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) - ?? ( occ oce ) " - +# Depend on opencascade:0 to get unslotted variant (so we know path to it), bug #833301 COMMON_DEPEND=" >=dev-libs/boost-1.61:=[context,nls,threads(+)] media-libs/freeglut @@ -36,8 +35,7 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) - occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] ) - oce? ( sci-libs/oce ) + occ? ( <sci-libs/opencascade-7.5.3:0=[vtk(+)] ) python? ( $(python_gen_cond_dep ' >=dev-libs/boost-1.61:=[context,nls,threads(+),python,${PYTHON_USEDEP}] @@ -103,7 +101,6 @@ src_configure() { -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" -DKICAD_SPICE="$(usex ngspice)" -DKICAD_USE_OCC="$(usex occ)" - -DKICAD_USE_OCE="$(usex oce)" -DKICAD_INSTALL_DEMOS="$(usex examples)" -DCMAKE_SKIP_RPATH="ON" ) @@ -114,23 +111,10 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" ) if use occ; then - if has_version "~sci-libs/opencascade-7.5.2"; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2 - ) - elif has_version "~sci-libs/opencascade-7.5.1"; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1 - ) - else - # <occ-7.5 uses different layout - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - ) - fi + mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + ) fi cmake_src_configure diff --git a/sci-electronics/kicad/kicad-6.0.1.ebuild b/sci-electronics/kicad/kicad-6.0.2-r1.ebuild index 4efd1ddc6a91..2d3156fe68e9 100644 --- a/sci-electronics/kicad/kicad-6.0.1.ebuild +++ b/sci-electronics/kicad/kicad-6.0.2-r1.ebuild @@ -21,7 +21,7 @@ else S="${WORKDIR}/${PN}-${MY_PV}" if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi fi @@ -34,6 +34,7 @@ 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=" !sci-electronics/kicad-i18n >=dev-libs/boost-1.61:=[context,nls] @@ -56,7 +57,7 @@ COMMON_DEPEND=" sys-devel/gettext ) occ? ( - >=sci-libs/opencascade-7.3.0:= + >=sci-libs/opencascade-7.3.0:0= ) " DEPEND="${COMMON_DEPEND}" @@ -73,6 +74,10 @@ fi CHECKREQS_DISK_BUILD="900M" +PATCHES=( + "${FILESDIR}/${PN}-scripts-install-fix.patch" +) + pkg_setup() { use openmp && tc-check-openmp diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild index 129d19372060..9ca55665856a 100644 --- a/sci-electronics/kicad/kicad-9999.ebuild +++ b/sci-electronics/kicad/kicad-9999.ebuild @@ -34,6 +34,7 @@ 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=" !sci-electronics/kicad-i18n >=dev-libs/boost-1.61:=[context,nls] @@ -56,7 +57,7 @@ COMMON_DEPEND=" sys-devel/gettext ) occ? ( - >=sci-libs/opencascade-7.3.0:= + >=sci-libs/opencascade-7.3.0:0= ) " DEPEND="${COMMON_DEPEND}" diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml index 09d8f72c361a..cd956ca81c5d 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -13,7 +13,6 @@ <flag name="github">Add github support into PCB editor</flag> <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="oce">Enable viewing 3D rendering of designs via <pkg>sci-libs/oce</pkg></flag> <flag name="python">Enable python scripting support</flag> <flag name="pcm">Enable plugin content manager</flag> </use> |