4 files changed, 10 insertions, 12 deletions
diff --git a/Library/Formula/cairomm.rb b/Library/Formula/cairomm.rb
index 5acaac2d7..b0eaf55ca 100644
--- a/Library/Formula/cairomm.rb
+++ b/Library/Formula/cairomm.rb
@@ -7,7 +7,7 @@ class Cairomm < Formula
 
   depends_on 'pkg-config' => :build
   depends_on 'libsigc++'
-  depends_on 'cairo' if MACOS_VERSION <= 10.6
+  depends_on 'cairo'
 
   def install
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/gerbv.rb b/Library/Formula/gerbv.rb
index 7dedf8be1..c259acb2c 100644
--- a/Library/Formula/gerbv.rb
+++ b/Library/Formula/gerbv.rb
@@ -7,7 +7,7 @@ class Gerbv < Formula
 
   depends_on 'pkg-config' => :build
   depends_on 'gtk+'
-  depends_on 'cairo' if MacOS.leopard?
+  depends_on 'cairo'
   depends_on :x11
 
   def install
diff --git a/Library/Formula/gtk+.rb b/Library/Formula/gtk+.rb
index e0c908aa9..350021415 100644
--- a/Library/Formula/gtk+.rb
+++ b/Library/Formula/gtk+.rb
@@ -14,6 +14,7 @@ class Gtkx < Formula
   depends_on 'pango'
   depends_on 'jasper' => :optional
   depends_on 'atk' => :optional
+  depends_on 'cairo'
   depends_on :x11
 
   fails_with :llvm do
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
index d1ad7736b..8cb94e137 100644
--- a/Library/Formula/pango.rb
+++ b/Library/Formula/pango.rb
@@ -10,16 +10,13 @@ class Pango < Formula
   depends_on 'glib'
   depends_on :x11
 
-  if MacOS.leopard?
-    depends_on 'fontconfig' # Leopard's fontconfig is too old.
-    depends_on 'cairo' # Leopard doesn't come with Cairo.
-  elsif MacOS.lion?
-    # The Cairo library shipped with Lion contains a flaw that causes Graphviz
-    # to segfault. See the following ticket for information:
-    #
-    #   https://trac.macports.org/ticket/30370
-    depends_on 'cairo'
-  end
+  depends_on 'fontconfig' if MacOS.leopard?
+
+  # The Cairo library shipped with Lion contains a flaw that causes Graphviz
+  # to segfault. See the following ticket for information:
+  #   https://trac.macports.org/ticket/30370
+  # We depend on our cairo on all platforms for consistency
+  depends_on 'cairo'
 
   fails_with :llvm do
     build 2326