xapian: remove --with-python@2 option

This option raises multiple red flags.

1. depends_on ... if build.with? ... has been frowned upon since ages ago.
2. Assumes sphinx-doc is py27-based. Well, time to move on.
3. Options are deprecated anyway.

Closes #36202.

Signed-off-by: FX Coudert <fxcoudert@gmail.com>
This commit is contained in:
Zhiming Wang 2019-01-20 15:40:46 -05:00 committed by FX Coudert
parent bc6585b68d
commit f2cabbb295

View file

@ -16,10 +16,7 @@ class Xapian < Formula
option "with-ruby", "Ruby bindings"
deprecated_option "ruby" => "with-ruby"
deprecated_option "with-python" => "with-python@2"
depends_on "python@2" => :optional
depends_on "sphinx-doc" => :build if build.with? "python@2"
depends_on "ruby" => :optional if MacOS.version <= :sierra
skip_clean :la
@ -35,7 +32,7 @@ class Xapian < Formula
"--prefix=#{prefix}"
system "make", "install"
if build.with?("ruby") || build.with?("python@2")
if build.with?("ruby")
resource("bindings").stage do
ENV["XAPIAN_CONFIG"] = bin/"xapian-config"
@ -50,21 +47,6 @@ class Xapian < Formula
args << "--with-ruby"
end
if build.with? "python@2"
# https://github.com/Homebrew/homebrew-core/issues/2422
ENV.delete("PYTHONDONTWRITEBYTECODE")
(lib/"python2.7/site-packages").mkpath
ENV["PYTHON_LIB"] = lib/"python2.7/site-packages"
ENV.append_path "PYTHONPATH",
Formula["sphinx-doc"].opt_libexec/"lib/python2.7/site-packages"
ENV.append_path "PYTHONPATH",
Formula["sphinx-doc"].opt_libexec/"vendor/lib/python2.7/site-packages"
args << "--with-python"
end
system "./configure", *args
system "make", "install"
end