use Language::Python.setup_install_args instead of setup_install

8 files changed, 31 insertions, 22 deletions

diff --git a/Library/Formula/ansible.rb b/Library/Formula/ansible.rb
index 988b34450..d2f75df75 100644
--- a/Library/Formula/ansible.rb
+++ b/Library/Formula/ansible.rb
@@ -93,10 +93,6 @@ class Ansible < Formula
   end
 
   def install
-    # pycrypto needs this on 10.8
-    # https://github.com/Homebrew/homebrew/pull/34682#issuecomment-65813603
-    ENV.refurbish_args
-
     ENV["PYTHONPATH"] = libexec/"vendor/lib/python2.7/site-packages"
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
 
@@ -105,7 +101,9 @@ class Ansible < Formula
     res += %w[six requests websocket-client docker-py] # docker support
     res += %w[pyasn1 python-keyczar] # accelerate support
     res.each do |r|
-      resource(r).stage { Language::Python.setup_install "python", libexec/"vendor" }
+      resource(r).stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
     end
 
     inreplace "lib/ansible/constants.py" do |s|
@@ -113,7 +111,7 @@ class Ansible < Formula
       s.gsub! "/etc/ansible", etc/"ansible"
     end
 
-    Language::Python.setup_install "python", libexec
+    system "python", *Language::Python.setup_install_args(libexec)
 
     man1.install Dir["docs/man/man1/*.1"]
     bin.install Dir["#{libexec}/bin/*"]
diff --git a/Library/Formula/awscli.rb b/Library/Formula/awscli.rb
index aa1447135..1780ba80b 100644
--- a/Library/Formula/awscli.rb
+++ b/Library/Formula/awscli.rb
@@ -80,10 +80,12 @@ class Awscli < Formula
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
 
     resources.each do |r|
-      r.stage { Language::Python.setup_install "python", libexec/"vendor" }
+      r.stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
     end
 
-    Language::Python.setup_install "python", libexec
+    system "python", *Language::Python.setup_install_args(libexec)
 
     # Install zsh completion
     zsh_completion.install "bin/aws_zsh_completer.sh" => "_aws"
diff --git a/Library/Formula/cmake.rb b/Library/Formula/cmake.rb
index 7684d25ce..483ae7458 100644
--- a/Library/Formula/cmake.rb
+++ b/Library/Formula/cmake.rb
@@ -75,7 +75,9 @@ class Cmake < Formula
     if build.with? "docs"
       ENV.prepend_create_path "PYTHONPATH", buildpath+"sphinx/lib/python2.7/site-packages"
       resources.each do |r|
-        r.stage { Language::Python.setup_install "python", buildpath/"sphinx" }
+        r.stage do
+          system "python", *Language::Python.setup_install_args(buildpath/"sphinx")
+        end
       end
 
       # There is an existing issue around OS X & Python locale setting
diff --git a/Library/Formula/duplicity.rb b/Library/Formula/duplicity.rb
index 969da86e5..5b0e4f1b3 100644
--- a/Library/Formula/duplicity.rb
+++ b/Library/Formula/duplicity.rb
@@ -50,13 +50,12 @@ class Duplicity < Formula
 
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
     resources.each do |r|
-      r.stage { Language::Python.setup_install "python", libexec/"vendor" }
+      r.stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
     end
 
-    # Prevent clang from dying because of -fno-fused-madd on Mountain Lion
-    ENV.refurbish_args
-
-    Language::Python.setup_install "python", libexec
+    system "python", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
diff --git a/Library/Formula/git-review.rb b/Library/Formula/git-review.rb
index 0b5e9676f..d55d4afc2 100644
--- a/Library/Formula/git-review.rb
+++ b/Library/Formula/git-review.rb
@@ -22,11 +22,11 @@ class GitReview < Formula
   def install
     ENV.prepend_create_path "PYTHONPATH", "#{libexec}/vendor/lib/python2.7/site-packages"
     resource("requests").stage do
-      Language::Python.setup_install "python", libexec/"vendor"
+      system "python", *Language::Python.setup_install_args(libexec/"vendor")
     end
 
     ENV.prepend_create_path "PYTHONPATH", "#{libexec}/lib/python2.7/site-packages"
-    Language::Python.setup_install "python", libexec
+    system "python", *Language::Python.setup_install_args(libexec)
 
     man1.install gzip("git-review.1")
 
diff --git a/Library/Formula/jrnl.rb b/Library/Formula/jrnl.rb
index a7e1a4ecd..931548666 100644
--- a/Library/Formula/jrnl.rb
+++ b/Library/Formula/jrnl.rb
@@ -53,11 +53,13 @@ class Jrnl < Formula
   def install
     ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
     %w[six pycrypto keyring parsedatetime python-dateutil pytz tzlocal].each do |r|
-      resource(r).stage { Language::Python.setup_install "python", libexec/"vendor" }
+      resource(r).stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
     end
 
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
-    Language::Python.setup_install "python", libexec
+    system "python", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir["#{libexec}/bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
diff --git a/Library/Formula/translate-toolkit.rb b/Library/Formula/translate-toolkit.rb
index 4bc63ee4d..78c509f21 100644
--- a/Library/Formula/translate-toolkit.rb
+++ b/Library/Formula/translate-toolkit.rb
@@ -65,12 +65,18 @@ class TranslateToolkit < Formula
 
     res = %w[six lxml pylev diffmatch beautifulsoup4 iniparse vobject cherrypy pytest]
     res.each do |r|
-      resource(r).stage { Language::Python.setup_install "python", libexec/"vendor" }
+      resource(r).stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
+      end
     end
 
+    # install_data tries to install to /Library because translate-toolkit's
+    # heuristic for extracting a relative site-packages path fails with Apple's
+    # layout
+    inreplace "setup.py", /^sitepackages =.+/, "sitepackages = 'lib/python2.7/site-packages'"
+
     ENV.prepend_create_path "PYTHONPATH", libexec/"lib/python2.7/site-packages"
-    # Explicitly specify the install data path otherwise it goes all Easter Bunny on us.
-    Language::Python.setup_install "python", libexec, "--install-data=#{libexec}/share"
+    system "python", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir["#{libexec}/bin/*"]
     bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
diff --git a/Library/Formula/wakatime-cli.rb b/Library/Formula/wakatime-cli.rb
index 1b2adef12..5139cb42c 100644
--- a/Library/Formula/wakatime-cli.rb
+++ b/Library/Formula/wakatime-cli.rb
@@ -17,7 +17,7 @@ class WakatimeCli < Formula
   def install
     ENV["PYTHONPATH"] = libexec+"lib/python2.7/site-packages"
 
-    Language::Python.setup_install "python", libexec
+    system "python", *Language::Python.setup_install_args(libexec)
     bin.install Dir[libexec/"bin/*"]
     bin.env_script_all_files(libexec+"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end