Parallel build fix, #187759

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 32 insertions, 9 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 392343184cec..1d9bbc835f16 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.66 2010/04/27 16:13:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.67 2010/06/22 14:30:06 jlec Exp $
+
+  22 Jun 2010; Justin Lecher <jlec@gentoo.org> netcdf-3.6.3.ebuild,
+  +files/netcdf-3.6.3-parallel.patch:
+  Parallel build fix, #187759
 
 *netcdf-4.1.1 (27 Apr 2010)
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 07e797ea23b2..9d2efbb9380f 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -2,21 +2,22 @@
 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
 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 2486 RMD160 b5d25d437f946983ce39e13955194af9b652e320 SHA1 f410cf368e88abdf6f5704d4597503453cc1d959 SHA256 5f7bdc4d70f126dddce1ed4e771121f93f4e0136c140bb3826ed2139a00ddbc1
+EBUILD netcdf-3.6.3.ebuild 2523 RMD160 694d3afebdb9dd2924f10208b84ce403b94e8156 SHA1 179ae8963dc2a18fa1d478f816710effbc694d58 SHA256 583f194511e4638a52acb489d2044c617e89ff393f61798919320156425599a0
 EBUILD netcdf-4.0.1-r1.ebuild 2001 RMD160 45f50fa0ee8b22ba1a09b45b25997ec38028c79e SHA1 7d04d27927318e6d4521f25f9eddbe24ebba2453 SHA256 a08166183593a2b3ecfd26011c0c2ed70f80e5209e8b50c85edd867e28534559
 EBUILD netcdf-4.1.1.ebuild 1971 RMD160 6b355d3837a96d1bacfc9f2bd58dc3f8712cd983 SHA1 3150293d80229a29aef8901623c3093e3b891488 SHA256 4717c6ba361ea18c90943829eabb95def225e95850635fe67fad87ebb50313f9
-MISC ChangeLog 12818 RMD160 9f94068581b3185acf266ada4ce304999646edda SHA1 2167b9d82c85c57c905bec6039cca03f18d6a170 SHA256 c0cff48e8d1a97c553c011e5059a366441cc606ace23133a0b42fe7227426b6a
+MISC ChangeLog 12950 RMD160 948fb5e96e747451156a1b1e16ed46d31abd170a SHA1 2da88a22dbaa3869f55ad759d3e083e262fecb17 SHA256 e66cf51f22bf52ee00062c17017d9b9f131dc36a095381968e45ba548ff396fb
 MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvXDOYACgkQHB6c3gNBRYcWlACffgB+lVf/Cev1r9V0AZE7vN4I
-5z0AoMrTfaau4N2VvR+d5A3H5IMNCcBO
-=LCBp
+iEYEARECAAYFAkwgyPQACgkQgAnW8HDreRbeygCg0uTrpG/PUSukp54gJl5bjLkw
+zbwAnRwfDducApC8kaQgdajI/ai6c/ko
+=Grne
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch b/sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch
new file mode 100644
index 000000000000..14364b831ccf
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-3.6.3-parallel.patch
@@ -0,0 +1,17 @@
+diff --git a/f90/Makefile.am b/f90/Makefile.am
+index ee56177..e9828eb 100644
+--- a/f90/Makefile.am
++++ b/f90/Makefile.am
+@@ -64,10 +64,12 @@ if UPPER_CASE_MOD
+ nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod
+ TYPESIZES.mod: typeSizes.o
+ NETCDF.mod: $(NETCDF_O)
++BUILT_SOURCES = TYPESIZES.mod
+ else
+ nodist_include_HEADERS = typesizes.mod netcdf.mod 
+ typesizes.mod: typeSizes.o
+ netcdf.mod: $(NETCDF_O)
++BUILT_SOURCES = 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 fd37a24ad0c7..ddc67df3683a 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
+# 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-3.6.3.ebuild,v 1.13 2009/12/07 18:30:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-3.6.3.ebuild,v 1.14 2010/06/22 14:30:06 jlec Exp $
 
 EAPI=2
 
@@ -29,6 +29,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-parallel.patch
 	eautoreconf
 }