From 6e26500e7f464e29287caf79f299354fdce25427 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Fri, 21 Mar 2014 19:56:38 -0500
Subject: python[23]: always use Homebrew openssl

---
 Library/Formula/python.rb  | 3 +--
 Library/Formula/python3.rb | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 44673b445..c969c8e04 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -8,7 +8,6 @@ class Python < Formula
 
   option :universal
   option 'quicktest', "Run `make quicktest` after the build (for devs; may fail)"
-  option 'with-brewed-openssl', "Use Homebrew's openSSL instead of the one from OS X"
   option 'with-brewed-tk', "Use Homebrew's Tk (has optional Cocoa and threads support)"
   option 'with-poll', "Enable select.poll, which is not fully implemented on OS X (http://bugs.python.org/issue5154)"
   option 'with-dtrace', "Experimental DTrace support (http://bugs.python.org/issue13405)"
@@ -17,7 +16,7 @@ class Python < Formula
   depends_on 'readline' => :recommended
   depends_on 'sqlite' => :recommended
   depends_on 'gdbm' => :recommended
-  depends_on 'openssl' if build.with? 'brewed-openssl'
+  depends_on 'openssl'
   depends_on 'homebrew/dupes/tcl-tk' if build.with? 'brewed-tk'
   depends_on :x11 if build.with? 'brewed-tk' and Tab.for_name('tcl-tk').used_options.include?('with-x11')
 
diff --git a/Library/Formula/python3.rb b/Library/Formula/python3.rb
index a2a05cf73..113a883e0 100644
--- a/Library/Formula/python3.rb
+++ b/Library/Formula/python3.rb
@@ -11,14 +11,13 @@ class Python3 < Formula
 
   option :universal
   option 'quicktest', 'Run `make quicktest` after the build'
-  option 'with-brewed-openssl', "Use Homebrew's openSSL instead of the one from OS X"
   option 'with-brewed-tk', "Use Homebrew's Tk (has optional Cocoa and threads support)"
 
   depends_on 'pkg-config' => :build
   depends_on 'readline' => :recommended
   depends_on 'sqlite' => :recommended
   depends_on 'gdbm' => :recommended
-  depends_on 'openssl' if build.with? 'brewed-openssl'
+  depends_on 'openssl'
   depends_on 'xz' => :recommended  # for the lzma module added in 3.3
   depends_on 'homebrew/dupes/tcl-tk' if build.with? 'brewed-tk'
   depends_on :x11 if build.with? 'brewed-tk' and Tab.for_name('tcl-tk').used_options.include?('with-x11')
-- 
cgit v1.2.3