Merge branch 'updates'

.gitignore

@@ -1,5 +1,6 @@
 /*
 !/.gitignore
+!/.yardopts
 !/Library/
 !/CODEOFCONDUCT.md
 !/CONTRIBUTING.md
@@ -9,6 +10,7 @@
 !/bin
 /bin/*
 !/bin/brew
+!/share/doc/homebrew
 !/share/man/man1/brew.1
 .DS_Store
 /Library/Homebrew/doc

.yardopts

@@ -0,0 +1,10 @@
+--title "Homebrew"
+--main Library/Homebrew/README.md
+--exclude Library/Homebrew/test/vendor/
+--exclude Library/Homebrew/vendor/
+Library/Homebrew/**/*.rb
+-
+Library/Homebrew/*.md
+Library/Homebrew/manpages/*.md
+share/doc/homebrew/*.md
+*.md

CODEOFCONDUCT.md

@@ -19,7 +19,7 @@ The Homebrew community welcomes and encourages participation by everyone. Our co
 
 We have created this diversity statement because we believe that a diverse Homebrew community is stronger and more vibrant. A diverse community where people treat each other with respect has more potential contributors and more sources for ideas.
 
-Although we have phrased the formal diversity statement generically to make it all-inclusive, we recognize that there are specific attributes that are used to discriminate against people. In alphabetical order, some of these attributes include (but are not limited to): age, culture, ethnicity, gender identity or expression, national origin, physical or mental difference, politics, race, religion, sex, sexual orientation, socio-economic status, and subculture. We welcome people regardless of the values of these or other attributes.
+Although we have phrased the formal diversity statement generically to make it all-inclusive, we recognise that there are specific attributes that are used to discriminate against people. In alphabetical order, some of these attributes include (but are not limited to): age, culture, ethnicity, gender identity or expression, national origin, physical or mental difference, politics, race, religion, sex, sexual orientation, socio-economic status, and subculture. We welcome people regardless of the values of these or other attributes.
 
 # Attribution
 This code of conduct is heavily based on the [Python Community Code of Conduct](http://www.python.org/psf/codeofconduct/) and the [Python Diversity Statement](http://www.python.org/community/diversity/).

CONTRIBUTING.md

@@ -1,22 +1,22 @@
-Contributing to Tigerbrew
-=========================
-
-Reporting Bugs
---------------
+# Contributing to Homebrew
+## Reporting Bugs
 First, please run `brew update` and `brew doctor`.
 
-Second, read the [Troubleshooting Checklist](https://github.com/Homebrew/homebrew/wiki/troubleshooting).
+Second, read the [Troubleshooting Checklist](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Troubleshooting.md#troubleshooting).
 
 **If you don't read these it will take us far longer to help you with your problem.**
 
-Writing formulae
-----------------
+## Security
+Please report security issues to security@brew.sh.
+
+## Contributing
 Please read:
 
-* [Code of Conduct](https://github.com/Homebrew/homebrew/blob/master/CODEOFCONDUCT.md)
-* [Formula Cookbook](https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook)
+* [Code of Conduct](https://github.com/Homebrew/homebrew/blob/master/CODEOFCONDUCT.md#code-of-conduct)
+* [Formula Cookbook](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Formula-Cookbook.md#formula-cookbook)
+* [Acceptable Formulae](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Acceptable-Formulae.md#acceptable-formulae)
 * [Ruby Style Guide](https://github.com/styleguide/ruby)
-* [How To Open a Homebrew Pull Request (and get it merged)](https://github.com/Homebrew/homebrew/wiki/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged))
+* [How To Open a Homebrew Pull Request (and get it merged)](https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md#how-to-open-a-homebrew-pull-request-and-get-it-merged)
 
 Tigerbrew guidelines
 --------------------

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2009-2014 Max Howell and other contributors.
+Copyright 2009-2014 Homebrew contributors.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Library/Contributions/brew_bash_completion.sh

@@ -458,9 +458,6 @@ _brew ()
     done
 
     if [[ $i -eq $COMP_CWORD ]]; then
-        local ext=$(\ls -p $(brew --repository)/Library/Contributions/cmd \
-                2>/dev/null | sed -e "s/\.rb//g" -e "s/brew-//g" \
-                -e "s/.*\///g")
         __brewcomp "
             --cache --cellar
             --env --prefix --repository
@@ -500,8 +497,6 @@ _brew ()
             update
             upgrade
             uses
-            versions
-            $ext
             "
         return
     fi
@@ -538,7 +533,6 @@ _brew ()
     update)                     _brew_update ;;
     upgrade)                    _brew_upgrade ;;
     uses)                       _brew_uses ;;
-    versions)                   __brew_complete_formulae ;;
     *)                          ;;
     esac
 }

Library/Contributions/example-formula.rb

@@ -3,7 +3,7 @@ require "formula"
 # This is a non-functional example formula to showcase all features and
 # therefore, it's overly complex and dupes stuff just to comment on it.
 # You may want to use `brew create` to start your own new formula!
-# Documentation: https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook
+# Documentation: https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Formula-Cookbook.md
 
 ## Naming -- Every Homebrew formula is a class of the type `Formula`.
 # Ruby classes have to start Upper case and dashes are not allowed.
@@ -23,7 +23,6 @@ class ExampleFormula < Formula
   #     `:nounzip` (without extracting)
   #     `:post` (download via an HTTP POST)
   #     `S3DownloadStrategy` (download from S3 using signed request)
-  #     `UnsafeSubversionDownloadStrategy` (svn with invalid certs)
   url "https://some.dont.provide.archives.example.com", :using => :git, :tag => "1.2.3"
 
   # version is seldom needed, because it's usually autodetected from the URL/tag.
@@ -88,8 +87,7 @@ class ExampleFormula < Formula
 
   # Bottles are pre-built and added by the Homebrew maintainers for you.
   # If you maintain your own repository, you can add your own bottle links.
-  # Read in the wiki about how to provide bottles:
-  # <https://github.com/Homebrew/homebrew/wiki/Bottles>
+  # https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Bottles.md
   bottle do
     root_url "http://mikemcquaid.com" # Optional root to calculate bottle URLs
     prefix "/opt/homebrew" # Optional HOMEBREW_PREFIX in which the bottles were built.
@@ -399,8 +397,8 @@ class ExampleFormula < Formula
       assert_equal "result", stdout.read
     end
 
-    # If an exception is raised (e.g. by assert), or if we return false, or if
-    # the command run by `system` prints to stderr, we consider the test failed.
+    # The test will fail if it returns false, or if an exception is raised.
+    # Failed assertions and failed `system` commands will raise exceptions.
   end
 
 
@@ -414,8 +412,8 @@ end
 
 __END__
 # Room for a patch after the `__END__`
-# Read in the wiki about how to get a patch in here:
-#    https://github.com/Homebrew/homebrew/wiki/Formula-Cookbook
+# Read about how to get a patch in here:
+#    https://github.com/Homebrew/homebrew/blob/master/share/doc/homebrew/Formula-Cookbook.md
 # In short, `brew install --interactive --git <formula>` and make your edits.
 # Then `git diff >> path/to/your/formula.rb`
 # Note, that HOMEBREW_PREFIX will be replaced in the path before it is

Library/ENV/4.3/pod2man

@@ -1,3 +1,3 @@
 #!/bin/bash
-POD2MAN=$(/usr/bin/which pod2man5.16 || /usr/bin/which pod2man5.12 || echo /usr/bin/pod2man)
+POD2MAN=$(/usr/bin/which pod2man5.18 || /usr/bin/which pod2man5.16 || /usr/bin/which pod2man5.12 || echo /usr/bin/pod2man)
 exec $POD2MAN "$@"

Library/ENV/4.3/powerpc-apple-darwin9-g++-4.0.1

@@ -0,0 +1 @@
+cc

Library/ENV/4.3/powerpc-apple-darwin9-gcc-4.0.1

@@ -0,0 +1 @@
+cc

Library/Formula/aalib.rb

@@ -7,9 +7,10 @@ class Aalib < Formula
 
   bottle do
     cellar :any
-    sha1 "91868f0ce9e9bbcd9a81206ad925a571144ac866" => :mavericks
-    sha1 "0e5d656547a69220d3f146e00ea82747d0f33aee" => :mountain_lion
-    sha1 "3e46ae8165db31c9c87a7bb344c09211c800153e" => :lion
+    revision 1
+    sha1 "bad7bebd32c57b4448895d9630bd26b81d7381a9" => :yosemite
+    sha1 "703020d9ca9218f85ccccb04aa8c0443d386eb13" => :mavericks
+    sha1 "7df0f5feb8621497d06c64a67a4b0d0350e6ecb1" => :mountain_lion
   end
 
   # Fix malloc/stdlib issue on OS X

Library/Formula/adobe-air-sdk.rb

@@ -4,16 +4,16 @@ require "formula"
 # https://helpx.adobe.com/air/kb/archived-air-sdk-version.html
 class AdobeAirSdk < Formula
   homepage "http://adobe.com/products/air/sdk"
-  version "15.0.0.249"
+  version "15.0.0.302"
 
   option "with-flex-support", "Do not download the new compiler with the SDK."
 
   if build.without? "flex-support"
     url "http://airdownload.adobe.com/air/mac/download/15.0/AIRSDK_Compiler.tbz2"
-    sha1 "8313d44ef53c02e271ddc7f59caeba5e7d910530"
+    sha1 "5f6f647a6399c8ba501b9c6f6cda489bf50e0ba8"
   else
     url "http://airdownload.adobe.com/air/mac/download/15.0/AdobeAIRSDK.tbz2"
-    sha1 "7d2dbf86c9bacf231bdc4b0d57db443c934d0294"
+    sha1 "ce9a96ccc7a4a414ba7ef0eebf39a8a1150d228e"
   end
 
   def install

Library/Formula/afflib.rb

@@ -7,9 +7,10 @@ class Afflib < Formula
 
   bottle do
     cellar :any
-    sha1 "c72b3fd14e5d7d5095c4d46c6c77619315112a20" => :mavericks
-    sha1 "28b07c6caae8ef85348b51ce80561fe10392ad8b" => :mountain_lion
-    sha1 "3af09ce1f21443b5a072979d97f7cc41035c3643" => :lion
+    revision 1
+    sha1 "b588679f7466eaebbf75add963ba174cff6facf4" => :yosemite
+    sha1 "4a925ea584eecf9ea4f5d978025cb4695c078b2d" => :mavericks
+    sha1 "2a9428d3960bc5c0cd8ed38c52828f6eab003a76" => :mountain_lion
   end
 
   depends_on "autoconf" => :build

Library/Formula/aircrack-ng.rb

@@ -1,9 +1,16 @@
-require 'formula'
+require "formula"
 
 class AircrackNg < Formula
-  homepage 'http://aircrack-ng.org/'
-  url 'http://download.aircrack-ng.org/aircrack-ng-1.1.tar.gz'
-  sha1 '16eed1a8cf06eb8274ae382150b56589b23adf77'
+  homepage "http://aircrack-ng.org/"
+  # We can't update this due to linux-only dependencies in >1.1.
+  # See https://github.com/Homebrew/homebrew/issues/29450
+  url "http://download.aircrack-ng.org/aircrack-ng-1.1.tar.gz"
+  sha1 "16eed1a8cf06eb8274ae382150b56589b23adf77"
+  revision 1
+
+  depends_on "pkg-config" => :build
+  depends_on "sqlite"
+  depends_on "openssl"
 
   # Remove root requirement from OUI update script. See:
   # https://github.com/Homebrew/homebrew/pull/12755

Library/Formula/android-ndk.rb

@@ -4,35 +4,30 @@ class AndroidNdk < Formula
   homepage "http://developer.android.com/sdk/ndk/index.html"
 
   if MacOS.prefer_64_bit?
-    url "https://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86_64.tar.bz2"
-    sha1 "6888a670c9d9007ffba7e314e38c367b6ea67f7c"
-
-    resource "64bit_target" do
-      url "https://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86_64.tar.bz2"
-      sha1 "b8354a4547cedb2901acc3dc35fd29104f6cc1bf"
-    end
+    url "http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin"
+    sha1 "a136ca2ad87771422c2cfa9474196cd29ffd9bb1"
   else
-    url "https://dl.google.com/android/ndk/android-ndk32-r10b-darwin-x86.tar.bz2"
-    sha1 "ee763b15cded16d313feded1e7244ce094825574"
-
-    resource "64bit_target" do
-      url "https://dl.google.com/android/ndk/android-ndk64-r10b-darwin-x86.tar.bz2"
-      sha1 "e55fecfa0189a0f94725d3208a4a1c1d4235a3ab"
-    end
+    url "http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86.bin"
+    sha1 "b083f9a1a4dd66d55ced8ea41eea6a0a91ea1ac9"
   end
 
+  version "r10c"
+
   depends_on "android-sdk" => :recommended
 
   def install
     bin.mkpath
 
-    # Unpack 64-bit target into current directory
-    target = resource("64bit_target")
-    target.verify_download_integrity(target.fetch)
-    system "tar", "xf", target.cached_download, "-C", buildpath.dirname
+    if MacOS.prefer_64_bit?
+      system "chmod", "a+x", "./android-ndk-r10c-darwin-x86_64.bin"
+      system "./android-ndk-r10c-darwin-x86_64.bin"
+    else
+      system "chmod", "a+x", "./android-ndk-r10c-darwin-x86.bin"
+      system "./android-ndk-r10c-darwin-x86.bin"
+    end
 
     # Now we can install both 64-bit and 32-bit targeting toolchains
-    prefix.install Dir["*"]
+    prefix.install Dir["android-ndk-r10c/*"]
 
     # Create a dummy script to launch the ndk apps
     ndk_exec = prefix+"ndk-exec.sh"

Library/Formula/ansible.rb

@@ -1,11 +1,11 @@
-require 'formula'
+require "formula"
 
 class Ansible < Formula
-  homepage 'http://www.ansible.com/home'
-  url 'http://releases.ansible.com/ansible/ansible-1.7.2.tar.gz'
-  sha1 '21532ce402e08c91cc64c5e655758574af9fc8f3'
+  homepage "http://www.ansible.com/home"
+  url "http://releases.ansible.com/ansible/ansible-1.7.2.tar.gz"
+  sha1 "21532ce402e08c91cc64c5e655758574af9fc8f3"
 
-  head 'https://github.com/ansible/ansible.git', :branch => 'devel'
+  head "https://github.com/ansible/ansible.git", :branch => "devel"
 
   bottle do
     sha1 "97822f76a9c9650473fff0cd725bfa546bb84442" => :mavericks
@@ -14,62 +14,79 @@ class Ansible < Formula
   end
 
   depends_on :python if MacOS.version <= :snow_leopard
-  depends_on 'libyaml'
+  depends_on "libyaml"
 
-  option 'with-accelerate', "Enable accelerated mode"
+  option "with-accelerate", "Enable accelerated mode"
+  option "with-windows", "Enable Windows support"
 
-  resource 'pycrypto' do
-    url 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.tar.gz'
-    sha1 'c17e41a80b3fbf2ee4e8f2d8bb9e28c5d08bbb84'
+  resource "pycrypto" do
+    url "https://pypi.python.org/packages/source/p/pycrypto/pycrypto-2.6.tar.gz"
+    sha1 "c17e41a80b3fbf2ee4e8f2d8bb9e28c5d08bbb84"
   end
 
-  resource 'boto' do
-    url 'https://pypi.python.org/packages/source/b/boto/boto-2.32.1.tar.gz'
-    sha1 '4fdecde66245b7fc0295e22d2c2d3c9b08c2b1fa'
+  resource "boto" do
+    url "https://pypi.python.org/packages/source/b/boto/boto-2.32.1.tar.gz"
+    sha1 "4fdecde66245b7fc0295e22d2c2d3c9b08c2b1fa"
   end
 
-  resource 'pyyaml' do
-    url 'https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz'
-    sha1 '476dcfbcc6f4ebf3c06186229e8e2bd7d7b20e73'
+  resource "pyyaml" do
+    url "https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz"
+    sha1 "476dcfbcc6f4ebf3c06186229e8e2bd7d7b20e73"
   end
 
-  resource 'paramiko' do
-    url 'https://pypi.python.org/packages/source/p/paramiko/paramiko-1.11.0.tar.gz'
-    sha1 'fd925569b9f0b1bd32ce6575235d152616e64e46'
+  resource "paramiko" do
+    url "https://pypi.python.org/packages/source/p/paramiko/paramiko-1.11.0.tar.gz"
+    sha1 "fd925569b9f0b1bd32ce6575235d152616e64e46"
   end
 
-  resource 'markupsafe' do
-    url 'https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.18.tar.gz'
-    sha1 '9fe11891773f922a8b92e83c8f48edeb2f68631e'
+  resource "markupsafe" do
+    url "https://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-0.18.tar.gz"
+    sha1 "9fe11891773f922a8b92e83c8f48edeb2f68631e"
   end
 
-  resource 'jinja2' do
-    url 'https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.7.1.tar.gz'
-    sha1 'a9b24d887f2be772921b3ee30a0b9d435cffadda'
+  resource "jinja2" do
+    url "https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.7.1.tar.gz"
+    sha1 "a9b24d887f2be772921b3ee30a0b9d435cffadda"
   end
 
-  resource 'python-keyczar' do
-    url 'https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.71b.tar.gz'
-    sha1 '20c7c5d54c0ce79262092b4cc691aa309fb277fa'
+  resource "python-keyczar" do
+    url "https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.71b.tar.gz"
+    sha1 "20c7c5d54c0ce79262092b4cc691aa309fb277fa"
+  end
+
+  resource "pywinrm" do
+    url "https://github.com/diyan/pywinrm/archive/df049454a9309280866e0156805ccda12d71c93a.zip"
+    sha1 "f2f94b9a1038425323afaa191a25798c1c0b8426"
+  end
+
+  resource "isodate" do
+    url "https://pypi.python.org/packages/source/i/isodate/isodate-0.5.0.tar.gz"
+    sha1 "1174aeb482567df02933bdc6f6e7c2a9a72eb31e"
+  end
+
+  resource "xmltodict" do
+    url "https://pypi.python.org/packages/source/x/xmltodict/xmltodict-0.9.0.tar.gz"
+    sha1 "06e4396e886133fdc0b10147c388ed82b0586c83"
   end
 
   def install
     ENV["PYTHONPATH"] = lib+"python2.7/site-packages"
-    ENV.prepend_create_path 'PYTHONPATH', libexec+'lib/python2.7/site-packages'
+    ENV.prepend_create_path "PYTHONPATH", libexec+"lib/python2.7/site-packages"
     # HEAD additionally requires this to be present in PYTHONPATH, or else
     # ansible's own setup.py will fail.
-    ENV.prepend_create_path 'PYTHONPATH', prefix+'lib/python2.7/site-packages'
+    ENV.prepend_create_path "PYTHONPATH", prefix+"lib/python2.7/site-packages"
     install_args = [ "setup.py", "install", "--prefix=#{libexec}" ]
 
     res = %w[pycrypto boto pyyaml paramiko markupsafe jinja2]
     res << "python-keyczar" if build.with? "accelerate"
+    res += %w[pywinrm isodate xmltodict] if build.with? "windows"
     res.each do |r|
       resource(r).stage { system "python", *install_args }
     end
 
-    inreplace 'lib/ansible/constants.py' do |s|
-      s.gsub! '/usr/share/ansible', share+'ansible'
-      s.gsub! '/etc/ansible', etc+'ansible'
+    inreplace "lib/ansible/constants.py" do |s|
+      s.gsub! "/usr/share/ansible", share+"ansible"
+      s.gsub! "/etc/ansible", etc+"ansible"
     end
 
     system "python", "setup.py", "install", "--prefix=#{prefix}"
@@ -79,9 +96,9 @@ class Ansible < Formula
     rm "#{lib}/python2.7/site-packages/site.py"
     rm Dir["#{lib}/python2.7/site-packages/*.pth"]
 
-    man1.install Dir['docs/man/man1/*.1']
+    man1.install Dir["docs/man/man1/*.1"]
 
-    bin.env_script_all_files(libexec+'bin', :PYTHONPATH => ENV['PYTHONPATH'])
+    bin.env_script_all_files(libexec+"bin", :PYTHONPATH => ENV["PYTHONPATH"])
   end
 
   test do

Library/Formula/app-engine-java-sdk.rb

@@ -2,8 +2,8 @@ require "formula"
 
 class AppEngineJavaSdk < Formula
   homepage "https://developers.google.com/appengine/docs/java/gettingstarted/introduction"
-  url "https://storage.googleapis.com/appengine-sdks/featured/appengine-java-sdk-1.9.12.zip"
-  sha1 "dade58a214fa55d5e0f4cee4c93f6bae5d7e048b"
+  url "https://storage.googleapis.com/appengine-sdks/featured/appengine-java-sdk-1.9.14.zip"
+  sha1 "326708bf2ce584a6603076e85797398991d195eb"
 
   def install
     rm Dir["bin/*.cmd"]

Library/Formula/arabica.rb

@@ -9,9 +9,9 @@ class Arabica < Formula
   head do
     url 'https://github.com/jezhiggins/arabica.git'
 
-    depends_on 'autoconf'
-    depends_on 'automake'
-    depends_on 'libtool'
+    depends_on 'autoconf' => :build
+    depends_on 'automake' => :build
+    depends_on 'libtool' => :build
   end
 
   def install

Library/Formula/arangodb.rb

@@ -2,29 +2,22 @@ require 'formula'
 
 class Arangodb < Formula
   homepage 'http://www.arangodb.org/'
-  url 'https://www.arangodb.org/repositories/Source/ArangoDB-2.2.4.tar.gz'
-  sha1 '80d3db0afb07a8c6de98810cd3b74d63d37c182c'
+  url 'https://www.arangodb.org/repositories/Source/ArangoDB-2.2.6.tar.gz'
+  sha1 '5e777db1dca878e9aaa518889b989126e368492d'
 
   head "https://github.com/triAGENS/ArangoDB.git", :branch => 'unstable'
 
   bottle do
-    sha1 "2e4806611b519f0063906675b6e846dccb951648" => :mavericks
-    sha1 "236fa46ecc3f46f148d7ca740b8becc35b5216be" => :mountain_lion
-    sha1 "9d707c9dfb6bf63f156b2d72820232e4fb2ad104" => :lion
+    sha1 "5581f21092850e71478a67d7724ae0666e28208a" => :yosemite
+    sha1 "3638cdf2e0c695eb75ad2a5f2ed6893eff2771f4" => :mavericks
+    sha1 "0d3e14d0d0457f096ce307780c27577a9581e01d" => :mountain_lion
   end
 
   depends_on 'go' => :build
+  depends_on 'openssl'
 
   needs :cxx11
 
-  def suffix
-    if build.stable?
-      return ""
-    else
-      return "-" + (build.devel? ? version : "unstable")
-    end
-  end
-
   def install
     # clang on 10.8 will still try to build against libstdc++,
     # which fails because it doesn't have the C++0x features
@@ -48,9 +41,10 @@ class Arangodb < Formula
       --enable-mruby
       --datadir=#{share}
       --localstatedir=#{var}
-      --program-suffix=#{suffix}
     ]
 
+    args << "--program-suffix=unstable" if build.head?
+
     system "./configure", *args
     system "make install"
 

Library/Formula/argp-standalone.rb

@@ -7,9 +7,10 @@ class ArgpStandalone < Formula
 
   bottle do
     cellar :any
-    sha1 "3e781159b73d2fbbb22ea626e568904d6f72bd2d" => :mavericks
-    sha1 "51228d446622730ba12dfa33e83d41ad79678fef" => :mountain_lion
-    sha1 "58936047ba691811df5aa11dbbb4ed2304ef3b8b" => :lion
+    revision 1
+    sha1 "72d7282e4ca51c5832e68f06bfdd5c144a73973a" => :yosemite
+    sha1 "500784846c3a83e25194cb578eedbbba6e2600fa" => :mavericks
+    sha1 "232276ab4611f2d1fa315de24fc062a53cfbd7c4" => :mountain_lion
   end
 
   # This patch fixes compilation with Clang.

Library/Formula/asciidoc.rb

@@ -7,9 +7,10 @@ class Asciidoc < Formula
 
   bottle do
     cellar :any
-    sha1 "fe0cb89bae6cc28250c29141d349436c6d7c180e" => :mavericks
-    sha1 "b4a455acf5666da7e13d4dc419069fc8220f111c" => :mountain_lion
-    sha1 "b1769d0672ec6b2993ed816d4ad6c21683777983" => :lion
+    revision 1
+    sha1 "14ff65fa337658acf5011b24a728a2f6f413fd3c" => :yosemite
+    sha1 "84793575a498025283f81295feeee74103386b70" => :mavericks
+    sha1 "7c932bea7c4d3e56072a7adb5cd4914cd5972414" => :mountain_lion
   end
 
   head do

Library/Formula/atf.rb

@@ -2,8 +2,14 @@ require 'formula'
 
 class Atf < Formula
   homepage 'https://github.com/jmmv/atf'
-  url 'https://github.com/jmmv/atf/releases/download/atf-0.20/atf-0.20.tar.gz'
-  sha1 '398baa9733f9136bb78c27d10a8fffd7810e678a'
+  url 'https://github.com/jmmv/atf/releases/download/atf-0.21/atf-0.21.tar.gz'
+  sha1 '7cc9d3703f7c0e00bb8ec801f7ac65ac9dc898d7'
+
+  bottle do
+    sha1 "5688f4c5066575165a7b9daf9aee4cc21f639656" => :yosemite
+    sha1 "6b3e5320b3cdc1b56556f1f41f819f684055c551" => :mavericks
+    sha1 "b7b43370c8bcf25b46c77b298b05e0d53098f7ad" => :mountain_lion
+  end
 
   def install
     system "./configure", "--disable-dependency-tracking",

Library/Formula/atk.rb

@@ -6,9 +6,10 @@ class Atk < Formula
   sha256 "2875cc0b32bfb173c066c22a337f79793e0c99d2cc5e81c4dac0d5a523b8fbad"
 
   bottle do
-    sha1 "b2ca7320d38039694c3258b9d11acaf47f5a3753" => :mavericks
-    sha1 "c04320419d8bac71188e0f01d7a5914fce0cf296" => :mountain_lion
-    sha1 "913adb577075b21f48f23770361f005f21259b57" => :lion
+    revision 1
+    sha1 "5a014bce43ff14675bec23b61909d3d85cff20f1" => :yosemite
+    sha1 "f75b7b55547cb58c87fd35e38e8cdba0877516f8" => :mavericks
+    sha1 "8aa05a84f58854ba26258d0d206c4e2fb663eb16" => :mountain_lion
   end
 
   depends_on "pkg-config" => :build

Library/Formula/autoconf.rb

@@ -8,6 +8,7 @@ class Autoconf < Formula
 
   bottle do
     revision 1
+    sha1 "3f83cb206720445748c0c4851152607bfabaa926" => :yosemite
     sha1 "319a4ac05d83b5b3db37dcc629a46a412ec1989b" => :mavericks
     sha1 "83184a596d69f3a868e6780c1c8fba309ea28fb2" => :mountain_lion
     sha1 "7d31f63e5ddd1bbbf0397b0b70df1ff9e70f998b" => :lion

Library/Formula/autojump.rb

@@ -1,23 +1,25 @@
-require 'formula'
+require "formula"
 
 class Autojump < Formula
-  homepage 'https://github.com/joelthelion/autojump#name'
-  url 'https://github.com/joelthelion/autojump/archive/release-v21.7.1.tar.gz'
-  sha1 'bc19d40b3ebe29dc44da950f2c6dbd7da26fb6a3'
+  homepage "https://github.com/joelthelion/autojump"
+  url "https://github.com/joelthelion/autojump/archive/release-v21.7.1.tar.gz"
+  sha1 "bc19d40b3ebe29dc44da950f2c6dbd7da26fb6a3"
 
-  head 'https://github.com/joelthelion/autojump.git'
+  head "https://github.com/joelthelion/autojump.git"
 
   def install
-    inreplace 'bin/autojump.sh', ' /etc/profile.d/', " #{prefix}/etc/"
+    inreplace "bin/autojump.sh", " /etc/profile.d/", " #{prefix}/etc/" if build.stable?
+    inreplace "bin/autojump.sh", " /usr/local/share/", " #{share}" if build.head?
 
-    libexec.install 'bin/autojump'
-    libexec.install 'bin/autojump_argparse.py', 'bin/autojump_data.py', 'bin/autojump_utils.py' if build.head?
-    man1.install 'docs/autojump.1'
-    (prefix/'etc').install 'bin/autojump.sh', 'bin/autojump.bash', 'bin/autojump.zsh'
-    zsh_completion.install 'bin/_j'
-    (prefix/'etc').install 'bin/autojump.fish'
 
-    bin.write_exec_script libexec+'autojump'
+    libexec.install "bin/autojump"
+    libexec.install "bin/autojump_argparse.py", "bin/autojump_data.py", "bin/autojump_utils.py" if build.head?
+    man1.install "docs/autojump.1"
+    (prefix/"etc").install "bin/autojump.sh", "bin/autojump.bash", "bin/autojump.zsh"
+    zsh_completion.install "bin/_j"
+    (prefix/"etc").install "bin/autojump.fish"
+
+    bin.write_exec_script libexec+"autojump"
   end
 
   def caveats;

Library/Formula/automake.rb

@@ -7,6 +7,7 @@ class Automake < Formula
   sha1 '0bb1714b78d70cab9907d2013082978a28f48a46'
 
   bottle do
+    sha1 "b7f153654e9a99194f13a8da140b3d861f046af0" => :yosemite
     sha1 '8720e073a828e5b7e29e5cacd01b3ccca88a6d40' => :mavericks
     sha1 'ed3cba7f2a806a4192e875e809bb73b65a128757' => :mountain_lion
     sha1 '12d0d7d3b6d31ea4faf9551076225343e9a5af1f' => :lion

Library/Formula/avidemux.rb

@@ -133,7 +133,7 @@ class Avidemux < Formula
     mkdir_p app/"MacOS"
     cp_r "./cmake/osx/Avidemux2.6", app/"MacOS/Avidemux2.6.app"
     chmod 0755, app/"MacOS/Avidemux2.6.app"
-    cp_r Formula['qt'].opt_prefix/"lib/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
+    cp_r "#{Formula['qt'].opt_lib}/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
     cp "./cmake/osx/Info.plist", app
     (app/"Resources").install_symlink bin, lib
     cp Dir["./cmake/osx/*.icns"], app/"Resources/"

Library/Formula/awscli.rb

@@ -2,37 +2,37 @@ require "formula"
 
 class Awscli < Formula
   homepage "https://aws.amazon.com/cli/"
-  url "https://pypi.python.org/packages/source/a/awscli/awscli-1.4.3.tar.gz"
-  sha1 "59d5cb117ba1c6071ce4badc61ba48d41263f182"
+  url "https://pypi.python.org/packages/source/a/awscli/awscli-1.5.3.tar.gz"
+  sha1 "529420e1148a3e6ad56dc58beb799e72f62eb39b"
 
   bottle do
     cellar :any
-    sha1 "ef4b22b8f9393a3f24d3c6e1ec8794af65abcc59" => :mavericks
-    sha1 "b5f2317057750fdb098b1e5f2edd72e210818d19" => :mountain_lion
-    sha1 "70dfcb884bfa1436b3ebd8d610d2128666426dba" => :lion
+    sha1 "7d41e26398421622338a26089e7c124e946fbcb5" => :yosemite
+    sha1 "873a05712283890f93d34f09880e7d8f94244119" => :mavericks
+    sha1 "b3ee173e568ea7dfb2422b1456e9b4d69fa9aca2" => :mountain_lion
   end
 
   head do
-    url "https://github.com/aws/aws-cli.git", :branch => :develop
+    url "https://github.com/aws/aws-cli.git", :branch => "develop"
 
     resource "botocore" do
-      url "https://github.com/boto/botocore.git", :branch => :develop
+      url "https://github.com/boto/botocore.git", :branch => "develop"
     end
 
     resource "bcdoc" do
-      url "https://github.com/boto/bcdoc.git", :branch => :develop
+      url "https://github.com/boto/bcdoc.git", :branch => "develop"
     end
 
     resource "jmespath" do
-      url "https://github.com/boto/jmespath.git", :branch => :develop
+      url "https://github.com/boto/jmespath.git", :branch => "develop"
     end
   end
 
   depends_on :python if MacOS.version <= :snow_leopard
 
   resource "botocore" do
-    url "https://pypi.python.org/packages/source/b/botocore/botocore-0.63.0.tar.gz"
-    sha1 "41ea1bf85acdd95d7af6f1b705cbe5cf2b4aea02"
+    url "https://pypi.python.org/packages/source/b/botocore/botocore-0.66.0.tar.gz"
+    sha1 "d864e80627c1eb6cb33ffcb75fd486e09da661cb"
   end
 
   resource "bcdoc" do

Library/Formula/babl.rb

@@ -1,33 +1,52 @@
-require 'formula'
+require "formula"
 
 class Babl < Formula
-  homepage 'http://www.gegl.org/babl/'
-  url 'ftp://ftp.gtk.org/pub/babl/0.1/babl-0.1.10.tar.bz2'
-  sha1 'ee60089e8e9d9390e730d3ae5e41074549928b7a'
+  homepage "http://www.gegl.org/babl/"
 
-  head 'git://git.gnome.org/babl'
+  stable do
+    # The official url is unreliable. Use Debian instead.
+    url "https://mirrors.kernel.org/debian/pool/main/b/babl/babl_0.1.10.orig.tar.bz2"
+    mirror "http://ftp.gtk.org/pub/babl/0.1/babl-0.1.10.tar.bz2"
+    sha1 "ee60089e8e9d9390e730d3ae5e41074549928b7a"
 
-  depends_on 'pkg-config' => :build
+    # There are two patches.
+    # The first one changes an include <values.h> (deleted on Mac OS X) to <limits.h>
+    # The second one fixes an error when compiling with clang. See:
+    # https://trac.macports.org/browser/trunk/dports/graphics/babl/files/clang.patch
+    patch :DATA
+  end
+
+  bottle do
+    sha1 "d3ead1808b7c029ab864d3318d7009379cc205a5" => :yosemite
+    sha1 "4fcb4a9c92b59796d40ffc4312935ca756d5264f" => :mavericks
+    sha1 "a35994e97093d303d02d30c3369bccfd1f33af37" => :mountain_lion
+  end
+
+  head do
+    # Use Github instead of GNOME's git. The latter is unreliable.
+    url "https://github.com/GNOME/babl.git"
+
+    depends_on "automake" => :build
+    depends_on "autoconf" => :build
+    depends_on "libtool" => :build
+  end
+
+  depends_on "pkg-config" => :build
 
   option :universal
 
-  # There are two patches.
-  # The first one changes an include <values.h> (deleted on Mac OS X) to <limits.h>
-  # The second one fixes an error when compiling with clang. See:
-  # https://trac.macports.org/browser/trunk/dports/graphics/babl/files/clang.patch
-  patch :DATA
-
   def install
     if build.universal?
       ENV.universal_binary
       if ENV.compiler == :gcc
-        opoo 'Compilation may fail at babl-cpuaccel.c using gcc for a universal build'
+        opoo "Compilation may fail at babl-cpuaccel.c using gcc for a universal build"
       end
     end
 
+    system "./autogen.sh" if build.head?
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
-    system "make install"
+    system "make", "install"
   end
 end
 
@@ -50,12 +69,12 @@ index b44bb5e..7f633d1 100644
 --- a/extensions/sse-fixups.c
 +++ b/extensions/sse-fixups.c
 @@ -21,7 +21,7 @@
- 
+
  #include "config.h"
- 
+
 -#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
 +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
- 
+
  #include <stdint.h>
  #include <stdlib.h>
 @@ -177,7 +177,7 @@ int init (void);
@@ -64,6 +83,6 @@ index b44bb5e..7f633d1 100644
  {
 -#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
 +#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
- 
+
    const Babl *rgbaF_linear = babl_format_new (
      babl_model ("RGBA"),

Library/Formula/bash-git-prompt.rb

@@ -2,22 +2,23 @@ require "formula"
 
 class BashGitPrompt < Formula
   homepage "https://github.com/magicmonty/bash-git-prompt"
-  url "https://github.com/magicmonty/bash-git-prompt/archive/2.2.1.tar.gz"
-  sha1 "6eec4b05744d4071f831202eee25edc0821f4e09"
+  url "https://github.com/magicmonty/bash-git-prompt/archive/2.3.1.tar.gz"
+  sha1 "c973bd8b86ac332d7310d79f0009844340b5999f"
   head "https://github.com/magicmonty/bash-git-prompt.git"
 
   def install
     share.install "gitprompt.sh", "gitprompt.fish", "git-prompt-help.sh",
                   "gitstatus.sh", "prompt-colors.sh"
 
-    (share/"themes").install Dir["themes/*.bgptheme"]
+    (share/"themes").install Dir["themes/*.bgptheme"], "themes/Custom.bgptemplate"
     doc.install "README.md"
   end
 
   def caveats; <<-EOS.undent
     You should add the following to your .bashrc (or equivalent):
-      if [ -f "$(brew --prefix)/opt/bash-git-prompt/share/gitprompt.sh" ]; then
-        source "$(brew --prefix)/opt/bash-git-prompt/share/gitprompt.sh"
+      if [ -f "$(brew --prefix bash-git-prompt)/share/gitprompt.sh" ]; then
+        GIT_PROMPT_THEME=Default
+        source "$(brew --prefix bash-git-prompt)/share/gitprompt.sh"
       fi
     EOS
   end

Library/Formula/bazaar.rb

@@ -1,7 +1,7 @@
 require 'formula'
 
 class Bazaar < Formula
-  homepage 'http://bazaar-vcs.org/'
+  homepage 'http://bazaar.canonical.com/'
   url 'https://launchpad.net/bzr/2.6/2.6.0/+download/bzr-2.6.0.tar.gz'
   sha1 '5eb4d0367c6d83396250165da5bb2c8a9f378293'
   def install

Library/Formula/bdw-gc.rb

@@ -9,9 +9,10 @@ class BdwGc < Formula
   depends_on "libatomic_ops" => :build
 
   bottle do
-    sha1 "ec34da6a822836bf96e450def06569a8809410a8" => :mavericks
-    sha1 "84f85673490d30f0de336ddf8f4c3fd5495d1b18" => :mountain_lion
-    sha1 "433a316925295305a006cefd6adb48244768bfe1" => :lion
+    revision 1
+    sha1 "3c5fdf16d5ddb72427e300a79b8aa829df51480d" => :yosemite
+    sha1 "9c03aaf69cbda261bc263a65e922607a4cda3bd1" => :mavericks
+    sha1 "365f19fe49db14430a858c812210ebc5e8bb0f5e" => :mountain_lion
   end
 
   option :universal

Library/Formula/beecrypt.rb

@@ -4,13 +4,11 @@ class Beecrypt < Formula
   homepage "http://beecrypt.sourceforge.net"
   url "https://downloads.sourceforge.net/project/beecrypt/beecrypt/4.2.1/beecrypt-4.2.1.tar.gz"
   sha256 "286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
-  revision 1
+  revision 2
 
   bottle do
     cellar :any
-    sha1 "8ccefc8dd0550ad157854be5217c9d3aebcd8275" => :mavericks
-    sha1 "67e8a03aeab78969d859e4cb7fcdf44b37fe5966" => :mountain_lion
-    sha1 "22a47abf61584481e5c3fa03de13fda568e046e1" => :lion
+    sha1 "5ebfd5789fc518c873994cb5d9b404837a742b5a" => :mavericks
   end
 
   depends_on "icu4c"

Library/Formula/berkeley-db.rb

@@ -7,9 +7,10 @@ class BerkeleyDb < Formula
 
   bottle do
     cellar :any
-    sha1 "82b52acb094e7f5cfb8f807f4501b47653744285" => :mavericks
-    sha1 "32db77b55f8f864af939d842a85bed64347912e8" => :mountain_lion
-    sha1 "6846c61e17ff5dcfe25f5aaf2e7e88b71758ea09" => :lion
+    revision 1
+    sha1 "a134b5effaa73fd296b2601180520292c0a6d095" => :yosemite
+    sha1 "910660e253bf32a1ce730d4ba27e3090f645f5f6" => :mavericks
+    sha1 "aaafa41026335a6b7e6c0792d1511325c79409fa" => :mountain_lion
   end
 
   option 'with-java', 'Compile with Java support.'

Library/Formula/berkeley-db4.rb

@@ -5,6 +5,13 @@ class BerkeleyDb4 < Formula
   url 'http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz'
   sha1 'ab36c170dda5b2ceaad3915ced96e41c6b7e493c'
 
+  bottle do
+    cellar :any
+    sha1 "20e65ac304a3faa61b84051344e73a4e8ea14e66" => :yosemite
+    sha1 "633a40046bb6e34e55a8781bc4dd0261ac0defa4" => :mavericks
+    sha1 "2f4fe7ea4983f9d8f671fa5ea59e826e5d093e2e" => :mountain_lion
+  end
+
   keg_only "BDB 4.8.30 is provided for software that doesn't compile against newer versions."
 
   # Fix build under Xcode 4.6

Library/Formula/bind.rb

@@ -6,9 +6,10 @@ class Bind < Formula
   sha1 "96aa28c6112c6a8c33a19efeac98c715f03b35ca"
 
   bottle do
-    sha1 "acbc3d6c023a81a8521d1e7f3734390a405b986e" => :mavericks
-    sha1 "89accfff4961c1425a1b6b29c6a9f78cc451ace3" => :mountain_lion
-    sha1 "45af0b2a7ab9c38751a18b2901ce3670a9e93d4a" => :lion
+    revision 4
+    sha1 "fbef96e8741894256851dd93b1136cbf83ed4518" => :yosemite
+    sha1 "9b79a3276cd9a0bd80ae2f6d2b216a780ce72f49" => :mavericks
+    sha1 "5efa168d357725842a24ce21d247a570b458cf88" => :mountain_lion
   end
 
   head "https://source.isc.org/git/bind9.git"
@@ -23,7 +24,7 @@ class Bind < Formula
     system "./configure", "--prefix=#{prefix}",
                           "--enable-threads",
                           "--enable-ipv6",
-                          "--with-ssl-dir=#{Formula["openssl"].opt_prefix}"
+                          "--with-openssl=#{Formula["openssl"].opt_prefix}"
 
     # From the bind9 README: "Do not use a parallel "make"."
     ENV.deparallelize

Library/Formula/bip.rb

@@ -2,8 +2,7 @@ require "formula"
 
 class Bip < Formula
   homepage "http://bip.milkypond.org"
-  url "https://projects.duckcorp.org/attachments/download/61/bip-0.8.9.tar.gz",
-    :using => CurlUnsafeDownloadStrategy
+  url "http://ftp.de.debian.org/debian/pool/main/b/bip/bip_0.8.9.orig.tar.gz"
   sha1 "6c6828dde0ec9c41237bac42a679aa8237bdeffe"
 
   def install

Library/Formula/bison.rb

@@ -7,9 +7,10 @@ class Bison < Formula
   sha1 '4bbb9a1bdc7e4328eb4e6ef2479b3fe15cc49e54'
 
   bottle do
-    sha1 "11f06b582581bd6be34717b696dd5d414fdca977" => :mavericks
-    sha1 "7d5d9b155a773da9a9a95189c8a7e66607901fee" => :mountain_lion
-    sha1 "cac23ffc39526cfd0ca9d47b89ab0d32122f2a52" => :lion
+    revision 1
+    sha1 "12fdce885665b82a723b815f40afa81f8765e1ec" => :yosemite
+    sha1 "59bd723116afc1a23813413e113d36c0a4361a3a" => :mavericks
+    sha1 "995e0372cc6b74c5475f740b83c17963fddbf320" => :mountain_lion
   end
 
   if MacOS.version < :leopard

Library/Formula/boost-build.rb

@@ -7,6 +7,13 @@ class BoostBuild < Formula
 
   head 'https://github.com/boostorg/build.git'
 
+  bottle do
+    cellar :any
+    sha1 "b2d64e89dff33d0ddf55c30cb2bca1f015ac1d7a" => :yosemite
+    sha1 "15905ff6a6324951e1b0d63761b8d1a4dac00861" => :mavericks
+    sha1 "bb2094e4f4747dded749ddbb7d697cd7f9174740" => :mountain_lion
+  end
+
   def install
     if build.head?
       system "./bootstrap.sh"

Library/Formula/boot2docker.rb

@@ -4,14 +4,14 @@ class Boot2docker < Formula
   homepage "https://github.com/boot2docker/boot2docker-cli"
   # Boot2docker and docker are generally updated at the same time.
   # Please update the version of docker too
-  url "https://github.com/boot2docker/boot2docker-cli.git", :tag => "v1.2.0"
+  url "https://github.com/boot2docker/boot2docker-cli.git", :tag => "v1.3.0"
   head "https://github.com/boot2docker/boot2docker-cli.git", :branch => "master"
 
   bottle do
-    revision 1
-    sha1 "9da9a3caea7efbf7b2d9d5c9fd6948ac796becca" => :mavericks
-    sha1 "9cff42aea648b52fd10a3077595ca494b062ce5c" => :mountain_lion
-    sha1 "05582008ec7a25b1f4263a24aa559887ed10a4c4" => :lion
+    revision 2
+    sha1 "891132f91b6af4cba058c92cecd41287d2e1fc6d" => :mavericks
+    sha1 "ec3342d2c6378aa6725eed021fd6cc801da79d31" => :mountain_lion
+    sha1 "5c651fe2047ea0cd0512722d278631d39b6a19f8" => :lion
   end
 
   depends_on "docker" => :recommended

Library/Formula/botan.rb

@@ -1,11 +1,21 @@
-require 'formula'
+require "formula"
 
 class Botan < Formula
-  homepage 'http://botan.randombit.net/'
-  url 'http://botan.randombit.net/files/Botan-1.10.8.tbz'
-  sha1 'a7ba0be11629143043da078a4c044eac3369b4ec'
+  homepage "http://botan.randombit.net/"
+  url "http://files.randombit.net/botan/Botan-1.10.8.tgz"
+  sha1 "078fcb03c9ef0691621eda3ca312ebf08b3890cc"
+  revision 1
 
-  option 'enable-debug', 'Enable debug build of Botan'
+  bottle do
+    sha1 "89d491598019e57540e22089c3c7a3d45a845adc" => :yosemite
+    sha1 "aa5b7be38ab12c1755f3cb8dbee104d9514f27b2" => :mavericks
+    sha1 "2efea61b9f63b8344617a90eb4dc0445baab0243" => :mountain_lion
+  end
+
+  option "enable-debug", "Enable debug build of Botan"
+
+  depends_on "pkg-config" => :build
+  depends_on "openssl"
 
   # upstream ticket: https://bugs.randombit.net/show_bug.cgi?id=267
   patch :DATA

Library/Formula/bro.rb

@@ -1,22 +1,37 @@
-require 'formula'
+require "formula"
 
 class Bro < Formula
-  homepage 'http://www.bro-ids.org/'
-  url 'http://www.bro-ids.org/downloads/release/bro-2.3.tar.gz'
-  sha1 '79397be0e351165d44047b044d29b5e6580532cc'
+  homepage "https://www.bro.org"
+  head "https://github.com/bro/bro.git"
+
+  stable do
+    url "https://www.bro.org/downloads/release/bro-2.3.1.tar.gz"
+    sha256 "ff32d21e335d2ddb3e2942527c3212de6ead4e7ffd6ac958497fa80e04e60800"
+
+    # Fix for ntohll errrors on Yosemite. Already in HEAD.
+    patch do
+      url "https://github.com/bro/bro/commit/121fcdbb5b9221.diff"
+      sha1 "985cede121964a96fe10c81f2239d1f0c137c517"
+    end
+  end
 
   bottle do
-    sha1 "8aa75265faa2f23b73f7b27b7e495d79c60447d7" => :mavericks
-    sha1 "322c30d872bfe4271d113f8c54fad4fd7476f899" => :mountain_lion
-    sha1 "cf5fe821b85cfac5d8e4ebd86df37a7c75cf95cc" => :lion
+    sha1 "19d44e396ea474a01625333cc005d59c15a1a779" => :yosemite
+    sha1 "3ec9e7b7c05b68668f6559322372a2f57344f735" => :mavericks
+    sha1 "6e69354144ece0c4b99fe0c8f07c353e5892bf3c" => :mountain_lion
   end
 
-  depends_on 'cmake' => :build
-  depends_on 'swig' => :build
-  depends_on 'geoip' => :recommended
+  depends_on "cmake" => :build
+  depends_on "swig" => :build
+  depends_on "geoip" => :recommended
+  depends_on "openssl"
 
   def install
-    system "./configure", "--prefix=#{prefix}"
-    system "make install"
+    system "./configure", "--prefix=#{prefix}", "--with-openssl=#{Formula["openssl"].opt_prefix}"
+    system "make", "install"
+  end
+
+  test do
+    system "#{bin}/bro", "--version"
   end
 end

Library/Formula/bsdmake.rb

@@ -6,9 +6,10 @@ class Bsdmake < Formula
   sha1 "9ce3c3fc01e0eb47d82827b1eb227eb371fefd5c"
 
   bottle do
-    sha1 "79030aa9845b6d38597687450fe2e816096ded78" => :mavericks
-    sha1 "ec9167226d71cb85d097b4a9c2770cf98a5465e1" => :mountain_lion
-    sha1 "517532eb240860be38ef6c6523aae550e2be5ca6" => :lion
+    revision 1
+    sha1 "af9a7d65b92a9c5fae42bd3653d4b79c249e8c18" => :yosemite
+    sha1 "e7530cee7765619355ad4ff07ff3a9635c5f843c" => :mavericks
+    sha1 "cbb0f8c89812af75e3f4ba99951d8b440db5660e" => :mountain_lion
   end
 
   keg_only :provided_until_xcode43

Library/Formula/bup.rb

@@ -8,6 +8,13 @@ class Bup < Formula
 
   option "run-tests", "Run unit tests after compilation"
 
+  # Fix compilation on 10.10
+  # https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97
+  patch do
+    url "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff"
+    sha1 "a97d4292a7398d0bca2eb2ea0a99fb40a049c178"
+  end
+
   def install
     system "make"
     system "make test" if build.include? "run-tests"

Library/Formula/cabal-install.rb

@@ -8,10 +8,10 @@ class CabalInstall < Formula
 
   bottle do
     cellar :any
-    sha1 "3e14c600962c09a3bff687e66989766d236134d3" => :yosemite
-    sha1 "12a7a0ed49eef251fb8454bf882187aa9f495e75" => :mavericks
-    sha1 "c1c4d78116c9fb9cec8e021f074a7b2d78f13fd8" => :mountain_lion
-    sha1 "1e201a29a5535edc30654402e407f985017ef518" => :lion
+    revision 1
+    sha1 "2e7eeaf5fa142dee42443e41e08774c6bb80df09" => :yosemite
+    sha1 "8a01264adc397dd6057cbfa1db4c709ecf9ce601" => :mavericks
+    sha1 "a5516ab7cfe110c0528da484a57124b8805f8ffd" => :mountain_lion
   end
 
   depends_on "ghc"

Library/Formula/cairo.rb

@@ -11,9 +11,10 @@ class Cairo < Formula
   revision 1
 
   bottle do
-    sha1 "10638baaadb72abb460f2693019ad93f95b0c93a" => :mavericks
-    sha1 "285f291b386d46d86bd6d0360f9f9121170d72bc" => :mountain_lion
-    sha1 "a854c7d9c3cb0736ae09512384dc943425a29b43" => :lion
+    revision 1
+    sha1 "25b504ff3e601cc87d5f64b2bcc04712aef9ba62" => :yosemite
+    sha1 "e111154f2b17cdab98ee0606e286761e72ee019c" => :mavericks
+    sha1 "14926972549bc24365481a627ed8e9d6d02bd2c5" => :mountain_lion
   end
 
   keg_only :provided_pre_mountain_lion

Library/Formula/cairomm.rb

@@ -7,9 +7,10 @@ class Cairomm < Formula
   revision 1
 
   bottle do
-    sha1 "cd8a555f260bb8b8fe8f82e79b19413255df4e04" => :mavericks
-    sha1 "76bd3aa998281c12a7b5e936bc3c03462a07e4e6" => :mountain_lion
-    sha1 "8640ddb943e78dc271c870d259c079bbbfcba668" => :lion
+    revision 1
+    sha1 "11d150d437921cd03ec810690db1e12bf952a7cf" => :yosemite
+    sha1 "17435d1a18ecda653fa71097ba9620b46421aabf" => :mavericks
+    sha1 "3247ebe37140dc109465dcfc7b5df6d948690091" => :mountain_lion
   end
 
   option 'without-x', 'Build without X11 support'

Library/Formula/camlp4.rb

@@ -0,0 +1,37 @@
+require "formula"
+
+class Camlp4 < Formula
+  homepage "https://github.com/ocaml/camlp4"
+  url "https://github.com/ocaml/camlp4/archive/4.02.1+1.tar.gz"
+  sha1 "7d0f879517887299167f1c3eefa8f4d266d69183"
+  version "4.02.1+1"
+  head "https://github.com/ocaml/camlp4.git"
+
+  bottle do
+    cellar :any
+    sha1 "0eb13f59de6a620e7663f3e865d0fae8d211abfa" => :yosemite
+    sha1 "af24c6a58f16bd15875114bca320db8c3110d88d" => :mavericks
+    sha1 "c0c7378b99240a65cec22fa505cc4711413e03ec" => :mountain_lion
+  end
+
+  depends_on "objective-caml"
+
+  def install
+    # this build fails if jobs are parallelized
+    ENV.deparallelize
+    system "./configure", "--bindir=#{bin}",
+                          "--libdir=#{HOMEBREW_PREFIX}/lib/ocaml",
+                          "--pkgdir=#{HOMEBREW_PREFIX}/lib/ocaml/camlp4"
+    system "make", "all"
+    system "make", "install", "LIBDIR=#{lib}/ocaml",
+                              "PKGDIR=#{lib}/lib/ocaml/camlp4"
+  end
+
+  test do
+    (testpath/"foo.ml").write "type t = Homebrew | Rocks"
+    system "#{bin}/camlp4", "-parser", "OCaml", "-printer", "OCamlr",
+                            "foo.ml", "-o", testpath/"foo.ml.out"
+    assert_equal "type t = [ Homebrew | Rocks ];",
+                 (testpath/"foo.ml.out").read.strip
+  end
+end

Library/Formula/camlp5.rb

@@ -4,11 +4,12 @@ class Camlp5 < Formula
   homepage "http://camlp5.gforge.inria.fr/"
   url "http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-6.12.tgz"
   sha1 "d78d89dbd33725d7589181c38cc67180502da2f8"
+  revision 2
 
   bottle do
-    sha1 "a96b54c869d6a746d63f4fae548eabce16e866e4" => :mavericks
-    sha1 "865a5f4e5162ddbd661f930717f4e7d35b6dffb2" => :mountain_lion
-    sha1 "ae8b490cad902abac671e9ac332dadd8a8e8cfe8" => :lion
+    sha1 "a59c46767de8e867733609b08630953c57523fb3" => :yosemite
+    sha1 "02c88c2b521f13d7733630f19c2fc145e6cb2d97" => :mavericks
+    sha1 "73d8bd3f7848902360e171b425a8e807a512d449" => :mountain_lion
   end
 
   depends_on :ld64 # uses -no_compact_unwind

Library/Formula/capnp.rb

@@ -1,17 +1,29 @@
-require 'formula'
+require "formula"
 
 class Capnp < Formula
-  homepage 'http://kentonv.github.io/capnproto/'
-  url 'http://capnproto.org/capnproto-c++-0.4.1.tar.gz'
-  sha1 '18ce1a404c2bf68e6625e44927bfe6b67186cb15'
+  homepage "http://kentonv.github.io/capnproto/"
+  url "http://capnproto.org/capnproto-c++-0.4.1.tar.gz"
+  sha1 "18ce1a404c2bf68e6625e44927bfe6b67186cb15"
+
+  bottle do
+    cellar :any
+    sha1 "e980920f619a0682b1335550844b065894ed43ac" => :yosemite
+    sha1 "37a57c4a451723d7aa63dce453d35c65dce38a6e" => :mavericks
+    sha1 "8d7cc81fe1e7356eea9b422cc59ecbb1cef8f808" => :mountain_lion
+  end
 
   needs :cxx11
+  option "without-shared", "Disable building shared library variant"
 
   def install
-    system "./configure", "--disable-debug",
-                          "--disable-dependency-tracking",
-                          "--disable-silent-rules",
-                          "--prefix=#{prefix}"
+    args = ["--disable-debug",
+            "--disable-dependency-tracking",
+            "--disable-silent-rules",
+            "--prefix=#{prefix}"]
+
+    args << "--disable-shared" if build.without? "shared"
+
+    system "./configure", *args
     system "make", "check"
     system "make", "install"
   end

Library/Formula/cassandra.rb

@@ -2,8 +2,8 @@ require 'formula'
 
 class Cassandra < Formula
   homepage 'http://cassandra.apache.org'
-  url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.1.0/apache-cassandra-2.1.0-bin.tar.gz'
-  sha1 '11f0357277526bbf2eb532490cfadb14c1085f9e'
+  url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/2.1.1/apache-cassandra-2.1.1-bin.tar.gz'
+  sha1 'ba1ce9e7f141e0217cb97238f69157b20cc84e01'
 
   def install
     (var+"lib/cassandra").mkpath

Library/Formula/ccache.rb

@@ -2,8 +2,15 @@ require 'formula'
 
 class Ccache < Formula
   homepage 'http://ccache.samba.org/'
-  url 'http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2'
-  sha1 'e80a5cb7301e72f675097246d722505ae56e3cd3'
+  url 'http://samba.org/ftp/ccache/ccache-3.1.10.tar.bz2'
+  sha1 'f78154d526b98546c27e5ef480354f3ce021abe2'
+
+  bottle do
+    cellar :any
+    sha1 "5679d6b03cb483ea5a410b64683879351b417bd5" => :yosemite
+    sha1 "a8ea6388d840a5010cc1335aac6a16f937618446" => :mavericks
+    sha1 "5562df8168b3cc70cf8ca74c70c2baa2df5be6a6" => :mountain_lion
+  end
 
   head do
     url 'https://github.com/jrosdahl/ccache.git'

Library/Formula/ccm.rb

@@ -12,7 +12,7 @@ class Ccm < Formula
     sha1 "7f7178f0b6901a756fbcddaa4450902bc5390dae" => :lion
   end
 
-  head "https://github.com/pcmanus/ccm.git", :branch => :master
+  head "https://github.com/pcmanus/ccm.git", :branch => "master"
 
   resource "pyyaml" do
     url "https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.11.tar.gz"

Library/Formula/cdrtools.rb

@@ -14,9 +14,9 @@ class Cdrtools < Formula
   end
 
   devel do
-    url "https://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a24.tar.bz2"
-    version "3.01~a24"
-    sha1 "b49b01b6269280336ef3ca89aa41538db3a9b2dc"
+    url "https://downloads.sourceforge.net/project/cdrtools/alpha/cdrtools-3.01a25.tar.bz2"
+    version "3.01~a25"
+    sha1 "ef54e81082c795d595e752cec93884f74a9294ca"
 
     patch :p0, :DATA
   end

Library/Formula/ceylon.rb

@@ -2,8 +2,10 @@ require 'formula'
 
 class Ceylon < Formula
   homepage 'http://ceylon-lang.org/'
-  url 'http://ceylon-lang.org/download/dist/1_0_0'
-  sha1 '24737e1816c16497cb4b504d857530e1a171c2bf'
+  url 'http://ceylon-lang.org/download/dist/1_1_0'
+  sha1 '91d84e96f3a4468cc2e7de5a4003d5e945bd7c20'
+
+  depends_on :java => "1.7"
 
   def install
     rm_f Dir["bin/*.bat"]
@@ -16,15 +18,11 @@ class Ceylon < Formula
     bin.install_symlink Dir["#{libexec}/bin/ceylon*"]
   end
 
-  def caveats
-    "Ceylon requires Java 7."
-  end
-
   test do
     cd "#{libexec}/samples/helloworld" do
-      system "#{bin}/ceylon", "compile", "com.acme.helloworld"
-      system "#{bin}/ceylon", "doc", "--non-shared", "com.acme.helloworld"
-      system "#{bin}/ceylon", "run", "com.acme.helloworld/1.0.0", "John"
+      system "#{bin}/ceylon", "compile", "--encoding", "UTF-8", "com.example.helloworld"
+      system "#{bin}/ceylon", "doc", "--encoding", "UTF-8", "--non-shared", "com.example.helloworld"
+      system "#{bin}/ceylon", "run", "com.example.helloworld/1.1.0", "John"
     end
   end
 end

Library/Formula/cgal.rb

@@ -5,6 +5,12 @@ class Cgal < Formula
   url 'https://gforge.inria.fr/frs/download.php/33525/CGAL-4.4.tar.gz'
   sha1 '5e82193808817ba5144a0c8a57fa5d0c2498cb0d'
 
+  bottle do
+    sha1 "c1ea7f91f163f9a1273690571022287a97545d53" => :yosemite
+    sha1 "db2eda449c8aea97ad5b8f486ffea3c3586d814a" => :mavericks
+    sha1 "e4a3ea10e202c521caf7e7a368bb00a7f1e408ac" => :mountain_lion
+  end
+
   option :cxx11
 
   option 'imaging', "Build ImageIO and QT compoments of CGAL"

Library/Formula/checkstyle.rb

@@ -1,9 +1,9 @@
-require 'formula'
+require "formula"
 
 class Checkstyle < Formula
-  homepage 'http://checkstyle.sourceforge.net/'
-  url 'https://downloads.sourceforge.net/project/checkstyle/checkstyle/5.7/checkstyle-5.7-bin.tar.gz'
-  sha1 '232d317391b58d118a0102e8ff289fbaebd0064a'
+  homepage "http://checkstyle.sourceforge.net/"
+  url "https://downloads.sourceforge.net/project/checkstyle/checkstyle/6.0/checkstyle-6.0-bin.tar.gz"
+  sha1 "55628df367e55127205bb3d8f333db26bdf28b3c"
 
   def install
     libexec.install "checkstyle-#{version}-all.jar", "sun_checks.xml"

Library/Formula/chmlib.rb

@@ -7,9 +7,10 @@ class Chmlib < Formula
 
   bottle do
     cellar :any
-    sha1 "e65fbdafd130028ed1383a8318612917e6f4eda5" => :mavericks
-    sha1 "bd7d91259ed29e4fd804ef8ae45ab57ac1559da8" => :mountain_lion
-    sha1 "cc6c36eca6407cfaa925aca3c86dc875adc7566a" => :lion
+    revision 1
+    sha1 "268c1b15456895dcf00e17826c60b115e8741dac" => :yosemite
+    sha1 "9857eebe67646472c638115c014289249992b515" => :mavericks
+    sha1 "e5c765036fd196e3c659b9cc21e3b024ab606f33" => :mountain_lion
   end
 
   def install

Library/Formula/chromedriver.rb

@@ -2,9 +2,9 @@ require 'formula'
 
 class Chromedriver < Formula
   homepage 'http://code.google.com/p/chromedriver/'
-  url 'http://chromedriver.storage.googleapis.com/2.10/chromedriver_mac32.zip'
-  sha256 'fc412529600693430a17434652e1b765b2bd61f20a829b626d752a7b7d237c56'
-  version '2.10'
+  url 'http://chromedriver.storage.googleapis.com/2.11/chromedriver_mac32.zip'
+  sha256 '5abe6c42cef691ae594fd385dad8c22ff73a8a91d54854dbb6a5ceed670ab570'
+  version '2.11'
 
   def install
     bin.install 'chromedriver'

Library/Formula/clib.rb

@@ -7,9 +7,10 @@ class Clib < Formula
 
   bottle do
     cellar :any
-    sha1 "078a75c4851fd7baef7dc1b44b2573c873d61ef4" => :mavericks
-    sha1 "3b694a2c43b542317795383df940404edf91ada9" => :mountain_lion
-    sha1 "2551a74714e88fe36b44132ab9b9f55554c12cd8" => :lion
+    revision 1
+    sha1 "34cd018a5a3b85899d246574eb653246a929c848" => :yosemite
+    sha1 "15a82cf9553ac9c8eff6a6cc309661b55327c710" => :mavericks
+    sha1 "c6d984954c4faee1cfa9daba196e77830fdcfd46" => :mountain_lion
   end
 
   def install

Library/Formula/cliclick.rb

@@ -2,8 +2,15 @@ require "formula"
 
 class Cliclick < Formula
   homepage "http://www.bluem.net/jump/cliclick/"
-  url "https://github.com/BlueM/cliclick/archive/3.0.1.tar.gz"
-  sha1 "be5e9069b1706da0b49f6a127a1912bb67346213"
+  url "https://github.com/BlueM/cliclick/archive/3.0.2.tar.gz"
+  sha1 "7e6dbdf772adf2e36c66dee51bd077a89fe574fa"
+
+  bottle do
+    cellar :any
+    sha1 "a56d6d6c95c5cb7f6641d4f6484e944542aaa6e5" => :mavericks
+    sha1 "b8b97526eb4ff4c38f025a418214e0a166b9758a" => :mountain_lion
+    sha1 "feca3a136c0ff6a464ddfec9e7d4b73f93739a45" => :lion
+  end
 
   def install
     system "make"

Library/Formula/cln.rb

@@ -2,24 +2,18 @@ require "formula"
 
 class Cln < Formula
   homepage "http://www.ginac.de/CLN/"
-  url "http://www.ginac.de/CLN/cln-1.3.3.tar.bz2"
-  sha1 "11c56780eb83ed54f2ad1ecef7f0dc0f609c426d"
+  url "http://www.ginac.de/CLN/cln-1.3.4.tar.bz2"
+  sha1 "76f73071236ead72ba5c9ee892f29ca24e557b8c"
 
   bottle do
     cellar :any
-    sha1 "54f11e2ffe58d465e7ae7740a607f38169e99d32" => :mavericks
-    sha1 "657f0060d774be90d2a88ebc480a20b6043e7c67" => :mountain_lion
-    sha1 "3c4a67e6672596a0a9881fb23b7aa3c9eb2c673f" => :lion
+    sha1 "4e7caf04c3fc9e5b38bc45b2ca8110aefdffea28" => :yosemite
+    sha1 "32c6b097023b1c7e5f7bea248a39648356dc02e3" => :mavericks
+    sha1 "1c2e8079757a031feb65279be81f0b9874098134" => :mountain_lion
   end
 
   depends_on "gmp"
 
-  # Patch for Clang from MacPorts
-  patch do
-    url "https://trac.macports.org/export/114806/trunk/dports/math/cln/files/patch-clang.diff"
-    sha1 "0e95e34b7b821fe8ddfc04c099cf5b9d72fc9093"
-  end
-
   def install
     system "./configure", "--prefix=#{prefix}",
                           "--disable-dependency-tracking"

Library/Formula/clojurescript.rb

@@ -3,14 +3,14 @@ require "formula"
 class Clojurescript < Formula
   homepage "https://github.com/clojure/clojurescript"
   head "https://github.com/clojure/clojurescript.git"
-  url "https://github.com/clojure/clojurescript/archive/r2356.tar.gz"
-  sha1 "a35ee217bb9d32aaf084fbe853826ce4df198056"
+  url "https://github.com/clojure/clojurescript/archive/r2371.tar.gz"
+  sha1 "63284f043f2f61adcc78de60998520b382b5f135"
 
   bottle do
     cellar :any
-    sha1 "640fd5b5a0f0abf677663879e8ea7cf391613508" => :mavericks
-    sha1 "63ae3b5f13dc4df3df767d4d0f67d2dd7eab14c4" => :mountain_lion
-    sha1 "1c0671366c0ed5630fe7822464220d60737cc2f4" => :lion
+    sha1 "05a29dcf4e9c92b0a0eee7045c25e7265d10241c" => :mavericks
+    sha1 "dc804f7b868c8ca634fdc8793608c1730c50cbc6" => :mountain_lion
+    sha1 "d2ff39cccff549ebf65b230b09b99f81b8ec6a36" => :lion
   end
 
   def install

Library/Formula/cmake.rb

@@ -35,12 +35,14 @@ class Cmake < Formula
 
   bottle do
     cellar :any
+    sha1 "29e403721a38731bb3015008b1fe39d0d334c11f" => :yosemite
     sha1 "4b8b26f60d28c85c0119cb9ab136c5b40f8db570" => :mavericks
     sha1 "a7bc77aa9b9855e5d4081ec689bb62c89be7c25d" => :mountain_lion
     sha1 "842240c9febb4123918cf62a3cea5ca4207ad860" => :lion
   end
 
-  depends_on :python => :build if MacOS.version <= :snow_leopard
+  option "without-docs", "Don't build man pages"
+  depends_on :python => :build if MacOS.version <= :snow_leopard && build.with?("docs")
 
   resource "sphinx" do
     url "https://pypi.python.org/packages/source/S/Sphinx/Sphinx-1.2.3.tar.gz"
@@ -70,16 +72,22 @@ class Cmake < Formula
   depends_on NoExpatFramework
 
   def install
-    ENV.prepend_create_path "PYTHONPATH", buildpath+"sphinx/lib/python2.7/site-packages"
-    %w[markupsafe docutils pygments jinja2 sphinx].each do |r|
-      resource(r).stage do
-        system "python", "setup.py", "install", "--prefix=#{buildpath}/sphinx"
+    if build.with? "docs"
+      ENV.prepend_create_path "PYTHONPATH", buildpath+"sphinx/lib/python2.7/site-packages"
+      %w[markupsafe docutils pygments jinja2 sphinx].each do |r|
+        resource(r).stage do
+          pyargs = ["setup.py", "install", "--prefix=#{buildpath}/sphinx"]
+          unless r == "docutils"
+            pyargs << "--single-version-externally-managed" << "--record=installed.txt"
+          end
+          system "python", *pyargs
+        end
       end
-    end
 
-    # There is an existing issue around OS X & Python locale setting
-    # See http://bugs.python.org/issue18378#msg215215 for explanation
-    ENV["LC_ALL"] = "en_US.UTF-8"
+      # There is an existing issue around OS X & Python locale setting
+      # See http://bugs.python.org/issue18378#msg215215 for explanation
+      ENV["LC_ALL"] = "en_US.UTF-8"
+    end
 
     args = %W[
       --prefix=#{prefix}
@@ -88,9 +96,10 @@ class Cmake < Formula
       --datadir=/share/cmake
       --docdir=/share/doc/cmake
       --mandir=/share/man
-      --sphinx-man
-      --sphinx-build=#{buildpath}/sphinx/bin/sphinx-build
     ]
+    if build.with? "docs"
+      args << "--sphinx-man" << "--sphinx-build=#{buildpath}/sphinx/bin/sphinx-build"
+    end
 
     system "./bootstrap", *args
     system "make"

Library/Formula/coccinelle.rb

@@ -5,7 +5,14 @@ class Coccinelle < Formula
   url 'http://coccinelle.lip6.fr/distrib/coccinelle-1.0.0-rc21.tgz'
   sha1 'edc008da552eb8f4ef7712fc99b4dc630ab6fb35'
 
+  bottle do
+    sha1 "907762ffd74c58637cfc1968c0812cf324ad8ac1" => :yosemite
+    sha1 "4d2f9a8af8dca8cce0a3e65c44afc70e38fe7218" => :mavericks
+    sha1 "ef567b84ce5bd101e3993e162855e4e88d1f3600" => :mountain_lion
+  end
+
   depends_on "objective-caml"
+  depends_on "camlp4"
 
   def install
     system "./configure", "--disable-dependency-tracking",

Library/Formula/cogl.rb

@@ -6,9 +6,10 @@ class Cogl < Formula
   sha256 "9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa"
 
   bottle do
-    sha1 "6ed57026e1e5f8a7ae7ca4d6191fcdfa496d7b9f" => :mavericks
-    sha1 "a064bf230c3188142a2c8d5d1d6031f164a1507f" => :mountain_lion
-    sha1 "994fa2392d984d6a7a6885d7ed705231c8fd5f71" => :lion
+    revision 1
+    sha1 "f86c435b6472355f9db615cfc7ea94d76452d8f6" => :yosemite
+    sha1 "113da66275bfe4c1af107b9cfa65619e20af5441" => :mavericks
+    sha1 "2740ac7cb7da32ae2e44d055918352d5d947aa1e" => :mountain_lion
   end
 
   head do
@@ -41,6 +42,9 @@ class Cogl < Formula
   patch :DATA
 
   def install
+    # Don't dump files in $HOME.
+    ENV["GI_SCANNER_DISABLE_CACHE"] = "yes"
+
     resource("grep").stage do
       system "./configure", "--disable-dependency-tracking",
                             "--disable-nls",

Library/Formula/collectd.rb

@@ -1,14 +1,39 @@
 require "formula"
 
 class Collectd < Formula
-  homepage "http://collectd.org/"
-  url "http://collectd.org/files/collectd-5.4.1.tar.bz2"
-  sha1 "cea47e3936ed081bd71efacf7ba825fc837dc347"
+  homepage "https://collectd.org/"
+
+  stable do
+    url "https://collectd.org/files/collectd-5.4.1.tar.gz"
+    mirror "https://mirrors.kernel.org/debian/pool/main/c/collectd/collectd_5.4.1.orig.tar.gz"
+    sha256 "853680936893df00bfc2be58f61ab9181fecb1cf45fc5cddcb7d25da98855f65"
+
+    # Fix detection of htonll()
+    # https://github.com/collectd/collectd/commit/1a822486f40
+    patch do
+      url "https://gist.githubusercontent.com/jacknagel/85ba734488b6fbd25957/raw/7f16be18f96f1202ec7e5b193afa46061dfd944e/collectd.diff"
+      sha1 "34afbe6b9193f72ac6f2dd9a6978ff75ef9f41b0"
+    end
+  end
+
+  bottle do
+    sha1 "a5476eb04711bb016a4ef65412a70ba3722098e2" => :mavericks
+    sha1 "4829ba6a324a3057ce56a56d378a7e6790530feb" => :mountain_lion
+    sha1 "c0c82da5f79fb4c19cf7d2f16a9c008810b835c7" => :lion
+  end
 
   # Will fail against Java 1.7
   option "java", "Enable Java 1.6 support"
   option "debug", "Enable debug support"
 
+  head do
+    url "git://git.verplant.org/collectd.git"
+
+    depends_on "libtool" => :build
+    depends_on "automake" => :build
+    depends_on "autoconf" => :build
+  end
+
   depends_on "pkg-config" => :build
 
   fails_with :clang do
@@ -20,21 +45,20 @@ class Collectd < Formula
   end
 
   def install
-    # Use system Python; doesn't compile against 2.7
-    # -C enables the cache and resolves permissions errors
-    args = %W[-C
-              --disable-debug
-              --disable-dependency-tracking
-              --prefix=#{prefix}
-              --localstatedir=#{var}
-              --with-python=/usr/bin]
+    args = %W[
+      --disable-debug
+      --disable-dependency-tracking
+      --prefix=#{prefix}
+      --localstatedir=#{var}
+    ]
 
     args << "--disable-embedded-perl" if MacOS.version <= :leopard
     args << "--disable-java" unless build.include? "java"
     args << "--enable-debug" if build.include? "debug"
 
+    system "./build.sh" if build.head?
     system "./configure", *args
-    system "make install"
+    system "make", "install"
   end
 
   def plist; <<-EOS.undent

Library/Formula/compcert.rb

@@ -2,9 +2,8 @@ require "formula"
 
 class Compcert < Formula
   homepage "http://compcert.inria.fr"
-  url "http://compcert.inria.fr/release/compcert-2.3pl2.tgz"
-  sha1 "8d7b9d5b18bd52487686db2acd534c978b1e1421"
-  version "2.3pl2"
+  url "http://compcert.inria.fr/release/compcert-2.4.tgz"
+  sha1 "065eef31d1a59547fb3275ba7566867757b176f6"
 
   depends_on "objective-caml" => :build
   depends_on "coq" => :build

Library/Formula/confuse.rb

@@ -5,6 +5,13 @@ class Confuse < Formula
   url 'http://savannah.nongnu.org/download/confuse/confuse-2.7.tar.gz'
   sha1 'b3f74f9763e6c9012476dbd323d083af4be34cad'
 
+  bottle do
+    cellar :any
+    sha1 "1364f86a7dfa199fee07f273f6e3b4945b9db02a" => :yosemite
+    sha1 "d1edb26d0b30a9d85453cf811a5acf582dba3d56" => :mavericks
+    sha1 "9ede76f809eb464d96a8f703fb74c1678fc0c48d" => :mountain_lion
+  end
+
   depends_on 'pkg-config' => :build
 
   def install

Library/Formula/cookiecutter.rb

@@ -2,8 +2,15 @@ require 'formula'
 
 class Cookiecutter < Formula
   homepage 'https://github.com/audreyr/cookiecutter'
-  url 'https://pypi.python.org/packages/source/c/cookiecutter/cookiecutter-0.7.1.tar.gz'
-  sha1 '278a615977a4b29cead14cc9ede07a8c7452864a'
+  url 'https://pypi.python.org/packages/source/c/cookiecutter/cookiecutter-0.7.2.tar.gz'
+  sha1 '127b3f755edfb022c4634483666cf5f9d085fa71'
+
+  bottle do
+    cellar :any
+    sha1 "f0ac7ce389eedcdc2e4b67a5e2fb71747c45adf7" => :mavericks
+    sha1 "c8425e83e01c889d090cc6596b5c9900fe53d4bb" => :mountain_lion
+    sha1 "d20dd767a6fec5a5e305d31eef2f91cf1182ced3" => :lion
+  end
 
   depends_on :python if MacOS.version <= :snow_leopard
 

Library/Formula/coreutils.rb

@@ -8,9 +8,10 @@ class Coreutils < Formula
   revision 1
 
   bottle do
-    sha1 "2e0bcc5019f66bfbe1d037883c21d8df807d3155" => :mavericks
-    sha1 "5241674b7ccd1aa0849f2bc4461137020473769f" => :mountain_lion
-    sha1 "599c8ceab94b433ee909b62aa6e20249c660f424" => :lion
+    revision 1
+    sha1 "380f3f5fbd0da33e69d19edba4ae30b7e7cf899c" => :yosemite
+    sha1 "edf8d1fc1ac7104b570bd72003e10ca3599302f5" => :mavericks
+    sha1 "fe7525c7ef751f07f1f7dd7b37d4f584d2891210" => :mountain_lion
   end
 
   conflicts_with "ganglia", :because => "both install `gstat` binaries"

Library/Formula/couchdb.rb

@@ -4,11 +4,12 @@ class Couchdb < Formula
   homepage "http://couchdb.apache.org/"
   url "http://www.apache.org/dyn/closer.cgi?path=/couchdb/source/1.6.1/apache-couchdb-1.6.1.tar.gz"
   sha1 "6275f3818579d7b307052e9735c42a8a64313229"
+  revision 1
 
   bottle do
-    sha1 "fffe93d2e67f729cfa36b74e38ba078b7a9b7f2e" => :mavericks
-    sha1 "288802699ff78750cb325a5841d548ae0a12a342" => :mountain_lion
-    sha1 "74a35893e066b2da33342a83dd9e3c9f7548c74e" => :lion
+    sha1 "5de6d96453578bcb65a89dd68128efb856f8e99d" => :mavericks
+    sha1 "f1aeadfbc607c179a54d9c68f45dbb8eb85a57cd" => :mountain_lion
+    sha1 "8170817f314f8136ae2504ec58b7a936f1d316c7" => :lion
   end
 
   head do

Library/Formula/cppcheck.rb

@@ -2,15 +2,16 @@ require "formula"
 
 class Cppcheck < Formula
   homepage "http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page"
-  url "https://github.com/danmar/cppcheck/archive/1.66.tar.gz"
-  sha1 "277a214aa8a2bf30180645aca09c1dc9d3069977"
+  url "https://github.com/danmar/cppcheck/archive/1.67.tar.gz"
+  sha1 "14b886e5cac631cec11a3f8efbdeaed15ddcc7d3"
+  revision 1
 
   head "https://github.com/danmar/cppcheck.git"
 
   bottle do
-    sha1 "a3b2341260ab7afbb08dbf44e51b32d2edbd6d7c" => :mavericks
-    sha1 "e7290d70f4aee90d644898785eb4eff25fbbcd8b" => :mountain_lion
-    sha1 "ee30f858617e11e68d465d7406f445cf13d6f791" => :lion
+    sha1 "f5be9595dfdbbc616cbd1f11d3ea59ec32045309" => :yosemite
+    sha1 "5fb0911b3ff750368cbbfed71a1809e298404d8b" => :mavericks
+    sha1 "ae6b9a60ed3e139814c647aabdb4df1c71058436" => :mountain_lion
   end
 
   option "no-rules", "Build without rules (no pcre dependency)"
@@ -31,6 +32,9 @@ class Cppcheck < Formula
 
     system "make", "DESTDIR=#{prefix}", "BIN=#{bin}", "CFGDIR=#{prefix}/cfg", "install"
 
+    # make sure cppcheck can find its configure directory, #26194
+    prefix.install "cfg"
+
     if build.with? "gui"
       cd "gui" do
         # fix make not finding cfg directory:

Library/Formula/cracklib-words.rb

@@ -5,6 +5,13 @@ class CracklibWords < Formula
   url 'https://downloads.sourceforge.net/project/cracklib/cracklib-words/2008-05-07/cracklib-words-20080507.gz'
   sha1 'e0cea03e505e709b15b8b950d56cb493166607da'
 
+  bottle do
+    cellar :any
+    sha1 "372cd320ea6e9344917981da8b472494c0651ca9" => :yosemite
+    sha1 "9062c71578a70c510c13ce5ec1c9b8f27365fda4" => :mavericks
+    sha1 "d5adb62174571ba9e395b9143d9a1fcdfc3eb076" => :mountain_lion
+  end
+
   depends_on 'cracklib'
 
   def install

Library/Formula/cracklib.rb

@@ -6,9 +6,11 @@ class Cracklib < Formula
   sha1 '827dcd24b14bf23911c34f4226b4453b24f949a3'
 
   bottle do
-    sha1 "40df594cdc2483e6b68b75e019574dbe4fc10519" => :mavericks
-    sha1 "f67cff17c3c71fc0f947b47da85e6eeb0a45a3b8" => :mountain_lion
-    sha1 "c355b2de9ec2df8d647160d08236aef6a783c976" => :lion
+    cellar :any
+    revision 1
+    sha1 "1d4005c5e5401a3104255efb1ae88f5396984f2c" => :yosemite
+    sha1 "232a22e23e25dd71405fe869050dfd82bb5141e0" => :mavericks
+    sha1 "50d5faf0c5c3a46985382340e311263de9c363a6" => :mountain_lion
   end
 
   depends_on "gettext"

Library/Formula/czmq.rb

@@ -1,29 +1,44 @@
-require 'formula'
+require "formula"
 
 class Czmq < Formula
-  homepage 'http://czmq.zeromq.org/'
-  url 'http://download.zeromq.org/czmq-2.2.0.tar.gz'
-  sha1 '2f4fd8de4cf04a68a8f6e88ea7657d8068f472d2'
+  homepage "http://czmq.zeromq.org/"
+  url "http://download.zeromq.org/czmq-2.2.0.tar.gz"
+  sha1 "2f4fd8de4cf04a68a8f6e88ea7657d8068f472d2"
+  revision 1
+
+  bottle do
+    cellar :any
+    sha1 "76953cbf02d8eb56aa0bea5caefa19d19f5e48c6" => :yosemite
+    sha1 "5297d31b43353db09cc1931de2a529999ca0f2b5" => :mavericks
+    sha1 "998759fe30f0e27fb994130dd7fe95c5930a8124" => :mountain_lion
+  end
 
   head do
-    url 'https://github.com/zeromq/czmq.git'
+    url "https://github.com/zeromq/czmq.git"
 
-    depends_on 'autoconf' => :build
-    depends_on 'automake' => :build
-    depends_on 'libtool' => :build
-    depends_on 'pkg-config' => :build
+    depends_on "autoconf" => :build
+    depends_on "automake" => :build
+    depends_on "libtool" => :build
   end
 
   option :universal
 
-  depends_on 'zeromq'
+  depends_on "pkg-config" => :build
+  depends_on "zeromq"
+  depends_on "libsodium" => :recommended
 
   def install
     ENV.universal_binary if build.universal?
+
+    args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
+
+    if build.stable?
+      args << "--with-libsodium" if build.with? "libsodium"
+    end
+
     system "./autogen.sh" if build.head?
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
-    system "make install"
+    system "./configure", *args
+    system "make", "install"
     rm Dir["#{bin}/*.gsl"]
   end
 

Library/Formula/d-bus.rb

@@ -6,9 +6,10 @@ class DBus < Formula
   sha1 "e0d10e8b4494383c7e366ac80a942ba45a705a96"
 
   bottle do
-    sha1 "52ccc0020b2509ceb76f091d9d9b218da69bef9c" => :mavericks
-    sha1 "3c9477e550084961fa7f5112b791ff4a2d012e2e" => :mountain_lion
-    sha1 "a14cb84cdb5e6ea7da0b808c336bed7fe2068038" => :lion
+    revision 1
+    sha1 "6258f4a3816c909fe3ef9aa9da7b596c56471d1e" => :yosemite
+    sha1 "de9cc0897fadf951d0a915263ec8303ce3f27e23" => :mavericks
+    sha1 "6132e9f82c522fef668c31319bd8c03ae42dfcda" => :mountain_lion
   end
 
   # Upstream fix for O_CLOEXEC portability

Library/Formula/daemon.rb

@@ -9,7 +9,7 @@ class Daemon < Formula
   patch do
     url "https://trac.macports.org/raw-attachment/ticket/42845/daemon-0.6.4-ignore-strlcpy-strlcat.patch"
     sha1 "8330e7a2df1b8a37b440709c26baf55df251bc56"
-  end if MacOS.version == :mavericks
+  end if MacOS.version >= :mavericks
 
   def install
     system "./config"

Library/Formula/dar.rb

@@ -25,8 +25,8 @@ class Dar < Formula
   depends_on "upx" => :build if build.with? "upx"
 
   def install
-    ENV.prepend_path 'PATH', "#{Formula['gnu-sed'].opt_prefix}/libexec/gnubin"
-    ENV.prepend_path 'PATH', "#{Formula['coreutils'].libexec}/gnubin" if build.with? "docs"
+    ENV.prepend_path 'PATH', "#{Formula['gnu-sed'].opt_libexec}/gnubin"
+    ENV.prepend_path 'PATH', "#{Formula['coreutils'].opt_libexec}/gnubin" if build.with? "docs"
     ENV.libstdcxx if ENV.compiler == :clang && MacOS.version >= :mavericks
 
     args = %W[

Library/Formula/datomic.rb

@@ -2,9 +2,9 @@ require 'formula'
 
 class Datomic < Formula
   homepage 'http://www.datomic.com/'
-  url 'https://my.datomic.com/downloads/free/0.9.4880.2'
-  sha256 'a2287e4068fa887e1f6b1d226fe6196c65e9ad43aa00cf0c600bd9f6506cdcd3'
-  version '0.9.4880.2'
+  url 'https://my.datomic.com/downloads/free/0.9.4956'
+  sha256 'f7ed9371818cc8911e0bf690e74f1f4f3e5f5a84b2557514dd6047f405eae068'
+  version '0.9.4956'
 
   def write_libexec_alias *script_names
     script_names.each do |script_name|

Library/Formula/davix.rb

@@ -2,20 +2,21 @@ require "formula"
 
 class Davix < Formula
   homepage "http://dmc.web.cern.ch/projects/davix/home"
-  url "https://git.cern.ch/pub/davix.git", :tag => "R_0_3_4"
-  version "0.3.4"
+  url "https://git.cern.ch/pub/davix.git", :tag => "R_0_3_6-2"
+  version "0.3.6-2"
 
   head "https://git.cern.ch/pub/davix.git"
 
   bottle do
     cellar :any
-    sha1 "26b49cc9cc80dfcd4afe3e7cc2ee2621a18e1270" => :mavericks
-    sha1 "ecbe105f2e286df23107daf69aa2e1d2ad58b5dd" => :mountain_lion
-    sha1 "3b374d8e9dd79c8dbe59d94d8226ef93778e5325" => :lion
+    sha1 "5cfd3f49de7034c40ec309a5a17514caf46e9e8e" => :yosemite
+    sha1 "525f241213630dfeaa3ec9d5ea019c8a0670b4dc" => :mavericks
+    sha1 "21befa078d3cdea7369e037999a9e5be24f3157d" => :mountain_lion
   end
 
   depends_on "cmake" => :build
   depends_on "doxygen" => :build
+  depends_on "openssl"
 
   def install
     ENV.libcxx

Library/Formula/dbus-glib.rb

@@ -6,9 +6,9 @@ class DbusGlib < Formula
   sha1 '58a8955972f6c221461a49f9c541c22e838a5776'
 
   bottle do
-    sha1 "6ca096253317cc2add57bd5af718924a391ea8f4" => :mavericks
-    sha1 "9fb847d04b08d4f6c17aa8e76e919c899c9c3be1" => :mountain_lion
-    sha1 "411565ac6f2a5b74d110c97955ec9d50a25f1996" => :lion
+    revision 1
+    sha1 "51b2423a45fd72b5476a2b3c7f8c7d3716c38976" => :yosemite
+    sha1 "a3ed176614007538b3fd7e788e0a72e4710b3762" => :mavericks
   end
 
   depends_on 'pkg-config' => :build

Library/Formula/ddclient.rb

@@ -5,6 +5,8 @@ class Ddclient < Formula
   url 'https://downloads.sourceforge.net/project/ddclient/ddclient/ddclient-3.8.2/ddclient-3.8.2.tar.bz2'
   sha1 '8c887c06a580773c48a1eaced82a08c3077e1325'
 
+  head 'https://github.com/wimpunk/ddclient.git'
+
   def install
     # Adjust default paths in script
     inreplace 'ddclient' do |s|

Library/Formula/dialog.rb

@@ -5,6 +5,13 @@ class Dialog < Formula
   url 'ftp://invisible-island.net/dialog/dialog-1.2-20130928.tgz'
   sha1 '204d852856754817f5590f60ffaa1c07a8ed35ca'
 
+  bottle do
+    cellar :any
+    sha1 "ed04a10d2cbe61af48b5a0c5232f9612efb2b6a6" => :yosemite
+    sha1 "bd04f2988844a9be9aed5796aff53365ff635a76" => :mavericks
+    sha1 "4ef77c2932c8a75f79170a98e9434201744e0193" => :mountain_lion
+  end
+
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}", "--mandir=#{man}"

Library/Formula/djvulibre.rb

@@ -13,9 +13,9 @@ class Djvulibre < Formula
   end
 
   bottle do
-    sha1 "10f62a1f13813f5c730071849bfe0898165c303f" => :mavericks
-    sha1 "7b9fcb62beec891e67d1dbaf19ae3e4d02975917" => :mountain_lion
-    sha1 "96a3c4bd45ed2c2ca4a6efab0f1334326560b891" => :lion
+    revision 1
+    sha1 "306baf176acba6f71f3381a010fa78ff80e62ba6" => :yosemite
+    sha1 "61a53093e18457fb4235cc0afe3717eef851b85e" => :mavericks
   end
 
   head 'git://git.code.sf.net/p/djvu/djvulibre-git'

Library/Formula/dmd.rb

@@ -1,53 +1,66 @@
-require 'formula'
+require "formula"
 
 class Dmd < Formula
-  homepage 'http://dlang.org'
-  url 'https://github.com/D-Programming-Language/dmd/archive/v2.065.0.tar.gz'
-  sha1 '15f67e9b088d599c4091f1844676d107e873e850'
+  homepage "http://dlang.org"
+  url "https://github.com/D-Programming-Language/dmd/archive/v2.066.0.tar.gz"
+  sha1 "4ad09f680b249bb10b014b61ccb791a24f7a84c6"
 
   bottle do
-    sha1 "581cd8093ffe9fca493f06996e1d95e538fbb99e" => :mavericks
-    sha1 "3dfec90ecfc970e05efea17d6f786a0a1fbbb322" => :mountain_lion
-    sha1 "68d88b84a7f3407e867a83d093bf649f99830e23" => :lion
+    sha1 "1cbca6f4f1b0d2af27ad6571c0b2f4b37b928423" => :mavericks
+    sha1 "a61c224f5d15c7b846b3348e196dde6a86cf6b0a" => :mountain_lion
+    sha1 "051c88ee54bebc15c3908fd2f31ec18b6634b9c1" => :lion
   end
 
-  resource 'druntime' do
-    url 'https://github.com/D-Programming-Language/druntime/archive/v2.065.0.tar.gz'
-    sha1 '0118d9386b2d5f006381a5e4802f295132c8717b'
+  resource "druntime" do
+    url "https://github.com/D-Programming-Language/druntime/archive/v2.066.0.tar.gz"
+    sha1 "e1a5a29898127b4775a7b60c2534c3f4fc4387a9"
   end
 
-  resource 'phobos' do
-    url 'https://github.com/D-Programming-Language/phobos/archive/v2.065.0.tar.gz'
-    sha1 '2af606451ee5d651fea91f252e09411714f779df'
+  resource "phobos" do
+    url "https://github.com/D-Programming-Language/phobos/archive/v2.066.0.tar.gz"
+    sha1 "92385871df5883034055a20f8e8da5c398d11dd6"
   end
 
-  resource 'tools' do
-    url 'https://github.com/D-Programming-Language/tools/archive/v2.065.0.tar.gz'
-    sha1 '54b5855599e64d0efbfc1cb21f1a31ef9939f8be'
+  resource "tools" do
+    url "https://github.com/D-Programming-Language/tools/archive/v2.066.0.tar.gz"
+    sha1 "03384e9237c778e9afcecd10e756111fd4f323de"
   end
 
   def install
-    make_args = ["INSTALL_DIR=#{prefix}", "MODEL=#{Hardware::bits}", "-f", "posix.mak"]
+    make_args = ["INSTALL_DIR=#{prefix}", "MODEL=#{Hardware::CPU.bits}", "-f", "posix.mak"]
 
-    system "make", "install", "SYSCONFDIR=#{etc}", "TARGET_CPU=X86", "RELEASE=1", *make_args
+    system "make", "SYSCONFDIR=#{etc}", "TARGET_CPU=X86", "RELEASE=1", *make_args
 
-    share.install prefix/'man'
+    bin.install "src/dmd"
+    prefix.install "samples"
+    man.install Dir["docs/man/*"]
 
-    inreplace bin/'dmd.conf', "DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib",
-                              "DFLAGS=-I#{prefix}/import -L-L#{lib}"
+    conf = etc/"dmd.conf"
 
-    etc.install bin/'dmd.conf'
+    if conf.exist?
+      inreplace conf, /^DFLAGS=.+$/, "DFLAGS=-I#{include}/d2 -L-L#{lib}"
+    else
+      conf.write <<-EOS.undent
+        [Environment]
+        DFLAGS=-I#{include}/d2 -L-L#{lib}
+        EOS
+    end
 
     make_args.unshift "DMD=#{bin}/dmd"
 
-    (buildpath/'druntime').install resource('druntime')
-    (buildpath/'phobos').install resource('phobos')
+    (buildpath/"druntime").install resource("druntime")
+    (buildpath/"phobos").install resource("phobos")
 
-    system "make", "-C", "druntime", "install", *make_args
-    system "make", "-C", "phobos", "install", "VERSION=#{buildpath}/VERSION", *make_args
+    system "make", "-C", "druntime", *make_args
+    system "make", "-C", "phobos", "VERSION=#{buildpath}/VERSION", *make_args
 
-    resource('tools').stage do
-      inreplace 'posix.mak', 'install: $(TOOLS) $(CURL_TOOLS)', 'install: $(TOOLS)'
+    (include/"d2").install Dir["druntime/import/*"]
+    cp_r ["phobos/std", "phobos/etc"], include/"d2"
+    lib.install Dir["druntime/lib/*", "phobos/**/libphobos2.a"]
+
+
+    resource("tools").stage do
+      inreplace "posix.mak", "install: $(TOOLS) $(CURL_TOOLS)", "install: $(TOOLS)"
       system "make", "install", *make_args
     end
   end

Library/Formula/dnscrypt-proxy.rb

@@ -6,7 +6,7 @@ class DnscryptProxy < Formula
   sha256 "b53822841bd275d81ff9faa4784a42618b7acc3c76a86c75be40379c503d69de"
 
   head do
-    url "https://github.com/opendns/dnscrypt-proxy.git", :branch => "master"
+    url "https://github.com/jedisct1/dnscrypt-proxy.git", :branch => "master"
 
     depends_on :autoconf
     depends_on :automake

Library/Formula/dnsrend.rb

@@ -42,7 +42,6 @@ class Dnsrend < Formula
   end
 
   test do
-    test_pcap = HOMEBREW_LIBRARY/"Homebrew/test/fixtures/test.pcap"
-    system "#{bin}/dnsrend", test_pcap
+    system "#{bin}/dnsrend", test_fixtures("test.pcap")
   end
 end

Library/Formula/docbook-xsl.rb

@@ -7,9 +7,10 @@ class DocbookXsl < Formula
 
   bottle do
     cellar :any
-    sha1 "1e3f2c99e079fd558c388552c1844bde033e06f4" => :mavericks
-    sha1 "5e64aaef0b5e4efd37192fc8be39ed1388de5da4" => :mountain_lion
-    sha1 "4cc76192fcdc38b0d41177cb4263456c14d910f6" => :lion
+    revision 1
+    sha1 "2d71a5e24820de3f498f632b47ecaf7af7875312" => :yosemite
+    sha1 "236f05f3d22a6972eca770fcaf19063c6b0ec3aa" => :mavericks
+    sha1 "435ee69f4fc431bff00a973a70c5f24235f5392d" => :mountain_lion
   end
 
   depends_on 'docbook'

Library/Formula/docbook.rb

@@ -6,9 +6,10 @@ class Docbook < Formula
   sha1 '49f274e67efdee771300cba4da1f3e4bc00be1ec'
 
   bottle do
-    sha1 "bf3e1674f6e1db1c38e5f56ecc7297f13c3c13f5" => :mavericks
-    sha1 "2878dc39a8d6125e3ecc2512462fb22dfba7b9bb" => :mountain_lion
-    sha1 "1c8362d72527056fede232590c18c1c23dce41e1" => :lion
+    revision 1
+    sha1 "b6666858a43379c827ba9a62df987bcbcfffc6f3" => :yosemite
+    sha1 "ac3a230baa6c7a2d9accada9d956a566f3520151" => :mavericks
+    sha1 "8cbf8d315805395f2ca483161daa2c8bc3c4e19c" => :mountain_lion
   end
 
   resource 'xml412' do

Library/Formula/docker.rb

@@ -1,15 +1,15 @@
 require "formula"
 
 class Docker < Formula
-  homepage "http://docker.io"
+  homepage "https://www.docker.com/"
   # Boot2docker and docker are generally updated at the same time.
   # Please update the version of boot2docker too
-  url "https://github.com/docker/docker.git", :tag => "v1.2.0"
+  url "https://github.com/docker/docker.git", :tag => "v1.3.0"
 
   bottle do
-    sha1 "92d2cb761ea3da18edfea52de6cb4ee113dba0aa" => :mavericks
-    sha1 "eccd8540a0c57eca11456b3f060e67c430907c05" => :mountain_lion
-    sha1 "6421cb3f6e5fd485e61731e004b2390629291867" => :lion
+    sha1 "7563b28df830baa880731b9448e88b99dcb68420" => :mavericks
+    sha1 "4ecba686ae851cb091bec58aebab1c092a5edfbf" => :mountain_lion
+    sha1 "697f44626b6dd3152fb23d6da8272cb2359a6845" => :lion
   end
 
   option "without-completions", "Disable bash/zsh completions"

Library/Formula/doxygen.rb

@@ -9,9 +9,10 @@ class Doxygen < Formula
 
   bottle do
     cellar :any
-    sha1 "458ae347add858cd2c1dcb2ac56630e32819c005" => :mavericks
-    sha1 "8da163fb89076eebe1ea022ce839aee134e1e55b" => :mountain_lion
-    sha1 "61cfa999f80f65caf1588ffa293e9a64cbc54910" => :lion
+    revision 1
+    sha1 "7333771de328171fbd376a341ff5cff3c9bcf81a" => :yosemite
+    sha1 "2d537233288de44363156eb8664535e82ae12f2d" => :mavericks
+    sha1 "befbe63ba7afc2afb9199a73ccf578ea923348a2" => :mountain_lion
   end
 
   option "with-dot", "Build with dot command support from Graphviz."

Library/Formula/duply.rb

@@ -2,8 +2,8 @@ require "formula"
 
 class Duply < Formula
   homepage "http://duply.net"
-  url "https://downloads.sourceforge.net/project/ftplicity/duply%20(simple%20duplicity)/1.9.x/duply_1.9.0.tgz"
-  sha1 "b195a59523c95424af5393483ae70df2b9267003"
+  url "https://downloads.sourceforge.net/project/ftplicity/duply%20(simple%20duplicity)/1.9.x/duply_1.9.1.tgz"
+  sha1 "b4a53f6ebc207185ae5c0b5f98bf46cf961def1a"
 
   depends_on "duplicity"
 

Library/Formula/dwdiff.rb

@@ -4,12 +4,12 @@ class Dwdiff < Formula
   homepage "http://os.ghalkes.nl/dwdiff.html"
   url "http://os.ghalkes.nl/dist/dwdiff-2.0.9.tgz"
   sha1 "01cb2230b9147347bcfd1770898e435e4a57fa25"
-  revision 1
+  revision 2
 
   bottle do
-    sha1 "d86c4df0684421132d197d6059ae73c1022b26cc" => :mavericks
-    sha1 "3cde7642d439be392e69a939c8a0f16b30ec84b0" => :mountain_lion
-    sha1 "4e33875ebc44f65716a6588de2a82e52658b9806" => :lion
+    sha1 "7f88e50048cd75124feabeefa19ce892d2530895" => :mavericks
+    sha1 "7a7ee944533fe44613dcb53bd5baf1a5e2c6efa0" => :mountain_lion
+    sha1 "df694f72951f3c441de4150261437c1d5a0d679f" => :lion
   end
 
   depends_on "gettext"

Library/Formula/dxflib.rb

@@ -7,9 +7,10 @@ class Dxflib < Formula
 
   bottle do
     cellar :any
-    sha1 "e20ddb14b010c8686963fad454846521b6bc4d2d" => :mavericks
-    sha1 "1af6665dba3655d6a47f99ada050ecd585c2ffb1" => :mountain_lion
-    sha1 "00b03949f806c24e4d4d3f23023d9ed48e8bfd97" => :lion
+    revision 1
+    sha1 "58c0add8f6f8c5211ca4e59bc185468531431765" => :yosemite
+    sha1 "2184e3835e92a57a52854ad82f966a9e186c30e0" => :mavericks
+    sha1 "238319c0040cde6d76fa085f086adef65c3c15f0" => :mountain_lion
   end
 
   def install

Library/Formula/dylibbundler.rb

@@ -7,9 +7,10 @@ class Dylibbundler < Formula
 
   bottle do
     cellar :any
-    sha1 "9cb552b5a5aa59bc91d5d30957ddced29f1a3493" => :mavericks
-    sha1 "169b43be109b00d73d5f67fc10625eb7d3b0fb38" => :mountain_lion
-    sha1 "d2c32949637f3ca23cfe51bb2740024dfabf7673" => :lion
+    revision 1
+    sha1 "7796af4a80af52b2cda87f9a6af74919811cddb4" => :yosemite
+    sha1 "af56868cede7747f2559320659654e017cb0144a" => :mavericks
+    sha1 "81c315d6fbaea3b56ba78e967953f3f8a11d08ec" => :mountain_lion
   end
 
   def install

Library/Formula/dynamodb-local.rb

@@ -2,9 +2,9 @@ require 'formula'
 
 class DynamodbLocal < Formula
   homepage 'https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Tools.DynamoDBLocal.html'
-  url 'http://dynamodb-local.s3-website-us-west-2.amazonaws.com/dynamodb_local_2014-04-24.tar.gz'
-  version '2014-04-24'
-  sha1 '16e7fcf5b71498d72e093b1fbd6cf17e989bea84'
+  url 'http://dynamodb-local.s3-website-us-west-2.amazonaws.com/dynamodb_local_2014-10-07.tar.gz'
+  version '2014-10-07'
+  sha1 '7fc8a3b246d9e132c0522c3e08acf6f14d76fe44'
 
   def data_path
     var/'data/dynamodb-local'

Library/Formula/easy-git.rb

@@ -2,7 +2,7 @@ require 'formula'
 
 class EasyGit < Formula
   homepage 'http://people.gnome.org/~newren/eg/'
-  url 'http://people.gnome.org/~newren/eg/download/1.7.5.2/eg', :using => :ssl3
+  url 'https://people.gnome.org/~newren/eg/download/1.7.5.2/eg'
   version '1.7.5.2'
   sha1 'c59a10affaae79bddbbe1de743d85d7771575905'
 

Library/Formula/easy-tag.rb

@@ -23,7 +23,7 @@ class EasyTag < Formula
   depends_on "wavpack" => :optional
 
   def install
-    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].lib}/python2.7/site-packages"
+    ENV.append_path "PYTHONPATH", "#{Formula["libxml2"].opt_lib}/python2.7/site-packages"
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}"
     system "make"

Library/Formula/editorconfig.rb

@@ -2,10 +2,18 @@ require 'formula'
 
 class Editorconfig < Formula
   homepage 'http://editorconfig.org'
-  url 'https://downloads.sourceforge.net/project/editorconfig/EditorConfig-C-Core/0.11.5/source/editorconfig-core-c-0.11.5.tar.gz'
-  sha1 '2fe9df54d49c17d7e62c3996f4095afcd79d4d28'
+  url 'https://downloads.sourceforge.net/project/editorconfig/EditorConfig-C-Core/0.12.0/source/editorconfig-core-c-0.12.0.tar.gz'
+  sha1 'dfa96da823133fd925e7384f19d7f2acf44f50ba'
+
+  bottle do
+    cellar :any
+    sha1 "9ecacf9c908945bcda00206afa77d1871b5f2f72" => :mavericks
+    sha1 "1b2365c812d65888725763d7dd4ec9cf7bb6c924" => :mountain_lion
+    sha1 "84b22980c00b6c779f6308561b06058f5e3d5b11" => :lion
+  end
 
   depends_on 'cmake' => :build
+  depends_on 'pcre'
 
   head 'https://github.com/editorconfig/editorconfig-core-c.git', :branch => 'master'
 
@@ -15,6 +23,6 @@ class Editorconfig < Formula
   end
 
   test do
-    system "#{bin}/editorconfig"
+    system "#{bin}/editorconfig", "--version"
   end
 end