gentoo auto-resync : 29:08:2022 - 10:46:12

10 files changed, 138 insertions, 79 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 645b7e1cb216..b833a2e26c14 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/jp2a/Manifest b/media-gfx/jp2a/Manifest
index aacbcacceefa..5ba69ded40cb 100644
--- a/media-gfx/jp2a/Manifest
+++ b/media-gfx/jp2a/Manifest
@@ -1,5 +1,3 @@
-DIST jp2a-1.0.6.tar.bz2 306975 BLAKE2B 284925e791423a1871347f8dfc9574c209192c8a583a0b3221142adb35ad32c2d00a47412c85df038237f4e1adf604324fb15440c33ca06290ee382fd90930ff SHA512 00c7f7b62a3d1f4238d7513167eebd6ead9447ac90b66fd3f9529f6e99dd1a021385ff970aabd005a88db1614636be57547494dfe00c7e687a11953066a6ecce
 DIST jp2a-1.1.1.tar.gz 628052 BLAKE2B 7f999ff1c7f32b02007a8d0a2d5f1aed4d77a3e9ed6711566faf0169e8d0eb842b3b118c36671a98abd8ccbad100eace4f1053b6dc795071f30e70052488f141 SHA512 898141c4b2847049cc312995a4b18d0de3f62bf9cf5c45050df01007de42486c706ab4b63a30f13828807d7bf01680a0e391304d03ba2087a481d86668773dba
-EBUILD jp2a-1.0.6-r1.ebuild 526 BLAKE2B a160c878c48b3cad1f39de403b5bdb1287af5eb913a66bc8be06d52a906ba44d038595a4b4d242594eca23b3849209740dee6c9c7cf95c167b9a705b75562678 SHA512 01792bef0209bdd3c5f6161b29b0e421aa70eece0312ae7573f903d4b692cfd393f721b7b7dfb261e0b88335127c38b3b4f2c0c3074acf451015d9f54eb960d4
-EBUILD jp2a-1.1.1.ebuild 636 BLAKE2B a1ccb43941c58673e44aa403611de796b5ece9220d1e384b658fa2e221af2ded304e08efa3272493b3db0a6f8463260d0cfc277401d6428cdf7a6bcdf55c534a SHA512 3d1207ace3e9cb041ebae838ba9dc3da9d8dd65d8f6180ef9627c0d43ef40e71fb5ab3ff206511db26b5ea4f34dce782371fc7b1fdaa8867356924a8f9200252
+EBUILD jp2a-1.1.1.ebuild 634 BLAKE2B cd50b1dae411b391b64165ac68dac1b5bb397ca0f4097ed2855c0159e3b0ff46d11304af30bc5f707c22ea275d1a85f2eaec3296d2baa2995d5555f1ff86aafa SHA512 a7e518d3149925f6f40a08a68f06db2ed07d0b66d03f3f6fa819ce9c473dfb63f80861f3b3b545d4a52e38f5605ab25b533fdef5bd115e132f83460c28f1ba78
 MISC metadata.xml 249 BLAKE2B 2572acca810424ee1967a908498b907de468a9fb1765d7bc11a5d1c6aa81294d962a224d7777fecc997fb3220613350618fb7edc9e65b66e9e8dc4a8d31e6313 SHA512 b13e4520e6f7e18c5b925bff00c9711a98d8e773aba54fbe527d95ba97ccd0bd6b58f91f6b01ad92f106bb56f671261de55aacf796db0086e700d9fd40a0d842
diff --git a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild b/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
deleted file mode 100644
index 50869054faa0..000000000000
--- a/media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="JPEG image to ASCII art converter"
-HOMEPAGE="http://csl.sublevel3.org/jp2a/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
-IUSE="curl"
-
-RDEPEND="sys-libs/ncurses
-	virtual/jpeg
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( man/jp2a.html )
-
-src_configure() {
-	econf \
-		$(use_enable curl)
-}
diff --git a/media-gfx/jp2a/jp2a-1.1.1.ebuild b/media-gfx/jp2a/jp2a-1.1.1.ebuild
index 6e96d47ef711..b5d30e113fdf 100644
--- a/media-gfx/jp2a/jp2a-1.1.1.ebuild
+++ b/media-gfx/jp2a/jp2a-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
 IUSE="curl"
 
 # TODO: restore ncurses support?
diff --git a/media-gfx/propaganda/Manifest b/media-gfx/propaganda/Manifest
index 663625615faa..e77c8734829a 100644
--- a/media-gfx/propaganda/Manifest
+++ b/media-gfx/propaganda/Manifest
@@ -13,6 +13,5 @@ DIST Propaganda-Vol-09.tar.gz 1664869 BLAKE2B 48baf8efa75f18141a557e0f36a982232d
 DIST Propaganda-Vol-10.tar.gz 6376914 BLAKE2B 365e96616d8f82321fd0a0460e6b14e5db7b96942ffa49f193ac86bba76c2394fa451718e611e8697ccde3ff02a6ac649d0ea85a04fad76a940c3769418b9751 SHA512 080d563442050f1266d09fbb2148d14173555a213ce1fb110ce4aab2d85a18563543705227b1e68146dd2f1a5b1bb7cc75f9512f823a4970f92b55eb9251b1fd
 DIST Propaganda-Vol-11.tar.gz 3030910 BLAKE2B b5637635165557c079d7801b91a6b1d7372a7ac1ef1ba414d0cf172d652de779fb05f106f0ef7cabebac79bbc8a1b21cabde0f34a14735eca17ccb193ade0882 SHA512 752a3e27bfbde1f694be3f57e4c7bf638159f8e7b06c00c703a82ff2795625298feca20f91beecc651da66ac7b6dc5e7fcfc0b5d7b465118e94f8769488be1c7
 DIST Propaganda-Vol-12.tar.gz 3140955 BLAKE2B ce23e5e781bd1d1cba757bcee71df199627e18bb72eddd0a6dc5759f1d80fcefbb4daa6048450aa51f9b4830ece14461ef63a299e0c13d43a1670bc8b1a4b0fc SHA512 1cef61c88a4cbe4c757c05c1ecf2d72ab67ad13e0268497971f9a11047351d0a0e8770a69bd6754672b6a8c99e69a2e61693fb593bcfb4db7003cd9eddd31f80
-EBUILD propaganda-1.0-r1.ebuild 1200 BLAKE2B d0f29c2ef8d257b0d0bfe8d09926456a548d85cbadc8224ac90805e8788f4f75aa69af9991d603d40d4450ac7118c874f04f5cb7e80d04700e9fe0027ce1472d SHA512 b30d65a468330bcdadf91863bb41e6e36dba1957b2ecfc7a3199ad1921f1d0f2ce65114d01ebac86749f1c6c1e9ee3844af9c6822f4e5fb3cbb2cb0a929d934f
-EBUILD propaganda-1.0-r2.ebuild 1195 BLAKE2B be66603e2275966fd3844272d2fd6559a7f5833378837947cd66f5dde7b4e3709b8b47a335cbeda52df8a784eec77da997d2924fd7bd7181d1b8788d2e28d740 SHA512 30934ea7bcfb5253a988b4acf95df3b0c701301b4209084bc7e392c561b64d0a2c0955cbdcc4dff0d0a6c5b693081318f2838a8c0ce531554f201af3c8b74ebc
+EBUILD propaganda-1.0-r2.ebuild 1193 BLAKE2B 65381680ceb891d293a50aeac62685cdd259a3513cfe5049098b8ea627a547276f7d7f5e1b593a2ba2f75b8d25d642f37f4564143df0945b3466d4273e0c3196 SHA512 ec9564150e67af1623410be2ea8c601d4ca502719872c1cf266dba69e505249510f2a39379338b9f556523d5f0f4d800e2320125844e846944d4055044f92fe4
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-gfx/propaganda/propaganda-1.0-r1.ebuild b/media-gfx/propaganda/propaganda-1.0-r1.ebuild
deleted file mode 100644
index f683c1bd6279..000000000000
--- a/media-gfx/propaganda/propaganda-1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-S="${WORKDIR}/Propaganda"
-DESCRIPTION="Propaganda Volume 1-14 + E. Tiling images for your desktop"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SITE="https://dev.gentoo.org/~andrey_utkin/distfiles/"
-SRC_URI="${SITE}Propaganda-Vol-01.tar.gz
-	${SITE}Propaganda-Vol-02.tar.gz
-	${SITE}Propaganda-Vol-03.tar.gz
-	${SITE}Propaganda-Vol-04.tar.gz
-	${SITE}Propaganda-Vol-05.tar.gz
-	${SITE}Propaganda-Vol-06.tar.gz
-	${SITE}Propaganda-Vol-07.tar.gz
-	${SITE}Propaganda-Vol-08.tar.gz
-	${SITE}Propaganda-Vol-09.tar.gz
-	${SITE}Propaganda-Vol-10.tar.gz
-	${SITE}Propaganda-Vol-11.tar.gz
-	${SITE}Propaganda-Vol-12.tar.gz
-	${SITE}Propaganda-13.tar.gz
-	${SITE}Propaganda-14.tar.gz
-	${SITE}Propaganda-For-E.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-src_prepare() {
-	default
-
-	mv ../Propaganda-Vol-11 Vol11 || die
-	mv ../Propaganda-Vol-12 Vol12 || die
-
-	rename JPG jpg */*.JPG || die
-}
-
-src_install() {
-	dodoc README-PROPAGANDA
-
-	local VOLUME
-	for VOLUME in Vol* Propaganda-For-E; do
-		insinto "/usr/share/pixmaps/Propaganda/${VOLUME}"
-		doins "${VOLUME}"/*.jpg
-	done
-}
diff --git a/media-gfx/propaganda/propaganda-1.0-r2.ebuild b/media-gfx/propaganda/propaganda-1.0-r2.ebuild
index 77eaa13762f4..764db3933a3e 100644
--- a/media-gfx/propaganda/propaganda-1.0-r2.ebuild
+++ b/media-gfx/propaganda/propaganda-1.0-r2.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/Propaganda"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 src_prepare() {
 	default
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 89494c44eea6..52f94dc45df0 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,5 +1,8 @@
 AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 AUX prusaslicer-2.5.0_alpha2-boost-fixes.patch 3836 BLAKE2B 92bd4d4e43eceb67a1356552ee75431d05d61f5983986d109f6601b3fb86b195a39d18f26add58426fa535200af778864ff643a38d6771cb5e7de6a3a91f0192 SHA512 3a13e2e0fb0fd53571ea2b44403c810729b80c715a8fcaa5c596f680eb9c67e9f86c2194e09af4de54baa5bd95023b32f27cb475ccfe9ac71ea583b5ab02aba5
+AUX prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 1691 BLAKE2B e8886bdd4a22ac215203422cd9dcc88972d61fcd522f65506a206f23849204175bf56b537f9984bc82b38528b3f08ee9f62020ee0fcb817f237a6b1b33a11be5 SHA512 d8b32d653bc1a21bf12dd75449ee018f04063536d0a519409bf520913b8e89ef3acd185a5351ec7a1225188f2d669d1cfcaf9a2552c509689d24d605aac56209
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e SHA512 8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
+DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d SHA512 5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90
 EBUILD prusaslicer-2.5.0_alpha2-r1.ebuild 1752 BLAKE2B 439d0db2496b075d674bfa74e8284b347bdb170b1b1d0f60fda0ec40c9bb0c578d93bb2a2307e4f077b6b1820bdb5ad830ede7066ee96a5761eecae0f1b19db6 SHA512 2bfd12ae34d061a0c0f8545813361a980929e0997064307ec791ea8b33e0ea26800f975a5da672947c465e8f6fcce4c186ddd2280230b79eaa3f3430307e26e6
+EBUILD prusaslicer-2.5.0_rc1.ebuild 1748 BLAKE2B 29aed6919880bee74596c4b3fdf8f3dedbf37a734d4218a8857bff4618dc1eddc9f68eebf2d8047eaf6086c0406932f0342ba0a8eacfef422db6b846f3fea402 SHA512 d31946306e37652d027deaad4751fa47588d0fcc47b7b0e4aa3c97cbe4f248e5eb5b4dfad4b317cb1dd2ce120db5775347fab4326bcc2b697b0630a37e748a9e
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
new file mode 100644
index 000000000000..29e01422b41f
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -0,0 +1,48 @@
+--- a/src/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/src/CMakeLists.txt	(date 1661704655632)
+@@ -127,7 +127,7 @@
+     set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
+
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+--- a/src/slic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/src/slic3r/CMakeLists.txt	(date 1661704724566)
+@@ -260,7 +260,7 @@
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
+--- a/src/libslic3r/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/src/libslic3r/CMakeLists.txt	(date 1661704699199)
+@@ -395,7 +395,7 @@
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
++    cereal::cereal
+     libigl
+     miniz
+     boost_libs
+--- a/CMakeLists.txt	(revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
++++ b/CMakeLists.txt	(date 1661704556468)
+@@ -446,6 +446,12 @@
+
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++    target_link_libraries(libcereal INTERFACE cereal)
++else()
++    target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
new file mode 100644
index 000000000000..f99c7d8cc487
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
@@ -0,0 +1,83 @@
+# 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-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[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.5.0_alpha2-boost-fixes.patch"
+	"${FILESDIR}/${P}-cereal-1.3.1.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
+}