Run brew style --fix on all formulae

Closes cartr#73. Closes cartr#74.

Author: cartr

automoc4.rb

@@ -7,9 +7,9 @@ class Automoc4 < Formula
 
   bottle do
     root_url "https://homebrew.bintray.com/bottles"
-    sha256 "3f9efbccd2e54425aefa23beb359a84790a702fbc83e7950a709b3a56c818898" => :el_capitan
-    sha256 "db251dc1e60d49c6ba011c28cf4d08f82468af379195c66fc5e7777b6e9fc4fd" => :yosemite
-    sha256 "86fc5bddf7faf6f2897fc626903f0d927c8c9094e41c3d238c4b3e718acf4f47" => :mavericks
+    sha256 el_capitan: "3f9efbccd2e54425aefa23beb359a84790a702fbc83e7950a709b3a56c818898"
+    sha256 yosemite:   "db251dc1e60d49c6ba011c28cf4d08f82468af379195c66fc5e7777b6e9fc4fd"
+    sha256 mavericks:  "86fc5bddf7faf6f2897fc626903f0d927c8c9094e41c3d238c4b3e718acf4f47"
   end
 
   depends_on "cmake" => :build

[email protected]

@@ -7,9 +7,9 @@ class CoinAT313 < Formula
 
   bottle do
     root_url "https://dl.bintray.com/cartr/bottle-qt4"
-    sha256 "323796851c0d3556b23eaaa1ba6400a49f3235d4c0bb52c356843d03b5352f18" => :sierra
-    sha256 "91cd3072b9034640aec2ba8058f9dbfb7160802c5a1ed1d4b91b01fa7dae7dda" => :el_capitan
-    sha256 "67f8f0d490afee4095a23fb36b3334947d25d41c8693d4bd8a612a0ccf6212cc" => :yosemite
+    sha256 sierra:     "323796851c0d3556b23eaaa1ba6400a49f3235d4c0bb52c356843d03b5352f18"
+    sha256 el_capitan: "91cd3072b9034640aec2ba8058f9dbfb7160802c5a1ed1d4b91b01fa7dae7dda"
+    sha256 yosemite:   "67f8f0d490afee4095a23fb36b3334947d25d41c8693d4bd8a612a0ccf6212cc"
   end
 
   option "without-soqt", "Build without SoQt"

ezlupdate.rb

@@ -8,12 +8,11 @@ class Ezlupdate < Formula
   head "https://github.com/ezsystems/ezpublish-legacy.git"
 
   bottle do
-    cellar :any
     root_url "https://homebrew.bintray.com/bottles"
-    sha256 "52ee8008a9bc66fe5183a2b6c62960e35e1433f77cf849530cd893b20ed712fb" => :el_capitan
-    sha256 "68df4f04b7e23877182f848c3626eeb6a7b6ea677042736252e337e91216fa53" => :yosemite
-    sha256 "c9ba7248ae420ad5b53cabe1a9184bac07894ec86199d024f60eaff7a3f185a6" => :mavericks
-    sha256 "4c09e545f0e9f011ed6d281a2eb3b53a5dfba04ddd4a5c6df2bc3628a285b8b5" => :mountain_lion
+    sha256 cellar: :any, el_capitan:    "52ee8008a9bc66fe5183a2b6c62960e35e1433f77cf849530cd893b20ed712fb"
+    sha256 cellar: :any, yosemite:      "68df4f04b7e23877182f848c3626eeb6a7b6ea677042736252e337e91216fa53"
+    sha256 cellar: :any, mavericks:     "c9ba7248ae420ad5b53cabe1a9184bac07894ec86199d024f60eaff7a3f185a6"
+    sha256 cellar: :any, mountain_lion: "4c09e545f0e9f011ed6d281a2eb3b53a5dfba04ddd4a5c6df2bc3628a285b8b5"
   end
 
   depends_on "cartr/qt4/qt@4"

frescobaldi.rb

@@ -5,13 +5,13 @@ class Frescobaldi < Formula
   sha256 "b426bd53d54fdc4dfc16fcfbff957fdccfa319d6ac63614de81f6ada5044d3e6"
   revision 3
 
+  depends_on "pkg-config" => :build
+  depends_on "cartr/qt4/poppler-qt4" => "with-qt@4"
+  depends_on "cartr/qt4/pyqt@4"
   depends_on "python@2" if MacOS.version <= :snow_leopard
   depends_on "portmidi" => :optional
 
   # python-poppler-qt4 dependencies
-  depends_on "pkg-config" => :build
-  depends_on "cartr/qt4/poppler-qt4" => "with-qt@4"
-  depends_on "cartr/qt4/pyqt@4"
 
   resource "python-poppler-qt4" do
     url "https://github.com/wbsoft/python-poppler-qt4/archive/v0.24.0.tar.gz"
@@ -28,9 +28,7 @@ def install
 
     %w[python-poppler-qt4 python-ly].each do |r|
       resource(r).stage do
-        if r == "python-poppler-qt4"
-          inreplace "types.sip", "PyList_SET_ITEM", "PyList_SetItem"
-        end
+        inreplace "types.sip", "PyList_SET_ITEM", "PyList_SetItem" if r == "python-poppler-qt4"
         system "python", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
@@ -40,18 +38,19 @@ def install
     system "python", *Language::Python.setup_install_args(libexec)
 
     bin.install Dir[libexec/"bin/*"]
-    bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"])
+    bin.env_script_all_files(libexec/"bin", PYTHONPATH: ENV["PYTHONPATH"])
   end
 
-  def caveats; <<~EOS
-    By default, a splash screen is shown on startup; this causes the main
-    window not to show until the application icon on the dock is clicked
-    (Cmd-Tab application switching does not appear to work).
+  def caveats
+    <<~EOS
+      By default, a splash screen is shown on startup; this causes the main
+      window not to show until the application icon on the dock is clicked
+      (Cmd-Tab application switching does not appear to work).
 
-    You may want to disable the splash screen in the preferences to
-    solve this issue. See:
-      https://github.com/wbsoft/frescobaldi/issues/428
-  EOS
+      You may want to disable the splash screen in the preferences to
+      solve this issue. See:
+        https://github.com/wbsoft/frescobaldi/issues/428
+    EOS
   end
 
   test do

libechonest.rb

@@ -6,19 +6,18 @@ class Libechonest < Formula
   revision 1
 
   bottle do
-    cellar :any
     root_url "https://homebrew.bintray.com/bottles"
-    sha256 "51cae76dec59157c29e47d836d94044c75a4e69c05ded3d9fe5d16ed39029eae" => :el_capitan
-    sha256 "155a7921bd0e807a5702d9cf2f85b0fa2636713c57ee2c355cf27b70bd567c79" => :yosemite
-    sha256 "0e774fa6901a1d8c7244e8fcbbaefdd2a1b4f1d69d9ab3061c9dd67d468ac57b" => :mavericks
-    sha256 "093d7b8f68f0ef72da44b8118d96a0e103f37788e91294006fb1fd09fbe04d82" => :mountain_lion
+    sha256 cellar: :any, el_capitan:    "51cae76dec59157c29e47d836d94044c75a4e69c05ded3d9fe5d16ed39029eae"
+    sha256 cellar: :any, yosemite:      "155a7921bd0e807a5702d9cf2f85b0fa2636713c57ee2c355cf27b70bd567c79"
+    sha256 cellar: :any, mavericks:     "0e774fa6901a1d8c7244e8fcbbaefdd2a1b4f1d69d9ab3061c9dd67d468ac57b"
+    sha256 cellar: :any, mountain_lion: "093d7b8f68f0ef72da44b8118d96a0e103f37788e91294006fb1fd09fbe04d82"
   end
 
   depends_on "cmake" => :build
   depends_on "cartr/qt4/qt@4"
   depends_on "qjson"
 
-  conflicts_with "doxygen", :because => "cmake fails to configure build."
+  conflicts_with "doxygen", because: "cmake fails to configure build"
 
   def install
     system "cmake", ".", *std_cmake_args

[email protected]

@@ -8,8 +8,8 @@ class OpensslAT10 < Formula
 
   bottle do
     root_url "https://dl.bintray.com/cartr/autobottle-qt4"
-    sha256 "faa8d3dc06601237a6f42a93ec6d8b0229426f01ea109e3fab691ac1cf9fd681" => :mojave
-    sha256 "6d2269e690b2ddc182fa1148bb44e25b1172b6516caefad709158e736da94b46" => :high_sierra
+    sha256 mojave:      "faa8d3dc06601237a6f42a93ec6d8b0229426f01ea109e3fab691ac1cf9fd681"
+    sha256 high_sierra: "6d2269e690b2ddc182fa1148bb44e25b1172b6516caefad709158e736da94b46"
   end
 
   keg_only :provided_by_macos,
@@ -68,14 +68,15 @@ def post_install
     (openssldir/"cert.pem").atomic_write(valid_certs.join("\n") << "\n")
   end
 
-  def caveats; <<~EOS
-    A CA file has been bootstrapped using certificates from the SystemRoots
-    keychain. To add additional certificates (e.g. the certificates added in
-    the System keychain), place .pem files in
-      #{openssldir}/certs
-    and run
-      #{opt_bin}/c_rehash
-  EOS
+  def caveats
+    <<~EOS
+      A CA file has been bootstrapped using certificates from the SystemRoots
+      keychain. To add additional certificates (e.g. the certificates added in
+      the System keychain), place .pem files in
+        #{openssldir}/certs
+      and run
+        #{opt_bin}/c_rehash
+    EOS
   end
 
   test do

poppler-qt4.rb

@@ -24,7 +24,7 @@ class PopplerQt4 < Formula
   depends_on "little-cms2" => :optional
 
   conflicts_with "pdftohtml", "pdf2image", "xpdf",
-    :because => "poppler, pdftohtml, pdf2image, and xpdf install conflicting executables"
+    because: "poppler, pdftohtml, pdf2image, and xpdf install conflicting executables"
 
   resource "font-data" do
     url "https://poppler.freedesktop.org/poppler-data-0.4.8.tar.gz"
@@ -44,16 +44,16 @@ def install
       -DENABLE_QT5=OFF
     ]
 
-    if build.with? "qt@4"
-      args << "-DENABLE_QT4=ON"
+    args << if build.with? "qt@4"
+      "-DENABLE_QT4=ON"
     else
-      args << "-DENABLE_QT4=OFF"
+      "-DENABLE_QT4=OFF"
     end
 
-    if build.with? "little-cms2"
-      args << "-DENABLE_CMS=lcms2"
+    args << if build.with? "little-cms2"
+      "-DENABLE_CMS=lcms2"
     else
-      args << "-DENABLE_CMS=OFF"
+      "-DENABLE_CMS=OFF"
     end
 
     system "cmake", ".", *args

puddletag.rb

@@ -1,22 +1,21 @@
 class Puddletag < Formula
-  desc "Powerful, simple, audio tag editor."
-  homepage "http://puddletag.sf.net"
+  desc "Powerful, simple, audio tag editor"
+  homepage "https://puddletag.sourceforge.io/"
   url "https://github.com/keithgg/puddletag/archive/1.1.1.tar.gz"
   sha256 "550680abf9c2cf082861dfb3b61fd308f87f9ed304065582cddadcc8bdd947cc"
   revision 4
 
   head "https://github.com/keithgg/puddletag.git"
 
   bottle do
-    cellar :any_skip_relocation
     root_url "https://homebrew.bintray.com/bottles"
-    sha256 "2f97b0687f8eacab3188d6e2ec595f267f862efed2701e51b39a2bf81bf508bb" => :el_capitan
-    sha256 "80ad92bbf1cdaaed786063b7fc2ef78e1b652a70efbc882e1fd2c5828e3d302d" => :yosemite
-    sha256 "52b3b94916fe4943df8962f63534093a7f9a9b7f6c5e0ed4869d23b51ccd908f" => :mavericks
+    sha256 cellar: :any_skip_relocation, el_capitan: "2f97b0687f8eacab3188d6e2ec595f267f862efed2701e51b39a2bf81bf508bb"
+    sha256 cellar: :any_skip_relocation, yosemite:   "80ad92bbf1cdaaed786063b7fc2ef78e1b652a70efbc882e1fd2c5828e3d302d"
+    sha256 cellar: :any_skip_relocation, mavericks:  "52b3b94916fe4943df8962f63534093a7f9a9b7f6c5e0ed4869d23b51ccd908f"
   end
 
-  depends_on "python@2" if MacOS.version <= :snow_leopard
   depends_on "cartr/qt4/pyqt@4"
+  depends_on "python@2" if MacOS.version <= :snow_leopard
   depends_on "chromaprint" => :recommended
 
   resource "pyparsing" do
@@ -50,7 +49,7 @@ def install
     ENV.prepend_create_path "PYTHONPATH", HOMEBREW_PREFIX/"lib/python2.7/site-packages"
 
     bin.install Dir[libexec/"bin/*"]
-    bin.env_script_all_files(libexec/"bin", :PATH => "#{HOMEBREW_PREFIX}/bin", :PYTHONPATH => ENV["PYTHONPATH"])
+    bin.env_script_all_files(libexec/"bin", PATH: "#{HOMEBREW_PREFIX}/bin", PYTHONPATH: ENV["PYTHONPATH"])
 
     system "sh", "create_macos_app_bundle.sh", "--name", "Puddletag",
                  "--icon", "puddletag.png", "--script", "#{bin}/puddletag"

[email protected]

@@ -5,16 +5,25 @@ class PyqtAT4 < Formula
   sha256 "3224ab2c4d392891eb0abbc2bf076fef2ead3a5bb36ceae2383df4dda00ccce5"
   revision 1
 
+  bottle do
+    rebuild 1
+    root_url "https://dl.bintray.com/cartr/autobottle-qt4"
+    sha256 mojave:      "e44d7923a06753626ffc9bf6736b9641eb2b653bbd6ea34c841e1aaf2b9aadae"
+    sha256 high_sierra: "5c6d1faf80702fbf842192da0823615a933b4e6198824cf923c2ad52da5c598c"
+    sha256 sierra:      "60e060eea471ae89cad6c16c14f4c7d3ad300840de3a4694259166ce91b377f2"
+    sha256 el_capitan:  "73742cd1d51d3cf121e36a15fdde6ebe0d4c55abb5ca45a219a1776cec3f5b6d"
+    sha256 yosemite:    "ea4bcda9e317579d71969c231cb3dcf3dd84b1aeb5d8cecd50ca128645e38838"
+  end
+
   option "without-python@2", "Build without python 2 support"
+  depends_on "cartr/qt4/qt@4"
+  depends_on "cartr/qt4/[email protected]" => :recommended
   depends_on "python" => :optional
 
   if build.without?("python") && build.without?("python@2")
     odie "pyqt: --with-python must be specified when using --without-python@2"
   end
 
-  depends_on "cartr/qt4/qt@4"
-  depends_on "cartr/qt4/[email protected]" => :recommended
-
   if build.with? "python"
     depends_on "sip" => "with-python"
   else
@@ -23,9 +32,7 @@ class PyqtAT4 < Formula
 
   def install
     # On Mavericks we want to target libc++, this requires a non default qt makespec
-    if ENV.compiler == :clang && MacOS.version >= :mavericks
-      ENV.append "QMAKESPEC", "unsupported/macx-clang-libc++"
-    end
+    ENV.append "QMAKESPEC", "unsupported/macx-clang-libc++" if ENV.compiler == :clang && MacOS.version >= :mavericks
 
     Language::Python.each_python(build) do |python, version|
       ENV.append_path "PYTHONPATH", "#{Formula["sip"].opt_lib}/python#{version}/site-packages"
@@ -64,9 +71,7 @@ def install
       end
 
       # On Mavericks we want to target libc++, this requires a non default qt makespec
-      if ENV.compiler == :clang && MacOS.version >= :mavericks
-        args << "--spec" << "unsupported/macx-clang-libc++"
-      end
+      args << "--spec" << "unsupported/macx-clang-libc++" if ENV.compiler == :clang && MacOS.version >= :mavericks
 
       args << "--no-stubs"
 
@@ -91,14 +96,4 @@ def caveats
       system python, "test.py"
     end
   end
-  
-  bottle do
-    rebuild 1
-    root_url "https://dl.bintray.com/cartr/autobottle-qt4"
-    sha256 "e44d7923a06753626ffc9bf6736b9641eb2b653bbd6ea34c841e1aaf2b9aadae" => :mojave
-    sha256 "5c6d1faf80702fbf842192da0823615a933b4e6198824cf923c2ad52da5c598c" => :high_sierra
-    sha256 "60e060eea471ae89cad6c16c14f4c7d3ad300840de3a4694259166ce91b377f2" => :sierra
-    sha256 "73742cd1d51d3cf121e36a15fdde6ebe0d4c55abb5ca45a219a1776cec3f5b6d" => :el_capitan
-    sha256 "ea4bcda9e317579d71969c231cb3dcf3dd84b1aeb5d8cecd50ca128645e38838" => :yosemite
-  end
 end

[email protected]

@@ -8,14 +8,13 @@ class PysideToolsAT12 < Formula
   head "https://github.com/PySide/Tools.git"
 
   bottle do
-    cellar :any
     rebuild 2
     root_url "https://dl.bintray.com/cartr/autobottle-qt4"
-    sha256 "6eda5d9dc88477e751efb4d0985074e1163bfe42e48805f1f4a689b01fb230cf" => :mojave
-    sha256 "ce1705c26ff37f14d9e2c8d89de2a1cd8d1285434fc762bc5f3473152d2b5664" => :high_sierra
-    sha256 "08e3186ed7c36de766daf475ca60146098a0858d66bedab77cd88c18ff07b80b" => :sierra
-    sha256 "96d0547e36fa48ddcc2f743909f0905b5aec03bd93bbde5409806aecc4a6c846" => :el_capitan
-    sha256 "0d1c0c79a35dd143732af7998a94bb57b8ffa871fef11c05ffbd54c72ff6ec82" => :yosemite
+    sha256 cellar: :any, mojave:      "6eda5d9dc88477e751efb4d0985074e1163bfe42e48805f1f4a689b01fb230cf"
+    sha256 cellar: :any, high_sierra: "ce1705c26ff37f14d9e2c8d89de2a1cd8d1285434fc762bc5f3473152d2b5664"
+    sha256 cellar: :any, sierra:      "08e3186ed7c36de766daf475ca60146098a0858d66bedab77cd88c18ff07b80b"
+    sha256 cellar: :any, el_capitan:  "96d0547e36fa48ddcc2f743909f0905b5aec03bd93bbde5409806aecc4a6c846"
+    sha256 cellar: :any, yosemite:    "0d1c0c79a35dd143732af7998a94bb57b8ffa871fef11c05ffbd54c72ff6ec82"
   end
 
   depends_on "cmake" => :build