Fixes parallell make with -j2 (real this time), uses FFLAGS for fortran 90 and do not remove .la files.

Package-Manager: portage-2.1.3.9

4 files changed, 59 insertions, 30 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 33fe892be2ae..dd7e5139afed 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.37 2007/08/05 12:07:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.38 2007/09/28 11:25:09 bicatali Exp $
+
+  28 Sep 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/netcdf-3.6.2-parallel-make.patch, netcdf-3.6.2.ebuild:
+  Fixes parallell make with -j2 (real this time), uses FFLAGS for fortran 90
+  and do not remove .la files.
 
   05 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org>
   +files/netcdf-3.6.2-parallel-make.patch, -files/gcc3-gentoo.patch,
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index d1b721ff8b28..350421ea2476 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -9,10 +9,10 @@ AUX fPIC.patch 209 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 SHA1 c5e87289
 MD5 46a9de0130f415c3cff34812e9ce6724 files/fPIC.patch 209
 RMD160 f7336b30c070a75335bed8280e5f1505a03ce464 files/fPIC.patch 209
 SHA256 7c24234fdc8b9f4031989949398aa203aafd492d367d71c02e1ce41b5b39d68c files/fPIC.patch 209
-AUX netcdf-3.6.2-parallel-make.patch 475 RMD160 fc042a98b1272c0c7651043ddc18d0c9b93049e0 SHA1 5a20d7df8a72daf3dc0f91fca979f636ee67a43f SHA256 728188ad6f87825229491926fe289fbd9d79728e7322c5602b5b25ab50f34b5b
-MD5 86cd0110db3ec8db4498225887de3e63 files/netcdf-3.6.2-parallel-make.patch 475
-RMD160 fc042a98b1272c0c7651043ddc18d0c9b93049e0 files/netcdf-3.6.2-parallel-make.patch 475
-SHA256 728188ad6f87825229491926fe289fbd9d79728e7322c5602b5b25ab50f34b5b files/netcdf-3.6.2-parallel-make.patch 475
+AUX netcdf-3.6.2-parallel-make.patch 1097 RMD160 fa1c28fd63411d1dbeb1b02a957df58ec3a3f068 SHA1 1a39d8eebc207058f83069fc581043e4638c530e SHA256 57d257a3d736a53b1e1426710a33e121d3d8bc1f2a706ae385c283161ff833c9
+MD5 f5e75abff74c07f4106976fefa36ca3a files/netcdf-3.6.2-parallel-make.patch 1097
+RMD160 fa1c28fd63411d1dbeb1b02a957df58ec3a3f068 files/netcdf-3.6.2-parallel-make.patch 1097
+SHA256 57d257a3d736a53b1e1426710a33e121d3d8bc1f2a706ae385c283161ff833c9 files/netcdf-3.6.2-parallel-make.patch 1097
 DIST netcdf-3.6.1.tar.gz 883888 RMD160 f46c3f65645169db60c8523eb28d498dfb6f7760 SHA1 42dfacab24f2af5fbc16a75769c7295d0b228542 SHA256 15c42a2c698c4e42ee17720701168711d86e97e97311223015d07853fb09249f
 DIST netcdf-3.6.2.tar.gz 5312882 RMD160 dcf1efa90b7479215ac0a2d8dc231d94dddc73d8 SHA1 32fb81f39ffccab539124cc3d5f619965ce42f36 SHA256 feaa7673f369e5fb57fcc51426e2be694228ddcc141fc3fd20399269fb6b9311
 EBUILD netcdf-3.6.1-r1.ebuild 1942 RMD160 42a193cbcdc44a15683990d62c1a81496e5c7347 SHA1 c17acc092474bdfcbe6186bc25da4454e1e887d3 SHA256 6dca89f478be2a2641df69049e7704d8e0dde2202be6a3a5e30788defc0c8189
@@ -23,14 +23,14 @@ EBUILD netcdf-3.6.1.ebuild 1932 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47
 MD5 4d5d4637ad171403872323fe26ab0197 netcdf-3.6.1.ebuild 1932
 RMD160 281ab589d135ac62c4881c4f4ea7f39c39828a47 netcdf-3.6.1.ebuild 1932
 SHA256 22d73c9434ed09b0a060767bcd42097cc568fbcb4809d57defc37d98711a84a8 netcdf-3.6.1.ebuild 1932
-EBUILD netcdf-3.6.2.ebuild 2421 RMD160 13e931dd2ef4609ec3fb6c34ad3fee4de5d8fa51 SHA1 f09267bb26e8d0529ca26a793984257f950e5e41 SHA256 74fac8b73034998ff98d7d97fb0bec0eb9fe0576a7deeea502024941b942ea74
-MD5 600e3189b36bc59034d72d621ea7b609 netcdf-3.6.2.ebuild 2421
-RMD160 13e931dd2ef4609ec3fb6c34ad3fee4de5d8fa51 netcdf-3.6.2.ebuild 2421
-SHA256 74fac8b73034998ff98d7d97fb0bec0eb9fe0576a7deeea502024941b942ea74 netcdf-3.6.2.ebuild 2421
-MISC ChangeLog 8682 RMD160 3bb3fd28d6b3c1d1b5fcdbc64b2e016a7fdfa9eb SHA1 e6131306f4e1f795217fe92de247d5c57599e397 SHA256 4eea6769b7f929a0953a022a0490300fb1416228bda6569f5a61d5c3733056f7
-MD5 ebfd8a45fbddd8c509edfb2634765631 ChangeLog 8682
-RMD160 3bb3fd28d6b3c1d1b5fcdbc64b2e016a7fdfa9eb ChangeLog 8682
-SHA256 4eea6769b7f929a0953a022a0490300fb1416228bda6569f5a61d5c3733056f7 ChangeLog 8682
+EBUILD netcdf-3.6.2.ebuild 2345 RMD160 ae0aede8d40ce9c5fdd68850791c9936940470f1 SHA1 26e194b5f39ee499b519656ccc863e9651327441 SHA256 d21ec0be1e73685c872abdafd03c4b36816dc3daf64e617f8940e061c778d179
+MD5 a07a47361d7dbc9f80206aa688cb243e netcdf-3.6.2.ebuild 2345
+RMD160 ae0aede8d40ce9c5fdd68850791c9936940470f1 netcdf-3.6.2.ebuild 2345
+SHA256 d21ec0be1e73685c872abdafd03c4b36816dc3daf64e617f8940e061c778d179 netcdf-3.6.2.ebuild 2345
+MISC ChangeLog 8909 RMD160 42d85a3f0c267c14f2574b46dca44ab043a9169d SHA1 967ca417e0a2e80a7b193e17f9dfe57943a615db SHA256 e82531f5b0d9a052405e8c0b6cbb4e5a46684171f164aed01beefe2e8143fd7c
+MD5 70290cab639fb8395b131908057b9605 ChangeLog 8909
+RMD160 42d85a3f0c267c14f2574b46dca44ab043a9169d ChangeLog 8909
+SHA256 e82531f5b0d9a052405e8c0b6cbb4e5a46684171f164aed01beefe2e8143fd7c ChangeLog 8909
 MISC metadata.xml 575 RMD160 638c53aa85064f37973c46069075a55d1cc02c9b SHA1 1b31b9514dc8f1d56c4c9e0bfe58e0d4f6ce2e9e SHA256 4fc8a40dde64837250400a3468add946b4cc8b29b74b9fc2b7b416534dab04f6
 MD5 6e13f312bd19633ba0c7be0f125451f0 metadata.xml 575
 RMD160 638c53aa85064f37973c46069075a55d1cc02c9b metadata.xml 575
@@ -47,7 +47,7 @@ SHA256 7d58e86cb28eae8a59453893dafaaf601d78ab9c2a343b742239cf35916ba816 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGtb1t1ycZbhPLE2ARAp4TAJwLMd5sRye3/ry1WtJywPECANMidwCghwZa
-qowPf4SgUCai12Rqh6qr1f8=
-=MIb8
+iD8DBQFG/OSb1ycZbhPLE2ARAsm/AJ94n7yR+skMtzlNpDGMZ1mrD425ogCgjNtq
++vtReQ3gpE+n5o15HZCUWLk=
+=Q8Z9
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch b/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
index 11b1b61214e3..466bc333c9a0 100644
--- a/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
+++ b/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
@@ -1,15 +1,39 @@
---- f90/Makefile.am	2007/08/04 22:02:56	1.1
-+++ f90/Makefile.am	2007/08/04 22:09:55
-@@ -64,10 +64,12 @@ if UPPER_CASE_MOD
+--- f90/Makefile.am.orig	2007-03-01 19:46:10.000000000 +0000
++++ f90/Makefile.am	2007-09-28 12:11:09.488085153 +0100
+@@ -37,7 +37,7 @@
+ libnetcdff90_la_DEPENDENCIES += netcdf4_func.f90 netcdf4_externals.f90	\
+ netcdf4_visibility.f90 netcdf4_constants.f90 netcdf4.f90
+ 
+-NETCDF_O = netcdf4.o
++NETCDF_ = netcdf4
+ 
+ else # not USE_NETCDF4
+ 
+@@ -48,7 +48,7 @@
+ libnetcdff90_la_SOURCES += netcdf.f90
+ libnetcdff90_la_DEPENDENCIES += netcdf.f90
+ 
+-NETCDF_O = netcdf.o
++NETCDF_ = netcdf
+ 
+ endif # USE_NETCDF4
+ 
+@@ -62,12 +62,14 @@
+ # uppercase. Just to be special.
+ if UPPER_CASE_MOD
  nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
- TYPESIZES.mod: typeSizes.o
- NETCDF.mod: $(NETCDF_O)
-+$(NETCDF_O): TYPESIZES.mod
+-TYPESIZES.mod: typeSizes.o
+-NETCDF.mod: $(NETCDF_O)
++TYPESIZES.mod: typeSizes.o typeSizes.lo
++NETCDF.mod: $(NETCDF_).o $(NETCDF_).lo
++$(NETCDF_).o : TYPESIZES.mod
  else
  nodist_include_HEADERS = typesizes.mod netcdf.mod 
- typesizes.mod: typeSizes.o
- netcdf.mod: $(NETCDF_O)
-+$(NETCDF_O): typesizes.mod
+-typesizes.mod: typeSizes.o
+-netcdf.mod: $(NETCDF_O)
++typesizes.mod: typeSizes.o typeSizes.lo
++netcdf.mod: $(NETCDF_).o $(NETCDF_).lo
++$(NETCDF_).o : typesizes.mod
  endif
  
  # This is what we are building: a convenience library of F90 functions.
diff --git a/sci-libs/netcdf/netcdf-3.6.2.ebuild b/sci-libs/netcdf/netcdf-3.6.2.ebuild
index 124b6f1e43aa..d35367185a6e 100644
--- a/sci-libs/netcdf/netcdf-3.6.2.ebuild
+++ b/sci-libs/netcdf/netcdf-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.2.ebuild,v 1.4 2007/08/05 12:07:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.2.ebuild,v 1.5 2007/09/28 11:25:09 bicatali Exp $
 
 inherit fortran eutils toolchain-funcs flag-o-matic autotools
 
@@ -19,8 +19,8 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	if use fortran ; then
-	    FORTRAN="gfortran ifc g77 pgf77 pgf90"
-	    fortran_pkg_setup
+		FORTRAN="gfortran ifc g77 pgf77 pgf90"
+		fortran_pkg_setup
 	fi
 }
 
@@ -35,7 +35,6 @@ src_compile() {
 	use debug || append-cppflags -DNDEBUG
 	local myconf
 	if use fortran; then
-		# cfortran CPPFLAGS are now automatically set by the configure script
 		case "${FORTRANC}" in
 			g77)
 				myconf="${myconf} --enable-f77 --disable-f90"
@@ -59,6 +58,8 @@ src_compile() {
 				export F90FLAGS="-i4  ${F90FLAGS}"
 				;;
 		esac
+		# fortran 90 uses FCFLAGS
+		export FCFLAGS="${FFLAGS:--O2}"
 	else
 		myconf="${myconf} --disable-f77 --disable-f90"
 	fi
@@ -73,7 +74,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	find "${D}usr/$(get_libdir)" -name \*.la -exec rm -f {} \;
 
 	dodoc README RELEASE_NOTES VERSION || die "dodoc failed"
 	# keep only pdf,txt and html docs, info were already installed