Add more deprecations, disable some existing ones.

Add more `odeprecated` calls to places that have been deprecated for a
while in the wild and move some of the existing `odeprecated` calls to
be `odisabled` to allow deleting the compatibility code.

1 files changed, 29 insertions, 56 deletions

diff --git a/Library/Homebrew/compat/macos.rb b/Library/Homebrew/compat/macos.rb
index 1f2c651c5..879af8357 100644
--- a/Library/Homebrew/compat/macos.rb
+++ b/Library/Homebrew/compat/macos.rb
@@ -10,142 +10,115 @@ module OS
     module_function
 
     def xcode_folder
-      odeprecated "MacOS.xcode_folder", "MacOS::Xcode.folder"
-      Xcode.folder
+      odisabled "MacOS.xcode_folder", "MacOS::Xcode.folder"
     end
 
     def xcode_prefix
-      odeprecated "MacOS.xcode_prefix", "MacOS::Xcode.prefix"
-      Xcode.prefix
+      odisabled "MacOS.xcode_prefix", "MacOS::Xcode.prefix"
     end
 
     def xcode_installed?
-      odeprecated "MacOS.xcode_installed?", "MacOS::Xcode.installed?"
-      Xcode.installed?
+      odisabled "MacOS.xcode_installed?", "MacOS::Xcode.installed?"
     end
 
     def xcode_version
-      odeprecated "MacOS.xcode_version", "MacOS::Xcode.version"
-      Xcode.version
+      odisabled "MacOS.xcode_version", "MacOS::Xcode.version"
     end
 
     def clt_installed?
-      odeprecated "MacOS.clt_installed?", "MacOS::CLT.installed?"
-      CLT.installed?
+      odisabled "MacOS.clt_installed?", "MacOS::CLT.installed?"
     end
 
     def clt_version?
-      odeprecated "MacOS.clt_version?", "MacOS::CLT.version"
-      CLT.version
+      odisabled "MacOS.clt_version?", "MacOS::CLT.version"
     end
 
     def x11_installed?
-      odeprecated "MacOS.x11_installed?", "MacOS::X11.installed?"
-      X11.installed?
+      odisabled "MacOS.x11_installed?", "MacOS::X11.installed?"
     end
 
     def x11_prefix
-      odeprecated "MacOS.x11_prefix", "MacOS::X11.prefix"
-      X11.prefix
+      odisabled "MacOS.x11_prefix", "MacOS::X11.prefix"
     end
 
     def leopard?
-      odeprecated "MacOS.leopard?", "'MacOS.version == :leopard'"
-      version == :leopard
+      odisabled "MacOS.leopard?", "'MacOS.version == :leopard'"
     end
 
     def snow_leopard?
-      odeprecated "MacOS.snow_leopard?", "'MacOS.version >= :snow_leopard'"
-      version >= :snow_leopard
+      odisabled "MacOS.snow_leopard?", "'MacOS.version >= :snow_leopard'"
     end
 
     def snow_leopard_or_newer?
-      odeprecated "MacOS.snow_leopard_or_newer?", "'MacOS.version >= :snow_leopard'"
-      version >= :snow_leopard
+      odisabled "MacOS.snow_leopard_or_newer?", "'MacOS.version >= :snow_leopard'"
     end
 
     def lion?
-      odeprecated "MacOS.lion?", "'MacOS.version >= :lion'"
-      version >= :lion
+      odisabled "MacOS.lion?", "'MacOS.version >= :lion'"
     end
 
     def lion_or_newer?
-      odeprecated "MacOS.lion_or_newer?", "'MacOS.version >= :lion'"
-      version >= :lion
+      odisabled "MacOS.lion_or_newer?", "'MacOS.version >= :lion'"
     end
 
     def mountain_lion?
-      odeprecated "MacOS.mountain_lion?", "'MacOS.version >= :mountain_lion'"
-      version >= :mountain_lion
+      odisabled "MacOS.mountain_lion?", "'MacOS.version >= :mountain_lion'"
     end
 
     def mountain_lion_or_newer?
-      odeprecated "MacOS.mountain_lion_or_newer?", "'MacOS.version >= :mountain_lion'"
-      version >= :mountain_lion
+      odisabled "MacOS.mountain_lion_or_newer?", "'MacOS.version >= :mountain_lion'"
     end
 
     def macports_or_fink_installed?
-      odeprecated "MacOS.macports_or_fink_installed?", "!MacOS.macports_or_fink.empty?"
-      !macports_or_fink.empty?
+      odisabled "MacOS.macports_or_fink_installed?", "!MacOS.macports_or_fink.empty?"
     end
 
-    def locate(tool)
-      odeprecated "MacOS.locate", "DevelopmentTools.locate"
-      DevelopmentTools.locate(tool)
+    def locate(_)
+      odisabled "MacOS.locate", "DevelopmentTools.locate"
     end
 
     def default_cc
-      odeprecated "MacOS.default_cc", "DevelopmentTools.default_cc"
-      DevelopmentTools.default_cc
+      odisabled "MacOS.default_cc", "DevelopmentTools.default_cc"
     end
 
     def default_compiler
-      odeprecated "MacOS.default_compiler", "DevelopmentTools.default_compiler"
-      DevelopmentTools.default_compiler
+      odisabled "MacOS.default_compiler", "DevelopmentTools.default_compiler"
     end
 
     def gcc_40_build_version
-      odeprecated "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_4_0_build_version"
-      DevelopmentTools.gcc_4_0_build_version
+      odisabled "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_4_0_build_version"
     end
 
     def gcc_4_0_build_version
-      odeprecated "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_4_0_build_version"
-      DevelopmentTools.gcc_4_0_build_version
+      odisabled "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_4_0_build_version"
     end
 
     def gcc_42_build_version
-      odeprecated "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_4_2_build_version"
-      DevelopmentTools.gcc_4_2_build_version
+      odisabled "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_4_2_build_version"
     end
 
     def gcc_build_version
-      odeprecated "MacOS.gcc_build_version", "DevelopmentTools.gcc_4_2_build_version"
-      DevelopmentTools.gcc_4_2_build_version
+      odisabled "MacOS.gcc_build_version", "DevelopmentTools.gcc_4_2_build_version"
     end
 
     def llvm_build_version
-      odeprecated "MacOS.llvm_build_version"
+      odisabled "MacOS.llvm_build_version"
     end
 
     def clang_version
-      odeprecated "MacOS.clang_version", "DevelopmentTools.clang_version"
-      DevelopmentTools.clang_version
+      odisabled "MacOS.clang_version", "DevelopmentTools.clang_version"
     end
 
     def clang_build_version
-      odeprecated "MacOS.clang_build_version", "DevelopmentTools.clang_build_version"
-      DevelopmentTools.clang_build_version
+      odisabled "MacOS.clang_build_version", "DevelopmentTools.clang_build_version"
     end
 
     def has_apple_developer_tools?
-      odeprecated "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?"
-      DevelopmentTools.installed?
+      odisabled "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?"
     end
 
     def release
-      odeprecated "MacOS.release", "MacOS.version"
-      version
+      odisabled "MacOS.release", "MacOS.version"
     end
   end
 end