From 17986602a29a96919cc60edbe0b49bc80b9fc14e Mon Sep 17 00:00:00 2001
From: Roland Walker <walker@pobox.com>
Date: Sat, 20 Dec 2014 16:01:56 -0500
Subject: [PATCH] fully remove homebrew-fork mach.rb

that was mistakenly commented out
---
 lib/homebrew-fork/Library/Homebrew/mach.rb    | 186 ------------------
 .../Library/Homebrew/os/mac/hardware.rb       |   2 -
 2 files changed, 188 deletions(-)
 delete mode 100644 lib/homebrew-fork/Library/Homebrew/mach.rb

diff --git a/lib/homebrew-fork/Library/Homebrew/mach.rb b/lib/homebrew-fork/Library/Homebrew/mach.rb
deleted file mode 100644
index 901a7f390ba87..0000000000000
--- a/lib/homebrew-fork/Library/Homebrew/mach.rb
+++ /dev/null
@@ -1,186 +0,0 @@
-# module ArchitectureListExtension
-#   def fat?
-#     length > 1
-#   end
-#
-#   def intel_universal?
-#     intersects_all?(Hardware::CPU::INTEL_32BIT_ARCHS, Hardware::CPU::INTEL_64BIT_ARCHS)
-#   end
-#
-#   def ppc_universal?
-#     intersects_all?(Hardware::CPU::PPC_32BIT_ARCHS, Hardware::CPU::PPC_64BIT_ARCHS)
-#   end
-#
-#   # Old-style 32-bit PPC/Intel universal, e.g. ppc7400 and i386
-#   def cross_universal?
-#     intersects_all?(Hardware::CPU::PPC_32BIT_ARCHS, Hardware::CPU::INTEL_32BIT_ARCHS)
-#   end
-#
-#   def universal?
-#     intel_universal? || ppc_universal? || cross_universal?
-#   end
-#
-#   def ppc?
-#     (Hardware::CPU::PPC_32BIT_ARCHS+Hardware::CPU::PPC_64BIT_ARCHS).any? {|a| self.include? a}
-#   end
-#
-#   def remove_ppc!
-#     (Hardware::CPU::PPC_32BIT_ARCHS+Hardware::CPU::PPC_64BIT_ARCHS).each {|a| self.delete a}
-#   end
-#
-#   def as_arch_flags
-#     self.collect{ |a| "-arch #{a}" }.join(' ')
-#   end
-#
-#   def as_cmake_arch_flags
-#     self.join(';')
-#   end
-#
-#   protected
-#
-#   def intersects_all?(*set)
-#     set.all? do |archset|
-#       archset.any? {|a| self.include? a}
-#     end
-#   end
-# end
-#
-# module MachO
-#   OTOOL_RX = /\t(.*) \(compatibility version (?:\d+\.)*\d+, current version (?:\d+\.)*\d+\)/
-#
-#   # Mach-O binary methods, see:
-#   # /usr/include/mach-o/loader.h
-#   # /usr/include/mach-o/fat.h
-#
-#   def mach_data
-#     @mach_data ||= begin
-#       offsets = []
-#       mach_data = []
-#
-#       header = read(8).unpack("N2")
-#       case header[0]
-#       when 0xcafebabe # universal
-#         header[1].times do |i|
-#           # header[1] is the number of struct fat_arch in the file.
-#           # Each struct fat_arch is 20 bytes, and the 'offset' member
-#           # begins 8 bytes into the struct, with an additional 8 byte
-#           # offset due to the struct fat_header at the beginning of
-#           # the file.
-#           offsets << read(4, 20*i + 16).unpack("N")[0]
-#         end
-#       when 0xcefaedfe, 0xcffaedfe, 0xfeedface, 0xfeedfacf # Single arch
-#         offsets << 0
-#       when 0x7f454c46 # ELF
-#         mach_data << { :arch => :x86_64, :type => :executable }
-#       else
-#         raise "Not a Mach-O binary."
-#       end
-#
-#       offsets.each do |offset|
-#         arch = case read(8, offset).unpack("N2")
-#           when [0xcefaedfe, 0x07000000] then :i386
-#           when [0xcffaedfe, 0x07000001] then :x86_64
-#           when [0xfeedface, 0x00000012] then :ppc7400
-#           when [0xfeedfacf, 0x01000012] then :ppc64
-#           else :dunno
-#           end
-#
-#         type = case read(4, offset + 12).unpack("N")[0]
-#           when 0x00000002, 0x02000000 then :executable
-#           when 0x00000006, 0x06000000 then :dylib
-#           when 0x00000008, 0x08000000 then :bundle
-#           else :dunno
-#           end
-#
-#         mach_data << { :arch => arch, :type => type }
-#       end
-#       mach_data
-#     rescue
-#       []
-#     end
-#   end
-#
-#   def archs
-#     mach_data.map{ |m| m.fetch :arch }.extend(ArchitectureListExtension)
-#   end
-#
-#   def arch
-#     case archs.length
-#     when 0 then :dunno
-#     when 1 then archs.first
-#     else :universal
-#     end
-#   end
-#
-#   def universal?
-#     arch == :universal
-#   end
-#
-#   def i386?
-#     arch == :i386
-#   end
-#
-#   def x86_64?
-#     arch == :x86_64
-#   end
-#
-#   def ppc7400?
-#     arch == :ppc7400
-#   end
-#
-#   def ppc64?
-#     arch == :ppc64
-#   end
-#
-#   def dylib?
-#     mach_data.any? { |m| m.fetch(:type) == :dylib }
-#   end
-#
-#   def mach_o_executable?
-#     mach_data.any? { |m| m.fetch(:type) == :executable }
-#   end
-#
-#   def mach_o_bundle?
-#     mach_data.any? { |m| m.fetch(:type) == :bundle }
-#   end
-#
-#   class Metadata
-#     attr_reader :path, :dylib_id, :dylibs
-#
-#     def initialize(path)
-#       @path = path
-#       @dylib_id, @dylibs = parse_otool_L_output
-#     end
-#
-#     def parse_otool_L_output
-#       ENV["HOMEBREW_MACH_O_FILE"] = path.expand_path.to_s
-#       libs = `#{MacOS.locate("otool")} -L "$HOMEBREW_MACH_O_FILE"`.split("\n")
-#
-#       libs.shift # first line is the filename
-#
-#       id = libs.shift[OTOOL_RX, 1] if path.dylib?
-#       libs.map! { |lib| lib[OTOOL_RX, 1] }.compact!
-#
-#       return id, libs
-#     ensure
-#       ENV.delete "HOMEBREW_MACH_O_FILE"
-#     end
-#   end
-#
-#   def mach_metadata
-#     @mach_metadata ||= Metadata.new(self)
-#   end
-#
-#   # Returns an array containing all dynamically-linked libraries, based on the
-#   # output of otool. This returns the install names, so these are not guaranteed
-#   # to be absolute paths.
-#   # Returns an empty array both for software that links against no libraries,
-#   # and for non-mach objects.
-#   def dynamically_linked_libraries
-#     mach_metadata.dylibs
-#   end
-#
-#   def dylib_id
-#     mach_metadata.dylib_id
-#   end
-# end
diff --git a/lib/homebrew-fork/Library/Homebrew/os/mac/hardware.rb b/lib/homebrew-fork/Library/Homebrew/os/mac/hardware.rb
index 158e928cd89cd..4dd3f43f851f8 100644
--- a/lib/homebrew-fork/Library/Homebrew/os/mac/hardware.rb
+++ b/lib/homebrew-fork/Library/Homebrew/os/mac/hardware.rb
@@ -1,5 +1,3 @@
-require 'mach'
-
 module MacCPUs
   OPTIMIZATION_FLAGS = {
     :penryn => '-march=core2 -msse4.1',