1 files changed, 9 insertions, 9 deletions
diff --git a/Library/Formula/boost149.rb b/Library/Formula/boost149.rb
index 1c81df650..c1c41a2d5 100644
--- a/Library/Formula/boost149.rb
+++ b/Library/Formula/boost149.rb
@@ -1,7 +1,7 @@
 require 'formula'
 
 class UniversalPython < Requirement
-  satisfy { archs_for_command("python").universal? }
+  satisfy(:build_env => false) { archs_for_command("python").universal? }
 
   def message; <<-EOS.undent
     A universal build was requested, but Python is not a universal build
@@ -23,12 +23,12 @@ class Boost149 < Formula
 
   option :universal
   option 'with-mpi', 'Enable MPI support'
-  option 'without-python', 'Build without Python'
-  option 'with-icu', 'Build regexp engine with icu support'
+  option 'with-icu4c', 'Build regexp engine with icu support'
 
-  depends_on UniversalPython if build.universal? and not build.include? "without-python"
-  depends_on "icu4c" if build.include? "with-icu"
-  depends_on MPIDependency.new(:cc, :cxx) if build.include? "with-mpi"
+  depends_on :python => :recommended
+  depends_on UniversalPython if build.universal? and build.with? "python"
+  depends_on "icu4c" => :optional
+  depends_on MPIDependency.new(:cc, :cxx) if build.with? "mpi"
 
   fails_with :llvm do
     build 2335
@@ -50,13 +50,13 @@ class Boost149 < Formula
     # Force boost to compile using the appropriate GCC version
     open("user-config.jam", "a") do |file|
       file.write "using darwin : : #{ENV.cxx} ;\n"
-      file.write "using mpi ;\n" if build.include? 'with-mpi'
+      file.write "using mpi ;\n" if build.with? 'mpi'
     end
 
     # we specify libdir too because the script is apparently broken
     bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"]
 
-    if build.include? 'with-icu'
+    if build.with? 'icu4c'
       icu4c_prefix = Formula.factory('icu4c').opt_prefix
       bargs << "--with-icu=#{icu4c_prefix}"
     else
@@ -73,7 +73,7 @@ class Boost149 < Formula
             "install"]
 
     args << "address-model=32_64" << "architecture=x86" << "pch=off" if build.universal?
-    args << "--without-python" if build.include? "without-python"
+    args << "--without-python" if build.without? 'python'
 
     system "./bootstrap.sh", *bargs
     system "./bjam", *args