Version bump, adds updated patch for FindLAPACK module by Eugene Shalygin <eugene.shalygin@gmail.com>, bug #518910. Remove old.

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

4 files changed, 38 insertions, 31 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index f330a04e9f9b..2ebd12d80efd 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.297 2014/08/21 19:42:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.298 2014/09/15 22:43:29 johu Exp $
+
+*cmake-3.0.2 (15 Sep 2014)
+
+  15 Sep 2014; Johannes Huber <johu@gentoo.org> +cmake-3.0.2.ebuild,
+  +files/cmake-3.0.2-FindLAPACK.patch, -cmake-3.0.0.ebuild,
+  -files/cmake-3.0.0-FindLAPACK.patch:
+  Version bump, adds updated patch for FindLAPACK module by Eugene Shalygin
+  <eugene.shalygin@gmail.com>, bug #518910. Remove old.
 
 *cmake-2.8.12.2-r2 (21 Aug 2014)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0b89b6275a97..3e3947ed6a35 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -24,31 +24,31 @@ AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1
 AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911
 AUX cmake-3.0.0-FindBLAS.patch 1577 SHA256 25be4e8671eff94b5cb7fe955215d9b97cc39e61f7203b4eb9b28e16977c3842 SHA512 c6239fe3d8b8e437b66399a3ebdf09da94f747dc6c45aaaba43773ce29a106727c7d4f8a570e1fd9603a9cdbade6b9702398c1989267adbcc5aebbeb59d30915 WHIRLPOOL 44366678ff681b3c876c90274d3b6709ad4ef7de051663db03fecdb77baffbd87b02c5edf53126b383680a58ef4c0a0100982240e58db352c781cd204907f2bc
 AUX cmake-3.0.0-FindBoost-python.patch 6481 SHA256 bd8ff52ce3565ab67806e2417d3c1e3c05215dde1da588f65dfc8db061ea3116 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf WHIRLPOOL ba4965b6e390a30178cd99806eda5d1fd669ccb894ba94d1f8ea358dcfbf10f9559918711912786cc3be16569b87d931d13712bd84a433b561f1092d8c71c416
-AUX cmake-3.0.0-FindLAPACK.patch 1511 SHA256 b42034723284685da665393561c918cbf8ad9c282f9a6b258149fb12dabbb5c0 SHA512 8875c2096e3377292c5f5351859892e2e5cce6d13af4b51dfeb241c501ebb44e796ad97bc09a6cf73d1a49d784ac7554a3053da99585aaf6e26d2740c11475a2 WHIRLPOOL 9319594fd16ea6c9c5de80e03aeb833aa30dae1bd3e73aa0955fbb29b9a4fff4c67a19bce87ba5a9e2d76851635430ee9e99b19c5e7ad675041496d7b955f444
 AUX cmake-3.0.0-prefix-dirs.patch 4279 SHA256 5f5f544a861c8c79fe668cbe65bbba8c8c83e4eca82503f8e7b193ec476c2225 SHA512 f90b2114aa84509fe3763d5c2d29460c84334aedc48f1856e646d7118a80ece72b57084f9ee7e8669ce59d61337d967e8d01f6a68b7d3580f2230a804a0ab2ee WHIRLPOOL 70761c4b3c7886ebcf1d052237f77eb871b92846a35281c911c6cf5ef867d3df09b563399113ca8f7d6f8e912b9c170b074d296b82a480dcc4c8dd10ebeab245
+AUX cmake-3.0.2-FindLAPACK.patch 1442 SHA256 394388bdf47c995bc540537ad2cb497c719eafc5298a19d41d1a672c02d3b221 SHA512 60b673005bb3cec6830a3f68922c5661bccd8d7d39d77172d1f59383e8f9912e3e74e052d5e632479d1b091357dbabef656049dffaf705cebae9ae99ea35e74e WHIRLPOOL 7b46096381aa9a94e92c9aac80993a3da75b80203050f609adf7672ac238d4dd3ad89ff8261e87bd040a4ba5b4b1b4e73bfdf9ac3ba55b2c33a6f7800315748c
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
 DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
-DIST cmake-3.0.0.tar.gz 5489804 SHA256 99a34b7f74000404feffd82fba9d9e0cd623428c74b6a4851a0dee1c272606c0 SHA512 e8b8098fda7d9db239df0a0151e34eb11f40aa0265386684acfb1aff93b401ad86163c1e13a3197700cf26ab7d284cf0a21caa2e2bfb07a62e9816ba4c15ae90 WHIRLPOOL 4e616cb9bd333d4cdbc72bc98ecf80a7a216fd35cd045a8786c972b35e5c5eaf16b25cfc03fc9c83685b74d54171ac697963b8d6b579449f7868b96ac9343642
+DIST cmake-3.0.2.tar.gz 5490501 SHA256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 WHIRLPOOL 4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6
 EBUILD cmake-2.8.12.2-r1.ebuild 5607 SHA256 007788831486d94203e5b9bcb95ae342419e89d7f82366b2a6529c511d07519a SHA512 bb0c29041b528026046b082662cc83bf59e67556add2b5afc263c2817b519eac10f955e2abc5acedc2c1f4a4d271e951cfe0530d5be80306f4ce4d360bd722b6 WHIRLPOOL cc95433a1e8475b0eb0b06c2405823ac26e6fce18b5d10c8ed987ec231d7af3c98a9e3c737fb4aeb865c231776ed994d300251d6d1cd155996389e1a1496276d
 EBUILD cmake-2.8.12.2-r2.ebuild 5702 SHA256 e92cff9b67120db42d8b2b408aa42fe3a59354ad8ec8b0498792529e52fcfeb3 SHA512 a255c33e431a4b427b02ab17a648dfadb7b348de85b9b6a036d6b465f8c77da2536d75f8542581b1e01fae42bff301c128e5f88468f268a162ee64e078e8032d WHIRLPOOL fcb0da2025ad4bce2c1c566ae4e11bd8d646d25ab89c25a4cca84fec196cb1c557dfd665b075de3bb8d57306a5513f4f0200e72831772b5ebefb3e3ec22f78fb
 EBUILD cmake-2.8.12.2.ebuild 5551 SHA256 589273d08366fd0a979406f3f9f46a8b84764472f2b5e8dad64aa1bd2d574776 SHA512 10a02c2ace51ed3c80a6a65cd2032547c8feee32fd7b45c30d0548926cebf605b61232fbfed2420bee0bf86a8fbd48237e2c15758ac83c18c28c6504944d2e73 WHIRLPOOL 359dae6d17a23382a514b5891cb6df1c867f51fb5952482fb0d5bf504e19ae9342be667ad9c17f89f0478bc2bd9f1ec630da0f831769bfd524c3fba3673d2d52
-EBUILD cmake-3.0.0.ebuild 5061 SHA256 3efaf35423133cbcba739a60b7e4b1b080185e0903189ff974465cfad34c4d80 SHA512 5a9f368307bb9d400749c6c77ac434d30ca9ecee38869f767e5a94114d5321ca631a2095260b84cc049fef3f9d703fc794c8645c64a6ecb408d01d84e57d1c08 WHIRLPOOL cf412e4a185a6aca1ba07b437344b45b36b1666b919f27735dc8924c68a9e6378bcd919c3e10ec0851952d8b2a092d202a43bf42bdb72fb53633cc8ab9902d4c
-MISC ChangeLog 48025 SHA256 de405e3fc9b93c87e206185c350f7e00c16ebf2860ff2de54fac852af483e409 SHA512 76f7120e1b0a72602944ffa089476e8201904123c87116d85b62a4111b7be59c38a374730047e0510f23afff6226ae743b7465276e438287e5c757111e44a326 WHIRLPOOL 4868588beed01f53a714eb6bdb15b77f1006ebf0c8c5021b9926994597e9c056e05338839635833d13d29d263968404c271213feda77742f7e4532b984789350
+EBUILD cmake-3.0.2.ebuild 5061 SHA256 2a49ec8ac6beda30560c7e3e6a48fece84a0652060abfde3cdba97ca9d5c1b18 SHA512 2eb70c5cb00a839e598f7558979725b975b2d04f6ad2b02ee979c209fefd8e94b1a98ad8dcdeba86e85a4ba2b5cc346a5ab7134b036bae2d6452f3f063cfc630 WHIRLPOOL e63cdf4e5558fe9f1397ecb18a13b945bb7bf639172265e81d69f3e70eac31d36ff63a8620de04c5b3f0f977e115c87b693eb07b7b98ca042312658f8024702c
+MISC ChangeLog 48354 SHA256 27bc628f9603f818355ec965597e0a8748c33fc0ffcd41ac772d4cb10c68bf10 SHA512 05f36d43628e5c4423a1f36b7e764de506944280c0935f9e9de45c0843554e118b58e94c55b12307b9a0465e5ed9ddf66d3ebbb20136966deff6f044e8782620 WHIRLPOOL 8d6791795d28ebfdd0c6968db20fbad7f5151f1778342f427400d22f8c8f582310a373e7dff2ee814313b4d3bb2089676a7b5b8c7432038ac4df3f60b6b20f4c
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9kuwAAoJEGVpnaTzz9K9bvUP/R4pN37ThEADfwGeajyFo8oV
-TJmlcXczBvNAmZcClI+fCLDkiUTsRRsrTLGFkuJw5NVLf5Vj1BQDXKkhBUmWJhFp
-4ghiQbgRU4/58XB7s8ivxM4rqaMSXIUFcviZobPLKW3q6E9LF2TgGOGSF27kiKwF
-bastSirFFbmRzgEAnIx+MbMVVDp5Wm5K0iLoS1Qsp9sCRKNpDa1OdLfADjUuUe8e
-vP0R5cVudHngNkSwdgfMB9kj3rroWD0Y4+XRoUcwV86LJx4CGdsd8aLz1+rWQ6wc
-Z6Gq/Y+QPHbf3uC2Skn24BOg6p/x8/AQ/9S/69jAMnQQy20B75J4fty75vpl5CTT
-L1s7uD0Jz/Ap1WwRi8b07HwBXWsRXvV974TemfCBxPlnFZ/Wa5qBmpolzk/36i4y
-JN/1ShyGVF0fZ+fETqbiZVwpI+O7Ho34dUeCUr4AmRZExOyUmnQDsYDrN+epcKHv
-VstO1vkC8eq5u7yzwrAOifVMBj2rGP9SBpVq/xC/oAROUG6EQYLg/B9opKrq+sbi
-Ebk6xqHHjyy9p7ko0k8XzcPdptuIV5p7WtQZnoRWwfUXAS7EyabahR+recnQfGC9
-4eqDvhHiXZnVp0tohl56mFzvnv2TuhWFn3EHw/aleB7EEa50ADnonAPVbWh4dEut
-Fjgln7GIHcxcvHe51adF
-=nb3e
+iQIcBAEBCAAGBQJUF2uWAAoJEGVpnaTzz9K9fBsP/RQ9tH1Jw+wFBmlsw3sO6NgF
+bJQYlL6nywsHEbRXHzG6iUp/XcZp/NyRqkhobKIvAiKh1wgrYBa1BoOnC8Fxg1nZ
+efQAveSijpHutUPsXKZNU1j47+QoaIS4JK7q0nfS4xQhUdaiY9FI75XP2EsbMPRE
+Xa8AWEhpcQvLBVIIMlCXWdzG1E1kt+cpEUaU+xqBVz7ijJj7qCuKN4tt7vnEHosc
+aoAtGTP4410QCxlK/L1+s1AoPUuDh3PWVZz6T0uEe97tJ6IcpdFgsreYEMCqDjyZ
+dIaG5Ji0l/8Wj9cN/2NC/UWQlFX90qVjMQTpKjSFHVCahC92RfWOT2VpjylIcS6y
+zbuW9+Np1zWN5g/Xz3z2RnOwBajUDcOb37vBcerUfHPXeZ+ctfT1R/5r3N/RPxFA
+fNMdcrcZ8iFpdCFZ9ui5SN7yGegK8wBzRxkXdO3Fqmda6iUvjy8BQ6qHQw1LDdUI
+KXCcYIyCGNMSpMnW5g4lr14QeubNUUq/HAc0v6FNMi3FCwuId2QHzHeCOSOIBed+
+6+ukZ3EMtrj4tKdhCLfkAw7GLYPNizQpzgMqIQ/JDNQ05ZWmHs7UBhn/vqpEGI2A
+kzukyYmUqI4UzqY9yw2c9kEkU7L+SB4BbgIhdJ8+2x3EMB2GCQFlmbDmVvAGJAsB
+FCbpB0A5RYt0elcBxbyf
+=5Ku2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.2.ebuild
index 6d62ab3e677f..182564dfbcaf 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.0.0.ebuild,v 1.1 2014/07/27 11:55:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.0.2.ebuild,v 1.1 2014/09/15 22:43:29 johu Exp $
 
 EAPI=5
 
@@ -52,9 +52,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
 	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch
 	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
index 611c5ceb94f7..57250e453be0 100644
--- a/dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch
+++ b/dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch
@@ -1,5 +1,5 @@
---- Modules/FindLAPACK.cmake
-+++ Modules/FindLAPACK.cmake
+--- Modules/FindLAPACK.cmake.orig	2014-09-15 23:50:11.377111987 +0200
++++ Modules/FindLAPACK.cmake	2014-09-15 23:52:54.734388375 +0200
 @@ -4,6 +4,10 @@
  #
  # Find LAPACK library
@@ -11,9 +11,9 @@
  # This module finds an installed fortran library that implements the
  # LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
  #
-@@ -72,6 +76,24 @@
- # N.B. _prefix is the prefix applied to the names of all cached variables that
- # are generated internally and marked advanced by this macro.
+@@ -140,6 +144,23 @@
+ 
+ endmacro()
  
 +#
 +# first, try PkgConfig
@@ -26,17 +26,16 @@
 +    if (NOT ${PC_LIB}_LIBRARY)
 +      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
 +    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY}) 
++    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
 +  endforeach(PC_LIB)
 +  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
 +  mark_as_advanced(LAPACK_LIBRARIES)
 +else(PC_LAPACK_FOUND)
 +message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-+
- set(_libraries_work TRUE)
- set(${LIBRARIES})
- set(_combined_name)
-@@ -348,3 +370,5 @@
+ 
+ set(LAPACK_LINKER_FLAGS)
+ set(LAPACK_LIBRARIES)
+@@ -348,3 +369,5 @@
  endif()
  
  set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})