aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/compat
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Homebrew/compat')
-rw-r--r--Library/Homebrew/compat/dependency_collector.rb8
-rw-r--r--Library/Homebrew/compat/requirements.rb1
2 files changed, 6 insertions, 3 deletions
diff --git a/Library/Homebrew/compat/dependency_collector.rb b/Library/Homebrew/compat/dependency_collector.rb
index b18adc490..bd72c55d4 100644
--- a/Library/Homebrew/compat/dependency_collector.rb
+++ b/Library/Homebrew/compat/dependency_collector.rb
@@ -13,6 +13,10 @@ class DependencyCollector
when :cairo, :fontconfig, :freetype, :libpng, :pixman
output_deprecation(spec, tags)
Dependency.new(spec.to_s, tags)
+ when :apr
+ # TODO: reenable in future when we've fixed a few of the audits.
+ # output_deprecation(spec, tags, "apr-util")
+ Dependency.new("apr-util", tags)
when :libltdl
tags << :run
output_deprecation("libtool", tags)
@@ -27,13 +31,13 @@ class DependencyCollector
Dependency.new(spec.to_s, tags)
end
- def output_deprecation(dependency, tags)
+ def output_deprecation(dependency, tags, new_dependency = dependency)
tags_string = if tags.length > 1
" => [:#{tags.join ", :"}]"
elsif tags.length == 1
" => :#{tags.first}"
end
odeprecated "'depends_on :#{dependency}'",
- "'depends_on \"#{dependency}\"#{tags_string}'"
+ "'depends_on \"#{new_dependency}\"#{tags_string}'"
end
end
diff --git a/Library/Homebrew/compat/requirements.rb b/Library/Homebrew/compat/requirements.rb
index 5c3c7a09c..77760d1dc 100644
--- a/Library/Homebrew/compat/requirements.rb
+++ b/Library/Homebrew/compat/requirements.rb
@@ -8,7 +8,6 @@ GPGRequirement = GPG2Requirement
TeXDependency = TeXRequirement
MercurialDependency = MercurialRequirement
GitDependency = GitRequirement
-AprDependency = AprRequirement
FortranDependency = FortranRequirement
JavaDependency = JavaRequirement
LanguageModuleDependency = LanguageModuleRequirement