6 files changed, 18 insertions, 8 deletions
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 65a6b8073e9e..37039cf88828 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.120 2013/07/02 22:53:00 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.121 2013/07/09 22:28:16 jsbronder Exp $
+
+  09 Jul 2013; Justin Bronder <jsbronder@gentoo.org> openmpi-1.4.3.ebuild,
+  openmpi-1.4.4.ebuild, openmpi-1.4.5.ebuild, openmpi-1.6.3.ebuild,
+  openmpi-1.6.4-r1.ebuild:
+  add sys-cluster/mpich blocker
 
   02 Jul 2013; Justin Bronder <jsbronder@gentoo.org> openmpi-1.6.4-r1.ebuild,
   files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch:
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index c86475d28de0..ee8d7d724edf 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.3.ebuild,v 1.18 2013/03/21 04:11:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.3.ebuild,v 1.19 2013/07/09 22:28:16 jsbronder Exp $
 
 EAPI=3
 
@@ -25,6 +25,7 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/openmpi/openmpi-1.4.4.ebuild b/sys-cluster/openmpi/openmpi-1.4.4.ebuild
index 97a0443bddb5..06fd47fdaedf 100644
--- a/sys-cluster/openmpi/openmpi-1.4.4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.4.ebuild,v 1.4 2012/10/16 18:43:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.4.ebuild,v 1.5 2013/07/09 22:28:16 jsbronder Exp $
 
 EAPI=3
 
@@ -27,6 +27,7 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 1903227d6c81..f57c3c7bfa52 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.5.ebuild,v 1.1 2013/03/21 04:11:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.5.ebuild,v 1.2 2013/07/09 22:28:16 jsbronder Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/openmpi/openmpi-1.6.3.ebuild b/sys-cluster/openmpi/openmpi-1.6.3.ebuild
index 8da408085a0a..0df514c798b9 100644
--- a/sys-cluster/openmpi/openmpi-1.6.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.3.ebuild,v 1.1 2012/12/30 14:24:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.3.ebuild,v 1.2 2013/07/09 22:28:16 jsbronder Exp $
 
 EAPI=4
 
@@ -50,6 +50,7 @@ REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
 	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
 
 RDEPEND="
+	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	>=sys-apps/hwloc-1.3
diff --git a/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
index b03b0d15911f..d5961b88f3ec 100644
--- a/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild,v 1.2 2013/07/02 22:53:00 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild,v 1.3 2013/07/09 22:28:16 jsbronder Exp $
 
 EAPI=5
 
@@ -50,6 +50,7 @@ REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
 	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
 
 RDEPEND="
+	!sys-cluster/mpich
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	>=sys-apps/hwloc-1.3