From 5c6a12e5b77c4aeedd54df8d5449d432fb130025 Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Sat, 7 Nov 2020 11:00:41 -0500
Subject: [PATCH 1/2] requirements: allow `depends_on arch: :arm64`

---
 Library/Homebrew/requirements/arch_requirement.rb  |  1 +
 .../test/requirements/arch_requirement_spec.rb     | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 Library/Homebrew/test/requirements/arch_requirement_spec.rb

diff --git a/Library/Homebrew/requirements/arch_requirement.rb b/Library/Homebrew/requirements/arch_requirement.rb
index e05e71645e..ec6a213174 100644
--- a/Library/Homebrew/requirements/arch_requirement.rb
+++ b/Library/Homebrew/requirements/arch_requirement.rb
@@ -19,6 +19,7 @@ class ArchRequirement < Requirement
   satisfy(build_env: false) do
     case @arch
     when :x86_64 then Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
+    when :arm64 then Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
     when :arm, :intel, :ppc then Hardware::CPU.type == @arch
     end
   end
diff --git a/Library/Homebrew/test/requirements/arch_requirement_spec.rb b/Library/Homebrew/test/requirements/arch_requirement_spec.rb
new file mode 100644
index 0000000000..0eb369c07c
--- /dev/null
+++ b/Library/Homebrew/test/requirements/arch_requirement_spec.rb
@@ -0,0 +1,14 @@
+# typed: false
+# frozen_string_literal: true
+
+require "requirements/arch_requirement"
+
+describe ArchRequirement do
+  subject(:requirement) { described_class.new([Hardware::CPU.type]) }
+
+  describe "#satisfied?" do
+    it "supports architecture symbols" do
+      expect(requirement).to be_satisfied
+    end
+  end
+end

From ec17dfbfcd6be949a97db15edbdb9612cdf42313 Mon Sep 17 00:00:00 2001
From: EricFromCanada <enk3@outlook.com>
Date: Sat, 7 Nov 2020 11:01:21 -0500
Subject: [PATCH 2/2] requirements: drop unused "cli/args" requirement

---
 Library/Homebrew/test/ENV_spec.rb                              | 1 -
 Library/Homebrew/test/os/mac/java_requirement_spec.rb          | 1 -
 Library/Homebrew/test/requirement_spec.rb                      | 1 -
 Library/Homebrew/test/requirements/java_requirement_spec.rb    | 1 -
 Library/Homebrew/test/requirements/linux_requirement_spec.rb   | 1 -
 Library/Homebrew/test/requirements/macos_requirement_spec.rb   | 1 -
 Library/Homebrew/test/requirements/osxfuse_requirement_spec.rb | 1 -
 Library/Homebrew/test/requirements/x11_requirement_spec.rb     | 1 -
 8 files changed, 8 deletions(-)

diff --git a/Library/Homebrew/test/ENV_spec.rb b/Library/Homebrew/test/ENV_spec.rb
index c0f5cfe768..c0f1be5328 100644
--- a/Library/Homebrew/test/ENV_spec.rb
+++ b/Library/Homebrew/test/ENV_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "extend/ENV"
 
 shared_examples EnvActivation do
diff --git a/Library/Homebrew/test/os/mac/java_requirement_spec.rb b/Library/Homebrew/test/os/mac/java_requirement_spec.rb
index 4d83a58898..20ea5687b6 100644
--- a/Library/Homebrew/test/os/mac/java_requirement_spec.rb
+++ b/Library/Homebrew/test/os/mac/java_requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "requirements/java_requirement"
 require "fileutils"
 
diff --git a/Library/Homebrew/test/requirement_spec.rb b/Library/Homebrew/test/requirement_spec.rb
index 018496b036..5f2b007c81 100644
--- a/Library/Homebrew/test/requirement_spec.rb
+++ b/Library/Homebrew/test/requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "extend/ENV"
 require "requirement"
 
diff --git a/Library/Homebrew/test/requirements/java_requirement_spec.rb b/Library/Homebrew/test/requirements/java_requirement_spec.rb
index 1b231d1fdd..8c709270b3 100644
--- a/Library/Homebrew/test/requirements/java_requirement_spec.rb
+++ b/Library/Homebrew/test/requirements/java_requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "requirements/java_requirement"
 
 describe JavaRequirement do
diff --git a/Library/Homebrew/test/requirements/linux_requirement_spec.rb b/Library/Homebrew/test/requirements/linux_requirement_spec.rb
index 78167a4d87..9187f5b542 100644
--- a/Library/Homebrew/test/requirements/linux_requirement_spec.rb
+++ b/Library/Homebrew/test/requirements/linux_requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "requirements/linux_requirement"
 
 describe LinuxRequirement do
diff --git a/Library/Homebrew/test/requirements/macos_requirement_spec.rb b/Library/Homebrew/test/requirements/macos_requirement_spec.rb
index 488f8c1f04..28e32b0d8c 100644
--- a/Library/Homebrew/test/requirements/macos_requirement_spec.rb
+++ b/Library/Homebrew/test/requirements/macos_requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "requirements/macos_requirement"
 
 describe MacOSRequirement do
diff --git a/Library/Homebrew/test/requirements/osxfuse_requirement_spec.rb b/Library/Homebrew/test/requirements/osxfuse_requirement_spec.rb
index faa1b6e7f4..2df2997d36 100644
--- a/Library/Homebrew/test/requirements/osxfuse_requirement_spec.rb
+++ b/Library/Homebrew/test/requirements/osxfuse_requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "requirements/osxfuse_requirement"
 
 describe OsxfuseRequirement do
diff --git a/Library/Homebrew/test/requirements/x11_requirement_spec.rb b/Library/Homebrew/test/requirements/x11_requirement_spec.rb
index 3191b90643..d936c06a64 100644
--- a/Library/Homebrew/test/requirements/x11_requirement_spec.rb
+++ b/Library/Homebrew/test/requirements/x11_requirement_spec.rb
@@ -1,7 +1,6 @@
 # typed: false
 # frozen_string_literal: true
 
-require "cli/args"
 require "requirements/x11_requirement"
 
 describe X11Requirement do