Attempt to fix parallel issues once and for all, wrt #296174 c#14

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

3 files changed, 22 insertions, 5 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 0f3622d26fd5..0ffa5890cd77 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/netcdf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.80 2011/01/25 05:23:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.81 2011/01/29 20:17:39 xarthisius Exp $
+
+  29 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  files/netcdf-4.1.1-parallel-build.patch:
+  Attempt to fix parallel issues once and for all, wrt #296174 c#14
 
   25 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   files/netcdf-4.1.1-parallel-build.patch:
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 6f970f3018ba..46ef5ed8269f 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,14 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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.1.1-fortran.patch 533 RMD160 5237f450bddab15286f4ec4a9abb95953dce437a SHA1 9f5450708b9d7a165d92c3a3545303f2ab797253 SHA256 0b7ed3bc01dfe23fe8eeace124efb3d49e793361a2626e3aeef5bf62c842e5df
 AUX netcdf-4.1.1-implicits.patch 2588 RMD160 1e27a022bb0fb7910bb9940ff2b9410dc0b8550b SHA1 205249ed81d4a09d9ea5bd9936b72c422badece7 SHA256 ffd6d894ea0dc29c56100d9c94fb22e51cb5fe775a41d02aa6367ccf2e091d95
 AUX netcdf-4.1.1-mpi-fix.patch 672 RMD160 3ce460d05e7b665e5cd2b2af5d01a39621da45e6 SHA1 c5ee6d6d36af47e156e5abf3e85fe93319c3008a SHA256 8b891b1ce49442158acb77b48fdaeff203a803ec644dd16fa4e85c14b6debc7c
-AUX netcdf-4.1.1-parallel-build.patch 1277 RMD160 50ab7cb416133e168b9b093a632b98032eade83e SHA1 4731a3300c547b7211e7f2d97c1e1da560bdcffc SHA256 29ac33847631fe3f00f90af4bfd6f2368fb4a595e9035896b23ce76cf26f450a
+AUX netcdf-4.1.1-parallel-build.patch 1311 RMD160 ea8237befdf90fb373a561531decee57c37d0a97 SHA1 d72b15f18d34a53a918746858d5c403f8b60c072 SHA256 e107feb3ae7df1381575e2ce1eac289871bc168ffb56470624a29959af394364
 DIST netcdf-3.6.3.tar.gz 11572512 RMD160 6917caa05adc2fb9dbf2d43354f6dd00914486a2 SHA1 711e5f2a24e1679b17715398ba58127e50cd7fb3 SHA256 afa1a0fa82b9ea33b035257b6e9662b22e135f98b2fd93d5cf030320dfc3ffa1
 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.1.1-r3.ebuild 2172 RMD160 5c7fb3fa65a42dfc7a357149addfd9e42a919cde SHA1 b0b1b918bec9bf0f70ba157c58612040de3b2834 SHA256 593b0685ef728fa3bc934693d1ad5672a51744ef3a5a409c7d1f4197334ae662
 EBUILD netcdf-4.1.1-r4.ebuild 2206 RMD160 f5a67a3a00d336302d494fdb48cc46d2ee965a11 SHA1 1c8adea1cac0a0d0bafd4845d36bd66a0b85bbd0 SHA256 c01563eeeae9de29a6fe8e709fb725d8ef4d0153d497f440618a034aee0c9a43
 EBUILD netcdf-4.1.1.ebuild 1963 RMD160 3e39844a9b490185dca99f309bee84463b4310a6 SHA1 87a21817a8c0ba7d353a8b8dd39bf454bcb8caaf SHA256 2dfedef4cd594e8e9ef2147a3108ff81f841887de0c4caf9bab813dc4dcfca62
-MISC ChangeLog 15318 RMD160 1e205e4f60b6ca49dc768e8219be954eb6b81ff2 SHA1 e70de3bf55b100ad3cfb220cab63c135ca508a1a SHA256 887782ca348d996992a7317f6ab4b313acf85845be680f86f6fa356eb963fe0a
+MISC ChangeLog 15484 RMD160 fa982478ac5b279cad8e206dfd6c749ebed7ef91 SHA1 636fa47340dbd81ee1750d10861b6ab65334876a SHA256 db612d89b051ad10bc9edad04bb4ecda96ac6061f71e3efdeba8d10b34b54e9e
 MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iJwEAQECAAYFAk1Ede0ACgkQIiMqcbOVdxT9kgP+O2/Cb67eMBxrPlPfzerwUPtZ
+6HBKgFLO7N9YQlNEMVikYMlH5UxxpOcWnjPqZPM+fhvn4hFEHiyDZF5eNyI5FoCN
+ftqvMgReMykCIbpFKsZacZo8RlSXDRG7MzWF0GKDFuN+QL2yvopyzzmdqJANJ5ua
+JhtTRODF26VxuCiuAq8=
+=HUR5
+-----END PGP SIGNATURE-----
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
index 0d39c9e69b57..22708e2201e9 100644
--- a/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-parallel-build.patch
@@ -4,7 +4,7 @@ https://bugs.gentoo.org/296174
 
 --- netcdf-4.1.1/f90/Makefile.am
 +++ netcdf-4.1.1/f90/Makefile.am
-@@ -101,17 +101,24 @@
+@@ -101,17 +101,25 @@
  # Some fortran compilers change the file names of .mod files to all
  # uppercase. Just to be special.
  if UPPER_CASE_MOD
@@ -21,7 +21,8 @@ https://bugs.gentoo.org/296174
 +NETCDF_MODULES = typesizes.mod netcdf.mod 
  endif
  
-+$(NETCDF_O): typeSizes.o
++NETCDF_LO := $(NETCDF_O:.o=.lo)
++$(NETCDF_LO): typeSizes.o
 +install-data-local:
 +	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 +	@list='$(NETCDF_MODULES)'; test -n "$(includedir)" || list=; \