gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 2 insertions, 153 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index c3f7de10156b..3216fac004b7 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,12 +1,8 @@
 AUX prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch 448 BLAKE2B 1d4a96762ed6da41e5f4322d6ac6019fb3894321da206ea354d1d9b57e1892155a109c329590bad4393cffd748f9e27542a7cc468803329c8f493789a2b497b1 SHA512 71a3eb2bbe3766be555e94f32219edfb908bdd5f86c74971c1c9b2586306d70724c45b06edbd4ade232017259fe4a99e504447cbbbdd5d5c91f4df03f4d52140
-AUX prusaslicer-2.6.0-libexpat-double-definition-fix.patch 636 BLAKE2B 047ea78be4b645790150c597e73df834cd77013f3f84f5823567318867c21746521f81582ad21e7c2db4d27e8e4e31b357a6160448ad306b5ee18a2a4efe90fe SHA512 e8bcd9db4d4cb895cebf7dd08e8f8428de7a845d802a1cd9cd6ca806450f5320dafe363bc5737203421ebe20f99110462e3ce4a16ee7c7d11be8222009be8dd4
 AUX prusaslicer-2.7.2-opencascade-7.8.0.patch 323 BLAKE2B ee422c91800bf164098396dab448630174b2dd5444d55ff176f10b73e660a446006a0dadfcd2d3cde715b8b58023fe10dd41f6bddb6165fb405382b256eebc52 SHA512 408897cc09ad58e9828b5645553f948a0e0e1b6b07c0bca7bb3ab37789bd988a7076c6d2c79d16ee198f16fdacc59d408ea759e969c83787b2f4bc1161dd94b0
-AUX prusaslicer-2.7.4-boost-1.85.patch 1060 BLAKE2B ea7970e19573f686a181b6e824ba1cccbdbefc339ed557e072169a5bff71b550ec61fa25f95d8cf0db91ce34ea3a4060c19f6c9621e1367564bd2bd04d90e815 SHA512 2e04a61ad5cd152ec26699bce5d81ceb9c59d2daca64a827902e99c536e8060461fbe442c79fb843025ca31e52f2db119dd4c03225c8dd46186001d9db888592
 AUX prusaslicer-2.8.0-fixed-linking.patch 751 BLAKE2B d0a5593a2559514f68df6798fb9c4e5c0b9c4021ece74281311c2a19b8233914fcb16227b7aafa5ee222d41ac82c4d5c9c363c32029d13c44c7fe2cb02e60291 SHA512 5f2fdc0da5d979b8520d302549f42103f7e9b0588165430aff734d7d50d56e98c8c208394d9bfaf82f042c9ecac7a3ae72713bfe18341f0ba184cf313cec9206
 AUX prusaslicer-2.8.0-missing-includes.patch 575 BLAKE2B aef794b75d180176f6ba4b1ec05e4ddfe740ced6000225ce51e3a15bd1143209a340af28dc91660d3f07696f19ad525ef86f5e84f3ff4c96ad77c90940059352 SHA512 65c2c8a2046bf39a9d0f5c073998ec93906efbeb8b2d3b7d835f1a65b2edc00c473fb2bed7396e35e45d00b9420f3942f2e16af2e2c6a1405e90341e41b16cf2
-DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69 SHA512 fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b
 DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937
-EBUILD prusaslicer-2.7.4.ebuild 2243 BLAKE2B f43117ea21eea84e3d853d5fed92c3f29386eaf988b06152726888fae7588e54c67e14536a1039829a64d2ba6f1c73cdac011817b1268a848f6d1d943de19dce SHA512 9b9c9075f49b852857801a8da5227e005281fb866af795af9a2e98a86c66fba3ee946d1b684c334b3967d72ced8cf5a5e17365d07ca49d949ee7b0e3cece67e0
-EBUILD prusaslicer-2.8.0.ebuild 2358 BLAKE2B 45a962647acce9d291eb1e9f45d4944dbd639b3533ff984919449218904c80d950d87df0070e7c597c2464a5603f044a0bfe4d556d02f6fef6fb68b798bd6e13 SHA512 88a8cb03f6a11239ba038579300793fe1323d023fe81195ebf810b524aad5eec17b408ab6c1c05312a6c37ada80bd4eff03c72677323361a5fd89d1bad994d66
+EBUILD prusaslicer-2.8.0.ebuild 2357 BLAKE2B 8802ef58761fa6d220836b97d70b0205614cc1f13383f1a33b07ccc3f36c219c21b235e04a6c2a402494bedc25e5a5afaaaeb10da96a67958e9b260865caa244 SHA512 d1eb4f621f967675bf1b86855db2246010098820d8ba2a0474c6a388122cbff7cdda5ed10854b118f7ad069ff10564989cd0e4364ee679a6be0474b9d9f5e09f
 EBUILD prusaslicer-9999.ebuild 2358 BLAKE2B 45a962647acce9d291eb1e9f45d4944dbd639b3533ff984919449218904c80d950d87df0070e7c597c2464a5603f044a0bfe4d556d02f6fef6fb68b798bd6e13 SHA512 88a8cb03f6a11239ba038579300793fe1323d023fe81195ebf810b524aad5eec17b408ab6c1c05312a6c37ada80bd4eff03c72677323361a5fd89d1bad994d66
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
deleted file mode 100644
index 4a93da994bd7..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From fdae4a9817b01aacd70ab033dfac711af2acb61e Mon Sep 17 00:00:00 2001
-From: Malte kleine Piening <mkl.piening@gmail.com>
-Date: Tue, 18 Apr 2023 22:29:04 +0200
-Subject: [PATCH] fixed double definition of target libexpat described in #9581
-
---- a/cmake/modules/FindEXPAT.cmake
-+++ b/cmake/modules/FindEXPAT.cmake
-@@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND)
-     endif ()
- endif()
- 
--if (EXPAT_FOUND AND NOT TARGET EXPAT::EXPAT)
-+if (EXPAT_FOUND AND NOT (TARGET EXPAT::EXPAT OR TARGET expat::expat))
-     add_library(libexpat INTERFACE)
-     add_library(EXPAT::EXPAT ALIAS libexpat)
-     target_link_libraries(libexpat INTERFACE expat::expat)
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch
deleted file mode 100644
index 4ccaff8f6b17..000000000000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Snapshot.cpp
-+++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Snapshot.cpp
-@@ -12,6 +12,7 @@
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/property_tree/ptree_fwd.hpp>
- #include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/directory.hpp>
- #include <boost/log/trivial.hpp>
- 
- #include "libslic3r/PresetBundle.hpp"
---- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Version.cpp
-+++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Version.cpp
-@@ -7,6 +7,7 @@
- #include <cctype>
- 
- #include <boost/filesystem/operations.hpp>
-+#include <boost/filesystem/directory.hpp>
- #include <boost/nowide/fstream.hpp>
- 
- #include "libslic3r/libslic3r.h"
---- PrusaSlicer-version_2.7.4.old/src/slic3r/GUI/RemovableDriveManager.cpp
-+++ PrusaSlicer-version_2.7.4/src/slic3r/GUI/RemovableDriveManager.cpp
-@@ -35,7 +35,6 @@
- #include <pwd.h>
- #include <boost/filesystem.hpp>
- #include <boost/system/error_code.hpp>
--#include <boost/filesystem/convenience.hpp>
- #include <boost/process.hpp>
- #endif
- 
diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
deleted file mode 100644
index 3745d41a4e8d..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-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"
-
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( 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:=
-	media-gfx/libbgcode
-	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-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
-	media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
-	media-libs/qhull[static-libs]
-	test? ( =dev-cpp/catch-2* )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
-	"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-	"${FILESDIR}/${PN}-2.7.4-boost-1.85.patch"
-)
-
-src_prepare() {
-	if has_version ">=sci-libs/opencascade-7.8.0"; then
-		eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"
-	fi
-
-	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
-}
-
-src_test() {
-	CMAKE_SKIP_TESTS=(
-		"^libslic3r_tests$"
-	)
-	cmake_src_test
-}
diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
index 2bb72a7c183f..ed23b287f530 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git"
 else
 	SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 	S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 fi