diff options
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/Manifest.gz | bin | 9047 -> 9044 bytes | |||
| -rw-r--r-- | sci-electronics/kicad/Manifest | 2 | ||||
| -rw-r--r-- | sci-electronics/kicad/kicad-5.1.10-r1.ebuild | 9 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 8158d0640aab..13f9c33cb725 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index dfe079578448..69ebe8e98811 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -3,5 +3,5 @@ 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.10.tar.bz2 18586889 BLAKE2B 2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975 SHA512 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0 -EBUILD kicad-5.1.10-r1.ebuild 4984 BLAKE2B be2dab0a34c18081380bff2dcd40d48b618dd01758d3b43eac2ae1e05aee47eba0493914e1786b3238eb826b643e6accedb0d153562c46d7c8bef8bdd12cddc5 SHA512 8569f09efa70a705dadc4d48b65db3a3790c48758195514deff8c038a574709eabcd70c41e7fb3b8f5d5bfcd1203d7047119827b00f440c84907e05bb0c0a608 +EBUILD kicad-5.1.10-r1.ebuild 5198 BLAKE2B fcf5f1b1624a51582844cee0e0128fba044086717995af53af80108829b7d79b8c2e666c63bf1f1375ce078217ea82d9a88a266554e84caa7875e215c30298bc SHA512 266ae022ed7fff5574476364f6143440c4c1920824df120c1b7c84276b467d126765d24744c1c70e252bf787d099577f2125a252024fbaf1a9f3903be6c97538 MISC metadata.xml 1043 BLAKE2B 01782b6dbb1f44de2c100eff987f9f3715afc7e860c782b333cbc8a87e8d117f0111c09c563e79859a7247d7931a5d46623461459118e0e3a55b7e5883f6aa02 SHA512 463508b78ca804425e53877e79e394b9d4977c5c65955c5f47ff1e1ab8eb1a45c576a50c22d49c5855bfcdb07d17ec41d39b90ff5e36ab00a8515a5bc805ce02 diff --git a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild index ea33fd638444..586e7c949bb1 100644 --- a/sci-electronics/kicad/kicad-5.1.10-r1.ebuild +++ b/sci-electronics/kicad/kicad-5.1.10-r1.ebuild @@ -36,7 +36,7 @@ COMMON_DEPEND=" ngspice? ( >sci-electronics/ngspice-27[shared] ) - occ? ( sci-libs/opencascade:=[vtk(+)] ) + occ? ( <sci-libs/opencascade-7.5.3:=[vtk(+)] ) oce? ( sci-libs/oce ) python? ( $(python_gen_cond_dep ' @@ -114,7 +114,12 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" ) if use occ; then - if has_version ">=sci-libs/opencascade-7.5"; 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 |