media-gfx/rawtherapee-5.2: version bump + cleanup.

Gentoo-Bug: https://bugs.gentoo.org/626108
Gentoo-Bug: https://bugs.gentoo.org/520932
Gentoo-Bug: https://bugs.gentoo.org/615058

Closes: https://github.com/gentoo/gentoo/pull/5326

9 files changed, 11 insertions, 208 deletions

diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 63d0437721a8..67032d336aba 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,3 +1,2 @@
-DIST rawtherapee-4.2.tar.xz 7787664 SHA256 fa4c13e8842df096b19d2dabaed5a61f5f9d4547f7b4f0dc6b77f80bdec16479 SHA512 feec61aeb84804cf01ff03fa9d7309f0eb3c04c43818c8397cc6f3ee762aca19484bce7594414d2141248b9740bdd4269fd86f76dcf391c61d4647fa169d48f6 WHIRLPOOL 56cc3e95ae7484cb91cd6c5fd32504b3fbfb17b9d50a38fa490300ff1b096e80a1d5060db3619c34f8b214dd413bfaab57a9748f5a365a87d257e75c753f307a
-DIST rawtherapee-5.0-gtk3.tar.xz 10442940 SHA256 25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8 SHA512 febcde98ada1059d6553a1dc2a86235adaf5fb8ca81b9f744748d3e8ef52109048ce43996f261796b2f345f2ce4a27c4ccc219b33ccfb79c2c2fa6476f19b41a WHIRLPOOL 479a7f37f523c533cf268edc8f2c710ded867febc13df3c4156040ca4d36ad86ff4af2613e9155506eb6a4620d4323fdc3d3f1374c4332393ba57b4b01bcc948
 DIST rawtherapee-5.1.tar.xz 10785516 SHA256 fb742065a6b2e1b89df67c70395e52ee1ebd537c86dfc473b41e7af171655b67 SHA512 6a881fe24a4109c7db39cb8bee500eb2f9357c479ddb32b3c9b7987aa5d12e4f10083533b5657a0e0f0713fe4ebc58e0dcf204eb8d5c5b656f3e7867a775ab19 WHIRLPOOL 0fc24843015750ab4747311d5ac6f40e5ebd9cedaa9c78e73c7fa7250dcbda9ea1260b7f6fc9a0c91559be4530a84e3826f991d9b9199d7caf25691ad78fd78b
+DIST rawtherapee-5.2.tar.xz 10819936 SHA256 5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d WHIRLPOOL 02c71705b76df25e86b6ba5bf6439a3a2966e84dfa968b0a82c1dbe0c6297af826d2ffff6e973a56db21f5821d0a4eead6c05422bc6cb36269ed18b829bad1df
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
deleted file mode 100644
index 3de7d7e6b123..000000000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-CVE-2015-3885.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Philip Rinn <rinni@inventati.org>
-Description: Fix CVE-2015-3885
-Source: https://github.com/rawstudio/rawstudio/commit/983bda1f0fa5fa86884381208274198a620f006e
-Last-update: 2015-05-14
---- a/rtengine/dcraw.c
-+++ b/rtengine/dcraw.c
-@@ -824,7 +824,8 @@
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x10000];
-   const uchar *dp;
- 
---- a/rtengine/dcraw.cc
-+++ b/rtengine/dcraw.cc
-@@ -787,7 +787,8 @@
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x10000];
-   const uchar *dp;
- 
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
deleted file mode 100644
index 0d79e25d649c..000000000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11-2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Philip Rinn <rinni@inventati.org>
-Description: Fix build with C++11 as char is unsigned on some architectures
-Last-update: 2015-11-04
---- a/rtengine/dcraw.cc
-+++ b/rtengine/dcraw.cc
-@@ -2054,7 +2054,7 @@
- 
- void CLASS kodak_radc_load_raw()
- {
--  static const char src[] = {
-+  static const signed char src[] = {
-     1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8,
-     1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8,
-     2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8,
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
deleted file mode 100644
index 4832dc3f67a2..000000000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-build-cxx11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Philip Rinn <rinni@inventati.org>
-Description: Fix build with C++11
-Last-update: 2015-11-03
---- a/rtengine/dcraw.cc
-+++ b/rtengine/dcraw.cc
-@@ -136,10 +136,10 @@
- 
- #define SQR(x) rtengine::SQR(x)
- #define ABS(x) (((int)(x) ^ ((int)(x) >> 31)) - ((int)(x) >> 31))
--#define MIN(a,b) rtengine::min(a,static_cast<typeof(a)>(b))
--#define MAX(a,b) rtengine::max(a,static_cast<typeof(a)>(b))
--#define LIM(x,min,max) rtengine::LIM(x,static_cast<typeof(x)>(min),static_cast<typeof(x)>(max))
--#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<typeof(x)>(y),static_cast<typeof(x)>(z))
-+#define MIN(a,b) rtengine::min(a,static_cast<__typeof__(a)>(b))
-+#define MAX(a,b) rtengine::max(a,static_cast<__typeof__(a)>(b))
-+#define LIM(x,min,max) rtengine::LIM(x,static_cast<__typeof__(x)>(min),static_cast<__typeof__(x)>(max))
-+#define ULIM(x,y,z) rtengine::ULIM(x,static_cast<__typeof__(x)>(y),static_cast<typeof__(x)>(z))
- #define CLIP(x) rtengine::CLIP(x)
- #define SWAP(a,b) { a=a+b; b=a-b; a=a-b; }
- 
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
deleted file mode 100644
index 48acb5fc6ffd..000000000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-cxx11.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 39ef59ddeb7679c71274b1da3faadd395b650c73 Mon Sep 17 00:00:00 2001
-From: Adam Reichold <adam.reichold@t-online.de>
-Date: Sun, 29 Nov 2015 11:48:30 +0100
-Subject: [PATCH] Build with '-std=c++11' if libsigc++ version 2.5.1 is used as
- it does require it.
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dd5fcbc..6153484 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -278,10 +278,10 @@ if (OPTION_OMP)
-     endif (OPENMP_FOUND)
- endif (OPTION_OMP)
- 
--if(USE_EXPERIMENTAL_LANG_VERSIONS)
-+if(USE_EXPERIMENTAL_LANG_VERSIONS OR NOT (SIGC_VERSION VERSION_LESS 2.5.1))
- 	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu1x")
- 	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
--endif (USE_EXPERIMENTAL_LANG_VERSIONS)
-+endif ()
- 
- # find out whether we are building out of source
- get_filename_component(ABS_SOURCE_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)
diff --git a/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch b/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch
deleted file mode 100644
index 356cee90e393..000000000000
--- a/media-gfx/rawtherapee/files/rawtherapee-4.2-sigc26.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Philip Rinn <rinni@inventati.org>
-Description: Fix build with sigc++ >= 2.5.2
-Last-update: 2015-11-03
---- a/rtgui/adjuster.cc
-+++ b/rtgui/adjuster.cc
-@@ -17,7 +17,7 @@
-  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-  */
- #include "adjuster.h"
--#include <sigc++/class_slot.h>
-+#include <sigc++/slot.h>
- #include <cmath>
- #include "multilangmgr.h"
- #include "../rtengine/rtengine.h"
---- a/rtgui/thresholdadjuster.cc
-+++ b/rtgui/thresholdadjuster.cc
-@@ -17,7 +17,7 @@
-  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
-  */
- #include "thresholdadjuster.h"
--#include <sigc++/class_slot.h>
-+#include <sigc++/slot.h>
- #include <cmath>
- #include "multilangmgr.h"
- #include "../rtengine/rtengine.h"
---- a/rtgui/preferences.cc
-+++ b/rtgui/preferences.cc
-@@ -16,7 +16,7 @@
-  *  You should have received a copy of the GNU General Public License

-  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.

-  */

--#include <sigc++/class_slot.h>

-+#include <sigc++/slot.h>

- #include "preferences.h"

- #include "multilangmgr.h"

- #include "splash.h"

---- a/rtgui/tonecurve.cc
-+++ b/rtgui/tonecurve.cc
-@@ -18,7 +18,7 @@
-  */

- #include "tonecurve.h"

- #include "adjuster.h"

--#include <sigc++/class_slot.h>

-+#include <sigc++/slot.h>

- #include <iomanip>

- #include "ppversion.h"

- #include "edit.h"

diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index c6263623297a..370756f32bc0 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>vivo75+gentoo_bugzilla@gmail.com</email>
+		<email>vivo75@gmail.com</email>
 		<name>Francesco Riosa</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild b/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild
deleted file mode 100644
index 71ee7204dde0..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-4.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="http://www.rawtherapee.com/"
-SRC_URI="http://rawtherapee.com/shared/source/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 openmp"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	>=x11-libs/gtk+-2.24.18:2
-	>=dev-cpp/gtkmm-2.12:2.4
-	>=dev-cpp/glibmm-2.16:2
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/libcanberra[gtk]
-	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"
-
-PATCHES=(
-	# Upstream patches for fixing build with current libstdc++
-	# A newer snapshot/version will make this unneeded
-	"${FILESDIR}"/${P}-cxx11.patch
-	"${FILESDIR}"/${P}-CVE-2015-3885.patch
-	"${FILESDIR}"/${P}-build-cxx11.patch
-	"${FILESDIR}"/${P}-build-cxx11-2.patch
-	"${FILESDIR}"/${P}-sigc26.patch
-)
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use openmp OPTION_OMP)
-		$(cmake-utils_use_with bzip2 BZIP)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.0.ebuild b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
index 141d13abcc15..38848a678a86 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.0.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
@@ -8,16 +8,16 @@ 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/_p1/-r1}
-SRC_URI="http://rawtherapee.com/shared/source/${MY_P}-gtk3.tar.xz"
+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]
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-cpp/gtkmm:3.0"
 
-S="${WORKDIR}/${MY_P}-gtk3"
+S="${WORKDIR}/${MY_P}"
 
 pkg_pretend() {
 	if use openmp ; then
@@ -51,14 +51,15 @@ pkg_pretend() {
 
 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)
-		-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
 }