Merge branch 'master' of http://github.com/mxcl/homebrew

5 files changed, 12 insertions, 12 deletions

diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 4ad93dc00..0da3bf236 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -2,8 +2,8 @@ require 'formula'
 
 class Mysql < Formula
   homepage 'http://dev.mysql.com/doc/refman/5.5/en/'
-  url 'http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.14.tar.gz'
-  md5 '19f43bb9c72b1b5f7ff86a7f921c9244'
+  url 'http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.15.tar.gz'
+  md5 '306b5549c7bd72e8e705a890db0da82b'
 
   depends_on 'cmake' => :build
   depends_on 'readline'
diff --git a/Library/Formula/phantomjs.rb b/Library/Formula/phantomjs.rb
index 5d0d0bd19..3da35cf80 100644
--- a/Library/Formula/phantomjs.rb
+++ b/Library/Formula/phantomjs.rb
@@ -1,16 +1,16 @@
 require 'formula'
 
 class Phantomjs < Formula
-  url "http://phantomjs.googlecode.com/files/phantomjs-1.2.0-source.zip"
+  url "https://phantomjs.googlecode.com/files/phantomjs-1.3.0-source.tar.gz"
   head "https://github.com/ariya/phantomjs.git"
   homepage 'http://www.phantomjs.org/'
-  sha1 "0b8b20fbc45013ecf61dd988390dd979a894dec1"
+  sha1 "76902ad0956cf212cc9bb845f290690f53eca576"
 
   depends_on 'qt'
 
   def install
     system "qmake -spec macx-g++"
     system "make"
-    bin.install "bin/phantomjs.app/Contents/MacOS/phantomjs"
+    bin.install "bin/phantomjs"
   end
 end
diff --git a/Library/Formula/rbenv-gemset.rb b/Library/Formula/rbenv-gemset.rb
index 147ceb0e3..3eb4c3f27 100644
--- a/Library/Formula/rbenv-gemset.rb
+++ b/Library/Formula/rbenv-gemset.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class RbenvGemset < Formula
-  url 'https://github.com/jamis/rbenv-gemset/tarball/v0.2.0'
+  url 'https://github.com/jamis/rbenv-gemset/tarball/v0.2.1'
   homepage 'https://github.com/jamis/rbenv-gemset'
-  md5 '850c305de2037138adec7e97576a6af9'
+  md5 '21d6a809ea2232164a570b1fff13e8e4'
 
   depends_on 'rbenv'
 
diff --git a/Library/Formula/sbt.rb b/Library/Formula/sbt.rb
index deb6a9247..09be9a2b6 100644
--- a/Library/Formula/sbt.rb
+++ b/Library/Formula/sbt.rb
@@ -1,10 +1,10 @@
 require 'formula'
 
 class Sbt < Formula
-  url "http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/0.10.1/sbt-launch.jar"
+  url "http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-tools.sbt/sbt-launch/0.11.0/sbt-launch.jar"
   homepage 'http://github.com/harrah/xsbt/'
-  version '0.10.1'
-  md5 '9408d6092d6e12139d111f39e2e7b61e'
+  version '0.11.0'
+  md5 'fa57b75cbc45763b7188a71928f4cd9a'
 
   def install
     (bin+'sbt').write <<-EOS.undent
diff --git a/Library/Formula/tor.rb b/Library/Formula/tor.rb
index e9870e957..39d2d520c 100644
--- a/Library/Formula/tor.rb
+++ b/Library/Formula/tor.rb
@@ -1,9 +1,9 @@
 require 'formula'
 
 class Tor < Formula
-  url 'https://www.torproject.org/dist/tor-0.2.2.32.tar.gz'
+  url 'https://www.torproject.org/dist/tor-0.2.2.33.tar.gz'
   homepage 'https://www.torproject.org/'
-  md5 '6d70db8da9513453d520168e017a272c'
+  md5 'ea99aba49694bb982d2fccc57a70d58e'
 
   depends_on 'libevent'