5 files changed, 19 insertions, 122 deletions
diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index ed728d7b0400..b25a33a1bdeb 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.62 2009/12/07 08:59:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.63 2009/12/07 17:53:00 bicatali Exp $
+
+  07 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/netcdf-3.6.2-as-needed.patch, -files/netcdf-3.6.2-gcc43.patch,
+  -files/netcdf-3.6.2-parallel-make.patch, netcdf-3.6.3.ebuild:
+  Cleaning and added same trick for parallel build in 3.6.3 as in 4.0.1
 
 *netcdf-4.0.1 (07 Dec 2009)
 
diff --git a/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch b/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch
deleted file mode 100644
index 8f2bef7d9ff4..000000000000
--- a/sci-libs/netcdf/files/netcdf-3.6.2-as-needed.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./cxx/Makefile.am.orig	2007-12-06 17:12:03.352615935 +0000
-+++ ./cxx/Makefile.am	2007-12-06 17:12:41.830808682 +0000
-@@ -88,6 +88,7 @@
- 
- # Library source.
- libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp
-+libnetcdf_c___la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
- 
- test: check
- 
---- ./fortran/Makefile.am.orig	2007-12-06 17:11:59.140375893 +0000
-+++ ./fortran/Makefile.am	2007-12-06 17:13:18.480897252 +0000
-@@ -35,6 +35,7 @@
- # (it's generated by the configure script from nfconfig.in), or if
- # netcdf.inc has changed.
- libnetcdff_la_DEPENDENCIES = nfconfig.inc netcdf.inc 
-+libnetcdff_la_LIBADD = $(top_builddir)/libsrc/libnetcdf.la
- 
- # Is the user building netCDF-4?
- if USE_NETCDF4
-@@ -71,7 +72,7 @@
- 
- # If F90 is built, include it's convenience library.
- if BUILD_F90
--libnetcdff_la_LIBADD = ../f90/libnetcdff90.la
-+libnetcdff_la_LIBADD += ../f90/libnetcdff90.la
- endif
- 
- # If we are building the dll (under MinGW) then set the correct flags.
---- ./Makefile.am.orig	2007-12-06 17:11:55.140147933 +0000
-+++ ./Makefile.am	2007-12-06 17:12:41.830808682 +0000
-@@ -57,7 +57,7 @@
- # This is the list of subdirs for which Makefiles will be constructed
- # and run. ncgen must come before ncdump and cxx, because their tests
- # depend on it. nf_test depends upon ncgen as well.
--SUBDIRS = $(F90_DIR) $(F77_DIR) libsrc $(V2_TEST) $(NCGEN) $(NCDUMP)	\
-+SUBDIRS = libsrc $(F90_DIR) $(F77_DIR) $(V2_TEST) $(NCGEN) $(NCDUMP)	\
- $(F77_TEST) ${CXX_DIR} nc_test $(MAN) $(EXAMPLES)
- 
- # make test should do the same as make check.
diff --git a/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch b/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch
deleted file mode 100644
index 60fd5b895292..000000000000
--- a/sci-libs/netcdf/files/netcdf-3.6.2-gcc43.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- cxx/ncvalues.cpp.orig	2008-01-25 09:15:53.766455735 +0000
-+++ cxx/ncvalues.cpp	2008-01-25 09:16:07.888196889 +0000
-@@ -9,7 +9,7 @@
- 
- #include <config.h>
- #include <iostream>
--#include <string>
-+#include <cstring>
- 
- #include "ncvalues.h"
- 
---- examples/CXX/sfc_pres_temp_rd.cpp.orig	2009-01-15 13:10:38.866169747 +0000
-+++ examples/CXX/sfc_pres_temp_rd.cpp	2009-01-15 13:11:21.301635873 +0000
-@@ -17,6 +17,7 @@
- */
- 
- #include <iostream>
-+#include <cstring>
- #include <netcdfcpp.h>
- 
- using namespace std;
---- examples/CXX/sfc_pres_temp_wr.cpp.orig	2009-01-15 13:10:28.031052831 +0000
-+++ examples/CXX/sfc_pres_temp_wr.cpp	2009-01-15 13:11:07.535199220 +0000
-@@ -17,6 +17,7 @@
- */
- 
- #include <iostream>
-+#include <cstring>
- #include <netcdfcpp.h>
- 
- using namespace std;
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
deleted file mode 100644
index 17fdbfec11a4..000000000000
--- a/sci-libs/netcdf/files/netcdf-3.6.2-parallel-make.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- f90/Makefile.am.orig	2007-03-01 19:46:10.000000000 +0000
-+++ f90/Makefile.am	2007-09-29 09:09:39.626908874 +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,16 @@
- # uppercase. Just to be special.
- if UPPER_CASE_MOD
- nodist_include_HEADERS = TYPESIZES.mod NETCDF.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
-+$(NETCDF_).lo : TYPESIZES.mod
- else
- nodist_include_HEADERS = typesizes.mod netcdf.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
-+$(NETCDF_).lo : typesizes.mod
- endif
- 
- # This is what we are building: a convenience library of F90 functions.
diff --git a/sci-libs/netcdf/netcdf-3.6.3.ebuild b/sci-libs/netcdf/netcdf-3.6.3.ebuild
index c358717a54dd..cdfda127fb1c 100644
--- a/sci-libs/netcdf/netcdf-3.6.3.ebuild
+++ b/sci-libs/netcdf/netcdf-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.11 2009/12/07 08:59:30 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.12 2009/12/07 17:53:00 bicatali Exp $
 
 EAPI=2
 
@@ -65,24 +65,28 @@ src_configure() {
 		myconf="${myconf} --disable-f77 --disable-f90"
 	fi
 
-	# otherwise fortran/fort-nc4.c is not compiled and package fails
-	#  tests with --as-needed
-	if use hdf5; then
-		myconf="${myconf} --with-hdf5=/usr"
-	fi
-
 	econf \
 		--enable-shared \
 		--docdir=/usr/share/doc/${PF} \
 		$(use_enable fortran separate-fortran ) \
-		$(use_enable hdf5 netcdf-4 ) \
 		$(use_enable doc docs-install) \
 		${myconf}
 }
 
+
+src_compile() {
+	# hack to allow parallel build
+	if use doc; then
+		emake pdf || die "emake pdf failed"
+		cd man4
+		emake -j1 || die "emake doc failed"
+		cd ..
+	fi
+	emake || die "emake failed"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-
 	dodoc README RELEASE_NOTES VERSION || die "dodoc failed"
 	# keep only pdf,txt and html docs, info were already installed
 	if use doc; then