x11_requirement: remove custom minimum version.

This isn't desired or needed. Ensure older code still works, though.

1 files changed, 17 insertions, 16 deletions

diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb
index 03d0382c5..e0974107a 100644
--- a/Library/Homebrew/requirements/x11_requirement.rb
+++ b/Library/Homebrew/requirements/x11_requirement.rb
@@ -2,7 +2,6 @@ require "requirement"
 
 class X11Requirement < Requirement
   include Comparable
-  attr_reader :min_version
 
   fatal true
   cask "xquartz"
@@ -12,36 +11,38 @@ class X11Requirement < Requirement
 
   def initialize(name = "x11", tags = [])
     @name = name
-    if /(\d\.)+\d/ =~ tags.first
-      @min_version = Version.create(tags.shift)
-      @min_version_string = " #{@min_version}"
-    else
-      @min_version = Version.create("0.0.0")
-      @min_version_string = ""
-    end
+    # no-op on version specified as a tag argument
+    tags.shift if /(\d\.)+\d/ =~ tags.first
     super(tags)
   end
 
+  def min_version
+    # TODO: remove in https://github.com/Homebrew/brew/pull/3483
+    return Version::NULL unless OS.mac?
+
+    MacOS::XQuartz.minimum_version
+  end
+
   satisfy build_env: false do
-    MacOS::XQuartz.installed? && min_version <= Version.create(MacOS::XQuartz.version)
+    # TODO: remove in https://github.com/Homebrew/brew/pull/3483
+    next false unless OS.mac?
+
+    next false unless MacOS::XQuartz.installed?
+    min_version <= MacOS::XQuartz.version
   end
 
   def message
-    s = "XQuartz#{@min_version_string} is required to install this formula."
+    s = "XQuartz #{min_version} (or newer) is required to install this formula."
     s += super
     s
   end
 
   def <=>(other)
     return unless other.is_a? X11Requirement
-    min_version <=> other.min_version
-  end
-
-  def eql?(other)
-    super && min_version == other.min_version
+    0
   end
 
   def inspect
-    "#<#{self.class.name}: #{name.inspect} #{tags.inspect} min_version=#{min_version}>"
+    "#<#{self.class.name}: #{name.inspect} #{tags.inspect}>"
   end
 end