Remove some unused options

Formula/apr-util.rb

@@ -16,34 +16,13 @@ class AprUtil < Formula
 
   depends_on "apr"
   depends_on "openssl"
-  depends_on "postgresql" => :optional
-  depends_on "mysql" => :optional
-  depends_on "freetds" => :optional
-  depends_on "unixodbc" => :optional
-  depends_on "sqlite" => :optional
-  depends_on "openldap" => :optional
 
   def install
-    # Stick it in libexec otherwise it pollutes lib with a .exp file.
-    args = %W[
-      --prefix=#{libexec}
-      --with-apr=#{Formula["apr"].opt_prefix}
-      --with-openssl=#{Formula["openssl"].opt_prefix}
-      --with-crypto
-    ]
-
-    args << "--with-pgsql=#{Formula["postgresql"].opt_prefix}" if build.with? "postgresql"
-    args << "--with-mysql=#{Formula["mysql"].opt_prefix}" if build.with? "mysql"
-    args << "--with-freetds=#{Formula["freetds"].opt_prefix}" if build.with? "freetds"
-    args << "--with-odbc=#{Formula["unixodbc"].opt_prefix}" if build.with? "unixodbc"
-
-    if build.with? "openldap"
-      args << "--with-ldap"
-      args << "--with-ldap-lib=#{Formula["openldap"].opt_lib}"
-      args << "--with-ldap-include=#{Formula["openldap"].opt_include}"
-    end
-
-    system "./configure", *args
+    # Install in libexec otherwise it pollutes lib with a .exp file.
+    system "./configure", "--prefix=#{libexec}",
+                          "--with-apr=#{Formula["apr"].opt_prefix}",
+                          "--with-crypto",
+                          "--with-openssl=#{Formula["openssl"].opt_prefix}"
     system "make"
     system "make", "install"
     bin.install_symlink Dir["#{libexec}/bin/*"]

Formula/aubio.rb

@@ -14,15 +14,12 @@ class Aubio < Formula
   end
 
   depends_on :macos => :lion
-  depends_on "pkg-config" => :build
   depends_on "libtool" => :build
+  depends_on "pkg-config" => :build
   depends_on "numpy"
   depends_on "python@2"
-  depends_on "libav" => :optional
-  depends_on "libsndfile" => :optional
-  depends_on "libsamplerate" => :optional
   depends_on "fftw" => :optional
-  depends_on "jack" => :optional
+  depends_on "libav" => :optional
 
   def install
     # Needed due to issue with recent cland (-fno-fused-madd))

Formula/bash-snippets.rb

@@ -6,57 +6,17 @@ class BashSnippets < Formula
 
   bottle :unneeded
 
-  option "with-bash-snippets", "Install bash-snippets gui"
-  option "with-cheat", "Install cheat"
-  option "with-cloudup", "Install cloudup"
-  option "with-crypt", "Install crypt"
-  option "with-cryptocurrency", "Install cryptocurrency"
-  option "with-currency", "Install currency"
-  option "with-geo", "Install geo"
-  option "with-lyrics", "Install lyrics"
-  option "with-meme", "Install meme"
-  option "with-movies", "Install movies"
-  option "with-newton", "Install newton"
-  option "with-pwned", "Install pwned"
-  option "with-qrify", "Install qrify"
-  option "with-short", "Install short"
-  option "with-siteciphers", "Install siteciphers"
-  option "with-stocks", "Install stocks"
-  option "with-taste", "Install taste"
-  option "with-todo", "Install todo"
-  option "with-transfer", "Install transfer"
-  option "with-weather", "Install weather"
-  option "with-ytview", "Install ytview"
-  option "without-all-tools", "Do not install all available snippets"
-
-  if build.with?("all-tools") || build.with?("cheat")
-    conflicts_with "cheat", :because => "Both install a `cheat` executable"
-  end
+  conflicts_with "cheat", :because => "Both install a `cheat` executable"
 
   def install
-    if build.with? "all-tools"
-      system "./install.sh", "--prefix=#{prefix}", "all"
-    else
-      args = []
-      %w[bash-snippets cheat cloudup crypt cryptocurrency currency geo lyrics movies newton qrify
-         short siteciphers stocks taste todo transfer weather ytview].each do |tool|
-        args << tool if build.with? tool
-      end
-      system "./install.sh", "--prefix=#{prefix}", *args
-    end
+    system "./install.sh", "--prefix=#{prefix}", "all"
   end
 
   test do
-    if build.with?("all-tools") || build.with?("weather")
-      output = shell_output("#{bin}/weather Paramus").lines.first
-      assert_equal "Weather report: Paramus, United States of America", output.chomp
-    end
-    if build.with?("all-tools") || build.with?("qrify")
-      output = shell_output("#{bin}/qrify This is a test")
-      assert_match "████ ▄▄▄▄▄ █▀ █▀▄█ ▄▄▄▄▄ ████", output
-    end
-    if build.with?("all-tools") || build.with?("stocks")
-      assert_match "AAPL stock info", shell_output("#{bin}/stocks Apple")
-    end
+    output = shell_output("#{bin}/weather Paramus").lines.first.chomp
+    assert_equal "Weather report: Paramus, United States of America", output
+    output = shell_output("#{bin}/qrify This is a test")
+    assert_match "████ ▄▄▄▄▄ █▀ █▀▄█ ▄▄▄▄▄ ████", output
+    assert_match "AAPL stock info", shell_output("#{bin}/stocks Apple")
   end
 end

Formula/bup.rb

@@ -13,14 +13,7 @@ class Bup < Formula
     sha256 "462b39a188a6fd32d9df4812a629b3bf8692f38439125d98e58e306261277903" => :yosemite
   end
 
-  option "with-pandoc", "Build and install the manpages"
-  option "with-test", "Run unit tests after compilation"
-  option "without-web", "Build without repository access via `bup web`"
-
-  deprecated_option "run-tests" => "with-test"
-  deprecated_option "with-tests" => "with-test"
-
-  depends_on "pandoc" => [:optional, :build]
+  depends_on "pandoc" => :build
   depends_on "python@2"
 
   resource "backports_abc" do
@@ -60,23 +53,18 @@ def install
       if test -n \"$run_test\"; then
     EOS
 
-    if build.with? "web"
-      ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
-      resources.each do |r|
-        r.stage do
-          system "python", *Language::Python.setup_install_args(libexec/"vendor")
-        end
+    ENV.prepend_create_path "PYTHONPATH", libexec/"vendor/lib/python2.7/site-packages"
+    resources.each do |r|
+      r.stage do
+        system "python", *Language::Python.setup_install_args(libexec/"vendor")
       end
     end
 
     system "make"
-    system "make", "test" if build.bottle? || build.with?("test")
     system "make", "install", "DESTDIR=#{prefix}", "PREFIX="
 
-    if build.with? "web"
-      mv bin/"bup", libexec/"bup.py"
-      (bin/"bup").write_env_script libexec/"bup.py", :PYTHONPATH => ENV["PYTHONPATH"]
-    end
+    mv bin/"bup", libexec/"bup.py"
+    (bin/"bup").write_env_script libexec/"bup.py", :PYTHONPATH => ENV["PYTHONPATH"]
   end
 
   test do

Formula/dar.rb

@@ -11,39 +11,23 @@ class Dar < Formula
     sha256 "0f3d68d33877c3d98b9d8fbacdbd52c54569ccc1a46130ecec244415c58c5c73" => :el_capitan
   end
 
-  option "with-doxygen", "build libdar API documentation and html man page"
-  option "with-libgcrypt", "enable strong encryption support"
-  option "with-lzo", "enable lzo compression support"
-  option "with-upx", "make executables compressed at installation time"
-
-  deprecated_option "with-docs" => "with-doxygen"
-
   depends_on :macos => :el_capitan # needs thread-local storage
-  depends_on "doxygen" => [:build, :optional]
-  depends_on "upx" => [:build, :optional]
-  depends_on "libgcrypt" => :optional
-  depends_on "lzo" => :optional
-  depends_on "xz" => :optional
 
   needs :cxx11
 
   def install
     ENV.cxx11
 
-    args = %W[
-      --enable-mode=64
-      --disable-debug
-      --disable-dependency-tracking
-      --disable-dar-static
-      --prefix=#{prefix}
-    ]
-    args << "--disable-build-html" if build.without? "doxygen"
-    args << "--disable-upx" if build.without? "upx"
-    args << "--disable-libgcrypt-linking" if build.without? "libgcrypt"
-    args << "--disable-liblzo2-linking" if build.without? "lzo"
-    args << "--disable-libxz-linking" if build.without? "xz"
-
-    system "./configure", *args
+    system "./configure", "--prefix=#{prefix}",
+                          "--disable-build-html",
+                          "--disable-dar-static",
+                          "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--disable-libgcrypt-linking",
+                          "--disable-liblzo2-linking",
+                          "--disable-libxz-linking",
+                          "--disable-upx",
+                          "--enable-mode=64"
     system "make", "install"
   end
 

Formula/gegl.rb

@@ -28,28 +28,18 @@ class Gegl < Formula
   depends_on "jpeg"
   depends_on "json-glib"
   depends_on "libpng"
-  depends_on "cairo" => :optional
-  depends_on "librsvg" => :optional
-  depends_on "lua" => :optional
-  depends_on "pango" => :optional
-  depends_on "sdl" => :optional
 
   conflicts_with "coreutils", :because => "both install `gcut` binaries"
 
   def install
-    args = %W[
-      --disable-debug
-      --disable-dependency-tracking
-      --prefix=#{prefix}
-      --disable-docs
-      --without-jasper
-      --without-umfpack
-    ]
-
-    args << "--without-cairo" if build.without? "cairo"
-
     system "./autogen.sh" if build.head?
-    system "./configure", *args
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--disable-docs",
+                          "--without-cairo",
+                          "--without-jasper",
+                          "--without-umfpack"
     system "make", "install"
   end
 

Formula/git.rb

@@ -12,17 +12,9 @@ class Git < Formula
     sha256 "cb0c4eac4a49fbd1936bae4070ecac3c3543aecfb2ba09869f6f6fd2aeb11015" => :el_capitan
   end
 
-  option "with-blk-sha1", "Compile with the block-optimized SHA1 implementation"
-  option "without-completions", "Disable bash/zsh completions from 'contrib' directory"
-  option "with-subversion", "Use Homebrew's version of SVN"
-  option "with-persistent-https", "Build git-remote-persistent-https from 'contrib' directory"
-
-  deprecated_option "with-brewed-svn" => "with-subversion"
   deprecated_option "with-pcre" => "with-pcre2"
 
   depends_on "pcre2" => :optional
-  depends_on "gettext" => :optional
-  depends_on "go" => :build if build.with? "persistent-https"
 
   if MacOS.version < :yosemite
     depends_on "openssl"
@@ -38,14 +30,6 @@ class Git < Formula
     depends_on "curl" => :optional
   end
 
-  if build.with? "subversion"
-    depends_on "subversion"
-    depends_on "perl" => :recommended
-  else
-    option "with-perl", "Build against Homebrew's Perl rather than system default"
-    depends_on "perl" => :optional
-  end
-
   resource "html" do
     url "https://www.kernel.org/pub/software/scm/git/git-htmldocs-2.18.0.tar.xz"
     sha256 "5b70d9b1f86aad464ae172040eb87da83058c00581388af6f60b050214912efc"
@@ -60,22 +44,15 @@ def install
     # If these things are installed, tell Git build system not to use them
     ENV["NO_FINK"] = "1"
     ENV["NO_DARWIN_PORTS"] = "1"
-    ENV["V"] = "1" # build verbosely
+    ENV["NO_GETTEXT"] = "1"
     ENV["NO_R_TO_GCC_LINKER"] = "1" # pass arguments to LD correctly
     ENV["PYTHON_PATH"] = which("python")
     ENV["PERL_PATH"] = which("perl")
+    ENV["V"] = "1" # build verbosely
 
     perl_version = Utils.popen_read("perl --version")[/v(\d+\.\d+)(?:\.\d+)?/, 1]
-    # If building with a non-system Perl search everywhere declared in @INC.
-    perl_inc = Utils.popen_read("perl -e 'print join\":\",@INC'").sub(":.", "")
 
-    if build.with? "subversion"
-      ENV["PERLLIB_EXTRA"] = %W[
-        #{Formula["subversion"].opt_lib}/perl5/site_perl
-      ].join(":")
-    elsif build.with? "perl"
-      ENV["PERLLIB_EXTRA"] = perl_inc
-    elsif MacOS.version >= :mavericks
+    if MacOS.version >= :mavericks
       ENV["PERLLIB_EXTRA"] = %W[
         #{MacOS.active_developer_dir}
         /Library/Developer/CommandLineTools
@@ -89,9 +66,6 @@ def install
       ENV["NO_PERL_MAKEMAKER"] = "1"
     end
 
-    ENV["BLK_SHA1"] = "1" if build.with? "blk-sha1"
-    ENV["NO_GETTEXT"] = "1" if build.without? "gettext"
-
     if build.with? "pcre2"
       ENV["USE_LIBPCRE2"] = "1"
       ENV["LIBPCREDIR"] = Formula["pcre2"].opt_prefix
@@ -144,23 +118,11 @@ def install
       git_core.install "git-subtree"
     end
 
-    if build.with? "persistent-https"
-      cd "contrib/persistent-https" do
-        system "make"
-        git_core.install "git-remote-persistent-http",
-                         "git-remote-persistent-https",
-                         "git-remote-persistent-https--proxy"
-      end
-    end
-
-    if build.with? "completions"
-      # install the completion script first because it is inside "contrib"
-      bash_completion.install "contrib/completion/git-completion.bash"
-      bash_completion.install "contrib/completion/git-prompt.sh"
-
-      zsh_completion.install "contrib/completion/git-completion.zsh" => "_git"
-      cp "#{bash_completion}/git-completion.bash", zsh_completion
-    end
+    # install the completion script first because it is inside "contrib"
+    bash_completion.install "contrib/completion/git-completion.bash"
+    bash_completion.install "contrib/completion/git-prompt.sh"
+    zsh_completion.install "contrib/completion/git-completion.zsh" => "_git"
+    cp "#{bash_completion}/git-completion.bash", zsh_completion
 
     elisp.install Dir["contrib/emacs/*.el"]
     (share/"git-core").install "contrib"

Formula/glfw.rb

@@ -15,30 +15,20 @@ class Glfw < Formula
   end
 
   option "without-shared-library", "Build static library only (defaults to building dylib only)"
-  option "with-examples", "Build examples"
-  option "with-test", "Build test programs"
 
   depends_on "cmake" => :build
 
-  deprecated_option "build-examples" => "with-examples"
   deprecated_option "static" => "without-shared-library"
-  deprecated_option "build-tests" => "with-test"
-  deprecated_option "with-tests" => "with-test"
 
   def install
     args = std_cmake_args + %w[
       -DGLFW_USE_CHDIR=TRUE
       -DGLFW_USE_MENUBAR=TRUE
     ]
     args << "-DBUILD_SHARED_LIBS=TRUE" if build.with? "shared-library"
-    args << "-DGLFW_BUILD_EXAMPLES=TRUE" if build.with? "examples"
-    args << "-DGLFW_BUILD_TESTS=TRUE" if build.with? "test"
-    args << "."
 
-    system "cmake", *args
+    system "cmake", *args, "."
     system "make", "install"
-    libexec.install Dir["examples/*"] if build.with? "examples"
-    libexec.install Dir["tests/*"] if build.with? "test"
   end
 
   test do