4 files changed, 25 insertions, 11 deletions
diff --git a/network/bitlbee/README b/network/bitlbee/README
index a47cd5c1df..d60017befd 100644
--- a/network/bitlbee/README
+++ b/network/bitlbee/README
@@ -32,6 +32,11 @@ OTR (Off the record) is not compiled by default. If you want bitlbee
 to compile with OTR capabilities, you'll need to install libotr from
 Slackware and run the script as follows: OTR=yes ./bitlbee.SlackBuild
 
+From version 3.2 bitlbee offers some form of skype support, even though
+this will not ever be part of bitlbee proper. please see the documentation
+in protocols/skype in the source package for information. You can run the
+script as following: SKYPE=yes ./bitlbee.SlackBuild
+
 NOTE: The default "bot"/bitlbee daemon is called 'root'. This is not
 the root user on your system. You can easily change it. Register and
 identify yourself first, and then:
diff --git a/network/bitlbee/bitlbee.SlackBuild b/network/bitlbee/bitlbee.SlackBuild
index 8a6fc01bb8..0de036ac5c 100644
--- a/network/bitlbee/bitlbee.SlackBuild
+++ b/network/bitlbee/bitlbee.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bitlbee
-VERSION=${VERSION:-3.0.5}
+VERSION=${VERSION:-3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,6 +68,13 @@ else
   USEOTR=0
 fi
 
+SKYPE=${SKYPE:-no}
+if [ "$SKYPE" = "yes" ]; then
+  USESKYPE=1
+else
+  USESKYPE=0
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -102,7 +109,6 @@ cat << EOF
   # groupadd -g $BITLBEE_GROUP bitlbee
 
 EOF
-
   exit
 fi
 
@@ -130,6 +136,7 @@ CPU="$ARCH" \
   --events=${EVENTS:-glib} \
   --ssl=${CRYPT:-gnutls} \
   --otr=${USEOTR} \
+  --skype=${USESKYPE} \
   --build=$ARCH-slackware-linux
 
 if [ -e Makefile.settings ]; then
@@ -145,12 +152,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/var/lib/$PRGNAM
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{oscar,skype} $PKG/var/lib/$PRGNAM
 cp -a \
   COPYING doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/INSTALL \
   doc/README doc/bitlbee.schema doc/bitlbee.xinetd doc/comic_3.0.png \
   doc/example_plugin.c doc/user-guide/user-guide.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a protocols/oscar/{AUTHORS,COPYING} $PKG/usr/doc/$PRGNAM-$VERSION/oscar
+cp -a protocols/skype/{HACKING,NEWS,README} $PKG/usr/doc/$PRGNAM-$VERSION/skype
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Rewrite the documentation to replace /usr/local/ with /usr
diff --git a/network/bitlbee/bitlbee.info b/network/bitlbee/bitlbee.info
index 3eea34ff53..eec50aba98 100644
--- a/network/bitlbee/bitlbee.info
+++ b/network/bitlbee/bitlbee.info
@@ -1,8 +1,8 @@
 PRGNAM="bitlbee"
-VERSION="3.0.5"
+VERSION="3.2"
 HOMEPAGE="http://www.bitlbee.org"
-DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.0.5.tar.gz"
-MD5SUM="9ff97260a2a7f3a7d102db158a8d9887"
+DOWNLOAD="http://get.bitlbee.org/src/bitlbee-3.2.tar.gz"
+MD5SUM="6a8fe98e96a47c636004a245075d5d7c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/bitlbee/slack-desc b/network/bitlbee/slack-desc
index 8c281eaa7a..76062dc33c 100644
--- a/network/bitlbee/slack-desc
+++ b/network/bitlbee/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
 bitlbee: bitlbee (an IRC instant messaging gateway)