Source Mage code commit list

[Justin Boffemmyer <scm AT sourcemage.org>]

GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:

 chat-irc/bitlbee/CONFIGURE |   48 
++++++++++++++++++++++++++++++---------------
 chat-irc/bitlbee/DEPENDS   |   36 ++++++++++++++++++++++++++++-----
 chat-irc/bitlbee/DETAILS   |    4 +--
 chat-irc/bitlbee/HISTORY   |    4 +++
 4 files changed, 69 insertions(+), 23 deletions(-)

New commits:
commit 349c949b96a12778a70d2c0f1558051f8ce0ea21
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    chat-irc/bitlbee: update to 3.0.5
    
    Updated to the latest 3.0.5. I also cleaned up CONFIGURE, added/changed
    dependency options as needed, and adjusted DEPENDS accordingly.
    CONFIGURE and DEPENDS should now match fairly well how the spell can
    actually be configured.
    
    For MSN, libsoup is no longer required, so it was removed as a
    dependency. Bitlbee will handle the MSN protocol just fine with its own
    code (and won't use libsoup even if you have it anyway).

diff --git a/chat-irc/bitlbee/CONFIGURE b/chat-irc/bitlbee/CONFIGURE
index 8a8aee5..b9ebedb 100755
--- a/chat-irc/bitlbee/CONFIGURE
+++ b/chat-irc/bitlbee/CONFIGURE
@@ -1,23 +1,41 @@
-# asking user what for im protocols he needs
+config_query_option BITLBEE_OPTS "Enable plugin support? " y \
+                     "--plugins=1" "--plugins=0" &&
 
-# msn protocol requires the libsoup library
-# the specific option is set in the DEPENDS file
+config_query_option BITLBEE_OPTS "Enable Jabber (XMPP) protocol? " n \
+                    "--jabber=1" "--jabber=0" &&
 
-# jabber
-config_query_option BITLBEE_OPTS "Enable Jabber protocol? " n \
-                     "--jabber=1" "--jabber=0"
+config_query_option BITLBEE_OPTS "Enable Oscar protocol (for ICQ or AIM)? " 
y \
+                    "--oscar=1" "--oscar=0" &&
 
-  # oscar (icq, aim)
+config_query_option BITLBEE_OPTS "Enable Yahoo protocol? " y \
+                     "--yahoo=1" "--yahoo=0" &&
 
-config_query_option BITLBEE_OPTS "Enable Oscar protocol (for ICQ or AIM)? " \
-                     y "--oscar=1" "--oscar=0"
+config_query_option BITLBEE_OPTS "Enable Twitter protocol? " y \
+                     "--twitter=1" "--twitter=0" &&
 
-  # yahoo
-config_query_option BITLBEE_OPTS "Enable Yahoo protocol? " y   \
-                     "--yahoo=1" "--yahoo=0"
+config_query_option BITLBEE_OPTS "Enable MSN protocol? " y \
+                     "--msn=1" "--msn=0" &&
 
-config_query_option BITLBEE_OPTS "Enable Twitter protocol? " y   \
-                     "--twitter=1" "--twitter=0"
+config_query BITLBEE_OTR "Enable off-the-record (OTR) encryption support?" y 
&&
 
-config_query BITLBEE_BITLBEED     \
+if [[ "$BITLBEE_OTR" == "y" ]]
+then
+  if [["$BITLBEE_OPTS" == *--plugins=1* ]]
+  then
+    config_query BITLBEE_OTRPLUGIN "Build OTR support as a plugin?" n &&
+    [[ "$BITLBEE_OTRPLUGIN" == "y" ]] && BITLBEE_OPTS="$BITLBEE_OPTS 
--otr=plugin"
+  else
+    BITLBEE_OPTS="$BITLBEE_OPTS --otr=1"
+  fi
+fi &&
+
+config_query_list BITLBEE_SSL "Which SSL library would you like to use?" \
+                  "openssl" \
+                  "gnutls" &&
+
+config_query_list BITLBEE_EVENT "Which event library would you like to use?" 
\
+                  "glib2" \
+                  "libevent" &&
+
+config_query BITLBEE_BITLBEED \
              "Build bitlbeed (to run bitlbee without xinetd)?" n
diff --git a/chat-irc/bitlbee/DEPENDS b/chat-irc/bitlbee/DEPENDS
index 0bbff01..e3535dd 100755
--- a/chat-irc/bitlbee/DEPENDS
+++ b/chat-irc/bitlbee/DEPENDS
@@ -1,6 +1,30 @@
-depends                 glib2                &&
-depends                 gnutls               &&
-optional_depends       libsoup                                         \
-                       "--msn=1"                                       \
-                       "--msn=0"                                       \
-                       "for enabling MSN protocol"
+if [[ "$BITLBEE_EVENT" == "glib2" ]]
+then
+  depends glib2 "--events=glib" ""
+elif [[ "$BILBEE_EVENT" == "libevent" ]]
+then
+  depends libevent "--events=libevent" ""
+fi &&
+
+if [[ "$BITLBEE_SSL" == "openssl" ]]
+then
+  depends openssl "--ssl=openssl" ""
+elif [[ "$BILBEE_SSL" == "gnutls" ]]
+then
+  depends gnutls "--ssl=gnutls" ""
+fi &&
+
+if [[ "$BITLBEE_OTR" == "y" ]]
+then
+  depends libotr
+fi &&
+
+optional_depends pidgin \
+                 "--purple=1" \
+                 "--purple=0" \
+                 "for enabling protocol support via libpurple"
+
+#optional_depends      libsoup                                         \
+#                      "--msn=1"                                       \
+#                      "--msn=0"                                       \
+#                      "for enabling MSN protocol"
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index b4513c5..6c1a3f2 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,12 +1,12 @@
            SPELL=bitlbee
-         VERSION=3.0.4
+         VERSION=3.0.5
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
         WEB_SITE=http://www.bitlbee.org
          ENTERED=20031024
   SECURITY_PATCH=1
-     
SOURCE_HASH=sha512:33359d5ed5a8f681a877a260decacfb63719f899c9138726e546bd5a26a955d867dc782da1c5c6442b06c3c4810ed017aa278713ce94fb514baed5ef2bd485ba
+     
SOURCE_HASH=sha512:68a630914c24ceafd35361dfdc1de30a431cb8f549a493ade40c4bf45f83431d60ee5b7642c254657cbaa2b5b6b1f4b49196bd3137699a03d29f1a4d5032b7f9
       LICENSE[0]=GPL
         KEYWORDS="irc chat"
            SHORT="bitlbee - an IRC gateway to IM chat networks"
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index 223ad81..1f46be5 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,7 @@
+2012-06-28 Justin Boffemmyer <flux AT sourcemage.org>
+       * DETAILS: updated spell to 3.0.5
+       * CONFIGURE, DEPENDS: updated dependencies and cleaned up a bit
+
 2011-12-06 Justin Boffemmyer <flux AT sourcemage.org>
        * DETAILS: updated spell to 3.0.4