gentoo resync : 29.03.2018

2 files changed, 26 insertions, 19 deletions

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 7a9b2365e974..69f9d9791081 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,7 @@
-DIST rawtherapee-5.1.tar.xz 10785516 BLAKE2B 5c8ae3f90c4ef4bc352b95761a5a2fd94e1541f6c7cec749c0985c95b85a7fd7cd5e96d439639513715b463c318d0f7b000cf48582b5391b944fc7a6ecaa3be8 SHA512 6a881fe24a4109c7db39cb8bee500eb2f9357c479ddb32b3c9b7987aa5d12e4f10083533b5657a0e0f0713fe4ebc58e0dcf204eb8d5c5b656f3e7867a775ab19
 DIST rawtherapee-5.2.tar.xz 10819936 BLAKE2B 6f4474fdf86efe177861a1a4da2178f75c3589b9d5649d43f7b70a13e51c9658af74fbaea4528e5dc34287b8109cc30608028ca348eb2186d7a2452322139169 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d
 DIST rawtherapee-5.3.tar.xz 11042548 BLAKE2B 7e0697fc0c0e8b3078ccf1f9079a4adebf7c12e8e91e1d5499f304e93bda1d025540d3744b719535133f249941e2b4dcee98189d20e3009eceeb8531252bfd1a SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284
-EBUILD rawtherapee-5.1.ebuild 1607 BLAKE2B 66a9b39d8d6ea289cf641bbc10646d8e3618b2b5255588cf1fb3cf36c03e9166893676335ca1df06c12aa2cdcf2d6bc9ede350d7245bdd46d0a466a388bd79af SHA512 77658a33529b11d2369505aae9de5d56cc49069121087fefeec75aada1e87f2b211649b449633d6f00f709ff08ec409628ebfe55c6ab244a8cc524585e05b7c8
+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
+EBUILD rawtherapee-5.4.ebuild 1631 BLAKE2B 56dba6e1a132b80fc5101b4eb4f59b66eadcb81b1ddc78aeb523c6fcfe8aaa9d610b42ebc18c561e3943767c4956d2498d49f52e767c0e8298e828c9c31fa4a7 SHA512 13eec785796a00e92f770fafc76d6308a0ea8ab9554b9b2e4d7c7efc6ee53de9a54b59fb02ab4d3d9fae2059e75bf016e5ef99fd59d221cc202eb6e53473a1b3
 MISC metadata.xml 484 BLAKE2B 672746e8291016ad6467a9b3c9baa84abac42df9f7de4b4bdb79374bba8e84f7cbfe140a076ebee49ec50587154612b73c6a7022461d01fd7fbdc63a6ddfcd98 SHA512 91f11609c7472bb7cebff5d440ee3d4b0560e0832e1bfb6ffd5b239e8e60647e067894d77ccb6e40a379680775f80b91250c3feab5cd2ce32d7991e0776d0cd9
diff --git a/media-gfx/rawtherapee/rawtherapee-5.1.ebuild b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild
index 543edfb71014..443bc8c4378f 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.1.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils toolchain-funcs flag-o-matic
+inherit cmake-utils toolchain-funcs flag-o-matic gnome2-utils xdg-utils
 
+MY_P=${P/_rc/-rc}
 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="bzip2 openmp"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	x11-libs/gtk+:3
+IUSE="openmp"
+
+RDEPEND="x11-libs/gtk+:3
 	dev-libs/expat
 	dev-libs/libsigc++:2
 	media-libs/libcanberra[gtk3]
@@ -25,6 +24,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
 	media-libs/libpng:0
 	media-libs/libiptcdata
 	media-libs/lcms:2
+	media-libs/lensfun
 	sci-libs/fftw:3.0
 	sys-libs/zlib
 	virtual/jpeg:0"
@@ -39,26 +39,33 @@ 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=(
 		-DOPTION_OMP=$(usex openmp)
-		-DBZIP=$(usex bzip2)
 		-DDOCDIR=/usr/share/doc/${PF}
 		-DCREDITSDIR=/usr/share/${PN}
 		-DLICENCEDIR=/usr/share/${PN}
 		-DCACHE_NAME_SUFFIX=""
-		-DCMAKE_CXX_FLAGS="-std=c++11"
+		-DWITH_SYSTEM_KLT="off"
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}