Rename requirements named *Dependency.

Dependency is another similar, related class and it's super confusing
to have some Requirements that are named *Dependency.

Closes Homebrew/homebrew#38891.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>

10 files changed, 13 insertions, 24 deletions

diff --git a/Library/Homebrew/requirements/apr_dependency.rb b/Library/Homebrew/requirements/apr_requirement.rb
index 7dfd83f29..313407e12 100644
--- a/Library/Homebrew/requirements/apr_dependency.rb
+++ b/Library/Homebrew/requirements/apr_requirement.rb
@@ -1,6 +1,6 @@
 require "requirement"
 
-class AprDependency < Requirement
+class AprRequirement < Requirement
   fatal true
   default_formula "apr-util"
 
diff --git a/Library/Homebrew/requirements/fortran_dependency.rb b/Library/Homebrew/requirements/fortran_requirement.rb
index 8ab4a8dce..a86a1a8ef 100644
--- a/Library/Homebrew/requirements/fortran_dependency.rb
+++ b/Library/Homebrew/requirements/fortran_requirement.rb
@@ -1,6 +1,6 @@
 require 'requirement'
 
-class FortranDependency < Requirement
+class FortranRequirement < Requirement
   fatal true
 
   default_formula 'gcc'
diff --git a/Library/Homebrew/requirements/java_dependency.rb b/Library/Homebrew/requirements/java_requirement.rb
index 7eb6aefae..1c43ad295 100644
--- a/Library/Homebrew/requirements/java_dependency.rb
+++ b/Library/Homebrew/requirements/java_requirement.rb
@@ -1,6 +1,6 @@
 require "language/java"
 
-class JavaDependency < Requirement
+class JavaRequirement < Requirement
   fatal true
   cask "java"
   download "http://www.oracle.com/technetwork/java/javase/downloads/index.html"
diff --git a/Library/Homebrew/requirements/language_module_dependency.rb b/Library/Homebrew/requirements/language_module_requirement.rb
index 2843c5c6c..47cbe8bc1 100644
--- a/Library/Homebrew/requirements/language_module_dependency.rb
+++ b/Library/Homebrew/requirements/language_module_requirement.rb
@@ -1,6 +1,6 @@
 require 'requirement'
 
-class LanguageModuleDependency < Requirement
+class LanguageModuleRequirement < Requirement
   fatal true
 
   def initialize language, module_name, import_name=nil
diff --git a/Library/Homebrew/requirements/ld64_dependency.rb b/Library/Homebrew/requirements/ld64_dependency.rb
deleted file mode 100644
index 782a50860..000000000
--- a/Library/Homebrew/requirements/ld64_dependency.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'dependency'
-
-# This special dependency ensures that the Tigerbrew ld64
-# formula is used as gcc's ld in place of the old version
-# that comes with the OS.
-class LD64Dependency < Dependency
-  def initialize(name='ld64', tags=[:build], env_proc=nil)
-    super
-    @env_proc = proc { ENV.ld64 }
-  end
-end
diff --git a/Library/Homebrew/requirements/mpi_dependency.rb b/Library/Homebrew/requirements/mpi_requirement.rb
index 9a5547a73..5ed042a41 100644
--- a/Library/Homebrew/requirements/mpi_dependency.rb
+++ b/Library/Homebrew/requirements/mpi_requirement.rb
@@ -3,7 +3,7 @@ require 'requirement'
 # There are multiple implementations of MPI-2 available.
 # http://www.mpi-forum.org/
 # This requirement is used to find an appropriate one.
-class MPIDependency < Requirement
+class MPIRequirement < Requirement
 
   attr_reader :lang_list
 
diff --git a/Library/Homebrew/requirements/osxfuse_dependency.rb b/Library/Homebrew/requirements/osxfuse_requirement.rb
index f1acf68e9..190d71cde 100644
--- a/Library/Homebrew/requirements/osxfuse_dependency.rb
+++ b/Library/Homebrew/requirements/osxfuse_requirement.rb
@@ -1,6 +1,6 @@
 require "requirement"
 
-class OsxfuseDependency < Requirement
+class OsxfuseRequirement < Requirement
   fatal true
   default_formula "osxfuse"
   cask "osxfuse"
@@ -17,9 +17,9 @@ class OsxfuseDependency < Requirement
   end
 end
 
-class ConflictsWithBinaryOsxfuse < Requirement
+class NonBinaryOsxfuseRequirement < Requirement
   fatal true
-  satisfy { HOMEBREW_PREFIX.to_s != "/usr/local" || !OsxfuseDependency.binary_osxfuse_installed? }
+  satisfy { HOMEBREW_PREFIX.to_s != "/usr/local" || !OsxfuseRequirement.binary_osxfuse_installed? }
 
   def message
     <<-EOS.undent
diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_requirement.rb
index f5276cb4e..df9d7328c 100644
--- a/Library/Homebrew/requirements/python_dependency.rb
+++ b/Library/Homebrew/requirements/python_requirement.rb
@@ -1,6 +1,6 @@
 require "language/python"
 
-class PythonDependency < Requirement
+class PythonRequirement < Requirement
   fatal true
   default_formula "python"
   cask "python"
@@ -47,7 +47,7 @@ class PythonDependency < Requirement
   alias_method :to_s, :python_binary
 end
 
-class Python3Dependency < PythonDependency
+class Python3Requirement < PythonRequirement
   fatal true
   default_formula "python3"
   cask "python3"
diff --git a/Library/Homebrew/requirements/tuntap_dependency.rb b/Library/Homebrew/requirements/tuntap_requirement.rb
index c3fa98ce1..1581393ac 100644
--- a/Library/Homebrew/requirements/tuntap_dependency.rb
+++ b/Library/Homebrew/requirements/tuntap_requirement.rb
@@ -1,6 +1,6 @@
 require "requirement"
 
-class TuntapDependency < Requirement
+class TuntapRequirement < Requirement
   fatal true
   default_formula "tuntap"
   cask "tuntap"
diff --git a/Library/Homebrew/requirements/x11_dependency.rb b/Library/Homebrew/requirements/x11_requirement.rb
index 5f7e4b526..890ef4d4f 100644
--- a/Library/Homebrew/requirements/x11_dependency.rb
+++ b/Library/Homebrew/requirements/x11_requirement.rb
@@ -1,6 +1,6 @@
 require "requirement"
 
-class X11Dependency < Requirement
+class X11Requirement < Requirement
   include Comparable
   attr_reader :min_version
 
@@ -33,7 +33,7 @@ class X11Dependency < Requirement
   end
 
   def <=> other
-    return unless X11Dependency === other
+    return unless X11Requirement === other
     min_version <=> other.min_version
   end