From fcc6795e839a46a3e1576d0c06fdb27f960da182 Mon Sep 17 00:00:00 2001
From: Will Farrington <wfarr@github.com>
Date: Thu, 18 Oct 2012 16:00:14 -0700
Subject: [PATCH 1/3] no more custom gyp

---
 script/bootstrap     |  1 -
 tools/gyp-formula.rb | 21 ---------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 tools/gyp-formula.rb

diff --git a/script/bootstrap b/script/bootstrap
index 0b5f44eee..a4f14b6f6 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -27,4 +27,3 @@ exit_unless_npm_exists
 exit_unless_brew_exists
 
 npm install
-brew install tools/gyp-formula.rb
diff --git a/tools/gyp-formula.rb b/tools/gyp-formula.rb
deleted file mode 100644
index 657f56cd4..000000000
--- a/tools/gyp-formula.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# Adapted from https://github.com/mxcl/homebrew/pull/11776/files
-
-require 'formula'
-
-class GypFormula < Formula
-  homepage 'http://code.google.com/p/gyp/'
-  url 'http://gyp.googlecode.com/svn/trunk', :revision => 1518
-  version 'trunk-1518'
-  head 'http://gyp.googlecode.com/svn/trunk'
-
-  def install
-    system "python", "setup.py", "install",
-      "--prefix=#{prefix}", "--install-purelib=#{libexec}",
-      "--install-platlib=#{libexec}", "--install-scripts=#{bin}"
-
-    mv bin + 'gyp', bin + 'gyp.py'
-    mv Dir[bin + '*'], libexec
-
-    bin.install_symlink "#{libexec}/gyp.py" => "gyp"
-  end
-end

From d58954145b2df7e7757c414975a47c1752715d4d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 18 Oct 2012 16:04:43 -0700
Subject: [PATCH 2/3] Remove brew check

This was added for the gyp formula install
which has been removed
---
 script/bootstrap | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/script/bootstrap b/script/bootstrap
index a4f14b6f6..de6b5542d 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -15,15 +15,7 @@ exit_unless_npm_exists() {
   fi
 }
 
-exit_unless_brew_exists() {
-  if ! hash brew 2> /dev/null; then
-    echo "ERROR: Atom requires brew"
-    exit 1
-  fi
-}
-
 exit_unless_xcode_exists
 exit_unless_npm_exists
-exit_unless_brew_exists
 
 npm install

From e60bd609d43cef80e66e034d84160f73e4e880db Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 19 Oct 2012 12:59:10 -0600
Subject: [PATCH 3/3] Fix 'rake nof'

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index e992256fb..8176c5f13 100644
--- a/Rakefile
+++ b/Rakefile
@@ -124,7 +124,7 @@ task :benchmark do
 end
 
 task :nof do
-  system %{find . -name *spec.coffee | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"}
+  system %{find . -name *spec.coffee | grep -v atom-build | xargs sed -E -i "" "s/f+(it|describe) +(['\\"])/\\1 \\2/g"}
 end
 
 def application_path