7 files changed, 14 insertions, 20 deletions
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 806310019d2c..bc8cac237278 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.107 2012/06/10 06:38:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.108 2012/06/25 18:28:11 jsbronder Exp $
+
+  25 Jun 2012; Justin Bronder <jsbronder@gentoo.org> openmpi-1.4.2.ebuild,
+  openmpi-1.4.3.ebuild, openmpi-1.4.4.ebuild, openmpi-1.5.4-r3.ebuild,
+  openmpi-1.5.5.ebuild, openmpi-1.6-r1.ebuild:
+  Drop blockers (sys-cluster/mpich and sys-cluster/lam-mpi) that are no longer
+  in the tree.
 
 *openmpi-1.6-r1 (10 Jun 2012)
 
diff --git a/sys-cluster/openmpi/openmpi-1.4.2.ebuild b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
index 758e28819883..9b44acea53e2 100644
--- a/sys-cluster/openmpi/openmpi-1.4.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.2.ebuild,v 1.17 2011/06/24 15:09:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.2.ebuild,v 1.18 2012/06/25 18:28:11 jsbronder Exp $
 
 EAPI=3
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
@@ -24,8 +24,6 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index c34613a4a864..2aaf6a381287 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-2012 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.14 2012/03/31 17:56:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.3.ebuild,v 1.15 2012/06/25 18:28:11 jsbronder Exp $
 
 EAPI=3
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
@@ -24,8 +24,6 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
 	!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 81d148e02d2c..b70de5f990dd 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
 # 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.1 2012/02/03 20:44:18 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.4.4.ebuild,v 1.2 2012/06/25 18:28:11 jsbronder Exp $
 
 EAPI=3
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
@@ -24,8 +24,6 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
index bdf4af79b38c..18bbfd5fef9b 100644
--- a/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild,v 1.2 2012/04/18 20:35:24 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.4-r3.ebuild,v 1.3 2012/06/25 18:28:11 jsbronder Exp $
 
 EAPI=4
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs
@@ -36,8 +36,6 @@ RDEPEND="
 		!app-text/lcdf-typetools
 	)
 	>=sys-apps/hwloc-1.3
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec"
 DEPEND="${RDEPEND}"
diff --git a/sys-cluster/openmpi/openmpi-1.5.5.ebuild b/sys-cluster/openmpi/openmpi-1.5.5.ebuild
index fb8145533d72..bb20dba7e115 100644
--- a/sys-cluster/openmpi/openmpi-1.5.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.5.ebuild,v 1.2 2012/04/19 20:15:34 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.5.ebuild,v 1.3 2012/06/25 18:28:11 jsbronder Exp $
 
 EAPI=4
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
@@ -47,8 +47,6 @@ REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
 	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
 
 RDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	>=sys-apps/hwloc-1.3
diff --git a/sys-cluster/openmpi/openmpi-1.6-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6-r1.ebuild
index 34cbdef00ee9..25566a065ccf 100644
--- a/sys-cluster/openmpi/openmpi-1.6-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6-r1.ebuild,v 1.1 2012/06/10 06:38:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6-r1.ebuild,v 1.2 2012/06/25 18:28:11 jsbronder Exp $
 
 EAPI=4
 inherit eutils fortran-2 multilib flag-o-matic toolchain-funcs versionator
@@ -47,8 +47,6 @@ REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
 	openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
 
 RDEPEND="
-	!sys-cluster/mpich
-	!sys-cluster/lam-mpi
 	!sys-cluster/mpich2
 	!sys-cluster/mpiexec
 	>=sys-apps/hwloc-1.3