commit: 194e0780737c7ff4f147a9c4d9f44971cc2306f5 Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info> AuthorDate: Sat Nov 3 05:44:01 2018 +0000 Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> CommitDate: Wed Jan 2 16:49:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=194e0780
sci-electronics/kicad: Bump to 5.0.1 version Bug: https://bugs.gentoo.org/669366 Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info> Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 sci-electronics/kicad/Manifest | 1 + sci-electronics/kicad/files/kicad-help-path.patch | 117 ++++++++++++++++++++ sci-electronics/kicad/kicad-5.0.1.ebuild | 128 ++++++++++++++++++++++ 3 files changed, 246 insertions(+) diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 80f7881b37e..f6f2ec87504 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,5 +1,6 @@ DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b DIST kicad-5.0.0.tar.xz 14284708 BLAKE2B 9f4414c4476aca8f2da1d7171b53f56d5ea216f11fc025695a228f93ec05e2f271cbab8429ed39445602a3a0707a31d44cce83eae0ad651167c471f52f3867cd SHA512 79d4d34e8eaa5b6e4c7baac39a76f86af89adbaf3f9181b8cd846ed3a8db1b4c6dd7a36efefda3394d33ef828917909ad3bd8bb22435af9c6f671efbff125b42 +DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d 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 diff --git a/sci-electronics/kicad/files/kicad-help-path.patch b/sci-electronics/kicad/files/kicad-help-path.patch new file mode 100644 index 00000000000..0fb43c3550c --- /dev/null +++ b/sci-electronics/kicad/files/kicad-help-path.patch @@ -0,0 +1,117 @@ +diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt +--- kicad-5.0.1-orig/CMakeLists.txt 2018-10-08 14:14:38.000000000 -0700 ++++ kicad-5.0.1/CMakeLists.txt 2018-12-25 00:04:50.423849671 -0800 +@@ -418,6 +418,10 @@ + set( KIFACE_PREFIX "_" ) + #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX} KIFACE_PREFIX:${KIFACE_PREFIX}" ) + ++# KICAD_HELP is the location of the help files accessed from the UI ++# (usually provided via kicad-doc package) ++set ( KICAD_HELP share/doc/kicad ++ CACHE PATH "Alternative location of KiCad help files.") + + #================================================ + # Locations for install targets. +diff -Naur kicad-5.0.1-orig/CMakeModules/config.h.cmake kicad-5.0.1/CMakeModules/config.h.cmake +--- kicad-5.0.1-orig/CMakeModules/config.h.cmake 2018-10-08 14:14:38.000000000 -0700 ++++ kicad-5.0.1/CMakeModules/config.h.cmake 2018-12-25 00:04:39.215828924 -0800 +@@ -59,6 +59,10 @@ + /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX. + #define DEFAULT_INSTALL_PATH "@DEFAULT_INSTALL_PATH@" + ++/// KiCad help files path can be different on some systems allow adding alternative, ++/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad ++#define KICAD_HELP "@KICAD_HELP@" ++ + /// The wxPython version found during configuration. + #if defined( KICAD_SCRIPTING_WXPYTHON ) + #define WXPYTHON_VERSION "@WXPYTHON_VERSION@" +diff -Naur kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp kicad-5.0.1/common/searchhelpfilefullpath.cpp +--- kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp 2018-10-08 14:14:38.000000000 -0700 ++++ kicad-5.0.1/common/searchhelpfilefullpath.cpp 2018-12-25 00:04:05.576771741 -0800 +@@ -25,7 +25,7 @@ + + #include <pgm_base.h> + #include <common.h> +-#include <config.h> // to define DEFAULT_INSTALL_PATH ++#include <config.h> // to define DEFAULT_INSTALL_PATH and KICAD_HELP + #include <macros.h> + + +@@ -68,6 +68,10 @@ + wxArrayString subdirs; + wxArrayString altsubdirs; + SEARCH_STACK ss = aSStack; ++#if ! defined(__WXMAC__) // && defined(__linux__) ++ SEARCH_STACK altss; ++ wxArrayString moresubdirs; ++#endif + + // It might already be in aSStack, but why depend on other code + // far away when it's so easy to add it again (to our copy) as the first place to look. +@@ -75,6 +79,7 @@ + // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during + // build configuration: + ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 ); ++ altss.AddPaths( wxT( KICAD_HELP ), 0 ); + + #if defined(__WXMAC__) + ss.AddPaths( GetOSXKicadMachineDataDir() ); +@@ -103,16 +108,17 @@ + + // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are + // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux. +- // This is ${KICAD_HELP} var in that CMakeLists.txt file. + // Below we account for an international subdirectory. + subdirs.Add( wxT( "share" ) ); + subdirs.Add( wxT( "doc" ) ); + subdirs.Add( wxT( "kicad" ) ); + subdirs.Add( wxT( "help" ) ); + ++ // For custom help path installations via ${KICAD_HELP} ++ moresubdirs.Add( wxT( "help" ) ); ++ + // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are + // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows. +- // This is ${KICAD_HELP} var in that CMakeLists.txt file. + // Below we account for an international subdirectory. + altsubdirs.Add( wxT( "doc" ) ); + altsubdirs.Add( wxT( "help" ) ); +@@ -158,6 +164,9 @@ + { + subdirs.Add( locale_name_dirs[ii] ); + altsubdirs.Add( locale_name_dirs[ii] ); ++#if ! defined(__WXMAC__) // && defined(__linux__) ++ moresubdirs.Add( locale_name_dirs[ii] ); ++#endif + + fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs ); + +@@ -187,8 +196,27 @@ + if( !fn.IsEmpty() ) + break; + ++#if ! defined(__WXMAC__) // && defined(__linux__) ++ fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs ); ++ ++ if( !fn.IsEmpty() ) ++ { ++ // Prepend URI protocol since we will open in a browser ++ fn = wxT( "file://" ) + fn; ++ break; ++ } ++ ++ fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs ); ++ ++ if( !fn.IsEmpty() ) ++ break; ++#endif ++ + subdirs.RemoveAt( subdirs.GetCount() - 1 ); + altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 ); ++#if ! defined(__WXMAC__) // && defined(__linux__) ++ moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 ); ++#endif + } + + return fn; diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild new file mode 100644 index 00000000000..598f92dad72 --- /dev/null +++ b/sci-electronics/kicad/kicad-5.0.1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +WX_GTK_VER="3.0" + +inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils + +DESCRIPTION="Electronic Schematic and PCB design tools" +HOMEPAGE="http://www.kicad-pcb.org"; +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 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] + python? ( + dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] + ${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-0.9.9.2 + media-libs/freeglut + media-libs/mesa + ngspice? ( + sci-electronics/ngspice[shared] + ) + 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-3.0:0 )" +RDEPEND="${COMMON_DEPEND} + sci-electronics/electronics-menu +" +CHECKREQS_DISK_BUILD="800M" + +PATCHES=( + "${FILESDIR}"/"${PN}-5.0.0-curl.patch" + "${FILESDIR}"/"${PN}-help-path.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + use openmp && tc-check-openmp + setup-wxwidgets + check-reqs_pkg_setup +} + +src_configure() { + xdg_environment_reset + + local mycmakeargs=( + -DKICAD_DOCS="/usr/share/doc/${P}" + -DKICAD_HELP="/usr/share/doc/${PN}-doc-${PV}" + -DBUILD_GITHUB_PLUGIN="$(usex github)" + -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="$(usex occ)" + -DKICAD_USE_OCE="$(usex oce)" + -DKICAD_INSTALL_DEMOS="$(usex examples)" + ) + use python && mycmakeargs+=( + -DPYTHON_DEST="$(python_get_sitedir)" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + ) + use occ && mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/lib + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc; then + cmake-utils_src_compile dev-docs doxygen-docs + fi +} + +src_install() { + cmake-utils_src_install + use python && 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/. development/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 + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +}
