Avoid conditionally defined resources

Resources are downloaded on-demand, so we can always define them and
avoid the headaches that come with conditional definitions.

6 files changed, 15 insertions, 23 deletions

diff --git a/Library/Formula/ansible.rb b/Library/Formula/ansible.rb
index be6ad59e5..ad806e4e9 100644
--- a/Library/Formula/ansible.rb
+++ b/Library/Formula/ansible.rb
@@ -43,11 +43,9 @@ class Ansible < Formula
     sha1 'a9b24d887f2be772921b3ee30a0b9d435cffadda'
   end
 
-  if build.with? 'accelerate'
-    resource 'python-keyczar' do
-      url 'https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.71b.tar.gz'
-      sha1 '20c7c5d54c0ce79262092b4cc691aa309fb277fa'
-    end
+  resource 'python-keyczar' do
+    url 'https://pypi.python.org/packages/source/p/python-keyczar/python-keyczar-0.71b.tar.gz'
+    sha1 '20c7c5d54c0ce79262092b4cc691aa309fb277fa'
   end
 
   def install
diff --git a/Library/Formula/cfitsio.rb b/Library/Formula/cfitsio.rb
index 47a57f827..0ff796a0f 100644
--- a/Library/Formula/cfitsio.rb
+++ b/Library/Formula/cfitsio.rb
@@ -13,7 +13,7 @@ class Cfitsio < Formula
     url "http://heasarc.gsfc.nasa.gov/docs/software/fitsio/cexamples/cexamples.zip"
     version "2014.01.23"
     sha1 "39a66bb611bf611e7c88f0a410234c0d4955529c"
-  end if build.with? "examples"
+  end
 
   def install
     system "./configure", "--prefix=#{prefix}"
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 34c840e66..2ce278096 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -29,7 +29,7 @@ class Glib < Formula
     url 'https://trac.macports.org/export/111532/trunk/dports/devel/glib2/files/config.h.ed'
     version '111532'
     sha1 '0926f19d62769dfd3ff91a80ade5eff2c668ec54'
-  end if build.universal?
+  end
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=673135 Resolved as wontfix,
   # but needed to fix an assumption about the location of the d-bus machine
diff --git a/Library/Formula/libgcrypt.rb b/Library/Formula/libgcrypt.rb
index 3a831a4c1..1a6690183 100644
--- a/Library/Formula/libgcrypt.rb
+++ b/Library/Formula/libgcrypt.rb
@@ -21,7 +21,7 @@ class Libgcrypt < Formula
     url "http://trac.macports.org/export/113198/trunk/dports/devel/libgcrypt/files/config.h.ed"
     version "113198"
     sha1 "136f636673b5c9d040f8a55f59b430b0f1c97d7a"
-  end if build.universal?
+  end
 
   def install
     ENV.universal_binary if build.universal?
diff --git a/Library/Formula/mat.rb b/Library/Formula/mat.rb
index d2c3b8774..2fa41f1e5 100644
--- a/Library/Formula/mat.rb
+++ b/Library/Formula/mat.rb
@@ -56,11 +56,9 @@ class Mat < Formula
     sha1 'db9ac81daf3e069b8838ae6d379abac2f0094663'
   end
 
-  if build.with? 'massive-audio'
-    resource 'mutagen' do
-      url 'https://pypi.python.org/packages/source/m/mutagen/mutagen-1.22.tar.gz'
-      sha1 '9bdd4a7a491008e62d140d83fc31d355577f94e7'
-    end
+  resource 'mutagen' do
+    url 'https://pypi.python.org/packages/source/m/mutagen/mutagen-1.22.tar.gz'
+    sha1 '9bdd4a7a491008e62d140d83fc31d355577f94e7'
   end
 
   def install
diff --git a/Library/Formula/mitmproxy.rb b/Library/Formula/mitmproxy.rb
index 2a4b7815d..f54a73098 100644
--- a/Library/Formula/mitmproxy.rb
+++ b/Library/Formula/mitmproxy.rb
@@ -54,18 +54,14 @@ class Mitmproxy < Formula
     sha1 '28bd77014cce92bcb09ccc11f93e558d02265082'
   end
 
-  if build.with? 'pyamf'
-    resource 'pyamf' do
-      url 'https://pypi.python.org/packages/source/P/PyAMF/PyAMF-0.6.1.tar.gz'
-      sha1 '825a5ee167c89d3a026347b409ae26cbf6c68530'
-    end
+  resource 'pyamf' do
+    url 'https://pypi.python.org/packages/source/P/PyAMF/PyAMF-0.6.1.tar.gz'
+    sha1 '825a5ee167c89d3a026347b409ae26cbf6c68530'
   end
 
-  if build.with? 'cssutils'
-    resource 'cssutils' do
-      url 'https://pypi.python.org/packages/source/c/cssutils/cssutils-1.0.zip'
-      sha1 '341e57dbb02b699745b13a9a3296634209d26169'
-    end
+  resource 'cssutils' do
+    url 'https://pypi.python.org/packages/source/c/cssutils/cssutils-1.0.zip'
+    sha1 '341e57dbb02b699745b13a9a3296634209d26169'
   end
 
   def install