unsigned_kext_req: use new cask/download DSL.

3 files changed, 4 insertions, 27 deletions

diff --git a/Library/Formula/osxfuse.rb b/Library/Formula/osxfuse.rb
index c5ddec5b9..ff8a49b9f 100644
--- a/Library/Formula/osxfuse.rb
+++ b/Library/Formula/osxfuse.rb
@@ -16,7 +16,7 @@ class Osxfuse < Formula
 
   depends_on ConflictsWithBinaryOsxfuse
   depends_on UnsignedKextRequirement => [ :cask => "osxfuse",
-      :binary => "http://sourceforge.net/projects/osxfuse/files/" ]
+      :download => "http://sourceforge.net/projects/osxfuse/files/" ]
 
   depends_on "autoconf" => :build
   depends_on "automake" => :build
diff --git a/Library/Formula/tuntap.rb b/Library/Formula/tuntap.rb
index a1e914ddb..caacac509 100644
--- a/Library/Formula/tuntap.rb
+++ b/Library/Formula/tuntap.rb
@@ -24,7 +24,7 @@ class Tuntap < Formula
   end
 
   depends_on UnsignedKextRequirement => [ :cask => "tuntap",
-      :binary => "http://sourceforge.net/projects/tuntaposx/files/tuntap/" ]
+      :download => "http://sourceforge.net/projects/tuntaposx/files/tuntap/" ]
 
   def install
     cd "tuntap" if build.head?
diff --git a/Library/Homebrew/requirements/unsigned_kext_requirement.rb b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
index 3f5704847..1a6c16795 100644
--- a/Library/Homebrew/requirements/unsigned_kext_requirement.rb
+++ b/Library/Homebrew/requirements/unsigned_kext_requirement.rb
@@ -5,35 +5,12 @@ class UnsignedKextRequirement < Requirement
 
   satisfy { MacOS.version < :yosemite }
 
-  def initialize(tags=[])
-    tags.each do |tag|
-      next unless tag.is_a? Hash
-      @binary ||= tag[:binary]
-      @cask ||= tag[:cask]
-    end
-    super
-  end
-
   def message
     s = <<-EOS.undent
       Building this formula from source isn't possible due to OS X
       Yosemite and above's strict unsigned kext ban.
     EOS
-
-    if @cask
-      s +=  <<-EOS.undent
-
-        You can install from Homebrew Cask:
-          brew install Caskroom/cask/#{@cask}
-      EOS
-    end
-
-    if @binary
-      s += <<-EOS.undent
-
-        You can use the upstream binary:
-          #{@binary}
-      EOS
-    end
+    s += super
+    s
   end
 end