From e02ad2242ab98f9ea7418ef51741480e3bfa4ed1 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Wed, 10 Aug 2016 21:00:14 +0100
Subject: gpg_requirement: rename to gpg2_requirement

---
 Library/Homebrew/compat/requirements.rb           |  3 ++-
 Library/Homebrew/dependency_collector.rb          |  2 +-
 Library/Homebrew/requirements.rb                  |  2 +-
 Library/Homebrew/requirements/gpg2_requirement.rb | 12 ++++++++++++
 Library/Homebrew/requirements/gpg_requirement.rb  | 12 ------------
 5 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 Library/Homebrew/requirements/gpg2_requirement.rb
 delete mode 100644 Library/Homebrew/requirements/gpg_requirement.rb

(limited to 'Library')

diff --git a/Library/Homebrew/compat/requirements.rb b/Library/Homebrew/compat/requirements.rb
index 2adeaaa2e..5c3c7a09c 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 9d208ec1d..122828191 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 8ba83b0c5..e709ff9cc 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/gpg2_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb
new file mode 100644
index 000000000..9eea59e78
--- /dev/null
+++ b/Library/Homebrew/requirements/gpg2_requirement.rb
@@ -0,0 +1,12 @@
+require "requirement"
+require "gpg"
+
+class GPG2Requirement < Requirement
+  fatal true
+  default_formula "gnupg2"
+
+  # MacGPG2/GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink
+  # pointing to `gpg2`, as do we. Ensure we're actually using a 2.0 `gpg`.
+  # Temporarily, only support 2.0.x rather than the 2.1.x "modern" series.
+  satisfy(:build_env => false) { Gpg.gpg2 || Gpg.gpg }
+end
diff --git a/Library/Homebrew/requirements/gpg_requirement.rb b/Library/Homebrew/requirements/gpg_requirement.rb
deleted file mode 100644
index bb41f0b0b..000000000
--- a/Library/Homebrew/requirements/gpg_requirement.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "requirement"
-require "gpg"
-
-class GPGRequirement < Requirement
-  fatal true
-  default_formula "gnupg2"
-
-  # MacGPG2/GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink
-  # pointing to `gpg2`, as do we. Ensure we're actually using a 2.0 `gpg`.
-  # Temporarily, only support 2.0.x rather than the 2.1.x "modern" series.
-  satisfy(:build_env => false) { Gpg.gpg2 || Gpg.gpg }
-end
-- 
cgit v1.2.3