zsh: fix strict audit

Formula/zsh.rb

@@ -1,11 +1,9 @@
-require 'formula'
-
 class Zsh < Formula
   desc "A UNIX shell (command interpreter)"
-  homepage 'http://www.zsh.org/'
-  url 'https://downloads.sourceforge.net/project/zsh/zsh/5.0.8/zsh-5.0.8.tar.bz2'
-  mirror 'http://www.zsh.org/pub/zsh-5.0.8.tar.bz2'
-  sha256 '8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23'
+  homepage "http://www.zsh.org/"
+  url "https://downloads.sourceforge.net/project/zsh/zsh/5.0.8/zsh-5.0.8.tar.bz2"
+  mirror "http://www.zsh.org/pub/zsh-5.0.8.tar.bz2"
+  sha256 "8079cf08cb8beff22f84b56bd72bb6e6962ff4718d816f3d83a633b4c9e17d23"
 
   bottle do
     revision 1
@@ -14,15 +12,16 @@ class Zsh < Formula
     sha256 "c68dff49299b118989c53654f668733afe191cdb2bcd965eca849f331ddc68d6" => :mountain_lion
   end
 
-  depends_on 'gdbm'
-  depends_on 'pcre'
+  option "without-etcdir", "Disable the reading of Zsh rc files in /etc"
+
+  deprecated_option "disable-etcdir" => "without-etcdir"
 
-  option 'disable-etcdir', 'Disable the reading of Zsh rc files in /etc'
+  depends_on "gdbm"
+  depends_on "pcre"
 
   # zsh 5.0.8 broke du tab-completion for files, but this has been fixed in
-  # bug #35467. We ship our own version of the patch to avoid CHANGELOG
-  # conflicts.
-  # https://github.com/zsh-users/zsh/commit/806f73a0b3d3959d5af12ce97e0258b4d4fe7d76.patch
+  # bug #35467. We ship our own version of the patch to avoid CHANGELOG conflict.
+  # http://sourceforge.net/p/zsh/code/ci/806f73a0b3d3959d5af12ce97e0258b4d4fe7d76/
   patch :DATA
 
   def install
@@ -41,10 +40,10 @@ def install
       --with-tcsetpgrp
     ]
 
-    if build.include? 'disable-etcdir'
-      args << '--disable-etcdir'
+    if build.without? "etcdir"
+      args << "--disable-etcdir"
     else
-      args << '--enable-etcdir=/etc'
+      args << "--enable-etcdir=/etc"
     end
 
     system "./configure", *args
@@ -57,18 +56,19 @@ def install
     system "make", "install.info"
   end
 
-  test do
-    system "#{bin}/zsh", "--version"
-  end
-
   def caveats; <<-EOS.undent
     Add the following to your zshrc to access the online help:
       unalias run-help
       autoload run-help
       HELPDIR=#{HOMEBREW_PREFIX}/share/zsh/help
     EOS
   end
+
+  test do
+    system "#{bin}/zsh", "--version"
+  end
 end
+
 __END__
 diff --git a/Completion/Unix/Command/_du b/Completion/Unix/Command/_du
 index d8871cd..4065a20 100644