Pre-patch the Makefile rather tha after econf (might fix an install failure).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 31 insertions, 12 deletions

diff --git a/sci-libs/punc/ChangeLog b/sci-libs/punc/ChangeLog
index c0254705a4d5..fcfe17a0f869 100644
--- a/sci-libs/punc/ChangeLog
+++ b/sci-libs/punc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/punc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.2 2010/06/09 11:41:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/ChangeLog,v 1.3 2010/07/28 15:16:45 flameeyes Exp $
+
+  28 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org> punc-0.2_p1.ebuild,
+  +files/punc-0.2_p1-libdir.patch:
+  Pre-patch the Makefile rather tha after econf (might fix an install
+  failure).
 
   09 Jun 2010; Justin Lecher <jlec@gentoo.org> punc-0.2_p1.ebuild:
   Force mpi USE to be equal with deps
diff --git a/sci-libs/punc/Manifest b/sci-libs/punc/Manifest
index 8f78d7e19bc2..25493aed7dc0 100644
--- a/sci-libs/punc/Manifest
+++ b/sci-libs/punc/Manifest
@@ -3,14 +3,15 @@ Hash: SHA1
 
 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 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
-EBUILD punc-0.2_p1.ebuild 1704 RMD160 8a72ce490ad6266820bc0b9f9ad49e1e5f6ce972 SHA1 bed83c70973e89bf507dcff7bacbe373bd2af150 SHA256 6d996c343695fcc3a813c4797fab8508e27e402c32920cf1343e322be16ca183
-MISC ChangeLog 499 RMD160 a19fc0eedebf2b194d0770530f6f6206998be03c SHA1 4ef51d8bf3e206048bb160f711bd5280b172db62 SHA256 008cd1013bb9e802f8dca12f67b9a0a9485d15936074dcd407956119df959614
+EBUILD punc-0.2_p1.ebuild 1586 RMD160 90c158e9ddd5b01eb8778bc0a309766b6b7e426f SHA1 d67d702da457af4deb3d51d942f2057c04d6eac4 SHA256 1b1e912fad8d47e7625187ba3a961f07bc47822721f342ceab310b732f9d8ba3
+MISC ChangeLog 698 RMD160 114309124ba6f3cfdf0c14414d58a80c320e2882 SHA1 22f52eb7cc4d172ef413100415c5d6c76203ab65 SHA256 8b6a28ac5f1052ae0278d36a9e05d9e434da2a3ab51757d7b3e163266aa2b314
 MISC metadata.xml 1268 RMD160 1c3eeab7f7f1713110d9012f1a32cc1735349521 SHA1 3cd959da5f7e94c760842dd8067b84b563cced77 SHA256 4dcd334a724ddcd75185f52fb0159c6a2aa5bab4c192634dca7685e22977790f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwPfdUACgkQgAnW8HDreRaFHgCgjxxNLlGknmnEVjuXCrW0Ht37
-ptEAoLYLL3VEFRcYOoG7Tv3Nag7FNV6V
-=81G+
+iEYEARECAAYFAkxQSe4ACgkQAiZjviIA2XjDGACePqEI+Bjv2F3mn6IXwm7gCbRu
+siwAoIVagZ+YO0yH7wwAfDL/w5ieq07q
+=ITE3
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/punc/files/punc-0.2_p1-libdir.patch b/sci-libs/punc/files/punc-0.2_p1-libdir.patch
new file mode 100644
index 000000000000..b8a973b3aa2d
--- /dev/null
+++ b/sci-libs/punc/files/punc-0.2_p1-libdir.patch
@@ -0,0 +1,15 @@
+Index: punc/src/aaa_lib/Makefile.am
+===================================================================
+--- punc.orig/src/aaa_lib/Makefile.am
++++ punc/src/aaa_lib/Makefile.am
+@@ -88,8 +88,8 @@ else
+ LIBPMG    = 
+ endif
+ 
+-libdir = ${prefix}/lib/${fetk_cpu_vendor_os}
+-lib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG}
++mylibdir = ${libdir}/${fetk_cpu_vendor_os}
++mylib_LTLIBRARIES = libpunc.la ${LIBVF2C} ${LIBBLAS} ${LIBLAPACK} ${LIBSUPERLU} ${LIBARPACK} ${LIBCGCODE} ${LIBPMG}
+ 
+ libpunc_la_SOURCES =
+ libpunc_la_LIBADD  = ${BASE_LIBS}
diff --git a/sci-libs/punc/punc-0.2_p1.ebuild b/sci-libs/punc/punc-0.2_p1.ebuild
index a06ad8febf8d..f0bd8e6f6325 100644
--- a/sci-libs/punc/punc-0.2_p1.ebuild
+++ b/sci-libs/punc/punc-0.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-0.2_p1.ebuild,v 1.3 2010/06/09 11:41:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/punc/punc-0.2_p1.ebuild,v 1.4 2010/07/28 15:16:46 flameeyes Exp $
 
 EAPI="3"
 
@@ -31,10 +31,12 @@ S="${WORKDIR}/${PN}"
 src_prepare() {
 	rm -rf src/{blas,lapack,arpack,superlu}
 	epatch "${FILESDIR}"/${PV}-underlinking.patch
+	epatch "${FILESDIR}"/${P}-libdir.patch
 
 	cp tools/tests/pmg/*.f src/pmg/ -f
 	cp tools/tests/pmg/*.c src/pmg/ -f
 	cp src/pmg/vpmg.h src/vf2c/punc/vpmg.h
+
 	eautoreconf
 }
 
@@ -53,10 +55,6 @@ src_configure() {
 		--enable-pmgforce \
 		--enable-cgcodeforce \
 		--enable-vf2cforce
-
-	sed -e "s|libdir = \${prefix}/lib/\${fetk_cpu_vendor_os}|libdir = \${prefix}/$(get_libdir)/|" \
-	-i src/aaa_lib/Makefile || \
-	die "failed to patch lib Makefile"
 }
 
 src_install() {