Merge pull request #1701 from MikeMcQuaid/deprecate-std-superenv-stuff

ENV: deprecate old methods.

4 files changed, 88 insertions, 8 deletions

diff --git a/Library/Homebrew/compat/ENV/shared.rb b/Library/Homebrew/compat/ENV/shared.rb
new file mode 100644
index 000000000..200e7b132
--- /dev/null
+++ b/Library/Homebrew/compat/ENV/shared.rb
@@ -0,0 +1,6 @@
+module SharedEnvExtension
+  def j1
+    odeprecated "ENV.j1", "ENV.deparallelize"
+    deparallelize
+  end
+end
diff --git a/Library/Homebrew/compat/ENV/std.rb b/Library/Homebrew/compat/ENV/std.rb
new file mode 100644
index 000000000..26dabe440
--- /dev/null
+++ b/Library/Homebrew/compat/ENV/std.rb
@@ -0,0 +1,27 @@
+module Stdenv
+  def fast
+    odeprecated "ENV.fast"
+  end
+
+  def O4
+    odeprecated "ENV.O4"
+  end
+
+  def Og
+    odeprecated "ENV.Og"
+  end
+
+  def gcc_4_0_1
+    odeprecated "ENV.gcc_4_0_1", "ENV.gcc_4_0"
+    gcc_4_0
+  end
+
+  def gcc
+    odeprecated "ENV.gcc", "ENV.gcc_4_2"
+    gcc_4_2
+  end
+
+  def libpng
+    odeprecated "ENV.libpng", "ENV.x11"
+  end
+end
diff --git a/Library/Homebrew/compat/ENV/super.rb b/Library/Homebrew/compat/ENV/super.rb
new file mode 100644
index 000000000..2020ad752
--- /dev/null
+++ b/Library/Homebrew/compat/ENV/super.rb
@@ -0,0 +1,47 @@
+module Superenv
+  def fast
+    odeprecated "ENV.fast"
+  end
+
+  def O4
+    odeprecated "ENV.O4"
+  end
+
+  def Og
+    odeprecated "ENV.Og"
+  end
+
+  def gcc_4_0_1
+    odeprecated "ENV.gcc_4_0_1", "ENV.gcc_4_0"
+    gcc_4_0
+  end
+
+  def gcc
+    odeprecated "ENV.gcc", "ENV.gcc_4_2"
+    gcc_4_2
+  end
+
+  def libxml2
+    odeprecated "ENV.libxml2"
+  end
+
+  def minimal_optimization
+    odeprecated "ENV.minimal_optimization"
+  end
+
+  def no_optimization
+    odeprecated "ENV.no_optimization"
+  end
+
+  def enable_warnings
+    odeprecated "ENV.enable_warnings"
+  end
+
+  def macosxsdk
+    odeprecated "ENV.macosxsdk"
+  end
+
+  def remove_macosxsdk
+    odeprecated "ENV.remove_macosxsdk"
+  end
+end
diff --git a/Library/Homebrew/compat/macos.rb b/Library/Homebrew/compat/macos.rb
index 17f4670cc..3acd2f9ef 100644
--- a/Library/Homebrew/compat/macos.rb
+++ b/Library/Homebrew/compat/macos.rb
@@ -100,23 +100,23 @@ module OS
     end
 
     def gcc_40_build_version
-      odeprecated "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_40_build_version"
-      DevelopmentTools.gcc_40_build_version
+      odeprecated "MacOS.gcc_40_build_version", "DevelopmentTools.gcc_4_0_build_version"
+      DevelopmentTools.gcc_4_0_build_version
     end
 
     def gcc_4_0_build_version
-      odeprecated "MacOS.gcc_4_0_build_version", "DevelopmentTools.gcc_40_build_version"
-      DevelopmentTools.gcc_40_build_version
+      odeprecated "MacOS.gcc_4_0_build_version", "DevelopmentTools.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_42_build_version"
-      DevelopmentTools.gcc_42_build_version
+      odeprecated "MacOS.gcc_42_build_version", "DevelopmentTools.gcc_4_2_build_version"
+      DevelopmentTools.gcc_4_2_build_version
     end
 
     def gcc_build_version
-      odeprecated "MacOS.gcc_build_version", "DevelopmentTools.gcc_42_build_version"
-      DevelopmentTools.gcc_42_build_version
+      odeprecated "MacOS.gcc_build_version", "DevelopmentTools.gcc_4_2_build_version"
+      DevelopmentTools.gcc_4_2_build_version
     end
 
     def llvm_build_version