diff options
| -rw-r--r-- | Library/Formula/net-snmp.rb | 18 | ||||
| -rw-r--r-- | Library/Formula/phantomjs.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/requirements.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/requirements/maximum_macos_requirement.rb | 19 | 
4 files changed, 26 insertions, 19 deletions
| diff --git a/Library/Formula/net-snmp.rb b/Library/Formula/net-snmp.rb index 4319ba13a..0ac920c31 100644 --- a/Library/Formula/net-snmp.rb +++ b/Library/Formula/net-snmp.rb @@ -1,23 +1,5 @@  require "formula" -class MaximumMacOSRequirement < Requirement -  fatal true - -  def initialize(tags) -    @version = MacOS::Version.from_symbol(tags.first) -    super -  end - -  satisfy { MacOS.version <= @version } - -  def message -    <<-EOS.undent -      OS X #{@version.pretty_name} or older is required for stable. -      Use `brew install --devel` on newer versions. -    EOS -  end -end -  class NetSnmp < Formula    homepage "http://www.net-snmp.org/" diff --git a/Library/Formula/phantomjs.rb b/Library/Formula/phantomjs.rb index af745bff6..c556b9fca 100644 --- a/Library/Formula/phantomjs.rb +++ b/Library/Formula/phantomjs.rb @@ -12,6 +12,11 @@ class Phantomjs < Formula        url "https://github.com/ariya/phantomjs/commit/fe6a96.diff"        sha1 "d3efd38e0f3f0da08530d0bf603ea72ebdf06b78"      end + +    # Upstream have said won't fix 1.9.x for Yosemite +    # https://github.com/ariya/phantomjs/issues/10648 +    # Please remove this dependency with the next stable 2.0 release. +    depends_on MaximumMacOSRequirement => :mavericks    end    bottle do @@ -23,7 +28,7 @@ class Phantomjs < Formula    head "https://github.com/ariya/phantomjs.git" -  depends_on 'openssl' +  depends_on "openssl"    def install      if build.stable? && MacOS.prefer_64_bit? diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb index 3b6f0fe24..d0ebbe9cf 100644 --- a/Library/Homebrew/requirements.rb +++ b/Library/Homebrew/requirements.rb @@ -6,6 +6,7 @@ require 'requirements/mpi_dependency'  require 'requirements/osxfuse_dependency'  require 'requirements/python_dependency'  require 'requirements/x11_dependency' +require 'requirements/maximum_macos_requirement'  class XcodeDependency < Requirement    fatal true diff --git a/Library/Homebrew/requirements/maximum_macos_requirement.rb b/Library/Homebrew/requirements/maximum_macos_requirement.rb new file mode 100644 index 000000000..5efba641e --- /dev/null +++ b/Library/Homebrew/requirements/maximum_macos_requirement.rb @@ -0,0 +1,19 @@ +require 'requirement' + +class MaximumMacOSRequirement < Requirement +  fatal true + +  def initialize(tags) +    @version = MacOS::Version.from_symbol(tags.first) +    super +  end + +  satisfy { MacOS.version <= @version } + +  def message +    <<-EOS.undent +      OS X #{@version.pretty_name} or older is required for stable. +      Use `brew install devel or --HEAD` for newer. +    EOS +  end +end | 
