Cleaning and added same trick for parallel build in 3.6.3 as in 4.0.1

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

6 files changed, 24 insertions, 130 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/Manifest b/sci-libs/netcdf/Manifest
index dee805a5bd63..ccd6bf2b9256 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX netcdf-3.6.2-as-needed.patch 1535 RMD160 394331f42b20e6fdc510b669390bc697b60cd07d SHA1 8970375441ba026995e1d517c643117919038486 SHA256 23a18d65be6cdc7521e75db8cca3c09e83854343e33f60d214addff836df3b88
-AUX netcdf-3.6.2-gcc43.patch 777 RMD160 b8da3f864204b21fdf38802c7e2c5256e3922916 SHA1 951ae22ac1eec47c0a755c80d6dc99af2512df66 SHA256 6846bcf8cf213218b93c84b52b7aded1c3f01b9f3d5f2bcb48bcb90391fcb9fa
-AUX netcdf-3.6.2-parallel-make.patch 1159 RMD160 bdc0ab52031c4822aeeb1a4ca93da027920c06f9 SHA1 38776793ab83f39762f1556e4932a0580153dcb7 SHA256 44fc5f7fcad525e53f1405e55b9924126f7214931cbd6f545ab9b8c30e2e8a74
 AUX netcdf-3.6.3-as-needed.patch 1794 RMD160 4b81004e09b1d620ad6fe3450ed3906f214cfa32 SHA1 f3c3809227674cdcdd0ec0ea3236c68cda8e9bf7 SHA256 4bd124aac6f9b3aeedf91b89e713cb1dd035423361ef609e784b17b4b08be645
 AUX netcdf-4.0.1-as-needed.patch 1021 RMD160 89d93f036d9b0c8ebf1d07d35cd2e05b7040d7b5 SHA1 5c3e4e50514a4eb3bf38db69ef619f39de18d725 SHA256 62a243574aed396a26bd79f26f5588fe87af2a2ed6da83533d7f2960e9beb116
 DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a2 SHA1 711e5f2a24e1679b17715398ba58127e50cd7fb3 SHA256 afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1
 DIST netcdf-4.0.1.tar.gz 8018998 RMD160 ba74363bbc4c76fc1bbac578ba4c2af4739b4958 SHA1 96b361de72bcf68eaba42e7e5cf0f92c33d288e9 SHA256 290e377aa2e9419bb50a2fa1038d6e77d36f239a8a9c3be9e3a9319f1e484d19
-EBUILD netcdf-3.6.3.ebuild 2478 RMD160 7ae706e7a1a6d2727237008d39719087ae02639a SHA1 8fc655f6ed6c365898444fb64e779c1519806d7d SHA256 b6809b40a69a9191ace7f56a131873a980b6aec9ad28ff403bffe048a0dbd3d6
+EBUILD netcdf-3.6.3.ebuild 2486 RMD160 46d5bc43caa17cf881bdc34c10900d8934c55dd0 SHA1 4d2adf90cc83c9662ffbc2e902dbf5fa68bfd478 SHA256 5162981d201b260ead1311cee21078b961e2d123f25492c61d28cc07e3d052df
 EBUILD netcdf-4.0.1.ebuild 1594 RMD160 bc92c9ced976af4202c1cb35e0e9e5a8e3ff9507 SHA1 abac2a8f760072c0e20098d75006ade002a83793 SHA256 aa5818b5cd07b5c50bda2196bebcc50e8c36f3cce6e2195b326b09ebc4a2e3e7
-MISC ChangeLog 11885 RMD160 4ed309e64b7ecaf7d51f01177d7ae47f71239ce2 SHA1 569703ff7fdfec85918f1de9d542fe73d9a94504 SHA256 66254307b6641958a0e54e714f864d2b37e6347e89c145b2a903c45dc0b9ce29
+MISC ChangeLog 12149 RMD160 c1e43578cce35ffd828524d275e3b8f278840b18 SHA1 26c9f251f798ae46d44b088a2154c4d07cb8237d SHA256 a5f93798e0d26b6ee1515d827296f245440acf163f834439eafdc3cca86b475c
 MISC metadata.xml 587 RMD160 7d0bee0490ff72907209deedcde696a7fc9c0ff0 SHA1 8db6642b93db40662ed494734ba8932cef3d00fd SHA256 a39e1699cc5a7d344bc90f12a2a89330f82b1d2bf05ea1f295cd8d428950f42c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksczUsACgkQ1ycZbhPLE2BYbwCeP2ScrRaQRVKNztZzu52POvq5
-UU0AoJs5jcS9CInSiDQJtQjqzFXWOgQe
-=cBOF
+iEYEARECAAYFAksdSlYACgkQ1ycZbhPLE2ANqwCdG56NnuH2gYge3Z3h2MXKyTKU
+J7sAmwRvybTZVIzxShKv6ULbKXse4RoU
+=tBv6
 -----END PGP SIGNATURE-----
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