blas/lapack pkg-config file update

git-svn-id: http://overlays.gentoo.org/svn/proj/science/overlay@693 32389bae-6d03-0410-99cf-db05cde120eb

4 files changed, 17 insertions, 19 deletions

diff --git a/sci-libs/lapack-atlas/Manifest b/sci-libs/lapack-atlas/Manifest
index 7f2f49553..f39c3b571 100644
--- a/sci-libs/lapack-atlas/Manifest
+++ b/sci-libs/lapack-atlas/Manifest
@@ -6,18 +6,18 @@ AUX eselect.lapack.atlas 221 RMD160 10a38380469d069b7562b1c8f5a11d0ca94c806d SHA
 MD5 17542dc2fda336886d50104d48e95487 files/eselect.lapack.atlas 221
 RMD160 10a38380469d069b7562b1c8f5a11d0ca94c806d files/eselect.lapack.atlas 221
 SHA256 41b00b000df42c14cc483b468b19d586995b4f528544e24e7aba25feab966a64 files/eselect.lapack.atlas 221
-AUX lapack-reference-3.1.1-autotool.patch 16994 RMD160 becd221cdb3dcdb0dd3ac4b7c11416c5da6aba44 SHA1 a1eda6146c1cd32f972b0f1703610c85b58b7c74 SHA256 6cd32492e97740d3e98e93de38a0e192dd6d249c35ade4caf7e7ab4c45edadec
-MD5 0750e86c04390617206f5170f2c07652 files/lapack-reference-3.1.1-autotool.patch 16994
-RMD160 becd221cdb3dcdb0dd3ac4b7c11416c5da6aba44 files/lapack-reference-3.1.1-autotool.patch 16994
-SHA256 6cd32492e97740d3e98e93de38a0e192dd6d249c35ade4caf7e7ab4c45edadec files/lapack-reference-3.1.1-autotool.patch 16994
+AUX lapack-reference-3.1.1-autotool.patch 16975 RMD160 6079931019165f92da5f5168dce45e0297fac8a0 SHA1 f2ac7b9a46ae739e545249f480f8d7db25a3901a SHA256 2989944e9ac4a95ac6731bdde9551a8dca44618cac92aec8cac9caac8d1f1dc9
+MD5 f6145b76d7bda11e4b2071626a2a293d files/lapack-reference-3.1.1-autotool.patch 16975
+RMD160 6079931019165f92da5f5168dce45e0297fac8a0 files/lapack-reference-3.1.1-autotool.patch 16975
+SHA256 2989944e9ac4a95ac6731bdde9551a8dca44618cac92aec8cac9caac8d1f1dc9 files/lapack-reference-3.1.1-autotool.patch 16975
 AUX lapack-reference-3.1.1-test-fix.patch 2120 RMD160 9c37d349af207f0bbb6deb1ae88addb9676c73fc SHA1 bf73066396b08def6bcd81d0ce09aab682224cb1 SHA256 40c514db2bf9a08ce9630e53058ef3d863fd981c774987b233f6bdce3601a6f8
 MD5 d9f7c5dbfc41c255eab86b32702f5650 files/lapack-reference-3.1.1-test-fix.patch 2120
 RMD160 9c37d349af207f0bbb6deb1ae88addb9676c73fc files/lapack-reference-3.1.1-test-fix.patch 2120
 SHA256 40c514db2bf9a08ce9630e53058ef3d863fd981c774987b233f6bdce3601a6f8 files/lapack-reference-3.1.1-test-fix.patch 2120
-AUX lapack.pc.in 346 RMD160 37e53e81a13ae0745bb4f70b960cf55ed7e091d2 SHA1 72158ced78039be6e35d2a48ac19c8126945566d SHA256 75cf6520921f344b83a8c0c085cbaefd12debc371ae1ef9dbcd6edd9b829ade2
-MD5 e9c548422f243390920d81d59e57e1a2 files/lapack.pc.in 346
-RMD160 37e53e81a13ae0745bb4f70b960cf55ed7e091d2 files/lapack.pc.in 346
-SHA256 75cf6520921f344b83a8c0c085cbaefd12debc371ae1ef9dbcd6edd9b829ade2 files/lapack.pc.in 346
+AUX lapack.pc.in 346 RMD160 14bb8a519ddb830ab2e38970550346c94a0c8b50 SHA1 1fe5e92ad8c683a152f62b4425172cab3aedf6f4 SHA256 dd6a4a49b3ab7b66c646123494838caa8b8cf6bc63a25f6b84bfee7e65177cbe
+MD5 84a8ea46d7784c82cde74e77826cebe4 files/lapack.pc.in 346
+RMD160 14bb8a519ddb830ab2e38970550346c94a0c8b50 files/lapack.pc.in 346
+SHA256 dd6a4a49b3ab7b66c646123494838caa8b8cf6bc63a25f6b84bfee7e65177cbe files/lapack.pc.in 346
 AUX war 545 RMD160 6f44c25e739703f988180959608094aa633db7bf SHA1 d90a66e57395e01b94bac9b444590de8fef77aca SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b
 MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
 RMD160 6f44c25e739703f988180959608094aa633db7bf files/war 545
@@ -25,10 +25,10 @@ SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b files/wa
 DIST atlas-3.7.37-shared-libs.patch.bz2 6373 RMD160 bcfb01319951b8ea5def473f47e6b8f3ea37906a SHA1 c8ca108f50a7968ad98be64a70ea1b0b5e87ad5d SHA256 17cd5fe09733eff63f3c332d63ca42bc62d461830027de9052eb24c48dadc9ec
 DIST atlas3.7.37.tar.bz2 2282682 RMD160 33f728d2d25c396179748c43aeff9ab71107ddc8 SHA1 32ea739fc4682fb2a9b6625d1a912baaf8f31e1a SHA256 bbc56b6355c07666d8021f640da00a35838e87ec4cb4cf52bdbb25336635fd65
 DIST lapack-lite-3.1.1.tgz 5332509 RMD160 d81baafd1f0f9859d9f75ac9b658f743544b5f5b SHA1 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5 SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437
-EBUILD lapack-atlas-3.7.37.ebuild 5100 RMD160 cc652537f4e13831d055571dd2c21951291841c3 SHA1 d4aa0d0ae5a42fd76117a7da4d9b7109aea23433 SHA256 085bdc0db44fb524e9aa2d691d616353670a0f0cbb54aaee51a9f24a7c3fe1b6
-MD5 7799498dda7d4e0d4e6215f402d9bf97 lapack-atlas-3.7.37.ebuild 5100
-RMD160 cc652537f4e13831d055571dd2c21951291841c3 lapack-atlas-3.7.37.ebuild 5100
-SHA256 085bdc0db44fb524e9aa2d691d616353670a0f0cbb54aaee51a9f24a7c3fe1b6 lapack-atlas-3.7.37.ebuild 5100
+EBUILD lapack-atlas-3.7.37.ebuild 5075 RMD160 c2a2757f50db4fcf68e9cacfa7d43132540b9b4c SHA1 2b9eda300c88196748e35adce0f6dd439460edbd SHA256 7e1c5181cc50d629620256d52bca0c7f301d6159972b65754a847f5c2f39063e
+MD5 e89f0536fef401e989021d28d56e49ac lapack-atlas-3.7.37.ebuild 5075
+RMD160 c2a2757f50db4fcf68e9cacfa7d43132540b9b4c lapack-atlas-3.7.37.ebuild 5075
+SHA256 7e1c5181cc50d629620256d52bca0c7f301d6159972b65754a847f5c2f39063e lapack-atlas-3.7.37.ebuild 5075
 MISC metadata.xml 654 RMD160 06f9ca1f9b2c2c3452dd71c61dba3a55b0c5e4e6 SHA1 0462e763a17b33d2ff889eb4d25751ea9a117840 SHA256 dc1ac3c41329b360274e3a2c393e390467a8d72cb64e10de2dddab060617bf1e
 MD5 382af87e1a8465db41ae327e9cf042cf metadata.xml 654
 RMD160 06f9ca1f9b2c2c3452dd71c61dba3a55b0c5e4e6 metadata.xml 654
diff --git a/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch b/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch
index 72a00618c..7df026709 100644
--- a/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch
+++ b/sci-libs/lapack-atlas/files/lapack-reference-3.1.1-autotool.patch
@@ -37,8 +37,8 @@
 +
 +EXTRA_DIST = README lapack.pc
 --- lapack.pc.in 	1970-01-01 01:00:00.000000000 +0100
-+++ lapack.pc.in	2007-08-14 17:16:49.000000000 +0100
-@@ -0,0 +1,12 @@
++++ lapack.pc.in	2007-08-17 11:39:19.000000000 +0100
+@@ -0,0 +1,11 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
 +libdir=@libdir@
@@ -50,7 +50,6 @@
 +Requires: blas
 +URL: http://www.netlib.org/lapack/
 +Libs: -llapack
-+Libs.private: -lm
 --- SRC/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
 +++ SRC/Makefile.am	2007-08-02 15:15:59.000000000 +0100
 @@ -0,0 +1,292 @@
diff --git a/sci-libs/lapack-atlas/files/lapack.pc.in b/sci-libs/lapack-atlas/files/lapack.pc.in
index 6dfda1c97..26b340a4d 100644
--- a/sci-libs/lapack-atlas/files/lapack.pc.in
+++ b/sci-libs/lapack-atlas/files/lapack.pc.in
@@ -8,6 +8,6 @@ Description: Automatically Tuned Linear Algebra Software F77 and C LAPACK implem
 Version: @PV@
 URL: http://math-atlas.sourceforge.net/
 Requires: blas cblas
-Libs: -L${libdir} -llapack
-Libs.private: -latlas @EXTLIBS@
+Libs: -L${libdir} -llapack -latlas
+Libs.private: @EXTLIBS@
 Include: -I${includedir}
diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.37.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.37.ebuild
index 8a8996a4c..c1cd08d54 100644
--- a/sci-libs/lapack-atlas/lapack-atlas-3.7.37.ebuild
+++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.37.ebuild
@@ -118,8 +118,7 @@ src_compile() {
 	[[ ${FORTRANC} == "gfortran" ]] && flibs="-lgfortran"
 	[[ ${FORTRANC} == "g77" ]] && flibs="-lg2c"
 	../libtool --mode=link --tag=F77 ${FORTRANC} \
-		$(pkg-config --libs blas) \
-		$(pkg-config --libs cblas) \
+		$(pkg-config --libs blas cblas) \
 		${flibs} \
 		-o liblapack.la *.lo -rpath "${RPATH}" \
 		|| die "Failed to create liblapack.la"