1 files changed, 21 insertions, 33 deletions
diff --git a/Library/Homebrew/compat/formula.rb b/Library/Homebrew/compat/formula.rb
index 57ab84a76..6f740710d 100644
--- a/Library/Homebrew/compat/formula.rb
+++ b/Library/Homebrew/compat/formula.rb
@@ -1,12 +1,10 @@
 module FormulaCompat
   def x11_installed?
-    odeprecated "Formula#x11_installed?", "MacOS::X11.installed?"
-    MacOS::X11.installed?
+    odisabled "Formula#x11_installed?", "MacOS::X11.installed?"
   end
 
   def snow_leopard_64?
-    odeprecated "Formula#snow_leopard_64?", "MacOS.prefer_64_bit?"
-    MacOS.prefer_64_bit?
+    odisabled "Formula#snow_leopard_64?", "MacOS.prefer_64_bit?"
   end
 end
 
@@ -15,48 +13,40 @@ class Formula
   extend FormulaCompat
 
   def std_cmake_parameters
-    odeprecated "Formula#std_cmake_parameters", "Formula#std_cmake_args"
-    "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev"
+    odisabled "Formula#std_cmake_parameters", "Formula#std_cmake_args"
   end
 
-  def cxxstdlib_check(check_type)
-    odeprecated "Formula#cxxstdlib_check in install",
-                "Formula.cxxstdlib_check outside install"
-    self.class.cxxstdlib_check check_type
+  def cxxstdlib_check(_)
+    odisabled "Formula#cxxstdlib_check in install",
+              "Formula.cxxstdlib_check outside install"
   end
 
   def self.bottle_sha1(*)
-    odeprecated "Formula.bottle_sha1"
+    odisabled "Formula.bottle_sha1"
   end
 
   def self.all
-    odeprecated "Formula.all", "Formula.map"
-    map
+    odisabled "Formula.all", "Formula.map"
   end
 
-  def self.canonical_name(name)
-    odeprecated "Formula.canonical_name", "Formulary.canonical_name"
-    Formulary.canonical_name(name)
+  def self.canonical_name(_)
+    odisabled "Formula.canonical_name", "Formulary.canonical_name"
   end
 
-  def self.class_s(name)
-    odeprecated "Formula.class_s", "Formulary.class_s"
-    Formulary.class_s(name)
+  def self.class_s(_)
+    odisabled "Formula.class_s", "Formulary.class_s"
   end
 
-  def self.factory(name)
-    odeprecated "Formula.factory", "Formulary.factory"
-    Formulary.factory(name)
+  def self.factory(_)
+    odisabled "Formula.factory", "Formulary.factory"
   end
 
   def self.require_universal_deps
-    odeprecated "Formula.require_universal_deps"
-    define_method(:require_universal_deps?) { true }
+    odisabled "Formula.require_universal_deps"
   end
 
-  def self.path(name)
-    odeprecated "Formula.path", "Formulary.core_path"
-    Formulary.core_path(name)
+  def self.path(_)
+    odisabled "Formula.path", "Formulary.core_path"
   end
 
   DATA = :DATA
@@ -67,20 +57,18 @@ class Formula
     {}
   end
 
-  def python(_options = {}, &_block)
-    odeprecated "Formula#python"
-    yield if block_given?
-    PythonRequirement.new
+  def python(_options = {}, &_)
+    odisabled "Formula#python"
   end
   alias python2 python
   alias python3 python
 
   def startup_plist
-    odeprecated "Formula#startup_plist", "Formula#plist"
+    odisabled "Formula#startup_plist", "Formula#plist"
   end
 
   def rake(*args)
-    # odeprecated "FileUtils#rake", "system \"rake\""
+    odeprecated "FileUtils#rake", "system \"rake\""
     system "rake", *args
   end
 end