1 |
commit: b99d82cf2ca7b57d411e8008b85b731b03dc08c0 |
2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 27 17:17:14 2017 +0000 |
4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 27 17:17:38 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b99d82cf |
7 |
|
8 |
media-gfx/slic3r-9999: add missing dep, strip local::lib |
9 |
|
10 |
local::lib is a workaround to help with the cpan-minus based |
11 |
build system the package comes with, which we are circumventing |
12 |
in order to perform a proper system installation. This commit |
13 |
includes a patch that reverts the upstream addition of local::lib. |
14 |
|
15 |
Also adds dev-perl/Devel-CheckLib to the dependency list |
16 |
|
17 |
Package-Manager: Portage-2.3.8, Repoman-2.3.1 |
18 |
|
19 |
.../slic3r/files/slic3r-9999-no-locallib.patch | 609 +++++++++++++++++++++ |
20 |
media-gfx/slic3r/slic3r-9999.ebuild | 2 + |
21 |
2 files changed, 611 insertions(+) |
22 |
|
23 |
diff --git a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch |
24 |
new file mode 100644 |
25 |
index 00000000000..8cb7fd6d16d |
26 |
--- /dev/null |
27 |
+++ b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch |
28 |
@@ -0,0 +1,609 @@ |
29 |
+commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f |
30 |
+Author: Ian Stakenvicius <axs@g.o> |
31 |
+Date: Wed Sep 27 12:22:14 2017 -0400 |
32 |
+ |
33 |
+ Revert "Use --local-lib when calling cpanm" |
34 |
+ |
35 |
+ This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others |
36 |
+ that add local::lib dependency |
37 |
+ |
38 |
+diff --git a/Build.PL b/Build.PL |
39 |
+index 2dd18435..18befbf8 100644 |
40 |
+--- a/Build.PL |
41 |
++++ b/Build.PL |
42 |
+@@ -109,16 +109,7 @@ EOF |
43 |
+ if !$cpanm; |
44 |
+ my @cpanm_args = (); |
45 |
+ push @cpanm_args, "--sudo" if $sudo; |
46 |
+- |
47 |
+- # install local::lib without --local-lib otherwise it's not usable afterwards |
48 |
+- if (!eval "use local::lib qw(local-lib); 1") { |
49 |
+- my $res = system $cpanm, @cpanm_args, 'local::lib'; |
50 |
+- warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n" |
51 |
+- if $res != 0; |
52 |
+- } |
53 |
+- |
54 |
+- push @cpanm_args, ('--local-lib', 'local-lib'); |
55 |
+- |
56 |
++ |
57 |
+ # make sure our cpanm is updated (old ones don't support the ~ syntax) |
58 |
+ system $cpanm, @cpanm_args, 'App::cpanminus'; |
59 |
+ |
60 |
+diff --git a/slic3r.pl b/slic3r.pl |
61 |
+index 11dc2fad..76885c90 100755 |
62 |
+--- a/slic3r.pl |
63 |
++++ b/slic3r.pl |
64 |
+@@ -6,7 +6,6 @@ use warnings; |
65 |
+ BEGIN { |
66 |
+ use FindBin; |
67 |
+ use lib "$FindBin::Bin/lib"; |
68 |
+- use local::lib '--no-create', "$FindBin::Bin/local-lib"; |
69 |
+ } |
70 |
+ |
71 |
+ use File::Basename qw(basename); |
72 |
+diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t |
73 |
+index 64c3769f..5ab631fe 100644 |
74 |
+--- a/t/adaptive_slicing.t |
75 |
++++ b/t/adaptive_slicing.t |
76 |
+@@ -5,7 +5,6 @@ use warnings; |
77 |
+ BEGIN { |
78 |
+ use FindBin; |
79 |
+ use lib "$FindBin::Bin/../lib"; |
80 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
81 |
+ } |
82 |
+ |
83 |
+ use List::Util qw(first sum); |
84 |
+diff --git a/t/adaptive_width.t b/t/adaptive_width.t |
85 |
+index 7a0baa75..c200f844 100644 |
86 |
+--- a/t/adaptive_width.t |
87 |
++++ b/t/adaptive_width.t |
88 |
+@@ -7,7 +7,6 @@ plan tests => 32; |
89 |
+ BEGIN { |
90 |
+ use FindBin; |
91 |
+ use lib "$FindBin::Bin/../lib"; |
92 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
93 |
+ } |
94 |
+ |
95 |
+ use List::Util qw(first); |
96 |
+diff --git a/t/angles.t b/t/angles.t |
97 |
+index 2ae00b4e..1e1a6c9c 100644 |
98 |
+--- a/t/angles.t |
99 |
++++ b/t/angles.t |
100 |
+@@ -7,9 +7,6 @@ plan tests => 34; |
101 |
+ BEGIN { |
102 |
+ use FindBin; |
103 |
+ use lib "$FindBin::Bin/../lib"; |
104 |
+- use lib "$FindBin::Bin/../lib"; |
105 |
+- use lib "$FindBin::Bin/../lib"; |
106 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
107 |
+ } |
108 |
+ |
109 |
+ use Slic3r; |
110 |
+diff --git a/t/arcs.t b/t/arcs.t |
111 |
+index ec85dfbc..65b83de4 100644 |
112 |
+--- a/t/arcs.t |
113 |
++++ b/t/arcs.t |
114 |
+@@ -7,7 +7,6 @@ plan tests => 24; |
115 |
+ BEGIN { |
116 |
+ use FindBin; |
117 |
+ use lib "$FindBin::Bin/../lib"; |
118 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
119 |
+ } |
120 |
+ |
121 |
+ use Slic3r; |
122 |
+diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t |
123 |
+index 7cd04e50..dd6c3e7b 100644 |
124 |
+--- a/t/avoid_crossing_perimeters.t |
125 |
++++ b/t/avoid_crossing_perimeters.t |
126 |
+@@ -5,7 +5,6 @@ use warnings; |
127 |
+ BEGIN { |
128 |
+ use FindBin; |
129 |
+ use lib "$FindBin::Bin/../lib"; |
130 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
131 |
+ } |
132 |
+ |
133 |
+ use List::Util qw(first sum); |
134 |
+diff --git a/t/bridges.t b/t/bridges.t |
135 |
+index 677115b8..3dc6b84a 100644 |
136 |
+--- a/t/bridges.t |
137 |
++++ b/t/bridges.t |
138 |
+@@ -5,7 +5,6 @@ use warnings; |
139 |
+ BEGIN { |
140 |
+ use FindBin; |
141 |
+ use lib "$FindBin::Bin/../lib"; |
142 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
143 |
+ } |
144 |
+ |
145 |
+ use List::Util qw(first sum); |
146 |
+diff --git a/t/clean_polylines.t b/t/clean_polylines.t |
147 |
+index 50c6f5bb..4526bd60 100644 |
148 |
+--- a/t/clean_polylines.t |
149 |
++++ b/t/clean_polylines.t |
150 |
+@@ -7,7 +7,6 @@ plan tests => 6; |
151 |
+ BEGIN { |
152 |
+ use FindBin; |
153 |
+ use lib "$FindBin::Bin/../lib"; |
154 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
155 |
+ } |
156 |
+ |
157 |
+ use Slic3r; |
158 |
+diff --git a/t/clipper.t b/t/clipper.t |
159 |
+index 3c983814..a898a53f 100644 |
160 |
+--- a/t/clipper.t |
161 |
++++ b/t/clipper.t |
162 |
+@@ -7,7 +7,6 @@ plan tests => 6; |
163 |
+ BEGIN { |
164 |
+ use FindBin; |
165 |
+ use lib "$FindBin::Bin/../lib"; |
166 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
167 |
+ } |
168 |
+ |
169 |
+ use List::Util qw(sum); |
170 |
+diff --git a/t/collinear.t b/t/collinear.t |
171 |
+index b28a3602..9dee7770 100644 |
172 |
+--- a/t/collinear.t |
173 |
++++ b/t/collinear.t |
174 |
+@@ -7,7 +7,6 @@ plan tests => 11; |
175 |
+ BEGIN { |
176 |
+ use FindBin; |
177 |
+ use lib "$FindBin::Bin/../lib"; |
178 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
179 |
+ } |
180 |
+ |
181 |
+ use Slic3r; |
182 |
+diff --git a/t/combineinfill.t b/t/combineinfill.t |
183 |
+index 66e461d4..6661cdd6 100644 |
184 |
+--- a/t/combineinfill.t |
185 |
++++ b/t/combineinfill.t |
186 |
+@@ -5,7 +5,6 @@ use warnings; |
187 |
+ BEGIN { |
188 |
+ use FindBin; |
189 |
+ use lib "$FindBin::Bin/../lib"; |
190 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
191 |
+ } |
192 |
+ |
193 |
+ use List::Util qw(first); |
194 |
+diff --git a/t/config.t b/t/config.t |
195 |
+index 829ef5f3..7f85dae8 100644 |
196 |
+--- a/t/config.t |
197 |
++++ b/t/config.t |
198 |
+@@ -5,7 +5,6 @@ use warnings; |
199 |
+ BEGIN { |
200 |
+ use FindBin; |
201 |
+ use lib "$FindBin::Bin/../lib"; |
202 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
203 |
+ } |
204 |
+ |
205 |
+ use Slic3r; |
206 |
+diff --git a/t/cooling.t b/t/cooling.t |
207 |
+index 80819bdc..5b2d4b4c 100644 |
208 |
+--- a/t/cooling.t |
209 |
++++ b/t/cooling.t |
210 |
+@@ -7,7 +7,6 @@ plan tests => 13; |
211 |
+ BEGIN { |
212 |
+ use FindBin; |
213 |
+ use lib "$FindBin::Bin/../lib"; |
214 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
215 |
+ } |
216 |
+ |
217 |
+ use List::Util qw(none all); |
218 |
+diff --git a/t/custom_gcode.t b/t/custom_gcode.t |
219 |
+index 9b58344e..3ff7c35d 100644 |
220 |
+--- a/t/custom_gcode.t |
221 |
++++ b/t/custom_gcode.t |
222 |
+@@ -5,7 +5,6 @@ use warnings; |
223 |
+ BEGIN { |
224 |
+ use FindBin; |
225 |
+ use lib "$FindBin::Bin/../lib"; |
226 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
227 |
+ } |
228 |
+ |
229 |
+ use List::Util qw(first); |
230 |
+diff --git a/t/fill.t b/t/fill.t |
231 |
+index 765cfd47..d422d27a 100644 |
232 |
+--- a/t/fill.t |
233 |
++++ b/t/fill.t |
234 |
+@@ -7,7 +7,6 @@ plan tests => 95; |
235 |
+ BEGIN { |
236 |
+ use FindBin; |
237 |
+ use lib "$FindBin::Bin/../lib"; |
238 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
239 |
+ } |
240 |
+ |
241 |
+ use List::Util qw(first sum max); |
242 |
+diff --git a/t/flow.t b/t/flow.t |
243 |
+index 37e9deaf..071d290c 100644 |
244 |
+--- a/t/flow.t |
245 |
++++ b/t/flow.t |
246 |
+@@ -5,7 +5,6 @@ use warnings; |
247 |
+ BEGIN { |
248 |
+ use FindBin; |
249 |
+ use lib "$FindBin::Bin/../lib"; |
250 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
251 |
+ } |
252 |
+ |
253 |
+ use List::Util qw(first sum); |
254 |
+diff --git a/t/gaps.t b/t/gaps.t |
255 |
+index 01ec1b4e..16baa036 100644 |
256 |
+--- a/t/gaps.t |
257 |
++++ b/t/gaps.t |
258 |
+@@ -5,7 +5,6 @@ use warnings; |
259 |
+ BEGIN { |
260 |
+ use FindBin; |
261 |
+ use lib "$FindBin::Bin/../lib"; |
262 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
263 |
+ } |
264 |
+ |
265 |
+ use List::Util qw(first); |
266 |
+diff --git a/t/gcode.t b/t/gcode.t |
267 |
+index ec9b7bb2..525356df 100644 |
268 |
+--- a/t/gcode.t |
269 |
++++ b/t/gcode.t |
270 |
+@@ -5,7 +5,6 @@ use warnings; |
271 |
+ BEGIN { |
272 |
+ use FindBin; |
273 |
+ use lib "$FindBin::Bin/../lib"; |
274 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
275 |
+ } |
276 |
+ |
277 |
+ use List::Util qw(first); |
278 |
+diff --git a/t/geometry.t b/t/geometry.t |
279 |
+index 9c6eef55..4e6e7097 100644 |
280 |
+--- a/t/geometry.t |
281 |
++++ b/t/geometry.t |
282 |
+@@ -7,7 +7,6 @@ plan tests => 44; |
283 |
+ BEGIN { |
284 |
+ use FindBin; |
285 |
+ use lib "$FindBin::Bin/../lib"; |
286 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
287 |
+ } |
288 |
+ |
289 |
+ use Slic3r; |
290 |
+diff --git a/t/layers.t b/t/layers.t |
291 |
+index a8599807..57fd2576 100644 |
292 |
+--- a/t/layers.t |
293 |
++++ b/t/layers.t |
294 |
+@@ -5,7 +5,6 @@ use warnings; |
295 |
+ BEGIN { |
296 |
+ use FindBin; |
297 |
+ use lib "$FindBin::Bin/../lib"; |
298 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
299 |
+ } |
300 |
+ |
301 |
+ use List::Util qw(first); |
302 |
+diff --git a/t/loops.t b/t/loops.t |
303 |
+index d2bf7717..725154c9 100644 |
304 |
+--- a/t/loops.t |
305 |
++++ b/t/loops.t |
306 |
+@@ -7,7 +7,6 @@ plan tests => 4; |
307 |
+ BEGIN { |
308 |
+ use FindBin; |
309 |
+ use lib "$FindBin::Bin/../lib"; |
310 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
311 |
+ } |
312 |
+ |
313 |
+ use Slic3r; |
314 |
+diff --git a/t/multi.t b/t/multi.t |
315 |
+index fb8cad81..4d6f8193 100644 |
316 |
+--- a/t/multi.t |
317 |
++++ b/t/multi.t |
318 |
+@@ -5,7 +5,6 @@ use warnings; |
319 |
+ BEGIN { |
320 |
+ use FindBin; |
321 |
+ use lib "$FindBin::Bin/../lib"; |
322 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
323 |
+ } |
324 |
+ |
325 |
+ use List::Util qw(first); |
326 |
+diff --git a/t/perimeters.t b/t/perimeters.t |
327 |
+index 513c76ef..3ddde0b8 100644 |
328 |
+--- a/t/perimeters.t |
329 |
++++ b/t/perimeters.t |
330 |
+@@ -5,7 +5,6 @@ use warnings; |
331 |
+ BEGIN { |
332 |
+ use FindBin; |
333 |
+ use lib "$FindBin::Bin/../lib"; |
334 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
335 |
+ } |
336 |
+ |
337 |
+ use Slic3r::ExtrusionLoop ':roles'; |
338 |
+diff --git a/t/polyclip.t b/t/polyclip.t |
339 |
+index 0808c7be..1292d321 100644 |
340 |
+--- a/t/polyclip.t |
341 |
++++ b/t/polyclip.t |
342 |
+@@ -7,7 +7,6 @@ plan tests => 18; |
343 |
+ BEGIN { |
344 |
+ use FindBin; |
345 |
+ use lib "$FindBin::Bin/../lib"; |
346 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
347 |
+ } |
348 |
+ |
349 |
+ use Slic3r; |
350 |
+diff --git a/t/pressure.t b/t/pressure.t |
351 |
+index dde23695..6bbb81d8 100644 |
352 |
+--- a/t/pressure.t |
353 |
++++ b/t/pressure.t |
354 |
+@@ -5,7 +5,6 @@ use warnings; |
355 |
+ BEGIN { |
356 |
+ use FindBin; |
357 |
+ use lib "$FindBin::Bin/../lib"; |
358 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
359 |
+ } |
360 |
+ |
361 |
+ use List::Util qw(); |
362 |
+diff --git a/t/print.t b/t/print.t |
363 |
+index b78739e4..28cf1ee4 100644 |
364 |
+--- a/t/print.t |
365 |
++++ b/t/print.t |
366 |
+@@ -5,7 +5,6 @@ use warnings; |
367 |
+ BEGIN { |
368 |
+ use FindBin; |
369 |
+ use lib "$FindBin::Bin/../lib"; |
370 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
371 |
+ } |
372 |
+ |
373 |
+ use List::Util qw(first); |
374 |
+diff --git a/t/retraction.t b/t/retraction.t |
375 |
+index 237af3ab..37dcb64b 100644 |
376 |
+--- a/t/retraction.t |
377 |
++++ b/t/retraction.t |
378 |
+@@ -5,7 +5,6 @@ use warnings; |
379 |
+ BEGIN { |
380 |
+ use FindBin; |
381 |
+ use lib "$FindBin::Bin/../lib"; |
382 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
383 |
+ } |
384 |
+ |
385 |
+ use List::Util qw(any); |
386 |
+diff --git a/t/shells.t b/t/shells.t |
387 |
+index 2347ff36..d64eb28c 100644 |
388 |
+--- a/t/shells.t |
389 |
++++ b/t/shells.t |
390 |
+@@ -5,7 +5,6 @@ use warnings; |
391 |
+ BEGIN { |
392 |
+ use FindBin; |
393 |
+ use lib "$FindBin::Bin/../lib"; |
394 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
395 |
+ } |
396 |
+ |
397 |
+ use List::Util qw(first sum); |
398 |
+diff --git a/t/skirt_brim.t b/t/skirt_brim.t |
399 |
+index d6181ba2..cfa0698e 100644 |
400 |
+--- a/t/skirt_brim.t |
401 |
++++ b/t/skirt_brim.t |
402 |
+@@ -5,7 +5,6 @@ use warnings; |
403 |
+ BEGIN { |
404 |
+ use FindBin; |
405 |
+ use lib "$FindBin::Bin/../lib"; |
406 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
407 |
+ } |
408 |
+ |
409 |
+ use List::Util qw(first); |
410 |
+diff --git a/t/slice.t b/t/slice.t |
411 |
+index 51b52163..301ae164 100644 |
412 |
+--- a/t/slice.t |
413 |
++++ b/t/slice.t |
414 |
+@@ -8,7 +8,6 @@ plan tests => 16; |
415 |
+ BEGIN { |
416 |
+ use FindBin; |
417 |
+ use lib "$FindBin::Bin/../lib"; |
418 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
419 |
+ } |
420 |
+ |
421 |
+ # temporarily disable compilation errors due to constant not being exported anymore |
422 |
+diff --git a/t/speed.t b/t/speed.t |
423 |
+index 5d9fb54c..3deab75b 100644 |
424 |
+--- a/t/speed.t |
425 |
++++ b/t/speed.t |
426 |
+@@ -5,7 +5,6 @@ use warnings; |
427 |
+ BEGIN { |
428 |
+ use FindBin; |
429 |
+ use lib "$FindBin::Bin/../lib"; |
430 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
431 |
+ } |
432 |
+ |
433 |
+ use List::Util qw(none); |
434 |
+diff --git a/t/support.t b/t/support.t |
435 |
+index 8d4655b3..b4f9ce04 100644 |
436 |
+--- a/t/support.t |
437 |
++++ b/t/support.t |
438 |
+@@ -5,7 +5,6 @@ use warnings; |
439 |
+ BEGIN { |
440 |
+ use FindBin; |
441 |
+ use lib "$FindBin::Bin/../lib"; |
442 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
443 |
+ } |
444 |
+ |
445 |
+ use List::Util qw(first); |
446 |
+diff --git a/t/svg.t b/t/svg.t |
447 |
+index 6092efe2..9299eeef 100644 |
448 |
+--- a/t/svg.t |
449 |
++++ b/t/svg.t |
450 |
+@@ -5,7 +5,6 @@ use warnings; |
451 |
+ BEGIN { |
452 |
+ use FindBin; |
453 |
+ use lib "$FindBin::Bin/../lib"; |
454 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
455 |
+ } |
456 |
+ |
457 |
+ use Slic3r; |
458 |
+diff --git a/t/thin.t b/t/thin.t |
459 |
+index 2d256d28..51461480 100644 |
460 |
+--- a/t/thin.t |
461 |
++++ b/t/thin.t |
462 |
+@@ -5,7 +5,6 @@ use warnings; |
463 |
+ BEGIN { |
464 |
+ use FindBin; |
465 |
+ use lib "$FindBin::Bin/../lib"; |
466 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
467 |
+ } |
468 |
+ |
469 |
+ use Slic3r; |
470 |
+diff --git a/t/threads.t b/t/threads.t |
471 |
+index 7fcd86f0..106a68af 100644 |
472 |
+--- a/t/threads.t |
473 |
++++ b/t/threads.t |
474 |
+@@ -5,7 +5,6 @@ use warnings; |
475 |
+ BEGIN { |
476 |
+ use FindBin; |
477 |
+ use lib "$FindBin::Bin/../lib"; |
478 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
479 |
+ } |
480 |
+ |
481 |
+ use List::Util qw(first); |
482 |
+diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t |
483 |
+index 1a5488a6..7bfa27ac 100644 |
484 |
+--- a/t/vibrationlimit.t |
485 |
++++ b/t/vibrationlimit.t |
486 |
+@@ -5,7 +5,6 @@ use warnings; |
487 |
+ BEGIN { |
488 |
+ use FindBin; |
489 |
+ use lib "$FindBin::Bin/../lib"; |
490 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
491 |
+ } |
492 |
+ |
493 |
+ use Slic3r; |
494 |
+diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl |
495 |
+index 56df2e23..7edc1460 100755 |
496 |
+--- a/utils/amf-to-stl.pl |
497 |
++++ b/utils/amf-to-stl.pl |
498 |
+@@ -7,7 +7,6 @@ use warnings; |
499 |
+ BEGIN { |
500 |
+ use FindBin; |
501 |
+ use lib "$FindBin::Bin/../lib"; |
502 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
503 |
+ } |
504 |
+ |
505 |
+ use File::Basename qw(basename); |
506 |
+diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl |
507 |
+index e1d7f614..beecd666 100755 |
508 |
+--- a/utils/config-bundle-to-config.pl |
509 |
++++ b/utils/config-bundle-to-config.pl |
510 |
+@@ -9,7 +9,6 @@ use warnings; |
511 |
+ BEGIN { |
512 |
+ use FindBin; |
513 |
+ use lib "$FindBin::Bin/../lib"; |
514 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
515 |
+ } |
516 |
+ |
517 |
+ use Getopt::Long qw(:config no_auto_abbrev); |
518 |
+diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl |
519 |
+index 6da275ab..4df94268 100644 |
520 |
+--- a/utils/dump-stl.pl |
521 |
++++ b/utils/dump-stl.pl |
522 |
+@@ -8,7 +8,6 @@ use warnings; |
523 |
+ BEGIN { |
524 |
+ use FindBin; |
525 |
+ use lib "$FindBin::Bin/../lib"; |
526 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
527 |
+ } |
528 |
+ |
529 |
+ use Slic3r; |
530 |
+diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl |
531 |
+index 43c558b6..eab4f6da 100755 |
532 |
+--- a/utils/estimate-gcode-time.pl |
533 |
++++ b/utils/estimate-gcode-time.pl |
534 |
+@@ -6,7 +6,6 @@ use warnings; |
535 |
+ BEGIN { |
536 |
+ use FindBin; |
537 |
+ use lib "$FindBin::Bin/../lib"; |
538 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
539 |
+ } |
540 |
+ |
541 |
+ use Slic3r; |
542 |
+diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl |
543 |
+index b94a2fc4..4d9619e4 100644 |
544 |
+--- a/utils/gcode_sectioncut.pl |
545 |
++++ b/utils/gcode_sectioncut.pl |
546 |
+@@ -7,7 +7,6 @@ use warnings; |
547 |
+ BEGIN { |
548 |
+ use FindBin; |
549 |
+ use lib "$FindBin::Bin/../lib"; |
550 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
551 |
+ } |
552 |
+ |
553 |
+ use Getopt::Long qw(:config no_auto_abbrev); |
554 |
+diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl |
555 |
+index 30c41ae4..fa7612bb 100755 |
556 |
+--- a/utils/pdf-slices.pl |
557 |
++++ b/utils/pdf-slices.pl |
558 |
+@@ -7,7 +7,6 @@ use warnings; |
559 |
+ BEGIN { |
560 |
+ use FindBin; |
561 |
+ use lib "$FindBin::Bin/../lib"; |
562 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
563 |
+ } |
564 |
+ |
565 |
+ use Getopt::Long qw(:config no_auto_abbrev); |
566 |
+diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl |
567 |
+index d87e6826..6f529b90 100644 |
568 |
+--- a/utils/send-gcode.pl |
569 |
++++ b/utils/send-gcode.pl |
570 |
+@@ -6,7 +6,6 @@ use warnings; |
571 |
+ BEGIN { |
572 |
+ use FindBin; |
573 |
+ use lib "$FindBin::Bin/../lib"; |
574 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
575 |
+ } |
576 |
+ |
577 |
+ use Slic3r; |
578 |
+diff --git a/utils/split_stl.pl b/utils/split_stl.pl |
579 |
+index eb659b9c..16cf5a9d 100755 |
580 |
+--- a/utils/split_stl.pl |
581 |
++++ b/utils/split_stl.pl |
582 |
+@@ -7,7 +7,6 @@ use warnings; |
583 |
+ BEGIN { |
584 |
+ use FindBin; |
585 |
+ use lib "$FindBin::Bin/../lib"; |
586 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
587 |
+ } |
588 |
+ |
589 |
+ use File::Basename qw(basename); |
590 |
+diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl |
591 |
+index cb041893..81648b8e 100755 |
592 |
+--- a/utils/stl-to-amf.pl |
593 |
++++ b/utils/stl-to-amf.pl |
594 |
+@@ -7,7 +7,6 @@ use warnings; |
595 |
+ BEGIN { |
596 |
+ use FindBin; |
597 |
+ use lib "$FindBin::Bin/../lib"; |
598 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
599 |
+ } |
600 |
+ |
601 |
+ use File::Basename qw(basename); |
602 |
+diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl |
603 |
+index 91cd20a2..b122faed 100644 |
604 |
+--- a/utils/view-mesh.pl |
605 |
++++ b/utils/view-mesh.pl |
606 |
+@@ -7,7 +7,6 @@ use warnings; |
607 |
+ BEGIN { |
608 |
+ use FindBin; |
609 |
+ use lib "$FindBin::Bin/../lib"; |
610 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
611 |
+ } |
612 |
+ |
613 |
+ use Getopt::Long qw(:config no_auto_abbrev); |
614 |
+diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl |
615 |
+index d4c47f07..4bbbaab4 100755 |
616 |
+--- a/utils/view-toolpaths.pl |
617 |
++++ b/utils/view-toolpaths.pl |
618 |
+@@ -7,7 +7,6 @@ use warnings; |
619 |
+ BEGIN { |
620 |
+ use FindBin; |
621 |
+ use lib "$FindBin::Bin/../lib"; |
622 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
623 |
+ } |
624 |
+ |
625 |
+ use Getopt::Long qw(:config no_auto_abbrev); |
626 |
+diff --git a/utils/wireframe.pl b/utils/wireframe.pl |
627 |
+index f49b66e5..053581de 100644 |
628 |
+--- a/utils/wireframe.pl |
629 |
++++ b/utils/wireframe.pl |
630 |
+@@ -8,7 +8,6 @@ use warnings; |
631 |
+ BEGIN { |
632 |
+ use FindBin; |
633 |
+ use lib "$FindBin::Bin/../lib"; |
634 |
+- use local::lib "$FindBin::Bin/../local-lib"; |
635 |
+ } |
636 |
+ |
637 |
+ use Getopt::Long qw(:config no_auto_abbrev); |
638 |
|
639 |
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild |
640 |
index 4c89cffa525..db80a647e0e 100644 |
641 |
--- a/media-gfx/slic3r/slic3r-9999.ebuild |
642 |
+++ b/media-gfx/slic3r/slic3r-9999.ebuild |
643 |
@@ -19,6 +19,7 @@ IUSE="+gui test" |
644 |
RDEPEND="!=dev-lang/perl-5.16* |
645 |
>=dev-libs/boost-1.55[threads] |
646 |
dev-perl/Class-XSAccessor |
647 |
+ dev-perl/Devel-CheckLib |
648 |
dev-perl/Devel-Size |
649 |
>=dev-perl/Encode-Locale-1.50.0 |
650 |
dev-perl/IO-stringy |
651 |
@@ -72,6 +73,7 @@ src_unpack() { |
652 |
src_prepare() { |
653 |
pushd "${WORKDIR}/slic3r-${PV}" || die |
654 |
sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die |
655 |
+ eapply "${FILESDIR}"/${P}-no-locallib.patch |
656 |
eapply_user |
657 |
popd || die |
658 |
} |