Fix build with USE=dap and openmpi >= 1.4 wrt #347893 by Juergen Rose <rose@rz.uni-potsdam.de>. Drop old.

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

4 files changed, 45 insertions, 16 deletions

diff --git a/sci-libs/netcdf/ChangeLog b/sci-libs/netcdf/ChangeLog
index 8b554bd67803..2c3c735b50a0 100644
--- a/sci-libs/netcdf/ChangeLog
+++ b/sci-libs/netcdf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.77 2010/12/05 11:38:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/ChangeLog,v 1.78 2010/12/06 12:47:00 xarthisius Exp $
+
+*netcdf-4.1.1-r3 (06 Dec 2010)
+
+  06 Dec 2010; Kacper Kowalik <xarthisius@gentoo.org> -netcdf-4.1.1-r2.ebuild,
+  +netcdf-4.1.1-r3.ebuild, +files/netcdf-4.1.1-mpi-fix.patch:
+  Fix build with USE=dap and openmpi >= 1.4 wrt #347893 by Juergen Rose
+  <rose@rz.uni-potsdam.de>. Drop old.
 
 *netcdf-4.1.1-r2 (05 Dec 2010)
 
diff --git a/sci-libs/netcdf/Manifest b/sci-libs/netcdf/Manifest
index 077a8964fc59..96493974be72 100644
--- a/sci-libs/netcdf/Manifest
+++ b/sci-libs/netcdf/Manifest
@@ -1,23 +1,12 @@
------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-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 1251 RMD160 4510fb75315e3762b6cd288f0cc082fa6c843f85 SHA1 74afa2ca9af5eb082a97e0019dcddc2b4ee40078 SHA256 e69c47d96f5b20320450a0f292966b7eaa72d7aa869e1caf7460a3ea0c72a7d1
 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-r2.ebuild 2138 RMD160 6035234e132c0a4ccb83a06515ca94599ab326ef SHA1 03ecf5b7da3aecd6e1c59442611a0721c2af675b SHA256 f2510899c415ae384b0c6efcd26390dd37372feed5e96a82c4b643013bcaa8ec
+EBUILD netcdf-4.1.1-r3.ebuild 2172 RMD160 5c7fb3fa65a42dfc7a357149addfd9e42a919cde SHA1 b0b1b918bec9bf0f70ba157c58612040de3b2834 SHA256 593b0685ef728fa3bc934693d1ad5672a51744ef3a5a409c7d1f4197334ae662
 EBUILD netcdf-4.1.1.ebuild 1963 RMD160 3e39844a9b490185dca99f309bee84463b4310a6 SHA1 87a21817a8c0ba7d353a8b8dd39bf454bcb8caaf SHA256 2dfedef4cd594e8e9ef2147a3108ff81f841887de0c4caf9bab813dc4dcfca62
-MISC ChangeLog 14579 RMD160 45262f818b93fae3d971a319ba96cc2f8636f281 SHA1 989738b8c1349a6b17bbbc3985a532cac278dd22 SHA256 0d52a7c2a2902e07367a105bcb0eccfd9b91721f080eba705182ba99124f0a4e
+MISC ChangeLog 14863 RMD160 34d3e480891d7bb0ff9a4dd385991c556d5cb4fd SHA1 e2f527e62cf2902d63d5c70931cd75142777a2cc SHA256 627bb2d87f524c303f92fb91a2762d8de5d222dd46305cd28fd1f978699dc76b
 MISC metadata.xml 689 RMD160 ea3463e14f45ed00c810c1ba8b452eb22ed68bc8 SHA1 78128a34222208d7accfdec9e92c75f0ec67ed6a SHA256 31c1ec42edfa2928152c62863bec9f485cf378552ddc9366578aa883dd309f2f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkz7ec8ACgkQIiMqcbOVdxTIvQP8DPb6AvpAdUwCCUpWkyWFqoJM
-X2ts+RVak2Y3FKXIWjw+mMXQ09f5syqGe0wLYMFfznCvfNf3iqYYAlaX7FrhrdbE
-p9aRXkSYRXPKWbYD4vvAbKhYHOZs1nx98hotj9Jlowwx9MylfKPvEtfvqYG5Cg19
-c0Mn+8OZqKIBx8eJ5w4=
-=6P+9
------END PGP SIGNATURE-----
diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch b/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch
new file mode 100644
index 000000000000..4656ef1e3cbc
--- /dev/null
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-mpi-fix.patch
@@ -0,0 +1,32 @@
+Ensure hdf5.h is included before netcdf.h to avoid build error with openmpi >= 1.4.1
+
+--- libsrc4/nc4internal.h
++++ libsrc4/nc4internal.h
+@@ -8,13 +8,13 @@
+ 
+ #include <config.h>
+ #include <stdio.h>
++#include <hdf5.h>
+ #include "error.h"
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <stdarg.h>
+ #include <string.h>
+ #include "netcdf3.h"
+-#include <hdf5.h>
+ #include <netcdf.h>
+ 
+ #ifdef USE_PARALLEL
+--- libncdap4/ncdap4.h
++++ libncdap4/ncdap4.h
+@@ -12,9 +12,9 @@
+ #include <stdio.h>
+ 
+ #include "config.h"
++#include "nc4internal.h"
+ #include "netcdf.h"
+ #include "nc.h"
+-#include "nc4internal.h"
+ #include "ncdap.h"
+ #include "getvara.h"
+ #include "constraints3.h"
diff --git a/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild b/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild
index 7ff69b8aa4a6..105457c697e5 100644
--- a/sci-libs/netcdf/netcdf-4.1.1-r2.ebuild
+++ b/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1-r2.ebuild,v 1.1 2010/12/05 11:38:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/netcdf/netcdf-4.1.1-r3.ebuild,v 1.1 2010/12/06 12:47:00 xarthisius Exp $
 
 EAPI="3"
 
@@ -28,6 +28,7 @@ DOCS=(README RELEASE_NOTES)
 PATCHES=(
 	"${FILESDIR}"/${P}-parallel-build.patch
 	"${FILESDIR}"/${P}-implicits.patch
+	"${FILESDIR}"/${P}-mpi-fix.patch
 )
 
 pkg_setup() {