gentoo resync : 29.12.2022

5 files changed, 12 insertions, 190 deletions

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 7e9b006d7712..db23bbb64c86 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,11 +1,7 @@
 AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 AUX prusaslicer-boost-1.79.0-fixes.patch 1981 BLAKE2B de0f36edfa3d740ce2c5e3470e4ca7402f6b563ef06af098ac1249538b75652579cbf76629c4c5e2bbf3d5a147a81e1ff709fbd78ea390649a86d7f7d30d326c SHA512 67c16680c34c34fc9cbfb174b005e0dd95a72132f2afd33dda693698a30c5616046b2e503d27658320cc63fdff3fe2ca6bb9458d461a2394a58824eca6d304b7
-DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47 SHA512 e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
-DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7 SHA512 895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
-DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545 SHA512 d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
-DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477 SHA512 bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72
-EBUILD prusaslicer-2.4.0-r2.ebuild 1676 BLAKE2B 596d5acea9300e6245f4d0879175c492f13485f2a6c5108d1b35a3e9b6b65867b6c7fb417c315aaea3f0661fd3e172fbd25fa5098f6612a7bb040af17502a12f SHA512 b7dba08d44dc5a3e835ec1376faf904a8c6f4c1f7b8f9a81979719766e4353305967bf4bb895973b8a258fe032ef4a57f2f7e1b56b3d47154d42ba03daf1b0b0
-EBUILD prusaslicer-2.4.1.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
-EBUILD prusaslicer-2.4.2.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
-EBUILD prusaslicer-2.4.2_p20220506.ebuild 1608 BLAKE2B ca2c8c6174367d3366fafb3955214f0cc9fe3ad3fe59c4debe448d145ca44b2d3a2beb7c1cfa0d6a668349f71ef0a1440ff2be42425661585e88f4a1683bc1e5 SHA512 15180ca71f9ece0782993b9f527fb4742349f40d7fdd3aaed53585e5e0ed806a0dfa799fc8a24472656b6cb3214af0b264b3340125eccc2f2c20d587e1d4aa80
+DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c SHA512 d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8
+DIST prusaslicer-2.6.0_pre20220620.tar.xz 29309256 BLAKE2B 2b2dda3f1efa05e674574812b50773b0f6c6d0c1dcfa0095deab7b80e62c5ed9f5837bc6141993ed41bcf985c598c11cf2741e17623309dbf8d7612c7af24a50 SHA512 7ad510b1e0db1774500049b76547e73b62976be897d47d118844c996939f843c9c0699c96bdf9569992a4d170a900e302566aa45ec8abee9ee4742104fb5deea
+EBUILD prusaslicer-2.6.0_pre20220601-r1.ebuild 1526 BLAKE2B 68ffb49148f127247181e19988ae2282cf4ee8a5248b82362d8ec78534d26eaaeac7b534ea759767e9ab3bf25f68ec874dcbc99b9957a32b93b4fda749ff8dbb SHA512 cfff97180e3671d61849c886439c177be54a7f81b5eaae409a2cdfe53def605fb5dfc0a47ed590171b3beddd2d41d2474e183ca661896a1862806894376dae0f
+EBUILD prusaslicer-2.6.0_pre20220620-r1.ebuild 1519 BLAKE2B b40bfaa144fd09074774948fa8f4f867f3a7982a0eda7b95afeb8ed8ee016aba50b15d8382e6289a601ad3e043919bd2b07ce201db4e6f0b5ac8906ecca777fa SHA512 f6660bf0359ace72ab413b546efdd5c0b7ed55dc38070aa1203bd917fa7dfa3605f0fe29fa8004ff2ed7e996d2fd639d64beece96d5a7371708e5e9987ce0b74
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
deleted file mode 100644
index 6965a84a96a9..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,82 +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"
-
-inherit cmake desktop wxwidgets xdg
-
-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="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	>=dev-cpp/tbb-2021.4.0:=
-	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
-	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
-	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}"/${P}-fix-build-with-cereal-1.3.1.patch
-)
-
-S="${WORKDIR}/${MY_PN}-version_${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.4.2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
deleted file mode 100644
index c402f1a876fd..000000000000
--- a/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
+++ /dev/null
@@ -1,82 +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"
-
-inherit cmake desktop wxwidgets xdg
-
-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="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-cpp/eigen:3
-	>=dev-cpp/tbb-2021.4.0:=
-	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
-	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
-	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
-)
-
-S="${WORKDIR}/${MY_PN}-version_${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.4.2_p20220506.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
index 26052c4ee910..e1175d1591a4 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
@@ -13,14 +13,14 @@ SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	>=dev-cpp/tbb-2021.4.0:=
+	dev-cpp/tbb:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
@@ -47,10 +47,6 @@ DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-boost-1.79.0-fixes.patch
-)
-
 S="${WORKDIR}"
 
 src_prepare() {
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
index c402f1a876fd..e90d15a4423e 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
@@ -5,24 +5,22 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit cmake desktop wxwidgets xdg
-
-MY_PN="PrusaSlicer"
+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/${MY_PN}/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
 	dev-cpp/eigen:3
-	>=dev-cpp/tbb-2021.4.0:=
+	dev-cpp/tbb:=
 	>=dev-libs/boost-1.73.0:=[nls,threads(+)]
 	dev-libs/cereal
 	dev-libs/expat
@@ -49,11 +47,7 @@ DEPEND="${RDEPEND}
 	media-libs/qhull[static-libs]
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
-)
-
-S="${WORKDIR}/${MY_PN}-version_${PV}"
+S="${WORKDIR}"
 
 src_prepare() {
 	sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die