From cc0a249f484068ce4533f90b5affc9f9691efa5a Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Mon, 4 Dec 2023 16:09:15 +0000
Subject: [PATCH] unpack_strategy/zip: fix super ancestor on macOS without
 Sorbet Runtime

---
 Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb  | 7 ++-----
 Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
index 9bbdf4a33a..370b2a21d9 100644
--- a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
+++ b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
@@ -6,10 +6,9 @@ require "system_command"
 module UnpackStrategy
   class Zip
     module MacOSZipExtension
-      include UnpackStrategy
-      include SystemCommand::Mixin
+      private
 
-      sig { override.params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
+      sig { params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).returns(T.untyped) }
       def extract_to_dir(unpack_dir, basename:, verbose:)
         with_env(TZ: "UTC") do
           if merge_xattrs && contains_extended_attributes?(path)
@@ -58,8 +57,6 @@ module UnpackStrategy
         end
       end
 
-      private
-
       sig { params(path: Pathname).returns(T::Boolean) }
       def contains_extended_attributes?(path)
         path.zipinfo.grep(/(^__MACOSX|\._)/).any?
diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
index 43597431d9..dee409eb2d 100644
--- a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
+++ b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
@@ -1,5 +1,5 @@
 # typed: strict
 
 module UnpackStrategy::Zip::MacOSZipExtension
-  include Kernel
+  requires_ancestor { UnpackStrategy }
 end