4 files changed, 63 insertions, 42 deletions
diff --git a/network/skype/README b/network/skype/README
index 9fd8399ce5..839b54b4c3 100644
--- a/network/skype/README
+++ b/network/skype/README
@@ -1,6 +1,8 @@
-Skype is a free Voice Over IP program for Linux, Windows and MacOS.  
-It allows users to communicate with other Skype users running any of 
-the supported platforms, as well as receiving and placing calls from 
-and to normal land lines as well as mobile phones.
+Skype is a free Voice Over IP program for Linux, Windows and MacOS.
+It allows users to communicate with other Skype users running any of
+the supported platforms, as well as receiving and placing calls from
+and to normal land lines and mobile phones.
 
-This script repackages the shared tarball provided by Skype.
+This script repackages the shared tarball provided by Skype, wich
+has been built dynamically. For more information on how to repackage
+a static version, check README.STATIC wich came with this package.
diff --git a/network/skype/README.STATIC b/network/skype/README.STATIC
new file mode 100644
index 0000000000..e7d3754dfa
--- /dev/null
+++ b/network/skype/README.STATIC
@@ -0,0 +1,12 @@
+By default this SlackBuild is going to build a dynamically linked skype
+package, but in some cases a staticly linked one might be preferred.
+
+First, get the skype_static tarball from here:
+
+http://download.skype.com/linux/skype_static-2.2.0.25.tar.bz2
+(md5sum: e8d83f45f7a0e092fc4e168dcb068a1a)
+
+Then run skype.SlackBuild like this:
+  STATIC=yes ./skype.SlackBuild
+
+Enjoy :-)
diff --git a/network/skype/skype.SlackBuild b/network/skype/skype.SlackBuild
index 551de3b4d6..ae185eee65 100644
--- a/network/skype/skype.SlackBuild
+++ b/network/skype/skype.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for skype
 
-# Copyright 2006  Martin Lefebvre <dadexter@gmail.com>
+# Copyright 2010-2011, mario <mario@slackverse.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,22 +11,19 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Ported from 12.1 repository; now only Skype 2.0 compatible
-# Updated for Skype 2.1.0.81 by mario <mario@slackverse.org>
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=skype
-VERSION=2.1.0.81
+VERSION=${VERSION:-2.2.0.25}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,39 +33,49 @@ case "$( uname -m )" in
      *) ARCH=$( uname -m ) ;;
 esac
 
+# Some people will want staticly linked version instead.
+STATIC=${STATIC:-no}
+
+if [ "$STATIC" = yes ]; then
+  SRCNAM=${PRGNAM}_static
+else
+    SRCNAM=$PRGNAM
+fi
+
+# Sanity check, we make sure resulting package will work on users system.
+case "$ARCH" in
+  x86_64)
+    echo "$ARCH is not supported, you will need 32bit compatibility libs..."
+    ARCH=i486
+    ;;
+  i486)
+    echo "System check passed..."
+    ;;
+  *)
+    echo "$ARCH is not supported."
+    exit 1
+    ;;
+esac
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Keep going on 64bit since user might have/want 32bit compatibility...
-if [ "$ARCH" == "x86_64" ]; then
-  printf "$ARCH is not supported - you will need 32bit compatibility...\n"
-  ARCH=i486
-fi
-
-# Afaik everything else is still not supported.
-if [ "$ARCH" != "i486" ]; then
-  printf "$ARCH is not supported...\n"
-  exit 1
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
+cd $SRCNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
-chmod 0644 sounds/*
 
-mkdir -p $PKG/usr/bin $PKG/usr/share/{skype,pixmaps,applications} \
-  $PKG/etc/dbus-1/system.d
+mkdir -p $PKG/usr/{bin,share/{skype,pixmaps,applications}} $PKG/etc/dbus-1/system.d
 cp -a skype $PKG/usr/bin
-cp -a avatars sounds lang $PKG/usr/share/skype
+cp -a avatars lang sounds $PKG/usr/share/skype
 cat skype.desktop > $PKG/usr/share/applications/skype.desktop
 cat icons/SkypeBlue_48x48.png > $PKG/usr/share/pixmaps/skype.png
 cat skype.conf > $PKG/etc/dbus-1/system.d/skype.conf
diff --git a/network/skype/skype.info b/network/skype/skype.info
index 960adbcaf6..a91c836432 100644
--- a/network/skype/skype.info
+++ b/network/skype/skype.info
@@ -1,8 +1,8 @@
 PRGNAM="skype"
-VERSION="2.1.0.81"
+VERSION="2.2.0.25"
 HOMEPAGE="http://www.skype.com"
-DOWNLOAD="http://download.skype.com/linux/skype-2.1.0.81.tar.bz2"
-MD5SUM="5411dcf89e33f53df5fbe5958bbaef54"
+DOWNLOAD="http://download.skype.com/linux/skype-2.2.0.25.tar.bz2"
+MD5SUM="dacece3b56f28fbd70a713db12d5bfaf"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64=""
 MAINTAINER="mario"