gentoo resync : 25.08.2020

3 files changed, 43 insertions, 2 deletions

diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index ba4bdcd95e73..57dce906eb79 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -1,10 +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-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
 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-9999.ebuild 2646 BLAKE2B 69887be58dbafebdf1c1eb52c22db40ab4bce885634fc457d4c0ffdc3de64d378bcf8f68081e0f77ffcedb03cb2d2a3bc93101aebff24cee5d58acea2636cf07 SHA512 cc71f52231dfe4c8b10d49d232ef249b8a32ad9ec63db6d943d2ee8b2bc0b0ba028339cdc463c93e95a4d34501e8adf277f3e13f0de69940d6f50c8e6dcdd4b3
+EBUILD slic3r-9999.ebuild 2689 BLAKE2B 1aa5771deef7a1b0b475ebdfb28a1b7866be011da3207fbd7ffa3a215bb4f154afbe2a540fee751d776117be0ffef6d53ac5f837b6d0705239108ab7b5f8d73e SHA512 c96177d936221f8251b3859b24b64a9188eb814354e5a2c849ae87170c5791f8f4433bd020196f1a6c931296f3624eabbaa3b697937d1f1bee2d9b918dd519ab
 MISC metadata.xml 797 BLAKE2B bc34024c8f935d21985d572971a3c28b809dd54e8af65092c98f0f18e9229f9e945732bd36e9620c542260d692e3259aebc38de68c9baca8ba9fa67c3c312cc5 SHA512 13a72e511f2341c9cecc05eca767c348c595d77de4a41a154da93d6bcb31710f24bc51a23abefb08719718194ab3961d3f94697ed97319936e5d9ce625f82da5
diff --git a/media-gfx/slic3r/files/slic3r-9999-boost-173.patch b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
new file mode 100644
index 000000000000..ef7289afcd8c
--- /dev/null
+++ b/media-gfx/slic3r/files/slic3r-9999-boost-173.patch
@@ -0,0 +1,39 @@
+--- 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/slic3r-9999.ebuild b/media-gfx/slic3r/slic3r-9999.ebuild
index d4bc4f6a67a5..61ef1b641af8 100644
--- a/media-gfx/slic3r/slic3r-9999.ebuild
+++ b/media-gfx/slic3r/slic3r-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,6 +75,7 @@ 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
 }