7 files changed, 51 insertions, 34 deletions
diff --git a/Library/Homebrew/compat.rb b/Library/Homebrew/compat.rb
index 71ae5a5d6..b20e8049c 100644
--- a/Library/Homebrew/compat.rb
+++ b/Library/Homebrew/compat.rb
@@ -7,3 +7,6 @@ require "compat/md5"
 require "compat/requirements"
 require "compat/version"
 require "compat/download_strategy"
+require "compat/keg"
+require "compat/pathname"
+require "compat/dependency_collector"
diff --git a/Library/Homebrew/compat/dependency_collector.rb b/Library/Homebrew/compat/dependency_collector.rb
new file mode 100644
index 000000000..516c55b56
--- /dev/null
+++ b/Library/Homebrew/compat/dependency_collector.rb
@@ -0,0 +1,25 @@
+module DependencyCollectorCompat
+  def parse_symbol_spec(spec, tags)
+    case spec
+    when :clt
+    when :autoconf, :automake, :bsdmake, :libtool
+      autotools_dep(spec, tags)
+    when :cairo, :fontconfig, :freetype, :libpng, :pixman
+      Dependency.new(spec.to_s, tags)
+    when :libltdl
+      tags << :run
+      Dependency.new("libtool", tags)
+    else
+      super(spec, tags)
+    end
+  end
+end
+
+class DependencyCollector
+  prepend DependencyCollectorCompat
+
+  def autotools_dep(spec, tags)
+    tags << :build unless tags.include? :run
+    Dependency.new(spec.to_s, tags)
+  end
+end
diff --git a/Library/Homebrew/compat/keg.rb b/Library/Homebrew/compat/keg.rb
new file mode 100644
index 000000000..015e6ae1f
--- /dev/null
+++ b/Library/Homebrew/compat/keg.rb
@@ -0,0 +1,6 @@
+class Keg
+  def fname
+    opoo "Keg#fname is a deprecated alias for Keg#name and will be removed soon"
+    name
+  end
+end
diff --git a/Library/Homebrew/compat/pathname.rb b/Library/Homebrew/compat/pathname.rb
new file mode 100644
index 000000000..7248525e5
--- /dev/null
+++ b/Library/Homebrew/compat/pathname.rb
@@ -0,0 +1,17 @@
+class Pathname
+  def cp(dst)
+    opoo "Pathname#cp is deprecated, use FileUtils.cp"
+    if file?
+      FileUtils.cp to_s, dst
+    else
+      FileUtils.cp_r to_s, dst
+    end
+    dst
+  end
+
+  def chmod_R(perms)
+    opoo "Pathname#chmod_R is deprecated, use FileUtils.chmod_R"
+    require "fileutils"
+    FileUtils.chmod_R perms, to_s
+  end
+end
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 4c8a50ed4..e2c68fe9d 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -116,14 +116,6 @@ class DependencyCollector
     when :emacs      then EmacsRequirement.new(tags)
     # Tiger's ld is too old to properly link some software
     when :ld64       then LD64Dependency.new if MacOS.version < :leopard
-    when :clt # deprecated
-    when :autoconf, :automake, :bsdmake, :libtool # deprecated
-      autotools_dep(spec, tags)
-    when :cairo, :fontconfig, :freetype, :libpng, :pixman # deprecated
-      Dependency.new(spec.to_s, tags)
-    when :libltdl # deprecated
-      tags << :run
-      Dependency.new("libtool", tags)
     when :python2
       PythonRequirement.new(tags)
     else
@@ -139,11 +131,6 @@ class DependencyCollector
     end
   end
 
-  def autotools_dep(spec, tags)
-    tags << :build unless tags.include? :run
-    Dependency.new(spec.to_s, tags)
-  end
-
   def ant_dep(spec, tags)
     if MacOS.version >= :mavericks
       Dependency.new(spec.to_s, tags)
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 9708879e9..8ff1f29a9 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -135,16 +135,6 @@ class Pathname
   end
   private :default_stat
 
-  # @private
-  def cp(dst)
-    opoo "Pathname#cp is deprecated, use FileUtils.cp"
-    if file?
-      FileUtils.cp to_s, dst
-    else
-      FileUtils.cp_r to_s, dst
-    end
-    dst
-  end
 
   # @private
   def cp_path_sub(pattern, replacement)
@@ -198,12 +188,6 @@ class Pathname
     false
   end
 
-  # @private
-  def chmod_R(perms)
-    opoo "Pathname#chmod_R is deprecated, use FileUtils.chmod_R"
-    require "fileutils"
-    FileUtils.chmod_R perms, to_s
-  end
 
   # @private
   def version
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 54c9f0e88..524538238 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -103,11 +103,6 @@ class Keg
     @opt_record = HOMEBREW_PREFIX.join("opt", name)
   end
 
-  def fname
-    opoo "Keg#fname is a deprecated alias for Keg#name and will be removed soon"
-    name
-  end
-
   def to_s
     path.to_s
   end