bitlbee: use new optional dependency syntax

Also removes the unnecessary LD fix, since we don't do that anymore.

1 files changed, 6 insertions, 13 deletions

diff --git a/Library/Formula/bitlbee.rb b/Library/Formula/bitlbee.rb
index a54b8e8e5..56cbf4482 100644
--- a/Library/Formula/bitlbee.rb
+++ b/Library/Formula/bitlbee.rb
@@ -5,24 +5,17 @@ class Bitlbee < Formula
   url 'http://get.bitlbee.org/src/bitlbee-3.2.tar.gz'
   sha1 '21e17f082c776566429603b1e8c966983a75ac9e'
 
-  option 'purple', "Use libpurple for all communication with instant messaging networks"
-  option 'with-otr', "Build with otr (off the record) support"
+  option 'with-libpurple', "Use libpurple for all communication with instant messaging networks"
+  option 'with-libotr', "Build with otr (off the record) support"
 
   depends_on 'pkg-config' => :build
   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'
+  depends_on 'libpurple' => :optional
+  depends_on 'libotr' => :optional
 
   def install
-    # By default Homebrew will set ENV['LD'] to the same as ENV['CC'] which
-    # defaults to /usr/bin/cc (see Library/Homebrew/extend/ENV.rb:39) However
-    # this will break as bitlbee uses one of those odd and rare Makefiles that
-    # can't handle the linker being 'cc' and must be 'ld' (don't ask me some C
-    # magician will know).
-    ENV['LD'] = '/usr/bin/ld'
-
     args = ["--prefix=#{prefix}",
             "--debug=0",
             "--ssl=gnutls",
@@ -30,8 +23,8 @@ class Bitlbee < Formula
             "--config=#{var}/bitlbee/lib/",
             "--ipsocket=#{var}/bitlbee/run/bitlbee.sock"]
 
-    args << "--purple=1" if build.include? "purple"
-    args << "--otr=1" if build.include? "with-otr"
+    args << "--purple=1" if build.with? "libpurple"
+    args << "--otr=1" if build.with? "libotr"
 
     system "./configure", *args