From f8874004c2c0ee06b3f0420ac549f762beeb3433 Mon Sep 17 00:00:00 2001
From: Maxim Belkin
Date: Wed, 21 Feb 2018 14:11:35 +0000
Subject: Make 'xz' and 'cvs' dependencies conditional

---
 Library/Homebrew/dependency_collector.rb                 | 4 ++--
 Library/Homebrew/extend/os/dependency_collector.rb       | 1 -
 Library/Homebrew/extend/os/linux/dependency_collector.rb | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 Library/Homebrew/extend/os/linux/dependency_collector.rb

(limited to 'Library/Homebrew')

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 0a38f0de3..7d3b90f9c 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -63,11 +63,11 @@ class DependencyCollector
   end
 
   def cvs_dep_if_needed(tags)
-    Dependency.new("cvs", tags)
+    Dependency.new("cvs", tags) unless which("cvs")
   end
 
   def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags)
+    Dependency.new("xz", tags) unless which("xz")
   end
 
   def zip_dep_if_needed(tags)
diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb
index fffec1c99..56fcad31d 100644
--- a/Library/Homebrew/extend/os/dependency_collector.rb
+++ b/Library/Homebrew/extend/os/dependency_collector.rb
@@ -1,3 +1,2 @@
 require "dependency_collector"
 require "extend/os/mac/dependency_collector" if OS.mac?
-require "extend/os/linux/dependency_collector" if OS.linux?
diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb
deleted file mode 100644
index dc5b994b8..000000000
--- a/Library/Homebrew/extend/os/linux/dependency_collector.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class DependencyCollector
-  def xz_dep_if_needed(tags)
-    Dependency.new("xz", tags) unless which("xz")
-  end
-end
-- 
cgit v1.2.3