split john-jumbo from john

1 files changed, 2 insertions, 13 deletions

diff --git a/Library/Formula/john.rb b/Library/Formula/john.rb
index 27f184810..6bb5a2e1e 100644
--- a/Library/Formula/john.rb
+++ b/Library/Formula/john.rb
@@ -5,12 +5,10 @@ class John < Formula
   url 'http://www.openwall.com/john/g/john-1.7.9.tar.bz2'
   sha1 '8f77bdd42b7cf94ec176f55ea69c4da9b2b8fe3b'
 
-  option 'jumbo', 'Build with jumbo-7 features'
+  conflicts_with 'john-jumbo', :because => 'both install the same binaries'
 
   def patches
-    p = [DATA] # Taken from MacPorts, tells john where to find runtime files
-    p << "http://www.openwall.com/john/g/john-1.7.9-jumbo-7.diff.gz" if build.include? 'jumbo'
-    return p
+    DATA # Taken from MacPorts, tells john where to find runtime files
   end
 
   fails_with :llvm do
@@ -18,22 +16,13 @@ class John < Formula
     cause "Don't remember, but adding this to whitelist 2336."
   end
 
-  fails_with :clang do
-    build 425
-    cause "rawSHA1_ng_fmt.c:535:19: error: redefinition of '_mm_testz_si128'"
-  end if build.include? 'jumbo'
-
   def install
     ENV.deparallelize
     arch = Hardware.is_64_bit? ? '64' : 'sse2'
-    arch += '-opencl' if build.include? 'jumbo'
 
     cd 'src' do
       inreplace 'Makefile' do |s|
         s.change_make_var! "CC", ENV.cc
-        if build.include?('jumbo') && MacOS.version != :leopard && ENV.compiler != :clang
-          s.change_make_var! "OMPFLAGS", "-fopenmp -msse2 -D_FORTIFY_SOURCE=0"
-        end
       end
       system "make", "clean", "macosx-x86-#{arch}"
     end