media-gfx/slic3r: version bump

Closes: https://bugs.gentoo.org/722308
Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18517
Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org>

6 files changed, 264 insertions, 661 deletions

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 1a6d2e82c5bf..f1a5e41dd20d 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1 +1,2 @@
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
+DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
diff --git a/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch
new file mode 100644
index 000000000000..d2aafecdb1e9
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.1_pre20200824-boost-1.73.patch
@@ -0,0 +1,133 @@
+--- a/xs/src/libslic3r/TriangleMesh.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/TriangleMesh.cpp	(date 1607117258000)
+@@ -22,6 +22,8 @@
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ TriangleMesh::TriangleMesh()
+     : repaired(false)
+ {
+
+--- a/src/CMakeLists.txt	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/src/CMakeLists.txt	(date 1607117046000)
+@@ -115,7 +115,7 @@
+ find_package(Threads REQUIRED)
+
+ set(Boost_NO_BOOST_CMAKE ON)
+-find_package(Boost REQUIRED COMPONENTS system thread filesystem)
++find_package(Boost REQUIRED COMPONENTS system thread filesystem nowide)
+
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+ set(GUI_LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/GUI/)
+
+--- a/xs/src/libslic3r/PrintObject.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/PrintObject.cpp	(date 1607117227000)
+@@ -4,12 +4,15 @@
+ #include "Geometry.hpp"
+ #include "Log.hpp"
+ #include "TransformationMatrix.hpp"
++#include <boost/bind/bind.hpp>
+ #include <algorithm>
+ #include <vector>
+ #include <limits>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ PrintObject::PrintObject(Print* print, ModelObject* model_object, const BoundingBoxf3 &modobj_bbox)
+ :   layer_height_spline(model_object->layer_height_spline),
+     typed_slices(false),
+
+--- a/xs/src/libslic3r/GCodeSender.hpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/GCodeSender.hpp	(date 1607117162000)
+@@ -7,7 +7,7 @@
+ #include <string>
+ #include <vector>
+ #include <boost/asio.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/core/noncopyable.hpp>
+
+@@ -15,6 +15,9 @@
+
+ namespace asio = boost::asio;
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ class GCodeSender : private boost::noncopyable {
+     public:
+     GCodeSender();
+
+--- a/xs/src/libslic3r/SLAPrint.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/SLAPrint.cpp	(date 1607117248000)
+@@ -7,9 +7,12 @@
+ #include <iostream>
+ #include <complex>
+ #include <cstdio>
++#include <boost/bind/bind.hpp>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ void
+ SLAPrint::slice()
+ {
+
+--- a/xs/src/libslic3r/ConfigBase.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/ConfigBase.cpp	(date 1607117107000)
+@@ -16,7 +16,7 @@
+ #include <boost/config.hpp>
+ #include <boost/foreach.hpp>
+ #include <boost/lexical_cast.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/property_tree/ptree.hpp>
+
+--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp	(date 1607117194000)
+@@ -1,9 +1,12 @@
+ #include "GCodeTimeEstimator.hpp"
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <cmath>
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ void
+ GCodeTimeEstimator::parse(const std::string &gcode)
+ {
+
+--- a/xs/Build.PL	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/Build.PL	(date 1607117077000)
+@@ -151,7 +151,7 @@
+ }
+ # In order to generate the -l switches we need to know how Boost libraries are named
+ my $have_boost = 0;
+-my @boost_libraries = qw(system thread filesystem);  # we need these
++my @boost_libraries = qw(system thread filesystem nowide);  # we need these
+ # check without explicit lib path (works on Linux)
+ if (! $mswin) {
+     $have_boost = 1
+
+--- a/xs/src/libslic3r/SupportMaterial.cpp	(revision 92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d)
++++ b/xs/src/libslic3r/SupportMaterial.cpp	(date 1607118181000)
+@@ -4,6 +4,8 @@
+ namespace Slic3r
+ {
+
++using boost::placeholders::_1;
++
+ PolylineCollection _fill_surface(Fill *fill, Surface *surface)
+ {
+     PolylineCollection ps;
diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
deleted file mode 100644
index ef7289afcd8c..000000000000
--- a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:32:00.044962439 -0600
-+++ b/xs/src/libslic3r/SLAPrint.cpp	2020-05-10 23:40:48.867348908 -0600
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <complex>
- #include <cstdio>
-+#include "boost/bind.hpp"
- 
- namespace Slic3r {
- 
---- a/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:32:00.044962439 -0600
-+++ b/xs/src/libslic3r/PrintObject.cpp	2020-05-10 23:46:22.614152088 -0600
-@@ -7,6 +7,7 @@
- #include <algorithm>
- #include <vector>
- #include <limits>
-+#include "boost/bind.hpp"
- 
- namespace Slic3r {
- 
---- a/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:32:00.044962439 -0600
-+++ b/xs/src/libslic3r/SupportMaterial.cpp	2020-05-10 23:54:17.078033850 -0600
-@@ -1,5 +1,6 @@
- #include "SupportMaterial.hpp"
- #include "Log.hpp"
-+#include "boost/bind.hpp"
- 
- namespace Slic3r
- {
---- a/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:32:00.045962432 -0600
-+++ b/xs/src/libslic3r/TriangleMesh.cpp	2020-05-10 23:35:44.778426800 -0600
-@@ -15,6 +15,7 @@
- #include <stdexcept>
- #include <boost/config.hpp>
- #include <boost/nowide/convert.hpp>
-+#include "boost/bind.hpp"
- 
- #ifdef SLIC3R_DEBUG
- #include "SVG.hpp"
diff --git a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch b/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
deleted file mode 100644
index 8cb7fd6d16dc..000000000000
--- a/media-gfx/slic3r/files/slic3r-9999-no-locallib.patch
+++ /dev/null
@@ -1,609 +0,0 @@
-commit 6f7e42a4707788d079d865800d9fdb65ed7d5f1f
-Author: Ian Stakenvicius <axs@gentoo.org>
-Date:   Wed Sep 27 12:22:14 2017 -0400
-
-    Revert "Use --local-lib when calling cpanm"
-    
-    This reverts commit e5412b5d69dc4d5415c92a7daaa47fb4860ca4ea and others
-    that add local::lib dependency
-
-diff --git a/Build.PL b/Build.PL
-index 2dd18435..18befbf8 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -109,16 +109,7 @@ EOF
-         if !$cpanm;
-     my @cpanm_args = ();
-     push @cpanm_args, "--sudo" if $sudo;
--    
--    # install local::lib without --local-lib otherwise it's not usable afterwards
--    if (!eval "use local::lib qw(local-lib); 1") {
--        my $res = system $cpanm, @cpanm_args, 'local::lib';
--        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
--            if $res != 0;
--    }
--    
--    push @cpanm_args, ('--local-lib', 'local-lib');
--    
-+
-     # make sure our cpanm is updated (old ones don't support the ~ syntax)
-     system $cpanm, @cpanm_args, 'App::cpanminus';
-     
-diff --git a/slic3r.pl b/slic3r.pl
-index 11dc2fad..76885c90 100755
---- a/slic3r.pl
-+++ b/slic3r.pl
-@@ -6,7 +6,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/lib";
--    use local::lib '--no-create', "$FindBin::Bin/local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/t/adaptive_slicing.t b/t/adaptive_slicing.t
-index 64c3769f..5ab631fe 100644
---- a/t/adaptive_slicing.t
-+++ b/t/adaptive_slicing.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/adaptive_width.t b/t/adaptive_width.t
-index 7a0baa75..c200f844 100644
---- a/t/adaptive_width.t
-+++ b/t/adaptive_width.t
-@@ -7,7 +7,6 @@ plan tests => 32;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/angles.t b/t/angles.t
-index 2ae00b4e..1e1a6c9c 100644
---- a/t/angles.t
-+++ b/t/angles.t
-@@ -7,9 +7,6 @@ plan tests => 34;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use lib "$FindBin::Bin/../lib";
--    use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/arcs.t b/t/arcs.t
-index ec85dfbc..65b83de4 100644
---- a/t/arcs.t
-+++ b/t/arcs.t
-@@ -7,7 +7,6 @@ plan tests => 24;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/avoid_crossing_perimeters.t b/t/avoid_crossing_perimeters.t
-index 7cd04e50..dd6c3e7b 100644
---- a/t/avoid_crossing_perimeters.t
-+++ b/t/avoid_crossing_perimeters.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/bridges.t b/t/bridges.t
-index 677115b8..3dc6b84a 100644
---- a/t/bridges.t
-+++ b/t/bridges.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/clean_polylines.t b/t/clean_polylines.t
-index 50c6f5bb..4526bd60 100644
---- a/t/clean_polylines.t
-+++ b/t/clean_polylines.t
-@@ -7,7 +7,6 @@ plan tests => 6;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/clipper.t b/t/clipper.t
-index 3c983814..a898a53f 100644
---- a/t/clipper.t
-+++ b/t/clipper.t
-@@ -7,7 +7,6 @@ plan tests => 6;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(sum);
-diff --git a/t/collinear.t b/t/collinear.t
-index b28a3602..9dee7770 100644
---- a/t/collinear.t
-+++ b/t/collinear.t
-@@ -7,7 +7,6 @@ plan tests => 11;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/combineinfill.t b/t/combineinfill.t
-index 66e461d4..6661cdd6 100644
---- a/t/combineinfill.t
-+++ b/t/combineinfill.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/config.t b/t/config.t
-index 829ef5f3..7f85dae8 100644
---- a/t/config.t
-+++ b/t/config.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/cooling.t b/t/cooling.t
-index 80819bdc..5b2d4b4c 100644
---- a/t/cooling.t
-+++ b/t/cooling.t
-@@ -7,7 +7,6 @@ plan tests => 13;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(none all);
-diff --git a/t/custom_gcode.t b/t/custom_gcode.t
-index 9b58344e..3ff7c35d 100644
---- a/t/custom_gcode.t
-+++ b/t/custom_gcode.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/fill.t b/t/fill.t
-index 765cfd47..d422d27a 100644
---- a/t/fill.t
-+++ b/t/fill.t
-@@ -7,7 +7,6 @@ plan tests => 95;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum max);
-diff --git a/t/flow.t b/t/flow.t
-index 37e9deaf..071d290c 100644
---- a/t/flow.t
-+++ b/t/flow.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/gaps.t b/t/gaps.t
-index 01ec1b4e..16baa036 100644
---- a/t/gaps.t
-+++ b/t/gaps.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/gcode.t b/t/gcode.t
-index ec9b7bb2..525356df 100644
---- a/t/gcode.t
-+++ b/t/gcode.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/geometry.t b/t/geometry.t
-index 9c6eef55..4e6e7097 100644
---- a/t/geometry.t
-+++ b/t/geometry.t
-@@ -7,7 +7,6 @@ plan tests => 44;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/layers.t b/t/layers.t
-index a8599807..57fd2576 100644
---- a/t/layers.t
-+++ b/t/layers.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/loops.t b/t/loops.t
-index d2bf7717..725154c9 100644
---- a/t/loops.t
-+++ b/t/loops.t
-@@ -7,7 +7,6 @@ plan tests => 4;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/multi.t b/t/multi.t
-index fb8cad81..4d6f8193 100644
---- a/t/multi.t
-+++ b/t/multi.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/perimeters.t b/t/perimeters.t
-index 513c76ef..3ddde0b8 100644
---- a/t/perimeters.t
-+++ b/t/perimeters.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r::ExtrusionLoop ':roles';
-diff --git a/t/polyclip.t b/t/polyclip.t
-index 0808c7be..1292d321 100644
---- a/t/polyclip.t
-+++ b/t/polyclip.t
-@@ -7,7 +7,6 @@ plan tests => 18;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/pressure.t b/t/pressure.t
-index dde23695..6bbb81d8 100644
---- a/t/pressure.t
-+++ b/t/pressure.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw();
-diff --git a/t/print.t b/t/print.t
-index b78739e4..28cf1ee4 100644
---- a/t/print.t
-+++ b/t/print.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/retraction.t b/t/retraction.t
-index 237af3ab..37dcb64b 100644
---- a/t/retraction.t
-+++ b/t/retraction.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(any);
-diff --git a/t/shells.t b/t/shells.t
-index 2347ff36..d64eb28c 100644
---- a/t/shells.t
-+++ b/t/shells.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first sum);
-diff --git a/t/skirt_brim.t b/t/skirt_brim.t
-index d6181ba2..cfa0698e 100644
---- a/t/skirt_brim.t
-+++ b/t/skirt_brim.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/slice.t b/t/slice.t
-index 51b52163..301ae164 100644
---- a/t/slice.t
-+++ b/t/slice.t
-@@ -8,7 +8,6 @@ plan tests => 16;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- # temporarily disable compilation errors due to constant not being exported anymore
-diff --git a/t/speed.t b/t/speed.t
-index 5d9fb54c..3deab75b 100644
---- a/t/speed.t
-+++ b/t/speed.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(none);
-diff --git a/t/support.t b/t/support.t
-index 8d4655b3..b4f9ce04 100644
---- a/t/support.t
-+++ b/t/support.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/svg.t b/t/svg.t
-index 6092efe2..9299eeef 100644
---- a/t/svg.t
-+++ b/t/svg.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/thin.t b/t/thin.t
-index 2d256d28..51461480 100644
---- a/t/thin.t
-+++ b/t/thin.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/t/threads.t b/t/threads.t
-index 7fcd86f0..106a68af 100644
---- a/t/threads.t
-+++ b/t/threads.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use List::Util qw(first);
-diff --git a/t/vibrationlimit.t b/t/vibrationlimit.t
-index 1a5488a6..7bfa27ac 100644
---- a/t/vibrationlimit.t
-+++ b/t/vibrationlimit.t
-@@ -5,7 +5,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/amf-to-stl.pl b/utils/amf-to-stl.pl
-index 56df2e23..7edc1460 100755
---- a/utils/amf-to-stl.pl
-+++ b/utils/amf-to-stl.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/utils/config-bundle-to-config.pl b/utils/config-bundle-to-config.pl
-index e1d7f614..beecd666 100755
---- a/utils/config-bundle-to-config.pl
-+++ b/utils/config-bundle-to-config.pl
-@@ -9,7 +9,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/dump-stl.pl b/utils/dump-stl.pl
-index 6da275ab..4df94268 100644
---- a/utils/dump-stl.pl
-+++ b/utils/dump-stl.pl
-@@ -8,7 +8,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
-index 43c558b6..eab4f6da 100755
---- a/utils/estimate-gcode-time.pl
-+++ b/utils/estimate-gcode-time.pl
-@@ -6,7 +6,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/gcode_sectioncut.pl b/utils/gcode_sectioncut.pl
-index b94a2fc4..4d9619e4 100644
---- a/utils/gcode_sectioncut.pl
-+++ b/utils/gcode_sectioncut.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/pdf-slices.pl b/utils/pdf-slices.pl
-index 30c41ae4..fa7612bb 100755
---- a/utils/pdf-slices.pl
-+++ b/utils/pdf-slices.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
-index d87e6826..6f529b90 100644
---- a/utils/send-gcode.pl
-+++ b/utils/send-gcode.pl
-@@ -6,7 +6,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Slic3r;
-diff --git a/utils/split_stl.pl b/utils/split_stl.pl
-index eb659b9c..16cf5a9d 100755
---- a/utils/split_stl.pl
-+++ b/utils/split_stl.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/utils/stl-to-amf.pl b/utils/stl-to-amf.pl
-index cb041893..81648b8e 100755
---- a/utils/stl-to-amf.pl
-+++ b/utils/stl-to-amf.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use File::Basename qw(basename);
-diff --git a/utils/view-mesh.pl b/utils/view-mesh.pl
-index 91cd20a2..b122faed 100644
---- a/utils/view-mesh.pl
-+++ b/utils/view-mesh.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/view-toolpaths.pl b/utils/view-toolpaths.pl
-index d4c47f07..4bbbaab4 100755
---- a/utils/view-toolpaths.pl
-+++ b/utils/view-toolpaths.pl
-@@ -7,7 +7,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
-diff --git a/utils/wireframe.pl b/utils/wireframe.pl
-index f49b66e5..053581de 100644
---- a/utils/wireframe.pl
-+++ b/utils/wireframe.pl
-@@ -8,7 +8,6 @@ use warnings;
- BEGIN {
-     use FindBin;
-     use lib "$FindBin::Bin/../lib";
--    use local::lib "$FindBin::Bin/../local-lib";
- }
- 
- use Getopt::Long qw(:config no_auto_abbrev);
diff --git a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
new file mode 100644
index 000000000000..c8ca66784afd
--- /dev/null
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils perl-module
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+HOMEPAGE="https://slic3r.org"
+SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+RESTRICT="!test? ( test )"
+
+# check Build.PL for dependencies
+RDEPEND="!=dev-lang/perl-5.16*
+	>=dev-libs/boost-1.55[threads]
+	dev-perl/Class-XSAccessor
+	dev-perl/Devel-CheckLib
+	dev-perl/Devel-Size
+	>=dev-perl/Encode-Locale-1.50.0
+	dev-perl/IO-stringy
+	>=dev-perl/Math-PlanePath-53.0.0
+	>=dev-perl/Moo-1.3.1
+	dev-perl/XML-SAX-ExpatXS
+	virtual/perl-Carp
+	virtual/perl-Encode
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-parent
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Test-Simple
+	virtual/perl-Thread-Semaphore
+	>=virtual/perl-threads-1.960.0
+	virtual/perl-Time-HiRes
+	virtual/perl-Unicode-Normalize
+	virtual/perl-XSLoader
+	gui? ( dev-perl/Class-Accessor
+		dev-perl/Growl-GNTP
+		dev-perl/libwww-perl
+		dev-perl/Module-Pluggable
+		dev-perl/Net-Bonjour
+		dev-perl/Net-DBus
+		dev-perl/OpenGL
+		>=dev-perl/Wx-0.991.800
+		dev-perl/Wx-GLCanvas
+		>=media-libs/freeglut-3
+		virtual/perl-Math-Complex
+		>=virtual/perl-Socket-2.16.0
+		x11-libs/libXmu
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/clipper
+	dev-perl/Devel-CheckLib
+	>=dev-perl/ExtUtils-CppGuess-0.70.0
+	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
+	>=dev-perl/ExtUtils-XSpp-0.170.0
+	>=dev-perl/Module-Build-0.380.0
+	>=dev-perl/Module-Build-WithXSpp-0.140.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.800.0
+	>=virtual/perl-ExtUtils-ParseXS-3.220.0
+	test? (	virtual/perl-Test-Harness
+		virtual/perl-Test-Simple )"
+
+S="${WORKDIR}/Slic3r-92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
+PERL_S="${S}/xs"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.73.patch"
+	"${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
+	"${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
+)
+
+src_prepare() {
+	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
+	perl-module_src_prepare
+}
+
+src_configure() {
+	cd "${PERL_S}" || die
+	SLIC3R_NO_AUTO=1 perl-module_src_configure
+}
+
+src_test() {
+	cd "${PERL_S}" || die
+	perl-module_src_test
+}
+
+src_install() {
+	cd "${PERL_S}" || die
+	perl-module_src_install
+
+	pushd .. || die
+	insinto "${VENDOR_LIB}"
+	doins -r lib/Slic3r.pm lib/Slic3r
+
+	insinto "${VENDOR_LIB}"/Slic3r
+	doins -r var
+
+	exeinto "${VENDOR_LIB}"/Slic3r
+	doexe slic3r.pl
+
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" /usr/bin/slic3r.pl
+
+	make_desktop_entry "slic3r.pl --gui %F" \
+		Slic3r \
+		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
+		"Graphics;3DGraphics;Engineering;Development"
+	popd || die
+}
diff --git a/media-gfx/slic3r/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index 404994de740e..6c8f1b5b6d9e 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit eutils git-r3 perl-module
 
@@ -54,6 +54,7 @@ RDEPEND="!=dev-lang/perl-5.16*
 		x11-libs/libXmu
 	)"
 DEPEND="${RDEPEND}
+	dev-libs/clipper
 	dev-perl/Devel-CheckLib
 	>=dev-perl/ExtUtils-CppGuess-0.70.0
 	>=dev-perl/ExtUtils-Typemaps-Default-1.50.0
@@ -65,46 +66,49 @@ DEPEND="${RDEPEND}
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
-S="${WORKDIR}/slic3r-${PV}/xs"
+S="${WORKDIR}/slic3r-${PV}"
+PERL_S="${S}/xs"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.1_pre20200824-boost-1.73.patch"
+	"${FILESDIR}/${PN}-1.3.0-no-locallib.patch"
+	"${FILESDIR}/${PN}-1.3.0-use-system-clipper.patch"
+)
 
 src_unpack() {
 	git-r3_src_unpack
 }
 
 src_prepare() {
-	pushd "${WORKDIR}/slic3r-${PV}" || die
 	sed -i lib/Slic3r.pm -e "s@FindBin::Bin@FindBin::RealBin@g" || die
-	eapply "${FILESDIR}"/${P}-no-locallib.patch
-	eapply "${FILESDIR}"/${P}-boost-173.patch
-	eapply_user
-	popd || die
+	perl-module_src_prepare
 }
 
 src_configure() {
+	cd "${PERL_S}" || die
 	SLIC3R_NO_AUTO=1 perl-module_src_configure
 }
 
 src_test() {
+	cd "${PERL_S}" || die
 	perl-module_src_test
-	pushd .. || die
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
 }
 
 src_install() {
+	cd "${PERL_S}" || die
 	perl-module_src_install
 
 	pushd .. || die
 	insinto "${VENDOR_LIB}"
 	doins -r lib/Slic3r.pm lib/Slic3r
 
-	insinto "${VENDOR_LIB}"/Slic3r
+	insinto "${VENDOR_LIB}/Slic3r"
 	doins -r var
 
-	exeinto "${VENDOR_LIB}"/Slic3r
+	exeinto "${VENDOR_LIB}/Slic3r"
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl"
 
 	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \