Corrected linking patch

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

4 files changed, 50 insertions, 77 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index 9878d80a70d5..2081f49285c8 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.10 2011/04/16 07:32:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.11 2011/04/17 09:12:22 jlec Exp $
+
+  17 Apr 2011; Justin Lecher <jlec@gentoo.org> files/1.5-linking.patch,
+  punc-1.5.ebuild:
+  Corrected linking patch
 
 *punc-1.5 (16 Apr 2011)
 
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 6fbe091c4b95..39df047e8971 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -6,20 +6,20 @@ AUX 0.2_p1-underlinking.patch 5390 RMD160 a7b54e8bda912e5b1d6f51d4d5242a6c31a7c9
 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 6323 RMD160 204e3b50879e5ff2084d22c4a0bfd326543aabdc SHA1 2c2edef52642a789eea8859ad8a74ba362260366 SHA256 6e897653963009f58cc029798739fbda531657b24dc39c6818a61f68c0120e70
+AUX 1.5-linking.patch 5713 RMD160 f127ff7bddb0dd74ca8f3f6bb9a096895668c543 SHA1 6f8da3cad48d7ed61ab458137ee9b0b9182e7af9 SHA256 9b9e11571c4de7735e2fbbd667c76e53e2cf0f6c3bdcd9115522402ec94570cd
 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 1586 RMD160 90c158e9ddd5b01eb8778bc0a309766b6b7e426f SHA1 d67d702da457af4deb3d51d942f2057c04d6eac4 SHA256 1b1e912fad8d47e7625187ba3a961f07bc47822721f342ceab310b732f9d8ba3
 EBUILD punc-1.4-r1.ebuild 2034 RMD160 eeeea80633371c4d738248ea243f2cc1d9b08e7d SHA1 c47d4980a4af907f1d7ca53a943e70a55ad7615b SHA256 4ce2cb0b5cbc3ca0dbdf38f28d2521b4009fc80292def6bf18aff0c425ccbf14
-EBUILD punc-1.5.ebuild 1992 RMD160 1b3e4b2798cb54b5d904e26882d09a4615718c06 SHA1 6b59deae927777e363ee51a93e04692d29f121c9 SHA256 51cbc5f5ea1f83ee03ce856f2fc557a2b06859581e9d14dc5aafc34e6be4e254
-MISC ChangeLog 1564 RMD160 96015771e361ce95f718e4e5133d9af2206c85df SHA1 f28eb91e44350401ce5c6abb69b09320e2f43f4c SHA256 198b9fc3875bbc717ab1bf4bfd402816ddd68334733e4b3cdbe759ff92c25438
+EBUILD punc-1.5.ebuild 2219 RMD160 01cc5ed171ada83a8d8b768d8eb3759764eeddfb SHA1 c5e3d761a1a229ac88d6bf746171fd311280beee SHA256 861e0015327b93377dc682a316dacd53d14b31dfa36a6173a2bd975de5f5e378
+MISC ChangeLog 1682 RMD160 3b05a4aa7dcc9f7cd1a306c0510c4ed4e3d98a08 SHA1 8d53a5a5dfb3f3af944f3e553ea8ea870e3823a2 SHA256 e87f2b2a34d064f8e47148eb5a75d2f106e9d065cb7f4683fec97f33d0ea1b16
 MISC metadata.xml 1268 RMD160 1c3eeab7f7f1713110d9012f1a32cc1735349521 SHA1 3cd959da5f7e94c760842dd8067b84b563cced77 SHA256 4dcd334a724ddcd75185f52fb0159c6a2aa5bab4c192634dca7685e22977790f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2pRikACgkQgAnW8HDreRYAqwCfWMC5OtGq1hhm6p4Loc8ES6jl
-+58AniLTKmdml82djUGcnENadLpFc3Sv
-=55hP
+iEYEARECAAYFAk2qrvsACgkQgAnW8HDreRZfgQCfaH+v31GVFu/AGKD2GLQpKHCQ
+VQUAoKqWqg+oyIQliJrLWMCPFRctkWBB
+=mkl0
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/punc/files/1.5-linking.patch b/sci-libs/punc/files/1.5-linking.patch
index dd52760ae52f..fb12a29e48e1 100644
--- a/sci-libs/punc/files/1.5-linking.patch
+++ b/sci-libs/punc/files/1.5-linking.patch
@@ -1,16 +1,10 @@
-From 0096d62870e715272dd9d3dc390f274e6b22d4c6 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Sat, 16 Apr 2011 09:03:28 +0200
-Subject: [PATCH 1/3] linking patch
-
----
- configure.ac            |   21 ++++++++-------------
+ configure.ac            |   29 ++++++++++++-----------------
  src/aaa_lib/Makefile.am |    7 +++----
  src/pmg/Makefile.am     |    1 +
- 3 files changed, 12 insertions(+), 17 deletions(-)
+ 3 files changed, 16 insertions(+), 21 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 1295a9f..c9b63cd 100644
+index 1295a9f..e996eb0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -49,6 +49,8 @@ AC_LANG_C
@@ -22,8 +16,30 @@ index 1295a9f..c9b63cd 100644
  AM_PROG_LIBTOOL
  
  dnl 3. checks for libraries
-@@ -469,7 +471,7 @@ else
-     AC_CHECK_LIB(amd,AMD_order,
+@@ -358,7 +360,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])
+     if test -z "${blas_use}"; then
+         AC_MSG_RESULT([** BLAS library missing ...will BUILD **])
+         blas="blas";
+@@ -414,7 +416,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=""],
+-dnl     [${lapack_lib_path}-llapack ${blas_lib} -lvf2c])
++dnl     [${lapack_lib_path}-llapack ${blas_lib}])
+ dnl if test -z "${lapack_use}"; then
+ dnl     AC_MSG_RESULT([** LAPACK library missing ...will BUILD **])
+ dnl     lapack="lapack";
+@@ -466,10 +468,10 @@ else
+     LDFLAGS_SAVE=${LDFLAGS};
+     LDFLAGS=${amd_lib_path};
+     amd_use="";
+-    AC_CHECK_LIB(amd,AMD_order,
++    AC_CHECK_LIB(amd,amd_order,
          [amd_use="yes";amd_lib="${amd_lib_path}-lamd"],
          [amd_use="";amd_lib=""],
 -        [${amd_lib_path}-lamd ${blas_lib} -lvf2c])
@@ -31,8 +47,12 @@ index 1295a9f..c9b63cd 100644
      if test -z "${amd_use}"; then
          AC_MSG_RESULT([** AMD library missing ...will BUILD **])
          amd="amd";
-@@ -524,7 +526,7 @@ else
-     AC_CHECK_LIB(umfpack,UMFPACK_numeric,
+@@ -521,10 +523,10 @@ else
+     LDFLAGS_SAVE=${LDFLAGS};
+     LDFLAGS=${umfpack_lib_path};
+     umfpack_use="";
+-    AC_CHECK_LIB(umfpack,UMFPACK_numeric,
++    AC_CHECK_LIB(umfpack,umfpack_di_numeric,
          [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"],
          [umfpack_use="";umfpack_lib=""],
 -        [${umfpack_lib_path}-lumfpack ${blas_lib} -lvf2c])
@@ -132,58 +152,3 @@ index cae9324..b34ace9 100644
  
  all-local:
  #	-cp -p ${top_srcdir}/src/${THISLIB}/punc/*.h ../aaa_inc/punc/.
--- 
-1.7.3.4
-
-
-From 6ff94c749755b7d3d08d39f8f6ad7fb0044662b9 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Sat, 16 Apr 2011 09:27:38 +0200
-Subject: [PATCH 2/3] linking patch
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c9b63cd..b506c6b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -468,7 +468,7 @@ else
-     LDFLAGS_SAVE=${LDFLAGS};
-     LDFLAGS=${amd_lib_path};
-     amd_use="";
--    AC_CHECK_LIB(amd,AMD_order,
-+    AC_CHECK_LIB(amd,amd_order,
-         [amd_use="yes";amd_lib="${amd_lib_path}-lamd"],
-         [amd_use="";amd_lib=""],
-         [${amd_lib_path}-lamd ${blas_lib}])
--- 
-1.7.3.4
-
-
-From 57724266b8e55979ecd49d2d8cf6de25bb80ea96 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Sat, 16 Apr 2011 09:31:00 +0200
-Subject: [PATCH 3/3] linking patch
-
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b506c6b..9ce379c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -523,7 +523,7 @@ else
-     LDFLAGS_SAVE=${LDFLAGS};
-     LDFLAGS=${umfpack_lib_path};
-     umfpack_use="";
--    AC_CHECK_LIB(umfpack,UMFPACK_numeric,
-+    AC_CHECK_LIB(umfpack,umfpack_di_numeric,
-         [umfpack_use="yes";umfpack_lib="${umfpack_lib_path}-lumfpack"],
-         [umfpack_use="";umfpack_lib=""],
-         [${umfpack_lib_path}-lumfpack ${blas_lib}])
--- 
-1.7.3.4
-
diff --git a/sci-libs/punc/punc-1.5.ebuild b/sci-libs/punc/punc-1.5.ebuild
index 10e7e91850df..b5d5e3108103 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.1 2011/04/16 07:32:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-1.5.ebuild,v 1.2 2011/04/17 09:12:22 jlec Exp $
 
 EAPI="3"
 
@@ -35,6 +35,8 @@ DEPEND="
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
+	sed 's:punc/slu_ddefs.h:superlu/slu_ddefs.h:g' src/superlu/punc/vsuperlu.h > vsuperlu.h || die
+	sed 's:punc/umfpack.h:umfpack.h:g' src/umfpack/punc/vumfpack.h > vumfpack.h || die
 	rm -rf src/{amd,blas,lapack,arpack,superlu,umfpack}
 	epatch \
 		"${FILESDIR}"/${PV}-linking.patch \
@@ -76,7 +78,9 @@ src_configure() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
+	insinto /usr/include/punc
+	doins v*.h || die
 
 	dohtml doc/index.html || die "failed to install html docs"
 }