gentoo auto-resync : 05:11:2024 - 03:03:37

3 files changed, 5 insertions, 83 deletions

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 383f46c2f926..584005bb60f2 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,4 +1,3 @@
 DIST rawtherapee-5.11.tar.xz 18005652 BLAKE2B d4b4cb45042faf7eadb1c5bfbd7d1db2a452397d10eb12349d1d0a2ae4b9254beb3ee943cf3ddf40380f31abc653ec2c85fb0d4c8e2b1121402bbd41e74afaf0 SHA512 a37af6d99569a6b427379b76b980be8dca5007bf4ec8fc65663e9e8d13850dd2f547e1633f69ee495df105ca6f0f9ab4daf12beec29c9fff63e2e7e5083813b2
-EBUILD rawtherapee-5.11-r1.ebuild 2015 BLAKE2B 1560df366622c8aca27fa89f7090c86e7fa60a3299727b90b269a1d9ed96a6bfa51fe15d3c2e6c82aa4bd2cf71d210e3ee287994434566efd84e488c33cc8468 SHA512 cc52e7df5df516f488b3bf0869eb3674fe970f8d78fc0178f01b5de4b9aaaa52c974708f39a2322254084e5852a584a08ddec4b0fcf975f0e643c2b6a7ee5ded
-EBUILD rawtherapee-5.11.ebuild 1898 BLAKE2B 15c4f40e7016b6d249c4129b41e8cfa472dfbb1063ae7fe30c393edf7d67c201fca1a71bbed303c1cba833d1cb7ef167c841b69bdc8d839adbd31c76f75b3647 SHA512 40f872d001a8f5179c5de769a53145bc555a4ad6b5b5884bf056e190fc12741aab1a7b0ad465780bd28046d71100e5ace4b973cdd041ffb5afe3bf55932cd374
+EBUILD rawtherapee-5.11-r2.ebuild 2058 BLAKE2B b110785ceca47799eed58bcc3dd92405dac2844c113fac7447a17c550efefa90a24b29f6c7fcd9f5f6c8f892be375063cdee967aaf148f513a8d802bc3a99901 SHA512 44ab44cdc2ffa4ac862348fcb8d347a07d9a48860b7ecd44db5f3ac1a771c04a88e07f93bb96ed8532459f9c286b9cab4a67c75a3a43d3b244e699e7b3f5bacc
 MISC metadata.xml 398 BLAKE2B 4a0ef68f8e8c4e04158552d21df211610a6ccd9195da6365c77f78297ee4957f61d91b5b6eb6af2912d28a70462bdeb012176dc1448cfdf7221eca7225c707ec SHA512 d562b2782f388590aac143ff10c74eb24b4df447d61051875d3a6d9200f013c290ca5c7fe7c2d130484b5ba01b9c725f453b690dbbe04cd0a0f398a9a99352ed
diff --git a/media-gfx/rawtherapee/rawtherapee-5.11-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11-r2.ebuild
index 06cfefe8c2bb..5a12aef49a1f 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.11-r1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.11-r2.ebuild
@@ -29,7 +29,10 @@ RDEPEND="
 	media-gfx/exiv2:=
 	media-libs/lcms:2
 	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
+	|| (
+		media-libs/libcanberra-gtk3
+		media-libs/libcanberra[gtk3(-)]
+	)
 	media-libs/libiptcdata
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
diff --git a/media-gfx/rawtherapee/rawtherapee-5.11.ebuild b/media-gfx/rawtherapee/rawtherapee-5.11.ebuild
deleted file mode 100644
index ff0c9e242b65..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.11.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P=${P/_rc/-rc}
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="https://www.rawtherapee.com/"
-SRC_URI="https://github.com/Beep6581/RawTherapee/releases/download/${PV}/${P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="openmp tcmalloc"
-
-RDEPEND="
-	dev-cpp/atkmm:0
-	dev-cpp/cairomm:0
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/pangomm:1.4
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	gnome-base/librsvg:2
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
-	media-libs/libiptcdata
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	media-libs/tiff:=
-	sci-libs/fftw:3.0=
-	sys-libs/zlib
-	x11-libs/gtk+:3
-	tcmalloc? ( dev-util/google-perftools )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-		-DENABLE_TCMALLOC=$(usex tcmalloc)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}