Use cleanly pkg-config to detect blas

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

5 files changed, 54 insertions, 29 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index 9f1085335eb4..aff3ed598753 100644
--- a/sci-libs/punc/ChangeLog
+++ b/sci-libs/punc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/punc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.13 2011/06/21 14:46:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.14 2011/11/24 11:01:47 jlec Exp $
+
+  24 Nov 2011; Justin Lecher <jlec@gentoo.org> files/1.5-linking.patch,
+  punc-1.5.ebuild, metadata.xml:
+  Use cleanly pkg-config to detect blas
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> punc-0.2_p1.ebuild,
   punc-1.4-r1.ebuild, punc-1.5.ebuild:
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index b0b2e8cb2979..202e40694462 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 0.2_p1-configure.patch 2119 RMD160 6cc11262aff3e8fc976c0bb23216fb1367ac59d6 SHA1 c24928f41d87a502629e87a16e8515e640951e28 SHA256 3591f2f8cdeb1582b12d04f7c66420e6581a70a66e3f9cc735f156cd02739e26
 AUX 0.2_p1-underlinking.patch 5390 RMD160 a7b54e8bda912e5b1d6f51d4d5242a6c31a7c9bf SHA1 82f77e70dd48cb7522e5866e916e07d47df77ed0 SHA256 f5fa9af72c719d8f346fb2e49aa3d690087bf66dfcfeabbd7de53600f1df2911
 AUX 1.4-doc.patch 534 RMD160 1ad6b3124686b4f64c3265855ed54b28eb38cbee SHA1 1a5f91fe46b619810c7f171c0953eeb0d1696a55 SHA256 625da0650f17e89b7be3fff73a10e47a6d9ead1ba7e25644c5c4f54a53c79c40
 AUX 1.4-header.patch 588 RMD160 e04c772f207931957acf1d949831f691853789e3 SHA1 c939c04e150ccc16e5173a4f1344156297251c54 SHA256 6a108de531ac5bb5725874ecd8da5728ef9bec5beca4fefda763fa899cde51b5
 AUX 1.4-linking.patch 5885 RMD160 c9ec7898c770187244a79402ee9245e44be2f23f SHA1 22bc29068cd058591a4cefecab7ba6b447dbc136 SHA256 fc9c93ce34e86f8c1f62a047e332b3a90f95cf426aa357a04b4cd3a577c0328c
-AUX 1.5-linking.patch 5713 RMD160 f127ff7bddb0dd74ca8f3f6bb9a096895668c543 SHA1 6f8da3cad48d7ed61ab458137ee9b0b9182e7af9 SHA256 9b9e11571c4de7735e2fbbd667c76e53e2cf0f6c3bdcd9115522402ec94570cd
+AUX 1.5-linking.patch 6247 RMD160 77641fe96c22ca6c3cbb4560aa3dcfcf3e434b9a SHA1 3660fcc5f7876b635b6130381b66615baf56f73e SHA256 7739c434d7c497c6c01e2b79f5c8f13598fd40f06371ad0137538a1c3b2abf60
 AUX punc-0.2_p1-libdir.patch 602 RMD160 045d2cca71835a4288d4a599231d508f8f41629a SHA1 456de24ccdf603eb40ffdaf9ee59a412ce6967ff SHA256 04303cfbe7655a9fdfc4e56c94652cdab6a0a1e6635585cd7451a046685e2c1c
 DIST punc-0.2-1.tar.gz 6645934 RMD160 c00936f26f7096cb66e0a323f7dc22ea40fdc0d4 SHA1 e7211c9a6067d73a56081df0a5f56021ac16b464 SHA256 05dcbc75191b73d3df5b108308b96c6c557ed9b1bd0611a0cc1956edc5541c5d
 DIST punc-1.4.tar.gz 7036966 RMD160 0f3f690a2a95dddeda21c6d4865c5ec08a451d07 SHA1 59adbba5c40f30e5cccbb26731e8a7d47b0a3087 SHA256 3f85b736924ed691a3452a3bf66e3455e73a200f8d67ae9f0f18eb25a51af181
 DIST punc-1.5.tar.gz 7036275 RMD160 83f6beb75a124360013af3b28323ba1fe20646cc SHA1 19eae43fbed3c25d9006c1901294f626289446e4 SHA256 6a63e4caf5dcd0529c09cd429cc94b4443ca4ba893b98b68962c0549c2a8246f
 EBUILD punc-0.2_p1.ebuild 1610 RMD160 6edbee60359f7d1ffd9010e8c2535144eee778d2 SHA1 38fa5c339e49f5484c0f44f8c2a044813ffea4d7 SHA256 48b5e6de51025e6bcf9dd7f74b36321cc12ee72571139a509edbf074808f1b43
 EBUILD punc-1.4-r1.ebuild 2062 RMD160 e1fc4c37d4b31944802e59a5baaae4c273501743 SHA1 6e4d067a7fca552cab160ec2079403d606d6dbc0 SHA256 cc26025bc252c40f434442aef3f4e3c053c57cc2338c607e3f30616758ddbec6
-EBUILD punc-1.5.ebuild 2247 RMD160 64a6193f25c812da2aa80f747b31465bde595091 SHA1 f53faba930573647e7e4f59c31a7dfb0c3f73948 SHA256 213697f9e202965fbf0722df4e39ca0b8cb461dc2bb41f7bff2a5f0286cff048
-MISC ChangeLog 1965 RMD160 4696f2587d1777b4f6288af5727e6f1c16fad8ba SHA1 9f96b984b40fb6575f5586378aa7cbcc58c9da4a SHA256 6a848f82aec5038d6dda6539c08cf9b8efb5f9e7cd3e0665252479a2ce4f581e
-MISC metadata.xml 1268 RMD160 1c3eeab7f7f1713110d9012f1a32cc1735349521 SHA1 3cd959da5f7e94c760842dd8067b84b563cced77 SHA256 4dcd334a724ddcd75185f52fb0159c6a2aa5bab4c192634dca7685e22977790f
+EBUILD punc-1.5.ebuild 2270 RMD160 c9c118ffff2fbe7bf1a445962d10b18363b72f6b SHA1 5e94706413d1908dae7a2957a6c446dd3e8e1fa7 SHA256 b4f2726f77aff6dae881017ef6dd4e8cc979669299f5405de3984f62948a8059
+MISC ChangeLog 2111 RMD160 1e4fb7537322eff6fcf9539f8c701ecad41eba06 SHA1 07655210bdb5757c328c80f7335232c8dfc7401d SHA256 d1ff002c7f7796f4ed16af381c65b3e0eae29905b02474f694fa2169c48ee0b7
+MISC metadata.xml 1272 RMD160 31db6bd5fed32098ab05c05fd61420bce807beba SHA1 9a966300b00f7de7323ca54269ad7fd87d656e6c SHA256 52ea9bab5f4124de96f68fbbcbf21ffe2260c6057891226725429da22fc3f7f9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4AruEACgkQgAnW8HDreRZd1wCfUKk5GmZJTipoXgRG+K8xY72Z
-jUEAnAmqH2UjBN2csaLpXH8R2KbV8RJT
-=+GvS
+iEYEAREKAAYFAk7OJCAACgkQgAnW8HDreRZu9ACgvLsGLagpYdg7E3xVpi4RMnrH
+XlIAnR5Rrczt4+hIEFgd47+Ou4VyYUsL
+=4gB/
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/punc/files/1.5-linking.patch b/sci-libs/punc/files/1.5-linking.patch
index fb12a29e48e1..9e5d5a8ced69 100644
--- a/sci-libs/punc/files/1.5-linking.patch
+++ b/sci-libs/punc/files/1.5-linking.patch
@@ -1,10 +1,10 @@
- configure.ac            |   29 ++++++++++++-----------------
+ configure.ac            |   35 +++++++++++++++++------------------
  src/aaa_lib/Makefile.am |    7 +++----
  src/pmg/Makefile.am     |    1 +
- 3 files changed, 16 insertions(+), 21 deletions(-)
+ 3 files changed, 21 insertions(+), 22 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1295a9f..e996eb0 100644
+index 1295a9f..f8fd97c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -49,6 +49,8 @@ AC_LANG_C
@@ -16,16 +16,36 @@ index 1295a9f..e996eb0 100644
  AM_PROG_LIBTOOL
  
  dnl 3. checks for libraries
-@@ -358,7 +360,7 @@ else
+@@ -341,6 +343,10 @@ if test -n "${blas}"; then
+ else
+     AC_MSG_RESULT([no ...poking around])
+    
++	PKG_CHECK_MODULES([BLAS],[blas],[
++	blas_lib=${BLAS_LIBS}
++	blas=""
++	],[
+     dnl # BLAS library location ENV specification
+     AC_MSG_CHECKING([whether your environment defines FETK_BLAS_LIBRARY])
+     if test -n "${FETK_BLAS_LIBRARY}"; then
+@@ -358,7 +364,7 @@ else
      AC_CHECK_LIB(blas,dscal_,
          [blas_use="yes";blas_lib="${blas_lib_path}-lblas"],
          [blas_use="";blas_lib=""],
 -        [${blas_lib_path}-lblas -lvf2c])
-+        [${blas_lib_path}-lblas])
++        [${blas_lib_path} $(BLAS_LIBS)])
      if test -z "${blas_use}"; then
          AC_MSG_RESULT([** BLAS library missing ...will BUILD **])
          blas="blas";
-@@ -414,7 +416,7 @@ dnl lapack_use="";
+@@ -368,7 +374,7 @@ else
+     fi
+    
+     dnl # Return LDFLAGS to normal
+-    LDFLAGS=${LDFLAGS_SAVE};
++    LDFLAGS=${LDFLAGS_SAVE};])
+ fi
+ 
+ dnl # Final decisions on BLAS
+@@ -414,7 +420,7 @@ dnl lapack_use="";
  dnl AC_CHECK_LIB(lapack,dsysv_,
  dnl     [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack"],
  dnl     [lapack_use="";lapack_lib=""],
@@ -34,7 +54,7 @@ index 1295a9f..e996eb0 100644
  dnl if test -z "${lapack_use}"; then
  dnl     AC_MSG_RESULT([** LAPACK library missing ...will BUILD **])
  dnl     lapack="lapack";
-@@ -466,10 +468,10 @@ else
+@@ -466,10 +472,10 @@ else
      LDFLAGS_SAVE=${LDFLAGS};
      LDFLAGS=${amd_lib_path};
      amd_use="";
@@ -47,7 +67,7 @@ index 1295a9f..e996eb0 100644
      if test -z "${amd_use}"; then
          AC_MSG_RESULT([** AMD library missing ...will BUILD **])
          amd="amd";
-@@ -521,10 +523,10 @@ else
+@@ -521,10 +527,10 @@ else
      LDFLAGS_SAVE=${LDFLAGS};
      LDFLAGS=${umfpack_lib_path};
      umfpack_use="";
@@ -60,7 +80,7 @@ index 1295a9f..e996eb0 100644
      if test -z "${umfpack_use}"; then
          AC_MSG_RESULT([** UMFPACK library missing ...will BUILD **])
          umfpack="umfpack";
-@@ -579,7 +581,7 @@ else
+@@ -579,7 +585,7 @@ else
      AC_CHECK_LIB(superlu,Destroy_SuperMatrix_Store,
          [superlu_use="yes";superlu_lib="${superlu_lib_path}-lsuperlu"],
          [superlu_use="";superlu_lib=""],
@@ -69,7 +89,7 @@ index 1295a9f..e996eb0 100644
      if test -z "${superlu_use}"; then
          AC_MSG_RESULT([** SUPERLU library missing ...will BUILD **])
          superlu="superlu";
-@@ -635,7 +637,7 @@ dnl arpack_use="";
+@@ -635,7 +641,7 @@ dnl arpack_use="";
  dnl AC_CHECK_LIB(arpack,dsgets_,
  dnl     [arpack_use="yes";arpack_lib="${arpack_lib_path}-larpack"],
  dnl     [arpack_use="";arpack_lib=""],
@@ -78,7 +98,7 @@ index 1295a9f..e996eb0 100644
  dnl if test -z "${arpack_use}"; then
  dnl     AC_MSG_RESULT([** ARPACK library missing ...will BUILD **])
  dnl     arpack="arpack";
-@@ -691,7 +693,7 @@ dnl cgcode_use="";
+@@ -691,7 +697,7 @@ dnl cgcode_use="";
  dnl AC_CHECK_LIB(cgcode,scgdrv_,
  dnl     [cgcode_use="yes";cgcode_lib="${cgcode_lib_path}-lcgcode"],
  dnl     [cgcode_use="";cgcode_lib=""],
@@ -87,7 +107,7 @@ index 1295a9f..e996eb0 100644
  dnl if test -z "${cgcode_use}"; then
  dnl     AC_MSG_RESULT([** CGCODE library missing ...will BUILD **])
  dnl     cgcode="cgcode";
-@@ -747,7 +749,7 @@ dnl pmg_use="";
+@@ -747,7 +753,7 @@ dnl pmg_use="";
  dnl AC_CHECK_LIB(pmg,buildg_,
  dnl     [pmg_use="yes";pmg_lib="${pmg_lib_path}-lpmg"],
  dnl     [pmg_use="";pmg_lib=""],
@@ -96,7 +116,7 @@ index 1295a9f..e996eb0 100644
  dnl if test -z "${pmg_use}"; then
  dnl     AC_MSG_RESULT([** PMG library missing ...will BUILD **])
  dnl     pmg="pmg";
-@@ -986,13 +988,6 @@ AC_OUTPUT([
+@@ -986,13 +992,6 @@ AC_OUTPUT([
      src/base/Makefile
  
      src/vf2c/Makefile
diff --git a/sci-libs/punc/metadata.xml b/sci-libs/punc/metadata.xml
index cc35dc3a4a07..6a2ed5438995 100644
--- a/sci-libs/punc/metadata.xml
+++ b/sci-libs/punc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<longdescription>
+	<herd>sci</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
 	PUNC (Portable Understructure for Numerical Computing) is a small standard
 	collection of software libraries for numerical computing. The PUNC
 	collection includes reference implementations of the standard (dense matrix)
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index 9b3a8f4d41bb..61eb3aea945c 100644
--- a/sci-libs/punc/punc-1.5.ebuild
+++ b/sci-libs/punc/punc-1.5.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/sci-libs/punc/punc-1.5.ebuild,v 1.4 2011/06/21 14:46:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.5 2011/11/24 11:01:47 jlec Exp $
 
 EAPI="3"
 
@@ -73,6 +73,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable debug vdebug) \
+		--enable-vf2cforce \
 		--enable-shared \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--disable-triplet \