gentoo auto-resync : 31:01:2023 - 03:00:52

4 files changed, 5 insertions, 178 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index d20a68d5cf20..70003a4bd850 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -4,10 +4,6 @@ AUX prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch 2581 BLAKE2B
 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
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431 SHA512 b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
-DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e SHA512 8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
-DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e SHA512 94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3
 EBUILD prusaslicer-2.5.0-r1.ebuild 2003 BLAKE2B c865dbecdfbeeb17aedd89266db7edc044c4a2c3b436bc294f766775f3dcfb00c685ee0ba9f0c5a0957cfeb04bdba07126dbf0c8fa0e528b7702b9a17e27a56c SHA512 3e6b41cf9b37fc61d96a55f0d1176d2cd8948429f2eb1c263eac318dc27abfdca91a2878ce102efccf744e51311f6fafc6d52b3cd4df8f48f0378ea684c1931b
-EBUILD prusaslicer-2.5.0.ebuild 1931 BLAKE2B 67b03ef80e8e02af21cd35768005399a83b93393f5a293e360126e609d29ebcaa7714d86a9d987d3e530335d0b39bd3105d719d5dabd041cf01c224063833cd8 SHA512 ee47e592dbb317ef6539175e5727b26e3c8313234a26bf73acba65efe8a8860ac06b41737289b8f7171c71570b12d78ae9553688e7488dbe198eb03cdb2f1ff9
-EBUILD prusaslicer-2.5.0_alpha2-r1.ebuild 1732 BLAKE2B bae5a2fbc6649c0e7508e51af3626273bac81d0ebb59feec20163bf71bf13e4a6a78d8c2dfd04d0b1e07544b05d70fb56dfd59c72ea50de4c0ae1b961134260e SHA512 df6f53be75ce105c990c4f8320646e5dfd9577aa08b0bcb04e90226138bc7ab69b7e3e9d22f805cb00153185cf23054a76a0c78d71266db4d65e6fa8bc766f29
-EBUILD prusaslicer-2.5.0_rc2.ebuild 1950 BLAKE2B acfa0d7285f0d7fdb878be0387a6f4c42a7a2472b532fa3921baf77885f63aab64d321f723d3d3af95b0365dcfac250967429babebc158eb8102b31af72d08e0 SHA512 e3653c4f6ea2dd06d63424bb656f043034ee74c46e3b5d47fc6f00e18f42761b9f6cd6240cda10e02eead03e479cb910142903109ba8bffa2b4fd5415ba48160
+EBUILD prusaslicer-2.5.0-r2.ebuild 2006 BLAKE2B 976d13d1bc0d421e25ddfe0efab831d696cb80aa4a09e55e0ba93d75f725b6a68353a3a1b38a6d695518c5cd3284e57b19be388780bb508551711aca759ecc50 SHA512 0c7ca19005f272dc89e2a29c5a147984b9b9857fbbab2ee19b1442aef06ec7e1095a15fa041c42fe7e14a35458fca21293e9f2e8f0defdc8cd465087963fcddd
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
index 0340bc2f5bbe..65d30cb77442 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"
@@ -37,7 +37,7 @@ RDEPEND="
 	media-libs/qhull:=
 	sci-libs/libigl
 	sci-libs/nlopt
-	=sci-libs/opencascade-7.6*:=
+	>=sci-libs/opencascade-7.6.2:=
 	>=sci-mathematics/cgal-5.0:=
 	sys-apps/dbus
 	sys-libs/zlib:=
@@ -53,6 +53,7 @@ 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}"
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
deleted file mode 100644
index fb35f87e8787..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 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="${PV//_/-}"
-
-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_2.5.0-alpha2.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:=
-	dev-libs/imath:=
-	>=media-gfx/openvdb-8.2:=
-	net-misc/curl[adns]
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/qhull:=
-	sci-libs/libigl
-	sci-libs/nlopt
-	>=sci-mathematics/cgal-5.0:=
-	sys-apps/dbus
-	sys-libs/zlib:=
-	virtual/glu
-	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.4.0-fix-build-with-cereal-1.3.1.patch"
-	"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.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
-	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.0_rc2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild
deleted file mode 100644
index fa1e70770d8a..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 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/"FastSweepingDomain
-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*:=
-	>=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"
-)
-
-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
-}