Move conditional fails_with annotations to spec blocks

3 files changed, 17 insertions, 12 deletions

diff --git a/Library/Formula/ncmpcpp.rb b/Library/Formula/ncmpcpp.rb
index 5c56a98d9..f442858b2 100644
--- a/Library/Formula/ncmpcpp.rb
+++ b/Library/Formula/ncmpcpp.rb
@@ -2,8 +2,15 @@ require 'formula'
 
 class Ncmpcpp < Formula
   homepage 'http://ncmpcpp.rybczak.net/'
-  url 'http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.5.10.tar.bz2'
-  sha1 '5e34733e7fbaf2862f04fdf8af8195ce860a9014'
+
+  stable do
+    url 'http://ncmpcpp.rybczak.net/stable/ncmpcpp-0.5.10.tar.bz2'
+    sha1 '5e34733e7fbaf2862f04fdf8af8195ce860a9014'
+
+    fails_with :clang do
+      cause "'itsTempString' is a private member of 'NCurses::basic_buffer<char>'"
+    end
+  end
 
   head do
     url 'git://repo.or.cz/ncmpcpp.git'
@@ -20,10 +27,6 @@ class Ncmpcpp < Formula
   depends_on 'libmpdclient'
   depends_on 'fftw' if build.include? "visualizer"
 
-  fails_with :clang do
-    cause "'itsTempString' is a private member of 'NCurses::basic_buffer<char>'"
-  end if build.stable?
-
   option 'outputs', 'Compile with mpd outputs control'
   option 'visualizer', 'Compile with built-in visualizer'
   option 'clock', 'Compile with optional clock tab'
diff --git a/Library/Formula/snort.rb b/Library/Formula/snort.rb
index 7b4ba6ce9..b746882f1 100644
--- a/Library/Formula/snort.rb
+++ b/Library/Formula/snort.rb
@@ -2,16 +2,18 @@ require 'formula'
 
 class Snort < Formula
   homepage 'http://www.snort.org'
-  url 'https://www.snort.org/downloads/snort/snort-2.9.6.2.tar.gz'
-  sha1 '09068bc88dbb3fe47b2bff5803a7b3ef0c98395b'
+
+  stable do
+    url 'https://www.snort.org/downloads/snort/snort-2.9.6.2.tar.gz'
+    sha1 '09068bc88dbb3fe47b2bff5803a7b3ef0c98395b'
+    fails_with :clang
+  end
 
   devel do
     url 'https://www.snort.org/downloads/snortdev/snort-2.9.7.0_beta.tar.gz'
     sha1 '723a8cf0f7cb2000145c916fbeacb8cfca92ae77'
   end
 
-  fails_with :clang unless build.devel?
-
   depends_on 'daq'
   depends_on 'libdnet'
   depends_on 'pcre'
diff --git a/Library/Formula/tesseract.rb b/Library/Formula/tesseract.rb
index 8f9e6856f..99fd74610 100644
--- a/Library/Formula/tesseract.rb
+++ b/Library/Formula/tesseract.rb
@@ -16,6 +16,8 @@ class Tesseract < Formula
     url 'https://drive.google.com/uc?id=0B7l10Bj_LprhSGN2bTYwemVRREU&export=download'
     sha1 '5bd12482a69f0a1fdf3c9e0d652de08db763ee93'
     version '3.03rc1'
+
+    needs :cxx11
   end
 
   head do
@@ -32,8 +34,6 @@ class Tesseract < Formula
   depends_on "libtiff" => :recommended
   depends_on "leptonica"
 
-  needs :cxx11 if build.devel?
-
   fails_with :llvm do
     build 2206
     cause "Executable 'tesseract' segfaults on 10.6 when compiled with llvm-gcc"