gentoo resync : 20.03.2022

4 files changed, 135 insertions, 6 deletions

diff --git a/media-gfx/mandelbulber/Manifest b/media-gfx/mandelbulber/Manifest
index d89b05ecebef..11ded73bf717 100644
--- a/media-gfx/mandelbulber/Manifest
+++ b/media-gfx/mandelbulber/Manifest
@@ -1,5 +1,7 @@
+AUX mandelbulber-2.26-openexr-3-imath.patch 951 BLAKE2B 0c8c7bca6d5ebdee799fb43b0a39912966554c0d62917bb1de0c92f628cec2d71b9acd26123a102d27f96aee22f2ffa4897edd0eb808798f4f31c2da3d66a5ae SHA512 17d907693ab54aaf60ce61e36616660f925e656bf05de1183cf7127f1c67ae62439a20faa7277a099611129a4dc6aaaba744f1c4bc0e76a1b7e6e03e0ce58b07
 DIST mandelbulber2-2.12-1.tar.gz 47092910 BLAKE2B 1e5ca64a4819052882bc7cdc047c6d755046f2ceebcf7b26db41511fde219aa523a3c6884f0667aed1365104c4502a6e6b1b2d7d40a4a024fdb5051d5ac13cd2 SHA512 5dc8dcaa45bc8747024ed16379cc4d622535099c925abf3c2aa01c0338fe8c1f272e6113b6bf28da6a4bb087e6d6e6a4c6634feca993d2c89f12b79582ff271c
 DIST mandelbulber2-2.26.tar.gz 113563064 BLAKE2B 6fd333a42f5e4b106b950079277ff1bb6cc2395382e12ea37424df137ed11cf5fb103185b325d9615bd890404fe596133644a5cdd3911140eabb2f8c0c1d0e14 SHA512 cc547cab6e2b672a35be5d3d214ad3b292eaf1b3b06daf12cecce0f69e612fcfb4123cd837fd87003eea3103086947639fd04cae4b0ed7cd231d78e5d775e299
-EBUILD mandelbulber-2.12-r1.ebuild 1698 BLAKE2B d0aa54f24759d1aee38d434d1e1fa73b36c6176ba917e5800bb28b871c2742c91bb2214070c58e44b69aa14a88383f90d7ea4356996cd44b30e2fdafbbd53bfe SHA512 17c92cd414b1dbbbfc371550bef8a3f4472805b40565e28563ac6fb11e336a02fa0c3ebe37a65a341540ca414086c616b2b537b43b62f022b36709a349093055
+EBUILD mandelbulber-2.12-r1.ebuild 1665 BLAKE2B 3177e407606884fef8231abbd645f3defa88693438d05a25e34f95656b0c5b2a35a4910fd668e69886e8870f3beed18b2c4e480c46449f22c048b9485cc87a0d SHA512 578355f308d9a58f3680272092349721dede622448ed87561de7ec7b26c0e8fbed39166c144acb433b1e194c735ebec8e6a99e5691120d49f07108b34d6a7fbd
+EBUILD mandelbulber-2.26-r1.ebuild 1975 BLAKE2B 1aee525c99fa0efbf96ef2908abd3b1e9db9e7215600c19bdfa5f7eb4bab58f224686557cd23fcc7c51ce457a506ff9ca547bde23715605ac04530e7b502df9a SHA512 a1ce3644a668490565f12ebfb15b92d0ff38461de2a992f260732fb5cef3b38961dadbc7caf03a8ad058a226949a8844b1cdb1a7d28a363725ca362cd15895bd
 EBUILD mandelbulber-2.26.ebuild 1924 BLAKE2B 86c47c6fce165f2b3bcb440fccdd83a9670cf270fc43e9e2e519206f34e3af1d638ffc12b4e6b21497b36105efc8479cc2d41917ea8835272d73394cb74e29ff SHA512 852bade0b1dd07e2a3d3c38a589495e0aac21af3ba613dfe2f4e8cf970daae42f462398c1a304d1920698225cb0f5c226b17a32861ffa4d670ca46dbaecc71da
 MISC metadata.xml 672 BLAKE2B 8b7d423df1cd3f405b43bbeea9f6de9438951cf55b2020016b3174376e5498f2bc903295afde6626bf342b77050210eec78db8672cf2555f344f12248f1e58be SHA512 4005cd3324e642b6ea382e992949c1a3f459cef6f6094eb896e58fbc5651cd1d88c6575ef76896673bd0589e46285d3df9858a110f9b4b4c867c797a329dee77
diff --git a/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch b/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch
new file mode 100644
index 000000000000..372b3e655536
--- /dev/null
+++ b/media-gfx/mandelbulber/files/mandelbulber-2.26-openexr-3-imath.patch
@@ -0,0 +1,32 @@
+https://github.com/buddhi1980/mandelbulber2/commit/4a90075d2ea3e7e3f1dd3430e6ba22b42d97b234.patch
+
+Slightly rebased.
+
+From 4a90075d2ea3e7e3f1dd3430e6ba22b42d97b234 Mon Sep 17 00:00:00 2001
+From: cagelight <cagelight@gmail.com>
+Date: Sat, 22 Jan 2022 00:13:52 -0500
+Subject: [PATCH] Upgrade build files for linking with OpenEXR 3
+
+---
+ mandelbulber2/qmake/common.pri     | 7 +++----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/mandelbulber2/qmake/common.pri b/mandelbulber2/qmake/common.pri
+index 2e579c5c1..17242e702 100644
+--- a/makefiles/common.pri
++++ b/makefiles/common.pri
+@@ -26,11 +26,10 @@ qtHaveModule(gamepad){
+ 	message("Use QtGamepad module")
+ }
+ 
+-packagesExist(IlmBase){
+-	PKGCONFIG += IlmBase
+-	LIBS += -lIlmImf -lHalf
++packagesExist(OpenEXR){
++	PKGCONFIG += OpenEXR
+ 	DEFINES += USE_EXR
+-	message("Use IlmBase library for EXR files")
++	message("Use OpenEXR libraries for EXR files")
+ }
+ 
+ packagesExist(libtiff-4){
diff --git a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
index b50cfb100e6b..ae92b8fde4b8 100644
--- a/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
+++ b/media-gfx/mandelbulber/mandelbulber-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,7 @@ inherit desktop qmake-utils xdg-utils
 DESCRIPTION="Tool to render 3D fractals"
 HOMEPAGE="https://www.mandelbulber.com"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="CC-BY-4.0 GPL-3"
 SLOT="0"
@@ -40,8 +41,6 @@ DEPEND="${RDEPEND}
 	dev-qt/designer:5
 "
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	default
 
@@ -69,8 +68,7 @@ src_install() {
 	insinto /usr/share/${PN}2
 	doins -r usr/share/${PN}2/*
 
-	insinto /usr/share/applications
-	doins ${PN}2.desktop
+	domenu ${PN}2.desktop
 
 	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
 }
diff --git a/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild b/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild
new file mode 100644
index 000000000000..ae58d3bf6c72
--- /dev/null
+++ b/media-gfx/mandelbulber/mandelbulber-2.26-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}2-${PV}"
+inherit desktop qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="Tool to render 3D fractals"
+HOMEPAGE="https://www.mandelbulber.com"
+SRC_URI="https://github.com/buddhi1980/${PN}2/releases/download/${PV}/${MY_P}.tar.gz mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="CC-BY-4.0 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="joystick opencl openexr sndfile tiff"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	media-libs/libpng:0=
+	sci-libs/gsl:=
+	joystick? ( dev-qt/qtgamepad:5 )
+	opencl? (
+		dev-libs/clhpp
+		virtual/opencl
+	)
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	sndfile? ( media-libs/libsndfile )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	dev-qt/designer:5
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-openexr-3-imath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+src_prepare() {
+	default
+
+	use joystick || sed -i -e "s/qtHaveModule(gamepad)/false/" makefiles/common.pri || die
+	use openexr || sed -i -e "s/packagesExist(OpenEXR)/false/" makefiles/common.pri || die
+	use sndfile || sed -i -e "s/packagesExist(sndfile)/false/" makefiles/common.pri || die
+	use tiff || sed -i -e "s/packagesExist(libtiff-4)/false/" makefiles/common.pri || die
+}
+
+src_configure() {
+	if use opencl; then
+		eqmake5 makefiles/${PN}-opencl.pro
+	else
+		eqmake5 makefiles/${PN}.pro
+	fi
+}
+
+src_install() {
+	dobin ${PN}2
+
+	dodoc README NEWS usr/share/doc/${PN}2/Mandelbulber_Manual.pdf
+
+	insinto /usr/share/${PN}2
+	doins -r usr/share/${PN}2/*
+
+	domenu ${PN}2.desktop
+
+	newicon -s 256 qt/icons/${PN}.png ${PN}2.png
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}