8 files changed, 11 insertions, 11 deletions
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 4932a191b..7d9545f38 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -84,7 +84,7 @@ def bottle_tag
   when 10.8, 10.7, 10.5
     MacOS.cat
   when 10.6
-    Hardware.is_64_bit? ? :snow_leopard : :snow_leopard_32
+    Hardware::CPU.is_64_bit? ? :snow_leopard : :snow_leopard_32
   else
     Hardware::CPU.type == :ppc ? Hardware::CPU.family : MacOS.cat
   end
diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb
index 51c5ee24a..46bc59b91 100644
--- a/Library/Homebrew/cmd/install.rb
+++ b/Library/Homebrew/cmd/install.rb
@@ -23,7 +23,7 @@ module Homebrew extend self
   end
 
   def check_ppc
-    case Hardware.cpu_type when :ppc, :dunno
+    case Hardware::CPU.type when :ppc, :dunno
       abort <<-EOS.undent
         Sorry, Homebrew does not support your computer's CPU architecture.
         For PPC support, see: https://github.com/mistydemeo/tigerbrew
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index db17f2255..40d44c773 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -299,7 +299,7 @@ module HomebrewEnvExtension
 
     unless compiler == :clang
       # Can't mix "-march" for a 32-bit CPU  with "-arch x86_64"
-      replace_in_cflags(/-march=\S*/, '-Xarch_i386 \0') if Hardware.is_32_bit?
+      replace_in_cflags(/-march=\S*/, '-Xarch_i386 \0') if Hardware::CPU.is_32_bit?
     end
   end
 
@@ -372,7 +372,7 @@ module HomebrewEnvExtension
     if self['HOMEBREW_MAKE_JOBS'].to_i > 0
       self['HOMEBREW_MAKE_JOBS'].to_i
     else
-      Hardware.processor_count
+      Hardware::CPU.cores
     end
   end
 
diff --git a/Library/Homebrew/hardware.rb b/Library/Homebrew/hardware.rb
index 547c3c318..815f4dbc0 100644
--- a/Library/Homebrew/hardware.rb
+++ b/Library/Homebrew/hardware.rb
@@ -37,12 +37,12 @@ class Hardware
   end
 
   def self.cores_as_words
-    case Hardware.processor_count
+    case Hardware::CPU.cores
     when 1 then 'single'
     when 2 then 'dual'
     when 4 then 'quad'
     else
-      Hardware.processor_count
+      Hardware::CPU.cores
     end
   end
 
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index d0f2d40f7..06215114c 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -184,7 +184,7 @@ module MacOS extend self
   end
 
   def prefer_64_bit?
-    Hardware.is_64_bit? and version != :leopard
+    Hardware::CPU.is_64_bit? and version != :leopard
   end
 
   STANDARD_COMPILERS = {
diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb
index 0cf427b09..76a19960f 100644
--- a/Library/Homebrew/superenv.rb
+++ b/Library/Homebrew/superenv.rb
@@ -196,7 +196,7 @@ class << ENV
 
   def determine_make_jobs
     if (j = ENV['HOMEBREW_MAKE_JOBS'].to_i) < 1
-      Hardware.processor_count
+      Hardware::CPU.cores
     else
       j
     end
diff --git a/Library/Homebrew/test/test_bottle_tag.rb b/Library/Homebrew/test/test_bottle_tag.rb
index 50028c164..2b039a29f 100644
--- a/Library/Homebrew/test/test_bottle_tag.rb
+++ b/Library/Homebrew/test/test_bottle_tag.rb
@@ -22,13 +22,13 @@ class BottleTagTests < Test::Unit::TestCase
 
   def test_cat_snow_leopard_32
     MacOS.stubs(:version).returns(MacOS::Version.new(10.6))
-    Hardware.stubs(:is_64_bit?).returns(false)
+    Hardware::CPU.stubs(:is_64_bit?).returns(false)
     assert_equal :snow_leopard_32, bottle_tag
   end
 
   def test_cat_snow_leopard_64
     MacOS.stubs(:version).returns(MacOS::Version.new(10.6))
-    Hardware.stubs(:is_64_bit?).returns(true)
+    Hardware::CPU.stubs(:is_64_bit?).returns(true)
     assert_equal :snow_leopard, bottle_tag
   end
 
diff --git a/Library/Homebrew/test/test_hardware.rb b/Library/Homebrew/test/test_hardware.rb
index 2f9787c9c..766ff7afd 100644
--- a/Library/Homebrew/test/test_hardware.rb
+++ b/Library/Homebrew/test/test_hardware.rb
@@ -9,7 +9,7 @@ class HardwareTests < Test::Unit::TestCase
   end
 
   def test_hardware_intel_family
-    if Hardware.cpu_type == :intel
+    if Hardware::CPU.type == :intel
       assert [:core, :core2, :penryn, :nehalem,
         :arrandale, :sandybridge, :ivybridge].include?(Hardware::CPU.family)
     end