gentoo resync : 30.10.2021

3 files changed, 8 insertions, 91 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 598db73d6ebf..28f383685048 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,7 +1,5 @@
 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.1.tar.gz 39583385 BLAKE2B 0d0fa11d21ec3cc0decb2708a1b1866bbe0ec5719236433ef87807541ada8abc67091f219392a1ae21b4f35c3821dde94bfd6dac72ec6617c40b7fda05cfc082 SHA512 2722ee9d5331fe03423ce179cec68196320b48c65bd3c6795b93469268956fb309609462cc62bf3e2b4f30d2fe720d0a28a16c010993737c045d82956493a1e3
 DIST prusaslicer-2.3.3.tar.gz 40659538 BLAKE2B 1e1a1f7aeb34934bab03410e004a91e5ed76aaf930ff59e5b373b2e229018b6703d8da8ee7ab9085be25c5b3ce4ef39aeb38204336400867fac4a55f52c76bd4 SHA512 1f6b97e135202ad9de8f0bb212239ce2497de4205ea32f860b483473fb1f1783451d539a67cd97ef31f512a797b29c1067a1eff4134ea4a29b6218e5757657e2
-EBUILD prusaslicer-2.3.1-r1.ebuild 1877 BLAKE2B 7a0cb2b523c099df7897d98731e3af3382307909579ea317fbd9866d25dbebeded59847e4e2596e59213074f081cecb662b65352a44497078ec0f72af20da5ca SHA512 7b1e130b1d9ff7f33a1d3571ebdadd6503a7af5d4b2ae00cb2b73eac73aa15f3a9155d68cd948d2b475dc533fabca03a64297513043359f9449cf0944b4d2819
-EBUILD prusaslicer-2.3.3.ebuild 1822 BLAKE2B b09f101fc6f16eed0e514951d42109eaaaba22810c50da2b1844db52dce85b9f0d802293bac4321e94f19b3c92aa699f65fc2e1cc2073572b26df6ad23327898 SHA512 6a2bd537e22888e96ee6f9762357482c872a90a65e042f70eb78aff57d7055fc8359369429fe754b8dda1a256092bc0d3c82c16b2392c0114ee3e5b5e621d5cf
+EBUILD prusaslicer-2.3.3-r1.ebuild 2051 BLAKE2B 4c988b531112c3dbc85b8b99c56069cf5076748f53f559cd456b8f69e1669e9f111f1e08d8690be6ea50c3fae41c766016c061bc98dbe98ff07c0a1391da07b5 SHA512 0b9c8458dfe3e358d7e8fe312ecbc1c1053da41f638159d5cd006f27ffdfc45c858ea5296129f508c28d9f8a42be99fe0352743fe1591fcf9ad6ef21ca6c8538
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild
index a023437a8056..7ce3bc36f884 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.3.1-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.3.3-r1.ebuild
@@ -22,9 +22,10 @@ IUSE="gui test"
 REQUIRED_USE="test? ( gui )"
 RESTRICT="!test? ( test )"
 
+# Please check if works with newer TBB on next release, bug #820785
 RDEPEND="
 	dev-cpp/eigen:3
-	dev-cpp/tbb
+	<dev-cpp/tbb-2021.4.0:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
@@ -58,9 +59,13 @@ 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_prepare() {
+	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	use gui && setup-wxwidgets
 
diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.3.ebuild b/media-gfx/prusaslicer/prusaslicer-2.3.3.ebuild
deleted file mode 100644
index dd741d4ed3c7..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.3.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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"
-)
-
-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
-}