Bottle imagemagick

Rationale: it doesn't compile well often enough, that it's worth our time bottling it.

Also, I removed the caveats about the source mirror, why was this ever in the caveats?

1 files changed, 7 insertions, 10 deletions

diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index 98a5e9fd7..508bd48d9 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -29,11 +29,15 @@ class Imagemagick < Formula
   # Using an unofficial Git mirror to work around:
   # * Stable tarballs disappearing
   # * Bad https cert on official SVN repo
-  url 'https://github.com/trevor/ImageMagick/tarball/6.7.1-1'
+  version '6.7.1-1'
+  url "https://github.com/trevor/ImageMagick/tarball/#{version}"
   md5 '9c71dfbddc42b78a0d8db8acdb534d37'
   homepage 'http://www.imagemagick.org'
   head 'https://github.com/trevor/ImageMagick.git'
 
+  bottle "https://downloads.sf.net/project/machomebrew/Bottles/imagemagick-#{version}-bottle.tar.gz"
+  bottle_sha1 'bff8db4da4bd255b01b483e0629e093ee76a9eb9'
+
   depends_on 'jpeg'
 
   depends_on 'ghostscript' => :recommended if ghostscript_srsly?
@@ -84,19 +88,12 @@ class Imagemagick < Formula
   end
 
   def caveats
-    s = <<-EOS.undent
-    We are downloading from an unofficial GitHub mirror because of:
-    * Stable tarballs disappearing
-    * Bad https cert on official SVN repo
-    EOS
-
     unless ghostscript_fonts? or ghostscript_srsly?
-      s += <<-EOS.undent
-      Some tools will complain if the ghostscript fonts are not installed in:
+      <<-EOS.undent
+      Some tools will complain unless the ghostscript fonts are installed to:
         #{HOMEBREW_PREFIX}/share/ghostscript/fonts
       EOS
     end
-    return s
   end
 
   def test