Fix FindLAPACK, bug 388757

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

4 files changed, 60 insertions, 18 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 9e4ad1dac374..fc60de4d3dab 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.172 2011/10/19 21:10:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.173 2011/10/29 21:49:29 dilfridge Exp $
+
+*cmake-2.8.6-r2 (29 Oct 2011)
+
+  29 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cmake-2.8.6-r1.ebuild, +cmake-2.8.6-r2.ebuild,
+  +files/cmake-2.8.6-FindLAPACK-2.patch:
+  Fix FindLAPACK, bug 388757
 
   19 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> cmake-2.8.6-r1.ebuild:
   Fix java 7 sandbox violation, bug 387227
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 88d630737b8e..56231e2579e6 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,6 +17,7 @@ AUX cmake-2.8.4-FindQt4.patch 10926 RMD160 15da9e13df5a98f9171a263c0c9d23f45707b
 AUX cmake-2.8.5-FindBLAS.patch 1096 RMD160 632ad06a5b3fa645d5d29d46602151d941049fb2 SHA1 69e089cf3bb8c9f748c8118a6d6dcbc218adc4cc SHA256 39e0fe4aa61b1efd149151b44b2c84bc651e11e96dd29321bd7d87e76158ac77
 AUX cmake-2.8.5-FindLAPACK.patch 1170 RMD160 1ea32132a982d3cb03072855a21059c68392bdf4 SHA1 8cbc7da551885c43863decabafec3d4d095cadaf SHA256 570707887e4d45a656bfeecfc06f203c7676d05bba988776a8a259cfeefb14d8
 AUX cmake-2.8.6-FindBLAS.patch 1064 RMD160 f359d84913dd868165f37d7bb9e507109552bf22 SHA1 1455e3602d9484a4fc339768eec221b037862ba1 SHA256 ef4b5e455ebf7431fdd4dd37a671c2c93b7e9db24cd13ac1eac9d3dccb1f828e
+AUX cmake-2.8.6-FindLAPACK-2.patch 1158 RMD160 2fb17c71e08e930ed9a71f59a4316c35749159b2 SHA1 6e4b552ea1d9a6a464089935a50ed1152b2323d1 SHA256 2caacc85c393d9ad09f2c92d0595480d1e02b8db6285aa35f270858075465425
 AUX cmake-2.8.6-FindLAPACK.patch 1150 RMD160 6f18fcb48dfa7ee92bd440198fcb2bc3822d3ad5 SHA1 9f9f92d7657025968ebfe74f5983c8b0ced94721 SHA256 033e3b0a217e0168b47588f01f2e4b216f0ade5dd0297264e8dc3f672a979caf
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.4.tar.gz 5477628 RMD160 8b92eb11391b07433e7fe02bbb80c3ebcaaf1893 SHA1 6c42699bd63fdfcc7743d4906e3208d051d7f19b SHA256 d97ea9f807f5407030d4f7246accc26addc520c9ee3897c4582eba3da49253cc
@@ -25,23 +26,23 @@ DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878
 EBUILD cmake-2.8.4-r1.ebuild 4510 RMD160 64efe5aa8c2b68908940ccf922d4754fc1a40d09 SHA1 0ef8f21873968242807661aa4ebb5617bb8e063b SHA256 b4aa824de85f7e74e6ec2c062d1ded1261fad04f3de7fbd0295faf32a6ebda5a
 EBUILD cmake-2.8.5-r2.ebuild 4662 RMD160 d0c60d71df4e4ac7b68e5a67e6218945ee2a30e1 SHA1 5f6fde7c9106ccf12c6c317d4ea58c408e979395 SHA256 72a80ae698d517fa66e4ad72e0e32b825be3f265d7666c29324c89613dceea99
 EBUILD cmake-2.8.5.ebuild 4553 RMD160 be92e42ac98a4cf72296e17cb5d3f3a6cdf4ee6f SHA1 9566c96f2a274250e5fb2ef92b69070e3e136c08 SHA256 85110a3edcd14ab4cd92558cc23932e9345aa15e2551733446b1633bbdab2f4f
-EBUILD cmake-2.8.6-r1.ebuild 4725 RMD160 889e473e677a373416304814eb3be0ee8f23676f SHA1 c3321be4acb2793fbbe6b8d0fed871aad9eb8ae0 SHA256 004795c3cc4a36c35bb62bb835d64d83b228d7a37fcb99f13bf5d72c3d6b9963
-MISC ChangeLog 27516 RMD160 ad2fba34f7e59b4ebf29464f611ccfe0372b9cef SHA1 752625040c11cd69ca48f23fa09681a32cb951f5 SHA256 4fc721790a9bca4dde68ae8765550e33d3aec4e0769990f7234d23c4e84586d5
+EBUILD cmake-2.8.6-r2.ebuild 4727 RMD160 5c1b8e10376ce352f23c7e94e813007c5c6584f8 SHA1 3c50dc691446383f2f6f32e78c686918217f50c6 SHA256 67e1a2746ccbfb7becfa50f41c80d1d94fb12ef1ef900531490e92f2c995d825
+MISC ChangeLog 27725 RMD160 5971483cc98ce33139a082b581ae02e13c92134b SHA1 6e03e037f8a5542f9653a48ee59b7be0b755b0e4 SHA256 6df1da965870964f6eaeb75f48e36a3dbb9244f6a9ee09d5b59278cabd9ca89b
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOnzzrAAoJENwGBM22xffe1JMP/jnk1wJ3Y+rB9nau/V5+NDT3
-H/0sZu0jWfRj1LaTcFl7OfUgTGlJlvciVSwihyKZEVZ7tr2QKosk+dgdl/mVJ/AK
-xIxPER6SJFlcHVKY7utu4demN7MMEL1DhvagOMtL+K7IzX64A9d6DGVpgemQVUeX
-XDcqf2LWagYhunRb4k3QgmjfCMXFJlz6x36NMA68BVW9MOGVlEc+7gM5opim1Pj/
-DQ8nO5FBtJcnHAKm9Z2CdCE3AeNQv+lTgxOauhkTmJFZMWbASljymjgWv+QkVuk8
-yb0q8VbTSQ047unmcklBOAHqLEeqtPVC0bEQ5z3JLcKRxfIrjt1hoUYayPaE2Zge
-s3Y+zn6nyF/bWef0c0L4lEAT7n3Ivs/X2tY29KP67xVO5pig7sjUejlgfJfzoPmw
-xBgKYXEdQhVrQN49k3R0TnBlOohIQQbQZCe0oXQpSeLrsVAMbHWcccyMfL5AdtTQ
-JEY6jCppwX5Uw7cYi2S44bt6gOLVjZXdWu7E3yry6iYnr5XPafAGBd7i4Nq/jcWU
-VfCPGjq42vqG2BIh0/FaKi/ntD8WSBQUvIRMMJHe6N1zrqN9k4jMBPF257voWxAA
-BKLUut0ZsLj7krOts/WH106LwpUavCi/dM/vwv/yCldQflvXtlpzVEIIZJn0Ixcz
-OfefK+xoejR2TjzOrUuy
-=FGKs
+iQIcBAEBCgAGBQJOrHT2AAoJENwGBM22xffe3J4P/0JMy4ie86hfJ6nfJP7OQgda
+SxZSZ9LTV7wvB/xOKfSlfHE8OSIRmmjNrTSJzVBOVUuHoW3AcjkDV0524fuXQ0IV
+Ulxnfl3IQ2rD/Uk6XnXJnLvNl+l8ubPnu/r79NE6NQVRf7QgyW3C4reQ0KfL3aOc
+4GCa7Z7TukmWBWEo5GE1J2lJOT7RhzNOrLwyr+8+zBzmUkxBpfo1HxSzh/yEo66C
+STNq4f3IJKyUY9CSZBRveiiu1WUJj8LLp1jLrINKwpOscvyultO0GwA2+OD3CSki
+vSoJWljfuVIiDjHci8iqoMbFvzpMZbbwkMn8yHHY0B/wSR1sFqGSvlxaOWrNks4o
+sll+m+Gs5vh+NtaqTdlnMg4z0K/7wvObTVpFO/fG6gDPkYddj1HWb/Gl7oNj5VAl
+6BSqygSo1zDZUSdt1Y6uYvKzxSSE4pLBroWLI/LpvnhD/i7fuNb6sPXIiWIDo/ng
+CEV+hldOwiKd0/35jKYDSQ3U2RMVPSyCPwIxZMyLYeJsDxyhAIyJkla23M31h0/D
+qlY4f/T7fMpD12etOrBgNlxtwkLokVkfyx/Czyt6jwH+eqvuac3jhpqgg0vaKgae
+ByrorfZEGHHj1WaZDTGu467XY4PW/8e0ruOMowpp0yHxuE3Muo9YSz88HWsHq5/9
+UBZXV2ZeQJkFuyEMTuis
+=wmP2
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.6-r1.ebuild b/dev-util/cmake/cmake-2.8.6-r2.ebuild
index 334cfe6bb8d6..8ac3a8e41659 100644
--- a/dev-util/cmake/cmake-2.8.6-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r1.ebuild,v 1.2 2011/10/19 21:10:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r2.ebuild,v 1.1 2011/10/29 21:49:29 dilfridge Exp $
 
 EAPI=4
 
@@ -57,7 +57,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.3-ruby_libname.patch
 	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
 	"${FILESDIR}"/${PN}-2.8.6-FindBLAS.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
 )
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
new file mode 100644
index 000000000000..579a07d880a1
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.6-FindLAPACK-2.patch
@@ -0,0 +1,34 @@
+--- cmake-2.8.6.orig/Modules/FindLAPACK.cmake	2011-10-09 23:38:48.956933106 +0800
++++ cmake-2.8.6.orig/Modules/FindLAPACK.cmake	2011-10-09 23:39:52.002144646 +0800
+@@ -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.")
++
+ set(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ 
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+@@ -304,4 +318,6 @@ 
+  endif(NOT LAPACK_FIND_QUIETLY)
+ endif(BLA_F95)
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(NOT LAPACK_FOUND)