gentoo resync : 06.08.2019

4 files changed, 44 insertions, 8 deletions

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 12bf46c23e08..19d77de7d636 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,7 +1,8 @@
 AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368
 AUX gmic-2.6.7-qt-cmake.patch 1765 BLAKE2B ca0f8cd00d2c89f1868a853b18107de20c6fbc192826b1aad2edb3f20bc7619db8cde701e402f0a5e059b0ec54d0a124314d04eb91cdf1992b42d177635c5d72 SHA512 2c6a092cf0ec7e5c613fb673a6008398e470fa018e781cbfa860de6acccd0eb2472d5d787acef29b67176f95b837320db3a9f51726a97c525d21e3e4a3ea5dc0
-DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5
-DIST gmic_2.6.7.tar.gz 5810623 BLAKE2B 407349683a7871937a37735aef81665ef5b06e5a88d5135e0d4264ce231ddba7ab088645049b1378dd73a7e6b45ada58958986b3282916aba19f7d7735c8bdaa SHA512 18088e33c133ddfa9642295af331d1808e0a618df8a7d3bb7f93d9933d4b6ec2f53a96e5a0f2bca5f1a53b4c7c0628ac7906503be007860fc37907db47029567
-EBUILD gmic-2.5.3.ebuild 4346 BLAKE2B 7d403804948db22dec88c15ac345b8b76237370bbd879a1711154dee5d654b203b20d0416db23d2f313678b6965a42df033c678656d01e7b096fd1e180977d26 SHA512 53fb2252a564a6060587594498277037d3844ee5cf3837ae754104a7304895f3ca9d18fb779cf131b335d346d6b73ab255a3aa301b57b04b754a08457224438e
-EBUILD gmic-2.6.7.ebuild 4381 BLAKE2B 645896b90bcec3677700bc5d7cd633117c3ee7d34be7d146410aaf8aa60aa70bbaeaeac8a274e9ea51eb25f1df7fe664f48a1a2824255b4c3b56ab9b8a106822 SHA512 7b5bb5d476a24ff1f7ece4617482cc4e86cea7931932307671a33f36ba67662f5a7ec64459adf475a0678588690c69d3ce24e743f6040eee27fa45c5f3d63295
+AUX gmic-2.7.1-qt-cmake.patch 1005 BLAKE2B 2b7e5f60788db611859b803cebd5e6e44ee7fac791d97e37fc22290e813c43b7b5d93e8725da2648c19999234f650399eb5fa7c973932f9bb1407fb88a955f58 SHA512 05fd4675cc1b65e4e504ae4c9913566b59b4c69467775a73734f01f9af842b87696c244203e9be75ef26876c452b34edfdfe1ed201ee6cdc934b2ea786c45a86
+DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
+DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
+EBUILD gmic-2.7.0.ebuild 4397 BLAKE2B da553fd50d27145cdc0fbfac7633e6c3e1c3421e36e59eff0b3635a5ee149d460ab3afa47e094d62ef73231b21f8e3578b43ce829e30d08545c6792bea0a279e SHA512 23b26101bb327a78d2ae907d0de5600835861024bffc0cd75b77e9a571daab212d12812b995f72e213967320d797ed4bab2484ff7f63bf931a6cc24fc86a9a04
+EBUILD gmic-2.7.1.ebuild 4397 BLAKE2B 4cab4b7f8ac92099459cc9c5830cb9adde000943474c3fc246639cce86fae71750a44145ddccb98af24848d047806cd4988d74ba2fa704e09adaeccafdf60726 SHA512 142736b44fe0df5ea579fa8bdf3ad973d6e7c40887c9e47fd06ce7dc5071f980368fdfae8a6c0d50d39bd1654867c47b15688d47a131eeb68f08eb516dc659cf
 MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee
diff --git a/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
new file mode 100644
index 000000000000..caf22d04ce94
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-2.7.1-qt-cmake.patch
@@ -0,0 +1,35 @@
+Fix linking with fftw when thread support is enabled.
+
+--- gmic-qt/CMakeLists.txt
++++ gmic-qt/CMakeLists.txt
+@@ -13,6 +13,7 @@
+ set(CMAKE_AUTOUIC OFF)
+ set(CMAKE_AUTORCC ON)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
++set(EXTRA_LIBRARIES)
+ 
+ set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita, none, paintdotnet, or digikam.")
+ if (${GMIC_QT_HOST} STREQUAL "none")
+@@ -145,8 +146,13 @@
+ #
+ find_package(FFTW3 REQUIRED)
+ add_definitions(-Dcimg_use_fftw3 )
+-add_definitions(-Dcimg_use_fftw3_singlethread )
+ include_directories(${FFTW3_INCLUDE_DIR})
++find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
++if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
++    add_definitions(-Dcimg_use_fftw3_singlethread)
++else()
++    list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
++endif()
+ 
+ #
+ # CURL
+@@ -187,6 +193,7 @@
+         ${PNG_LIBRARIES}
+         ${FFTW3_LIBRARIES}
+         ${ZLIB_LIBRARIES}
++        ${EXTRA_LIBRARIES}
+ )
+ 
+ if (CURL_FOUND)
diff --git a/media-gfx/gmic/gmic-2.5.3.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
index bfd30752357e..d4bacf387446 100644
--- a/media-gfx/gmic/gmic-2.5.3.ebuild
+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -63,11 +63,11 @@ RDEPEND="${COMMON_DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	gimp? ( dev-qt/linguist-tools )
 	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
 "
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	if use openmp ; then
@@ -87,7 +87,7 @@ src_prepare() {
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
-		PATCHES=()
+		PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
 		cmake-utils_src_prepare
 	fi
 }
diff --git a/media-gfx/gmic/gmic-2.6.7.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
index 2a1fe822e6ef..bd8a5d1a186b 100644
--- a/media-gfx/gmic/gmic-2.6.7.ebuild
+++ b/media-gfx/gmic/gmic-2.7.1.ebuild
@@ -63,11 +63,11 @@ RDEPEND="${COMMON_DEPEND}
 	ffmpeg? ( media-video/ffmpeg:0= )
 "
 DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
 	gimp? ( dev-qt/linguist-tools )
 	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
 "
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	if use openmp ; then
@@ -87,7 +87,7 @@ src_prepare() {
 	if use gimp || use krita || use qt5; then
 		sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
 		local S="${S}/gmic-qt"
-		PATCHES=( "${FILESDIR}"/${P}-qt-cmake.patch )
+		PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
 		cmake-utils_src_prepare
 	fi
 }