| 1 |
commit: 41cbc5c9a11f007e126063bc7b60e57b8ca24538 |
| 2 |
Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info> |
| 3 |
AuthorDate: Tue May 12 08:10:34 2020 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 14 10:34:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41cbc5c9 |
| 7 |
|
| 8 |
sci-electronics/kicad: Drop 5.0.1 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/682480 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info> |
| 13 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
| 14 |
|
| 15 |
sci-electronics/kicad/Manifest | 1 - |
| 16 |
sci-electronics/kicad/files/kicad-5.0.0-curl.patch | 23 ---- |
| 17 |
sci-electronics/kicad/files/kicad-5.0.0-help.patch | 117 ------------------- |
| 18 |
sci-electronics/kicad/kicad-5.0.1.ebuild | 130 --------------------- |
| 19 |
4 files changed, 271 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest |
| 22 |
index be715a6e32b..5b38dbd3a14 100644 |
| 23 |
--- a/sci-electronics/kicad/Manifest |
| 24 |
+++ b/sci-electronics/kicad/Manifest |
| 25 |
@@ -1,6 +1,5 @@ |
| 26 |
DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a |
| 27 |
DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b |
| 28 |
-DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7 SHA512 36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d |
| 29 |
DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad SHA512 644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761 |
| 30 |
DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e SHA512 5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b |
| 31 |
DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b SHA512 ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337 |
| 32 |
|
| 33 |
diff --git a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch |
| 34 |
deleted file mode 100644 |
| 35 |
index c99071c0a54..00000000000 |
| 36 |
--- a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch |
| 37 |
+++ /dev/null |
| 38 |
@@ -1,23 +0,0 @@ |
| 39 |
---- a/common/CMakeLists.txt.old 2018-09-13 16:21:29.642915273 +0200 |
| 40 |
-+++ a/common/CMakeLists.txt 2018-09-13 16:23:25.146914833 +0200 |
| 41 |
-@@ -337,14 +337,17 @@ |
| 42 |
- list( APPEND COMMON_SRCS strtok_r.c ) |
| 43 |
- endif() |
| 44 |
- |
| 45 |
-+if( BUILD_GITHUB_PLUGIN ) |
| 46 |
-+ list( APPEND COMMON_SRCS |
| 47 |
-+ kicad_curl/kicad_curl.cpp |
| 48 |
-+ kicad_curl/kicad_curl_easy.cpp |
| 49 |
-+ ) |
| 50 |
-+endif() |
| 51 |
- |
| 52 |
- set( COMMON_SRCS |
| 53 |
- ${COMMON_SRCS} |
| 54 |
- system/libcontext.cpp |
| 55 |
- |
| 56 |
-- kicad_curl/kicad_curl.cpp |
| 57 |
-- kicad_curl/kicad_curl_easy.cpp |
| 58 |
-- |
| 59 |
- view/view.cpp |
| 60 |
- view/view_item.cpp |
| 61 |
- view/view_group.cpp |
| 62 |
|
| 63 |
diff --git a/sci-electronics/kicad/files/kicad-5.0.0-help.patch b/sci-electronics/kicad/files/kicad-5.0.0-help.patch |
| 64 |
deleted file mode 100644 |
| 65 |
index 0fb43c3550c..00000000000 |
| 66 |
--- a/sci-electronics/kicad/files/kicad-5.0.0-help.patch |
| 67 |
+++ /dev/null |
| 68 |
@@ -1,117 +0,0 @@ |
| 69 |
-diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt |
| 70 |
---- kicad-5.0.1-orig/CMakeLists.txt 2018-10-08 14:14:38.000000000 -0700 |
| 71 |
-+++ kicad-5.0.1/CMakeLists.txt 2018-12-25 00:04:50.423849671 -0800 |
| 72 |
-@@ -418,6 +418,10 @@ |
| 73 |
- set( KIFACE_PREFIX "_" ) |
| 74 |
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX} KIFACE_PREFIX:${KIFACE_PREFIX}" ) |
| 75 |
- |
| 76 |
-+# KICAD_HELP is the location of the help files accessed from the UI |
| 77 |
-+# (usually provided via kicad-doc package) |
| 78 |
-+set ( KICAD_HELP share/doc/kicad |
| 79 |
-+ CACHE PATH "Alternative location of KiCad help files.") |
| 80 |
- |
| 81 |
- #================================================ |
| 82 |
- # Locations for install targets. |
| 83 |
-diff -Naur kicad-5.0.1-orig/CMakeModules/config.h.cmake kicad-5.0.1/CMakeModules/config.h.cmake |
| 84 |
---- kicad-5.0.1-orig/CMakeModules/config.h.cmake 2018-10-08 14:14:38.000000000 -0700 |
| 85 |
-+++ kicad-5.0.1/CMakeModules/config.h.cmake 2018-12-25 00:04:39.215828924 -0800 |
| 86 |
-@@ -59,6 +59,10 @@ |
| 87 |
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX. |
| 88 |
- #define DEFAULT_INSTALL_PATH "@DEFAULT_INSTALL_PATH@" |
| 89 |
- |
| 90 |
-+/// KiCad help files path can be different on some systems allow adding alternative, |
| 91 |
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad |
| 92 |
-+#define KICAD_HELP "@KICAD_HELP@" |
| 93 |
-+ |
| 94 |
- /// The wxPython version found during configuration. |
| 95 |
- #if defined( KICAD_SCRIPTING_WXPYTHON ) |
| 96 |
- #define WXPYTHON_VERSION "@WXPYTHON_VERSION@" |
| 97 |
-diff -Naur kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp kicad-5.0.1/common/searchhelpfilefullpath.cpp |
| 98 |
---- kicad-5.0.1-orig/common/searchhelpfilefullpath.cpp 2018-10-08 14:14:38.000000000 -0700 |
| 99 |
-+++ kicad-5.0.1/common/searchhelpfilefullpath.cpp 2018-12-25 00:04:05.576771741 -0800 |
| 100 |
-@@ -25,7 +25,7 @@ |
| 101 |
- |
| 102 |
- #include <pgm_base.h> |
| 103 |
- #include <common.h> |
| 104 |
--#include <config.h> // to define DEFAULT_INSTALL_PATH |
| 105 |
-+#include <config.h> // to define DEFAULT_INSTALL_PATH and KICAD_HELP |
| 106 |
- #include <macros.h> |
| 107 |
- |
| 108 |
- |
| 109 |
-@@ -68,6 +68,10 @@ |
| 110 |
- wxArrayString subdirs; |
| 111 |
- wxArrayString altsubdirs; |
| 112 |
- SEARCH_STACK ss = aSStack; |
| 113 |
-+#if ! defined(__WXMAC__) // && defined(__linux__) |
| 114 |
-+ SEARCH_STACK altss; |
| 115 |
-+ wxArrayString moresubdirs; |
| 116 |
-+#endif |
| 117 |
- |
| 118 |
- // It might already be in aSStack, but why depend on other code |
| 119 |
- // far away when it's so easy to add it again (to our copy) as the first place to look. |
| 120 |
-@@ -75,6 +79,7 @@ |
| 121 |
- // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during |
| 122 |
- // build configuration: |
| 123 |
- ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 ); |
| 124 |
-+ altss.AddPaths( wxT( KICAD_HELP ), 0 ); |
| 125 |
- |
| 126 |
- #if defined(__WXMAC__) |
| 127 |
- ss.AddPaths( GetOSXKicadMachineDataDir() ); |
| 128 |
-@@ -103,16 +108,17 @@ |
| 129 |
- |
| 130 |
- // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are |
| 131 |
- // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux. |
| 132 |
-- // This is ${KICAD_HELP} var in that CMakeLists.txt file. |
| 133 |
- // Below we account for an international subdirectory. |
| 134 |
- subdirs.Add( wxT( "share" ) ); |
| 135 |
- subdirs.Add( wxT( "doc" ) ); |
| 136 |
- subdirs.Add( wxT( "kicad" ) ); |
| 137 |
- subdirs.Add( wxT( "help" ) ); |
| 138 |
- |
| 139 |
-+ // For custom help path installations via ${KICAD_HELP} |
| 140 |
-+ moresubdirs.Add( wxT( "help" ) ); |
| 141 |
-+ |
| 142 |
- // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are |
| 143 |
- // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows. |
| 144 |
-- // This is ${KICAD_HELP} var in that CMakeLists.txt file. |
| 145 |
- // Below we account for an international subdirectory. |
| 146 |
- altsubdirs.Add( wxT( "doc" ) ); |
| 147 |
- altsubdirs.Add( wxT( "help" ) ); |
| 148 |
-@@ -158,6 +164,9 @@ |
| 149 |
- { |
| 150 |
- subdirs.Add( locale_name_dirs[ii] ); |
| 151 |
- altsubdirs.Add( locale_name_dirs[ii] ); |
| 152 |
-+#if ! defined(__WXMAC__) // && defined(__linux__) |
| 153 |
-+ moresubdirs.Add( locale_name_dirs[ii] ); |
| 154 |
-+#endif |
| 155 |
- |
| 156 |
- fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs ); |
| 157 |
- |
| 158 |
-@@ -187,8 +196,27 @@ |
| 159 |
- if( !fn.IsEmpty() ) |
| 160 |
- break; |
| 161 |
- |
| 162 |
-+#if ! defined(__WXMAC__) // && defined(__linux__) |
| 163 |
-+ fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs ); |
| 164 |
-+ |
| 165 |
-+ if( !fn.IsEmpty() ) |
| 166 |
-+ { |
| 167 |
-+ // Prepend URI protocol since we will open in a browser |
| 168 |
-+ fn = wxT( "file://" ) + fn; |
| 169 |
-+ break; |
| 170 |
-+ } |
| 171 |
-+ |
| 172 |
-+ fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs ); |
| 173 |
-+ |
| 174 |
-+ if( !fn.IsEmpty() ) |
| 175 |
-+ break; |
| 176 |
-+#endif |
| 177 |
-+ |
| 178 |
- subdirs.RemoveAt( subdirs.GetCount() - 1 ); |
| 179 |
- altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 ); |
| 180 |
-+#if ! defined(__WXMAC__) // && defined(__linux__) |
| 181 |
-+ moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 ); |
| 182 |
-+#endif |
| 183 |
- } |
| 184 |
- |
| 185 |
- return fn; |
| 186 |
|
| 187 |
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild |
| 188 |
deleted file mode 100644 |
| 189 |
index cb1d50631ac..00000000000 |
| 190 |
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild |
| 191 |
+++ /dev/null |
| 192 |
@@ -1,130 +0,0 @@ |
| 193 |
-# Copyright 1999-2020 Gentoo Authors |
| 194 |
-# Distributed under the terms of the GNU General Public License v2 |
| 195 |
- |
| 196 |
-EAPI=6 |
| 197 |
-PYTHON_COMPAT=( python2_7 ) |
| 198 |
- |
| 199 |
-WX_GTK_VER="3.0" |
| 200 |
- |
| 201 |
-inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils |
| 202 |
- |
| 203 |
-DESCRIPTION="Electronic Schematic and PCB design tools" |
| 204 |
-HOMEPAGE="http://www.kicad-pcb.org" |
| 205 |
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.xz" |
| 206 |
- |
| 207 |
-LICENSE="GPL-2+ GPL-3+ Boost-1.0" |
| 208 |
-SLOT="0" |
| 209 |
-KEYWORDS="~amd64 ~arm64 ~x86" |
| 210 |
-IUSE="doc examples github +ngspice occ +oce openmp +python" |
| 211 |
- |
| 212 |
-REQUIRED_USE=" |
| 213 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 214 |
- ?? ( occ oce ) |
| 215 |
-" |
| 216 |
- |
| 217 |
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] |
| 218 |
- $(python_gen_cond_dep " |
| 219 |
- python? ( |
| 220 |
- dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}] |
| 221 |
- ${PYTHON_DEPS} |
| 222 |
- ) |
| 223 |
- >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] |
| 224 |
- ") |
| 225 |
- github? ( net-misc/curl:=[ssl] ) |
| 226 |
- media-libs/glew:0= |
| 227 |
- media-libs/glm |
| 228 |
- media-libs/freeglut |
| 229 |
- media-libs/mesa[X(+)] |
| 230 |
- ngspice? ( |
| 231 |
- sci-electronics/ngspice[shared] |
| 232 |
- ) |
| 233 |
- occ? ( >=sci-libs/opencascade-6.8.0:= ) |
| 234 |
- oce? ( sci-libs/oce ) |
| 235 |
- >=x11-libs/cairo-1.8.8:= |
| 236 |
- >=x11-libs/pixman-0.30" |
| 237 |
-DEPEND="${COMMON_DEPEND} |
| 238 |
- doc? ( app-doc/doxygen ) |
| 239 |
- python? ( >=dev-lang/swig-3.0:0 )" |
| 240 |
-RDEPEND="${COMMON_DEPEND} |
| 241 |
- sci-electronics/electronics-menu |
| 242 |
-" |
| 243 |
-CHECKREQS_DISK_BUILD="800M" |
| 244 |
- |
| 245 |
-PATCHES=( |
| 246 |
- "${FILESDIR}"/"${PN}-5.0.0-curl.patch" |
| 247 |
- "${FILESDIR}"/"${PN}-5.0.0-help.patch" |
| 248 |
-) |
| 249 |
- |
| 250 |
-pkg_setup() { |
| 251 |
- use python && python-single-r1_pkg_setup |
| 252 |
- use openmp && tc-check-openmp |
| 253 |
- setup-wxwidgets |
| 254 |
- check-reqs_pkg_setup |
| 255 |
-} |
| 256 |
- |
| 257 |
-src_configure() { |
| 258 |
- xdg_environment_reset |
| 259 |
- |
| 260 |
- local mycmakeargs=( |
| 261 |
- -DKICAD_DOCS="/usr/share/doc/${P}" |
| 262 |
- -DKICAD_HELP="/usr/share/doc/${PN}-doc-${PV}" |
| 263 |
- -DBUILD_GITHUB_PLUGIN="$(usex github)" |
| 264 |
- -DKICAD_SCRIPTING="$(usex python)" |
| 265 |
- -DKICAD_SCRIPTING_MODULES="$(usex python)" |
| 266 |
- -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" |
| 267 |
- -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" |
| 268 |
- -DKICAD_SPICE="$(usex ngspice)" |
| 269 |
- -DKICAD_USE_OCC="$(usex occ)" |
| 270 |
- -DKICAD_USE_OCE="$(usex oce)" |
| 271 |
- -DKICAD_INSTALL_DEMOS="$(usex examples)" |
| 272 |
- ) |
| 273 |
- use python && mycmakeargs+=( |
| 274 |
- -DPYTHON_DEST="$(python_get_sitedir)" |
| 275 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
| 276 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 277 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
| 278 |
- ) |
| 279 |
- use occ && mycmakeargs+=( |
| 280 |
- -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade |
| 281 |
- -DOCC_LIBRARY_DIR="${CASROOT}"/lib |
| 282 |
- ) |
| 283 |
- |
| 284 |
- cmake-utils_src_configure |
| 285 |
-} |
| 286 |
- |
| 287 |
-src_compile() { |
| 288 |
- cmake-utils_src_compile |
| 289 |
- if use doc; then |
| 290 |
- cmake-utils_src_compile dev-docs doxygen-docs |
| 291 |
- fi |
| 292 |
-} |
| 293 |
- |
| 294 |
-src_install() { |
| 295 |
- cmake-utils_src_install |
| 296 |
- use python && python_optimize |
| 297 |
- if use doc ; then |
| 298 |
- dodoc uncrustify.cfg |
| 299 |
- cd Documentation || die |
| 300 |
- dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. |
| 301 |
- fi |
| 302 |
-} |
| 303 |
- |
| 304 |
-pkg_postinst() { |
| 305 |
- optfeature "Component symbols library" sci-electronics/kicad-symbols |
| 306 |
- optfeature "Component footprints library" sci-electronics/kicad-footprints |
| 307 |
- optfeature "3D models of components " sci-electronics/kicad-packages3d |
| 308 |
- optfeature "Project templates" sci-electronics/kicad-templates |
| 309 |
- optfeature "Different languages for GUI" sci-electronics/kicad-i18n |
| 310 |
- optfeature "Extended documentation" app-doc/kicad-doc |
| 311 |
- optfeature "Creating 3D models of components" media-gfx/wings |
| 312 |
- |
| 313 |
- xdg_desktop_database_update |
| 314 |
- xdg_mimeinfo_database_update |
| 315 |
- gnome2_icon_cache_update |
| 316 |
-} |
| 317 |
- |
| 318 |
-pkg_postrm() { |
| 319 |
- xdg_desktop_database_update |
| 320 |
- xdg_mimeinfo_database_update |
| 321 |
- gnome2_icon_cache_update |
| 322 |
-} |
Archives