From 7eb3f1a3142a285cc00e4f707de4681b27260a93 Mon Sep 17 00:00:00 2001
From: Rylan Polster <rslpolster@gmail.com>
Date: Mon, 4 Dec 2023 13:43:33 -0500
Subject: [PATCH] Replace `discontinued?` with `deprecated?`

---
 Library/Homebrew/cask/audit.rb                | 12 +++++-----
 Library/Homebrew/cask/dsl/caveats.rb          |  1 +
 Library/Homebrew/livecheck/skip_conditions.rb | 23 +++++++++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/cask/audit.rb b/Library/Homebrew/cask/audit.rb
index 025771cd27..c0a826a2c8 100644
--- a/Library/Homebrew/cask/audit.rb
+++ b/Library/Homebrew/cask/audit.rb
@@ -289,7 +289,7 @@ module Cask
 
     sig { params(livecheck_result: T.any(NilClass, T::Boolean, Symbol)).void }
     def audit_hosting_with_livecheck(livecheck_result: audit_livecheck_version)
-      return if cask.discontinued?
+      return if cask.deprecated? || cask.disabled?
       return if cask.version&.latest?
       return unless cask.url
       return if block_url_offline?
@@ -544,7 +544,7 @@ module Cask
         )
       end
 
-      # Respect cask skip conditions (e.g. discontinued, latest, unversioned)
+      # Respect cask skip conditions (e.g. deprecated, disabled, latest, unversioned)
       skip_info ||= Homebrew::Livecheck::SkipConditions.skip_information(cask)
       return :skip if skip_info.present?
 
@@ -682,8 +682,8 @@ module Cask
 
     sig { void }
     def audit_github_repository_archived
-      # Discontinued casks may have an archived repo.
-      return if cask.discontinued?
+      # Deprecated/disabled casks may have an archived repo.
+      return if cask.deprecated? || cask.disabled?
 
       user, repo = get_repo_data(%r{https?://github\.com/([^/]+)/([^/]+)/?.*}) if online?
       return if user.nil?
@@ -696,8 +696,8 @@ module Cask
 
     sig { void }
     def audit_gitlab_repository_archived
-      # Discontinued casks may have an archived repo.
-      return if cask.discontinued?
+      # Deprecated/disabled casks may have an archived repo.
+      return if cask.deprecated? || cask.disabled?
 
       user, repo = get_repo_data(%r{https?://gitlab\.com/([^/]+)/([^/]+)/?.*}) if online?
       return if user.nil?
diff --git a/Library/Homebrew/cask/dsl/caveats.rb b/Library/Homebrew/cask/dsl/caveats.rb
index eaf45d0284..1a9c4ad4f0 100644
--- a/Library/Homebrew/cask/dsl/caveats.rb
+++ b/Library/Homebrew/cask/dsl/caveats.rb
@@ -163,6 +163,7 @@ module Cask
       end
 
       caveat :discontinued do
+        # odeprecated "`caveats :discontinued`", "`deprecated!`"
         @discontinued = true
         <<~EOS
           #{@cask} has been officially discontinued upstream.
diff --git a/Library/Homebrew/livecheck/skip_conditions.rb b/Library/Homebrew/livecheck/skip_conditions.rb
index fe8c52668b..d6401fa704 100644
--- a/Library/Homebrew/livecheck/skip_conditions.rb
+++ b/Library/Homebrew/livecheck/skip_conditions.rb
@@ -119,10 +119,24 @@ module Homebrew
           verbose:       T::Boolean,
         ).returns(Hash)
       }
-      def cask_discontinued(cask, livecheckable, full_name: false, verbose: false)
-        return {} if !cask.discontinued? || livecheckable
+      def cask_deprecated(cask, livecheckable, full_name: false, verbose: false)
+        return {} if !cask.deprecated? || livecheckable
 
-        Livecheck.status_hash(cask, "discontinued", full_name: full_name, verbose: verbose)
+        Livecheck.status_hash(cask, "deprecated", full_name: full_name, verbose: verbose)
+      end
+
+      sig {
+        params(
+          cask:          Cask::Cask,
+          livecheckable: T::Boolean,
+          full_name:     T::Boolean,
+          verbose:       T::Boolean,
+        ).returns(Hash)
+      }
+      def cask_disabled(cask, livecheckable, full_name: false, verbose: false)
+        return {} if !cask.disabled? || livecheckable
+
+        Livecheck.status_hash(cask, "disabled", full_name: full_name, verbose: verbose)
       end
 
       sig {
@@ -165,7 +179,8 @@ module Homebrew
       # Skip conditions for casks.
       CASK_CHECKS = [
         :package_or_resource_skip,
-        :cask_discontinued,
+        :cask_deprecated,
+        :cask_disabled,
         :cask_version_latest,
         :cask_url_unversioned,
       ].freeze