gentoo resync : 15.06.2021

4 files changed, 116 insertions, 1 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index da77ca5c7bf0..93b76e674b4e 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,4 +1,7 @@
 AUX prusaslicer-2.3.0-miniz-zip-header.patch 284 BLAKE2B f73db5727dd6bffc39c658a291602ee6d86609244e9cd55a9eeb92a376cc4a579a94ef9f423e3072dbd01295b173c9291d615a56d5fb512cdccc93b205f665d0 SHA512 36e3c1e5d35f6cda26d8f74db3862cc5206478f7f79f35b28b3b3749291150764d1d907a3ccb67b4dcd1872fa5d0ac612791653dc67f3a56aeb98b68dc873f27
+AUX prusaslicer-2.3.1-gcc11-missing-include.patch 740 BLAKE2B 162981c4ddf74bf55f27adebc8603892da97e60eecc085649d508abf06731969643d0a043e275f8978318b9e2c2603557e03529f8017030da4503a71f5c60171 SHA512 bb7067b20ad07ca4aaa5a20583e8399d61f4e7ca2e9a04fda7bd8929e0b51aa908bfe7a546e82f1d688f2853d14f3c961c65296608aa2e14ccfa6c5e4d8f6a19
 DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7 SHA512 2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d
+DIST prusaslicer-2.3.1.tar.gz 39583385 BLAKE2B 0d0fa11d21ec3cc0decb2708a1b1866bbe0ec5719236433ef87807541ada8abc67091f219392a1ae21b4f35c3821dde94bfd6dac72ec6617c40b7fda05cfc082 SHA512 2722ee9d5331fe03423ce179cec68196320b48c65bd3c6795b93469268956fb309609462cc62bf3e2b4f30d2fe720d0a28a16c010993737c045d82956493a1e3
 EBUILD prusaslicer-2.3.0.ebuild 1812 BLAKE2B 1d34a7cd0dd5fcb40dce9d8fcab86d8b643722a8ebe4810ce0b83172304d2a8aaaea76ed8a6077ed30dab134152294ff42b54476b401b5482691beb41bc8aeb8 SHA512 df62be529a5b69d88e44ac219e6a5e9a51738509f4946397aa7771a29a544aeb9bca84213525c5f6540de3649f5742ce759d2d5303783b2e9f7a70e7f6921997
-MISC metadata.xml 964 BLAKE2B fd4b95e2725a37291f9d7f39aaf75d34068789960c27d6180e809c33b9624507dc5abdb16d125eee88acffbdb424bb949751a86da6475747ef658913b0f6dc44 SHA512 27a581c15d36f0514183f663a645198feed74856c8a9eef7dc8d7c7f460bbaa89f5a5e7c4b8884d400346baffcde66b8f9552d4204f17b7ac905e9f06100b762
+EBUILD prusaslicer-2.3.1.ebuild 1874 BLAKE2B cc4ad8722898304d4ae600bcea5b2b9475da8b551bc2128a28e60782fc43d5f097cb068a12cbfef32066ecdaf1bfff75c0b5b2bce515c328c8e03101904439d4 SHA512 dfddeb8cb85d2deb6c4726ba1b7b4a10b9ee4bedd3846eaf8d5bca52b08f91aaf49481c728af6b9ae6b4c622bba67fb9cb3479a32c34492d249cc3c29f64af09
+MISC metadata.xml 1027 BLAKE2B 8a247ceabac85b67484df3c9853225f1cb7d1dcff13c2069a4d37578a741f3cb0d4c181d05eb910147a79e969f3042eeb7de9dec03a9a8f69ffe9e5975c55656 SHA512 e9d281340a7aeeb0e5f0e8fef26e71a1abaac2033322a3e0a778d0852dc0aa8ea01bd34dba653c5f143a8259ce36ad968f9969d57c86ee3546f8c3c37802bf51
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch b/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch
new file mode 100644
index 000000000000..6480277bde64
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.3.1-gcc11-missing-include.patch
@@ -0,0 +1,24 @@
+https://github.com/prusa3d/PrusaSlicer/commit/62592ca
+https://bugs.gentoo.org/788196
+
+From 62592cab48cfb6a20d84041b1992aecc6a2b659c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com>
+Date: Sat, 1 May 2021 22:33:59 +0200
+Subject: [PATCH] Added missing include (GCC 11.1)
+
+---
+ src/libslic3r/Optimize/Optimizer.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libslic3r/Optimize/Optimizer.hpp b/src/libslic3r/Optimize/Optimizer.hpp
+index 05191eba26..8ae55c61c5 100644
+--- a/src/libslic3r/Optimize/Optimizer.hpp
++++ b/src/libslic3r/Optimize/Optimizer.hpp
+@@ -8,6 +8,7 @@
+ #include <functional>
+ #include <limits>
+ #include <cassert>
++#include <optional>
+ 
+ namespace Slic3r { namespace opt {
+ 
diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml
index dd17dbe10ea6..32e35320f53f 100644
--- a/media-gfx/prusaslicer/metadata.xml
+++ b/media-gfx/prusaslicer/metadata.xml
@@ -16,6 +16,7 @@
 	<upstream>
 		<bugs-to>https://github.com/prusa3d/PrusaSlicer/issues</bugs-to>
 		<doc>https://help.prusa3d.com/en/article/general-info_1910</doc>
+		<remote-id type="cpe">cpe:/a:prusa3d:prusaslicer</remote-id>
 		<remote-id type="github">prusa3d/PrusaSlicer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild
new file mode 100644
index 000000000000..cc29c97ae4a3
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.3.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+MY_PN="PrusaSlicer"
+
+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/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui test"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/tbb
+	>=dev-libs/boost-1.73.0:=[nls,threads]
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/gmp:=
+	>=dev-libs/miniz-2.1.0-r2
+	dev-libs/mpfr:=
+	>=media-gfx/openvdb-5.0.0
+	media-libs/ilmbase:=
+	media-libs/libpng:0=
+	media-libs/qhull:=
+	sci-libs/libigl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-5.0:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	gui? (
+		dev-libs/glib:2
+		media-libs/glew:0=
+		net-misc/curl
+		virtual/glu
+		virtual/opengl
+		x11-libs/gtk+:3
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)
+"
+DEPEND="${RDEPEND}
+	media-libs/qhull[static-libs]
+"
+
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.0-miniz-zip-header.patch"
+	"${FILESDIR}/${PN}-2.3.1-gcc11-missing-include.patch"
+)
+
+src_configure() {
+	use gui && setup-wxwidgets
+
+	local mycmakeargs=(
+		-DSLIC3R_BUILD_TESTS=$(usex test)
+		-DSLIC3R_FHS=ON
+		-DSLIC3R_GTK=3
+		-DSLIC3R_GUI=$(usex gui)
+		-DSLIC3R_PCH=OFF
+		-DSLIC3R_WX_STABLE=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use gui; then
+		newicon -s 128 resources/icons/PrusaSlicer_128px.png PrusaSlicer.png
+		newicon -s 128 resources/icons/PrusaSlicer-gcodeviewer_128px.png PrusaSlicer-gcodeviewer.png
+		domenu src/platform/unix/Prusa{Slicer,Gcodeviewer}.desktop
+	fi
+}