Updated with required patches to stop build failures with packages that

depend on mpi.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 63 insertions, 15 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 75f0cb81f461..57f5bcdeb57a 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.39 2009/07/05 14:45:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.40 2009/09/15 03:30:45 nerdboy Exp $
+
+*mpich2-1.0.8-r1 (15 Sep 2009)
+
+  15 Sep 2009; Steve Arnold <nerdboy@gentoo.org> -mpich2-1.0.8.ebuild,
+  +mpich2-1.0.8-r1.ebuild, +files/mpich2-1.0.8-no-pvfs2.patch:
+  Added back required patches needed for proper shared lib building.
+  (otherwise things like HDF5 barf with unresolved symbols)
 
   05 Jul 2009; Markus Meier <maekke@gentoo.org> mpich2-1.0.8.ebuild:
   amd64 stable, bug #266409
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 7c98bbc228a8..b8752121f6b5 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 AUX mpich2-1.0.3-make-test.patch 741 RMD160 b139d5c92e35c888dba1d196b118c9e4d334cc90 SHA1 98084a742311957e5f4ddb086bd5be868d6f60c5 SHA256 1b4c7ed94504779ec87cabdb6238210545eb7fb352729a39c3cce1bb0df62c67
 AUX mpich2-1.0.3-make.patch 4524 RMD160 1b4d1aaaafacb688ae0118714a36ec12b60e97b6 SHA1 d4466adebd1b7fbd26daed9317a75ba2d6ae9c7c SHA256 6180fa27369462b0d6fdcdf35a02401d7fc0b7bc1856bdf104ddf74c0de233f1
@@ -13,6 +10,7 @@ AUX mpich2-1.0.6-no-pvfs2.patch 1014 RMD160 627224ce6f4093ef5624107d53211b4de9c4
 AUX mpich2-1.0.6-shlib.patch 1576 RMD160 b68da396b97cfce783e5439eb53388c96ee74bef SHA1 0f6f7f929d69ec70c5ec14a785c4388a032166b7 SHA256 32ed3e4fa4048b3efcea3db55326c89ccb50bf86d0928e6fc8b0b3e715702089
 AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 RMD160 5b9904ae02f1c1098fdfd2dc4717610f89469afd SHA1 a33bcefa87d990a678436ebfac70976069a7f90d SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced
 AUX mpich2-1.0.8-mpdconf-env.patch 5041 RMD160 c3d9f6ebd43443a24614da030253cf8c503afd59 SHA1 5b453a171f8b1dce93e3c2e675e5b3d4f05514e8 SHA256 b8c81614bba8c748db2ec24a7683d27b3a0430950fecd5644fd1f97f8e5ab2f9
+AUX mpich2-1.0.8-no-pvfs2.patch 1082 RMD160 0e2cc16cd3ebc5e5a82c73160f79f8b310c1de62 SHA1 9239dd3b611813f0f99240916cea7f285d63c92b SHA256 e0f3dbb4ed6f7d4f5ad69deefd18d87e7f90e30aca7bd95e29542c80bb2d4afa
 AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
 AUX mpich2-1.0.8-py26.patch 1341 RMD160 51d9b6ebb1fcce06cabb7ef201ffefcd97e39e3e SHA1 1a7db4a10ef6916f1ab98a38ce3c0de9f1c05725 SHA256 43dfaa60a2822728eae874dc423563aac1e658873702858b5bef237577270331
 AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7279384987722 SHA1 706313c20e1d4d6a4a060c8ac36befdb5ee3b926 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8
@@ -23,13 +21,6 @@ DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1
 EBUILD mpich2-1.0.3-r1.ebuild 6000 RMD160 567b0c8a1490cf027360f64922bb1c7b790febfe SHA1 c3f299110632a25b820fe535523c82ef5916751e SHA256 53a1eb944df4cd7e3298c517ea9d5cd75def1630e6f5fd307d66f01b3295025c
 EBUILD mpich2-1.0.3.ebuild 2809 RMD160 2b55e1f9737baa86305da05949dbab67d47352a3 SHA1 4c1c76a39202f91f859c43647900060fba9328f4 SHA256 65b88fa53a8d68d7f8db72c74badf5f4e8925f700d9affb7c5555562b4bf3ff3
 EBUILD mpich2-1.0.6.ebuild 10906 RMD160 2352bb02c24166018cbbcd4bad9eba9ffa86597b SHA1 c9ba43c633a7bbbe0f29ceba085252ab2d1f7763 SHA256 930a4d98329b2daac7d8ea8f15299125a3c4a8c311a446e831b80aa7eade5c17
-EBUILD mpich2-1.0.8.ebuild 6077 RMD160 6766ab95952012aa0464d726afce4fb871707e81 SHA1 6274128f7e58b0474f14a7be9b08072a07d41bf9 SHA256 693dc5c2395f4e3844b50965e63736fa1d32694b8755cb49acada9e7f50babbe
-MISC ChangeLog 8899 RMD160 109115b73a47538676a9e44c75a9c1fd295c396b SHA1 9972f4443dd749a49be71e88cf9ecc092983c1f4 SHA256 1b0585885eed03e056c55afb77a393cd3b95b6518b1f2b0b3677e18f4f3a5a3e
+EBUILD mpich2-1.0.8-r1.ebuild 6550 RMD160 029749fcdaa92480cc3f4e3d646c029d9bcd91f4 SHA1 2388c6a86ff7aac6bc49ad4d479442cd53fe313a SHA256 dc7e515ee1f1581e1bb9fbe4d924c1b859b50d3cc67eb6e2969edf1d53cc682f
+MISC ChangeLog 9196 RMD160 a6009b7fc0407a7dd2aa4c7d1d56589b67c792ef SHA1 d59589602f41f8b7ba58c34e644230245c157d7c SHA256 53074e10d7371426138ef0126be3bf46c752f0af0f17098311489e1a3100a737
 MISC metadata.xml 668 RMD160 f56f9c5c751af5fa65c848c16dae61f11ad40de6 SHA1 9e5221933dd0c7bd918fa7a4791bb6e0017fba27 SHA256 843b215b79e31646bb4f205a62a612c5a98224845288fadcb8a2e25ecf1d5668
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpQvJAACgkQkKaRLQcq0GKDFQCgpHu0Z3PpWclNh4UhdRbLJ2+H
-H44AoIZvPjD1WezB4CTY6kfGF5qFXwZK
-=B3SP
------END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-no-pvfs2.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-no-pvfs2.patch
new file mode 100644
index 000000000000..6e8b4403288f
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.0.8-no-pvfs2.patch
@@ -0,0 +1,37 @@
+--- src/mpi/romio/configure.orig	2009-09-14 17:30:33.267403501 -0700
++++ src/mpi/romio/configure	2009-09-14 17:39:40.079654437 -0700
+@@ -2033,6 +2033,12 @@
+ # Check whether --with-pvfs2 was given.
+ if test "${with_pvfs2+set}" = set; then
+   withval=$with_pvfs2;
++  if test "x$withval" = "xno" ; then
++    without_pvfs2=yes
++    with_pvfs2=""
++  fi
++else
++  without_pvfs2=yes
+ fi
+ 
+ 
+@@ -7577,11 +7583,16 @@
+ 	if test -n "${with_pvfs2}" -o -n "${file_system_pvfs2}" ; then
+ 		# the user either told us where pvfs is or asked for it in
+ 		# --with-file-system (or both)
+-		CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
+-		LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
+-		ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
+-		FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
+-		file_system_pvfs2=1
++		if test "x$without_pvfs2" = "xyes" ; then
++			ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
++			file_system_pvfs2=0
++		else
++			CFLAGS="$CFLAGS $( $PVFS2_CONFIG --cflags)"
++			LIBS="$LIBS $( $PVFS2_CONFIG --libs)"
++			ROMIO_LIBLIST="$ROMIO_LIBLIST $LIBS"
++			FILE_SYSTEM="pvfs2 $FILE_SYSTEM"
++			file_system_pvfs2=1
++		fi
+ 	fi
+ fi
+ 
diff --git a/sys-cluster/mpich2/mpich2-1.0.8.ebuild b/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
index 43dee079269a..79d994e832f9 100644
--- a/sys-cluster/mpich2/mpich2-1.0.8.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.8-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/sys-cluster/mpich2/mpich2-1.0.8.ebuild,v 1.9 2009/07/05 14:45:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild,v 1.1 2009/09/15 03:30:45 nerdboy Exp $
 
 EAPI=1
 inherit python eutils fortran autotools
@@ -11,7 +11,7 @@ SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PV
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+cxx debug doc fortran pvfs2 threads romio mpi-threads"
 
 COMMON_DEPEND="dev-lang/perl
@@ -106,6 +106,19 @@ src_unpack() {
 	cat aclocal_mpd.m4 "${S}"/confdb/aclocal_subcfg.m4 > aclocal.m4
 	AT_M4DIR=${S}/confdb eautoreconf
 	popd >/dev/null
+
+	# Yes, we still need this to avoid unresolved symbols
+	# and related build errors (eg, with hdf5).
+	# TODO:  Should probably send these upstream too...
+	epatch "${FILESDIR}"/${PN}-1.0.6-shlib.patch
+	epatch "${FILESDIR}"/${PN}-1.0.6-makefile.patch
+	sed -i -e "s:-Lnerdboy::g" Makefile.in || die "sed failed"
+	if use pvfs2; then
+		sed -i -e "s:-laio:-laio -lpvfs2:g" Makefile.in \
+		    || die "sed pvfs2 failed"
+	else
+		epatch "${FILESDIR}"/${P}-no-pvfs2.patch
+	fi
 }
 
 src_compile() {