From fe6c8dcd7d29bdc7a5cdfe2e42eeed7006e6df95 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Mon, 20 Aug 2012 17:00:34 -0500
Subject: python/python3: don't duplicate TkCheck requirement

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
---
 Library/Formula/python.rb  |  6 +++---
 Library/Formula/python3.rb | 16 +---------------
 2 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index a5f5db2f3..5a9a0cdf6 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -2,9 +2,9 @@ require 'formula'
 
 class TkCheck < Requirement
   def message; <<-EOS.undent
-    Tk.framework detected in /Library/Frameworks
-    and that can make python builds to fail.
-    https://github.com/mxcl/homebrew/issues/11602
+    Tk.framework was detected in /Library/Frameworks
+    This can cause Python builds to fail. See:
+      https://github.com/mxcl/homebrew/issues/11602
     EOS
   end
 
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index 3cf82a30a..28472b12f 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -1,25 +1,11 @@
 require 'formula'
+require Formula.path("python") # For TkCheck requirement
 
 # Python3 is the new language standard, not just a new revision.
 # It's somewhat incompatible to Python 2.x, therefore, the executable
 # "python" will always point to the 2.x version which you can get by
 # `brew install python`.
 
-class TkCheck < Requirement
-  def message; <<-EOS.undent
-    Tk.framework detected in /Library/Frameworks
-    and that can make python builds to fail.
-    https://github.com/mxcl/homebrew/issues/11602
-    EOS
-  end
-
-  def fatal?; false; end
-
-  def satisfied?
-    not File.exist? '/Library/Frameworks/Tk.framework'
-  end
-end
-
 class Distribute < Formula
   url 'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.28.tar.gz'
   md5 'b400b532e33f78551e6847c1f5965e56'
-- 
cgit v1.2.3