gentoo resync : 12.01.2019

3 files changed, 30 insertions, 91 deletions

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index b4ebe54b971f..9ba2fff57db4 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,5 @@
-DIST rawtherapee-5.2.tar.xz 10819936 BLAKE2B 6f4474fdf86efe177861a1a4da2178f75c3589b9d5649d43f7b70a13e51c9658af74fbaea4528e5dc34287b8109cc30608028ca348eb2186d7a2452322139169 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d
-DIST rawtherapee-5.3.tar.xz 11042548 BLAKE2B 7e0697fc0c0e8b3078ccf1f9079a4adebf7c12e8e91e1d5499f304e93bda1d025540d3744b719535133f249941e2b4dcee98189d20e3009eceeb8531252bfd1a SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284
 DIST rawtherapee-5.4.tar.xz 11991988 BLAKE2B 625b4e04b82f34d994e0f23f6aea6af4b0a2af2b6a325e916e7b51f8a83b568b65bef47a489be547d1e2437f9637b2ecea0d69d95bfabd53b61b11b46d9e36bc SHA512 6dc9a82202b80675f90eeb8f08c4484700561861f296546ae9425c6e9603f6e84bdc0859896c333d2367cc0b371c6bb6ab2fe36ff3d6f56419cbf18a58d8ef89
-EBUILD rawtherapee-5.2.ebuild 1645 BLAKE2B 1de2629c455de8965ad83b68a0f32f40fb40e6c9d65dea1c6b1f5b0da9862530f11d35475bc4e0412df943fd602a9fbda6ff5cbeb0a185ac95bd07db06ba2079 SHA512 3f06920c09a7b487bc2779ca665bab242469129af57f6bebdee9169eacddedb01cc68e81971406632557b3ce75452fc314fb3a3539b11b6fcf878d334cd4fbc1
-EBUILD rawtherapee-5.3.ebuild 1667 BLAKE2B c6ba0b5a19be035fca4cfefbf466e029b8eccf8ed677eed0adf3a0d251935836dc533762f52aee0cfed285b0f0c612e376aa2e162fbdf575e6e613ca7f19830e SHA512 d1f0044b321b3063504d17ac9944d9173237f80401c543c99fc8f40d5b182e3f6f0d1f6070687069ebd2a1cba3f89d1fec649f3e927bdaf6f8e55c5e37a9ac4a
+DIST rawtherapee-5.5.tar.xz 12163556 BLAKE2B 6251655b5bcc8b805eda584e386771b14dec15a2d8a96518bdb79d7e31354c78eb263f6964d7f6ffaeb35a127d3f775c9c39dfebf072a0bfc14d284358acd03c SHA512 fcb546ad6e420200a821c89555ec259140995a3bc69429d2ecb648632c02e10ffceebbd7296e879c93b53ad8efa45ea71336d936cd90cead723e70e8932a413a
 EBUILD rawtherapee-5.4.ebuild 1626 BLAKE2B c85d316a1e741e3bb34b278429c35a01312bfb33ff413fdca05d3d14b329ed57f207ba56537711943c9afef4c3177c421af9f46bcf1d95a96a361cef5c3bac7b SHA512 f9645dfa2bda00054821956bc1a9de57066c06c8f74ec1d8ebdaf0b1ed2e4453b253fb66ae4ff7a8f0e55d8a455176cea71b5502e76a8004f435a65bc877bcf9
+EBUILD rawtherapee-5.5.ebuild 1632 BLAKE2B 9532c517460e30fa307d47ce83fb41c2722b178b6b560b70c13dbfbd75f233261f6b1eaa30711a131e801d44b181b1a121cf98e3e7801d842a6801fe345180e9 SHA512 eb553e9e10586745cdb200ddf69915d122c2a06cc0347894b697c9400d18053965670a3258092fa996004b21f16f054cf8b072020369adf91c8c0861b9b9eee1
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
deleted file mode 100644
index 652e35577aef..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
-
-MY_P=${P/_rc/-rc}
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="openmp"
-
-RDEPEND="x11-libs/gtk+:3
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/libcanberra[gtk3]
-	media-libs/tiff:0
-	media-libs/libpng:0
-	media-libs/libiptcdata
-	media-libs/lcms:2
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-cpp/gtkmm:3.0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	# https://github.com/vivo75/vivovl/issues/2
-	if [[ $(get-flag -O3) != "-O3" ]] ; then
-		ewarn "upstream suggest using {C,CXX}FLAGS+=\"-O3\" for better performances"
-		ewarn "see bug#606896#c2"
-		ewarn "take a look at https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		ewarn "for suggestion on how to change environment for a single package"
-	fi
-}
-
-src_configure() {
-	filter-flags -ffast-math
-	# 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"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.3.ebuild b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
index a345df7ead1c..0994a1f97e03 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.3.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.5.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
+inherit cmake-utils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
 
 MY_P=${P/_rc/-rc}
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
+DESCRIPTION="A powerful cross-platform raw image processing program"
+HOMEPAGE="https://www.rawtherapee.com/"
+SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,22 +16,23 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE="openmp"
 
-RDEPEND="x11-libs/gtk+:3
+RDEPEND="
 	dev-libs/expat
 	dev-libs/libsigc++:2
-	media-libs/libcanberra[gtk3]
-	media-libs/tiff:0
-	media-libs/libpng:0
-	media-libs/libiptcdata
 	media-libs/lcms:2
 	media-libs/lensfun
+	media-libs/libcanberra[gtk3]
+	media-libs/libiptcdata
+	media-libs/libpng:0
+	media-libs/tiff:0
 	sci-libs/fftw:3.0
 	sys-libs/zlib
-	virtual/jpeg:0"
+	virtual/jpeg:0
+	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	virtual/pkgconfig
-	dev-cpp/gtkmm:3.0"
+	dev-cpp/gtkmm:3.0
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -40,18 +40,14 @@ pkg_pretend() {
 	if use openmp ; then
 		tc-has-openmp || die "Please switch to an openmp compatible compiler"
 	fi
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	# https://github.com/vivo75/vivovl/issues/2
-	if [[ $(get-flag -O3) != "-O3" ]] ; then
-		ewarn "upstream suggest using {C,CXX}FLAGS+=\"-O3\" for better performances"
-		ewarn "see bug#606896#c2"
-		ewarn "take a look at https://wiki.gentoo.org/wiki//etc/portage/package.env"
-		ewarn "for suggestion on how to change environment for a single package"
-	fi
 }
 
 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=(
@@ -64,3 +60,13 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}