summaryrefslogtreecommitdiff
path: root/sci-electronics/kicad
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-01-16 20:27:28 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-01-16 20:27:28 +0000
commit2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /sci-electronics/kicad
parentc3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
gentoo resync : 16.01.2021
Diffstat (limited to 'sci-electronics/kicad')
-rw-r--r--sci-electronics/kicad/Manifest6
-rw-r--r--sci-electronics/kicad/kicad-6.0.0-r1.ebuild (renamed from sci-electronics/kicad/kicad-6.0.0.ebuild)20
-rw-r--r--sci-electronics/kicad/kicad-9999.ebuild20
-rw-r--r--sci-electronics/kicad/metadata.xml4
4 files changed, 25 insertions, 25 deletions
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 44f58c8e4810..357acb711050 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -5,6 +5,6 @@ AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7
DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76 SHA512 c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
DIST kicad-6.0.0.tar.gz 45037889 BLAKE2B 4ea4075cd8e860ed19ee051be3567400c57f8c1b51550d2da80525ef65cc0b6c0951bac8c306c4fc19bddd824e2b727f416817ea4006a67f949dbf70df673a37 SHA512 1cadf59cfa85c5bbeb86f968ced896eff16c330e498497bf58826a58a59dfb83989422d660f7230d7921eeeda709d1ff10b50d4f842a36e50d44bf9017360b50
EBUILD kicad-5.1.12.ebuild 5198 BLAKE2B 3293a0a9b260c3a3bf635045a98977ae58b899402cb43e80c9d754df5d9d82859cefc6d56946e877ca10e32d1cde28b747c2fad43c52ae6e7997c8e510963abc SHA512 38c96f65d3f05610fefd77915d55619b86ebe5c508952138b28ac4da60dd3e98bb279a6d172d4b73466361aec16036cf96ff19af23a0555599e71c8c4e60bfc7
-EBUILD kicad-6.0.0.ebuild 4142 BLAKE2B 26ba3819428682a21221f9d588006cb8a08c51e9e928c2d23b9062d4a58aeff6a1588a787eba43b11bd3dda86d984ba177f5722386b84dbd6821e069a26e5477 SHA512 e78589c80532537a0cf4389d6641483fd49365cca16e102f45452f5268bb424b6d7c410653ae9254802c4e2bf2415e7c1c8eaaf5ff0e12f6b4fff34466e0d8a1
-EBUILD kicad-9999.ebuild 4142 BLAKE2B 26ba3819428682a21221f9d588006cb8a08c51e9e928c2d23b9062d4a58aeff6a1588a787eba43b11bd3dda86d984ba177f5722386b84dbd6821e069a26e5477 SHA512 e78589c80532537a0cf4389d6641483fd49365cca16e102f45452f5268bb424b6d7c410653ae9254802c4e2bf2415e7c1c8eaaf5ff0e12f6b4fff34466e0d8a1
-MISC metadata.xml 1100 BLAKE2B 0d7d4f0b90b243776a069fb7783f15a2cbedff807decfdae4dd0c3dbf1d75316a30e8e49c2b6c33b263dc47c7bd47606c628c14f7f5f1ee77eb0d2f0955ff239 SHA512 0b2978d4e5eee2e207133293822e3f6438a0554162ae972da88267d58fb9005ad0b3f69ab3f0228cca8976f93564a56c9b7ef32b94a54bb008144a6699888f53
+EBUILD kicad-6.0.0-r1.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb
+EBUILD kicad-9999.ebuild 4160 BLAKE2B 9a4ac201beec0b3fad26b0400a02a3df0b51d8cbc91e261a0d2092706576815682cb04be0c81b8ae6c92cc798e73b95089d7cf6e8fa5d862b32fb16a8efca0bc SHA512 2a62ba808de89273879d4311d068db7cc99bb32d521df16a682492596fbad852953174eda04d1f70b1322651560488d502bffe2e411a7ae3bf1ca18f73f43bfb
+MISC metadata.xml 1140 BLAKE2B e7f0b293ca2a8304712fab8165dda2ed527dd93809748e562e56ef0a1a23e3703e56599551eb6a318304e9e0d74a30eb361f497cbc8809c2d82b42ff7f160c1a SHA512 7f4e1ec8886f042ce559d2401b3721b474b2e7c4799610419732aae228fe6583e99ec0b49f12df4ec4bcfd6c5238861c22a200a8f9712d4c5c7d91d0b74a60e5
diff --git a/sci-electronics/kicad/kicad-6.0.0.ebuild b/sci-electronics/kicad/kicad-6.0.0-r1.ebuild
index 8840070ef1e9..ff3a92646a7e 100644
--- a/sci-electronics/kicad/kicad-6.0.0.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.0-r1.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=7
@@ -35,6 +35,7 @@ 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=
@@ -94,6 +95,10 @@ src_configure() {
-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)"
@@ -107,14 +112,9 @@ src_configure() {
-DCMAKE_SKIP_RPATH="ON"
)
- local OCC_P=$(best_version sci-libs/opencascade)
- OCC_P=${OCC_P#sci-libs/}
- OCC_P=${OCC_P%-r*}
-
use occ && mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
)
cmake_src_configure
@@ -123,7 +123,7 @@ src_configure() {
src_compile() {
cmake_src_compile
if use doc; then
- cmake_src_compile dev-docs doxygen-docs
+ cmake_src_compile doxygen-docs
fi
}
@@ -142,7 +142,7 @@ src_install() {
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/. development/doxygen/.
+ dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
fi
}
diff --git a/sci-electronics/kicad/kicad-9999.ebuild b/sci-electronics/kicad/kicad-9999.ebuild
index 8840070ef1e9..ff3a92646a7e 100644
--- a/sci-electronics/kicad/kicad-9999.ebuild
+++ b/sci-electronics/kicad/kicad-9999.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=7
@@ -35,6 +35,7 @@ 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=
@@ -94,6 +95,10 @@ src_configure() {
-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)"
@@ -107,14 +112,9 @@ src_configure() {
-DCMAKE_SKIP_RPATH="ON"
)
- local OCC_P=$(best_version sci-libs/opencascade)
- OCC_P=${OCC_P#sci-libs/}
- OCC_P=${OCC_P%-r*}
-
use occ && mycmakeargs+=(
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/${OCC_P}
- -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/${OCC_P}
-
+ -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
+ -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade
)
cmake_src_configure
@@ -123,7 +123,7 @@ src_configure() {
src_compile() {
cmake_src_compile
if use doc; then
- cmake_src_compile dev-docs doxygen-docs
+ cmake_src_compile doxygen-docs
fi
}
@@ -142,7 +142,7 @@ src_install() {
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/. development/doxygen/.
+ dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/.
fi
}
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 603e4e9f9662..09d8f72c361a 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -12,8 +12,8 @@
<use>
<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 opencascade</flag>
- <flag name="oce">Enable viewing 3D rendering of designs via OCE</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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 09:12:35 +0000