Recursively scan for keg-only deps before generating build ENV

Remove cairo dep from gtk formula as a consequence.

2 files changed, 1 insertions, 6 deletions

diff --git a/Library/Formula/gtk+.rb b/Library/Formula/gtk+.rb
index 3707f2506..9cc8fc14e 100644
--- a/Library/Formula/gtk+.rb
+++ b/Library/Formula/gtk+.rb
@@ -10,11 +10,6 @@ class Gtkx < Formula
   depends_on 'jpeg'
   depends_on 'libtiff'
   depends_on 'gdk-pixbuf'
-
-  # Used by pango, but keg-only, so needs to be added to
-  # the flags for gtk+ explicitly.
-  depends_on 'cairo' if MacOS.leopard?
-
   depends_on 'pango'
   depends_on 'jasper' => :optional
   depends_on 'atk' => :optional
diff --git a/Library/Homebrew/build.rb b/Library/Homebrew/build.rb
index 9844ef401..36c3da268 100755
--- a/Library/Homebrew/build.rb
+++ b/Library/Homebrew/build.rb
@@ -40,7 +40,7 @@ at_exit do
 end
 
 def install f
-  f.deps.uniq.each do |dep|
+  f.recursive_deps.uniq.each do |dep|
     dep = Formula.factory dep
     if dep.keg_only?
       ENV.prepend 'LDFLAGS', "-L#{dep.lib}"