Set CC=mpicc when building with mpi enabled (bug #286353), added --enabled-shared which was disabled with mpi enabled (bug #287124), and added slashes in destdir patch

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

4 files changed, 33 insertions, 15 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index f8e11abaa7f4..ad3b8a077406 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/hdf5
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.40 2009/10/01 19:27:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.41 2009/10/02 16:09:26 bicatali Exp $
+
+  02 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> hdf5-1.8.3-r1.ebuild,
+  files/hdf5-1.8.3-destdir.patch:
+  Set CC=mpicc when building with mpi enabled (bug #286353), added
+  --enabled-shared which was disabled with mpi enabled (bug #287124), and
+  added slashes in destdir patch
 
   01 Oct 2009; Tobias Klausmann <klausman@gentoo.org> hdf5-1.8.3-r1.ebuild:
   Keyworded on alpha, bug #285148
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 7233cd0f62b8..1a378c8be21a 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -1,6 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hdf5-1.6.6-gcc4.3.patch 355 RMD160 109811c4e4d434bfa09ea156e67623e50b0f89a5 SHA1 c0fe43c262723e117572b687d9f3c94910e4fddc SHA256 ca1a16f1df4c58410001ca4b06886f9df47b475100078c5e9208ff7a21ca22c1
 AUX hdf5-1.8.3-as-needed.patch 1909 RMD160 86c153a302d2730d94ab2c741fb71eb66de6b271 SHA1 aafc558d4a5bf58d78ff807f79a81b0f2ef8f8f3 SHA256 11d4fba2970b68666d65e31178f2a07630c0c1f46ef7b18bfa16d49de776a649
-AUX hdf5-1.8.3-destdir.patch 1754 RMD160 2b0130b12bff2c74c9e65766f0afcd5d422022e1 SHA1 98a91a52ceaab919d6a6b3af8b1c6dc017e40296 SHA256 693002516df4d1026833d629a5b647fea57314b9c62f655e631629b5c19cb602
+AUX hdf5-1.8.3-destdir.patch 1758 RMD160 3e8992fa473603d72189b2309ae1be9a66bbdc18 SHA1 a37816332fb9f4b7556435fefcc3b2dade4a4c69 SHA256 d28654fddf341969e2a3ba9878c68d6ca868bae07ff2ff2fa75c636119f9a8d7
 AUX hdf5-1.8.3-gnutools.patch 1352 RMD160 a0a51a484f1ab926f13618093c809b6582da8e7f SHA1 e4121383f2876dea4ba09356ca7d233fe6ac5b2e SHA256 0e6720e736d7103f39edcf8d3fb4a14f40bbee67363e8f167d9b594ef348f197
 AUX hdf5-1.8.3-includes.patch 398 RMD160 5112dd05bebbc702f24fa22aeebc67209a4e6611 SHA1 339137d04a803e25a0cafaa4f4d167a4cbc9a7ae SHA256 cd82d8b3817d83d59054a2a32ce44aca060157095875f6e91c560ab830b32561
 AUX hdf5-1.8.3-noreturn.patch 3222 RMD160 39285ba18447b0f8db22a5f8e9d51a3cd8a8e91e SHA1 c5d8f7528fbe5c0bde0cb0ac5c1dd189559ac140 SHA256 d902cfbda0382b8998506ea765d0795937485c44d8824051275ad668bcbd6565
@@ -19,6 +22,13 @@ EBUILD hdf5-1.6.4.ebuild 2098 RMD160 348a6f05d7677e372688ca5ecdcdea36c90df7c9 SH
 EBUILD hdf5-1.6.5-r1.ebuild 6638 RMD160 b19d0ec9f56fa0ba1423a494798ab79bccc1380d SHA1 ca0a6106c94fd1745e6852b89f4e119d7d10f461 SHA256 c59e90e1383173906eb59d78bb48a57acebc94530e596501db8f6d5ee8268226
 EBUILD hdf5-1.6.6.ebuild 7782 RMD160 2ee70cea539827f28e08f18638703d9a0a87a40e SHA1 cbe8ba966c6435269a84bc120189fb63ac559f8a SHA256 ab6325efffbf410230cf8df6391e33d925c6b0ed9f7b0fcaddf57c8d174ed8fd
 EBUILD hdf5-1.6.7.ebuild 7834 RMD160 7075472110e03e5cb3b2450be55b6553841af1a5 SHA1 4396cd6dfc671ff9963f75a06ff00e7a34448c46 SHA256 ed3dfb77a31b871f430711e266b9844e1032891c5c1c7d53e4a01eb725393973
-EBUILD hdf5-1.8.3-r1.ebuild 2410 RMD160 cd00b136685ccc0bc5e7538c6edb279af868e595 SHA1 fe33d33c1262135ea2057990017bb1970ef9a287 SHA256 4b2c1caf8d3b1e1df5fa3a56a97e87abefaed0571eb170982e47bf41b6bf994a
-MISC ChangeLog 9681 RMD160 80a0351187e467649582506f71bfe56c72b882d6 SHA1 11ee82c060eee576b73d3ca28861052c1772f11f SHA256 d86abb567d7f09d19c57473421ff36d4724789078c2eadd14ad03451a4df420b
+EBUILD hdf5-1.8.3-r1.ebuild 2441 RMD160 f3d696403b0a5d114562b6df85222aac5cbe9e23 SHA1 b628392e13a6c0d0e6fb951660ade85cc920b71a SHA256 33f25a58fd7700895e4d083876161cc83ac4584eeeea9612165166598cf359e0
+MISC ChangeLog 9967 RMD160 0091f9e5be67cb5925026c3f6899b495c4256311 SHA1 9445f8037b9b42e344c0b873c0c4d11377c68201 SHA256 1ae03406b02688137c08d52adbd89d5f15d6290a39b681f226e2253fa84e57b4
 MISC metadata.xml 649 RMD160 1b9a1fca35d2d3f57bd4295590a195d2e185ac7b SHA1 3f660a0e5cbad641be13c544a3ef115121c590fb SHA256 108e74754b00646a4e0196b4c305711e210beb91f64ab3ef188369037bc2eea2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrGJb8ACgkQ1ycZbhPLE2B+owCfWaZuFJFcFVK7STXo+AFX9XcK
+13QAn30nligdUG+pt0hbZahHRtSFR7A6
+=TXH0
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
index 41cf505f1658..82aa2120875c 100644
--- a/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
+++ b/sci-libs/hdf5/files/hdf5-1.8.3-destdir.patch
@@ -5,7 +5,7 @@
  # How to create EXAMPLEDIR if it doesn't already exist
  $(EXAMPLEDIR):
 -	-$(top_srcdir)/bin/mkdirs $@
-+	-$(top_srcdir)/bin/mkdirs $(DESTDIR)$@
++	-$(top_srcdir)/bin/mkdirs $(DESTDIR)/$@
  
  # Install and uninstall rules.  We install the source files, not the
  # example programs themselves.
@@ -14,15 +14,15 @@
  	@for f in X $(INSTALL_FILES); do                                     \
  	  if test $$f != X; then                                             \
 -	    (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\
-+	    (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(EXAMPLEDIR)/. || exit 1);\
++	    (set -x; $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(EXAMPLEDIR)/. || exit 1);\
  	  fi;                                                                \
  	done
  
  uninstall-examples:
 -	@if test -n "$(INSTALL_FILES)" -a -d $(EXAMPLEDIR); then                                 \
 -	  set -x; cd $(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
-+	@if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)$(EXAMPLEDIR); then                                 \
-+	  set -x; cd $(DESTDIR)$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
++	@if test -n "$(INSTALL_FILES)" -a -d $(DESTDIR)/$(EXAMPLEDIR); then                                 \
++	  set -x; cd $(DESTDIR)/$(EXAMPLEDIR) && $(RM) $(INSTALL_FILES);              \
          fi
  
  installcheck-local:
diff --git a/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild
index 7d4f752b40b7..c8ab06a72696 100644
--- a/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.3-r1.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/hdf5/hdf5-1.8.3-r1.ebuild,v 1.3 2009/10/01 19:27:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.3-r1.ebuild,v 1.4 2009/10/02 16:09:26 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -27,12 +27,13 @@ DEPEND="${RDEPEND}
 	sys-process/time"
 
 pkg_setup() {
-	if use mpi && use cxx; then
-		ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
-		ewarn "Will disable cxx interface"
-	fi
-	if use mpi && use fortran; then
-		export FC=mpif90
+	if use mpi; then
+		if use cxx; then
+			ewarn "Simultaneous mpi and cxx is not supported by ${PN}"
+			ewarn "Will disable cxx interface"
+		fi
+		export CC=mpicc
+		use fortran && export FC=mpif90
 	fi
 }
 
@@ -72,6 +73,7 @@ src_configure() {
 		--enable-production \
 		--enable-strict-format-checks \
 		--enable-deprecated-symbols \
+		--enable-shared \
 		$(use_enable fortran) \
 		$(use_enable mpi parallel) \
 		$(use_with szip szlib) \