Fix parallel build wrt #296174 by MarisN <maris.gis@gmail.com>. Fix implicit function declarations. Drop old.

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

8 files changed, 124 insertions, 138 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index de6dd5117a47..179d80e450c0 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.75 2010/12/01 16:55:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.76 2010/12/04 21:40:09 xarthisius Exp $
+
+*netcdf-4.1.1-r1 (04 Dec 2010)
+
+  04 Dec 2010; Kacper Kowalik <xarthisius@gentoo.org> -netcdf-4.0.1-r1.ebuild,
+  -files/netcdf-4.0.1-as-needed.patch, -files/netcdf-4.0.1-cfortran.patch,
+  -files/netcdf-4.0.1-pkgconfig.patch, +netcdf-4.1.1-r1.ebuild,
+  +files/netcdf-4.1.1-implicits.patch,
+  +files/netcdf-4.1.1-parallel-build.patch:
+  Fix parallel build wrt #296174 by MarisN <maris.gis@gmail.com>. Fix implicit
+  function declarations. Drop old.
 
   01 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> netcdf-3.6.3.ebuild:
   Remove use of fortran eclass
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 7792552200ef..92b73d7e06d0 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -3,21 +3,21 @@ Hash: SHA1
 
 AUX netcdf-3.6.3-as-needed.patch 1794 RMD160 4b81004e09b1d620ad6fe3450ed3906f214cfa32 SHA1 f3c3809227674cdcdd0ec0ea3236c68cda8e9bf7 SHA256 4bd124aac6f9b3aeedf91b89e713cb1dd035423361ef609e784b17b4b08be645
 AUX netcdf-3.6.3-parallel.patch 518 RMD160 840c57498d0dd75f33f1653be0a811248b2c1d18 SHA1 f8a14e3d069c9983bbb9fd3b3ebdd9f480617e2a SHA256 ff26354df395398b70ebb28c26a0478e6a0bff18fdf6b46cece9a619d3df1b97
-AUX netcdf-4.0.1-as-needed.patch 1021 RMD160 89d93f036d9b0c8ebf1d07d35cd2e05b7040d7b5 SHA1 5c3e4e50514a4eb3bf38db69ef619f39de18d725 SHA256 62a243574aed396a26bd79f26f5588fe87af2a2ed6da83533d7f2960e9beb116
-AUX netcdf-4.0.1-cfortran.patch 1395 RMD160 7248f03f0878742b3ce4eeb0a7d793b57706e94d SHA1 806d66be5ef8d964279a61b6717d193a7149ad99 SHA256 1b3c32f346748d2c06f01bdf9558704b85a4a37051b428aa55aa2e595736f271
-AUX netcdf-4.0.1-pkgconfig.patch 1413 RMD160 34a692e62624569b928148ca860d5497366d39a9 SHA1 a4767ff2aa79e591218ffaea73ea17035cef9f88 SHA256 77fa4b00133cceaa753e507a37c53351813191f02b45138b1ce1dc200fcbbd35
+AUX netcdf-4.1.1-implicits.patch 1186 RMD160 11bd2ea587d796ef72735e4388502891b7a1f9c7 SHA1 7fbe9f23584e010679d00c81bf1e244f0694916e SHA256 8de834032c716208219143ec4c8b5dfc84325742129b6e5bc2e9d5efbde74bbe
+AUX netcdf-4.1.1-parallel-build.patch 1251 RMD160 4510fb75315e3762b6cd288f0cc082fa6c843f85 SHA1 74afa2ca9af5eb082a97e0019dcddc2b4ee40078 SHA256 e69c47d96f5b20320450a0f292966b7eaa72d7aa869e1caf7460a3ea0c72a7d1
 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
 DIST netcdf-4.1.1.tar.gz 11201096 RMD160 89b6e1a2115ef348ac83166aa7a50e045fbd98e2 SHA1 6fece208825b978fc2240732f6f57927d71a0552 SHA256 7933d69d378c57f038375bae4dd78c52442a06e2647fce4b75c13a225e342fb0
 EBUILD netcdf-3.6.3.ebuild 2415 RMD160 f5af681e5bf3b635a5a537385d213b97017edaf8 SHA1 125ad71d02a32dcfd014a2dbc2f88c5dccea0b44 SHA256 7e4f33e1a5682a7176f8f08f0cb81e9fe345d0610f3836e99b765d574f074a4f
-EBUILD netcdf-4.0.1-r1.ebuild 2001 RMD160 45f50fa0ee8b22ba1a09b45b25997ec38028c79e SHA1 7d04d27927318e6d4521f25f9eddbe24ebba2453 SHA256 a08166183593a2b3ecfd26011c0c2ed70f80e5209e8b50c85edd867e28534559
+EBUILD netcdf-4.1.1-r1.ebuild 2083 RMD160 ee00cb83807195aea9d39e3ed3465915a549d26b SHA1 9c1448969afb3c61895823ea946add387565844e SHA256 5cd1ff98f7afebf457f07e783facf469874272087b46bd32f493402a4e9a8ca3
 EBUILD netcdf-4.1.1.ebuild 1963 RMD160 3e39844a9b490185dca99f309bee84463b4310a6 SHA1 87a21817a8c0ba7d353a8b8dd39bf454bcb8caaf SHA256 2dfedef4cd594e8e9ef2147a3108ff81f841887de0c4caf9bab813dc4dcfca62
-MISC ChangeLog 13760 RMD160 ed786484c575389898faf2c9e5cb59703d270afe SHA1 8dc1ec7a68142e34619b2d36a599520c199f6822 SHA256 128e5659407dc9334452454a39245d5175d49266b2264b09be39924c9d199ced
+MISC ChangeLog 14210 RMD160 8cc9d6064b6d20267ecaa3248356124c558d8f82 SHA1 bf64779ac8dadfd967f8927635a427bbe69dbeca SHA256 a7f5e540036e2e910f1bf528353a176e9634c13a2e39dd9da1b203452e54ffb6
 MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz2fjQACgkQ1ycZbhPLE2BaawCgmKO75kHSxRv34UfOQoVYeAJW
-jBIAnjOqCtkCb9TiKydnMEO97KJkBVL/
-=VmBz
+iJwEAQECAAYFAkz6tUMACgkQIiMqcbOVdxQPRgQAhtY53NrsSfTGTv8CZsca8lja
+iwqsc0urI+8feSCJzZRLX4d45wpJ4RU/c0IeCPB7USfYG390eYaaAetK0aBCVrzb
+Cq9vVHIPp/2KZUyXHULxhfCHXZMUkxTvjmumVd3eoIW74F3DfH9uVcU2UiPnPsWK
+i2wOmprEkoGqK+ApIY4=
+=oxF+
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch b/sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch
deleted file mode 100644
index b0391c804ec0..000000000000
--- a/sci-libs/netcdf/files/netcdf-4.0.1-as-needed.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- netcdf-4.0.1.orig/libsrc4/Makefile.am	2009-03-26 21:03:16.000000000 +0100
-+++ netcdf-4.0.1/libsrc4/Makefile.am	2009-09-10 22:34:48.245041376 +0200
-@@ -67,6 +67,7 @@
- libnetcdf_la_SOURCES = nc4attr.c nc4internal.c nc4var.c netcdf3.h	\
- nc4dim.c nc4internal.h ncfunc.c nc4file.c netcdf.h error.c error.h	\
- nc4grp.c nc4type.c nc4hdf.c
-+libnetcdf_la_LIBADD += -lhdf5_hl
- 
- # If we are not building separate fortran libraries, then include
- # their functions in the C library.
---- netcdf-4.0.1.orig/cxx4/Makefile.am	2007-08-13 18:05:17.000000000 +0200
-+++ netcdf-4.0.1/cxx4/Makefile.am	2009-09-10 23:45:06.335707145 +0200
-@@ -42,6 +42,7 @@
- # Library source.
- libnetcdf_c__4_la_SOURCES = ncatt.cpp ncdim.cpp ncexception.cpp	\
- ncfile.cpp ncgroup.cpp ncvar.cpp ncvalues.cpp ncvalues.h
-+libnetcdf_c__4_la_LIBADD = $(top_builddir)/libsrc4/libnetcdf.la
- 
- TESTFILES = tst_suiterunner$(EXEEXT) tst_file$(EXEEXT) tst_filerw$(EXEEXT) tst_simple$(EXEEXT)
- tst_suiterunner_SOURCES = tst_suite.cpp tst_suiterunner.cpp tst_suite.h 
diff --git a/sci-libs/netcdf/files/netcdf-4.0.1-cfortran.patch b/sci-libs/netcdf/files/netcdf-4.0.1-cfortran.patch
deleted file mode 100644
index 56b761df1be3..000000000000
--- a/sci-libs/netcdf/files/netcdf-4.0.1-cfortran.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- netcdf-4.0.1.orig/configure.ac	2009-03-26 13:10:02.000000000 +0100
-+++ netcdf-4.0.1/configure.ac	2010-01-28 19:01:47.156238559 +0100
-@@ -801,7 +801,7 @@
-              *)
-                 # If it's a gnu compiler, guess f2c.
-                 if test "x$ac_cv_fc_compiler_gnu" = xyes; then
--                   AC_DEFINE(f2cFortran, [1], [Turned on by netCDF configure.])
-+                   AC_DEFINE(gFortran, [1], [Turned on by netCDF configure.])
-                 fi
-                 ;;
-          esac
-
---- netcdf-4.0.1.orig/fortran/ncfortran.h	2009-02-19 13:50:25.000000000 +0100
-+++ netcdf-4.0.1/fortran/ncfortran.h	2009-09-24 21:10:08.000000000 +0200
-@@ -660,7 +660,7 @@
-  * The following is for f2c-support only.
-  */
- 
--#if defined(f2cFortran) && !defined(pgiFortran)
-+#if defined(f2cFortran) && !defined(pgiFortran) && !defined(gFortran)
- 
- /*
-  * The f2c(1) utility on BSD/OS and Linux systems adds an additional
---- netcdf-4.0.1.orig/nf_test/fortlib.c	2009-09-24 21:11:12.000000000 +0200
-+++ netcdf-4.0.1/nf_test/fortlib.c	2009-09-24 21:11:36.000000000 +0200
-@@ -14,7 +14,7 @@
- #include "../fortran/ncfortran.h"
- 
- 
--#if defined(f2cFortran) && !defined(pgiFortran)
-+#if defined(f2cFortran) && !defined(pgiFortran) && !defined(gFortran)
- /*
-  * The f2c(1) utility on BSD/OS and Linux systems adds an additional
-  * underscore suffix (besides the usual one) to global names that have
diff --git a/sci-libs/netcdf/files/netcdf-4.0.1-pkgconfig.patch b/sci-libs/netcdf/files/netcdf-4.0.1-pkgconfig.patch
deleted file mode 100644
index 4bd940fee82e..000000000000
--- a/sci-libs/netcdf/files/netcdf-4.0.1-pkgconfig.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nru netcdf-4.0.1.orig/configure.ac netcdf-4.0.1/configure.ac
---- netcdf-4.0.1.orig/configure.ac	2009-03-26 12:10:02.000000000 +0000
-+++ netcdf-4.0.1/configure.ac	2010-01-28 22:10:56.000000000 +0000
-@@ -1159,11 +1159,11 @@
- fi
- if test "x$enable_netcdf_4" = xyes ; then 
-    if test "x$HDF5DIR" != x ; then 
--      NC_LIBS="$NC_LIBS -L$HDF5DIR"
-+      NC_LIBS="$NC_LIBS -L$HDF5DIR/lib"
-    fi
-    NC_LIBS="$NC_LIBS -lhdf5_hl -lhdf5 $SZLIB_LIBS"
-    if test "x$ZLIBDIR" != x ; then 
--      NC_LIBS="$NC_LIBS -L$ZLIBDIR"
-+      NC_LIBS="$NC_LIBS -L$ZLIBDIR/lib"
-    fi
-    NC_LIBS="$NC_LIBS -lz $LIBS"
- fi
-diff -Nru netcdf-4.0.1.orig/nc-config.in netcdf-4.0.1/nc-config.in
---- netcdf-4.0.1.orig/nc-config.in	2009-03-18 20:28:46.000000000 +0000
-+++ netcdf-4.0.1/nc-config.in	2010-01-28 21:48:02.000000000 +0000
-@@ -4,9 +4,9 @@
- #
- 
- prefix=@prefix@
--exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
- 
- cc="@CC@"
- cxx="@CXX@"
-diff -Nru netcdf-4.0.1.orig/netcdf.pc.in netcdf-4.0.1/netcdf.pc.in
---- netcdf-4.0.1.orig/netcdf.pc.in	2009-03-19 12:22:33.000000000 +0000
-+++ netcdf-4.0.1/netcdf.pc.in	2010-01-28 22:11:32.000000000 +0000
-@@ -6,7 +6,7 @@
- cppcompiler=@CXX@
- fcompiler=@FC@
- fflags=@FFLAGS@ -I${includedir}
--flibs=@FLIBS@ @NC_FLIBS@
-+flibs=@NC_FLIBS@
- 
- Name: @PACKAGE@
- Description: NetCDF Client Library
diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
new file mode 100644
index 000000000000..bd2982bf3a74
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
@@ -0,0 +1,30 @@
+Fix implicit function declarations
+
+--- libsrc/nc.c
++++ libsrc/nc.c
+@@ -15,7 +15,7 @@
+ #  include <mpp/shmem.h>
+ #  include <intrinsics.h>
+ #endif
+-#ifdef HAVE_UNISTD
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+ 
+--- fortran/fort-nc4.c
++++ fortran/fort-nc4.c
+@@ -30,6 +30,14 @@
+ /* These are in libsrc4/nc4vars.c... */
+ int nc_inq_var_chunking_ints(int ncid, int varid, int *contiguousp, int *chunksizesp);
+ int nc_def_var_chunking_ints(int ncid, int varid, int contiguous, int *chunksizes);
++int nc_set_var_chunk_cache_ints(int ncid, int varid, int size, int nelems, int preemption);
++int nc_get_var_chunk_cache_ints(int ncid, int varid, int *sizep, int *nelemsp, int *preemptionp);
++
++/* These are in libsrc4/nc4file.c... */
++int nc_set_chunk_cache_ints(int size, int nelems, int preemption);
++int nc_get_chunk_cache_ints(int *sizep, int *nelemsp, int *preemptionp);
++int nc_create_par_fortran(const char *path, int cmode, int comm, int info, int *ncidp);
++int nc_open_par_fortran(const char *path, int mode, int comm, int info, int *ncidp);
+ 
+ FCALLSCFUN5(NF_INT, nc_create_par_fortran, NF_CREATE_PAR, nf_create_par,
+ 	    STRING, FINT2CINT, FINT2CINT, FINT2CINT, PCINT2FINT)
diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch b/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
new file mode 100644
index 000000000000..d06e94539664
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
@@ -0,0 +1,38 @@
+Avoid building fortran modules twice, just install them instead.
+
+https://bugs.gentoo.org/296174
+
+--- netcdf-4.1.1/f90/Makefile.am
++++ netcdf-4.1.1/f90/Makefile.am
+@@ -101,17 +101,23 @@
+ # Some fortran compilers change the file names of .mod files to all
+ # uppercase. Just to be special.
+ if UPPER_CASE_MOD
+-nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
+-TYPESIZES.mod: typeSizes.o
+-NETCDF.mod: $(NETCDF_O)
+-BUILT_SOURCES = TYPESIZES.mod
++NETCDF_MODULES = TYPESIZES.mod NETCDF.mod
+ else
+-nodist_include_HEADERS = typesizes.mod netcdf.mod 
+-typesizes.mod: typeSizes.o
+-netcdf.mod: $(NETCDF_O)
+-BUILT_SOURCES = typesizes.mod
++NETCDF_MODULES = typesizes.mod netcdf.mod 
+ endif
+ 
++install-data-local:
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
++	@list='$(NETCDF_MODULES)'; test -n "$(includedir)" || list=; \
++	for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; \
++	done | $(am__base_list) | \
++	while read files; do \
++	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
++	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
++	done
++
+ # This is what we are building: a convenience library of F90 functions.
+ noinst_LTLIBRARIES = libnetcdff90.la
+ 
diff --git a/sci-libs/netcdf/netcdf-4.0.1-r1.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r1.ebuild
index f65123f6a28a..1c19295b6e8e 100644
--- a/sci-libs/netcdf/netcdf-4.0.1-r1.ebuild
+++ b/sci-libs/netcdf/netcdf-4.1.1-r1.ebuild
@@ -1,26 +1,35 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.0.1-r1.ebuild,v 1.6 2010/03/07 18:59:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r1.ebuild,v 1.1 2010/12/04 21:40:09 xarthisius Exp $
 
 EAPI="3"
 
-inherit eutils autotools
+inherit autotools autotools-utils
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
 HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="ftp://ftp.unidata.ucar.edu/pub/netcdf/${P}.tar.gz"
 
 LICENSE="UCAR-Unidata"
 SLOT="0"
-IUSE="doc fortran hdf5 szip cxx"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cxx dap doc fortran hdf5 static-libs szip"
+
+RDEPEND="dap? ( net-misc/curl )
+	hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] )"
 
-RDEPEND="hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] )"
 DEPEND="${RDEPEND}
 	>=sys-devel/libtool-2.2
 	doc? ( virtual/latex-base )
 	fortran? ( dev-lang/cfortran )"
 
+DOCS=(README RELEASE_NOTES)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-parallel-build.patch
+	"${FILESDIR}"/${P}-implicits.patch
+)
+
 pkg_setup() {
 	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
 		export CC=mpicc
@@ -35,11 +44,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-cfortran.patch
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
 	# use system cfortran
 	rm -f fortran/cfortran.h || die
+	if ! use doc; then
+		sed -i -e "/\$(NC_TEST4)/ s/man4//" Makefile.am || die
+	fi
+	autotools-utils_src_prepare
 	eautoreconf
 }
 
@@ -50,31 +60,28 @@ src_configure() {
 		use szip && myconf="${myconf} --with-szlib=${EPREFIX}/usr"
 	fi
 
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--enable-shared \
-		$(use_enable fortran f77) \
-		$(use_enable fortran f90) \
-		$(use_enable cxx) \
-		$(use_enable fortran separate-fortran) \
-		$(use_enable hdf5 netcdf-4) \
-		$(use_enable hdf5 ncgen4) \
-		$(use_enable doc docs-install) \
+	myeconfargs=(
+		--enable-shared
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable dap)
+		$(use_enable static-libs static)
+		$(use_enable fortran f77)
+		$(use_enable fortran f90)
+		$(use_enable cxx)
+		$(use_enable fortran separate-fortran)
+		$(use_enable hdf5 netcdf-4)
+		$(use_enable hdf5 ncgen4)
+		$(use_enable doc docs-install)
 		${myconf}
+	)
+	autotools-utils_src_configure
 }
 
 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 ..
+		emake pdf || die
+		emake -j1 -C man4 || die
 	fi
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README RELEASE_NOTES VERSION
+	autotools-utils_src_compile
 }