Add syntax sugar for MPIDependency

Closes #20797.

5 files changed, 5 insertions, 7 deletions

diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 34e7d2c59..a518fd4d9 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -28,7 +28,6 @@ class Boost < Formula
   env :userpaths
 
   option :universal
-  option 'with-mpi', 'Enable MPI support'
   option 'with-icu', 'Build regexp engine with icu support'
   option 'with-c++11', 'Compile using Clang, std=c++11 and stdlib=libc++' if MacOS.version >= :lion
   option 'use-system-layout', 'Use system layout instead of tagged'
@@ -36,7 +35,7 @@ class Boost < Formula
   depends_on :python => :recommended
   depends_on UniversalPython if build.universal? and build.with? "python"
   depends_on "icu4c" if build.with? 'icu'
-  depends_on MPIDependency.new(:cc, :cxx) if build.with? "mpi"
+  depends_on :mpi => [:cc, :cxx, :optional]
 
   fails_with :llvm do
     build 2335
diff --git a/Library/Formula/boost149.rb b/Library/Formula/boost149.rb
index bf9c4659e..9e6207b06 100644
--- a/Library/Formula/boost149.rb
+++ b/Library/Formula/boost149.rb
@@ -22,13 +22,12 @@ class Boost149 < Formula
   env :userpaths
 
   option :universal
-  option 'with-mpi', 'Enable MPI support'
   option 'with-icu', 'Build regexp engine with icu support'
 
   depends_on :python => :recommended
   depends_on UniversalPython if build.universal? and build.with? "python"
   depends_on "icu4c" if build.with? 'icu'
-  depends_on MPIDependency.new(:cc, :cxx) if build.with? "mpi"
+  depends_on :mpi => [:cc, :cxx, :optional]
 
   fails_with :llvm do
     build 2335
diff --git a/Library/Formula/bsponmpi.rb b/Library/Formula/bsponmpi.rb
index 0fd9df5fc..5ee528062 100644
--- a/Library/Formula/bsponmpi.rb
+++ b/Library/Formula/bsponmpi.rb
@@ -6,7 +6,7 @@ class Bsponmpi < Formula
   sha1 '07380f8c4e72a69dddf5deae786ecbb37811b489'
 
   depends_on 'scons' => :build
-  depends_on MPIDependency.new(:cc, :cxx)
+  depends_on :mpi => [:cc, :cxx]
 
   def install
     # Don't install 'CVS' folders from tarball
diff --git a/Library/Formula/hdf5.rb b/Library/Formula/hdf5.rb
index 64f55bbfa..037acce83 100644
--- a/Library/Formula/hdf5.rb
+++ b/Library/Formula/hdf5.rb
@@ -15,7 +15,7 @@ class Hdf5 < Formula
 
   depends_on :fortran if build.include? 'enable-fortran' or build.include? 'enable-fortran2003'
   depends_on 'szip'
-  depends_on MPIDependency.new(:cc, :cxx, :f90) if build.include? "enable-parallel"
+  depends_on :mpi => [:cc, :cxx, :f90] if build.include? "enable-parallel"
 
   def install
     ENV.universal_binary if build.universal?
diff --git a/Library/Formula/konoha.rb b/Library/Formula/konoha.rb
index e0d9324ba..e600f47b1 100644
--- a/Library/Formula/konoha.rb
+++ b/Library/Formula/konoha.rb
@@ -8,7 +8,7 @@ class Konoha < Formula
   option 'tests', 'Verify the build with make test (1 min)'
 
   depends_on 'cmake' => :build
-  depends_on MPIDependency.new(:cc, :cxx)
+  depends_on :mpi => [:cc, :cxx]
   depends_on 'pcre'
   depends_on 'json-c'
   depends_on 'sqlite'