sip: cleanup python usage.

1 files changed, 13 insertions, 23 deletions

diff --git a/Library/Formula/sip.rb b/Library/Formula/sip.rb
index b5c0b100c..5f8543cfb 100644
--- a/Library/Formula/sip.rb
+++ b/Library/Formula/sip.rb
@@ -7,39 +7,29 @@ class Sip < Formula
 
   head 'http://www.riverbankcomputing.co.uk/hg/sip', :using => :hg
 
-  depends_on :python => :recommended
-  depends_on :python3 => :optional
-
   def install
     if build.head?
       # Link the Mercurial repository into the download directory so
       # buid.py can use it to figure out a version number.
       ln_s downloader.cached_location + '.hg', '.hg'
-      system python, "build.py", "prepare"
+      system "python", "build.py", "prepare"
     end
 
     # The python block is run once for each python (2.x and 3.x if requested)
-    python do
-      # Note the binary `sip` is the same for python 2.x and 3.x
-      # Set --destdir such that the python modules will be in the HOMEBREWPREFIX/lib/pythonX.Y/site-packages
-      system python, "configure.py",
-                              "--deployment-target=#{MacOS.version}",
-                              "--destdir=#{lib}/#{python.xy}/site-packages",
-                              "--bindir=#{bin}",
-                              "--incdir=#{include}",
-                              "--sipdir=#{HOMEBREW_PREFIX}/share/sip#{python.if3then3}"
-      system "make"
-      system "make install"
-      system "make clean"
-    end
-
+    # Note the binary `sip` is the same for python 2.x and 3.x
+    # Set --destdir such that the python modules will be in the HOMEBREWPREFIX/lib/pythonX.Y/site-packages
+    system "python", "configure.py",
+                            "--deployment-target=#{MacOS.version}",
+                            "--destdir=#{lib}/python2.7/site-packages",
+                            "--bindir=#{bin}",
+                            "--incdir=#{include}",
+                            "--sipdir=#{HOMEBREW_PREFIX}/share/sip"
+    system "make"
+    system "make install"
+    system "make clean"
   end
 
   def caveats
-    s = ''
-    s += python.standard_caveats if python
-    s += "The sip-dir for Python 2.x is #{HOMEBREW_PREFIX}/share/sip.\n"
-    s += "The sip-dir for Python 3.x is #{HOMEBREW_PREFIX}/share/sip3."
-    s
+    "The sip-dir for Python 2.x is #{HOMEBREW_PREFIX}/share/sip."
   end
 end