From 2fed17f4d1ecaf1d4b4c21e76805b478438f3785 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sat, 2 Feb 2013 00:09:28 -0600
Subject: Ensure :cairo and :pixman resolve to standard formula deps

We do not use X11 to satisfy these deps for consistency reasons,
but we should continue to support the symbols for compatibility.
---
 Library/Homebrew/dependency_collector.rb | 4 ++++
 Library/Homebrew/requirements.rb         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index 59fae8254..703b6782c 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -83,6 +83,10 @@ private
       else
         X11Dependency::Proxy.for(spec.to_s, tag)
       end
+    when :cairo, :pixman
+      # We no longer use X11 psuedo-deps for cairo or pixman,
+      # so just return a standard formula dependency.
+      Dependency.new(spec.to_s, tag)
     when :x11        then X11Dependency.new(spec.to_s, tag)
     when :xcode      then XcodeDependency.new(tag)
     when :mysql      then MysqlInstalled.new(tag)
diff --git a/Library/Homebrew/requirements.rb b/Library/Homebrew/requirements.rb
index 7538079b0..b4ef6b881 100644
--- a/Library/Homebrew/requirements.rb
+++ b/Library/Homebrew/requirements.rb
@@ -107,7 +107,7 @@ class X11Dependency < Requirement
   # Rather than instantiate it directly, a separate class is built
   # for each of the packages that we proxy to X11Dependency.
   class Proxy < self
-    PACKAGES = [:libpng, :freetype, :pixman, :fontconfig]
+    PACKAGES = [:libpng, :freetype, :fontconfig]
 
     def self.for(name, *tags)
       constant = name.capitalize
-- 
cgit v1.2.3