boost: update icu option

2 files changed, 9 insertions, 15 deletions

diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 14d95e4cb..a50fde236 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -18,26 +18,20 @@ class Boost < Formula
   env :userpaths
 
   option :universal
-  option 'with-icu', 'Build regexp engine with icu support'
+  option 'with-icu4c', 'Build regexp engine with icu support'
   option 'without-single', 'Disable building single-threading variant'
   option 'without-static', 'Disable building static library variant'
   option 'with-mpi', 'Build with MPI support'
   option :cxx11
 
-  if build.with? 'icu'
-    if build.cxx11?
-      depends_on 'icu4c' => 'c++11'
-    else
-      depends_on 'icu4c'
-    end
-  end
+  deprecated_option "with-icu" => "with-icu4c"
 
-  if build.with? 'mpi'
-    if build.cxx11?
-      depends_on 'open-mpi' => 'c++11'
-    else
-      depends_on :mpi => [:cc, :cxx, :optional]
-    end
+  if build.cxx11?
+    depends_on "icu4c" => [:optional, "c++11"]
+    depends_on "open-mpi" => "c++11" if build.with? "mpi"
+  else
+    depends_on "icu4c" => :optional
+    depends_on :mpi => [:cc, :cxx, :optional]
   end
 
   fails_with :llvm do
diff --git a/Library/Formula/freeling.rb b/Library/Formula/freeling.rb
index c45e5bb03..499084830 100644
--- a/Library/Formula/freeling.rb
+++ b/Library/Formula/freeling.rb
@@ -15,7 +15,7 @@ class Freeling < Formula
   end
 
   depends_on "icu4c"
-  depends_on "boost" => "with-icu"
+  depends_on "boost" => "with-icu4c"
   depends_on "libtool" => :build
 
   def install