Merge branch homebrew/master into linuxbrew/master

Conflicts: Library/Formula/android-sdk.rb Library/Formula/ghostscript.rb
atavism · May 11, 2015 · 2366f6b · 2366f6b
2 parents 14973e8 + fd40341
commit 2366f6b
Show file tree

Hide file tree

Showing 266 changed files with 3,311 additions and 2,119 deletions.
diff --git a/CODEOFCONDUCT.md b/CODEOFCONDUCT.md
@@ -7,7 +7,7 @@ A member of the Homebrew community is:
 Members of the community are open to collaboration, whether it's on GitHub, email, IRC or otherwise. We're receptive to constructive comment and criticism, as the experiences and skill sets of other members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate and everyone can make a difference.
 
 ## Considerate
-Members of the community are considerate of their peers - other Homebrew users. We're thoughtful when addressing the efforts of others, keeping in mind that often times the labor was completed simply for the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
+Members of the community are considerate of their peers - other Homebrew users. We're thoughtful when addressing the efforts of others, keeping in mind that oftentimes their labor was completed simply for the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.
 
 ## Respectful
 Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments, and their efforts. We're respectful of the volunteer efforts that permeate the Homebrew community. We're respectful of the processes set forth in the community, and we work within them. When we disagree, we are courteous in raising our issues.

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
@@ -113,3 +113,7 @@ Style/Tab:
     Enabled: false
 Style/TrailingBlankLines:
     Enabled: false
+
+# we use raise, not fail
+Style/SignalException:
+  EnforcedStyle: only_raise
diff --git a/Library/Aliases/pcre1 b/Library/Aliases/pcre1
@@ -0,0 +1 @@
+../Formula/pcre.rb
diff --git a/Library/Aliases/yubico-pam b/Library/Aliases/yubico-pam
@@ -0,0 +1 @@
+../Formula/pam_yubico.rb
diff --git a/Library/Contributions/brew_bash_completion.sh b/Library/Contributions/brew_bash_completion.sh
@@ -413,6 +413,7 @@ _brew_upgrade ()
     case "$cur" in
     --*)
         __brewcomp "
+            --all
             --build-from-source --build-bottle --force-bottle
             --debug
             --verbose

diff --git a/Library/ENV/4.3/g++-5 b/Library/ENV/4.3/g++-5
@@ -0,0 +1 @@
+cc
diff --git a/Library/ENV/4.3/gcc-5 b/Library/ENV/4.3/gcc-5
@@ -0,0 +1 @@
+cc
diff --git a/Library/Formula/ack.rb b/Library/Formula/ack.rb
@@ -1,13 +1,44 @@
 class Ack < Formula
   homepage "http://beyondgrep.com/"
   url "http://beyondgrep.com/ack-2.14-single-file"
-  sha1 "49c43603420521e18659ce3c50778a4894dd4a5f"
+  sha256 "1d203cfbc52ce8f49e3992be1cd3e4d7d5dfb7daa3739e8628aa9858ccc5b9df"
   version "2.14"
 
+  head "https://github.com/petdance/ack2.git", :branch => "dev"
+
+  devel do
+    url "https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/ack-2.15_01.tar.gz"
+    sha256 "dfd1df3def5d3b16af8a7c585fc8954362d4f2b097891919490c89fdb484fd83"
+  end
+
+  resource "File::Next" do
+    url "https://cpan.metacpan.org/authors/id/P/PE/PETDANCE/File-Next-1.12.tar.gz"
+    sha256 "cc3afd8eaf6294aba93b8152a269cc36a9df707c6dc2c149aaa04dabd869e60a"
+  end
+
   def install
-    bin.install "ack-#{version}-single-file" => "ack"
-    system "pod2man", "#{bin}/ack", "ack.1"
-    man1.install "ack.1"
+    if build.stable?
+      bin.install "ack-#{version}-single-file" => "ack"
+      system "pod2man", "#{bin}/ack", "ack.1"
+      man1.install "ack.1"
+    else
+      ENV.prepend_create_path "PERL5LIB", libexec/"lib/perl5"
+      ENV.prepend_path "PERL5LIB", libexec/"lib"
+
+      resource("File::Next").stage do
+        system "perl", "Makefile.PL", "INSTALL_BASE=#{libexec}"
+        system "make", "install"
+      end
+
+      system "perl", "Makefile.PL", "DESTDIR=#{buildpath}"
+      system "make"
+
+      libexec.install "ack"
+      chmod 0755, libexec/"ack"
+      (libexec/"lib").install "blib/lib/App"
+      (bin/"ack").write_env_script("#{libexec}/ack", :PERL5LIB => ENV["PERL5LIB"])
+      man1.install "blib/man1/ack.1"
+    end
   end
 
   test do

diff --git a/Library/Formula/afl-fuzz.rb b/Library/Formula/afl-fuzz.rb
@@ -2,15 +2,15 @@
 
 class AflFuzz < Formula
   homepage "http://lcamtuf.coredump.cx/afl/"
-  url "http://lcamtuf.coredump.cx/afl/releases/afl-1.75b.tgz"
-  sha256 "ca9b691cb92631881d5491ce54afe2a7e447a140d0497555cefb739be72dc188"
+  url "http://lcamtuf.coredump.cx/afl/releases/afl-1.77b.tgz"
+  sha256 "542f5ce26e1e6c7487bd0af9d0b776cded52014a9adcc1be9ca5bd4357a0c431"
 
   head "http://lcamtuf.coredump.cx/afl/releases/afl-latest.tgz"
 
   bottle do
-    sha256 "ad0ffdd261b79feea939dda941c081563f46290cb1f399873ee47911f01a4fff" => :yosemite
-    sha256 "603a20b32b25d47bd3bf7c872ee76b44a88739c5ff6f5dfe32debe6094c5107c" => :mavericks
-    sha256 "4b027255596c7c43fc1e4128883661672c0dbfcd99047c626de1a39115557e0f" => :mountain_lion
+    sha256 "6432ca2854c3931990b9d38e60bfb8b43be030c3eafbe27467174f8454ff628c" => :yosemite
+    sha256 "09f9ae233fada70859c751cd77944f55a097563a58cdaa26acd528fe5469a5ae" => :mavericks
+    sha256 "e400018988d4e2fdc1e1327b9852d688e02eed6b7265c0de58ddd0ccb47955ea" => :mountain_lion
   end
 
   def install

diff --git a/Library/Formula/alpine.rb b/Library/Formula/alpine.rb
@@ -48,7 +48,7 @@ class Alpine < Formula
   def install
     ENV.j1
     system "./configure", "--disable-debug",
-                          "--with-ssl-dir=#{Formula["openssl"].prefix}",
+                          "--with-ssl-dir=#{Formula["openssl"].opt_prefix}",
                           "--with-ssl-certs-dir=#{etc}/openssl",
                           "--prefix=#{prefix}"
     system "make", "install"

diff --git a/Library/Formula/android-platform-tools.rb b/Library/Formula/android-platform-tools.rb
@@ -1,7 +1,7 @@
 class AndroidPlatformTools < Formula
   homepage "https://developer.android.com/sdk"
   # the url is from:
-  # https://dl.google.com/android/repository/repository-8.xml
+  # https://dl.google.com/android/repository/repository-10.xml
   url "https://dl.google.com/android/repository/platform-tools_r22-macosx.zip"
   version "22.0.0"
   sha256 "c06721ff66a1a3f70e489325f06474e28cd0efd5352f097ee2ff58167b4f6564"

diff --git a/Library/Formula/android-sdk.rb b/Library/Formula/android-sdk.rb
@@ -1,12 +1,12 @@
 class AndroidSdk < Formula
   homepage "https://developer.android.com/index.html"
-  version "24.1.2"
+  version "24.2"
   if OS.mac?
-    url "https://dl.google.com/android/android-sdk_r24.1.2-macosx.zip"
-    sha256 "a4441a4770130aa841f350918a16db43aaee18f2d8e0c681a216e0381a763362"
+    url "https://dl.google.com/android/android-sdk_r24.2-macosx.zip"
+    sha256 "9e0cd4844a696c555563a2daad5ff6731a4175b7a56f00c8f8dd831dbca9511b"
   elsif OS.linux?
-    url "https://dl.google.com/android/android-sdk_r24.1.2-linux.tgz"
-    sha256 "77dc2e98cf64a04d13d9554ec6ac8ad26a8b32d49119ae8af15348e715674f8e"
+    url "https://dl.google.com/android/android-sdk_r24.2-linux.tgz"
+    sha256 "c07ade2f984e108fc24d96598b45b87f4e77ff2af5e4243fa52184c3073efcf3"
   end
 
   conflicts_with "android-platform-tools",
@@ -19,7 +19,7 @@ class AndroidSdk < Formula
 
   # Version of the android-build-tools the wrapper scripts reference.
   def build_tools_version
-    "21.1.2"
+    "22.0.1"
   end
 
   def install
@@ -88,8 +88,7 @@ def install
   def caveats; <<-EOS.undent
     Now run the 'android' tool to install the actual SDK stuff.
 
-    The Android-SDK location for IDEs such as Eclipse, IntelliJ etc is:
-      #{prefix}
+    The Android-SDK is available at #{opt_prefix}
 
     You will have to install the platform-tools and docs EVERY time this formula
     updates. If you want to try and fix this then see the comment in this formula.

diff --git a/Library/Formula/ant.rb b/Library/Formula/ant.rb
@@ -1,7 +1,7 @@
 class Ant < Formula
-  homepage "http://ant.apache.org/"
-  url "http://www.apache.org/dyn/closer.cgi?path=ant/binaries/apache-ant-1.9.4-bin.tar.gz"
-  sha1 "6c41481e8201f6b3f7e216146b95bb6de70208bb"
+  homepage "https://ant.apache.org/"
+  url "https://www.apache.org/dyn/closer.cgi?path=ant/binaries/apache-ant-1.9.4-bin.tar.bz2"
+  sha256 "20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf"
   head "https://git-wip-us.apache.org/repos/asf/ant.git"
 
   bottle do
@@ -17,13 +17,13 @@ class Ant < Formula
   option "with-bcel", "Install Byte Code Engineering Library"
 
   resource "ivy" do
-    url "http://www.apache.org/dyn/closer.cgi?path=ant/ivy/2.4.0/apache-ivy-2.4.0-bin.tar.gz"
-    sha1 "97a206e3b6ec2ce9793d2ee151fa997a12647c7f"
+    url "https://www.apache.org/dyn/closer.cgi?path=ant/ivy/2.4.0/apache-ivy-2.4.0-bin.tar.gz"
+    sha256 "7a3d13a80b69d71608191463dfc2a74fff8ef638ce0208e70d54d28ba9785ee9"
   end
 
   resource "bcel" do
     url "http://central.maven.org/maven2/org/apache/bcel/bcel/5.2/bcel-5.2.jar"
-    sha1 "96b2cefeb067c08c31225d48e2a689f814baae25"
+    sha256 "7b87e2fd9ac3205a6e5ba9ef5e58a8f0ab8d1a0e0d00cb2a761951fa298cc733"
   end
 
   def install

diff --git a/Library/Formula/apache-spark.rb b/Library/Formula/apache-spark.rb
@@ -5,11 +5,13 @@ class ApacheSpark < Formula
   head "https://github.com/apache/spark.git"
   url "https://d3kbcqa49mib13.cloudfront.net/spark-1.3.1-bin-hadoop2.6.tgz"
   version "1.3.1"
+  revision 1
   sha1 "86911b6c8964230a93691bd45589f491c10d36c0"
 
-  conflicts_with 'hive', :because => 'both install `beeline` binaries'
-
   def install
+    # Rename beeline to distinguish it from hive's beeline
+    mv "bin/beeline", "bin/spark-beeline"
+
     rm_f Dir["bin/*.cmd"]
     libexec.install Dir["*"]
     bin.write_exec_script Dir["#{libexec}/bin/*"]

diff --git a/Library/Formula/apktool.rb b/Library/Formula/apktool.rb
@@ -1,24 +1,12 @@
 require 'formula'
 
 class Apktool < Formula
-  homepage 'http://android-apktool.googlecode.com/'
-  url 'https://android-apktool.googlecode.com/files/apktool1.5.2.tar.bz2'
-  sha1 '2dd828cf79467730c7406aa918f1da1bd21aaec8'
-
-  resource 'exes' do
-    url 'https://android-apktool.googlecode.com/files/apktool-install-macosx-r05-ibot.tar.bz2'
-    sha1 'c2fb262760ccd27530e58ccc4bbef4d4a7b0ab39'
-  end
+  homepage 'https://github.com/iBotPeaches/Apktool'
+  url 'https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_2.0.0.jar', :using => :nounzip
+  sha1 '577e351e5b06986c7e099ec33944934f3b9e31e1'
 
   def install
-    libexec.install 'apktool.jar', resource('exes')
-
-    # Make apktool look for jar and aapkt in libexec
-    inreplace "#{libexec}/apktool" do |s|
-      s.gsub! /^libdir=.*$/, "libdir=\"#{libexec}\""
-      s.gsub! "PATH=$PATH:`pwd`;", "PATH=$PATH:#{libexec};"
-    end
-
-    bin.install_symlink libexec/'apktool'
+    libexec.install "apktool_#{version}.jar"
+    bin.write_jar_script libexec/"apktool_#{version}.jar", 'apktool'
   end
 end
diff --git a/Library/Formula/apr-util.rb b/Library/Formula/apr-util.rb
@@ -1,12 +1,13 @@
 class AprUtil < Formula
   homepage "https://apr.apache.org/"
-  url "http://www.apache.org/dyn/closer.cgi?path=apr/apr-util-1.5.4.tar.bz2"
-  sha1 "b00038b5081472ed094ced28bcbf2b5bb56c589d"
+  url "https://www.apache.org/dyn/closer.cgi?path=apr/apr-util-1.5.4.tar.bz2"
+  sha256 "a6cf327189ca0df2fb9d5633d7326c460fe2b61684745fd7963e79a6dd0dc82e"
+  revision 1
 
   bottle do
-    sha1 "c0807fd64a46a6c0d1dfd3e3a5cfff3812356251" => :yosemite
-    sha1 "c3d8fa3f0b6d5c4923ab8bda382614d81d412c0b" => :mavericks
-    sha1 "4af28090bda520eabde6dfc039ea7d20da4f3db6" => :mountain_lion
+    sha256 "6b043e4bf051fce17991f3cafb4ce7d235bf52e01b76e447b5a286f85a69cde9" => :yosemite
+    sha256 "aff874c3e72a5ec31b75c066d327771bc84b0a31fedc2243e4e21a56dee78eae" => :mavericks
+    sha256 "76f24ef98aebf89eb0b3c7d7fdc31f8074120c39708d8a513575e956fe50fc07" => :mountain_lion
   end
 
   keg_only :provided_by_osx, "Apple's CLT package contains apr."

diff --git a/Library/Formula/apr.rb b/Library/Formula/apr.rb
@@ -1,12 +1,12 @@
 class Apr < Formula
   homepage "https://apr.apache.org/"
-  url "http://www.apache.org/dyn/closer.cgi?path=apr/apr-1.5.1.tar.bz2"
-  sha1 "f94e4e0b678282e0704e573b5b2fe6d48bd1c309"
+  url "https://www.apache.org/dyn/closer.cgi?path=apr/apr-1.5.2.tar.bz2"
+  sha256 "7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a"
 
   bottle do
-    sha1 "dd876e8523f31e935a605c3cb710d681aa762ae7" => :yosemite
-    sha1 "881def6c18b664e2d3cc88f1e8c975fb314bb105" => :mavericks
-    sha1 "48905e0fc63b2ae63cd3fd0912cec8ea09441420" => :mountain_lion
+    sha256 "5ae775d6f6a3fb46b1b262e1c0ecb2aca4e5a29ea1f841672ac430b4d49606af" => :yosemite
+    sha256 "691b67fdf7077bca9db5cb0fcc40856dd82914bb00868c4e1a6a692abca87913" => :mavericks
+    sha256 "4d5e7c20d507c48712d8ba549f500e7e58a4782dd1e88aee6d2eb1a169aeeaf9" => :mountain_lion
   end
 
   keg_only :provided_by_osx, "Apple's CLT package contains apr."
@@ -16,14 +16,7 @@ class Apr < Formula
   def install
     ENV.universal_binary if build.universal?
 
-    # Configure switch unconditionally adds the -no-cpp-precomp switch
-    # to CPPFLAGS, which is an obsolete Apple-only switch that breaks
-    # builds under non-Apple compilers and which may or may not do anything anymore.
-    # Reported upstream: https://issues.apache.org/bugzilla/show_bug.cgi?id=48483
-    # Upstream bug report still open and unresolved as of end of 2014
-    inreplace "configure", " -no-cpp-precomp", ""
-
-    # https://issues.apache.org/bugzilla/show_bug.cgi?id=57359
+    # https://bz.apache.org/bugzilla/show_bug.cgi?id=57359
     # The internal libtool throws an enormous strop if we don't do...
     ENV.deparallelize
 

diff --git a/Library/Formula/ascii.rb b/Library/Formula/ascii.rb
@@ -16,9 +16,7 @@ class Ascii < Formula
   end
 
   def install
-    if build.head?
-      ENV["XML_CATALOG_FILES"] = HOMEBREW_PREFIX/"etc/xml/catalog"
-    end
+    ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog" if build.head?
     bin.mkpath
     man1.mkpath
     system "make"

diff --git a/Library/Formula/asciidoc.rb b/Library/Formula/asciidoc.rb
@@ -35,7 +35,7 @@ def caveats; <<-EOS.undent
       (such as a2x for manpage generation) you need to add something
       like:
 
-        export XML_CATALOG_FILES=#{HOMEBREW_PREFIX}/etc/xml/catalog
+        export XML_CATALOG_FILES=#{etc}/xml/catalog
 
       to your shell rc file so that xmllint can find AsciiDoc's
       catalog files.

diff --git a/Library/Formula/audiofile.rb b/Library/Formula/audiofile.rb
@@ -26,7 +26,7 @@ class Audiofile < Formula
   def install
     if build.head?
       inreplace "autogen.sh", "libtool", "glibtool"
-      ENV["XML_CATALOG_FILES"] = "#{HOMEBREW_PREFIX}/etc/xml/catalog"
+      ENV["XML_CATALOG_FILES"] = "#{etc}/xml/catalog"
     end
 
     configure = build.head? ? "./autogen.sh" : "./configure"
-Original file line number
+Diff line change
@@ Expand Up / @@ -413,6 +413,7 @@ _brew_upgrade () @@
         case "$cur" in
         --*)
             __brewcomp "
+                --all
                 --build-from-source --build-bottle --force-bottle
                 --debug
                 --verbose
@@ Expand Down @@