Merge pull request #219899 from Homebrew/add-conflicts-with

various: declare missing conflicts with casks

Author: p-linnane

Formula/a/aide.rb

@@ -36,6 +36,8 @@ class Aide < Formula
   uses_from_macos "curl"
   uses_from_macos "zlib"
 
+  conflicts_with cask: "aide-app"
+
   def install
     # use sdk's strnstr instead
     ENV.append_to_cflags "-DHAVE_STRNSTR"

Formula/c/cmake.rb

@@ -33,6 +33,8 @@ class Cmake < Formula
     depends_on "openssl@3"
   end
 
+  conflicts_with cask: "cmake"
+
   # The completions were removed because of problems with system bash
 
   # The `with-qt` GUI option was removed due to circular dependencies if

Formula/c/cocoapods.rb

@@ -20,6 +20,8 @@ class Cocoapods < Formula
   depends_on "ruby"
   uses_from_macos "libffi", since: :catalina
 
+  conflicts_with cask: "cocoapods", because: "both install `pod` binaries"
+
   def install
     ENV["GEM_HOME"] = libexec
     system "gem", "build", "cocoapods.gemspec"

Formula/d/docker-completion.rb

@@ -14,6 +14,8 @@ class DockerCompletion < Formula
     sha256 cellar: :any_skip_relocation, all: "ab2d16d72a1a2b17b8149581cc8fbc7d6b4dcd65451a8d8a28ba32024248c4ce"
   end
 
+  conflicts_with cask: "docker"
+
   # These used to also be provided by the `docker` formula.
   link_overwrite "etc/bash_completion.d/docker"
   link_overwrite "share/fish/vendor_completions.d/docker.fish"

Formula/d/docker-compose.rb

@@ -25,6 +25,8 @@ class DockerCompose < Formula
 
   depends_on "go" => :build
 
+  conflicts_with cask: "docker"
+
   def install
     ldflags = %W[
       -s -w

Formula/d/docker-credential-helper-ecr.rb

@@ -23,6 +23,8 @@ class DockerCredentialHelperEcr < Formula
 
   depends_on "go" => :build
 
+  conflicts_with cask: "docker"
+
   def install
     (buildpath/"GITCOMMIT_SHA").write tap.user
     system "make", "build"

Formula/d/docker.rb

@@ -25,6 +25,8 @@ class Docker < Formula
   depends_on "go-md2man" => :build
   depends_on "docker-completion"
 
+  conflicts_with cask: "docker"
+
   def install
     # TODO: Drop GOPATH when merged/released: https://github.com/docker/cli/pull/4116
     ENV["GOPATH"] = buildpath

Formula/d/dotnet.rb

@@ -54,6 +54,11 @@ class Dotnet < Formula
     depends_on "lttng-ust"
   end
 
+  conflicts_with cask: "dotnet"
+  conflicts_with cask: "dotnet-sdk"
+  conflicts_with cask: "dotnet-sdk@preview"
+  conflicts_with cask: "dotnet@preview"
+
   def install
     if OS.mac?
       # Need GNU grep (Perl regexp support) to use release manifest rather than git repo

Formula/e/emacs.rb

@@ -37,6 +37,9 @@ class Emacs < Formula
     depends_on "jpeg-turbo"
   end
 
+  conflicts_with cask: "emacs"
+  conflicts_with cask: "emacs@nightly"
+
   def install
     # Mojave uses the Catalina SDK which causes issues like
     # https://github.com/Homebrew/homebrew-core/issues/46393

Formula/f/fpc.rb

@@ -36,6 +36,7 @@ class Fpc < Formula
   end
 
   conflicts_with "px", because: "both install `ptop` binaries"
+  conflicts_with cask: "fpc-laz"
 
   resource "bootstrap" do
     on_macos do