Skip to content

Commit

Permalink
Remove asymmetric conflicts_with statements
Browse files Browse the repository at this point in the history
A recent change to brew audit disallows asymmetric
conflicts_with statements. Since these all involve
old formulae, this removes the conflicts_with
statements rather than trying to make them symmetric.

Fixes osrf#1518.
  • Loading branch information
scpeters committed Jun 21, 2021
1 parent f4a5600 commit 7215767
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 35 deletions.
10 changes: 0 additions & 10 deletions Formula/gazebo10.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,6 @@ class Gazebo10 < Formula
depends_on "gdal" => :optional
depends_on "player" => :optional

conflicts_with "gazebo2", because: "differing version of the same formula"
conflicts_with "gazebo3", because: "differing version of the same formula"
conflicts_with "gazebo4", because: "differing version of the same formula"
conflicts_with "gazebo5", because: "differing version of the same formula"
conflicts_with "gazebo6", because: "differing version of the same formula"
conflicts_with "gazebo7", because: "differing version of the same formula"
conflicts_with "gazebo8", because: "differing version of the same formula"
conflicts_with "gazebo9", because: "differing version of the same formula"
conflicts_with "gazebo11", because: "differing version of the same formula"

patch do
# set CMP0100
url "https://github.com/osrf/gazebo/commit/2e4f1b185cb46b2c06fe63881d60f3fbeb868923.patch?full_index=1"
Expand Down
7 changes: 0 additions & 7 deletions Formula/gazebo11.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,8 @@ class Gazebo11 < Formula
depends_on "gdal" => :optional
depends_on "player" => :optional

conflicts_with "gazebo2", because: "differing version of the same formula"
conflicts_with "gazebo3", because: "differing version of the same formula"
conflicts_with "gazebo4", because: "differing version of the same formula"
conflicts_with "gazebo5", because: "differing version of the same formula"
conflicts_with "gazebo6", because: "differing version of the same formula"
conflicts_with "gazebo7", because: "differing version of the same formula"
conflicts_with "gazebo8", because: "differing version of the same formula"
conflicts_with "gazebo9", because: "differing version of the same formula"
conflicts_with "gazebo10", because: "differing version of the same formula"

patch do
# Fix build when homebrew python is installed
Expand Down
1 change: 0 additions & 1 deletion Formula/gazebo7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class Gazebo7 < Formula
conflicts_with "gazebo6", because: "differing version of the same formula"
conflicts_with "gazebo8", because: "differing version of the same formula"
conflicts_with "gazebo9", because: "differing version of the same formula"
conflicts_with "gazebo10", because: "differing version of the same formula"
conflicts_with "gazebo11", because: "differing version of the same formula"

patch do
Expand Down
7 changes: 0 additions & 7 deletions Formula/gazebo9.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,7 @@ class Gazebo9 < Formula
depends_on "gdal" => :optional
depends_on "player" => :optional

conflicts_with "gazebo2", because: "differing version of the same formula"
conflicts_with "gazebo3", because: "differing version of the same formula"
conflicts_with "gazebo4", because: "differing version of the same formula"
conflicts_with "gazebo5", because: "differing version of the same formula"
conflicts_with "gazebo6", because: "differing version of the same formula"
conflicts_with "gazebo7", because: "differing version of the same formula"
conflicts_with "gazebo8", because: "differing version of the same formula"
conflicts_with "gazebo10", because: "differing version of the same formula"
conflicts_with "gazebo11", because: "differing version of the same formula"

patch do
Expand Down
2 changes: 0 additions & 2 deletions Formula/ignition-math4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ class IgnitionMath4 < Formula
depends_on "doxygen" => :build
depends_on "ignition-cmake0"

conflicts_with "ignition-math2", because: "symbols collision between the two libraries"

def install
system "cmake", ".", *std_cmake_args
system "make", "install"
Expand Down
2 changes: 0 additions & 2 deletions Formula/ignition-math5.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ class IgnitionMath5 < Formula
depends_on "eigen"
depends_on "ignition-cmake1"

conflicts_with "ignition-math2", because: "symbols collision between the two libraries"

def install
system "cmake", ".", *std_cmake_args
system "make", "install"
Expand Down
2 changes: 0 additions & 2 deletions Formula/ignition-math6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ class IgnitionMath6 < Formula
depends_on "ignition-cmake2"
depends_on "ruby"

conflicts_with "ignition-math2", because: "symbols collision between the two libraries"

def install
cmake_args = std_cmake_args
cmake_args << "-DBUILD_TESTING=Off"
Expand Down
2 changes: 0 additions & 2 deletions Formula/sdformat6.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ class Sdformat6 < Formula
depends_on "tinyxml"
depends_on "urdfdom" => :optional

conflicts_with "sdformat", because: "differing version of the same formula"
conflicts_with "sdformat3", because: "differing version of the same formula"
conflicts_with "sdformat4", because: "differing version of the same formula"
conflicts_with "sdformat5", because: "differing version of the same formula"
conflicts_with "sdformat7", because: "differing version of the same formula"
Expand Down
2 changes: 0 additions & 2 deletions Formula/sdformat7.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ class Sdformat7 < Formula
depends_on "tinyxml"
depends_on "urdfdom" => :optional

conflicts_with "sdformat", because: "differing version of the same formula"
conflicts_with "sdformat3", because: "differing version of the same formula"
conflicts_with "sdformat4", because: "differing version of the same formula"
conflicts_with "sdformat5", because: "differing version of the same formula"
conflicts_with "sdformat6", because: "differing version of the same formula"
Expand Down

0 comments on commit 7215767

Please sign in to comment.