1 |
commit: 011a513569497182d632fcbb967275e4169c3afd |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 25 20:16:02 2020 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 25 20:20:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=011a5135 |
7 |
|
8 |
sci-electronics/kicad: Remove old (py2.7, drop to ~arch) |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sci-electronics/kicad/Manifest | 4 - |
13 |
sci-electronics/kicad/files/kicad-boost-1.61.patch | 347 --------------------- |
14 |
.../files/kicad-cmake-checkcxxsymbolexists.patch | 46 --- |
15 |
.../kicad/files/kicad-footprints-cmakelists.txt | 16 - |
16 |
sci-electronics/kicad/kicad-4.0.7-r1.ebuild | 198 ------------ |
17 |
sci-electronics/kicad/metadata.xml | 2 - |
18 |
6 files changed, 613 deletions(-) |
19 |
|
20 |
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest |
21 |
index be5b223eb6f..137d591a548 100644 |
22 |
--- a/sci-electronics/kicad/Manifest |
23 |
+++ b/sci-electronics/kicad/Manifest |
24 |
@@ -1,6 +1,2 @@ |
25 |
-DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B 610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df SHA512 4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a |
26 |
-DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B 54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b SHA512 7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b |
27 |
DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5 |
28 |
DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f SHA512 4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a |
29 |
-DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f |
30 |
-DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360 |
31 |
|
32 |
diff --git a/sci-electronics/kicad/files/kicad-boost-1.61.patch b/sci-electronics/kicad/files/kicad-boost-1.61.patch |
33 |
deleted file mode 100644 |
34 |
index 3ca8711b9f0..00000000000 |
35 |
--- a/sci-electronics/kicad/files/kicad-boost-1.61.patch |
36 |
+++ /dev/null |
37 |
@@ -1,347 +0,0 @@ |
38 |
---- a/common/tool/tool_manager.cpp |
39 |
-+++ b/common/tool/tool_manager.cpp |
40 |
-@@ -532,11 +532,11 @@ |
41 |
- if( st->cofunc ) |
42 |
- st->Push(); |
43 |
- |
44 |
-+ st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second ); |
45 |
-+ |
46 |
- // as the state changes, the transition table has to be set up again |
47 |
- st->transitions.clear(); |
48 |
- |
49 |
-- st->cofunc = new COROUTINE<int, const TOOL_EVENT&>( tr.second ); |
50 |
-- |
51 |
- // got match? Run the handler. |
52 |
- st->cofunc->Call( aEvent ); |
53 |
- |
54 |
---- a/include/tool/coroutine.h |
55 |
-+++ b/include/tool/coroutine.h |
56 |
-@@ -27,10 +28,15 @@ |
57 |
- |
58 |
- #include <cstdlib> |
59 |
- |
60 |
--#include <boost/context/fcontext.hpp> |
61 |
- #include <boost/version.hpp> |
62 |
-+#include <type_traits> |
63 |
- |
64 |
--#include "delegate.h" |
65 |
-+#if BOOST_VERSION <= 106000 |
66 |
-+#include <boost/context/fcontext.hpp> |
67 |
-+#else |
68 |
-+#include <boost/context/execution_context.hpp> |
69 |
-+#include <boost/context/protected_fixedsize_stack.hpp> |
70 |
-+#endif |
71 |
- |
72 |
- /** |
73 |
- * Class COROUNTINE. |
74 |
-@@ -53,13 +59,12 @@ |
75 |
- * See coroutine_example.cpp for sample code. |
76 |
- */ |
77 |
- |
78 |
--template <class ReturnType, class ArgType> |
79 |
-+template <typename ReturnType, typename ArgType> |
80 |
- class COROUTINE |
81 |
- { |
82 |
- public: |
83 |
- COROUTINE() : |
84 |
-- m_saved( NULL ), m_self( NULL ), m_stack( NULL ), m_stackSize( c_defaultStackSize ), |
85 |
-- m_running( false ) |
86 |
-+ COROUTINE( nullptr ) |
87 |
- { |
88 |
- } |
89 |
- |
90 |
-@@ -69,8 +74,7 @@ |
91 |
- */ |
92 |
- template <class T> |
93 |
- COROUTINE( T* object, ReturnType(T::* ptr)( ArgType ) ) : |
94 |
-- m_func( object, ptr ), m_self( NULL ), m_saved( NULL ), m_stack( NULL ), |
95 |
-- m_stackSize( c_defaultStackSize ), m_running( false ) |
96 |
-+ COROUTINE( std::bind( ptr, object, std::placeholders::_1 ) ) |
97 |
- { |
98 |
- } |
99 |
- |
100 |
-@@ -78,9 +82,15 @@ |
101 |
- * Constructor |
102 |
- * Creates a coroutine from a delegate object |
103 |
- */ |
104 |
-- COROUTINE( DELEGATE<ReturnType, ArgType> aEntry ) : |
105 |
-- m_func( aEntry ), m_saved( NULL ), m_self( NULL ), m_stack( NULL ), |
106 |
-- m_stackSize( c_defaultStackSize ), m_running( false ) |
107 |
-+ COROUTINE( std::function<ReturnType(ArgType)> aEntry ) : |
108 |
-+ m_func( std::move( aEntry ) ), |
109 |
-+ m_running( false ), |
110 |
-+#if BOOST_VERSION <= 106000 |
111 |
-+ m_stack( nullptr ), |
112 |
-+ m_stackSize( c_defaultStackSize ), |
113 |
-+#endif |
114 |
-+ m_caller( nullptr ), |
115 |
-+ m_callee( nullptr ) |
116 |
- { |
117 |
- // Avoid not initialized members, and make static analysers quiet |
118 |
- m_args = 0; |
119 |
-@@ -89,18 +99,26 @@ |
120 |
- |
121 |
- ~COROUTINE() |
122 |
- { |
123 |
-- if( m_saved ) |
124 |
-- delete m_saved; |
125 |
-- |
126 |
- #if BOOST_VERSION >= 105600 |
127 |
-- if( m_self ) |
128 |
-- delete m_self; |
129 |
-+ delete m_callee; |
130 |
- #endif |
131 |
- |
132 |
-+#if BOOST_VERSION <= 106000 |
133 |
-+ delete m_caller; |
134 |
-+ |
135 |
- if( m_stack ) |
136 |
- free( m_stack ); |
137 |
-+#endif |
138 |
- } |
139 |
- |
140 |
-+private: |
141 |
-+#if BOOST_VERSION <= 106000 |
142 |
-+ using context_type = boost::context::fcontext_t; |
143 |
-+#else |
144 |
-+ using context_type = boost::context::execution_context<COROUTINE*>; |
145 |
-+#endif |
146 |
-+ |
147 |
-+public: |
148 |
- /** |
149 |
- * Function Yield() |
150 |
- * |
151 |
-@@ -110,7 +128,12 @@ |
152 |
- */ |
153 |
- void Yield() |
154 |
- { |
155 |
-- jump( m_self, m_saved, 0 ); |
156 |
-+#if BOOST_VERSION <= 106000 |
157 |
-+ jump( m_callee, m_caller, false ); |
158 |
-+#else |
159 |
-+ auto result = (*m_caller)( this ); |
160 |
-+ *m_caller = std::move( std::get<0>( result ) ); |
161 |
-+#endif |
162 |
- } |
163 |
- |
164 |
- /** |
165 |
-@@ -122,7 +145,11 @@ |
166 |
- void Yield( ReturnType& aRetVal ) |
167 |
- { |
168 |
- m_retVal = aRetVal; |
169 |
-- jump( m_self, m_saved, 0 ); |
170 |
-+#if BOOST_VERSION <= 106000 |
171 |
-+ jump( m_callee, m_caller, false ); |
172 |
-+#else |
173 |
-+ m_caller( this ); |
174 |
-+#endif |
175 |
- } |
176 |
- |
177 |
- /** |
178 |
-@@ -130,9 +157,9 @@ |
179 |
- * |
180 |
- * Defines the entry point for the coroutine, if not set in the constructor. |
181 |
- */ |
182 |
-- void SetEntry( DELEGATE<ReturnType, ArgType> aEntry ) |
183 |
-+ void SetEntry( std::function<ReturnType(ArgType)> aEntry ) |
184 |
- { |
185 |
-- m_func = aEntry; |
186 |
-+ m_func = std::move( aEntry ); |
187 |
- } |
188 |
- |
189 |
- /* Function Call() |
190 |
-@@ -143,6 +170,10 @@ |
191 |
- */ |
192 |
- bool Call( ArgType aArgs ) |
193 |
- { |
194 |
-+ assert( m_callee == NULL ); |
195 |
-+ assert( m_caller == NULL ); |
196 |
-+ |
197 |
-+#if BOOST_VERSION <= 106000 |
198 |
- // fixme: Clean up stack stuff. Add a guard |
199 |
- m_stack = malloc( c_defaultStackSize ); |
200 |
- |
201 |
-@@ -151,22 +182,32 @@ |
202 |
- |
203 |
- // correct the stack size |
204 |
- m_stackSize -= ( (size_t) m_stack + m_stackSize - (size_t) sp ); |
205 |
-- |
206 |
-- assert( m_self == NULL ); |
207 |
-- assert( m_saved == NULL ); |
208 |
-+#endif |
209 |
- |
210 |
- m_args = &aArgs; |
211 |
--#if BOOST_VERSION >= 105600 |
212 |
-- m_self = new boost::context::fcontext_t(); |
213 |
-- *m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub ); |
214 |
-+ |
215 |
-+#if BOOST_VERSION < 105600 |
216 |
-+ m_callee = boost::context::make_fcontext( sp, m_stackSize, callerStub ); |
217 |
-+#elif BOOST_VERSION <= 106000 |
218 |
-+ m_callee = new context_type( boost::context::make_fcontext( sp, m_stackSize, callerStub ) ); |
219 |
- #else |
220 |
-- m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub ); |
221 |
-+ m_callee = new context_type( std::allocator_arg_t(), |
222 |
-+ boost::context::protected_fixedsize_stack( c_defaultStackSize ), &COROUTINE::callerStub ); |
223 |
-+#endif |
224 |
-+ |
225 |
-+#if BOOST_VERSION <= 106000 |
226 |
-+ m_caller = new context_type(); |
227 |
- #endif |
228 |
-- m_saved = new boost::context::fcontext_t(); |
229 |
- |
230 |
- m_running = true; |
231 |
-+ |
232 |
- // off we go! |
233 |
-- jump( m_saved, m_self, reinterpret_cast<intptr_t>( this ) ); |
234 |
-+#if BOOST_VERSION <= 106000 |
235 |
-+ jump( m_caller, m_callee, reinterpret_cast<intptr_t>( this ) ); |
236 |
-+#else |
237 |
-+ auto result = (*m_callee)( this ); |
238 |
-+ *m_callee = std::move( std::get<0>( result ) ); |
239 |
-+#endif |
240 |
- return m_running; |
241 |
- } |
242 |
- |
243 |
-@@ -179,7 +220,12 @@ |
244 |
- */ |
245 |
- bool Resume() |
246 |
- { |
247 |
-- jump( m_saved, m_self, 0 ); |
248 |
-+#if BOOST_VERSION <= 106000 |
249 |
-+ jump( m_caller, m_callee, false ); |
250 |
-+#else |
251 |
-+ auto result = (*m_callee)( this ); |
252 |
-+ *m_callee = std::move( std::get<0>( result ) ); |
253 |
-+#endif |
254 |
- |
255 |
- return m_running; |
256 |
- } |
257 |
-@@ -208,61 +254,66 @@ |
258 |
- static const int c_defaultStackSize = 2000000; // fixme: make configurable |
259 |
- |
260 |
- /* real entry point of the coroutine */ |
261 |
-+#if BOOST_VERSION <= 106000 |
262 |
- static void callerStub( intptr_t aData ) |
263 |
-+#else |
264 |
-+ static context_type callerStub( context_type caller, COROUTINE* cor ) |
265 |
-+#endif |
266 |
- { |
267 |
- // get pointer to self |
268 |
-+#if BOOST_VERSION <= 106000 |
269 |
- COROUTINE<ReturnType, ArgType>* cor = reinterpret_cast<COROUTINE<ReturnType, ArgType>*>( aData ); |
270 |
-+#else |
271 |
-+ cor->m_caller = &caller; |
272 |
-+#endif |
273 |
- |
274 |
- // call the coroutine method |
275 |
-- cor->m_retVal = cor->m_func( *cor->m_args ); |
276 |
-+ cor->m_retVal = cor->m_func( *( cor->m_args ) ); |
277 |
- cor->m_running = false; |
278 |
- |
279 |
- // go back to wherever we came from. |
280 |
-- jump( cor->m_self, cor->m_saved, 0 ); // reinterpret_cast<intptr_t>( this )); |
281 |
-+#if BOOST_VERSION <= 106000 |
282 |
-+ jump( cor->m_callee, cor->m_caller, 0 ); |
283 |
-+#else |
284 |
-+ return caller; |
285 |
-+#endif |
286 |
- } |
287 |
- |
288 |
- ///> Wrapper for jump_fcontext to assure compatibility between different boost versions |
289 |
-- static inline intptr_t jump(boost::context::fcontext_t* aOld, boost::context::fcontext_t* aNew, |
290 |
-+#if BOOST_VERSION <= 106000 |
291 |
-+ static inline intptr_t jump( context_type* aOld, context_type* aNew, |
292 |
- intptr_t aP, bool aPreserveFPU = true ) |
293 |
- { |
294 |
--#if BOOST_VERSION >= 105600 |
295 |
-- return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU ); |
296 |
--#else |
297 |
-+#if BOOST_VERSION < 105600 |
298 |
- return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU ); |
299 |
-+#else |
300 |
-+ return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU ); |
301 |
- #endif |
302 |
- } |
303 |
-+#endif |
304 |
- |
305 |
-- template <typename T> |
306 |
-- struct strip_ref |
307 |
-- { |
308 |
-- typedef T result; |
309 |
-- }; |
310 |
-+ std::function<ReturnType(ArgType)> m_func; |
311 |
- |
312 |
-- template <typename T> |
313 |
-- struct strip_ref<T&> |
314 |
-- { |
315 |
-- typedef T result; |
316 |
-- }; |
317 |
-+ bool m_running; |
318 |
- |
319 |
-- DELEGATE<ReturnType, ArgType> m_func; |
320 |
-+#if BOOST_VERSION <= 106000 |
321 |
-+ ///< coroutine stack |
322 |
-+ void* m_stack; |
323 |
-+ |
324 |
-+ size_t m_stackSize; |
325 |
-+#endif |
326 |
- |
327 |
- ///< pointer to coroutine entry arguments. Stripped of references |
328 |
- ///< to avoid compiler errors. |
329 |
-- typename strip_ref<ArgType>::result* m_args; |
330 |
-+ typename std::remove_reference<ArgType>::type* m_args; |
331 |
-+ |
332 |
- ReturnType m_retVal; |
333 |
- |
334 |
- ///< saved caller context |
335 |
-- boost::context::fcontext_t* m_saved; |
336 |
-+ context_type* m_caller; |
337 |
- |
338 |
- ///< saved coroutine context |
339 |
-- boost::context::fcontext_t* m_self; |
340 |
-- |
341 |
-- ///< coroutine stack |
342 |
-- void* m_stack; |
343 |
-- |
344 |
-- size_t m_stackSize; |
345 |
-- |
346 |
-- bool m_running; |
347 |
-+ context_type* m_callee; |
348 |
- }; |
349 |
- |
350 |
- #endif |
351 |
---- a/include/tool/tool_base.h |
352 |
-+++ b/include/tool/tool_base.h |
353 |
-@@ -31,7 +32,7 @@ |
354 |
- #include <tool/tool_event.h> |
355 |
- #include <tool/tool_settings.h> |
356 |
- |
357 |
--#include <tool/delegate.h> |
358 |
-+#include <functional> |
359 |
- |
360 |
- class EDA_ITEM; |
361 |
- class TOOL_MANAGER; |
362 |
-@@ -53,7 +54,9 @@ |
363 |
- |
364 |
- /// Unique identifier for tools |
365 |
- typedef int TOOL_ID; |
366 |
--typedef DELEGATE<int, const TOOL_EVENT&> TOOL_STATE_FUNC; |
367 |
-+ |
368 |
-+using TOOL_STATE_FUNC = std::function<int(const TOOL_EVENT&)>; |
369 |
-+ |
370 |
- |
371 |
- /** |
372 |
- * Class TOOL_BASE |
373 |
---- a/include/tool/tool_interactive.h |
374 |
-+++ b/include/tool/tool_interactive.h |
375 |
-@@ -113,7 +114,7 @@ |
376 |
- void TOOL_INTERACTIVE::Go( int (T::* aStateFunc)( const TOOL_EVENT& ), |
377 |
- const TOOL_EVENT_LIST& aConditions ) |
378 |
- { |
379 |
-- TOOL_STATE_FUNC sptr( static_cast<T*>( this ), aStateFunc ); |
380 |
-+ TOOL_STATE_FUNC sptr = std::bind( aStateFunc, static_cast<T*>( this ), std::placeholders::_1 ); |
381 |
- |
382 |
- goInternal( sptr, aConditions ); |
383 |
- } |
384 |
- |
385 |
|
386 |
diff --git a/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch b/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch |
387 |
deleted file mode 100644 |
388 |
index b2a1eeb2cc4..00000000000 |
389 |
--- a/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch |
390 |
+++ /dev/null |
391 |
@@ -1,46 +0,0 @@ |
392 |
-diff -Naur kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake |
393 |
---- kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake 2017-08-28 07:31:31.000000000 -0700 |
394 |
-+++ kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake 1969-12-31 16:00:00.000000000 -0800 |
395 |
-@@ -1,42 +0,0 @@ |
396 |
--# - Check if a symbol exists as a function, variable, or macro in C++ |
397 |
--# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>) |
398 |
--# |
399 |
--# Check that the <symbol> is available after including given header |
400 |
--# <files> and store the result in a <variable>. Specify the list |
401 |
--# of files in one argument as a semicolon-separated list. |
402 |
--# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed |
403 |
--# to CHECK_SYMBOL_EXISTS(), which works only for C. |
404 |
--# |
405 |
--# If the header files define the symbol as a macro it is considered |
406 |
--# available and assumed to work. If the header files declare the |
407 |
--# symbol as a function or variable then the symbol must also be |
408 |
--# available for linking. If the symbol is a type or enum value |
409 |
--# it will not be recognized (consider using CheckTypeSize or |
410 |
--# CheckCSourceCompiles). |
411 |
--# |
412 |
--# The following variables may be set before calling this macro to |
413 |
--# modify the way the check is run: |
414 |
--# |
415 |
--# CMAKE_REQUIRED_FLAGS = string of compile command line flags |
416 |
--# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) |
417 |
--# CMAKE_REQUIRED_INCLUDES = list of include directories |
418 |
--# CMAKE_REQUIRED_LIBRARIES = list of libraries to link |
419 |
-- |
420 |
--#============================================================================= |
421 |
--# Copyright 2003-2011 Kitware, Inc. |
422 |
--# |
423 |
--# Distributed under the OSI-approved BSD License (the "License"); |
424 |
--# see accompanying file Copyright.txt for details. |
425 |
--# |
426 |
--# This software is distributed WITHOUT ANY WARRANTY; without even the |
427 |
--# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
428 |
--# See the License for more information. |
429 |
--#============================================================================= |
430 |
--# (To distribute this file outside of CMake, substitute the full |
431 |
--# License text for the above reference.) |
432 |
-- |
433 |
--include(CheckSymbolExists) |
434 |
-- |
435 |
--macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE) |
436 |
-- _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" ) |
437 |
--endmacro() |
438 |
|
439 |
diff --git a/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt b/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt |
440 |
deleted file mode 100644 |
441 |
index d024485befd..00000000000 |
442 |
--- a/sci-electronics/kicad/files/kicad-footprints-cmakelists.txt |
443 |
+++ /dev/null |
444 |
@@ -1,16 +0,0 @@ |
445 |
-project( kicad-footprints ) |
446 |
- |
447 |
-cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR ) |
448 |
- |
449 |
-file(GLOB footprint_dirs "*.pretty") |
450 |
- |
451 |
-# Everything without leading / is relative to CMAKE_INSTALL_PREFIX. |
452 |
-set( KICAD_DATA share/kicad |
453 |
- CACHE PATH "Location of KiCad data files." ) |
454 |
-set( KICAD_MODULES ${KICAD_DATA}/modules ) |
455 |
- |
456 |
-mark_as_advanced( KICAD_DATA KICAD_MODULES ) |
457 |
- |
458 |
-install(DIRECTORY ${footprint_dirs} |
459 |
- DESTINATION ${KICAD_MODULES} |
460 |
- COMPONENT resources) |
461 |
|
462 |
diff --git a/sci-electronics/kicad/kicad-4.0.7-r1.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild |
463 |
deleted file mode 100644 |
464 |
index a85b949bc42..00000000000 |
465 |
--- a/sci-electronics/kicad/kicad-4.0.7-r1.ebuild |
466 |
+++ /dev/null |
467 |
@@ -1,198 +0,0 @@ |
468 |
-# Copyright 1999-2020 Gentoo Authors |
469 |
-# Distributed under the terms of the GNU General Public License v2 |
470 |
- |
471 |
-EAPI=6 |
472 |
-PYTHON_COMPAT=( python2_7 ) |
473 |
- |
474 |
-WX_GTK_VER="3.0" |
475 |
- |
476 |
-inherit check-reqs cmake-utils flag-o-matic gnome2-utils python-single-r1 wxwidgets vcs-snapshot versionator xdg |
477 |
- |
478 |
-SERIES=$(get_version_component_range 1-2) |
479 |
- |
480 |
-DESCRIPTION="Electronic Schematic and PCB design tools." |
481 |
-HOMEPAGE="http://www.kicad-pcb.org" |
482 |
-SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz |
483 |
- !minimal? ( |
484 |
- http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz |
485 |
- http://downloads.kicad-pcb.org/libraries/kicad-library-${PV}.tar.gz |
486 |
- ) |
487 |
- i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz -> ${P}-i18n.tar.gz )" |
488 |
- |
489 |
-LICENSE="GPL-2+ GPL-3+ Boost-1.0" |
490 |
-SLOT="0" |
491 |
-KEYWORDS="amd64 ~arm64 x86" |
492 |
-IUSE="debug doc examples github i18n libressl minimal +python" |
493 |
-LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh-CN" |
494 |
-for lang in ${LANGS} ; do |
495 |
- IUSE="${IUSE} l10n_${lang}" |
496 |
-done |
497 |
-unset lang |
498 |
- |
499 |
-REQUIRED_USE=" |
500 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
501 |
- |
502 |
-COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] |
503 |
- $(python_gen_cond_dep " |
504 |
- python? ( |
505 |
- dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}] |
506 |
- ${PYTHON_DEPS} |
507 |
- ) |
508 |
- >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] |
509 |
- ") |
510 |
- github? ( |
511 |
- libressl? ( dev-libs/libressl:0= ) |
512 |
- !libressl? ( dev-libs/openssl:0= ) |
513 |
- ) |
514 |
- media-libs/glew:0= |
515 |
- media-libs/freeglut |
516 |
- media-libs/mesa[X(+)] |
517 |
- sys-libs/zlib |
518 |
- x11-libs/cairo" |
519 |
-DEPEND="${COMMON_DEPEND} |
520 |
- doc? ( app-doc/doxygen ) |
521 |
- i18n? ( virtual/libintl ) |
522 |
- python? ( dev-lang/swig:0 )" |
523 |
-RDEPEND="${COMMON_DEPEND} |
524 |
- sci-electronics/electronics-menu" |
525 |
- |
526 |
-pkg_pretend() { |
527 |
- CHECKREQS_DISK_BUILD="8G" |
528 |
- check-reqs_pkg_pretend |
529 |
-} |
530 |
- |
531 |
-pkg_setup() { |
532 |
- use python && python-single-r1_pkg_setup |
533 |
- setup-wxwidgets |
534 |
- CHECKREQS_DISK_BUILD="8G" |
535 |
- check-reqs_pkg_setup |
536 |
-} |
537 |
- |
538 |
-src_prepare() { |
539 |
- xdg_src_prepare |
540 |
- cmake-utils_src_prepare |
541 |
- |
542 |
- # Patch to work with >=boost 1.61 |
543 |
- eapply "${FILESDIR}/${PN}-boost-1.61.patch" |
544 |
- # Patch to work with >=cmake 3.11 |
545 |
- eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch" |
546 |
- |
547 |
- # Remove cvpcb desktop file as it does nothing |
548 |
- rm "resources/linux/mime/applications/cvpcb.desktop" || die |
549 |
- |
550 |
- # Handle optional minimal install. |
551 |
- if use minimal; then |
552 |
- # remove templates as they are not needed to run binaries |
553 |
- sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die |
554 |
- else |
555 |
- # create a link to the parts library in the main project folder |
556 |
- ln -s "${WORKDIR}/kicad-library-${PV}" "${S}/${PN}-library" || die |
557 |
- # create a link to the footprints library and add cmake build rule for it |
558 |
- ln -s "${WORKDIR}/${PN}-footprints-${PV}" "${S}/${PN}-footprints" || die |
559 |
- cp "${FILESDIR}/${PN}-footprints-cmakelists.txt" "${WORKDIR}/${PN}-footprints-${PV}/CMakeLists.txt" || die |
560 |
- # add the libraries directory to cmake as a subproject to build |
561 |
- sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die |
562 |
- # add the footprints directory to cmake as a subproject to build |
563 |
- sed "/add_subdirectory( ${PN}-library )/a add_subdirectory( ${PN}-footprints )" -i CMakeLists.txt || die |
564 |
- # remove duplicate uninstall directions for the library module |
565 |
- sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die |
566 |
- fi |
567 |
- |
568 |
- # Add internationalization for the GUI |
569 |
- if use i18n; then |
570 |
- # create a link to the translations library in the main project folder |
571 |
- ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die |
572 |
- # Remove unused languages. Project generates only languages specified in the |
573 |
- # file in LINGUAS in the subproject folder. By default all languages are added |
574 |
- # so we sed out the unused ones based on the user l10n_* settings. |
575 |
- local lang |
576 |
- for lang in ${LANGS}; do |
577 |
- if ! use l10n_${lang}; then |
578 |
- lang="${lang//-/_}" # Needed to turn zh-CN to zh_CN as KiCad does not follow l10n standard here |
579 |
- sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die |
580 |
- fi |
581 |
- done |
582 |
- # cmakelists does not respect our build dir variables, so make it point to the right location |
583 |
- sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die |
584 |
- # we also make from the master project so the source dir is understood incorretly, replace that too |
585 |
- sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die |
586 |
- # add the translations directory to cmake as a subproject to build |
587 |
- sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die |
588 |
- # remove duplicate uninstall directions for the translation module |
589 |
- sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die |
590 |
- fi |
591 |
- |
592 |
- # Install examples if requested |
593 |
- use examples || sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die |
594 |
- |
595 |
- # Add important missing doc files |
596 |
- sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die |
597 |
-} |
598 |
- |
599 |
-src_configure() { |
600 |
- local mycmakeargs=( |
601 |
- -DKICAD_DOCS="/usr/share/doc/${PF}" |
602 |
- -DKICAD_SKIP_BOOST=ON |
603 |
- -DBUILD_GITHUB_PLUGIN="$(usex github)" |
604 |
- -DKICAD_SCRIPTING="$(usex python)" |
605 |
- -DKICAD_SCRIPTING_MODULES="$(usex python)" |
606 |
- -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" |
607 |
- -DKICAD_I18N_UNIX_STRICT_PATH="$(usex i18n)" |
608 |
- -DCMAKE_CXX_FLAGS="-std=c++11" |
609 |
- ) |
610 |
- use python && mycmakeargs+=( |
611 |
- -DwxUSE_UNICODE=ON |
612 |
- -DPYTHON_DEST="$(python_get_sitedir)" |
613 |
- -DPYTHON_EXECUTABLE="${PYTHON}" |
614 |
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
615 |
- -DPYTHON_LIBRARY="$(python_get_library_path)" |
616 |
- ) |
617 |
- if use debug; then |
618 |
- append-cxxflags "-DDEBUG" |
619 |
- append-cflags "-DDEBUG" |
620 |
- fi |
621 |
- cmake-utils_src_configure |
622 |
-} |
623 |
- |
624 |
-src_compile() { |
625 |
- cmake-utils_src_compile |
626 |
- if use doc; then |
627 |
- doxygen Doxyfile || die |
628 |
- fi |
629 |
-} |
630 |
- |
631 |
-src_install() { |
632 |
- cmake-utils_src_install |
633 |
- use python && python_optimize |
634 |
- if use doc ; then |
635 |
- dodoc uncrustify.cfg |
636 |
- cd Documentation || die |
637 |
- dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/. |
638 |
- fi |
639 |
-} |
640 |
- |
641 |
-pkg_preinst() { |
642 |
- xdg_pkg_preinst |
643 |
-} |
644 |
- |
645 |
-pkg_postinst() { |
646 |
- xdg_pkg_postinst |
647 |
- gnome2_icon_cache_update |
648 |
- |
649 |
- if use minimal ; then |
650 |
- ewarn "If the schematic and/or board editors complain about missing libraries when you" |
651 |
- ewarn "open old projects, you will have to take one or more of the following actions :" |
652 |
- ewarn "- Install the missing libraries manually." |
653 |
- ewarn "- Remove the libraries from the 'Libs and Dir' preferences." |
654 |
- ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences." |
655 |
- ewarn "- Emerge ${PN} without the 'minimal' USE flag." |
656 |
- fi |
657 |
- elog "" |
658 |
- elog "You may want to emerge media-gfx/wings if you want to create 3D models of components." |
659 |
- elog "For help and extended documentation emerge app-doc/kicad-doc." |
660 |
-} |
661 |
- |
662 |
-pkg_postrm() { |
663 |
- xdg_pkg_postrm |
664 |
- gnome2_icon_cache_update |
665 |
-} |
666 |
|
667 |
diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml |
668 |
index 6eff0d23caf..0892cbd7d4b 100644 |
669 |
--- a/sci-electronics/kicad/metadata.xml |
670 |
+++ b/sci-electronics/kicad/metadata.xml |
671 |
@@ -11,8 +11,6 @@ |
672 |
</maintainer> |
673 |
<use> |
674 |
<flag name="github">Add github support into PCB editor</flag> |
675 |
- <flag name="i18n">Allow GUI internationalization through l10n_* use flags</flag> |
676 |
- <flag name="minimal">Build only binaries without parts library and examples</flag> |
677 |
<flag name="ngspice">Enable circuit simulation</flag> |
678 |
<flag name="occ">Enable viewing 3D rendering of designs via opencascade</flag> |
679 |
<flag name="oce">Enable viewing 3D rendering of designs via OCE</flag> |