commit:     e8c187233e9e706c949815498b06fb7f3fb3a4ae
Author:     Zoltan Puskas <zoltan <AT> sinustrom <DOT> info>
AuthorDate: Tue Sep 20 14:57:17 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 22:33:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c18723

sci-electronics/kicad: Add new 4.0.4 ebuild

Package-Manager: portage-2.3.0

Closes: https://github.com/gentoo/gentoo/pull/2377

 sci-electronics/kicad/Manifest                     |  4 ++
 ...ntext.patch => kicad-4.0.2-boost-context.patch} |  0
 ....patch => kicad-4.0.2-swig-import-helper.patch} |  0
 ...ntext.patch => kicad-4.0.4-boost-context.patch} | 56 +++++++++----------
 sci-electronics/kicad/kicad-4.0.1-r1.ebuild        |  2 +-
 sci-electronics/kicad/kicad-4.0.2-r1.ebuild        |  2 +-
 sci-electronics/kicad/kicad-4.0.2-r2.ebuild        |  4 +-
 sci-electronics/kicad/kicad-4.0.2-r3.ebuild        |  6 +-
 sci-electronics/kicad/kicad-4.0.2-r4.ebuild        |  6 +-
 .../{kicad-4.0.2-r4.ebuild => kicad-4.0.4.ebuild}  | 64 ++++++++++------------
 10 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index aba1b59..76b023c 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,6 +4,10 @@ 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-4.0.4-i18n.tar.gz 2409039 SHA256 
aec8121fc64985b150c0843db937a3383afe1805697f339aa73009215c1b92cf SHA512 
5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf
 WHIRLPOOL 
65c940149ab3357341b41a70f7db35695a598ade462a6fc8e602c4d1b53458fc712706e0effbc8b27b24f95510980a223cb9445b8ca8d54669dd89a65d066a2c
+DIST kicad-4.0.4.tar.xz 10672424 SHA256 
6da5d3f7bc63a9c5b4d0f5e4b954411b45d712168596b5af02957343c87eda00 SHA512 
230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242
 WHIRLPOOL 
c5e577bebfd11160528e9543d9a421a5814ad70134092e9a0bd759b7a941e730b33cac7059606eba049ad5ffc8e6d44a0079bdbe9446ad1f152fa04ec6150d4c
 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
+DIST kicad-footprints-4.0.4.tar.gz 1400434 SHA256 
2b23e282c64c7e72d9ad52a6f114c20572b8c0e3fd9895b9b87b7ccacc7b4479 SHA512 
7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e
 WHIRLPOOL 
6f96d7ecbe94c511f99c6022466704742aec83578790685c2945926682a0a2c50f2ff176bf075b06cea4cd60fe7afbfb8c142096b6b7a1d73020f0327d1281a8
 DIST kicad-libcontext.tar.gz 25599 SHA256 
37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512 
3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9
 WHIRLPOOL 
d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087
+DIST kicad-library-4.0.4.tar.gz 87947075 SHA256 
22c02d151aba7ea90c519fda953a8cd882d8da7e36ec0e68ed90a6e15151cdf3 SHA512 
57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c
 WHIRLPOOL 
1ee926de02ca13c420535487437a45ecf8ea652e854105f4849612a30091ff9f9098d422e7e1c49ab1a6a2cb36cb94d9587a7267851307d947c76109b863da7b

diff --git a/sci-electronics/kicad/files/kicad-boost-context.patch 
b/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
similarity index 100%
copy from sci-electronics/kicad/files/kicad-boost-context.patch
copy to sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch

diff --git a/sci-electronics/kicad/files/kicad-swig-import-helper.patch 
b/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
similarity index 100%
rename from sci-electronics/kicad/files/kicad-swig-import-helper.patch
rename to sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch

diff --git a/sci-electronics/kicad/files/kicad-boost-context.patch 
b/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
similarity index 97%
rename from sci-electronics/kicad/files/kicad-boost-context.patch
rename to sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
index 00e80f3..529a82c 100644
--- a/sci-electronics/kicad/files/kicad-boost-context.patch
+++ b/sci-electronics/kicad/files/kicad-4.0.4-boost-context.patch
@@ -1,19 +1,19 @@
-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.000000000 -0700
-+++ kicad-4.0.2/common/system/libcontext.cpp    2016-06-16 22:35:46.654719468 
-0700
-@@ -13,7 +13,7 @@
-             http://www.boost.org/LICENSE_1_0.txt)
-
- */
--#include "libcontext.h"
-+#include <system/libcontext.h>
- #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.txt    2016-02-13 13:14:42.000000000 -0800
-+++ kicad-4.0.2/CMakeLists.txt 2016-06-11 01:11:25.623484908 -0700
-@@ -561,7 +561,7 @@
+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.000000000 -0700
++++ kicad-4.0.2/common/system/libcontext.cpp    2016-06-16 22:35:46.654719468 
-0700
+@@ -13,7 +13,7 @@
+             http://www.boost.org/LICENSE_1_0.txt)
+
+ */
+-#include "libcontext.h"
++#include <system/libcontext.h>
+ #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.txt    2016-02-13 13:14:42.000000000 -0800
++++ kicad-4.0.2/CMakeLists.txt 2016-06-11 01:11:25.623484908 -0700
+@@ -561,7 +561,7 @@
  # Download boost and possibly build parts of it
  #################################################
  if( KICAD_SKIP_BOOST )
@@ -22,10 +22,10 @@ diff -Naur kicad-4.0.2-orig/CMakeLists.txt 
kicad-4.0.2/CMakeLists.txt
                                                     program_options regex 
system thread )
  
      if( NOT Boost_FOUND )
-diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt 
kicad-4.0.2/common/CMakeLists.txt
---- kicad-4.0.2-orig/common/CMakeLists.txt     2016-02-13 13:14:42.000000000 
-0800
-+++ kicad-4.0.2/common/CMakeLists.txt  2016-06-11 01:10:04.886830434 -0700
-@@ -256,6 +256,8 @@
+diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt 
kicad-4.0.2/common/CMakeLists.txt
+--- kicad-4.0.2-orig/common/CMakeLists.txt     2016-02-13 13:14:42.000000000 
-0800
++++ kicad-4.0.2/common/CMakeLists.txt  2016-06-11 01:10:04.886830434 -0700
+@@ -256,6 +256,8 @@
      view/view_item.cpp
      view/view_group.cpp
  
@@ -34,10 +34,10 @@ diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt 
kicad-4.0.2/common/CMakeLists.
      math/math_util.cpp
  
      tool/tool_action.cpp
-diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h 
kicad-4.0.2/include/tool/coroutine.h
---- kicad-4.0.2-orig/include/tool/coroutine.h  2016-02-13 13:14:42.000000000 
-0800
-+++ kicad-4.0.2/include/tool/coroutine.h       2016-06-11 01:07:06.035378422 
-0700
-@@ -27,8 +27,7 @@
+diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h 
kicad-4.0.2/include/tool/coroutine.h
+--- kicad-4.0.2-orig/include/tool/coroutine.h  2016-02-13 13:14:42.000000000 
-0800
++++ kicad-4.0.2/include/tool/coroutine.h       2016-06-11 01:07:06.035378422 
-0700
+@@ -27,8 +27,7 @@
  
  #include <cstdlib>
  
@@ -47,7 +47,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h 
kicad-4.0.2/include/tool/co
  
  #include "delegate.h"
  
-@@ -92,10 +91,8 @@
+@@ -92,10 +91,8 @@
          if( m_saved )
              delete m_saved;
  
@@ -58,7 +58,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h 
kicad-4.0.2/include/tool/co
  
          if( m_stack )
              free( m_stack );
-@@ -156,13 +153,9 @@
+@@ -156,13 +153,9 @@
          assert( m_saved == NULL );
  
          m_args = &aArgs;
@@ -75,7 +75,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h 
kicad-4.0.2/include/tool/co
  
          m_running = true;
          // off we go!
-@@ -222,14 +215,10 @@
+@@ -222,14 +215,10 @@
      }
  
      ///> Wrapper for jump_fcontext to assure compatibility between different 
boost versions
@@ -92,7 +92,7 @@ diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h 
kicad-4.0.2/include/tool/co
      }
  
      template <typename T>
-@@ -252,10 +241,10 @@
+@@ -252,10 +241,10 @@
      ReturnType m_retVal;
  
      ///< saved caller context

diff --git a/sci-electronics/kicad/kicad-4.0.1-r1.ebuild 
b/sci-electronics/kicad/kicad-4.0.1-r1.ebuild
index cbd6d23..985dae2 100644
--- a/sci-electronics/kicad/kicad-4.0.1-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.1-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
        <dev-libs/boost-1.61[context,nls,threads,python?]
        >=dev-libs/boost-1.56[context,nls,threads,python?]
        github? ( dev-libs/openssl:0 )
-       media-libs/glew
+       media-libs/glew:0=
        media-libs/freeglut
        media-libs/mesa
        sys-libs/zlib

diff --git a/sci-electronics/kicad/kicad-4.0.2-r1.ebuild 
b/sci-electronics/kicad/kicad-4.0.2-r1.ebuild
index cbd6d23..985dae2 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r1.ebuild
@@ -42,7 +42,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
        <dev-libs/boost-1.61[context,nls,threads,python?]
        >=dev-libs/boost-1.56[context,nls,threads,python?]
        github? ( dev-libs/openssl:0 )
-       media-libs/glew
+       media-libs/glew:0=
        media-libs/freeglut
        media-libs/mesa
        sys-libs/zlib

diff --git a/sci-electronics/kicad/kicad-4.0.2-r2.ebuild 
b/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
index b0670c6..a7c39c3 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r2.ebuild
@@ -43,7 +43,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
        )
        >=dev-libs/boost-1.56[nls,threads,python?]
        github? ( dev-libs/openssl:0 )
-       media-libs/glew
+       media-libs/glew:0=
        media-libs/freeglut
        media-libs/mesa
        sys-libs/zlib
@@ -70,7 +70,7 @@ src_prepare() {
        cp "${WORKDIR}/${PN}-libcontext/libcontext.h" 
"${S}/include/system/libcontext.h" || die "cp failed"
        # Path source to use new "built in" libcontext. Also patch 
libcontext.cpp to have correct include file.
        # Path must be applied after new libcontext files have been copied to 
the kicad source directory.
-       epatch "${FILESDIR}/${PN}-boost-context.patch"
+       epatch "${FILESDIR}/${P}-boost-context.patch"
 
        # remove all the non unix file endings
        find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix

diff --git a/sci-electronics/kicad/kicad-4.0.2-r3.ebuild 
b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
index 998e630..ad2d2cd 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
@@ -43,7 +43,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
        )
        >=dev-libs/boost-1.56[nls,threads,python?]
        github? ( dev-libs/openssl:0 )
-       media-libs/glew
+       media-libs/glew:0=
        media-libs/freeglut
        media-libs/mesa
        sys-libs/zlib
@@ -70,9 +70,9 @@ src_prepare() {
        cp "${WORKDIR}/${PN}-libcontext/libcontext.h" 
"${S}/include/system/libcontext.h" || die "cp failed"
        # Path source to use new "built in" libcontext. Also patch 
libcontext.cpp to have correct include file.
        # Path must be applied after new libcontext files have been copied to 
the kicad source directory.
-       epatch "${FILESDIR}/${PN}-boost-context.patch"
+       epatch "${FILESDIR}/${P}-boost-context.patch"
        # Patch python swig import fixer build script
-       epatch "${FILESDIR}/${PN}-swig-import-helper.patch"
+       epatch "${FILESDIR}/${P}-swig-import-helper.patch"
 
        # remove all the non unix file endings
        find "${S}" -type f -name "*.desktop" | xargs -n1 dos2unix

diff --git a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild 
b/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
index 0aec71a..1765013 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
@@ -48,7 +48,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
                libressl? ( dev-libs/libressl:0 )
                !libressl? ( dev-libs/openssl:0 )
        )
-       media-libs/glew
+       media-libs/glew:0=
        media-libs/freeglut
        media-libs/mesa
        sys-libs/zlib
@@ -74,9 +74,9 @@ src_prepare() {
        cp "${WORKDIR}/${PN}-libcontext/libcontext.h" 
"${S}/include/system/libcontext.h" || die "cp failed"
        # Path source to use new "built in" libcontext. Also patch 
libcontext.cpp to have correct include file.
        # Path must be applied after new libcontext files have been copied to 
the kicad source directory.
-       epatch "${FILESDIR}/${PN}-boost-context.patch"
+       epatch "${FILESDIR}/${P}-boost-context.patch"
        # Patch python swig import fixer build script
-       epatch "${FILESDIR}/${PN}-swig-import-helper.patch"
+       epatch "${FILESDIR}/${P}-swig-import-helper.patch"
 
        # remove all the non unix file endings
        edos2unix $(find "${S}" -type f -name "*.desktop")

diff --git a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild 
b/sci-electronics/kicad/kicad-4.0.4.ebuild
similarity index 80%
copy from sci-electronics/kicad/kicad-4.0.2-r4.ebuild
copy to sci-electronics/kicad/kicad-4.0.4.ebuild
index 0aec71a..21f5114 100644
--- a/sci-electronics/kicad/kicad-4.0.2-r4.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.4.ebuild
@@ -18,7 +18,7 @@ SERIES=$(get_version_component_range 1-2)
 SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
        !minimal? (
                
http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
-               https://github.com/KiCad/${PN}-library/archive/${PV}.tar.gz -> 
${P}-library.tar.gz
+               
http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz
        )
        i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> 
${P}-i18n.tar.gz )
        
https://github.com/twlostow/libcontext/archive/${LIBCONTEXT_COMMIT}.tar.gz -> 
${PN}-libcontext.tar.gz"
@@ -26,7 +26,7 @@ 
SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
 LICENSE="GPL-2+ GPL-3+ Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples github i18n libressl minimal +python webkit"
+IUSE="debug doc examples github i18n libressl minimal +python"
 LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN"
 for lang in ${LANGS} ; do
        IUSE="${IUSE} linguas_${lang}"
@@ -35,10 +35,9 @@ unset lang
 unset LANGS
 
 REQUIRED_USE="
-       github? ( webkit )
        python? ( ${PYTHON_REQUIRED_USE} )"
 
-CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
+COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
        python? (
                dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
                ${PYTHON_DEPS}
@@ -48,16 +47,16 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
                libressl? ( dev-libs/libressl:0 )
                !libressl? ( dev-libs/openssl:0 )
        )
-       media-libs/glew
+       media-libs/glew:0=
        media-libs/freeglut
        media-libs/mesa
        sys-libs/zlib
        x11-libs/cairo"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
        doc? ( app-doc/doxygen )
        i18n? ( virtual/libintl )
        python? ( dev-lang/swig:0 )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
        sci-electronics/electronics-menu"
 
 pkg_setup() {
@@ -68,74 +67,72 @@ src_prepare() {
        xdg_src_prepare
 
        # Add separated out libcontext files and patch source to use them
-       mkdir -p "${S}/common/system/" || die "mkdir failed"
-       mkdir -p "${S}/include/system/" || die "mkdir failed"
-       cp "${WORKDIR}/${PN}-libcontext/libcontext.cpp" 
"${S}/common/system/libcontext.cpp" || die "cp failed"
-       cp "${WORKDIR}/${PN}-libcontext/libcontext.h" 
"${S}/include/system/libcontext.h" || die "cp failed"
+       mkdir -p "${S}/common/system/" || die
+       mkdir -p "${S}/include/system/" || die
+       cp "${WORKDIR}/${PN}-libcontext/libcontext.cpp" 
"${S}/common/system/libcontext.cpp" || die
+       cp "${WORKDIR}/${PN}-libcontext/libcontext.h" 
"${S}/include/system/libcontext.h" || die
        # Path source to use new "built in" libcontext. Also patch 
libcontext.cpp to have correct include file.
        # Path must be applied after new libcontext files have been copied to 
the kicad source directory.
-       epatch "${FILESDIR}/${PN}-boost-context.patch"
-       # Patch python swig import fixer build script
-       epatch "${FILESDIR}/${PN}-swig-import-helper.patch"
+       epatch "${FILESDIR}/${P}-boost-context.patch"
 
        # remove all the non unix file endings
        edos2unix $(find "${S}" -type f -name "*.desktop")
 
        # Remove cvpcb desktop file while it does nothing
-       rm "${WORKDIR}/${P}/resources/linux/mime/applications/cvpcb.desktop" || 
die "rm failed"
+       rm "${WORKDIR}/${P}/resources/linux/mime/applications/cvpcb.desktop" || 
die
 
        # Handle optional minimal install.
        if use minimal; then
                # remove templates as they are not needed to run binaries
-               sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || 
die "sed failed"
+               sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || 
die
        else
                # create a link to the parts library in the main project folder
-               ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln 
failed"
+               ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || 
die
                # create a link to the footprints library and add cmake build 
rule for it
-               ln -s "${WORKDIR}/${PN}-footprints-${PV}" 
"${S}/${PN}-footprints" || die "ln failed"
-               cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" 
"${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die "cp failed"
+               ln -s "${WORKDIR}/${PN}-footprints-${PV}" 
"${S}/${PN}-footprints" || die
+               cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" 
"${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die
                # add the libraries directory to cmake as a subproject to build
-               sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( 
${PN}-library )" -i CMakeLists.txt || die "sed failed"
+               sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( 
${PN}-library )" -i CMakeLists.txt || die
                # add the footprints directory to cmake as a subproject to build
-               sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( 
${PN}-footprints )" -i CMakeLists.txt || die "sed failed"
+               sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( 
${PN}-footprints )" -i CMakeLists.txt || die
                # remove duplicate uninstall directions for the library module
-               sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || 
die "sed failed"
+               sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || 
die
        fi
 
        # Add internationalization for the GUI
        if use i18n; then
                # create a link to the translations library in the main project 
folder
-               ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die "ln 
failed"
+               ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die
                # Remove unused languages. Project generates only languages 
specified in the
                # file in LINGUAS in the subproject folder. By default all 
languages are added
                # so we sed out the unused ones based on the user linguas_* 
settings.
                local lang
                for lang in ${LANGS}; do
                        if ! use linguas_${lang}; then
-                               sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die 
"sed failed"
+                               sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die
                        fi
                done
                # cmakelists does not respect our build dir variables, so make 
it point to the right location
-               sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i 
${PN}-i18n/CMakeLists.txt || die "sed failed"
+               sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i 
${PN}-i18n/CMakeLists.txt || die
                # we also make from the master project so the source dir is 
understood incorretly, replace that too
-               sed 
"s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i 
${PN}-i18n/CMakeLists.txt || die "sed failed"
+               sed 
"s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i 
${PN}-i18n/CMakeLists.txt || die
                # add the translations directory to cmake as a subproject to 
build
-               sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( 
${PN}-i18n )" -i CMakeLists.txt || die "sed failed"
+               sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( 
${PN}-i18n )" -i CMakeLists.txt || die
                # remove duplicate uninstall directions for the translation 
module
-               sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die 
"sed failed"
+               sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die
        fi
 
        # Install examples in the right place if requested
        if use examples; then
                # install demos into the examples folder too
-               sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i 
CMakeLists.txt || die "sed failed"
+               sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i 
CMakeLists.txt || die
        else
                # remove additional demos/examples as its not strictly required 
to run the binaries
-               sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die 
"sed failed"
+               sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die
        fi
 
        # Add important missing doc files
-       sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' 
-i CMakeLists.txt || die "sed failed"
+       sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' 
-i CMakeLists.txt || die
 }
 
 src_configure() {
@@ -154,7 +151,6 @@ src_configure() {
                $(cmake-utils_use python KICAD_SCRIPTING)
                $(cmake-utils_use python KICAD_SCRIPTING_MODULES)
                $(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)
-               $(cmake-utils_use webkit KICAD_USE_WEBKIT)
                $(usex i18n "-DKICAD_I18N_UNIX_STRICT_PATH=1" "")
        )
        if use debug; then
@@ -167,7 +163,7 @@ src_configure() {
 src_compile() {
        cmake-utils_src_compile
        if use doc; then
-               doxygen Doxyfile || die "doxygen failed"
+               doxygen Doxyfile || die
        fi
 }
 
@@ -176,7 +172,7 @@ src_install() {
        use python && python_optimize
        if use doc ; then
                dodoc uncrustify.cfg
-               cd Documentation || die "cd failed"
+               cd Documentation || die
                dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt 
doxygen/.
        fi
 }

Reply via email to