Update PyQt to 4.8.4, sip 4.12.2

PyQt 4.8.4 has just been released, and apparently they can't be
bothered to keep the previous tarball in place...

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

2 files changed, 7 insertions, 39 deletions

diff --git a/Library/Formula/pyqt.rb b/Library/Formula/pyqt.rb
index e7c0c14d5..2e31bfb6e 100644
--- a/Library/Formula/pyqt.rb
+++ b/Library/Formula/pyqt.rb
@@ -4,9 +4,9 @@ require 'formula'
 # downloads disappear.
 
 class Pyqt < Formula
-  url 'http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-mac-gpl-4.8.3.tar.gz'
+  url 'http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-mac-gpl-4.8.4.tar.gz'
   homepage 'http://www.riverbankcomputing.co.uk/software/pyqt'
-  md5 '14bade8b251660177ccc1a0cbbe33aba'
+  md5 'c9114258f494cafa87fc2740364fa7f4'
 
   depends_on 'sip'
   depends_on 'qt'
@@ -63,7 +63,7 @@ sys.exit(0)
       file.write test_program
     end
 
-    ENV.prepend 'PYTHONPATH', "#{HOMEBREW_PREFIX}/lib/python", ':'
+    ENV['PYTHONPATH'] = "#{HOMEBREW_PREFIX}/lib/python"
     system "python test_pyqt.py"
 
     ohai "Removing test script 'test_pyqt.py'."
diff --git a/Library/Formula/sip.rb b/Library/Formula/sip.rb
index b5e820ca5..f524e4763 100644
--- a/Library/Formula/sip.rb
+++ b/Library/Formula/sip.rb
@@ -1,13 +1,8 @@
 require 'formula'
 
-#
-# NOTE: You must also change the version in the patch below, as the upstream
-# build figures out the version number from the hg checkout.
-#
-
 class Sip < Formula
-  url 'http://www.riverbankcomputing.co.uk/hg/sip/archive/4.12.1.tar.gz'
-  md5 '92b0bf4b2ec76da55ac45f27bd17fbe0'
+  url 'http://www.riverbankcomputing.co.uk/hg/sip/archive/4.12.2.tar.gz'
+  md5 '9df80f88e0e4022cdd8a8891c6c38048'
   head 'http://www.riverbankcomputing.co.uk/hg/sip', :using => :hg
   homepage 'http://www.riverbankcomputing.co.uk/software/sip'
 
@@ -18,7 +13,6 @@ class Sip < Formula
   end
 
   def install
-    system "python", "build.py", "prepare"
     system "python", "configure.py",
                               "--destdir=#{lib}/python",
                               "--bindir=#{bin}",
@@ -35,38 +29,12 @@ end
 
 
 __END__
-Patch to allow the SIP build.py script to generate a reasonable version number
-without the .hg directory from the Mercurial repository.
-
-diff --git a/build.py b/build.py
-index 927d7f1..fdf13a3 100755
---- a/build.py
-+++ b/build.py
-@@ -179,7 +179,7 @@ def _get_release():
-         changelog = None
-         name = os.path.basename(_RootDir)
- 
--        release_suffix = "-unknown"
-+        release_suffix = ""
-         version = None
- 
-         parts = name.split('-')
-@@ -192,7 +192,7 @@ def _get_release():
- 
-     # Format the results.
-     if version is None:
--        version = (0, 1, 0)
-+        version = (4, 12, 1)
- 
-     major, minor, micro = version
- 
-
-Another patch to remove the seemingly unnecessary framework build requirement
+Patch to remove the seemingly unnecessary framework build requirement
 diff --git a/siputils.py b/siputils.py
 index 57e8911..1af6152 100644
 --- a/siputils.py
 +++ b/siputils.py
-@@ -1423,8 +1423,8 @@ class ModuleMakefile(Makefile):
+@@ -1434,8 +1434,8 @@ class ModuleMakefile(Makefile):
              # 'real_prefix' exists if virtualenv is being used.
              dl = getattr(sys, 'real_prefix', sys.exec_prefix).split(os.sep)