gentoo auto-resync : 22:04:2023 - 18:05:23

6 files changed, 79 insertions, 180 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 73b1808d6e1a..2f7c39fcb7cc 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index ae4b48bb145f..b2f2673c98cb 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -2,11 +2,9 @@ AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3297 BLAKE2B 2353b6c84d0c9bba6c08
 AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2509 BLAKE2B 6acf83743780b847fe3334213c227f33ec992e4fff8a873f42dcf26be8d008212928d01034b3fd9daf3873e0ef94943947d8adeadc4c426918f97493a008c0a1 SHA512 fef42120814bf5c45dd5bcd7dbad477cdd74ec62bea85335a67973072ae5e16e91e08530815a4bbb649c9ac418510e18b2cd4c136abcd1eacb0c2ca7a943871c
 AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1384 BLAKE2B 080b05c64f181759616557ebe6d83f91dd9a7b45f0f3833f9c3fa7f3d74df3d3399b353898967a51597b0422a611e8a86f85a8825de1a8fe818b389384e70373 SHA512 c325f7fed4bcdb380221c3b63ad525a53d26bab8baf7c7347035c8d22474ab38af944e445fc58da7f7979d9ec53f61b17a9edc1e7d86c65ac796e479a0316ce6
 AUX prusaslicer-2.5.0_rc1-fix-tests.patch 363 BLAKE2B 49c2dd3da996148497ab09854421cadd5054d06d5d78c2fd973f274857817c4fa0da7dfdb5efed03125422c2cab432d0f946f0f84929e08756ca3180bebd6709 SHA512 952958b687bf1b0d454ed921799d283b08fe56acaccbd909c41269243839cd5c02b1aca594d1fa947aff73c853ef6dcfd52e938f4f39a54396ec32d2e9cb284b
+AUX prusaslicer-2.5.2-fix-slicing.patch 5038 BLAKE2B 5d732bd8585e8a70c4f04270092bccfdfd7fc9d95999f58b8b9ba0f7516b9fad273102702959ce964a138a8f575f008277f84ff28ff2de77835b360d8f3a435d SHA512 40e5f094c5f9904b970e404f57ef9658024df4c60ecd75d4e4e8d2bc586d6c81bdcad6254e2355137bd1ec78b711bfdd7d1cc8ac73c46ae43cb0f4131763b8b2
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431 SHA512 b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
-DIST prusaslicer-2.5.1.tar.gz 48888707 BLAKE2B 2d976cdb7a72e14fba3bdef044b317dca059549b300ea327fe396ace121441260f6bc29dfcd4e7e8d0624ea90d3014cdea1af8a970abac4b1c0c91fa291d0b3c SHA512 7326f5e2ce5316b9afd9387f616a489d2f0e5d256ff27efbd91baa5a1755f8ccdb6ec14139f0074ead330d11674c20bb2d22b77f866ac26e5ec170223ced4af6
 DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8 SHA512 7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2
 EBUILD prusaslicer-2.5.0-r1.ebuild 2003 BLAKE2B c865dbecdfbeeb17aedd89266db7edc044c4a2c3b436bc294f766775f3dcfb00c685ee0ba9f0c5a0957cfeb04bdba07126dbf0c8fa0e528b7702b9a17e27a56c SHA512 3e6b41cf9b37fc61d96a55f0d1176d2cd8948429f2eb1c263eac318dc27abfdca91a2878ce102efccf744e51311f6fafc6d52b3cd4df8f48f0378ea684c1931b
-EBUILD prusaslicer-2.5.0-r2.ebuild 2006 BLAKE2B 976d13d1bc0d421e25ddfe0efab831d696cb80aa4a09e55e0ba93d75f725b6a68353a3a1b38a6d695518c5cd3284e57b19be388780bb508551711aca759ecc50 SHA512 0c7ca19005f272dc89e2a29c5a147984b9b9857fbbab2ee19b1442aef06ec7e1095a15fa041c42fe7e14a35458fca21293e9f2e8f0defdc8cd465087963fcddd
-EBUILD prusaslicer-2.5.1.ebuild 1986 BLAKE2B 6611a8156b70bc9d6acbb97dfe2f5b8299d21fdc130f704211015e3c7efd739dd4e6b89bf3cef0097af928a3c51d18c25ac652158a70138caf79f97d7fef703f SHA512 b07f14888a2acceb6240723d1800c45fad1aeda09e9721814648537c27449ce7788da07453d2d0c724d80d92116b7db27e0ba82b074f2e2f037b078522318f55
-EBUILD prusaslicer-2.5.2.ebuild 1986 BLAKE2B 6611a8156b70bc9d6acbb97dfe2f5b8299d21fdc130f704211015e3c7efd739dd4e6b89bf3cef0097af928a3c51d18c25ac652158a70138caf79f97d7fef703f SHA512 b07f14888a2acceb6240723d1800c45fad1aeda09e9721814648537c27449ce7788da07453d2d0c724d80d92116b7db27e0ba82b074f2e2f037b078522318f55
+EBUILD prusaslicer-2.5.2-r1.ebuild 2031 BLAKE2B 114c67724d9a6959dfe31488a3f0dc61cee98d21395339b2366dbf48f71ef418abb4211dbb9ed8060726e276da32e7172a49027d5de7042b03ff82093bf6b6a1 SHA512 3523e00815298c4591d7d2939bd1936318b4189df6003dfd8307549dca45e53934298ca698b8bc0dfc65c058d09c87bb7f071420636fe83e2169e0feb3253247
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch
new file mode 100644
index 000000000000..ae85057f10bd
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch
@@ -0,0 +1,76 @@
+diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
+index f8fc2e5a7..c74ee32dd 100644
+--- a/src/libslic3r/GCode.cpp
++++ b/src/libslic3r/GCode.cpp
+@@ -1551,27 +1551,27 @@ void GCode::process_layers(
+             }
+         });
+     const auto spiral_vase = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&spiral_vase = *this->m_spiral_vase](LayerResult in) -> LayerResult {
++        [spiral_vase = this->m_spiral_vase.get()](LayerResult in) -> LayerResult {
+             if (in.nop_layer_result)
+                 return in;
+ 
+-            spiral_vase.enable(in.spiral_vase_enable);
+-            return { spiral_vase.process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
++            spiral_vase->enable(in.spiral_vase_enable);
++            return { spiral_vase->process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
+         });
+     const auto pressure_equalizer = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) -> LayerResult {
+-            return pressure_equalizer.process_layer(std::move(in));
++        [pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult in) -> LayerResult {
++            return pressure_equalizer->process_layer(std::move(in));
+         });
+     const auto cooling = tbb::make_filter<LayerResult, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&cooling_buffer = *this->m_cooling_buffer](LayerResult in) -> std::string {
++        [cooling_buffer = this->m_cooling_buffer.get()](LayerResult in) -> std::string {
+              if (in.nop_layer_result)
+                 return in.gcode;
+ 
+-             return cooling_buffer.process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
++             return cooling_buffer->process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
+         });
+     const auto find_replace = tbb::make_filter<std::string, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&self = *this->m_find_replace](std::string s) -> std::string {
+-            return self.process_layer(std::move(s));
++        [find_replace = this->m_find_replace.get()](std::string s) -> std::string {
++            return find_replace->process_layer(std::move(s));
+         });
+     const auto output = tbb::make_filter<std::string, void>(slic3r_tbb_filtermode::serial_in_order,
+         [&output_stream](std::string s) { output_stream.write(s); }
+@@ -1633,25 +1633,25 @@ void GCode::process_layers(
+             }
+         });
+     const auto spiral_vase = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&spiral_vase = *this->m_spiral_vase](LayerResult in)->LayerResult {
++        [spiral_vase = this->m_spiral_vase.get()](LayerResult in)->LayerResult {
+             if (in.nop_layer_result)
+                 return in;
+-            spiral_vase.enable(in.spiral_vase_enable);
+-            return { spiral_vase.process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
++            spiral_vase->enable(in.spiral_vase_enable);
++            return { spiral_vase->process_layer(std::move(in.gcode)), in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
+         });
+     const auto pressure_equalizer = tbb::make_filter<LayerResult, LayerResult>(slic3r_tbb_filtermode::serial_in_order,
+-        [&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) -> LayerResult {
+-             return pressure_equalizer.process_layer(std::move(in));
++        [pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult in) -> LayerResult {
++             return pressure_equalizer->process_layer(std::move(in));
+         });
+     const auto cooling = tbb::make_filter<LayerResult, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&cooling_buffer = *this->m_cooling_buffer](LayerResult in)->std::string {
++        [cooling_buffer = this->m_cooling_buffer.get()](LayerResult in)->std::string {
+             if (in.nop_layer_result)
+                 return in.gcode;
+-            return cooling_buffer.process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
++            return cooling_buffer->process_layer(std::move(in.gcode), in.layer_id, in.cooling_buffer_flush);
+         });
+     const auto find_replace = tbb::make_filter<std::string, std::string>(slic3r_tbb_filtermode::serial_in_order,
+-        [&self = *this->m_find_replace](std::string s) -> std::string {
+-            return self.process_layer(std::move(s));
++        [find_replace = this->m_find_replace.get()](std::string s) -> std::string {
++            return find_replace->process_layer(std::move(s));
+         });
+     const auto output = tbb::make_filter<std::string, void>(slic3r_tbb_filtermode::serial_in_order,
+         [&output_stream](std::string s) { output_stream.write(s); }
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
deleted file mode 100644
index 65d30cb77442..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="$(ver_rs 3 -)"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/tbb:=
-	dev-libs/boost:=[nls]
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/gmp:=
-	dev-libs/mpfr:=
-	>=media-gfx/openvdb-8.2:=
-	net-misc/curl[adns]
-	media-libs/glew:0=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/qhull:=
-	sci-libs/libigl
-	sci-libs/nlopt
-	>=sci-libs/opencascade-7.6.2:=
-	>=sci-mathematics/cgal-5.0:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/opengl
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-	media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-	"${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
-	"${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
-src_prepare() {
-	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
-
-	sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
-		src/occt_wrapper/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	setup-wxwidgets
-
-	local mycmakeargs=(
-		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=ON
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_STATIC=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
index 09476833706a..e0a2d4fd7cfd 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
 	"${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
 	"${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch"
+	"${FILESDIR}/${PN}-2.5.2-fix-slicing.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild
deleted file mode 100644
index 09476833706a..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="$(ver_rs 3 -)"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-cpp/tbb:=
-	dev-libs/boost:=[nls]
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/gmp:=
-	dev-libs/mpfr:=
-	media-gfx/openvdb:=
-	net-misc/curl[adns]
-	media-libs/glew:0=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/qhull:=
-	sci-libs/libigl
-	sci-libs/nlopt
-	sci-libs/opencascade:=
-	sci-mathematics/cgal:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/opengl
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-	media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-	"${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
-	"${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
-	"${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
-src_prepare() {
-	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
-
-	sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
-		src/occt_wrapper/CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	CMAKE_BUILD_TYPE="Release"
-
-	setup-wxwidgets
-
-	local mycmakeargs=(
-		-DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB"
-
-		-DSLIC3R_BUILD_TESTS=$(usex test)
-		-DSLIC3R_FHS=ON
-		-DSLIC3R_GTK=3
-		-DSLIC3R_GUI=ON
-		-DSLIC3R_PCH=OFF
-		-DSLIC3R_STATIC=OFF
-		-DSLIC3R_WX_STABLE=ON
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}