diff options
Diffstat (limited to 'sci-electronics')
-rw-r--r-- | sci-electronics/Manifest.gz | bin | 9741 -> 9734 bytes | |||
-rw-r--r-- | sci-electronics/kicad/Manifest | 5 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.0.0-curl.patch | 23 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-5.0.0-r1.ebuild (renamed from sci-electronics/kicad/kicad-5.0.0.ebuild) | 38 | ||||
-rw-r--r-- | sci-electronics/kicad/metadata.xml | 1 |
5 files changed, 52 insertions, 15 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex a29e5754c848..6b320bdab264 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 9a2eb39de02a..78dce085171a 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,3 +1,4 @@ +AUX kicad-5.0.0-curl.patch 568 BLAKE2B 6a6d4d382f014fa57a5af8af27e6090f4c9e7b8c9454ee09f039c472f0089f0d9cb045d435b5193d6da4fa2a24dd5a859f7905b330d9bbbd5b0fa4cf116e8512 SHA512 dcb7a260f5acda58dcfdddd59920df02b8003b1727728c90076770fc67b4e7c47050b915e3d634612077b66d1ff62b6409111ee1003c443f48ea6356eeb59841 AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822 @@ -7,5 +8,5 @@ DIST kicad-5.0.0.tar.xz 14284708 BLAKE2B 9f4414c4476aca8f2da1d7171b53f56d5ea216f DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360 EBUILD kicad-4.0.7.ebuild 6655 BLAKE2B d5b54ce74ca3028d62c6d4ebf52992c7bf12eb2f5c519ed487914d1763ab3589f3cfd831f79f3080d95b85c157296c85aea78990e44f497656208431a3b6d3f0 SHA512 16f19bcb4fd206a24ab06f049b86aa6f1724bd8d0bfdebd804cc1eb50109f00b7ad7b9327d20abefb3527ff962e76c46640854d6bb2c393317c876e9d9e64625 -EBUILD kicad-5.0.0.ebuild 2865 BLAKE2B a5c14eb0539dff9fd975f5a1ef202fa4ba2404a6a1a6df934396b5fdedb0644a82271af98742b2baf9118350523172cf22d09887fcef6bc1f637ee63bc70d9be SHA512 2bc9bf253e56ab0bdf3a202784ba843bfbcbaeb161d47b0562bdd553a132bfc7fc19646c73e01edf70f4242f8e23ef91c02f18bdffac91f6471b2c424edaeaed -MISC metadata.xml 1100 BLAKE2B 07817b27f0ef057df1374ea3e480c934585c4fe284e5bd24e33551e8ac6ce44c6937704f13645838f27e8693123439cc25cf873b4d53f11342ef1dc820876ccb SHA512 45d21ce8f297512d6b48a750851b03a9ab306bc72c49cd2b367fea7471fdba28f9261ad279e96c32167298dddab77f4c93ea2288c24458281186f75177078226 +EBUILD kicad-5.0.0-r1.ebuild 3505 BLAKE2B a330ec2d0080728dab3690408e7c17150884f10b62d70fff07dc07d37f4127e52b700ead2ec56161f865a5512400c422e110a474161d1f7e672d5eac3866e8f6 SHA512 85b0ab06e6d0b74885b0bf84ec19adbc20a838b3f1051f787172fbdb6c2a7ddd36e586db678eb93c9e5a1088e2b290d7c192e411e743e8922b1741e7de442144 +MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c diff --git a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch new file mode 100644 index 000000000000..c99071c0a548 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch @@ -0,0 +1,23 @@ +--- a/common/CMakeLists.txt.old 2018-09-13 16:21:29.642915273 +0200 ++++ a/common/CMakeLists.txt 2018-09-13 16:23:25.146914833 +0200 +@@ -337,14 +337,17 @@ + list( APPEND COMMON_SRCS strtok_r.c ) + endif() + ++if( BUILD_GITHUB_PLUGIN ) ++ list( APPEND COMMON_SRCS ++ kicad_curl/kicad_curl.cpp ++ kicad_curl/kicad_curl_easy.cpp ++ ) ++endif() + + set( COMMON_SRCS + ${COMMON_SRCS} + system/libcontext.cpp + +- kicad_curl/kicad_curl.cpp +- kicad_curl/kicad_curl_easy.cpp +- + view/view.cpp + view/view_item.cpp + view/view_group.cpp diff --git a/sci-electronics/kicad/kicad-5.0.0.ebuild b/sci-electronics/kicad/kicad-5.0.0-r1.ebuild index db6476d4b962..18cae5de2535 100644 --- a/sci-electronics/kicad/kicad-5.0.0.ebuild +++ b/sci-electronics/kicad/kicad-5.0.0-r1.ebuild @@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 ) WX_GTK_VER="3.0" -inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 wxwidgets xdg +inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg DESCRIPTION="Electronic Schematic and PCB design tools" HOMEPAGE="http://www.kicad-pcb.org" @@ -15,10 +15,11 @@ SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.xz" LICENSE="GPL-2+ GPL-3+ Boost-1.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples github +ngspice +oce +python" +IUSE="doc examples github +ngspice occ +oce openmp +python" REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) + ?? ( occ oce ) " COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] @@ -27,9 +28,6 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] ${PYTHON_DEPS} ) >=dev-libs/boost-1.61[context,nls,threads,python?,${PYTHON_USEDEP}] - github? ( - net-misc/curl[ssl] - ) media-libs/glew:0= media-libs/glm media-libs/freeglut @@ -37,13 +35,14 @@ COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] ngspice? ( sci-electronics/ngspice[shared] ) - oce? ( - sci-libs/oce - ) - x11-libs/cairo" + occ? ( >=sci-libs/opencascade-6.8.0 ) + oce? ( sci-libs/oce ) + >=x11-libs/cairo-1.8.8 + >=x11-libs/pixman-0.30" DEPEND="${COMMON_DEPEND} doc? ( app-doc/doxygen ) - python? ( dev-lang/swig:0 )" + github? ( net-misc/curl[ssl] ) + python? ( >=dev-lang/swig-3.0:0 )" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " @@ -51,6 +50,7 @@ CHECKREQS_DISK_BUILD="800M" pkg_setup() { use python && python-single-r1_pkg_setup + use openmp && tc-check-openmp setup-wxwidgets check-reqs_pkg_setup } @@ -58,6 +58,14 @@ pkg_setup() { src_prepare() { xdg_src_prepare cmake-utils_src_prepare + + epatch "${FILESDIR}"/${P}-curl.patch + + # fix application categories in desktop files + while IFS="" read -d $'\0' -r f; do + sed -i.bkp '/Categories/s/Development;//' "${f}" + done < <(find "${S}" -type f -name "*.desktop" -print0) + } src_configure() { @@ -67,8 +75,9 @@ src_configure() { -DKICAD_SCRIPTING="$(usex python)" -DKICAD_SCRIPTING_MODULES="$(usex python)" -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" + -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_USE_OCC=OFF + -DKICAD_USE_OCC="$(usex occ)" -DKICAD_USE_OCE="$(usex oce)" -DKICAD_INSTALL_DEMOS="$(usex examples)" ) @@ -78,13 +87,16 @@ src_configure() { -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" ) + use occ && mycmakeargs+=( -DOCC_LIBRARY_DIR="${CASROOT}"/lib ) + cmake-utils_src_configure } src_compile() { cmake-utils_src_compile if use doc; then - doxygen Doxyfile || die + cmake-utils_src_compile doxygen-docs + cmake-utils_src_compile dev-docs fi } @@ -94,7 +106,7 @@ src_install() { if use doc ; then dodoc uncrustify.cfg cd Documentation || die - dodoc -r doxygen/. + dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. fi } diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml index 41cd516dac1f..6eff0d23cafb 100644 --- a/sci-electronics/kicad/metadata.xml +++ b/sci-electronics/kicad/metadata.xml @@ -14,6 +14,7 @@ <flag name="i18n">Allow GUI internationalization through l10n_* use flags</flag> <flag name="minimal">Build only binaries without parts library and examples</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="python">Enable python scripting support</flag> </use> |