[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2024-03-27 Thread Yixun Lan 
commit: ded5389f065b99454f2478b9559bf3a6dc43247f
Author: Huang Rui  gmail  com>
AuthorDate: Fri Mar 22 11:22:21 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Mar 27 11:41:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ded5389f

sci-electronics/kicad: fix build error with libgit2-1.8.0

See also: https://gitlab.com/kicad/code/kicad/-/issues/17536

Closes: https://bugs.gentoo.org/927503
Closes: https://github.com/gentoo/gentoo/pull/35865
Signed-off-by: Huang Rui  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 .../kicad/files/kicad-8.0.1-libgit2.patch  | 36 ++
 sci-electronics/kicad/kicad-8.0.0.ebuild   |  4 +++
 sci-electronics/kicad/kicad-8.0.1.ebuild   |  4 +++
 3 files changed, 44 insertions(+)

diff --git a/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch 
b/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch
new file mode 100644
index ..d2523993e6fe
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-8.0.1-libgit2.patch
@@ -0,0 +1,36 @@
+From: Huang Rui 
+Date: Fri, 22 Mar 2024 18:18:40 +0800
+Subject: [PATCH] libgit2-1.8.0 compatibility: adjusted parent pointer type
+
+- Adjusted parent pointer type in git_commit_create call for compatibility
+  with libgit2 1.8.0 and above.
+- Included preprocessor checks to maintain support for versions older than
+  1.8.0.
+- Ensures consistent function behavior across different libgit2 versions.
+
+Fixes https://gitlab.com/kicad/code/kicad/-/issues/17536
+Signed-off-by: Huang Rui 
+---
+ kicad/project_tree_pane.cpp | 7 +++
+ 1 file changed, 7 insertions(+)
+
+--- a/kicad/project_tree_pane.cpp
 b/kicad/project_tree_pane.cpp
+@@ -2233,7 +2233,14 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& 
aEvent )
+ }
+ 
+ git_oid   oid;
++// Check if the libgit2 library version is 1.8.0 or higher
++#if ( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && 
LIBGIT2_VER_MINOR >= 8 )
++// For libgit2 version 1.8.0 and above
++git_commit* const parents[1] = { parent };
++#else
++// For libgit2 versions older than 1.8.0
+ const git_commit* parents[1] = { parent };
++#endif
+ 
+ if( git_commit_create( , repo, "HEAD", author, author, nullptr, 
commit_msg.mb_str(), tree,
+1, parents ) != 0 )
+-- 
+2.44.0
+

diff --git a/sci-electronics/kicad/kicad-8.0.0.ebuild 
b/sci-electronics/kicad/kicad-8.0.0.ebuild
index 8c9a6b4dc5eb..96b4a708d332 100644
--- a/sci-electronics/kicad/kicad-8.0.0.ebuild
+++ b/sci-electronics/kicad/kicad-8.0.0.ebuild
@@ -81,6 +81,10 @@ fi
 
 CHECKREQS_DISK_BUILD="1500M"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.0.1-libgit2.patch
+)
+
 pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 

diff --git a/sci-electronics/kicad/kicad-8.0.1.ebuild 
b/sci-electronics/kicad/kicad-8.0.1.ebuild
index 8c9a6b4dc5eb..96b4a708d332 100644
--- a/sci-electronics/kicad/kicad-8.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-8.0.1.ebuild
@@ -81,6 +81,10 @@ fi
 
 CHECKREQS_DISK_BUILD="1500M"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.0.1-libgit2.patch
+)
+
 pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2023-07-18 Thread Sam James 
commit: 886a3319f85d6e36f4536bca1bc915e2cd541f4e
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Thu Jul  6 10:27:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 18 19:13:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=886a3319

sci-electronics/kicad: drop 6.0.11

Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Sam James  gentoo.org>

 sci-electronics/kicad/Manifest |   1 -
 .../kicad-6.0.6-unitialized-variable-fix.patch |  12 --
 .../kicad/files/kicad-6.0.9-gcc-13.patch   |  30 
 .../kicad/files/kicad-scripts-install-fix.patch|  12 --
 sci-electronics/kicad/kicad-6.0.11.ebuild  | 175 -
 sci-electronics/kicad/metadata.xml |   2 -
 6 files changed, 232 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index b66d5d8111fa..7fde7c4c5fd8 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1,3 @@
-DIST kicad-6.0.11.tar.bz2 34083016 BLAKE2B 
85662dd57eb5f28498317b1554e703efdebaa470f749ca239b2caeae4c366005a7c9bb1d1ba6375ed80d277efabf09b56d3e7e1e82bf93462b4ba5405445157e
 SHA512 
9827be9f2c18be1ab3bc5a1a3bd3d6297bc69b561e43b0f9010cb49009c3e87f1d320034411ecc0a2277b5686923a3d4bcc507278590814309d10de14463266d
 DIST kicad-7.0.1.tar.bz2 42744121 BLAKE2B 
cb6005be531027e02c5c3fa03be54dff00720aa9c36d12d1e619e041da05e5b4efd048be4e01021cf225a35cd638a162f4b620b65ec117027092a5bf650cb1ec
 SHA512 
6b3f32073a0667c745be54fccf1660cc81b560ad7613eb2355956b48567d7e82ce6926ab04d374fe88dcaa1220357997f5f4621e6d635effcd3d698e45a37516
 DIST kicad-7.0.2.tar.bz2 42844186 BLAKE2B 
136d68b3174cde74db96b1197c62da1fb4e54f628f73a6e0ea092c713b529863d9e443b6631a0ecbb55e2d299a7b78b8218d05e605f8ae8f5972915147ec140f
 SHA512 
04d7e39815f9e87b8646f25fb7e1b82bcf2bc63e26e078f3175c37a2c2e0a2bb7771e70e4698dbfc496f112a733668bdc746eefd1a9c4c76d0b36696738026a4
 DIST kicad-7.0.6.tar.bz2 43548452 BLAKE2B 
90fa15d67f5629266755c469208baa486f41003a9b6ff32c7b7a0707967d54dbc3410d332f0ab1fde91c6045c345b34d1e27585feb265386e58447aea464a93f
 SHA512 
492e6f4997eefda03eb371ec92c1a971cc37e16cb18f4ead08db22370048f6e2fce332c58d5eac64554808bf15738ebd18cf8f3664eacd6d3066a35268f3ec6a

diff --git 
a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch 
b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
deleted file mode 100644
index cce508c1e888..
--- a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp 
kicad-6.0.6-new/common/tool/tool_manager.cpp
 kicad-6.0.6/common/tool/tool_manager.cpp   2022-06-17 18:11:16.0 
-0700
-+++ kicad-6.0.6-new/common/tool/tool_manager.cpp   2022-06-20 
00:17:13.548239632 -0700
-@@ -902,7 +902,7 @@
- m_menuOwner = -1;
- 
- // Restore cursor settings
--for( auto cursorSetting : m_cursorSettings )
-+for( auto const& cursorSetting : m_cursorSettings )
- {
- auto it = m_toolIdIndex.find( cursorSetting.first );
- wxASSERT( it != m_toolIdIndex.end() );

diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch 
b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
deleted file mode 100644
index f1047cb9dee5..
--- a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.gentoo.org/892499
-https://gitlab.com/kicad/code/kicad/-/commit/8c324f1fc8f7fcdb5e8f494da3d45997001fab4a
-
-From 8c324f1fc8f7fcdb5e8f494da3d45997001fab4a Mon Sep 17 00:00:00 2001
-From: jean-pierre charras 
-Date: Tue, 20 Dec 2022 12:46:19 +0100
-Subject: [PATCH] Fix a missing include. Fixes #13216
- https://gitlab.com/kicad/code/kicad/issues/13216
-
 a/pcb_calculator/eserie.h
-+++ b/pcb_calculator/eserie.h
-@@ -2,7 +2,7 @@
-  * This program source code file is part of KiCad, a free EDA CAD application.
-  *
-  * Copyright (C) 2020 
-- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
-+ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
-  *
-  * This program is free software: you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License as published by the
-@@ -21,6 +21,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- /**
-  * E-Values derived from a geometric sequence formula by Charles Renard were 
already
--- 
-GitLab

diff --git a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch 
b/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
deleted file mode 100644
index d52a05d3bcf5..
--- a/sci-electronics/kicad/files/kicad-scripts-install-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kicad-6.0.2-orig/CMakeLists.txt kicad-6.0.2/CMakeLists.txt
 kicad-6.0.2-orig/CMakeLists.txt2022-02-10 16:29:07.0 -0800
-+++

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2023-02-18 Thread Matthew Smith 
commit: e2727746cd7823177e43b15f01314e60d68397a6
Author: Matthew Smith  gentoo  org>
AuthorDate: Sat Feb 18 10:41:05 2023 +
Commit: Matthew Smith  gentoo  org>
CommitDate: Sat Feb 18 10:43:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2727746

sci-electronics/kicad: Use wxGTK-3.2

wxGTK is slotted and wxpython is not. The versions must match, so use
the latest version for now.

Closes: https://bugs.gentoo.org/895188
Signed-off-by: Matthew Smith  gentoo.org>

 .../files/kicad-7.0.0-wxwidgets-version.patch  | 95 ++
 .../{kicad-7.0.0.ebuild => kicad-7.0.0-r1.ebuild}  | 10 ++-
 2 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch 
b/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch
new file mode 100644
index ..9ef12e97b573
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-7.0.0-wxwidgets-version.patch
@@ -0,0 +1,95 @@
+From b536580119c59fde78e38d8d6388f2540ecb6cf9 Mon Sep 17 00:00:00 2001
+From: Ian McInerney 
+Date: Mon, 13 Feb 2023 21:24:26 +
+Subject: [PATCH] Support subrelease field in wxWidgets cmake detection
+
+Sometimes wxWidgets increments the subrelease to a non-zero value, and
+since wxPython will report a subrelease, we must ensure we can get the
+subrelease from the wx library properly, otherwise configure will fail
+thinking the library isn't the same version as that used by wxPython.
+
+Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13887
+--- a/cmake/FindwxWidgets.cmake
 b/cmake/FindwxWidgets.cmake
+@@ -926,8 +926,17 @@ if(wxWidgets_FOUND)
+ "\\2" wxWidgets_VERSION_MINOR "${_wx_version_h}" )
+   string(REGEX REPLACE "^(.*\n)?#define +wxRELEASE_NUMBER +([0-9]+).*"
+ "\\2" wxWidgets_VERSION_PATCH "${_wx_version_h}" )
+-  set(wxWidgets_VERSION_STRING
+-
"${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}"
 )
++  string(REGEX REPLACE "^(.*\n)?#define +wxSUBRELEASE_NUMBER +([0-9]+).*"
++"\\2" wxWidgets_VERSION_SUBRELEASE "${_wx_version_h}" )
++
++  if( ${wxWidgets_VERSION_SUBRELEASE} GREATER 0 )
++set(wxWidgets_VERSION_STRING
++  
"${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}.${wxWidgets_VERSION_SUBRELEASE}"
 )
++  else()
++set(wxWidgets_VERSION_STRING
++  
"${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_PATCH}"
 )
++  endif()
++
+   DBG_MSG("wxWidgets_VERSION_STRING:${wxWidgets_VERSION_STRING}")
+ endif()
+ 
+-- 
+From 1e8cc6855d6a8fc1f9dfc933224c3a10fb759f9c Mon Sep 17 00:00:00 2001
+From: Ian McInerney 
+Date: Tue, 14 Feb 2023 00:18:56 +
+Subject: [PATCH] Relax wxPython version mismatch check to major.minor
+
+The previous version check failed when the version was even slightly
+different, including on the revision field. Theoretically the ABI of the
+wx minor versions in use should be the same, so this might work. On the
+other hand, with wxPython it could break as well. YOLO.
+--- a/scripting/python_scripting.cpp
 b/scripting/python_scripting.cpp
+@@ -50,6 +50,7 @@
+ #include 
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include 
+@@ -128,7 +129,39 @@ except:
+wxVI.GetMajor(), wxVI.GetMinor(), 
wxVI.GetMicro() );
+ version = version.Mid( idx + 10 );
+ 
+-if( wxVersion.Cmp( version ) != 0 )
++int wxPy_major = 0;
++int wxPy_minor = 0;
++int wxPy_micro = 0;
++int wxPy_rev   = 0;
++
++// Compile a regex to extract the wxPython version
++wxRegEx re( "([0-9]+)\\.([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?" );
++wxASSERT( re.IsValid() );
++
++if( re.Matches( version ) )
++{
++wxString v = re.GetMatch( version, 1 );
++
++if( !v.IsEmpty() )
++v.ToInt( _major );
++
++v = re.GetMatch( version, 2 );
++
++if( !v.IsEmpty() )
++v.ToInt( _minor );
++
++v = re.GetMatch( version, 3 );
++
++if( !v.IsEmpty() )
++v.ToInt( _micro );
++
++v = re.GetMatch( version, 4 );
++
++if( !v.IsEmpty() )
++v.ToInt( _rev );
++}
++
++if( ( wxVI.GetMajor() != wxPy_major ) || ( wxVI.GetMinor() != 
wxPy_minor ) )
+ {
+ wxString msg = wxT( "The wxPython library was compiled against 
wxWidgets %s but KiCad is "
+ "using %s.  Python plugins will not be 
available." );
+-- 

diff --git a/sci-electronics/kicad/kicad-7.0.0.ebuild 
b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
similarity index 95%
rename from sci-electronics/kicad/kicad-7.0.0.ebuild
rename to sci-electronics/kicad/kicad-7.0.0-r1.ebuild
index 96825330a19f..5371ccfee521 100644
--- a/sci-electronics/kicad/kicad-7.0.0.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2023-01-29 Thread Sam James 
commit: 9392d038b7d2ae6ff15b75694e30920d65e4bf48
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 30 03:34:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 30 03:34:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9392d038

sci-electronics/kicad: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/892499
Signed-off-by: Sam James  gentoo.org>

 .../kicad/files/kicad-6.0.9-gcc-13.patch   | 30 ++
 sci-electronics/kicad/kicad-6.0.9.ebuild   |  1 +
 2 files changed, 31 insertions(+)

diff --git a/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch 
b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
new file mode 100644
index ..f1047cb9dee5
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-6.0.9-gcc-13.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/892499
+https://gitlab.com/kicad/code/kicad/-/commit/8c324f1fc8f7fcdb5e8f494da3d45997001fab4a
+
+From 8c324f1fc8f7fcdb5e8f494da3d45997001fab4a Mon Sep 17 00:00:00 2001
+From: jean-pierre charras 
+Date: Tue, 20 Dec 2022 12:46:19 +0100
+Subject: [PATCH] Fix a missing include. Fixes #13216
+ https://gitlab.com/kicad/code/kicad/issues/13216
+
+--- a/pcb_calculator/eserie.h
 b/pcb_calculator/eserie.h
+@@ -2,7 +2,7 @@
+  * This program source code file is part of KiCad, a free EDA CAD application.
+  *
+  * Copyright (C) 2020 
+- * Copyright (C) 2020-2021 KiCad Developers, see AUTHORS.txt for contributors.
++ * Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
+  *
+  * This program is free software: you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the
+@@ -21,6 +21,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ /**
+  * E-Values derived from a geometric sequence formula by Charles Renard were 
already
+-- 
+GitLab

diff --git a/sci-electronics/kicad/kicad-6.0.9.ebuild 
b/sci-electronics/kicad/kicad-6.0.9.ebuild
index 482f0ade6d2d..66c09b766366 100644
--- a/sci-electronics/kicad/kicad-6.0.9.ebuild
+++ b/sci-electronics/kicad/kicad-6.0.9.ebuild
@@ -77,6 +77,7 @@ CHECKREQS_DISK_BUILD="900M"
 PATCHES=(
"${FILESDIR}/${PN}-scripts-install-fix.patch"
"${FILESDIR}/${PN}-6.0.6-unitialized-variable-fix.patch"
+   "${FILESDIR}/${PN}-6.0.9-gcc-13.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/, profiles/

2023-01-26 Thread Joonas Niilola 
commit: 8c47b89a01cc8cc46121199be8c50e564eb081b6
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Fri Jan 27 06:53:00 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 27 07:42:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c47b89a

sci-electronics/kicad: drop 5.1.12-r3

Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Joonas Niilola  gentoo.org>

 profiles/package.mask  |  14 --
 sci-electronics/kicad/Manifest |   1 -
 sci-electronics/kicad/files/kicad-5.1.5-help.patch | 117 --
 .../kicad/files/kicad-5.1.5-ldflags.patch  |  17 ---
 .../kicad/files/kicad-5.1.5-strict-aliasing.patch  |  25 ---
 .../kicad/files/kicad-5.1.6-metainfo.patch |  30 
 sci-electronics/kicad/kicad-5.1.12-r3.ebuild   | 170 -
 sci-electronics/kicad/metadata.xml |   2 -
 8 files changed, 376 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 6551af4f652f..a84f9682ec68 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -963,20 +963,6 @@ dev-qt/qtwebsockets:6
 # meaningless backtrace, debugging (flags, symbols) do not help
 >app-shells/scsh-0.6.9
 
-# Zoltan Puskas  (2022-02-18)
-# Multiple vulnerabilities (CVE-2022-{23803,23804,23946,23947})
-# 5.X series is masked to avoid accidental use, but it's kept for
-# industrial users who are in the process of migrating to the new
-# format of the 6.X series.
- (2022-01-24)
 # Mask experimental software
 =mail-mta/postfix-3.8*

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index b1a0ea3ed005..4546d883c102 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1,3 @@
-DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B 
f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76
 SHA512 
c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B 
fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c844c5bc9d0ec2
 SHA512 
c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a
 DIST kicad-6.0.7.tar.gz 45143677 BLAKE2B 
4ab9132be84cb6c6c566a826e5966f4fe64922dcd66f78c558126b37a276e075af80440da35071c864457298f6f964ba15511d0038424f473c3fb079d5f042e6
 SHA512 
0466650d166becbde23f1202e8bbe73ac7c743b5baad9608252fe4e960f0d15aad363664b69d840ef4568bf6d1c042b94252afce8657594a5f8193c979613e0e
 DIST kicad-6.0.9.tar.gz 4513 BLAKE2B 
e4d45c589a8e76d7c121ac4ab7adefc5fd44d4ccbff7140196caec56c309f6e83d47a3ea9cf79f59de57c3bda43b3d32a2bea82c5850c2a7a58a6e1db27a06a7
 SHA512 
49e6bd3c9f6e0c9839c4fac18dc12dc7ef16183f6fbe8091992e2223c7fb085b3119d46797c0b0cf86fd2813e3c4def9eb1f2adbff1bf072a363f1a501da9354

diff --git a/sci-electronics/kicad/files/kicad-5.1.5-help.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-help.patch
deleted file mode 100644
index 1b37e3013c1e..
--- a/sci-electronics/kicad/files/kicad-5.1.5-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
 kicad-5.1.5-orig/CMakeLists.txt2019-11-14 09:09:45.0 -0800
-+++ kicad-5.1.5/CMakeLists.txt 2019-12-15 03:41:57.574995996 -0800
-@@ -442,6 +442,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.1.5-orig/CMakeModules/config.h.cmake 
kicad-5.1.5/CMakeModules/config.h.cmake
 kicad-5.1.5-orig/CMakeModules/config.h.cmake   2019-11-14 
09:09:45.0 -0800
-+++ kicad-5.1.5/CMakeModules/config.h.cmake2019-12-15 03:42:00.368013375 
-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.1.5-orig/common/searchhelpfilefullpath.cpp 
kicad-5.1.5/common/searchhelpfilefullpath.cpp
 kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2022-06-21 Thread Sam James 
commit: bd8b6af601461b9665e4cfc88ec1ed72aa0a72f0
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Mon Jun 20 07:35:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 21 20:44:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8b6af6

sci-electronics/kicad: add 6.0.6

Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Sam James  gentoo.org>

 sci-electronics/kicad/Manifest |   1 +
 .../kicad-6.0.6-unitialized-variable-fix.patch |  12 ++
 sci-electronics/kicad/kicad-6.0.6.ebuild   | 175 +
 3 files changed, 188 insertions(+)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index d81bd5988637..1d5f7831f430 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,2 +1,3 @@
 DIST kicad-5.1.12.tar.bz2 18581842 BLAKE2B 
f04369fecded6fb07376efa209ddf5fcc693e73018ed728003529cdd0e6ef4a059c28106db1acf18834d938c3fbe4b9df5b5c8e0874989d35f74cf67414e6c76
 SHA512 
c0e5ad5b360ef788b427755aa71eeaec1a19b7520a00bb94fafba47e291f6ba067c598004efd515287800cd41f7da399d0389121e53e9669026c62f21b0a65ea
 DIST kicad-6.0.5.tar.gz 45086778 BLAKE2B 
9cd10a2a59068a436cf7d940a52725018a98f27ffa785f62d86498d0dd436a54c2603806ec4c26366d72886f487965427bb77cded7afc62746a236b29aaed426
 SHA512 
aa0cc555b201aacfbc4321a8713f98810ffb24338281e30b1aabaf6e2e649fe78b9c7f40773bb9aa796c7f1d91064436219a6493f28fc9b710634cc9574f2545
+DIST kicad-6.0.6.tar.gz 45086249 BLAKE2B 
fbf1f11cbf4838186e1ecb42127f7b182d3cd13b4af147211c85244d361cbf83387f5d102efdc80a63cfff36e343e6c4e07fef7f95dac4c844c5bc9d0ec2
 SHA512 
c472a6b81e3065e0499cad8467527d3531dc4d5861f50079ecb2ae6fccaf2c4d24fbeae8e9fe0cdde5ef548458fcef9615d6539426abe391a629dd539406065a

diff --git 
a/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch 
b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
new file mode 100644
index ..cce508c1e888
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-6.0.6-unitialized-variable-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur kicad-6.0.6/common/tool/tool_manager.cpp 
kicad-6.0.6-new/common/tool/tool_manager.cpp
+--- kicad-6.0.6/common/tool/tool_manager.cpp   2022-06-17 18:11:16.0 
-0700
 kicad-6.0.6-new/common/tool/tool_manager.cpp   2022-06-20 
00:17:13.548239632 -0700
+@@ -902,7 +902,7 @@
+ m_menuOwner = -1;
+ 
+ // Restore cursor settings
+-for( auto cursorSetting : m_cursorSettings )
++for( auto const& cursorSetting : m_cursorSettings )
+ {
+ auto it = m_toolIdIndex.find( cursorSetting.first );
+ wxASSERT( it != m_toolIdIndex.end() );

diff --git a/sci-electronics/kicad/kicad-6.0.6.ebuild 
b/sci-electronics/kicad/kicad-6.0.6.ebuild
new file mode 100644
index ..c152b8099cd1
--- /dev/null
+++ b/sci-electronics/kicad/kicad-6.0.6.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+WX_GTK_VER="3.0-gtk3"
+
+inherit check-reqs cmake optfeature python-single-r1 toolchain-funcs wxwidgets 
xdg-utils
+
+DESCRIPTION="Electronic Schematic and PCB design tools"
+HOMEPAGE="https://www.kicad.org;
+
+if [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://gitlab.com/kicad/code/kicad.git;
+   inherit git-r3
+else
+   MY_PV="${PV/_rc/-rc}"
+   MY_P="${PN}-${MY_PV}"
+   
SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${MY_PV}/${MY_P}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${MY_PV}"
+
+   if [[ ${PV} != *_rc* ]] ; then
+   KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+   fi
+fi
+
+# BSD for bundled pybind
+LICENSE="GPL-2+ GPL-3+ Boost-1.0 BSD"
+SLOT="0"
+IUSE="doc examples +ngspice nls openmp +occ +pcm"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Contains bundled pybind but it's patched for wx
+# See 
https://gitlab.com/kicad/code/kicad/-/commit/74e4370a9b146b21883d6a2d1df46c7a10bd0424
+# Depend on opencascade:0 to get unslotted variant (so we know path to it), 
bug #833301
+COMMON_DEPEND="
+   !sci-electronics/kicad-i18n
+   >=dev-libs/boost-1.61:=[context,nls]
+   media-libs/freeglut
+   media-libs/glew:0=
+   >=media-libs/glm-0.9.9.1
+   media-libs/mesa[X(+)]
+   >=x11-libs/cairo-1.8.8:=
+   >=x11-libs/pixman-0.30
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+   $(python_gen_cond_dep '
+   >=dev-libs/boost-1.61:=[context,nls,python,${PYTHON_USEDEP}]
+   dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+   ')
+   ${PYTHON_DEPS}
+   ngspice? (
+   >sci-electronics/ngspice-27[shared]
+   )
+   nls? (
+   sys-devel/gettext
+   )
+   occ? (
+   >=sci-libs/opencascade-7.3.0:0=
+   )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2020-09-25 Thread Michał Górny 
commit: 011a513569497182d632fcbb967275e4169c3afd
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 25 20:16:02 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Sep 25 20:20:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011a5135

sci-electronics/kicad: Remove old (py2.7, drop to ~arch)

Signed-off-by: Michał Górny  gentoo.org>

 sci-electronics/kicad/Manifest |   4 -
 sci-electronics/kicad/files/kicad-boost-1.61.patch | 347 -
 .../files/kicad-cmake-checkcxxsymbolexists.patch   |  46 ---
 .../kicad/files/kicad-footprints-cmakelists.txt|  16 -
 sci-electronics/kicad/kicad-4.0.7-r1.ebuild| 198 
 sci-electronics/kicad/metadata.xml |   2 -
 6 files changed, 613 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index be5b223eb6f..137d591a548 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,2 @@
-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.1.5.tar.xz 14203632 BLAKE2B 
cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd
 SHA512 
5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B 
b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f
 SHA512 
4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-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-boost-1.61.patch 
b/sci-electronics/kicad/files/kicad-boost-1.61.patch
deleted file mode 100644
index 3ca8711b9f0..000
--- a/sci-electronics/kicad/files/kicad-boost-1.61.patch
+++ /dev/null
@@ -1,347 +0,0 @@
 a/common/tool/tool_manager.cpp
-+++ b/common/tool/tool_manager.cpp
-@@ -532,11 +532,11 @@
- if( st->cofunc )
- st->Push();
- 
-+st->cofunc = new COROUTINE( 
tr.second );
-+
- // as the state changes, the transition table has to be 
set up again
- st->transitions.clear();
- 
--st->cofunc = new COROUTINE( 
tr.second );
--
- // got match? Run the handler.
- st->cofunc->Call( aEvent );
- 
 a/include/tool/coroutine.h
-+++ b/include/tool/coroutine.h
-@@ -27,10 +28,15 @@
- 
- #include 
- 
--#include 
- #include 
-+#include 
- 
--#include "delegate.h"
-+#if BOOST_VERSION <= 106000
-+#include 
-+#else
-+#include 
-+#include 
-+#endif
- 
- /**
-  *  Class COROUNTINE.
-@@ -53,13 +59,12 @@
-  *  See coroutine_example.cpp for sample code.
-  */
- 
--template 
-+template 
- class COROUTINE
- {
- public:
- COROUTINE() :
--m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( 
c_defaultStackSize ),
--m_running( false )
-+COROUTINE( nullptr )
- {
- }
- 
-@@ -69,8 +74,7 @@
-  */
- template 
- COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) :
--m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL 
),
--m_stackSize( c_defaultStackSize ), m_running( false )
-+COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) )
- {
- }
- 
-@@ -78,9 +82,15 @@
-  * Constructor
-  * Creates a coroutine from a delegate object
-  */
--COROUTINE( DELEGATE aEntry ) :
--m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ),
--m_stackSize( c_defaultStackSize ), m_running( false )
-+COROUTINE(

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2020-06-06 Thread Alexey Shvetsov 
commit: 2f0ebe29c68c8b8fa957126aff9f58131711d599
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Tue May 26 03:42:39 2020 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sat Jun  6 17:46:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0ebe29

sci-electronics/kicad: Fix up 5.1.5 ebuild

Rename patches to be versioned, since it's not guaranteed they will
cleanly apply to future versions. Also clean up some syntax in patching
logic.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Alexey Shvetsov  gentoo.org>

 ...rithm-header.patch => kicad-5.1.5-algorithm-header.patch} |  0
 .../kicad/files/{ldflags.patch => kicad-5.1.5-ldflags.patch} |  0
 .../{kicad-metainfo.patch => kicad-5.1.5-metainfo.patch} |  0
 sci-electronics/kicad/kicad-5.1.5-r2.ebuild  | 12 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sci-electronics/kicad/files/kicad-algorithm-header.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
similarity index 100%
rename from sci-electronics/kicad/files/kicad-algorithm-header.patch
rename to sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch

diff --git a/sci-electronics/kicad/files/ldflags.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
similarity index 100%
rename from sci-electronics/kicad/files/ldflags.patch
rename to sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch

diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
similarity index 100%
rename from sci-electronics/kicad/files/kicad-metainfo.patch
rename to sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch

diff --git a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild 
b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
index 26d76cf5887..dde42e44bd4 100644
--- a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
@@ -55,12 +55,12 @@ BDEPEND="doc? ( app-doc/doxygen )"
 CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
-   "${FILESDIR}"/"${PN}-5.1.5-help.patch"
-   "${FILESDIR}"/"${PN}-5.1.5-ninja-build.patch"
-   "${FILESDIR}"/"${PN}-5.1.5-strict-aliasing.patch"
-   "${FILESDIR}"/"${PN}-algorithm-header.patch"
-   "${FILESDIR}"/"${PN}-metainfo.patch"
-   "${FILESDIR}"/"ldflags.patch"
+   "${FILESDIR}/${P}-help.patch"
+   "${FILESDIR}/${P}-ninja-build.patch"
+   "${FILESDIR}/${P}-strict-aliasing.patch"
+   "${FILESDIR}/${P}-algorithm-header.patch"
+   "${FILESDIR}/${P}-metainfo.patch"
+   "${FILESDIR}/${P}-ldflags.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2020-05-14 Thread Alexey Shvetsov 
commit: 0eea69141f8a758b5205b69a1495332aff9e78e9
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Thu Dec 19 10:26:24 2019 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Thu May 14 10:34:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eea6914

sci-electronics/kicad: Fix build failure and QA

Fix recent build failure in KiCAD. Also apply backported
patches from upstream to address QA issues that remained
since introducing this version of the ebuild.

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Zoltan Puskas  sinustrom.info>
Closes: https://bugs.gentoo.org/682480
Closes: https://bugs.gentoo.org/722288
Signed-off-by: Alexey Shvetsov  gentoo.org>

 .../kicad/files/kicad-5.1.5-ninja-build.patch  |  6 +++---
 .../kicad/files/kicad-5.1.5-strict-aliasing.patch  | 25 ++
 .../kicad/files/kicad-algorithm-header.patch   | 11 ++
 sci-electronics/kicad/files/kicad-metainfo.patch   | 12 +++
 ...kicad-5.1.5-r1.ebuild => kicad-5.1.5-r2.ebuild} | 17 ++-
 5 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
index 3aac927b5bd..3b4b6a4d2fe 100644
--- a/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-ninja-build.patch
@@ -13,8 +13,8 @@ diff -Naur kicad-5.1.5-orig/pcbnew/CMakeLists.txt 
kicad-5.1.5/pcbnew/CMakeLists.
 +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION 
${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
  set( PYMOD_EXT "so" )
  endif()
- 
-@@ -827,18 +823,16 @@
+
+@@ -792,18 +788,16 @@ if( KICAD_SCRIPTING_MODULES )
  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
  )
  else()
@@ -41,5 +41,5 @@ diff -Naur kicad-5.1.5-orig/pcbnew/CMakeLists.txt 
kicad-5.1.5/pcbnew/CMakeLists.
 +DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
 +)
  endif()
- 
+
  endif()

diff --git a/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
new file mode 100644
index 000..b01a6b7d79f
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.5-strict-aliasing.patch
@@ -0,0 +1,25 @@
+diff --git a/eeschema/dialogs/dialog_spice_model.cpp 
b/eeschema/dialogs/dialog_spice_model.cpp
+index b265e2363..eb1187d86 100644
+--- a/eeschema/dialogs/dialog_spice_model.cpp
 b/eeschema/dialogs/dialog_spice_model.cpp
+@@ -34,6 +34,7 @@
+ #include 
+
+ #include 
++#include 
+
+ // Helper function to shorten conditions
+ static bool empty( const wxTextCtrl* aCtrl )
+@@ -804,9 +804,11 @@ bool DIALOG_SPICE_MODEL::addPwlValue( const wxString& 
aTime, const wxString& aVa
+ float timeF;
+ m_pwlTime->GetValue().ToDouble(  );
+ timeF = timeD;
++long data;
++std::memcpy( , , sizeof( timeF ) );
+
+ // Store the time value, so the entries can be sorted
+-m_pwlValList->SetItemData( idx, *reinterpret_cast(  ) );
++m_pwlValList->SetItemData( idx, data );
+
+ // Sort items by timestamp
+ m_pwlValList->SortItems( comparePwlValues, -1 );

diff --git a/sci-electronics/kicad/files/kicad-algorithm-header.patch 
b/sci-electronics/kicad/files/kicad-algorithm-header.patch
new file mode 100644
index 000..aa118ea6f86
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-algorithm-header.patch
@@ -0,0 +1,11 @@
+diff -Naur kicad-5.1.5-orig/common/lib_tree_model.cpp 
kicad-5.1.5/common/lib_tree_model.cpp
+--- kicad-5.1.5-orig/common/lib_tree_model.cpp  2020-05-11 00:36:36.568301297 
+0200
 kicad-5.1.5/common/lib_tree_model.cpp   2020-05-11 00:37:50.472359703 
+0200
+@@ -21,6 +21,7 @@
+
+ #include 
+
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch 
b/sci-electronics/kicad/files/kicad-metainfo.patch
new file mode 100644
index 000..48a5ef5be50
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-metainfo.patch
@@ -0,0 +1,12 @@
+diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
+--- kicad-5.1.5-orig/CMakeLists.txt2019-11-14 09:09:45.0 -0800
 kicad-5.1.5/CMakeLists.txt 2020-05-11 23:51:52.122093410 -0700
+@@ -919,7 +919,7 @@
+ set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
+ set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
+ set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
+-set( UNIX_APPDATA_FILES resources/linux/appdata )
++set( UNIX_APPDATA_FILES resources/linux/metainfo )
+ 
+ # Install Mime directory
+ install( DIRECTORY ${UNIX_ICON_FILES}

diff --git a/sci-electronics/kicad/kicad-5.1.5-r1.ebuild 
b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild
similarity index 83%
rename from sci-electronics/kicad/kicad-5.1.5-r1.ebuild
rename to sci-electronics/kicad/kicad-5.1.5-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2019-12-17 Thread Joonas Niilola 
commit: 6d7413c3d947d61ebc56979556836f8046774b16
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Sat Nov 16 10:07:45 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec 17 18:14:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7413c3

sci-electronics/kicad: Bump to 5.1.5 version

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-electronics/kicad/Manifest |   1 +
 sci-electronics/kicad/files/kicad-5.1.5-help.patch | 117 ++
 .../kicad/files/kicad-5.1.5-ninja-build.patch  |  45 +++
 sci-electronics/kicad/files/ldflags.patch  |  17 +++
 sci-electronics/kicad/kicad-5.1.5.ebuild   | 134 +
 5 files changed, 314 insertions(+)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 533c9ef6a4b..be715a6e32b 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,5 +4,6 @@ DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B 
47b6f8f4443e547dc1251e609b53fc998006c6a
 DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 
182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad
 SHA512 
644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
 DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B 
f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e
 SHA512 
5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
 DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 
99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b
 SHA512 
ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
+DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B 
cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd
 SHA512 
5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 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-5.1.5-help.patch 
b/sci-electronics/kicad/files/kicad-5.1.5-help.patch
new file mode 100644
index 000..1b37e3013c1
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.5-help.patch
@@ -0,0 +1,117 @@
+diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt
+--- kicad-5.1.5-orig/CMakeLists.txt2019-11-14 09:09:45.0 -0800
 kicad-5.1.5/CMakeLists.txt 2019-12-15 03:41:57.574995996 -0800
+@@ -442,6 +442,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.1.5-orig/CMakeModules/config.h.cmake 
kicad-5.1.5/CMakeModules/config.h.cmake
+--- kicad-5.1.5-orig/CMakeModules/config.h.cmake   2019-11-14 
09:09:45.0 -0800
 kicad-5.1.5/CMakeModules/config.h.cmake2019-12-15 03:42:00.368013375 
-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.1.5-orig/common/searchhelpfilefullpath.cpp 
kicad-5.1.5/common/searchhelpfilefullpath.cpp
+--- kicad-5.1.5-orig/common/searchhelpfilefullpath.cpp 2019-11-14 
09:09:45.0

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2019-08-03 Thread Alexey Shvetsov 
commit: 8b9a5153b00803bc29cd6809f3d7725d0589f3c0
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Mon Jul 29 06:58:00 2019 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sat Aug  3 09:28:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9a5153

sci-electronics/kicad: Fix 5.1.x build issues with swig-4.0.0

Closes: https://bugs.gentoo.org/690146
Signed-off-by: Zoltan Puskas  sinustrom.info>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Closes: https://github.com/gentoo/gentoo/pull/12568
Signed-off-by: Alexey Shvetsov  gentoo.org>

 sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 
 .../kicad/{kicad-5.1.0.ebuild => kicad-5.1.0-r1.ebuild}  |  1 +
 .../kicad/{kicad-5.1.2.ebuild => kicad-5.1.2-r1.ebuild}  |  1 +
 3 files changed, 14 insertions(+)

diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch 
b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
new file mode 100644
index 000..3ab6677e5e1
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
@@ -0,0 +1,12 @@
+--- a/scripting/build_tools/fix_swig_imports.py2019-04-22 
23:14:54.0 +0200
 b/scripting/build_tools/fix_swig_imports.py2019-07-18 
15:44:24.255754237 +0200
+@@ -40,6 +40,9 @@
+ txt = b""
+ 
+ for l in lines:
++if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"): # ok 
with swig version >= 4.0.0
++l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False")
++doneOk = True
+ if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"): # ok 
with swig version >= 3.0.10
+ l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False")
+ doneOk = True

diff --git a/sci-electronics/kicad/kicad-5.1.0.ebuild 
b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
similarity index 98%
rename from sci-electronics/kicad/kicad-5.1.0.ebuild
rename to sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 8fca5ececb9..c7eca78142e 100644
--- a/sci-electronics/kicad/kicad-5.1.0.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+   "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
 )
 
 pkg_setup() {

diff --git a/sci-electronics/kicad/kicad-5.1.2.ebuild 
b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
similarity index 98%
rename from sci-electronics/kicad/kicad-5.1.2.ebuild
rename to sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index c739de95232..0505a9fa436 100644
--- a/sci-electronics/kicad/kicad-5.1.2.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -51,6 +51,7 @@ CHECKREQS_DISK_BUILD="800M"
 
 PATCHES=(
"${FILESDIR}"/"${PN}-5.1.0-help.patch"
+   "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2019-04-07 Thread Alexey Shvetsov 
commit: ce2e77001196f94d29efe79628a62bf7e69d5f20
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Mon Mar 25 00:47:10 2019 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sun Apr  7 16:52:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2e7700

sci-electronics/kicad: Bump to version 5.1.0

Bug: https://bugs.gentoo.org/680642
Signed-off-by: Zoltan Puskas  sinustrom.info>
Signed-off-by: Alexey Shvetsov  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.12

 sci-electronics/kicad/Manifest |  1 +
 ...icad-help-path.patch => kicad-5.0.0-help.patch} |  0
 ...icad-help-path.patch => kicad-5.1.0-help.patch} | 46 +++---
 sci-electronics/kicad/kicad-5.0.1.ebuild   |  4 +-
 .../{kicad-5.0.1.ebuild => kicad-5.1.0.ebuild} | 12 +++---
 5 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index f8f01cb2ef6..13afaa4c6a4 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.1.tar.xz 14241544 BLAKE2B 
47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7
 SHA512 
36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
+DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B 
182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad
 SHA512 
644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
 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-5.0.0-help.patch
similarity index 100%
copy from sci-electronics/kicad/files/kicad-help-path.patch
copy to sci-electronics/kicad/files/kicad-5.0.0-help.patch

diff --git a/sci-electronics/kicad/files/kicad-help-path.patch 
b/sci-electronics/kicad/files/kicad-5.1.0-help.patch
similarity index 75%
rename from sci-electronics/kicad/files/kicad-help-path.patch
rename to sci-electronics/kicad/files/kicad-5.1.0-help.patch
index 0fb43c3550c..e89b7e45c24 100644
--- a/sci-electronics/kicad/files/kicad-help-path.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.0-help.patch
@@ -1,7 +1,7 @@
-diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt
 kicad-5.0.1-orig/CMakeLists.txt2018-10-08 14:14:38.0 -0700
-+++ kicad-5.0.1/CMakeLists.txt 2018-12-25 00:04:50.423849671 -0800
-@@ -418,6 +418,10 @@
+diff -Naur /tmp/kicad-5.1.0-orig/CMakeLists.txt kicad-5.1.0/CMakeLists.txt
+--- /tmp/kicad-5.1.0-orig/CMakeLists.txt   2019-03-08 04:31:50.0 
-0800
 kicad-5.1.0/CMakeLists.txt 2019-03-24 16:16:58.287376258 -0700
+@@ -427,6 +427,10 @@
  set( KIFACE_PREFIX  "_" )
  #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  
KIFACE_PREFIX:${KIFACE_PREFIX}" )
  
@@ -12,9 +12,9 @@ diff -Naur kicad-5.0.1-orig/CMakeLists.txt 
kicad-5.0.1/CMakeLists.txt
  
  #
  # 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.0 -0700
-+++ kicad-5.0.1/CMakeModules/config.h.cmake2018-12-25 00:04:39.215828924 
-0800
+diff -Naur /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake 
kicad-5.1.0/CMakeModules/config.h.cmake
+--- /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake  2019-03-08 
04:31:50.0 -0800
 kicad-5.1.0/CMakeModules/config.h.cmake2019-03-24

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2019-01-02 Thread Amy Liffey 
commit: 194e0780737c7ff4f147a9c4d9f44971cc2306f5
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Sat Nov  3 05:44:01 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jan  2 16:49:33 2019 +
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  sinustrom.info>
Signed-off-by: Amy Liffey  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 000..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.txt2018-10-08 14:14:38.0 -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.0 -0700
 kicad-5.0.1/CMakeModules/config.h.cmake2018-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.0 -0700
 kicad-5.0.1/common/searchhelpfilefullpath.cpp  2018-12-25 
00:04:05.576771741 -0800
+@@ -25,7 +25,7 @@
+ 
+ #include 
+ #include 
+-#include  // to define

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2018-09-27 Thread Virgil Dupras 
commit: 2e9d688fa4b08833f3c130a41d3e1369cfaf4edc
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Sun Sep 23 12:59:45 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Thu Sep 27 13:37:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9d688f

sci-electronics/kicad: Add USE=occ,openmp, fix curl dependency

Thanks to Fabio Rossi for the authorship of the patch.

Closes: https://bugs.gentoo.org/665500
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Signed-off-by: Zoltan Puskas  sinustrom.info>
Closes: https://github.com/gentoo/gentoo/pull/9955
Signed-off-by: Virgil Dupras  gentoo.org>

 sci-electronics/kicad/files/kicad-5.0.0-curl.patch | 23 +
 .../{kicad-5.0.0.ebuild => kicad-5.0.0-r1.ebuild}  | 38 ++
 sci-electronics/kicad/metadata.xml |  1 +
 3 files changed, 49 insertions(+), 13 deletions(-)

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 000..c99071c0a54
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
@@ -0,0 +1,23 @@
+--- a/common/CMakeLists.txt.old2018-09-13 16:21:29.642915273 +0200
 a/common/CMakeLists.txt2018-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
similarity index 74%
rename from sci-electronics/kicad/kicad-5.0.0.ebuild
rename to sci-electronics/kicad/kicad-5.0.0-r1.ebuild
index db6476d4b96..18cae5de253 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

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2018-09-07 Thread Virgil Dupras 
commit: 22fe2623355fa8f7045537cd84b76bb3aef436fc
Author: Virgil Dupras  gentoo  org>
AuthorDate: Fri Sep  7 12:01:37 2018 +
Commit: Virgil Dupras  gentoo  org>
CommitDate: Fri Sep  7 12:01:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fe2623

sci-electronics/kicad: remove old

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-electronics/kicad/Manifest |   5 -
 .../kicad/files/kicad-4.0.4-boost-context.patch| 107 ---
 sci-electronics/kicad/kicad-4.0.4.ebuild   | 204 -
 3 files changed, 316 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8ef3f97151a..80f7881b37e 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,10 +1,5 @@
-DIST kicad-4.0.4-i18n.tar.gz 2409039 BLAKE2B 
95e0e8c8b001957df1f244ba5fef5b36658c75b3c903b495faab8c8ccb524d02dbb79b0197fa0485fc5f93a5a0088861bada57cd85d7982191437bdf8f7b1f3c
 SHA512 
5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf
-DIST kicad-4.0.4.tar.xz 10672424 BLAKE2B 
16bef2545e697757be270eeff6820e75b1a79a37528f264e127587131c519cbdf67a774a4a9a8ff32c90b236279746ffd2164cb4d8885dc68d2664ef3dd178de
 SHA512 
230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242
 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-footprints-4.0.4.tar.gz 1400434 BLAKE2B 
eaf81e977a3d65305034f60eff18f6955cf6b805c2a28a2019c4bb2bd8de9868906a0f9e5ac17810c4779940c6b78e06472661966775cfb196b8cd8fc1ae4083
 SHA512 
7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B 
ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce
 SHA512 
9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
-DIST kicad-libcontext.tar.gz 25599 BLAKE2B 
b8871ab552745dfe29504b97c3c3e23f9e63100ef108c5a116512029f4973791e3d2bca240877319ee177f0a28da4a7946ae5cfaf18eaca0f5b0b1660335a520
 SHA512 
3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9
-DIST kicad-library-4.0.4.tar.gz 87947075 BLAKE2B 
b9176ad7ba05f32a5ed42012818a7636fd0f8993630627480557c3d8ab99884b31090f66f438a86dbc842677629cca629333be1d7b05f06a3c12373e57622954
 SHA512 
57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 
0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0
 SHA512 
c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360

diff --git a/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch 
b/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
deleted file mode 100644
index 529a82c018f..000
--- a/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naur kicad-4.0.2-orig/common/system/libcontext.cpp 
kicad-4.0.2/common/system/libcontext.cpp
 kicad-4.0.2-orig/common/system/libcontext.cpp   2016-06-16 
22:30:58.0 -0700
-+++ kicad-4.0.2/common/system/libcontext.cpp2016-06-16 22:35:46.654719468 
-0700
-@@ -13,7 +13,7 @@
- http://www.boost.org/LICENSE_1_0.txt)
-
- */
--#include "libcontext.h"
-+#include 
- #if defined(LIBCONTEXT_PLATFORM_windows_i386) && 
defined(LIBCONTEXT_COMPILER_gcc)
- __asm (
- ".text\n"
-diff -Naur kicad-4.0.2-orig/CMakeLists.txt kicad-4.0.2/CMakeLists.txt
 kicad-4.0.2-orig/CMakeLists.txt2016-02-13 13:14:42.0 -0800
-+++ kicad-4.0.2/CMakeLists.txt 2016-06-11 01:11:25.623484908 -0700
-@@ -561,7

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2016-04-13 Thread Ian Delaney 
commit: c1e00fdcabd18dff609313e7a5db6beff210c63e
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Tue Apr 12 08:28:34 2016 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Apr 13 07:29:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e00fdc

sci-electronics/kicad: Fix missing footprint library issue

Update ebuild to donwload and install previously missing footprint
libraries. Update ebuild in preparation to EAPI=6 migration.
Affected versions: 4.0.0, 4.0.1, 4.0.2

Gentoo Bug: 576820

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1241

Signed-off-by: Ian Delaney  gentoo.org>

 sci-electronics/kicad/Manifest |   3 +
 .../kicad/files/kicad-footprints-cmakelists.txt|  16 ++
 sci-electronics/kicad/kicad-4.0.0-r1.ebuild| 191 +
 sci-electronics/kicad/kicad-4.0.1-r1.ebuild| 191 +
 sci-electronics/kicad/kicad-4.0.2-r1.ebuild| 191 +
 5 files changed, 592 insertions(+)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index df08c95..86054cb 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -13,3 +13,6 @@ DIST kicad-4.0.1.tar.xz 10837804 SHA256 
73a9f8713ba93ce34e5f9c26e9667f33a22f4e33
 DIST kicad-4.0.2-i18n.tar.gz 2290139 SHA256 
05a9a5b1c9a2aa0e0712171c5e71cc3b74c43254a7d5fdd3d3c76e32ff927bea SHA512 
2021706d0e96f6a82b57b8f187b703f37c32ee6efb99323ec191de141c2bfc89b590949cdbf2eea6cc618afc84bbac9fae758fdbb088aed3ab06649279bcab21
 WHIRLPOOL 
0797d587ed4009bc9be6aac0b19f2cd0581e497f074e6cfd33adff6a44b68c215c06c084d8221a57a0f39e228d70e9760bf368770d2bc7bd361be1688a65ab9b
 DIST kicad-4.0.2-library.tar.gz 105106185 SHA256 
0499da0fa617248a4196e50ff65c0bf78cb456bf1ca4bd6c72d956044b310bef SHA512 
14f7136ded81f54fcccbb4555f77b0079d637a08b15b2fd60b729226dbc5adfb5fe7489060ba1d3b949ca1d94d95623df28cceac93ee600165598d9fd78711e7
 WHIRLPOOL 
c5080ad602684ccdb60493745714398027af2ba09b4a2187740b89fcac923941adda80c744a12338d8c6eda07763fdae12428a8c9d06379a637e3e0ee881bef1
 DIST kicad-4.0.2.tar.xz 10841200 SHA256 
2eae6986843a29862ab399a30b50454582d22f58ed3f53eb50d0c85e5d488eb9 SHA512 
b0817cca7b8d0216507d78c602d332deaf2a68528b129309067b01e254c6600af5513dea7f44570beb4a339bc044ef7966890a91aeda6fd5a95515657cd1628a
 WHIRLPOOL 
7ae9b072addeea8cc3d6daa69b8f19d077604f0ec5d1e5dfed53efe6b0a32f6b12c1156c2f52092a859d9f716cab83d16b17b0e3abbc0c72a2bafacb3be27719
+DIST kicad-footprints-4.0.0.tar.gz 1056498 SHA256 
684c1197dab01c2aa31de94fbe8530470a81d7729db73c39183792c45b0b54f0 SHA512 
f19d1a662e39df46d3c11089f9a4baff83e56a0931259cd9ee9fcec1f3108f4c778e89f77168a544910b723ce1b6a99842dc34b323eed509973c8655620b0447
 WHIRLPOOL 
10a66194d03cfd52b5897fbd2e24fd1166b321e933b849729ea8fa3ee44aad0774057479dd8461bd50a779bb0df755dc5ac0141d43369e0ec7656522143c4b0c
+DIST kicad-footprints-4.0.1.tar.gz 801985 SHA256 
e3b195706c8f30928c34478a87607e996def94a19982f8987a783b8e4ffe112f SHA512 
4fef1792eee8be951c77a8684942ecfa9047b602796f90e746010d63f72f5981cb2c90efe28ba7bd7d22894256d23f71b47eb170056e7b4423f72120f5413725
 WHIRLPOOL 
b41eb7149b14af4c3dd37bc19f7bba9afcc896c1b5d523e7bead0c6695dad7255527f952042589181876dc598d7a85963ab4f86b6c3179e0e82e6f187712c298
+DIST kicad-footprints-4.0.2.tar.gz 802003 SHA256 
eff257abc2d5e4b1b87b2251c74b5c751271505c0605f31f8f4390dedff43f6f SHA512 
2b54bbbcaac8ae17f9b27f2ba2542be10a84fda46266dfa249699d731ceb3de1c8129bcd1e88f045b2fb20af9a58658ef65390ea702e7c583923a50b10cd5a29
 WHIRLPOOL 
bf9f9475092eb6a9167d5297731942c9f0ad48a49ba05d04db400cff64c46a413ffec68d524f39edbfee05fb55216da5b69dd2c1f409e955cb0758da1383b140

diff --git a/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt 
b/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt
new file mode 100644
index 000..d024485
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt
@@ -0,0 +1,16 @@
+project( kicad-footprints )
+
+cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR )
+
+file(GLOB footprint_dirs "*.pretty")
+
+# Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
+set( KICAD_DATA share/kicad
+CACHE PATH "Location of KiCad data files." )
+set( KICAD_MODULES ${KICAD_DATA}/modules )
+
+mark_as_advanced( KICAD_DATA KICAD_MODULES )
+
+install(DIRECTORY ${footprint_dirs}
+DESTINATION ${KICAD_MODULES}
+COMPONENT resources)

diff --git a/sci-electronics/kicad/kicad-4.0.0-r1.ebuild 
b/sci-electronics/kicad/kicad-4.0.0-r1.ebuild
new file mode 100644
index 000..e55ea9e
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.0-r1.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 vcs-snapshot 
wxwidgets versionator xdg
+
+DESCRIPTION="Electronic Schematic and

[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/, sci-electronics/kicad/files/

2015-10-31 Thread Ian Delaney 
commit: 7061259150fb5832c68a3ffc0b83242049e2ee63
Author: Zoltan Puskas  sinustrom  info>
AuthorDate: Tue Oct 27 02:41:27 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Sun Nov  1 03:51:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70612591

sci-electronics/kicad: bump to KiCad-4.0.0-rc1

New use flags: examples, github, i18n, minimal, python, webkit.
More languages for i18n. Package source now downloads from project
website. Update dependencies and address wxwidgets upgrade issue.
USE flag 'debug' made functional in the bumped ebuild. Remove
outdated kicad-20130518.ebuild

Gentoo-Bug: #560768
Gentoo-Bug: #499040
Gentoo-Bug: #560766

Pull request https://github.com/gentoo/gentoo/pull/313

 sci-electronics/kicad/Manifest |   5 +-
 .../kicad/files/kicad-desktop-file.patch   |  35 
 .../kicad/files/kicad-missing-doc.patch|  25 ---
 .../kicad/files/kicad-native-boost.patch   |  27 ---
 sci-electronics/kicad/files/kicad-scripts.patch|  25 ---
 sci-electronics/kicad/kicad-20130518.ebuild| 129 ---
 sci-electronics/kicad/kicad-4.0.0_rc1.ebuild   | 183 +
 sci-electronics/kicad/metadata.xml |  11 +-
 8 files changed, 196 insertions(+), 244 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 8d9fa05..37addfd 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,2 +1,3 @@
-DIST kicad-2013-05-18-BZR4017-stable-UBUNTU_12.04_full_with_components_doc.tgz 
280828915 SHA256 
48c91acb9d4f45c7eebbcf4d602841896f11f22bb00721c62d351dd7241efd0b SHA512 
8c4b81077c7e23bae6ad6a167fca7e34c006fc6a2a28457ddc276bef94ab43f6bf29f460a9ed5d9e564ef144a106ee82362b3cead3ca64b1361466d8d390619d
 WHIRLPOOL 
ed51fdc7ee287d65f4002250e79652d791d2aebe2fc872e1b853cfeccd287bf548346824ffc9afb599ff21721e972db7a5b3c134c662e883cd7d1e5c5b6c5abe
-DIST kicad-sources-stable_2013-05-18_BZR4017.zip 15025159 SHA256 
cb9ca0d19e5ea8ca45c731eeddbd8a242eb696e619ee98af91f2c7a0095b393d SHA512 
747e4719a426646cf38b9951d28aea32085d672371426b44d9f9a575b55e051925ae3fd6c98aea6fa2c21c2c6a6a2f6cc2da461c882b854d033f5d1ce58384ba
 WHIRLPOOL 
69dbeed6da6d1400207c048a49008d6b0876df184d64c520b82e7e82e3826a04ada5563551f1498244ee4d67ec7731f81285a604e671ee73f6518f211ecb8ef0
+DIST kicad-4.0.0-rc1.tar.xz 10951000 SHA256 
62c2e95a2d6b8a3cf30bb91146c3d2b1c0df0cbfc070b6e54bcfdf0da2df6973 SHA512 
f158906b85e3c4032086c4a75563d47f75f183bc354e1f2fa55e157083005b51829c141e14171dea9092b9b24b6b5ff1c71e3ae485dd1d2d44fe7e63179c1ffa
 WHIRLPOOL 
755fde28cf45196bb60ffb6af7bc0acb92148310ad74807ef71404c418557bc2c6243f41e9040c0217dc970061df09a4092e2a5e52e016888660e4998153c95a
+DIST kicad-4.0.0_rc1-i18n.tar.gz 1959024 SHA256 
5fbd037e4a76a83ed6be7554ab1add98f7d93dce0db5fea6a0bcd58ef61486bd SHA512 
85c2db5d193cd4d1521eb9f454a13892680cb5340c3b86b264bceb36ce0c996f818b64c3edd9dae3ff51046c97ba33702649a1083a36f27a80d316f64465f630
 WHIRLPOOL 
8141fb59822fdda2bf46a9b8af7fe75d6557a1c3f384e5e2b03e58c5e4c9eca4f167a262f2ed9fd3479c64a8730ff1ba3f46f6cb72c680df9c6d6173ca611ada
+DIST kicad-4.0.0_rc1-library.tar.gz 87967616 SHA256 
09a9e184e19b6072efdc00fabb65e3c0d498858c17f5fa5ce8d255b21eab3db4 SHA512 
f611015a8760d3c9cf26fd99a043d69fa75d398fb287af7e6fe7cfbd70d3ff1aa67abcedeffa00fef60434e3944ac6b59fa4ac9ea50097d910fbabcb6f288165
 WHIRLPOOL 
83585bbc772da122139dfa643c4045bfef207ea8dbc4a83a5458be6227ff976fe9c48cea2388f9ec0b20e7c697579701b75231b852161b33a9c51ddef480c6f4

diff --git a/sci-electronics/kicad/files/kicad-desktop-file.patch 
b/sci-electronics/kicad/files/kicad-desktop-file.patch
deleted file mode 100644
index 7f982f7..000
--- a/sci-electronics/kicad/files/kicad-desktop-file.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cacd01f36db6277111a35fe60ad4762ee3b002e1 Mon Sep 17 00:00:00 2001
-From: Denis Dupeyron 
-Date: Thu, 18 Apr 2013 15:17:36 -0600
-Subject: [PATCH] Fix desktop category and semicolon
-

- resources/linux/mime/applications/eeschema.desktop | 2 +-
- resources/linux/mime/applications/kicad.desktop| 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/resources/linux/mime/applications/eeschema.desktop 
b/resources/linux/mime/applications/eeschema.desktop
-index 3042eae..0ed616c 100644
 a/resources/linux/mime/applications/eeschema.desktop
-+++ b/resources/linux/mime/applications/eeschema.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=Development;Electronics
-+Categories=Electronics;
- Comment=Design an electronic schematic
- Comment[fr]=Dessiner des schémas électroniques
- Exec=eeschema
-diff --git a/resources/linux/mime/applications/kicad.desktop 
b/resources/linux/mime/applications/kicad.desktop
-index 1d7645b..3a23e34 100644
 a/resources/linux/mime/applications/kicad.desktop
-+++ b/resources/linux/mime/applications/kicad.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]