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.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 50 insertions, 17 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/Manifest b/dev-util/cmake/Manifest
index d05045793e41..70f84d4675dc 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,6 +18,7 @@ AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2
 AUX cmake-2.8.11-FindBoost-python.patch 5287 SHA256 95784f74c82fd412d81c850ccea8e2b0e333084dbd3dcaca3d2316986828e5c6 SHA512 db6ab343d3497ac2314250d094d4b608e83ca9d7f5c04d3b98e4461bd4655e155c189c39adffa9d31264564de6e382e227ba70c8c6ee8ab14dd8dbb7004490ef WHIRLPOOL 16358f1d91bd8ab79d51d3a772380b4e0d9ca65443dff685109e88e0c383f4edd181fdf7737cea7f8527684143704ba9154b3569dbe31ab34c9fdd2606c6487b
 AUX cmake-2.8.11-FindImageMagick.patch 3033 SHA256 721b1eee4fdc8374782276a1de719fb52df794c2ef6a9cd37d66ee99c08dabca SHA512 701e9583a63ee67a79ea6fea164ac5d3d46fed3a72f297b771fd55236ec51de6c3f1161f527b9d662382a3e9e48f3b36b3a9bdf89c20888ccab30dae64697754 WHIRLPOOL 8e16438957c9d51b497f876a4a4776807e651be0947342469e4058e74a1e0be008f8a697a554e87de0931a02072eed07f4a7e1ef1805312146e2d0c0e012d8a8
 AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1
+AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
 AUX cmake-2.8.7-FindBLAS.patch 1641 SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac SHA512 91a38e22d183ca4b501b305e6ba5068397b09b02bd39e7bdf27bf4a7771f432acaf099d0840260ce815f4d254d704036d022aaeec5b8c27dea1e4ca78112731b WHIRLPOOL e9734f0671918be36c5c1ec78f5185b21b17ef3a216b2c988d0951652db8c705e587df80f3e2c544c6e5a5080d5fc403a6554724c82055e3448f661df147205a
 AUX cmake-2.8.7-FindBoost-python.patch 5334 SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68 SHA512 81d6ef46f006a42d1234f7a2aec3e18052ff5f5cca3019b42a5b3be77978babf75265db61eb32b4b28156a320506fbb6f7dc1038c9b01d13ed92cb7d0a25da4e WHIRLPOOL 3f6a52259e85d07e3209b6639fc1ccceda67f80a99f94ebe8a069a67d706e1e6cf16e30c8da0be6eff67793b30c49e006ea9b8d3f7a8cad562f90db5f7eebcdc
 AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005
@@ -28,23 +29,23 @@ DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a
 DIST cmake-2.8.12.1.tar.gz 6068021 SHA256 fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 SHA512 91b07b33208fa66228b05a940422a99569ab8a0d8132de24b0ab19fc2f7a1f0697701234a5a374fb5884f0b48f693e917c284011f1c9ec9b94e82e06b70d9b7d WHIRLPOOL 674c07f82be6096723a0f772c3cac5224083507b7771ec887c527a0e84c11c9e5d25528b1b60ca20db67d08c01b2fdddebf07f3560f35c19cb057ffba2a65907
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
 EBUILD cmake-2.8.11.2.ebuild 5354 SHA256 5e911fc1f206094703a89ab48e1e65d5b35bedf59d206b0f789dc85f3b6796a8 SHA512 061559a757f363654cf5d0cbdc444c0801a84a0ee66feb9cd4f34fd363deb61d6fe0b55525f03b52af0f7bf2e2964a8936501c8adb45928cebdf6f052706627c WHIRLPOOL abc8da5fc5e1a02f602dbdfa4fde5a0e9c20fb1d59e6792deec432c0532d819b1e435d87de2cf0b02db6228eb5ce01ea371c4cd86c91318075eb333c1fc1557f
-EBUILD cmake-2.8.12.1.ebuild 5410 SHA256 5a78a0f7ace63b7b8345c9ef7c0211ecd9ae2331f86daf4fe07fb91b1fcea888 SHA512 cbb537c427c5be5ef12f9aeb243bc4194e8e1049cedcfb580a24e36f20654b9c72b9c98524598409771fc8cd0347b5e489690482022647c3f0f7f3dee7f5f67f WHIRLPOOL f6f9a3464c247ed051699c641ca6f1a6da0f2e21486b93ee0314a47a56449cada393c50265225b981a33b8a120bd777554075740b269eca54c5bc0594c53ce83
-MISC ChangeLog 41657 SHA256 0a082bce502aa3f63d24104caaa25f2f11ece35ad2af65a248c0d0cdacd7bf2d SHA512 00ecc046f09742977cea6340e89aa86409e5deb56a87c90eef6d798cc252652637ea3d51ad0d908a8f4a2d3695badd56150528ae459cc68ba9b83ad8011a76fa WHIRLPOOL abe319f04d8e2773efd8048fc02a989b5338181f36026e847c44b1b446f1eb6261f9cf666aec0140754b746b6e5b97c39b0bc9f28c5b32397fe52faf237937f7
+EBUILD cmake-2.8.12.1-r1.ebuild 5465 SHA256 0c263049c329949851d9ee513cd41c61c3b4f5a27780b77e5ec0a9deb64e89f9 SHA512 49e2b25fcde0b87657e6408415c1d43b76a8003cbac14ea618d8e5388ceeaa76b766b3ea65e6997798d035a88b660034ebe5405253018db8e1a9217ee99dda93 WHIRLPOOL 1d09bd458be620a3c0b57ec8cca50ace41abe8def3484bdd8dda582fb331e32c224e468349fb67e3d59b613c0653840f1f7daaffd27c036c03002020678db2c1
+MISC ChangeLog 42042 SHA256 0e3588be54125284950c75d51d4939cd64b07a2b1a4bfde45db1fa56695dbadc SHA512 407e0c9e3a75b601aa7c9d798f7c47bd996dbd1d0ac254edad1ede34f9314010aad92efa32751d51b2958df31f86f0f3187348e91dc3cb4836d29658d2ae6a67 WHIRLPOOL 988c0379773fe0fea59d8818ecc2176daf271a02aeb61bd6e55ee12208677fd26ca77b3392834df5bcd18d6f95a9a14a2d9c5e0684c4585b419baa747d6ed52d
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSgqKuAAoJEGVpnaTzz9K9frsQAIFtJ7aZ8/75oetIshexOqWP
-VmgGlpVkzriWwXBeDC+TVH/eicOlA2PA2x75S/oZCHk8vJ3XFDZKWynojkcZZ6NA
-3jTigrfjaI90Eat1yNIjyg+3HP27CtIyskLqxqNrP4gMBur0/LPdir+B64BbkhKO
-bLcPZBNQGFWcpMrsPhbfNqCm/FpE9OtrurB4bmTL5O9X26ezIC4eF7QPcdc7WEaq
-pBnRwHCzRStKGuEli0nV4Rjp+6JNMCrftkhPCz4JJUSUeERDjNkcukh7FloxvsD4
-7JtMbqfMC7R23SUXLN+eKOIQrOlzZQIr9wexHQ5n9VhQ5WxP9L7bRN8DysrG8xMV
-8MfZGR8yHlmbm2IbQ2bLuLQVrB3eBuAmIqYZOYkL4cwGoCHrrJQM01NjuP0Xon14
-0XN1nqp7ubOOYUOW1CHCGed4X1kz0VEOZJMcWlI6PpzSyInRTxmapjTZWNbQeqr1
-OU9kGpYX70xpdA35mG19mgyRG1ATElRV2062DE2yl25p5TjuyaTxzjvpFA4OFx/S
-nNkHrxlknEU/+4QNx+JLRSs9ilLvOf6TffFx1mF9ur/V/o/wcYJ8aLGjAj6uhF97
-nO6gg/pvqZ9xAG1m+Y5g2Nghff61ii3P/SKGDTwe5Z3dwDG5WXk8Ice9TCbxIHO4
-w+L8MglP21FJbOMTgjDS
-=sA7z
+iQIbBAEBCAAGBQJSg8RbAAoJEGVpnaTzz9K9FbAP9jNwLhARBbZ70q0z99ZGy+/Y
+de/edjz5iDzmSIq5A2GyzGWLrMMKwdeNWS/CCJiVTL5QI7jVSom09biXCd8bUUeT
+yPxMwZYEiiQ8+VGccjaioiR5+tY+1MO2fKMFdKIabdXSIO2C2rc18R4cxX8nFNiH
+ka9ogaC6ybwEPTBe80zlshLRdIdhdYxVFbNksmPkt4gTW3i7brDSu+Qc9oRHZcjk
+QvLu/jrveYY3P9TNLguRyxanSQ6x5bmyET6H5xxQoe+jxcQ3Jjf1O9AHzNf3+1Xx
+MN3b7Xf4OLBu35LhDnmqFLfyWm1NYWikx4GwedB36oiaGJzUnchRnsCDFm+yITfx
+F5A9KOkTZPznt5Q4JWjHxpjuVepvHc4A7yWzlFV8xAccLnqR6qbJwSgP2wMepCmV
+CqG+jh0PUWUR2Xoe3P3EC7m94IaowI1PKzvfIw6FPauw0KMr15z+njD/8cf0i9lp
+WykpH07SQjRZJF4softT4KrFz21YZG2tzGq8bqaJD5m15gh6Q9J/w14wQsQ/yrmR
+kPR646zAOUdFCVQ4C8ATqM9C9GlJV2kGY9RkbX9PC06U1mSo59Re1W4GlFaBisez
+4enKl6BUdc7Q5JQSbUejgDBe3eJhbIGup6l3y8RXVu0guY7m3H+PR5nfihUV1JIf
+RGHt2SrvnoQ9NWbfosM=
+=LWe2
 -----END PGP SIGNATURE-----
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()