diff --git a/Library/Homebrew/compat/requirements.rb b/Library/Homebrew/compat/requirements.rb index 2adeaaa2e9c25a865f0488c469ce6cfbd93fb2d7..5c3c7a09c7abeea397b347883b10cf3586fbaf1e 100644 --- a/Library/Homebrew/compat/requirements.rb +++ b/Library/Homebrew/compat/requirements.rb @@ -3,7 +3,8 @@ require "requirements" XcodeDependency = XcodeRequirement MysqlDependency = MysqlRequirement PostgresqlDependency = PostgresqlRequirement -GPGDependency = GPGRequirement +GPGDependency = GPG2Requirement +GPGRequirement = GPG2Requirement TeXDependency = TeXRequirement MercurialDependency = MercurialRequirement GitDependency = GitRequirement diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index 9d208ec1de74faf85bcea9e6c1115ae756e58461..122828191d13a2ad8873842b0b8301f36a1d61be 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -99,7 +99,7 @@ class DependencyCollector when :macos then MinimumMacOSRequirement.new(tags) when :mysql then MysqlRequirement.new(tags) when :postgresql then PostgresqlRequirement.new(tags) - when :gpg then GPGRequirement.new(tags) + when :gpg then GPG2Requirement.new(tags) when :fortran then FortranRequirement.new(tags) when :mpi then MPIRequirement.new(*tags) when :tex then TeXRequirement.new(tags) diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb index 8ba83b0c5786402d8cd736f118cd2641edd0bcf1..e709ff9ccde4a8502f8a0fb5fb54c89735270bbe 100644 --- a/Library/Homebrew/requirements.rb +++ b/Library/Homebrew/requirements.rb @@ -1,7 +1,7 @@ require "requirement" require "requirements/apr_requirement" require "requirements/fortran_requirement" -require "requirements/gpg_requirement" +require "requirements/gpg2_requirement" require "requirements/language_module_requirement" require "requirements/minimum_macos_requirement" require "requirements/maximum_macos_requirement" diff --git a/Library/Homebrew/requirements/gpg_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb similarity index 90% rename from Library/Homebrew/requirements/gpg_requirement.rb rename to Library/Homebrew/requirements/gpg2_requirement.rb index bb41f0b0b1ff4a89df2eefcd2f911ac80b82d34b..9eea59e78606345a434db8dc2272c45cbc54981e 100644 --- a/Library/Homebrew/requirements/gpg_requirement.rb +++ b/Library/Homebrew/requirements/gpg2_requirement.rb @@ -1,7 +1,7 @@ require "requirement" require "gpg" -class GPGRequirement < Requirement +class GPG2Requirement < Requirement fatal true default_formula "gnupg2"