Respect pkg-config library path also in FindLAPACK, bug 399755; thanks to Christoph Junghans for the patches

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

4 files changed, 72 insertions, 19 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 72e0f71c04b1..2b48d9965120 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.189 2012/03/08 04:45:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.190 2012/03/09 01:22:06 dilfridge Exp $
+
+*cmake-2.8.7-r5 (09 Mar 2012)
+
+  09 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cmake-2.8.7-r3.ebuild, +cmake-2.8.7-r5.ebuild,
+  +files/cmake-2.8.7-FindLAPACK.patch:
+  Respect pkg-config library path also in FindLAPACK, bug 399755; thanks to
+  Christoph Junghans for the patches
 
 *cmake-2.8.7-r4 (08 Mar 2012)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index cff293a2f701..bac428a9a1e0 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,29 +20,30 @@ AUX cmake-2.8.6-FindLAPACK-2.patch 1158 RMD160 2fb17c71e08e930ed9a71f59a4316c357
 AUX cmake-2.8.6-testsvn17.patch 1033 RMD160 2fa56bf0177607c88c2e2960b2839b2df8820f2e SHA1 20b1003e391c44d8854105efa8592ac9b7ab6f2c SHA256 6d90df7a5472eeb8be81a70ee4a5f5850bb9d469ef9390af930ba7d6d528183b
 AUX cmake-2.8.7-FindBLAS.patch 1641 RMD160 ec83cae23c4c44c48127cf4ed96494896bedf756 SHA1 4901f3fffff835b32174374f962b831ffd0536ec SHA256 be0d7ce6b59171c9e32ce7fe2ab4ae4a351640a7fa07920ae9230047eb0495ac
 AUX cmake-2.8.7-FindBoost-python.patch 5334 RMD160 eca921c1f0b0a335a108ac1e4af92cd14ab2d59f SHA1 c30778b6a0842a09a0ac848127323d7bbba0e99b SHA256 1f7ab1facbb332cf6a2d6f770ea77eff00cd7137990d3254ee6c1a9ecd22ed68
+AUX cmake-2.8.7-FindLAPACK.patch 1744 RMD160 c10a0c33a440c69640680bf6f879b6b108c0f22d SHA1 ca722fd057c2098d6e5bce591dcdb87979cf760d SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e
 AUX cmake-2.8.7-FindOpenMP.patch 3265 RMD160 d37d4c56b1a15e33fa62931f5332cf4d78005b8c SHA1 e78974bb5390952cc351ea88dca45dc098803480 SHA256 0bd38ba40fc6dcc1ab462c6e27e4f3a3dca6451881ba46c1ff87b1af3b200c40
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.8.6.tar.gz 5583905 RMD160 c3095a4776367496f895b8075fda373568f01878 SHA1 7c2cbd42d27e26580cd4923892197b84b2a90675 SHA256 e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e
 DIST cmake-2.8.7.tar.gz 5667409 RMD160 13b188e75152feef4e5692807e3a9e7c34b26fe3 SHA1 d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 SHA256 130923053d8fe1a2ae032a3f09021f9024bf29d7a04ed10ae04647ff00ecf59f
 EBUILD cmake-2.8.6-r4.ebuild 4913 RMD160 19aa5cc3336016d998924baaf6f24899072eeb1f SHA1 2dcbc1a7e9309f18c4c789398a289661fe5decde SHA256 f9369ac05f203eb1c9756cc1570c812ebd87a24723d3719e91e109452af74dbf
-EBUILD cmake-2.8.7-r3.ebuild 4883 RMD160 9ff5d938fa0a1bbfe3a25dbc480d8d05700b77c1 SHA1 407497914318ae223746fa2ae2d9ff6330679198 SHA256 af301c62aa45bb754aee62bcfa46bc27ed07c609d258f04d5f103cdc01fe038c
 EBUILD cmake-2.8.7-r4.ebuild 4886 RMD160 4242f47753fd43f62af0bed72699131eec59e7f8 SHA1 6eeafe2b649bdf454f5805c009a4033481823049 SHA256 4a410aa5d8b38fc6d35be7792c0914c97bb1373c8725c944dde20d5a92b7a086
-MISC ChangeLog 30411 RMD160 bea35a6c04ef2126a21255ffbd93b36d93c797e3 SHA1 75e2efaad18b8fc634e82db69e70d752c4774242 SHA256 8185c78b6fd641af43d90a0810eac0c65215f4d29b9b872f4668701319cda6c6
+EBUILD cmake-2.8.7-r5.ebuild 4884 RMD160 4fe7220d0c2b3414300e15c71ece68b6e828f54f SHA1 b95034b26457935d1605fb9be02ac837fe0b0e76 SHA256 a560c4d90e5352dbc740e55d742fcb2e377a4a63849439cc64f39622ca70116d
+MISC ChangeLog 30702 RMD160 97cb598eaec76b655bc2e7ec7e26ec2ed25147d5 SHA1 d250277a34030e78d00daf4779801f96351b50a8 SHA256 6d4cc9412d1f56286d1462b97415fed67a369b1342cca9fab5c6727e19d30464
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPWDm9AAoJEEb+UGWnxTyHRv8P/RWKF2aMjTompEpZTR0eJgXf
-janZR3J7F6bpoobAbCx4K0sYVwAlW4sc3X5Lh2iGEPC2FjVcZtyUQvTVOvaaCjq3
-yLbu0yLF2W5Dt/yIvZ630BwLYtS5mMlMbldQmXO9wFzOn10uZKpRULNl90T2VQ/d
-k5VzEaoxAZyadfPuQS9143lYMukGOG6MmoQepgwSeg/CWQ6eETBYLOC5Za/7wnv2
-P4uA8TfFzJtUxxFkLFJdT1AXpefHoz3yQroY+qOsUabmJ75GcSwi7B3Za+18SkmD
-ychap57zWT2Mhr1PkbmuI0OXRLfWSUt3ECkPIP/kv3YZVMJ6GU3wwQzEKZyd4gV/
-ynI1gUhI0vONDkJX7Rw6d1kdJUYQ8a/l6VbGUzPoCw9hlKhBc8WGx6ql7VnEFob/
-z2U+eQ2n+oXnX/hF5v3R/ZqpZsaLLvrecKxK7CBv+V7xbyKMEo57SkOb0Y7WZAbD
-T35K97z8t6YfzwRRh5XdQSb67gbDUjCl3xxeGrGc+4aTcUVNXDIppGaYwBlvZZw9
-o+Al+dKLDSqzbbfZ0jYIDE6TupwwCQcarUHsGTfUkQd4jIncHBFgw+QWOeJoEZWY
-jZ5B5w78bpsB1UkEBgDSVam6RXupJbB7mp9M9DCDeaOMOFplhOvF7xFoRNwbNAgX
-THdbIqJzYPnyhcwmhQaz
-=yMKt
+iQIcBAEBCgAGBQJPWVt1AAoJEEb+UGWnxTyHK3MQAJ2owrB5l9hOWi7Xz+EXtn6o
+RqDTQ3wNVcyUgvfdrC+gBAkA5PXrYlhkY95SkRLnQSMmacEObp1gHYqVgd+1w8+t
+nacppx/Ckmlkz+dxdV5S8EO1L60ZlGmVbtvcAfJK5jRGNvv7SLa56Ut/iePz7asv
+emyZmxJvmEPmWjq3DjDtSl6DXxWe3NrXDXGMTfhFiwtWBjMhow+egz1KnnmKyGQN
+CUyLHyZSO94Fj2xVYNLODduDC2qIYBHSbNqi5vMHvT7JAEZ8ThsifItHmKxlm3qp
+wyXjVMiuWEzOF6ErcBKwHLFJ67WbWrG+HOHkQp8yCAH0G2/IWDrxuSsLwjdMHvIk
+TOWgq9g6mQiXqfYkJtAZCGgO5z44LjS180AdPUO3IOblM007lI9DACoLKvcDvKjK
+v2Lx6bZYrG3Dd19Eev1XQ1lWKmRLvGyjV12L2b3hSV6fPXe71dqY4dPceIhXuy8g
++/HgQ2AlNGyr/Jny1Pi3eRHsMQvKt2717qSEsx69foehcy17daPAQE+s4ixVi2HH
+ivuVGKFXe4bB/2yylRl33IIg8qGwxkW/PL8OK+hJdfA5ZbtYNHORHieqeXXIgNvL
+x3V5DHrsHIpw82Lg25R8dHfZiSFy6J/3dB0RQPGJfbqcTQdAA6z95HGUWoCZIc31
+C8Rqf/X3XfuPcslhOjg9
+=+M3J
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.7-r3.ebuild b/dev-util/cmake/cmake-2.8.7-r5.ebuild
index e3399194c221..e8bea5aa83c2 100644
--- a/dev-util/cmake/cmake-2.8.7-r3.ebuild
+++ b/dev-util/cmake/cmake-2.8.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r3.ebuild,v 1.1 2012/02/06 13:52:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.1 2012/03/09 01:22:06 dilfridge Exp $
 
 EAPI=4
 
@@ -55,10 +55,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.4-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.patch
 	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-2.8.7-FindOpenMP.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
 )
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.
diff --git a/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
new file mode 100644
index 000000000000..6808b80ae505
--- /dev/null
+++ b/dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch
@@ -0,0 +1,44 @@
+diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake
+--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake	2011-12-30 17:49:56.000000000 +0100
++++ cmake-2.8.7/Modules/FindLAPACK.cmake	2012-03-09 02:15:46.000000000 +0100
+@@ -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,24 @@
+ # (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(PC_LAPACK lapack)
++if(PC_LAPACK_FOUND)
++  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
++    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
++    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}) 
++  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(_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+ 
+ get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
+@@ -305,3 +329,5 @@
+ endif(BLA_F95)
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
++
++endif(PC_LAPACK_FOUND)