Same magic for LAPACK

(Portage version: 2.1.10.5/git/Linux x86_64, signed Manifest commit with key 7887F787)

4 files changed, 56 insertions, 15 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index aa674a5..0541053 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.169 2011/07/11 16:50:44 scarabeus Exp $
 
+  17 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.5-r1.ebuild,
+  +files/cmake-2.8.5-FindLAPACK.patch:
+  Same magic for LAPACK
+
 *cmake-2.8.5-r1 (17 Jul 2011)
 
   17 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 8b4dc3f..0450e57 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,25 +15,26 @@ AUX cmake-2.8.4-FindPythonInterp.patch 543 RMD160 e71546dafa162726bce3f46994833a
 AUX cmake-2.8.4-FindPythonLibs.patch 642 RMD160 b116a8f6d4dfd722943a88b1998bfd194a014853 SHA1 f599c1e88a5a64a215e7d27cbfd097543b42e389 SHA256 5c9be7cad3446dc07ad75cc221a2de7df073fb35670ed5325516ef7db4b0c7a3
 AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b494 SHA1 a7f1c589b115f6e5f9abfeb589cb07095510b1f4 SHA256 0aaa6b6a8fa4fdf3aea8efeaa831a3443e60a5a453cd7b71207e57980bce5564
 AUX cmake-2.8.5-FindBLAS.patch 1095 RMD160 4179fd0c8dfc179a0b352da492087bb8264394c0 SHA1 0f122e8886a411cc4cdec9beac62268a5a25519e SHA256 1de57c4a4f09945691449dc5e45ad6175c0b155bcc8b9ce8565a1f8876d0a7f8
+AUX cmake-2.8.5-FindLAPACK.patch 1169 RMD160 5996350acd65c62ad0a91c75fa586f4837dbe6e6 SHA1 416eac77e556555ae836428bd45b9be37989c85b SHA256 d32de16f7ff5afd4a6e4675c417b46851ca705e67057c810382847a9fa84d981
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.5.tar.gz 5517977 RMD160 e4767dc0ea3e53da3ab14cc6af5d42dd190eda76 SHA1 8dd4c31cbccf1a297829a476a0ef79d1614ca368 SHA256 5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91
-EBUILD cmake-2.8.5-r1.ebuild 4569 RMD160 75a95c8860889953e1f4a50de72f3c58ccf76af2 SHA1 fabf49f74610d4b66620c54800a34694b03f62fc SHA256 deac0e311b9b82ffc184689ffd741714a617c0dccd82f106bee89c0db67ed0f2
-MISC ChangeLog 27517 RMD160 32ffb328bad3a235bc01e9f07ad3d90265ecc998 SHA1 20ac4ea777ec91f2215da57af0444c37dbacecbf SHA256 ea248208392c3e2b83c67007e2de1a6c8ccf10db20fc3ee11aeaf3848d403085
+EBUILD cmake-2.8.5-r1.ebuild 4633 RMD160 fe02d554c81bc1d6783b26801841fb1b64c9828d SHA1 bcf09a1e8fdbba02e1b7291c8d66aeb77bb0f6d6 SHA256 ac3827a8b94ee1eb654411efaf7c89c85002b69d45dc3d30c1659d44a7146d17
+MISC ChangeLog 27661 RMD160 6b10d5048b54cf0479a4e5e8affcc91a70e5c87d SHA1 b06290c6fe1eb27373cca918e7cad004bb2a97af SHA256 789268baa8a6eb6b96840c897aaee6937e34895078dfc8f4715ed2148cf05f75
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOIwL5AAoJEEb+UGWnxTyHLQgQAKdJ6Rzi/N4wMTeIltpxBzUv
-UV9Jyu5VZ1x42abQm9r5NUYSCzIDA6fG/YvK2EcRNs+bW3UWW5HzQoJawKYFRUbd
-2KQ/7kQ8gW/KSFQ2de03vzuG974Em1OSU65nJqG3+8T9UBOg28+KWirPVpcJEg6o
-rYY65/1KVY6IVFjumPwOBn0yncZxKYVrMhES0C6MauKzsP+W+E8N5Wdealn2gkzP
-wArbTona6dF/0QsCw4s308oJFyWLXzJMlDBxL8JG3T3uvJqBRc0+f/zTgVACnb3w
-kNMAabca5zm40lsO/OldOGbBuC6MNdlNlY6mnAzJnJmQGwO/MKiaX6e1euqQDpY2
-A7h4N0c6Yd8gY0B+MQ++iVrrEILPDIvYROLQg4p9ZYg7twkPp/tuOOIBczC5rjfU
-GLjn0AG17IQSY3N+xaQIAqNGxaGnjrFwRPo2KukNGB+OdcyfkHgT86EHCKZxJDHx
-oIfGmeQszPnDCT50HisLuxibQu1uE9H16//TirIgwD+LsrnBr5Q2+Pje/rVdlGt7
-yVFBFtl+ptXVpksOQ5BPldK/TU9q1Kl0Dgz4CbjkpWgUBRQVx9HE3JE+2n/jydqJ
-WR8mGIJWGGBmijXEesy1mf5vShyE1258sj5zI3x2IX7LCl7W2+9jvxiwwyGkzP6X
-4smkceVwq1AfgSPktEqA
-=0n+i
+iQIcBAEBCgAGBQJOIyEBAAoJEEb+UGWnxTyHSqIQALopUXIeHwBWIUVVGS1b/fBN
+rkapjxO3wQbbJJ2G7FQbHOLdKAgv2RkM02NCvUH4y3PwvRnbMuBlSg9STXy0f3VW
+xwDPLzlTQwzPdps/yYNxFUFlUZn4iwOvNKKFQmJKFa9lX994UgVup0f9lw6FglL9
+CVFyMuajYLA2zf+NCSGdudqUFbjpvvvGAcOCYSZBowaeg6ogrARFEly2zBfIp/vk
+SYu7cw8oBX8W8olW2EKLuuPkkq/fZBdZU3v+H2+v+/IQFLtsVYqOClgVf3hMkM3Q
+whlBsucObyiCli2UOI0RVaoKE+6U9BMwT4BuGwYyJJJWicI3brGO8CxMppJqNL3i
+XU1uy4/LdLnO1018TLni1LOk+1RqssK0fBMvSs1SPGvifOw3gIPhJxou9ALvzaSU
+EIFuhndw/r6s4wM+fjrqMsbAInMvvsHK+ZgP+OtGbLWTcrsdlw9oJcMDhqQxGQX/
+merPQ8ckQp0+/LLD5cT8IGfIL/o69CU4yzNL0xGf/cIwjlgwjmT2//9zdbd4W1N1
+CEv/CBWJuJo2PKb5feL9/CKJemqwXCWYFnEWou4V9iZC3VDyhZNIKJww+i/9Wfii
+d0o7POC80ZoWmYml+oa5qT5BsqoxG8PjIyDqCT9R9AZzw/BUkv1wNfXZ56wPbqzE
+C/t+dfTW/TAhKvQEcLmG
+=MHxt
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.5-r1.ebuild b/dev-util/cmake/cmake-2.8.5-r1.ebuild
index c094d5d..0c9b943 100644
--- a/dev-util/cmake/cmake-2.8.5-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.5-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 	>=app-arch/libarchive-2.8.0
 	>=net-misc/curl-7.20.0-r1[ssl]
 	>=dev-libs/expat-2.0.1
+	dev-util/pkgconfig
 	sys-libs/zlib
 	ncurses? ( sys-libs/ncurses )
 	qt4? ( x11-libs/qt-gui:4 )
@@ -56,6 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
 	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
 	"${FILESDIR}"/${PN}-2.8.5-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.5-FindLAPACK.patch
 )
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch
new file mode 100644
index 0000000..d9a2314
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.5-FindLAPACK.patch
@@ -0,0 +1,34 @@
+diff -ruN cmake-2.8.5.orig/Modules/FindLAPACK.cmake cmake-2.8.5/Modules/FindLAPACK.cmake
+--- cmake-2.8.5.orig/Modules/FindLAPACK.cmake	2011-07-08 14:21:44.000000000 +0200
++++ cmake-2.8.5/Modules/FindLAPACK.cmake	2011-07-17 19:46:57.865560858 +0200
+@@ -1,3 +1,9 @@
++#
++# Version modified for Gentoo Linux
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
++
+ # - Find LAPACK library
+ # This module finds an installed fortran library that implements the LAPACK
+ # linear-algebra interface (see http://www.netlib.org/lapack/).
+@@ -36,6 +42,14 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++#
++# first, try PkgConfig
++#
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(LAPACK lapack)
++if(NOT LAPACK_FOUND)
++message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search."
++
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+ if (NOT _LANGUAGES_ MATCHES Fortran)
+ include(CheckFunctionExists)
+@@ -300,3 +314,5 @@
+   endif(LAPACK_FOUND)
+  endif(NOT LAPACK_FIND_QUIETLY)
+ endif(BLA_F95)
++
++endif(NOT LAPACK_FOUND)