From 9be4f126d01d6ddaa79f342de7fd1a4984e53d7b Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 5 May 2015 21:37:13 -0400
Subject: [PATCH] Revert to native emacs brew

---
 rake/pkg/emacs.rake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rake/pkg/emacs.rake b/rake/pkg/emacs.rake
index 700deb26..c381a26d 100644
--- a/rake/pkg/emacs.rake
+++ b/rake/pkg/emacs.rake
@@ -3,7 +3,7 @@ if is_mac?
   ENV["EMACS_D"] = File.expand_path("~/.emacs.d")
 
   def emacs_reqs
-    [ "emacs-mac --with-gnutls --with-imagemagick --with-modern-icon --HEAD",
+    [ "emacs --with-cocoa --with-gnutls --with-imagemagick --with-librsvg --HEAD",
       "ispell",
       "cask",
       "markdown" ]
@@ -43,10 +43,7 @@ if is_mac?
 
     desc "Setup required homebrew packages"
     task :setup do
-      if !emacs_installed? || ENV["FORCE"]
-        Package.tap "railwaycat/emacsmacport"
-        setup
-      end
+      setup if !emacs_installed? || ENV["FORCE"]
     end
 
     desc "Setup required node & node plugins"
@@ -73,7 +70,6 @@ if is_mac?
       echo "Uninstalling emacs"
       Package.remove "emacs"
       Package.remove "homebrew/dupes/tidy"
-      Package.untap "railwaycat/emacsmacport"
       emacs_reqs.each { |pkg| Package.remove pkg.split.first }
 
       rm_rf ENV["EMACS_D"] if Dir.exists? ENV["EMACS_D"]