Revision bump adds patch by Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>. Patch is for compatibility with media-gfx/imagemagick[q32] and media-gfx/imagemagick[q64] wrt bug #491124.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 34 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 95166d5560bd..20d8cf16e0bc 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.260 2013/11/12 21:50:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.261 2013/11/13 18:26:34 johu Exp $
+
+*cmake-2.8.12.1-r1 (13 Nov 2013)
+
+  13 Nov 2013; Johannes Huber <johu@gentoo.org> +cmake-2.8.12.1-r1.ebuild,
+  +files/cmake-2.8.12.1-FindImageMagick.patch, -cmake-2.8.12.1.ebuild:
+  Revision bump adds patch by Arfrever Frehtes Taifersar Arahesis
+  <arfrever.fta@gmail.com>. Patch is for compatibility with media-
+  gfx/imagemagick[q32] and media-gfx/imagemagick[q64] wrt bug #491124.
 
 *cmake-2.8.12.1 (12 Nov 2013)
 
diff --git a/dev-util/cmake/cmake-2.8.12.1.ebuild b/dev-util/cmake/cmake-2.8.12.1-r1.ebuild
index bde6d4e93486..4339e91d4370 100644
--- a/dev-util/cmake/cmake-2.8.12.1.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1.ebuild,v 1.1 2013/11/12 21:50:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.1-r1.ebuild,v 1.1 2013/11/13 18:26:34 johu Exp $
 
 EAPI=5
 
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
 	"${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
new file mode 100644
index 000000000000..b094f17938ce
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch
@@ -0,0 +1,23 @@
+--- Modules/FindImageMagick.cmake
++++ Modules/FindImageMagick.cmake
+@@ -147,17 +147,17 @@
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
++      Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
++      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
++      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()