From b0e349541a80b9582fd335d25589b8fe60ee6a41 Mon Sep 17 00:00:00 2001
From: haarp <main.haarp@gmail.com>
Date: Thu, 9 Jul 2020 11:46:01 +0200
Subject: Fix Prusa-Slicer with GCC 10 (thanks, Argil)

Signed-off-by: haarp <main.haarp@gmail.com>
---
 media-gfx/prusa-slicer/Manifest                    |  2 +-
 .../prusa-slicer/prusa-slicer-2.2.0-r1.ebuild      | 67 ++++++++++++++++++++++
 media-gfx/prusa-slicer/prusa-slicer-2.2.0.ebuild   | 67 ----------------------
 3 files changed, 68 insertions(+), 68 deletions(-)
 create mode 100644 media-gfx/prusa-slicer/prusa-slicer-2.2.0-r1.ebuild
 delete mode 100644 media-gfx/prusa-slicer/prusa-slicer-2.2.0.ebuild

diff --git a/media-gfx/prusa-slicer/Manifest b/media-gfx/prusa-slicer/Manifest
index 1c7903f..1fe393d 100644
--- a/media-gfx/prusa-slicer/Manifest
+++ b/media-gfx/prusa-slicer/Manifest
@@ -1,3 +1,3 @@
 DIST prusa-slicer-2.2.0.tar.gz 30811929 BLAKE2B cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5 SHA512 5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
-EBUILD prusa-slicer-2.2.0.ebuild 1606 BLAKE2B 729c64d9bec2a943d9ebaf81f1a2bf5f386f67c7177fe458ea08d19409d9b78a52431470ed58d6f4cb421e3e4a42dd0627145d4d84448aa957745ba629ce8142 SHA512 eb8844245442dc8e39ea796225bb4f2bd5453f558a182511600efc69ae3dd50d9dc48b926e8ee441d3647915a64125ce29558dc7d12f3e579079df0a90b90a26
+EBUILD prusa-slicer-2.2.0-r1.ebuild 1612 BLAKE2B 6039e6314103fb4e73f14d66b068617671f77d0935e174326bad413d82b8ddb12171d0113af043f94e06434e7f10adb3b8abc6d3b12ad49a86e01d7d13b5dbe2 SHA512 a309a6d36a1681c83a41ad70e030fc9d03c9d268970ef101aa960f9b5ef23971e3cf785daa149813187f0d740706bd3bae31f42cef5b6cd15149fa25d19572b5
 MISC metadata.xml 203 BLAKE2B c6e21b67977c25397c014c8a709a0568bef0d455dbad7aa9787c63895c9dac8e1405522bc1dc82745b18d37f48d01a822ca29880ea374c895446dfba5c33d9cc SHA512 05b7902daead1819658dd3c1b9539056a410ed454703125399504ef2816dced3dfb606894ada0ca325da3e149f845078fefa21af4fb24e9d224d93813d66e68e
diff --git a/media-gfx/prusa-slicer/prusa-slicer-2.2.0-r1.ebuild b/media-gfx/prusa-slicer/prusa-slicer-2.2.0-r1.ebuild
new file mode 100644
index 0000000..bbd5ac4
--- /dev/null
+++ b/media-gfx/prusa-slicer/prusa-slicer-2.2.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop perl-module cmake-utils
+
+DESCRIPTION="G-code generator for 3D printers"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
+SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/version_${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gui test"
+
+RDEPEND="!media-gfx/slic3r
+	>=dev-libs/boost-1.55[threads]
+	dev-cpp/eigen
+	dev-cpp/gtest
+	>=dev-cpp/tbb-2020.2
+	dev-libs/cereal
+	dev-libs/expat
+	dev-libs/openssl
+	>=media-gfx/openvdb-5.0[-abi4-compat]
+	media-libs/glew
+	net-misc/curl
+	sci-libs/nlopt
+	>=sci-mathematics/cgal-4.14
+	x11-libs/wxGTK:3.0-gtk3"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/PrusaSlicer-version_${PV/_/-}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DSLIC3R_WX_STABLE=1
+		-DSLIC3R_GUI=$(usex gui 1 0)
+		-DSLIC3R_FHS=1
+		-DSLIC3R_STATIC=0
+		-DSLIC3R_GTK=3
+		-DSLIC3R_PERL_XS=0
+		-DSLIC3R_BUILD_SANDBOXES=0
+		-DSLIC3R_BUILD_TESTS=$(usex test 1 0)
+		-DSLIC3R_PCH=0
+		-DOPENVDB_ABI_VERSION_NUMBER=5
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	perl-module_src_test
+	pushd .. || die
+	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
+	popd || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dosym "/usr/share/PrusaSlicer/icons/PrusaSlicer_192px.png" \
+		"/usr/share/pixmaps/prusa-slicer.png"
+
+	make_desktop_entry "prusa-slicer %F" "PrusaSlicer" "prusa-slicer" \
+		"Graphics;3DGraphics;Engineering;Development" \
+		"MimeType=model/stl;application/xml;application/prs.wavefront-obj;application/vnd.ms-3mfdocument;"
+}
diff --git a/media-gfx/prusa-slicer/prusa-slicer-2.2.0.ebuild b/media-gfx/prusa-slicer/prusa-slicer-2.2.0.ebuild
deleted file mode 100644
index c6018bf..0000000
--- a/media-gfx/prusa-slicer/prusa-slicer-2.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop perl-module cmake-utils
-
-DESCRIPTION="G-code generator for 3D printers"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/"
-SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/version_${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gui test"
-
-RDEPEND="!media-gfx/slic3r
-	>=dev-libs/boost-1.55[threads]
-	dev-cpp/eigen
-	dev-cpp/gtest
-	dev-cpp/tbb
-	dev-libs/cereal
-	dev-libs/expat
-	dev-libs/openssl
-	>=media-gfx/openvdb-5.0[-abi4-compat]
-	media-libs/glew
-	net-misc/curl
-	sci-libs/nlopt
-	>=sci-mathematics/cgal-4.14
-	x11-libs/wxGTK:3.0-gtk3"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/PrusaSlicer-version_${PV/_/-}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSLIC3R_WX_STABLE=1
-		-DSLIC3R_GUI=$(usex gui 1 0)
-		-DSLIC3R_FHS=1
-		-DSLIC3R_STATIC=0
-		-DSLIC3R_GTK=3
-		-DSLIC3R_PERL_XS=0
-		-DSLIC3R_BUILD_SANDBOXES=0
-		-DSLIC3R_BUILD_TESTS=$(usex test 1 0)
-		-DSLIC3R_PCH=0
-		-DOPENVDB_ABI_VERSION_NUMBER=5
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	perl-module_src_test
-	pushd .. || die
-	prove -Ixs/blib/arch -Ixs/blib/lib/ t/ || die "Tests failed"
-	popd || die
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dosym "/usr/share/PrusaSlicer/icons/PrusaSlicer_192px.png" \
-		"/usr/share/pixmaps/prusa-slicer.png"
-
-	make_desktop_entry "prusa-slicer %F" "PrusaSlicer" "prusa-slicer" \
-		"Graphics;3DGraphics;Engineering;Development" \
-		"MimeType=model/stl;application/xml;application/prs.wavefront-obj;application/vnd.ms-3mfdocument;"
-}
-- 
cgit v1.2.3-18-g5258