7 files changed, 11 insertions, 2 deletions
diff --git a/Library/Formula/bitlbee.rb b/Library/Formula/bitlbee.rb
index 11f5bf0c1..28d1f3bb2 100644
--- a/Library/Formula/bitlbee.rb
+++ b/Library/Formula/bitlbee.rb
@@ -10,6 +10,7 @@ class Bitlbee < Formula
 
   depends_on 'glib'
   depends_on 'gnutls'
+  depends_on 'libgcrypt'
   depends_on 'libpurple' => :optional if build.include? 'purple'
   depends_on 'libotr' => :optional if build.include? 'with-otr'
 
diff --git a/Library/Formula/inspircd.rb b/Library/Formula/inspircd.rb
index 4d426c877..8ff8460a6 100644
--- a/Library/Formula/inspircd.rb
+++ b/Library/Formula/inspircd.rb
@@ -13,7 +13,8 @@ class Inspircd < Formula
   option 'with-tre', 'Enable the TRE module'
 
   depends_on 'pkg-config' => :build
-  depends_on 'gnutls' unless build.include? 'without-gnutls'
+  depends_on 'gnutls' => :recommended unless build.include? 'without-gnutls'
+  depends_on 'libgcrypt' unless build.include? 'without-gnutls'
   depends_on 'openssl' if build.include? 'with-openssl'
   depends_on 'pcre' if build.include? 'with-pcre'
   depends_on 'tre' if build.include? 'with-tre'
diff --git a/Library/Formula/libimobiledevice.rb b/Library/Formula/libimobiledevice.rb
index 88dba4717..750db0e16 100644
--- a/Library/Formula/libimobiledevice.rb
+++ b/Library/Formula/libimobiledevice.rb
@@ -13,6 +13,7 @@ class Libimobiledevice < Formula
   depends_on 'libplist'
   depends_on 'usbmuxd'
   depends_on 'gnutls'
+  depends_on 'libgcrypt'
 
   if build.head?
     depends_on :automake
diff --git a/Library/Formula/libvirt.rb b/Library/Formula/libvirt.rb
index ca2964a1e..d1309ae35 100644
--- a/Library/Formula/libvirt.rb
+++ b/Library/Formula/libvirt.rb
@@ -14,6 +14,7 @@ class Libvirt < Formula
   option 'without-libvirtd', 'Build only the virsh client and development libraries'
 
   depends_on "gnutls"
+  depends_on 'libgcrypt'
   depends_on "yajl"
 
   if MacOS.version == :leopard
diff --git a/Library/Formula/libxmlsec1.rb b/Library/Formula/libxmlsec1.rb
index 2277df6c3..6284df446 100644
--- a/Library/Formula/libxmlsec1.rb
+++ b/Library/Formula/libxmlsec1.rb
@@ -5,9 +5,12 @@ class Libxmlsec1 < Formula
   url 'http://www.aleksey.com/xmlsec/download/xmlsec1-1.2.18.tar.gz'
   sha1 '740c3c791be838bf638651a3fe0e80c624c2ae0e'
 
+  option 'without-gnutls', 'Disable GnuTLS'
+
   depends_on 'pkg-config' => :build
   depends_on 'libxml2' # Version on 10.6/10.7 is too old
-  depends_on 'gnutls' => :optional
+  depends_on 'gnutls' => :recommended unless build.include? 'without-gnutls'
+  depends_on 'libgcrypt' unless build.include? 'without-gnutls'
 
   # Add HOMEBREW_PREFIX/lib to dl load path
   def patches; DATA; end
diff --git a/Library/Formula/pianobar.rb b/Library/Formula/pianobar.rb
index fbdce2c45..20063f4a3 100644
--- a/Library/Formula/pianobar.rb
+++ b/Library/Formula/pianobar.rb
@@ -11,6 +11,7 @@ class Pianobar < Formula
   depends_on 'mad'
   depends_on 'faad2'
   depends_on 'gnutls'
+  depends_on 'libgcrypt'
   depends_on 'json-c'
 
   fails_with :llvm do
diff --git a/Library/Formula/wireshark.rb b/Library/Formula/wireshark.rb
index c242026ed..a059802df 100644
--- a/Library/Formula/wireshark.rb
+++ b/Library/Formula/wireshark.rb
@@ -7,6 +7,7 @@ class Wireshark < Formula
 
   depends_on 'pkg-config' => :build
   depends_on 'gnutls' => :optional
+  depends_on 'libgcrypt' => :optional
   depends_on 'c-ares' => :optional
   depends_on 'pcre' => :optional
   depends_on 'glib'