gentoo resync : 14.12.2020

13 files changed, 392 insertions, 849 deletions

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 9f33509616c0..2894b9bb6862 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,12 +1,11 @@
-AUX slic3r-1.1.7-adjust_var_path.patch 274 BLAKE2B 7f360a202f1bcbeb42619ed7293a5997ebc47ab754fc2fed0c88bbf514bf32b6c72f7c64e9c86efef90d8aec93a72662da599af910c14f6186e0f3cc5b1e9482 SHA512 c13cf1a6f37aa13a9b85093e75de0d2368b4ca4623b28be17e7cfef5740b2b4f4cee69492c099bf936e4ee553e37389b8ffa9ea0df804a80a1cb6295cd198653
-AUX slic3r-1.3.0-boost.patch 338 BLAKE2B 8ae2f8fa44f932f3b43254c027039930a22209a31ac60fe572c0e3b883b5caf3f5b99e76acc0dd64f0b121eb31318d865bb19da1c918855910b36ac8ddb3a289 SHA512 3068908d72c3ddf54b063ac61edd01acec031462b36e25af2a69a635d286477d17f4937fc407fb1c69f6d3d2c2511c83cd40992bd3255c085deeeaa4a55b3213
+AUX slic3r-1.3.0-boost-1.73.patch 3740 BLAKE2B d4327b262928a13ea05cc9edd3db647f35f4216e801a557cdebc76638fd3c7c3c6d20a91e5081a629b3c2e18ea8bf9bdba08db05a64fa05e3153ebd7ccea92b5 SHA512 ea45b30181a91576b9a4b23d45dd0bf39c3c18d80579b28d8dcf54af29daa9d8fef7ec59cfed30f2278da070c965943740255508cf1bbd910a1b3ac7b08b0461
 AUX slic3r-1.3.0-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
-AUX slic3r-9999-boost-173.patch 1152 BLAKE2B 5f37ed2bff40f4f7da867ffb547e7f34f03864b313c8b085d13a8fd9bac9c3ef672e9dc730ac810ccbd5f2032e87f79a5d6d4afe0486c9feaa2fa6f57ed01c5b SHA512 f8045ca3f32a74fb2f657552ea4f85aa5e75bde84ac2db2e05810d8df934e5ce902bc45adfcc02b4ca33c759e0b7e2f6b25db941563a7d3c46ea9ca97240689d
-AUX slic3r-9999-no-locallib.patch 15462 BLAKE2B 0fd73fbf341573392ebdab3c4d010e1a11cbf424ded6b5b6fab18c05ffde049a8816c2884a06acdbacf0f41ed30b4d136a849eb6bf92e5fb72591e6e0081592d SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187
-DIST slic3r-1.1.7.tar.gz 2079200 BLAKE2B b3aa45741bb92a75dd09be783cb9a8cd551c7736f04022905d11587d8b2a533db85c1f88a9d0185b2b6414ba56d44e0feb104bcfcaf52a0a35a1db912c6976db SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650
+AUX slic3r-1.3.0-use-system-clipper.patch 1047 BLAKE2B ee3948e20db610d67c4132732037a1769a620a975b58cf54d02f9a3aae2b7d09a5d9bd5d9ae4ee24d0150b6dec7d13183838116877591adcc08436a2793e186c SHA512 b6a6ed07d57ef6b0f71c2f267543018cd3460fa03fc8ed8f5a9b8cdcd782edd191f35c73ed1829d4bb32da9460d076574f49af0b2e1cd19bc195c0ac3c0fdd25
+AUX slic3r-1.3.0-wayland.patch 224 BLAKE2B 71395194aed291387897eae5e5af8d58bee0e4af45075588fc456b733710716e5dc743ea2e734c816e32b2593f395dc7c7a23c92c75e466e54f49e1fbb4a6d9e SHA512 17f662af318c23dab656c8ae320ef9823bfc6cf71f9b33bdfebeaf9c53fec299062bf76b89b7422628072cc055b4790083491300a5d205f06cd1e6625654463e
+AUX slic3r-1.3.1_pre20200824-boost-1.73.patch 3928 BLAKE2B 24c2e497a7dd80fa4212e21652abd85b439917a1d4c84866591be2c2fb4d6acc999468edc4a50ed065b64611ffe3b3f11415f383e2298904986d585b0acd0f67 SHA512 9100c93537a8a40ccd17fc8486797b02e426d853d443ec40b85feaf92bba38d26c97bd4b3aa66609ab3cb8116d7ce94588302761e337153e2f37006770698875
 DIST slic3r-1.3.0.tar.gz 2104094 BLAKE2B 74c58690cf196f89ecff5eec853215c87c648df5a504725fea9f14b0343bca105190de1d63e2e8e76d47fcaf8dbe7b6d26f61b304ce7336412effa1c9a3fba41 SHA512 ff0f7747e166826ff1c53220974ee9d3a217d0e19964dbe4a5fa3e81f262a6810a47632686b7f1b3128384ae05c6f98d8aab980524079bdf9811445fe23a0f0d
-EBUILD slic3r-1.1.7.ebuild 2934 BLAKE2B 12740144adbadb8ef668003b7c1391b5e124208d02a5f9fe89d17a95e2ced01c04421f985b2aca1e3ddb4df34e7fdedc71af3d0e8dcbc76d85805fcc7c030b2a SHA512 b6b2c92e011e473cdd4934ae43e0ab32556fee66008bab3a397a2ac2f9b78d747eca30a4b794d3955d04f040e260fb5857ebbd6ab08250f611eb76f3faa1c623
-EBUILD slic3r-1.3.0-r1.ebuild 2885 BLAKE2B ef50ccee25ce363aea8b5a678e9e0d3e49182739c71311dcc1417420ab028663e1f74011b8b710e900710eda870c632f783cbe3428a5f6c786256b41e421b60a SHA512 5cf3b715822f7217b38d2fb8ceef29de8684742b16b27f7ac50aeaf3d7df326373e9ff1f9112b816e5c7728a06ebd49292b4376f948671940e6b1577078fe177
-EBUILD slic3r-1.3.0-r2.ebuild 2896 BLAKE2B b02342bf78e7a0a90af62a5dc5d0c430763e04d7ea6bd474404ae60380e75edecc9f86e6bd26433081461a9903d7c01487b9eca1938e4c7bf08a4a100746323f SHA512 9f40f4d2e8e454bb9f3419e96b05ed8ee0363f3e61ecea3828deb2bcd24debb7d856ecd7693fe8053c7a126c2be46b054b5effdd3bab034c3e9af7c56aed239f
-EBUILD slic3r-9999.ebuild 2700 BLAKE2B 3977555fb2da32181d4ef307e7666ed1ff33d1384644e724cec22e7e7f185b6f2bb5faa8d8f020a217a3fcab1ffe61a6332302ec3db258a623cb3d7b9a6787bc SHA512 af562137cbb1306cfaae9b7cb017d2fb44c17147c9101fee74c1f9e96eee22aa6558567b42777cf8711ce182f0587e1049f5231100fbfff53f99fea8f40f0fca
+DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a6411532103ea30500903cf3d6a221c2fa3d3109fb733db5d0cb0e9d0eec5033dad9acec2f89258242cdab316ea26392a8386097d9dd38 SHA512 fd7198f7c4a60911b2009f617d37485bf73964a626a53d02bd13baae963d28e74dc2f8314888e7c0fcacb389e0b481f3357c6ea595ac8f92d99f7a228c5cc2b7
+EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
+EBUILD slic3r-1.3.1_pre20200824.ebuild 2751 BLAKE2B 05edb3259beed74f87a666e4d06394e1a86a8fedb80d715e5b3b1e155541304bdbca067b45bba5629b40654ea8946c49c97776f96797f61d9fc7bb7a3733a036 SHA512 1e1b28d2fb58101122b08999c6d5ad76f3739b7efd9e492281bc223a714367e9314d3edd3359f05ee076df2ee0edc64a1759477bcbe48a2aad9e95bca366cf45
+EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch b/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
deleted file mode 100644
index ee4d75d0122a..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.1.7-adjust_var_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/lib/Slic3r.pm	2016-03-31 13:27:59.431548980 +0200
-+++ b/lib/Slic3r.pm	2016-03-31 13:28:21.658675137 +0200
-@@ -29,7 +29,7 @@
-     if $^V >= v5.16;
- 
- use FindBin;
--our $var = "$FindBin::Bin/var";
-+our $var = "$FindBin::RealBin/var";
- 
- use Encode;
- use Encode::Locale;
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
new file mode 100644
index 000000000000..6b710a18f3af
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-boost-1.73.patch
@@ -0,0 +1,146 @@
+--- a/xs/src/boost/nowide/cstdlib.hpp
++++ b/xs/src/boost/nowide/cstdlib.hpp
+@@ -8,7 +8,7 @@
+ #ifndef BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+ #define BOOST_NOWIDE_CSTDLIB_HPP_INCLUDED
+
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/nowide/system.hpp>
+
+ #endif
+--- a/xs/src/admesh/stl.h
++++ b/xs/src/admesh/stl.h
+@@ -26,11 +26,6 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <stddef.h>
+-#include <boost/detail/endian.hpp>
+-
+-#ifndef BOOST_LITTLE_ENDIAN
+-#error "admesh works correctly on little endian machines only!"
+-#endif
+
+ #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+     #include "windows.h"
+
+--- a/xs/src/libslic3r/PrintObject.cpp
++++ b/xs/src/libslic3r/PrintObject.cpp
+@@ -2,11 +2,14 @@
+ #include "BoundingBox.hpp"
+ #include "ClipperUtils.hpp"
+ #include "Geometry.hpp"
++#include <boost/bind/bind.hpp>
+ #include <algorithm>
+ #include <vector>
+
+ 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
++++ b/xs/src/libslic3r/GCodeSender.hpp
+@@ -7,13 +7,17 @@
+ #include <string>
+ #include <vector>
+ #include <boost/asio.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
++#include <boost/core/noncopyable.hpp>
+ #include <boost/thread.hpp>
+
+ namespace Slic3r {
+
+ namespace asio = boost::asio;
+
++using boost::placeholders::_1;
++using boost::placeholders::_2;
++
+ class GCodeSender : private boost::noncopyable {
+     public:
+     GCodeSender();
+--- a/xs/src/libslic3r/TriangleMesh.cpp
++++ b/xs/src/libslic3r/TriangleMesh.cpp
+@@ -14,6 +14,7 @@
+ #include <stdexcept>
+ #include <boost/config.hpp>
+ #include <boost/nowide/convert.hpp>
++#include <boost/bind/bind.hpp>
+
+ #ifdef SLIC3R_DEBUG
+ #include "SVG.hpp"
+@@ -21,6 +22,8 @@
+
+ namespace Slic3r {
+
++using boost::placeholders::_1;
++
+ TriangleMesh::TriangleMesh()
+     : repaired(false)
+ {
+--- a/xs/src/libslic3r/Config.cpp
++++ b/xs/src/libslic3r/Config.cpp
+@@ -14,6 +14,7 @@
+ #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/SLAPrint.cpp
++++ b/xs/src/libslic3r/SLAPrint.cpp
+@@ -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/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -22,7 +22,7 @@
+ set(Boost_USE_STATIC_LIBS ON)
+ set(Boost_USE_STATIC_RUNTIME ON)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-find_package(Boost COMPONENTS system thread filesystem)
++find_package(Boost MODULE REQUIRED)
+
+ set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/../xs/src/)
+
+--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
++++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
+@@ -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
++++ b/xs/Build.PL
+@@ -142,7 +142,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
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch b/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
deleted file mode 100644
index e77e50b3c998..000000000000
--- a/media-gfx/slic3r/files/slic3r-1.3.0-boost.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp.old	2019-11-04 19:31:05.714869400 -0800
-+++ Slic3r-1.3.0/xs/src/libslic3r/GCodeSender.hpp	2019-11-04 19:34:10.656330929 -0800
-@@ -9,6 +9,7 @@
- #include <boost/asio.hpp>
- #include <boost/bind.hpp>
- #include <boost/thread.hpp>
-+#include <boost/core/noncopyable.hpp>
- 
- namespace Slic3r {
- 
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
new file mode 100644
index 000000000000..9f9a5ef2fbd0
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-use-system-clipper.patch
@@ -0,0 +1,44 @@
+--- a/xs/src/libslic3r/ClipperUtils.hpp
++++ b/xs/src/libslic3r/ClipperUtils.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_ClipperUtils_hpp_
+ 
+ #include <libslic3r.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Polygon.hpp"
+ #include "Surface.hpp"
+--- a/xs/src/libslic3r/Geometry.cpp
++++ b/xs/src/libslic3r/Geometry.cpp
+@@ -3,7 +3,7 @@
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "PolylineCollection.hpp"
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include <algorithm>
+ #include <cassert>
+ #include <cmath>
+--- a/xs/src/libslic3r/SVG.hpp
++++ b/xs/src/libslic3r/SVG.hpp
+@@ -2,7 +2,7 @@
+ #define slic3r_SVG_hpp_
+ 
+ #include "libslic3r.h"
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "ExPolygon.hpp"
+ #include "Line.hpp"
+ #include "TriangleMesh.hpp"
+--- a/xs/xsp/Clipper.xsp
++++ b/xs/xsp/Clipper.xsp
+@@ -2,7 +2,7 @@
+ 
+ %{
+ #include <xsinit.h>
+-#include "clipper.hpp"
++#include <polyclipping/clipper.hpp>
+ #include "libslic3r/ClipperUtils.hpp"
+ %}
+ 
diff --git a/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
new file mode 100644
index 000000000000..d2dea0208d86
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-1.3.0-wayland.patch
@@ -0,0 +1,10 @@
+--- a/slic3r.pl
++++ b/slic3r.pl
+@@ -20,6 +20,7 @@ use Time::HiRes qw(gettimeofday tv_interval);
+ $|++;
+ binmode STDOUT, ':utf8';
+ binmode STDERR, ':utf8';
++$ENV{GDK_BACKEND} = 'x11';
+ 
+ our %opt = ();
+ my %cli_options = ();
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.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild
deleted file mode 100644
index f144a2980def..000000000000
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/Encode-Locale
-	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-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-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-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 )"
-
-DIST_TEST="do"
-S="${WORKDIR}/Slic3r-${PV}/xs"
-
-src_prepare() {
-	pushd "${WORKDIR}/Slic3r-${PV}" || die
-	eapply "${FILESDIR}/${P}-adjust_var_path.patch"
-	eapply_user
-	popd || die
-}
-
-src_configure() {
-	SLIC3R_NO_AUTO=1 perl-module_src_configure
-}
-
-src_test() {
-	perl-module_src_test
-	# 1.1.7 Is kinda broken after Perl 5.16
-	pushd .. || die
-	ewarn "Some Tests Skipped due to consuming 100% of RAM"
-	local bad_files=(
-		t/combineinfill.t t/cooling.t t/custom_gcode.t t/fill.t
-		t/flow.t t/gaps.t t/gcode.t t/layers.t t/multi.t
-		t/perimeters.t t/print.t t/retraction.t t/shells.t
-		t/skirt_brim.t t/support.t t/threads.t t/vibrationlimit.t
-	);
-	for filename in "${bad_files[@]}"; do
-		einfo "Removing bad test ${filename}";
-		rm -f "./${filename}" || die "Cannot remove ./${filename}";
-	done
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
-}
-
-src_install() {
-	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 \
-		Slic3r \
-		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
-		"Graphics;3DGraphics;Engineering;Development"
-	popd || die
-}
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
index 67feefd30fac..5917a9210b8d 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r1.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic perl-module
+inherit desktop eutils perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 # check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
-	>=dev-libs/boost-1.55[threads]
+	>=dev-libs/boost-1.73[threads]
 	dev-perl/Class-XSAccessor
 	dev-perl/Devel-CheckLib
 	dev-perl/Devel-Size
@@ -53,6 +53,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
@@ -64,38 +65,33 @@ DEPEND="${RDEPEND}
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
-S="${WORKDIR}/Slic3r-${PV}/xs"
+S="${WORKDIR}/Slic3r-${PV}"
+PERL_S="${S}/xs"
 
-pkg_pretend() {
-	einfo "Checking for -std=c++11 support in compiler"
-	test-flags-CXX -std=c++11 > /dev/null || die
-}
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.73.patch"
+	"${FILESDIR}/${P}-no-locallib.patch"
+	"${FILESDIR}/${P}-use-system-clipper.patch"
+	"${FILESDIR}/${P}-wayland.patch"
+)
 
 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.patch
-	eapply_user
-	popd || die
-	# drop std=c++11 to compiler defaults...
-	sed \
-		-e '/c++11/d' \
-		-i Build.PL || 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
@@ -108,9 +104,9 @@ src_install() {
 	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 \
+	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
 		"${VENDOR_LIB}/Slic3r/var/Slic3r_128px.png" \
 		"Graphics;3DGraphics;Engineering;Development"
diff --git a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
index 60c8950aab45..c8ca66784afd 100644
--- a/media-gfx/slic3r/slic3r-1.3.0-r2.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic perl-module
+inherit desktop eutils perl-module
 
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
@@ -53,6 +53,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
@@ -64,38 +65,32 @@ DEPEND="${RDEPEND}
 	test? (	virtual/perl-Test-Harness
 		virtual/perl-Test-Simple )"
 
-S="${WORKDIR}/Slic3r-${PV}/xs"
+S="${WORKDIR}/Slic3r-92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
+PERL_S="${S}/xs"
 
-pkg_pretend() {
-	einfo "Checking for -std=c++11 support in compiler"
-	test-flags-CXX -std=c++11 > /dev/null || die
-}
+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() {
-	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.patch
-	eapply_user
-	popd || die
-	# drop std=c++11 to compiler defaults...
-	sed \
-		-e '/c++11/d' \
-		-i Build.PL || 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
@@ -108,7 +103,7 @@ src_install() {
 	exeinto "${VENDOR_LIB}"/Slic3r
 	doexe slic3r.pl
 
-	dosym "${VENDOR_LIB}"/Slic3r/slic3r.pl /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" /usr/bin/slic3r.pl
 
 	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
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 \