From 97a4064d0b54bdf015240f32d87d7ba8046d51ca Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Wed, 25 Mar 2009 15:00:39 +0000
Subject: ekiga: updating ekiga (to 3.0.0) and its dependencies

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2124 370017ae-e619-0410-ac65-c121f96126d4
---
 app/text/gnome-doc-utils/Manifest                  |  23 ++
 .../gnome-doc-utils/gnome-doc-utils.SlackBuild     |  97 ++++++--
 app/text/scrollkeeper/Manifest                     |  23 ++
 app/text/scrollkeeper/scrollkeeper.SlackBuild      | 143 +++++++++++-
 dev/lang/mono/Manifest                             |  24 ++
 dev/lang/mono/mono.SlackBuild                      |  78 ++++++-
 dev/libs/libdaemon/Manifest                        |  24 ++
 dev/libs/libdaemon/libdaemon.SlackBuild            |  84 ++++++-
 dev/libs/libtasn1/Manifest                         |  23 ++
 dev/libs/libtasn1/libtasn1.SlackBuild              |  78 ++++++-
 dev/libs/ptlib/Manifest                            |  24 ++
 dev/libs/ptlib/ptlib.SlackBuild                    | 223 ++++++++++++++++++
 dev/libs/pwlib/Manifest                            |  23 ++
 dev/libs/pwlib/pwlib.SlackBuild                    | 101 ++++++--
 gnome/base/gconf/GConf.SlackBuild                  |  82 ++++++-
 gnome/base/gconf/Manifest                          |  25 ++
 gnome/base/gnome-keyring/Manifest                  |  24 ++
 gnome/base/gnome-keyring/gnome-keyring.SlackBuild  |  78 ++++++-
 gnome/base/gnome-mime-data/Manifest                |  23 ++
 .../gnome-mime-data/gnome-mime-data.SlackBuild     |  93 +++++++-
 gnome/base/gnome-vfs/Manifest                      |  24 ++
 gnome/base/gnome-vfs/gnome-vfs.SlackBuild          |  78 ++++++-
 gnome/base/libbonobo/Manifest                      |  23 ++
 gnome/base/libbonobo/libbonobo.SlackBuild          |  78 ++++++-
 gnome/base/libbonoboui/Manifest                    |  23 ++
 gnome/base/libbonoboui/libbonoboui.SlackBuild      |  93 +++++++-
 gnome/base/libgnome/Manifest                       |  24 ++
 gnome/base/libgnome/libgnome.SlackBuild            |  78 ++++++-
 gnome/base/libgnomeui/Manifest                     |  24 ++
 gnome/base/libgnomeui/libgnomeui.SlackBuild        |  78 ++++++-
 gnome/base/orbit/Manifest                          |  23 ++
 gnome/base/orbit/ORBit2.SlackBuild                 |  78 ++++++-
 gnome/extra/evolution-data-server/Manifest         |  24 ++
 .../evolution-data-server.SlackBuild               |  95 ++++++--
 net/dns/avahi/Manifest                             |  26 ++-
 net/dns/avahi/avahi.SlackBuild                     |  73 +++++-
 net/dns/avahi/slack-required                       |   2 -
 net/im/ekiga/Manifest                              |  24 ++
 net/im/ekiga/ekiga.SlackBuild                      |  88 ++++++-
 net/im/ekiga/slack-required                        |   2 +
 net/libs/libproxy/Manifest                         |  23 ++
 net/libs/libproxy/libproxy.SlackBuild              | 223 ++++++++++++++++++
 net/libs/libsoup/Manifest                          |  26 +++
 net/libs/libsoup/libsoup.SlackBuild                | 258 ++++++++++++++-------
 net/libs/libsoup/slack-required                    |   5 +-
 net/libs/opal/Manifest                             |  26 +++
 net/libs/opal/opal.SlackBuild                      | 108 +++++++--
 net/libs/opal/slack-required                       |   2 +-
 48 files changed, 2678 insertions(+), 244 deletions(-)
 create mode 100644 app/text/gnome-doc-utils/Manifest
 create mode 100644 app/text/scrollkeeper/Manifest
 create mode 100644 dev/lang/mono/Manifest
 create mode 100644 dev/libs/libdaemon/Manifest
 create mode 100644 dev/libs/libtasn1/Manifest
 create mode 100644 dev/libs/ptlib/Manifest
 create mode 100644 dev/libs/ptlib/ptlib.SlackBuild
 create mode 100644 dev/libs/pwlib/Manifest
 create mode 100644 gnome/base/gconf/Manifest
 create mode 100644 gnome/base/gnome-keyring/Manifest
 create mode 100644 gnome/base/gnome-mime-data/Manifest
 create mode 100644 gnome/base/gnome-vfs/Manifest
 create mode 100644 gnome/base/libbonobo/Manifest
 create mode 100644 gnome/base/libbonoboui/Manifest
 create mode 100644 gnome/base/libgnome/Manifest
 create mode 100644 gnome/base/libgnomeui/Manifest
 create mode 100644 gnome/base/orbit/Manifest
 create mode 100644 gnome/extra/evolution-data-server/Manifest
 create mode 100644 net/im/ekiga/Manifest
 create mode 100644 net/libs/libproxy/Manifest
 create mode 100644 net/libs/libproxy/libproxy.SlackBuild
 create mode 100644 net/libs/libsoup/Manifest
 create mode 100644 net/libs/opal/Manifest

diff --git a/app/text/gnome-doc-utils/Manifest b/app/text/gnome-doc-utils/Manifest
new file mode 100644
index 00000000..a4f8f046
--- /dev/null
+++ b/app/text/gnome-doc-utils/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gnome-doc-utils-0.12.0.tar.bz2 592073 MD5 5934c08d12407d8233416343cd73df24 RMD160 3ac9b6f04163ba2581b048282f64558f608ca44d SHA1 e20c74ad415b9ddfdf6c8d663e22bf27c0b939c4 SHA256 6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076 SHA512 0d687cfbae27a2bfa2eeb5e1af39e4dc0b7791ef46266f7b084e58be7b576308fcc59a97b41168946fd786bb2a68eb965692befb127dbaa0d53b9a0a6a58b8b3
+MKBUILD gnome-doc-utils.mkbuild 4170 MD5 1647da44912ee172c1f30dcb58dc9d25 RMD160 f5047a978bdcf2e5c1de75283367d3c77e77d99d SHA1 589c6c8c800e346ae3a5049c1b3b7ff1b8324474 SHA256 be828fbef3e1e7e1c9dd4af10b93e925b0a8f7ed195ad03774d6197a70219784 SHA512 3a74f3917ff082b70b3d66050fcde191e66d9fa564261e440d2649378e17bc9af1846533e3508cdd6634384ca4df59404ac3de44735d4570a1ae2d3bb1234635
+SLACKBUILD gnome-doc-utils.SlackBuild 7329 MD5 9fa533181d4cd6822ccf3fec4059ea67 RMD160 5c6c73ff308f5db7ad591531c38479675ccf4491 SHA1 d8b9d040ff90c7726a6305de483dbb2a45cf1725 SHA256 be1aad5b387ff10db1b80341e412206135e8d243f402c0e0521d60c47846da89 SHA512 7a608925e695b6c0f6c037d46c9bfe3df281f703c835407a977c255985169f3121efeb96898898e373228e73b71ac156add291e1bfe65006b0aaf3e11613ec4a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYPxAAoJEEHL93ESzgei5RYP/jNrmjVGiTKOluHMH3BYzs4R
+HhSJ+NyJp3ZEUBSf2V+CrAEs2DypS8Qbwz3R0BPCY0yMwju4WOqr+NTRBoc1Dw+E
+aEr3idGN19VEoQ49/kWOgs9IIV6e8YoSQX8HTlh5pmzsZEf2eDaoVXZyFocHZr79
+eojhLmwVtVZPjNx6+u26hdCcwqR/1ZzyXuPu+qT+9fBWAQLADbrMEg1nSESkBYjO
+fYp0kykRVm42Msq5/SXlRpHkUA01ndDGOn5AUmvp4J8DRaSPjgIZEDc36r6tuVku
+a62R1w/sIRIgEHKcn0n/5ey2GTCuWBb3ogffoRPAgn6V30e08R2mxNfG+pNPfzzb
+8geQ4Qs3BIezIhT0QHamU/saxyFQJ84VOCBDkimx1TGIgJk1MxOmVA9tfGwS1/bD
+Z873h47YSJS9NFBVICsGQANpJlqaNs5u+DtD/yqnbrHi/DpVELA0HW5zcAmFvqWu
+lxTqLzV9dcMmvwCczRV+0hTeftee1inBpD6H/Vsuy/z9OqDRCf8Iy2D1duFejcRe
+GgacCB4t3UjNwamTPeYKBXDKvDUqV9sbsaE4PFFqCohpuPdK93GdFGckMC1GPmPJ
+qM8llatarDskaOi0dvIiH418RmYECGyFqxV0jiiZY8dzcNOoN99r1fMxt9oLq3OF
+agCcOYkA1mAENN7XLRDe
+=7Cyv
+-----END PGP SIGNATURE-----
diff --git a/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild b/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild
index 24b1826a..d376e541 100644
--- a/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild
+++ b/app/text/gnome-doc-utils/gnome-doc-utils.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for gnome-doc-utils, by Rudson R. Alves
 # requires:  
-# tested: gnome-doc-utils-0.12.0, 0.12.2
+# tested: gnome-doc-utils-0.12.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="gnome-doc-utils"
 PKG_NAME="gnome-doc-utils"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.12.2}
+SRC_VERSION=${VERSION:=0.12.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/text/gnome-doc-utils"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j7"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -83,10 +87,76 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/app/text/scrollkeeper/Manifest b/app/text/scrollkeeper/Manifest
new file mode 100644
index 00000000..c655773e
--- /dev/null
+++ b/app/text/scrollkeeper/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST scrollkeeper-0.3.14.tar.bz2 546059 MD5 b175e582a6cec3e50a9de73a5bb7455a RMD160 6c39aa9c045f0685497fc7e46e484ad87fc66737 SHA1 395e50fa1e2570e97cca62374a6392e9494d5ddb SHA256 ece1987169d136aa148dc02f1e4784cbe5d1a21cf6725039547f1417e4ebc122 SHA512 0d88b344856aefa20f8fac845fd14f7cca719324d67a35f35ea47283b952a8430fa8c88501e2118b586fa0331134dc7746043ca84763509f51f8bb0897f68bab
+MKBUILD scrollkeeper.mkbuild 4726 MD5 c97296ebeb430aa31076324b101696cb RMD160 3216dfe23897ad8b1bddb7edac148b21f78379ff SHA1 d2179df734432b2b819d1d443888bd0c61702a1e SHA256 17f2769c529d3bd92a8b617aff55ec8f384ae07bb7e832eeff7c74c8339e1daf SHA512 36b1447772c7c3a8262c9e2dcfad314a78f759ba6af945f24a9319b5bd03bb68d5490c821686b1014cb014c96562daf220778b92ad58244c8a5491fd7e27d432
+SLACKBUILD scrollkeeper.SlackBuild 8604 MD5 070dd0eab0f62feadd8619619fd8bc65 RMD160 7914aa8e31ca86060a2181df0009272a110f2b14 SHA1 88002bcc5a5b838238937f7520d87d39b50263f5 SHA256 fa68ae09e227626d29feae7aeffc6a5e966f7ead07d7236b750f74089fe01757 SHA512 dc5b94f3f64f1faaf8b532dc9b6dc262962b072bb4b24752e89ae588fbcef22a30502f92a15929216d44e60d8af18fc2023f1bba1f9a694e2d610b190ca46505
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYOpAAoJEEHL93ESzgeiDjgQAIyBiGMvp2kxWAkqJrYIlPVV
+70cDncqWkxho3bsQwmP/71s4dvkFhAB2yhjeShAU38k3zihBnOko3+GWglIfSZlc
+2++7ePH9x9Gh6g6KU3Fd0H7OSNqhjpNglniEkHDL+plRCq+NxQROT+6LensQYr/W
+zzSn3rcTzDgrJ0RGrlafbHFUXXJJZySY6LH/BaKKQ2w7Hv8JO9AQfWMih0yU+bKF
+LNLuXtNv8i3qGWuzYkwH2uPS8wgHgvdXk9MjxEDccqLxBILchzhjmbPwOwyVrjKL
+XGbjKT7y/+rG9O8GIBVVxk2tVxj4Pfpy7zO9n9wvG3hfHZxgxrAgcRRawJYTudLS
+khhRlRhzHKq6Mmw6sywko62k4oEDLV9AcMQ2mG79VOvdukxexjKks7pYQvMMFJ1t
+N2nL+I1JIgEcIDGtFJc+BVhd5nf7EGEPmP5GZsVDcVPWzJ70J/k0vH+JHMoBVSQm
+8NL2PgOpJhYua69J0ga3s3fmrcvAx7nQZobjpGnsdRN+jtFhxuB1+e0JfwOa3pKu
+PYfdKmdHd3SfmCbqAghz9y/Yz7XT5AihGQCGc2R+ERyhRyV0n/aAk1UEb9el0uBY
+jiMKsYfPTbih5fz6stMzkAFJWN/pllmBWIRvHvecWJQlLcjnqq6DL+PZrH+/28jO
+pFAlSChq3i2Ld51a10dj
+=7ixj
+-----END PGP SIGNATURE-----
diff --git a/app/text/scrollkeeper/scrollkeeper.SlackBuild b/app/text/scrollkeeper/scrollkeeper.SlackBuild
index 6b19aead..3eca6818 100644
--- a/app/text/scrollkeeper/scrollkeeper.SlackBuild
+++ b/app/text/scrollkeeper/scrollkeeper.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for scrollkeeper, by Rudson R. Alves
 # requires:  
 # tested: scrollkeeper-0.3.14
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -33,11 +34,12 @@ PKG_NAME="scrollkeeper"
 ARCH=${ARCH:=i486}
 SRC_VERSION=${VERSION:=0.3.14}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=1rra}
+BUILD=${BUILD:=2rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/text/scrollkeeper"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--localstatedir=/var --sysconfdir=/etc --program-prefix= --program-suffix= --disable-static"}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -83,10 +87,76 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -142,11 +212,60 @@ scrollkeeper:
 scrollkeeper:
 EODESC
 
+# Move config files to .new to avoid overwriting any system config
+for config_file in etc/scrollkeeper.conf; do
+  mv $PKG/$config_file $PKG/$config_file.new
+done
+
+# Add a post-installation script (doinst.sh)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EOSCRIPT > "$PKG/install/doinst.sh"
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .sample)"
+  OLD="\$(dirname \$NEW)/\$(basename \$OLD .dist)"
+
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+mkgroup() {
+  GROUP="\$1"
+  if ! grep -qe "^\$GROUP:" etc/group; then
+    echo Creating group \$GROUP...
+    chroot . /usr/sbin/groupadd \$GROUP
+  fi
+}
+
+mkuser() {
+  USER="\$1"
+  if [ ! -z "\$2" ]; then
+    GROUP="\$2"
+  else
+    GROUP="\$USER"
+  fi
+  if ! grep -qe "^\$USER:" etc/passwd; then
+    echo Creating user \$USER...
+    chroot . /usr/sbin/useradd \$USER -g \$GROUP
+  fi
+}
+
+config etc/scrollkeeper.conf.new
+EOSCRIPT
+
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/lang/mono/Manifest b/dev/lang/mono/Manifest
new file mode 100644
index 00000000..c9f6e10e
--- /dev/null
+++ b/dev/lang/mono/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST mono-1.2.5.2.tar.bz2 17878783 MD5 50b379ce60c1550dcd7be50bae25fa30 RMD160 3eb2c11762dd2e0e870c9ee718e29cb0a2195b17 SHA1 006a9e2e6a5abc09a01a9eb65af4b39a1f683701 SHA256 dd8205a3ce616481352e9c17c61f84a7249850c1b394024758be240c62fd06d4 SHA512 afa1e63c5a77c8481b34e40443a5c56f1eb02616d1c6446bb194016ab2fd2bf50a6a570751f35c7ecc46a644497b6f05073308f9eb7a6d2989b68b8066096926
+MKBUILD mono.mkbuild 4067 MD5 32f8665d0748262cc76e6cf7c3a0b1c8 RMD160 8da6d1025b99ebd749e09c29ad8dd9a5c59c7f20 SHA1 17d3ff4466f58b70a4acb64e53d00c496c637527 SHA256 636b360db1ba7c0491802b8bf09b7bc04cadfbb949f537c60e8c9610e127fea1 SHA512 2ba133666bdcd3d98acb527c39736138703b9205f5de2f98b7d81dfb14ea3928c280d8d98ae874751e7d9615933e472d1558768f4d74e6de1b1ac64bcb3d3d0f
+SLACK-REQUIRED slack-required 121 MD5 de54a14ff1ecb019760d8799776b2af5 RMD160 210afb25239c1bd199885e3cd6f48e5b8a41b407 SHA1 14ae3a97491b7bdb8ac5ccf6ff34dc86ed1eb657 SHA256 a573a7422b5422722342efba9457620d2814467106814c009e57c59e3b8277e3 SHA512 d81f5cd654bce9213dfacbb45b7ca87ecf61cf56c78751ea7bb8ea2fbd7cd0e5d74c39d495338e78d8f914f60e08b259179b6b431caeddfea7c3d7a72910a607
+SLACKBUILD mono.SlackBuild 7258 MD5 e9450589cdfb54eca052657e4202d73c RMD160 6646438979dd2bc5a0228a540a1c9bafab97df58 SHA1 57bf70f71d92f55eee85e07b2802d04be44a393e SHA256 b4920ebb8e94d990ec5cbf6c517a39c03c3df7fd44cd003b1eb6f67a42b34eb3 SHA512 b48f4f2d8274f17eaf40008fc01be54ce2fe1a145bb002263c016f71c8b9c7456879fe0d7f3693371e06452c99b0e274aefe27bd2e4353a2b4f17cd7d448fde4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyawRAAoJEEHL93ESzgei7AEP/iYxrvpoYwErS8dzHNFl5gWH
+zOjZ554JBLoVyoBPt1Iey5LvbYtRs7fHaEmmWrcHdbrLaja3TAbEitYTyjwI1dQD
+4m4DNgYLeFdvhSaSwGqNGUj6VRvAdrNfxdKPlYQt7JZcgEPVnBId528LwynA4ff+
+gY0W3Y5Bt7uDofKu1k6Vm428lWARrwGO8/DL3axWNXq5+usoIT0FgjvPhu+B2hlL
+HRuf3l3a/Ofl+xv+PjxEwt0ubjq35M1bbp3zE1jjHx+/xV5cgwmhakMRr21w7KeF
+8Fdoc01JZEP/GyDVoXpJ3YeI4Db1xI1NVq4d3pPT4kVsyhFrD0JO8SHqOpvCvUdJ
+EYT9jNBPQavx6HJ8gY/M2vt9YrvqRpRHJQxt2Ogy4HQ1CTfBjhRcSIaUWot+GqH+
+0A3//7lKMuvO5DyM8eQR7h17CZkBW3Rp9QSQDXeP9d9JB9B+JAwP5iJpW6/h3nHd
+BdxGFFHyd71srdamMfL39SFpU6bI7pT+QGzoPlOQd+Twsr0oWgdwFwj8aLCNYB+A
+syXFk7bpyT7EuR3IqWjqBXgXTagRraMTwHF0HlUOb/tccv69trEY7uxCIcoKhB3e
+o4QwYwcRM6jog0b/jYAJFGBQGHo8tjbx3TPDQTsQidAQbFgkF1cgFdJRNgU8Eq0g
+3GfEsZkMSLI0RmPSW5Cq
+=OJ3a
+-----END PGP SIGNATURE-----
diff --git a/dev/lang/mono/mono.SlackBuild b/dev/lang/mono/mono.SlackBuild
index d5b06030..93c619f1 100644
--- a/dev/lang/mono/mono.SlackBuild
+++ b/dev/lang/mono/mono.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for mono, by Rudson R. Alves
-# requires: glib2 glibc-solibs zlib 
+# requires:  
 # tested: mono-1.2.5.2
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/lang/mono"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --localstatedir=/var --disable-static"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j7"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -150,7 +219,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/dev/libs/libdaemon/Manifest b/dev/libs/libdaemon/Manifest
new file mode 100644
index 00000000..bd35e7d6
--- /dev/null
+++ b/dev/libs/libdaemon/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdaemon-0.13.tar.gz 368119 MD5 ae9113fcd825d5a7f07e5ddccb3c3102 RMD160 7fc41dc7a147d969b29e5a359442716859de7e0e SHA1 2c67eedf0dfe303a86bee64feba3e40d21abbd01 SHA256 bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709 SHA512 eca6f99c87f33a48c097a9d3f1aac80b16951b3460fc6258cd26044bbd1c87973397eda27ef70c77ce3b48ccfaaf459cf1e770f782d7cdbd31e5fa206b502bea
+MKBUILD libdaemon.mkbuild 4180 MD5 9dba3d21e90203dae6b8db8177239abb RMD160 ce91e1bf2a1d75f37b7586d3fbc6298bd6e67f0e SHA1 249da12ca2949db6dfab4e01085b5099ceadf7f1 SHA256 2def35f64d02f48099d5ff5eb1f557e510d5d137962c6cc8e46d1c8388a53a2f SHA512 5c75e83130e9bd89f7dd0fd5c94e5f89c85bfefdf146af0cab85b0ff21935d09a3f5c7cdf5e02dcd32a0d6c4834dad284865c293beb2664f3a07b7c74ebc40c2
+SLACK-REQUIRED slack-required 86 MD5 5a1df0e2493926f9757c291ce4192864 RMD160 5e54359f4d875cd5e9d9891c8118d9abfe0b012e SHA1 b090fe004db80dd3ef9c42050f1e12a1a0509f06 SHA256 e3a1906ec64055f4b48eb68d4f09a4d451a58febfe7a1720ac3f6d46a561efda SHA512 487f4ae74b1f18410478eeb9d7ed80a549ee5bfb459c7585bf0356d446f6aa00a29424f9c55134a5bfe81bc4495b8cec07c0e3d432de024ba49f965f59e9e35e
+SLACKBUILD libdaemon.SlackBuild 7427 MD5 178d7ea9f75f319e1805a07e862d8fce RMD160 fd7fab26686ce0ca43cc9c1a214fe64c39344245 SHA1 7af4ecf62d32a1b097097d8e058cd291d1cd8a07 SHA256 fed70a851c94515126752231ca04787c52bec206c3c7c665eef23edd56d8565d SHA512 fe17f71d077f2c6f2d7f8435570b09eadf4171f27d79125879937955dbe5d677257a24c04c33d9ca3d6ddfb658f31417e566bdf9f0b44492de068826c8464475
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyappAAoJEEHL93ESzgeiuY0P/0H7G0mkh+fvbQbJIR+7+5T8
+eWUcwYJjy6vJbuC+uUQTMZWeP3PsG1RR1XqI6zULboYgAiFUcb077fXErTROuCdl
+pmDxQFXjp8i2SVNypospx+L6fzYjFzePg2fnh0zF5ZzQ4knFApnpxcLM6uBPs4GW
+GOfx1yGzEsAZY2Hvsv+PmGqFzbYzCsq61v4VgpkCwuZz7+aOaJUcTenuZx0U4MXt
+OUEl87lKypGDDElscyOVZvkdx38mR67/a/F8VwJmCyfB6w4/b/GVJyf89mkeq8wY
+MVGI3wg6nAEQJL3IL2iwQDKvhsAl0ocasa/yjOZsVn1RdwTi0ZPwpaX6XmqMd2ni
+Pp2VveqBMIkh8ns2eqWgzPpWEgbfVV4RSOBGiQZ+pqCweirUHPDAExFV6C1GCSzJ
+++ajI3tjZC1ISk8loBiqkBuKLBBPeuWT/eoxnmHyXzzEVR2fbduqwHHtF9/TAYFj
+0uOTAg2Jp0D4QtjFygN4AmgLVk/Rae2AgrrhO/neKNq0YsCTrF69LEQXn3OvS2kX
+00JSVUfPmtW+jeD/crsAsU/D4G1Ul38yUV1/bD2/tsefoSwi+Jgu6N5cXVHVnC68
+1n8bEb6GKJVNlra6t8nS7s9uTS+xNxsdFktlIRT35A13R6II4oW9j+SFtxC0PE36
+EpVWju3urArF95Xxurui
+=FXkd
+-----END PGP SIGNATURE-----
diff --git a/dev/libs/libdaemon/libdaemon.SlackBuild b/dev/libs/libdaemon/libdaemon.SlackBuild
index c3825f3a..6244a144 100644
--- a/dev/libs/libdaemon/libdaemon.SlackBuild
+++ b/dev/libs/libdaemon/libdaemon.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libdaemon, by Rudson R. Alves
-# requires: glibc-solibs 
-# tested: libdaemon-0.12
+# requires:  
+# tested: libdaemon-0.13
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="libdaemon"
 PKG_NAME="libdaemon"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.12}
+SRC_VERSION=${VERSION:=0.13}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/libs/libdaemon"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--disable-static --program-prefix= --program-suffix= --build=$ARCH-slackware-linux"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -78,12 +81,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://freshmeat.net/redir/libdaemon/41781/url_tgz/$SRC"
+URL="http://0pointer.de/lennart/projects/libdaemon/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -151,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/dev/libs/libtasn1/Manifest b/dev/libs/libtasn1/Manifest
new file mode 100644
index 00000000..d93a77cc
--- /dev/null
+++ b/dev/libs/libtasn1/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libtasn1-1.4.tar.gz 1552101 MD5 a733ecdfed3517910e627d24e050979f RMD160 8553984f8992151b1086f6b3d7196a3916e61edd SHA1 684c9dc343b0155a074c2127ac8050f983528bc8 SHA256 84aa37835fe4f967d3b7cb6037d101db5d507b637af0050d6f92913128236196 SHA512 37d9ff9726ecc20ff07a2acded3a2e934f8f0eea5827745f2b61b99c5865df5392f24574fd08d098538257f2891eb811c6b1b86c2f1874ddbafc314ff540e4d7
+MKBUILD libtasn1.mkbuild 4203 MD5 4e0a847152bd1a11edf69c315c37dc30 RMD160 18396722462afc26a9bfa2c29b2388569820e6ec SHA1 4e6c261c48f3e53769c831233340a0a2ac1ed0cb SHA256 7c70d303de353b5023f89a20d5468137e27656efdf9bc9e82756061487993c20 SHA512 b594a9a5428ef20182b042915f6a34c265104af61669b053d4f2720f202a9a37ba9c37e7681ed8b369428990e7c0a09a902ff0297a69907aefd1fb89d687d918
+SLACKBUILD libtasn1.SlackBuild 6902 MD5 e3e64c83dea129a8854f0d38bebe5380 RMD160 535ff602e90fe6b23cbd26d7613f114c0e7db3d8 SHA1 b2f528e260e5cffd823d34d8f73daf6d6827ad20 SHA256 f12fbac5c35fbf2a8c8e26d0439cfe06574122fbd3d3954a0e5e03f2acc48ebf SHA512 5de6ab48852096ee4025021d010ce759b74837da181eccf64819870be6a0feace1cc544cb90a12b6962116224aa03ac9eb539b862af320f0665313e4a08eb03e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZHZAAoJEEHL93ESzgei93kP/iYxT5oricVdB7Luvgxiqbqf
+kI4z7iq+DZ2NzI6grMGd/5XEFz4iLdDU1W1I0ZSC6DNekrIGNtQESEXJEvuOIFxZ
+ecxr/t7OIhR4OoluLoqxUbZ/bB+BqcyTj/n+eTmP3QHFtvJTH+CkDLzVzu5d6KrD
+kPrBlfSIlVGcrq/MF9AOLfAY8UoOwUyESs0oHZK2ujL7/TjSBCTeDXsErScANDtY
+aKbJXTO8Re4R2HK8W7UFF7DZ5A1d9Z8/LRmjgBR/B3l3iwQDLHfauvdyHKsjbeYr
+B5iOvse168CHINt9aR95/YtujPqMufTWOvUBecK72b5MA3YbpknKqMQfVmJaU0bt
+WrRuhmAUl6PDS0HmqjXa3TLqY4gHbdKxoHoGw6T0PPQOQIY0EOsiYDIWFZErnc/t
+TIOYyGHyByP8oS3hYsuxmYZ3XO2kC9V3Kc5akXc1T/n29HPxAcGlsh6gKM3i8d5T
+8EZVEIjPwLAgvKiF7vHkve1bnIe6SAnUDoU6PjP25QFYrKBdRmn4pXw3+OW85fPx
+RZhcZrF4yLaQX6kLCY8YnQXGt/jJH50peD6qTDC1GN4WlMhy/1OzNweCBuCmZRxi
+SV9V88CIRV9WQ2206oMwmGOKh6BRSdk1Ej3aH7XsDZpgMNlPE2wMSOc4YIQeQgdp
+kwC5AIkUunCizdkH/Z+R
+=b6ZM
+-----END PGP SIGNATURE-----
diff --git a/dev/libs/libtasn1/libtasn1.SlackBuild b/dev/libs/libtasn1/libtasn1.SlackBuild
index 32da0584..72c1b594 100644
--- a/dev/libs/libtasn1/libtasn1.SlackBuild
+++ b/dev/libs/libtasn1/libtasn1.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for libtasn1, by Alexandre Vieira de Souza
 # requires:  
 # tested: libtasn1-1.4
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/libs/libtasn1"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -145,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/libs/ptlib/Manifest b/dev/libs/ptlib/Manifest
new file mode 100644
index 00000000..5667947a
--- /dev/null
+++ b/dev/libs/ptlib/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ptlib-2.4.4.tar.bz2 3009442 MD5 221ea2f96ff6bae9cf604d8766eae526 RMD160 9a84d463bf203b1619a9df5a67d0fed80b182acd SHA1 a6255cc6f2fb337518a9c49d8ce21f1790729ca7 SHA256 c9ef4267490507fc9699634551b50c0c1c225d48e0c095a81be6fa5a1fa96a3a SHA512 f9d6295025b999b1b21e60ae9f636bc21ff444a1f986bf79cdb4af21a7b36862062d0f44d2dd98a278bb96df1a5030997b082c294bc873f1720500b9a084369b
+DIST ptlib-2.6.1.tar.bz2 3296212 MD5 122ab96fcc44110ce05153f259b3285a RMD160 e7bd3f954c871725b269df0ab7561ab0fe6a23ba SHA1 b269a20f1bf98130e0088eea6ec5689197cf5521 SHA256 b8301389c1ee9968df8075942061665e33198d3865f92d8fb26e519068517305 SHA512 f074213ad00f7fbc60c8cd0c5008864acffbe45234bc267e6a152dccb9d6ea3c9d4ad090be149884aa0abfce2018e58ec3c27134c22edd11931c2ae623055cb6
+MKBUILD ptlib.mkbuild 5065 MD5 0c9587a722b4c295c41144a440ea2694 RMD160 9604fabe6b5785729d9cd367973f846997411e90 SHA1 22db177fd6ad32ae7dac061824adb1fe23997d25 SHA256 9b05ddcf3a636cd5584f7a34b9add2a02d955291bf0203c665bfd0f3b75f90d2 SHA512 44d537ac329833eae09a6678478fbb0b6b1376f98f308a2e53676efba9eb793bd0c97283006796e884d2660f8bbc3f1c9f55ea2c60193c9b2438f6085bb85126
+SLACKBUILD ptlib.SlackBuild 7115 MD5 76f3b88c695ff164f5df5c7c2740cfdf RMD160 d438bf405ff6f1dd4047606227370b6282c57d7e SHA1 4807bfe66fb071a4e20ffe8297e97a9fc7a5889e SHA256 273fc5aa8c9d5dc7fa3b07467e6aa969c287d6f9e42e29af10ce6bfa41ecef93 SHA512 a5bc98a0ec0e8591031667f256f73875bde964977ee710c3aee76ec5678a6e639b265fd1967c6082c1ad35042e814b5b91754b957f24e8e285489cf08e0f44bc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyjDgAAoJEEHL93ESzgeiTeoP/3AqYqQ49nwQxA5WSo57APxD
+SBEKJAXfB10TpNt8iYWzOxoQgkSX7xMS9C3d6Z4COzzoLnsSPdVbOBHDCbO6XsPU
+7+rfAwk2w9ItpDglY0WzDc7J/ggmpE1w+ixysOM0twnE7QmwJXorQtbzE63/KCxA
+AAeubvmGpMlTbzqGvrRP/m68b8ts1sJkaeHnA5ZsFUazNyn7TNSF27bhTq9ZMLLo
+GEHrmquJG27BvSEVJyFxgAJhVsSgo/5u+75WbTIr4x3DZXKdO8a9ucUIwomBn97k
+WAL7w3OeahKpfklS33pnIOtB7P9XWTrma7S6Z/J5Rra61Dm6ZBA0X8NfuNskYoUQ
+68+RXYRmnx/x9uI7FWs3kJwnQdTKp8cwnVTQWoMdQ5fquNRNCPoV/zj72AD5M3Ox
+TNgNebbfCqfKgBt1gytsZPlXbudOeugZ3/amfWhzMSoEAIDDE+f7ZpLmkArGPiRL
+7CUnn6A1SVvaphyySEzLR+jTmCqHjw0fBZUduU3xeVrT8EmLwtJwQyKf9P+F6tC+
+dVTJIwyHiuzk7uVO07echHbrNNx/AVBzYZsVWAzwC21J6X1xQCpmBLfK3Jdkjxue
+vqcSg3OKBel54bhBAJkOCMSUHJ1sO9LMMEV0pE0mlxui/vcpWIkatq/CrloJWidJ
+9sjTJCp7Ov5g1Ekz9RC2
+=GDN0
+-----END PGP SIGNATURE-----
diff --git a/dev/libs/ptlib/ptlib.SlackBuild b/dev/libs/ptlib/ptlib.SlackBuild
new file mode 100644
index 00000000..b687d2de
--- /dev/null
+++ b/dev/libs/ptlib/ptlib.SlackBuild
@@ -0,0 +1,223 @@
+#!/bin/bash
+#
+#  ptlib.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
+#
+#  ptlib.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+#  Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# slackbuild for ptlib, by Silvio Rhatto
+# requires:  
+# tested: ptlib-2.4.4
+# model: generic.mkSlackBuild $Rev: 796 $
+#
+
+# Look for slackbuildrc
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
+  source /etc/slackbuildrc
+fi
+
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="ptlib"
+PKG_NAME="ptlib"
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=2.4.4}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+BUILD=${BUILD:=1rha}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
+TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
+REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/libs/ptlib"}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:="-j4"}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
+fi
+
+# Set error codes (used by createpkg)
+ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
+ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
+
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
+
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
+
+# Dowload source if necessary
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
+# Untar
+cd "$PKG_WORK"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+cd "$PKG_SRC"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
+
+# Add package description (slack-desc)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EODESC > "$PKG/install/slack-desc"
+# 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 ':'.
+
+     |-----handy-ruler--------------------------------------------------------|
+ptlib: ptlib
+ptlib:
+ptlib: PTLib (Portable Tools Library) is a moderately large class library
+ptlib: that has it's genesis many years ago as PWLib (portable Windows
+ptlib: Library), a method to product applications to run on both Microsoft
+ptlib: Windows and Unix systems. It has also been ported to other systems
+ptlib: such as Mac OSX, VxWorks and other embedded systems
+ptlib:
+ptlib:
+ptlib:
+ptlib:
+EODESC
+
+# Build the package
+cd "$PKG"
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
+fi
diff --git a/dev/libs/pwlib/Manifest b/dev/libs/pwlib/Manifest
new file mode 100644
index 00000000..30c8d4fd
--- /dev/null
+++ b/dev/libs/pwlib/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST pwlib-v1_11_1-src.tar.gz 2327497 MD5 8b7a7a2ed8da6792006922476dd3b2f3 RMD160 434307ecaec5c7c5a145641890e5f8287a17689a SHA1 1cdda88e2de3be0186811d466052569b3a771668 SHA256 a909b9d52ab19ba516f31e96e5875e6a336810ac929eeb5ca13f95b0e7b8572e SHA512 64d19ac0a6c36b4f394bc5211245deab5cde8d05edd0f59a34000a6234f4bdfdcd8ec1c78ff88b59ced40539d93688ab18d6e3aafa34699ba93bf32dcb7c7400
+MKBUILD pwlib.mkbuild 4274 MD5 598b0c6fef77619657d6a3215c55fe5a RMD160 5f8084f36f84a6b008154d9d3dfe7d53953122b1 SHA1 40ce70eeb429f0072dcd3a4fe09e8040dd5d7e9f SHA256 a08de32d79ecbfdc5d4da9174a00f106ca47a284d9504490a044fd2b69450933 SHA512 811d84ea4f862b5ca8a9fb0852d313f955aee4f32578162d214e08b5559ecda989ebbc29a6c74295957234ad45889c4b8f50b7a997d8dfeae3f7e5b21a401ad3
+SLACKBUILD pwlib.SlackBuild 7060 MD5 051d66dfcfa3c5f803b52b65b30f3dc5 RMD160 49406db4996cb4d8988f032dca6aa6db8bfda4b6 SHA1 179a72a1506e8368916f3679209fcce08c7942f8 SHA256 8be9e8d0980b5a0f3df631007dbc70d98e195a3ba2b40d6c14ebd1a4bc14c0a6 SHA512 b5b0361c93a77e63be77ac283c2129bcbff21acd7683825887664c0902ba4361cda5fbe3e098c94566cbc343a33f1fd37fd300f8582538292661f504aebbb26e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyXaZAAoJEEHL93ESzgeiB14P/iS/ZewLyVUg1Ds5TIhS0nbg
+Ie0KQIqjvZ3vSAWoSrBfueTjGJRqdKh5NKpDQ2lyBIZA1bD1vdRb9k/4B9T9K3DD
+CwPQ+AoqIAGr9/rpONb4f9pM+F8zsA6n1kx99uyqa6fQMBvTelw7GR97keNEQiFT
+4UcvxBeh1GSUaZO/jTDIQS5fO0vsnd6etaNMkiGTSR8uvBdnbNShKJ//ye6qGzsI
+9YJ+4pCxlcad4WJPrxDQIg9wEFy9gxbt3HR/c0YeDF2rz83z0W3naJuDm0cVfFkc
+g9kZKUGcyVAY+x9fIx/9Er5tN1bw5uy/+iFiZ30qNxWaqbHN+bXlpmSWxU8N8GHL
+xRYO8J+KG1x1q6vwmNK2x1/Pj+exdpYvy6v/B0++XTyYlDp+TOzT6w9Zd5e5CeqG
+euGv3dtr3afDzzBLzAFD3eTbQi+yjBB8OAt6VjP/HKpGQ/OeFib5kN5gODwvCUZe
+8UOLGB16IhqsJLdLnnpw0YIFeM/GShxsCl6GKWbpv26TPbByF6AuAX3vi9FgFSHl
+NpJb+wICAkXONuzwEj43iEO2iRvaUOud1V6rhZspv4tz3dJ3D4W9PjRp+olhHd2x
+BuLWC7LvZ1Jw9BpEdQmXBt95YjDyD+kkR//vzYeR2LFlV0ddPNUR+pXKuddZUCVz
+z+fmfQCgRuxW/Q4Ythuc
+=9Ncj
+-----END PGP SIGNATURE-----
diff --git a/dev/libs/pwlib/pwlib.SlackBuild b/dev/libs/pwlib/pwlib.SlackBuild
index 3c966f75..8c686be1 100755
--- a/dev/libs/pwlib/pwlib.SlackBuild
+++ b/dev/libs/pwlib/pwlib.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for pwlib, by Rudson R. Alves
 # requires:  
-# tested: pwlib-1.10.10
+# tested: pwlib-1_11_1
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="pwlib"
 PKG_NAME="pwlib"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.10.10}
+SRC_VERSION=${VERSION:=1_11_1}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/libs/pwlib"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -76,17 +80,83 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://www.ekiga.org/admin/downloads/latest/sources/sources/$SRC"
+SRC="$SRC_NAME-v$VERSION-src.tar.gz"
+URL="http://www.voxgratia.org/releases/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/gnome/base/gconf/GConf.SlackBuild b/gnome/base/gconf/GConf.SlackBuild
index 2c62a142..25234d71 100644
--- a/gnome/base/gconf/GConf.SlackBuild
+++ b/gnome/base/gconf/GConf.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for GConf, by Rudson R. Alves
-# requires: glib 
-# tested: GConf-2.20.1
+# requires:  
+# tested: GConf-2.22.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="GConf"
 PKG_NAME="GConf"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.20.1}
+SRC_VERSION=${VERSION:=2.22.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/gconf"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j7"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -85,6 +88,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -152,7 +221,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/gnome/base/gconf/Manifest b/gnome/base/gconf/Manifest
new file mode 100644
index 00000000..5f76e973
--- /dev/null
+++ b/gnome/base/gconf/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST GConf-2.20.1.tar.bz2 1404919 MD5 646fc896c6282a8f103365af0fa2e303 RMD160 743bee341731402e5d4938ee030adf4f463d9a52 SHA1 c628e2645a91b15749f1ebacc62ea685cbfa681c SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838 SHA512 1eec3d2e20cd0f2d873fed58b6e90da264fb35dee79217a84167d34add4744467bae03fdcd35df62114a09f039786723d84e27b48e8c4b3c4a318bd5dbd126e3
+DIST GConf-2.22.0.tar.bz2 1416685 MD5 a56c043afeb1052abaf45407409b0331 RMD160 71f0c6f20882681efdffc957f6d86affd4a29a80 SHA1 2a9ca649ef58394e425a030dc99b863b499a8a56 SHA256 54e40cf047eb431cdf994f763ae840107ed6e9b8f9521b2b2eb07c7a55f92ce0 SHA512 8e7df5414fdbbaa044fad229d825f46a750816890db1f73db9f76d52c28eef6db6c825328cd015e10be3c1c30624dffacd79e36baca4a1d89a414c2c66a1d717
+MKBUILD GConf.mkbuild 4228 MD5 42b77417a82f780d1b2cbd3be052cdf4 RMD160 e4dffedd8e3c5e3977553f60a56b80b6cccaa311 SHA1 254f7ead22efe9d7b221675549b68c9e9f6ab0d1 SHA256 20a9509e9b86d61284fc3e26e769a696904aa3f917f56f15a9230f8d7fbce5e7 SHA512 bca31c993fd6929947849bcf14530e761d08a0212ddac0c70022ca48337805438d05c08527f8dea67cfccdc4dd44392725a6ed3a64bcdbd32518d47521ee9814
+SLACK-REQUIRED slack-required 85 MD5 52db12706c4e6c7ca99a364ed6041605 RMD160 a5fc1fb14cab158d3579bd242716d8c92dc2d109 SHA1 c8f6d2ae1187f71e57d902f1bf549695aea07e91 SHA256 5634a2bd16b5d24dd8915d917268841781b27d174ee80db96d0f3552b0d492d8 SHA512 f37f9edc3833ba691cb196aa0364c3e8ec1bfc6de3158c045588b972bc0aa985a1698ab6dd75239f813f33e954f7cd85fe8439afb7e389f47ba6d8a52ad274d8
+SLACKBUILD GConf.SlackBuild 7279 MD5 c23230773c30e8ab5f3e5dc00003289b RMD160 500fbd4475793ad3544d92025f2ea9533a09bd8e SHA1 e652c78a547189e23bd21fb864fcf0222bdc6ea1 SHA256 1aa54fec295244b5e12cfe03c2ffc1ca67c37ae13b666c1ba616cdae8b2a0d8f SHA512 ba4b80ee55091a053486ccff3095a1a0a1e3a62b18a9c7b223efddc23eb43312b63b68c5ae8bbbaae8153f1447d4bc71b7f712ad05d0e5f87772ebbea41e99f6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyjs5AAoJEEHL93ESzgeiHRQP/Rx+43XBDKumWu+zHwBx8SRa
+uQDUJ6YC9asjqDeerGsnn27kT6ZlWdxlnnYu5VObNL7f02XGtQgn1768Lm2Z1CnV
+cz/m2+u2j9JvIwu4WC93dl1HDDZUTtHNmXzY1d/8HtvqVDm/9wxhuRvYVTPJz1gu
+DQpeYpdBBkOsjvjGQsI9qrfpLLcmZHWv5ZqE63IlblgKyiSQi6+Q7JspYSd+HOxW
+YkvrKljBvLSA6T/CEjs8xa/Qs4dDZ6HHPvjDYYrSoy4Y1xqXM/s1oBQI82VZQlnA
+VlsfxPUfYBYfMHGEAugtcEzPNO/lot2jZf8h19RRScSTsKTpqyGkiRLLOgZeMibF
+u/kHD0pSujnpahl0FaCiT2PUGPNLWtusJkiFYx/R3gqeS71JhYHyVBocN89mPuD1
+lkc6ToX+2oDLuTPZUqIjya7eUK5zOpz/0JOpwKAiRnXck1uZAhIGszY2xgKMUCAW
+mYrzzAFtJVPekZiizBNnwSmmLGRhOvqJs3eZhnqk1UaBhP+6ZNoBgEIsTcUBp0FC
+jKPu3/oLbjrDHIsToPi4DwIF7JKuDJJZba8RMvRChlZhi8VZisvMffQyGU+GDIU5
+eGLceViAgLj0Q97hti+1J2MBKgGB74yG9FeMyY+aN6VZ/Jm1QXXtmROogzR9bBfR
+Urtgz7Ti/JJLF+qwyiAe
+=rR8c
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/gnome-keyring/Manifest b/gnome/base/gnome-keyring/Manifest
new file mode 100644
index 00000000..873601a0
--- /dev/null
+++ b/gnome/base/gnome-keyring/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gnome-keyring-2.22.3.tar.bz2 894308 MD5 f9e5cd9efac383076aaefc1086520656 RMD160 551f4a4d734e0196522be9276ae7e76110a96556 SHA1 0f52095590a684920cc683d1985ac66263702114 SHA256 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6 SHA512 4c0d16dab23a7152426c6621f233286c97269d15577a7031cd3ff201509c7f936650d8a933492f4968481c94a9f7a6feb96b36db47fdb610dd63984564c4f70c
+MKBUILD gnome-keyring.mkbuild 4453 MD5 09a499f7b10b242b43204d3207dd3dc3 RMD160 3666b8bf3544fccc93797410b57cca4e5065505c SHA1 2c59dba2b42381abca7cea318720b6c49f815676 SHA256 c9cbad9cf41458ec27980b10bb96e036b000496ab48a9e46aef20e7fe5ddba5a SHA512 dc897799f59050b946affac8fd701e69fa99bef96a6466cbb345ea16578f90eb294700ba58779a2a8cc432d3d71469d79b4fc59fdf82b91dea2ef97c78e67983
+SLACK-REQUIRED slack-required 109 MD5 822d8cf1736e9f2399afe433d3808050 RMD160 0c7752e0b040d5f9d1395fc478b945bbda61571f SHA1 1b3e732d845c3d8d3292c71979fc0049c415fbe7 SHA256 de234d75bdc0de6a5e645d49b3740cf715050e5a5a8eaa404f56405e8718fcdb SHA512 797a10478cdf4b7275df98a2472af1bd4806dbf490af7476a627ef07d1a022a85deefccc4d8b54b9729fe4d3452cc3b5b32123d8c647679423457ee779a2d637
+SLACKBUILD gnome-keyring.SlackBuild 7270 MD5 dc8c77877e5f612b9c870d4d902443d2 RMD160 2f75d42437678917fa66449147404265743e8d88 SHA1 61de0a83b587160f766b1d6d7ddeb2117a60b811 SHA256 631117de94cffb5be96c977a3a9d84ffd277413d8538ed1b993b3ab52abd1079 SHA512 f9b0334bcb92dea8290ff239bedeff2a9b57fdfa8ae29e7c0d6262975cd395b9f7cc35ae7719588b92f1b8e8561cbb4416a7ab324debc866935b9526858fcaac
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZJ5AAoJEEHL93ESzgeiJswQAIqygHtIUeKtMnHgpzvF4i2g
+CBW/9BXievdgiUt3SrvX0lAOgtObXYFVzl6xLp12Qn1uXtfTdkbKLoLcdg4B7F5A
+DboIX5v3KAT46ul0Cnab/osrWyU8Nn02dD4a8cRmm8OrFtIuMhAXlk2PNzBCy7nF
+sa8p9Bq4rN+7XCDXAP9CiEOzBwHahpKb7RDbunho0raqOKrVeOOCTATSalVIFJQ4
+kFaQKtRglVOUoayxsFpq+Y374VC0zy5UlCV7dCdyiQY9vrshO2o+z4YcFrAeugg2
+mlGhn0jbZ5X9/Pr71DVevNRVXb9u0lH4K8cgeUOJFyXs3nrach15HzL0holHNhM8
+f9KwcDzjEJK9Y5pEiG7xV+VIsAa9K3Na3bBaD/xSXSv61UjrduQb/jndf5KerJSb
+867+4coFy7s7zJh2TKYWCI+dHh+dkWN9wqt2+vs5cmPbDP7kYNLhtpvv6ZxKMVIS
+yQ7X4w1MYFobw82/vbOJWJVcFeNZ4iZh0La7hDYMU1iYvKO0LbsR3BbSq0yvBo+F
+y3FdB0JwE+m7uKL1SpTwVwwqaoUc/v5h0ooP0cZbfovzrZEl48McqO0d77NlO3Mx
+HdVIgBbyW5ULg9OgUa6qGjfXjtPSxePg73OUIFJtsI+LXQVPI1gwS8OB3Zuc4hKX
+lhqTc9cNP/7lDbdlJMQG
+=bpWH
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/gnome-keyring/gnome-keyring.SlackBuild b/gnome/base/gnome-keyring/gnome-keyring.SlackBuild
index 968b44c6..18f9e65e 100644
--- a/gnome/base/gnome-keyring/gnome-keyring.SlackBuild
+++ b/gnome/base/gnome-keyring/gnome-keyring.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for gnome-keyring, by Alexandre Vieira de Souza
-# requires: libtasn1 
+# requires:  
 # tested: gnome-keyring-2.22.3
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/gnome-keyring"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -151,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/gnome/base/gnome-mime-data/Manifest b/gnome/base/gnome-mime-data/Manifest
new file mode 100644
index 00000000..186a4cc7
--- /dev/null
+++ b/gnome/base/gnome-mime-data/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gnome-mime-data-2.4.3.tar.bz2 563654 MD5 2abe573a6e84b71c58a661d4bafa9bd6 RMD160 5f526f32ecb3cfd01d2bb817ac66beb63cae6f53 SHA1 c2f9045cb6cb417bb4bd66adab30b8ae35dfdb37 SHA256 6b1ea9a4b5019d77515563c19640569f9d81e1747307ac9eb7170770e97bb49c SHA512 c0551f81e33d1d48cae40730d7196a2e87886361866bc9dc2f31523e95e73e40093df93baecbd951cc91cf210950a25816ae19ee6a6f692448973c9240430b41
+MKBUILD gnome-mime-data.mkbuild 3939 MD5 d4eb7d9034a24b09c14f74a52f4cb1c8 RMD160 11aa7bc35c554fd466cfb8ce15c400289bf0f1b9 SHA1 70e0fda970a28faba1f25c9a3e635b38cfa1c536 SHA256 70b37aadaf337a461706637e8b62230c852860eb613fbf76e7d640c6ce1f556b SHA512 793ed8d59692563cfa90856cd7f919213af15f86ed40923e00793db63fc2985ca1ae1bb07cccd949bab3f4401d96c17ba6b7a7abb5e47798c808ccf2f140d494
+SLACKBUILD gnome-mime-data.SlackBuild 7097 MD5 9b0f04376df54880af99b25b2a19e86d RMD160 17e9b2755d4427eacc2fa39a0dd237a58777e337 SHA1 14f1a71f6eadc0fae534fbedad15d0a843aa3869 SHA256 76e3c61fb9edaf2ec855e76f8cff23bd362ea1617b0c6cd869fa0a8499b4b630 SHA512 9e70383dd1c38d576cf0a18a249666132e7b62c147734b0ff8eba740ef7f60cf81a48fb38cf9d6455b78428f08e565c930bf6828b75de613ca6f155a950a0317
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYobAAoJEEHL93ESzgeiC5IQALEgcBOoP3oESPt3WaXVorgS
+ZyMofEc70DxRxf35TxsMJqEzWwBQyWZecFzGLP3n+7208e7t96MLb09p7PXMGeW4
+2hgfLo5fEL3e+4UaO/5il7oirjtrRO9HS4DIi7elJt5iD6IY0Jno850nStlgb5jO
+vN8UapzswIf33ZzPuxDzdY5KPfvlvEeKi+K+vd5I8YCIdiLmSwGAhXSKr4DzsX6i
+EfVD9zWUg+x4XSa1wON9+EZ4EFRkJLkmX2LqIzhTUY76aDksR2UokzqaWduV4Y1N
+b3NuWqot/xqKD8BAF2lfNJOLjcTxZ3vgnOeU0lsslR/CbENTISLQAm6pnYt35/Rj
+wAiZe1uNbGocbbYN2k6BkHEhghvu3aM4Lh5FpKzS8Ya7H8R6c/9n3zUygTOj24f7
+Nkp702iIPNQ1N4Otkmn8iAROAGikeM3HTmesgfEk9OAYHa96AtgbPG5CHOCqBjwG
+f+092I+yTeMsk7Tx12DfVpsByaSsJnQUkBR/9K1lSLF2BVM6E8kZqP67cAimHXIJ
+1c01o8Kv/AKlZSDshKL/Gqk6YoWdQrZZpQ62YTIWbQjYnM3zNWH2f321SeH+g4wQ
+O4Zn++351SHaKapT2leanUEblw1qeBJ4CepNmZbJWC1oF2EJ8rTRu6gUZiBzLM7n
+t0lCaCVQ0d1qgawCxT1A
+=1xfH
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/gnome-mime-data/gnome-mime-data.SlackBuild b/gnome/base/gnome-mime-data/gnome-mime-data.SlackBuild
index bad7795d..aaa9b421 100644
--- a/gnome/base/gnome-mime-data/gnome-mime-data.SlackBuild
+++ b/gnome/base/gnome-mime-data/gnome-mime-data.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for gnome-mime-data, by Rudson R. Alves
 # requires:  
 # tested: gnome-mime-data-2.4.3
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/gnome-mime-data"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j7"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -83,10 +87,76 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -144,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/gnome/base/gnome-vfs/Manifest b/gnome/base/gnome-vfs/Manifest
new file mode 100644
index 00000000..ee314f23
--- /dev/null
+++ b/gnome/base/gnome-vfs/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST gnome-vfs-2.22.0.tar.bz2 1939765 MD5 369105fd82cb99e69e63acab8f3b89b7 RMD160 307dbff23be666e18326211065a7dee78a8a17e2 SHA1 a58fb0654bb2c434372ee313a591ecfa8195fe18 SHA256 622cf50cefa2c4187e0a23f29d665f010f7a0815864fc35a61caefd5a7d4ebb1 SHA512 eecc6994f3a50b7a2501987b8ab18f2c25ee7057e743162714067c533f811016c7a52151c0153b987ea6fb03401a80845af61bbb4f69669e0b4ae3552938a0f1
+MKBUILD gnome-vfs.mkbuild 4626 MD5 c53717097f91f8640c7f1c4304c39d63 RMD160 26000f06fe4f45c55a53bf40e037c9320e437f58 SHA1 c82202fecd0fe6a7167963f9b13397841656c630 SHA256 a18c392a627068216487fb4d8b30fb1fafcc7bd1030d2dcb723cc95d91133ef1 SHA512 6d56bd2beb76df5f0e95e2410303ace48ff11f51c84cf304d68a538327b613fceca08a459a59a2bb828192adffed6ecff04a4ebe883535ccf5a34edd1d6c778a
+SLACK-REQUIRED slack-required 166 MD5 652168bb9141e3ffac7a6d3d17ecca30 RMD160 7f47d88009d6fc65d9eddc5fc0537dfa627e3267 SHA1 9dee9c91c4ff09e40c873850a3499e0bae5906f0 SHA256 bdf4cfd3301695bb20ce18622b865ab460e401e94dbc6e197490ab027d21ee1c SHA512 3fa78974cac447dc4d7cbaf499b8c8b108ced240d1e4eaf4942b17de5822864615429d3265ee20f4e8eaf07557bf3c2d666436359c1233f2eb0afb736388b5cd
+SLACKBUILD gnome-vfs.SlackBuild 7230 MD5 fa9f24418ea00c945006b1e1eae4d25f RMD160 7d221f694dff0deb4080f7f5a48c47b9a4307a2f SHA1 f3ae42f26b2d367fd7861f9896ea7de9e148b43e SHA256 5aafef1380d40e5ed24ba64e50f31023b7cd5e23d4d0db3bebce4926f50fb415 SHA512 92080619eae08a7f96aea0a584b281a8f6e979115a619079ca631105e405c3573ff0c47abcbe0dcb17db1edaf533fb612af61ecc0d14aa45a7119f43da3cfdf6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYqSAAoJEEHL93ESzgeiA5cP/i2L45RpE8WexgEGwS5JVgcb
+aHqzLzj1FBsiDXdlOPAURblWtvY7Dx77zbpfh2buADXy5Sz0jYow9ECx06YT/whd
+uqUQo5L4wlmmDTpK65PY5n+tJ/LriqEiYWYBz8Grk/MxeINp0ed1Pb6yu8BekYwO
+Pa2LToJM1rO8U8Xbu+B5+vIw8Yb7U2I57o3orRUYbu68ae4MiCHJCipTHSX0Mo87
+2Pa0TqcjSgNeh0z1ohqf5gtsLKzCp+GbpViolPOtPp0iH/Tw8EJ0aLWzMftpPwwe
+HbjGIE6BqP9GqrSIPtMnoQK0hv00AjoqwWGxK7aT5ARWEIX578fh3Ric2n7v8NyQ
+xOlDFBipm1fXzKN83yYZrILVp+FyO6L16atnpEIBwIr5g0hXG7N60awnZdAUMRrq
+4s9cNDo9CgeP9tpzJ0G4bacosf1T07bUhu6sPEt/eFf0MqOllEzej75YaxsSKiyv
+Q6OfKBxBErYyF2YGm/g3QKij5QxQM17pLbVT/G7PHMhx56RdqUxRDDNZkOB3+efw
+lb3yqLPJNFf6xjD5hj+4Y/LSYNn7T19ZITcOikRAvgrxzH80CpJwDURnoKZjj4jU
+lyPg0rfKX7EiX4AxnqDqZni9msCXfPgpJuhePLt8/JGdGqR4+x7k49Z0V8RTFWvh
+HErsB7/wMserfQnk8dxc
+=Vo5z
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/gnome-vfs/gnome-vfs.SlackBuild b/gnome/base/gnome-vfs/gnome-vfs.SlackBuild
index 3a29c318..b4dd0acf 100644
--- a/gnome/base/gnome-vfs/gnome-vfs.SlackBuild
+++ b/gnome/base/gnome-vfs/gnome-vfs.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for gnome-vfs, by Rudson R. Alves
-# requires: glib libxml2 gnome-mime-data dbus-glib 
+# requires:  
 # tested: gnome-vfs-2.22.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/gnome-vfs"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -85,6 +88,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -152,7 +221,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/gnome/base/libbonobo/Manifest b/gnome/base/libbonobo/Manifest
new file mode 100644
index 00000000..9a24429b
--- /dev/null
+++ b/gnome/base/libbonobo/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libbonobo-2.22.0.tar.bz2 1445318 MD5 998a576ad26784ac87eab99e96013527 RMD160 ad22f56ec15e663010721eab5f346421dba39863 SHA1 517e8f1ca24cea4ce77cdb1d7485c61da3096be2 SHA256 5a6d96b9b15afa5d1702eee3a1ee3e50c3cfedb65d7c3faad64036ccfb3294b4 SHA512 fbb6e1d5df5b96bdab29a43d2952e19cd46b04d85d2e3c8420d04d8dc4cdba9f823ec97604301413872d0e9dde43cfa3d09c0c92d3a437b49ae006c9d891fdf5
+MKBUILD libbonobo.mkbuild 4001 MD5 2185a495c0edea007cca0d3f97f9317a RMD160 7bdb046a7596443e57571179f08c492eb7e301d3 SHA1 d324a2019d8c73bd828f98f212cede490355477e SHA256 396af0c54a7d3369d623d3e79042412ac738d74a5622fe39694895179ce2034d SHA512 eac8609a466dfcdb4103f6d5314c332038e60da694d86b77fb7c7a42517106abb886e9ff5a4d997093e91574f47e29232d374277071abbe318ce4a41614fcc0f
+SLACKBUILD libbonobo.SlackBuild 7136 MD5 f4410bf700ba304b2816ceaaef9a52fa RMD160 d951636fe4f61c06971b769a8b7caaaa22fc2603 SHA1 cfda4a2f5d8f775adc6a509d1ba1ee03bbbf3989 SHA256 47c361a54e9302da54fa78b490d86e7a81d622a5bfb84d4a5d182e240a91a3be SHA512 3745a218346dbaf64851b00c2b94c441289ee3e3d55be8515e86f3fab8047f2a2a57d5bd9a61e77f8c517a61245d60048515979e208d7ca0a0cd281d7dbcdad5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYvqAAoJEEHL93ESzgeixOMP/1PoZG1h+oWLEdQPrLIlbKDO
+4out5mPvO6fFWVaxT38fDVXLa08lQMI+IgHrD/8UlbRkitI11PHqz4oOD0CtFVjm
+cehVWYsxe2izubGQp77snFVw+WJSlD/fsuC7MPO68Hzl9NZtJQF2uO7UZI+qnn3W
+F6dLWGRAl1I9GSSVAQxPm7boqwhUMQva1stdmjxRN0bI1xogbRys9NCpcxZAm7e4
+QC8PrtcFuwNA9FscWAW8lOt/t/ysxadc0y3gEm6nbjpw2fGibrxILLI0hnc6X77S
+EBJGWIAmX3o4Ua5tsAcfJDwjZ/xbJPdnRHvxTAiz6kfYPMME52zcWH4hJdExTL30
+0uzzp7arDyLLR8bSA+eLUO7zR+wkVvzuYZz/N8KejaA9Q0RVFMhtK3H+6axMBiUM
+YBQIhSiNKV5tBt0EYfv2ESvK3LlUkMTaoLOL6Z62J2jzJTV8vNHo67vUWyBtE5md
+DEuUlfbIOpwCEYKMea4IFnwsm2ix2mDbr/uYKn0jdnKTukUzulF18jcWiyv/Kttf
+sQzMcUdkamUp8vDsZ+OE1aDLgJ0h6xIsGGLcI6xAD+eHXufwO/JrAgzlGaGN6H4v
+TyjyKITKV/zV+dtOs2r7DPyKqt1b9qUAMDZAyjunXpl4TlcI2IsP4Ljr2pv7EkfQ
+VUw4OID8e7Y8S2Xa6W/Z
+=KVoN
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/libbonobo/libbonobo.SlackBuild b/gnome/base/libbonobo/libbonobo.SlackBuild
index c5984626..2caa084b 100644
--- a/gnome/base/libbonobo/libbonobo.SlackBuild
+++ b/gnome/base/libbonobo/libbonobo.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for libbonobo, by Rudson R. Alves
 # requires:  
 # tested: libbonobo-2.22.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/libbonobo"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j7"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -145,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/gnome/base/libbonoboui/Manifest b/gnome/base/libbonoboui/Manifest
new file mode 100644
index 00000000..4dc04e61
--- /dev/null
+++ b/gnome/base/libbonoboui/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libbonoboui-2.22.0.tar.bz2 1006030 MD5 e4e4d74c9387d08c956574f981cf91f2 RMD160 77bee2de7e4eff77885d68eb717df188cc62b1ca SHA1 48fcf81966b839b328ab63bae4ee128246eb0a63 SHA256 a1f2cc830a67cf02ea66812624d92f369b7d9e0231dc05ee1d0a0374b7706926 SHA512 8792fd6052ef21fbd271de94de274e2728fd296eeb6001b793be3b864c332611e08c2b4bc18873dc39f849ac22e6e82ba5f0380aa81004758aec01c8a6e1aa1a
+MKBUILD libbonoboui.mkbuild 4358 MD5 813819edf8095984944aedf711789bb4 RMD160 d5214b8c2800d10d8181a040bc3d74f4ce009b08 SHA1 f8c971808fecd8af62cc72c1ef2ff2f6293b3c2e SHA256 4176dcabef82b4f72e058f682363018f1d69c549b94203ed7cc42d5ff9326b63 SHA512 c01ddba162b8f0b6b751a46b9bd4ab0ad687a0abd923696bc56c25ec427e7a4819d0d56662b52c5cccca736bd340d0d28aa146715c3582484003d9386f3ad5a6
+SLACKBUILD libbonoboui.SlackBuild 6996 MD5 e7b8a4d8daecac1c7ca9f853a67da66f RMD160 7b5e175303e0944381a3dc6fe630313ba74f7afc SHA1 8e923b2cfa2ae0f1001c1e708093357fb5bc83f2 SHA256 489c542312f93c89c3373e71edcd19a8a97e5e8a528514991f3466a5debc3129 SHA512 ecac9abb885ace02f9858e1f09a7b0d292ce5f2cc077ac09583763daa9245ebe0c645729b46c3aea8f3189717bc8436658fbe091825e44198e386f54440e62dd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZEVAAoJEEHL93ESzgeiXpYQAI1SndH94jt/zjfAQeix1tLs
+TfNV0ArLLbDYrh/dQ9WZm6j2jNbVh8TX+5miJoxGlTsiZjeVn4Gay3cThvPY9JEZ
+LHCp979d9IETv8z0QDvXkVWP6n5vIARP0vrKjlfBABFQ+XqVhUVPsTvFPPgdrP2k
+qVPvcIIbcTvHv/kbf31Ep3m9Sat+zYzzOlEIPVidqSWinkzV841RRX9S8TtDCafU
+WRxKnKx3KdGscnHuzBROxljnp7qDCuGXEMVavlRwLurx5DM7uwGCtejGlay3qN+M
+YPXd+92F+3NwhFYWJATIDwFdWepNgWY5w20HHwboHksXlM7zOoaadSVsWQ+Aese7
+cRawYITTXiXIr7XjLTMXt/kE/B5HlR2ff5jGkkNixZg3yN7h1NntFW7ZRopBBhF4
+EQRXyv5Epyhtke9qog5kZ8JhE1NHo/IqEPP3o1ITN9SJfZdLJIroOBB5xCUIBx8p
+Khcfg+Z32bF6ZX4aCIoVOGcC97QyowiSB6qd6BsS40JyB5kdKQ0EzGEn+XrLWUQj
++TDPV4NykrTy2LumOGDFajQCqA3jarJLX0RyYVPHhtX6Y8bwj8inIYeyh7ZSyLlh
+XckU38EmmW6ooYXQYVcotSp0BXt+wbzqhx5XzjtC73bIRV++ZSLO9eLNWjLGDa+V
+2lrLP959v+dvorXHgXqH
+=8PkJ
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/libbonoboui/libbonoboui.SlackBuild b/gnome/base/libbonoboui/libbonoboui.SlackBuild
index 86ceb7a3..8fe02c93 100644
--- a/gnome/base/libbonoboui/libbonoboui.SlackBuild
+++ b/gnome/base/libbonoboui/libbonoboui.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libbonoboui, by Rudson R. Alves
 # requires:  
 # tested: libbonoboui-2.22.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/libbonoboui"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,10 +88,76 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -123,9 +193,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
@@ -145,9 +215,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/gnome/base/libgnome/Manifest b/gnome/base/libgnome/Manifest
new file mode 100644
index 00000000..2c6dd416
--- /dev/null
+++ b/gnome/base/libgnome/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libgnome-2.22.0.tar.bz2 1407548 MD5 52db42762589826c66d27def66112807 RMD160 50b0c0fc21e14c45245b95138b40e1ea40084547 SHA1 2d263acdd313d37d1018356c74e9d1cc7a9c2e0d SHA256 d5f668fc9d218ddb0697142a4ec288b16af3f0a9f2ed16e12d0ac568fe9c75d7 SHA512 77b4ae5e2f47feef74a9169ef1d9a7b91871affb966e544608d92cba5b06b49aee461f32d4147863f9b124581c4ab4f59907a3eadf825adba0a08c71c9da0137
+MKBUILD libgnome.mkbuild 4483 MD5 d68fb10653e9a387aa2e6d16e99ee967 RMD160 ad2291dd0b705eedf03d1118f9fc42834d24a584 SHA1 50a2714813ae7bcb41a937347a3a8745a62c59b9 SHA256 e912d852128d5383ae6e4334d2292883ea55e4428f63f8b0f0fd0c53a012887e SHA512 9dec9bd7f196a218d0a43a6b9963ffb875a61700b19c1bac06ee527c476f436e1d2a9892bf8dc4329be036ec3d904e4c0914fab7eaafbdece7c1a514bd3560a7
+SLACK-REQUIRED slack-required 185 MD5 7dcebafb5d84cd0f6d6ce0c5cc67394a RMD160 52a6f50befd3c2bf09aa5571a4efdd4ea5addb17 SHA1 61d182814a762e7ae27484ddec90e57a966b66fa SHA256 ff0e7f71737396019bdd2253a9eaeac02a8d40acb243a72c019667b5231fa6b1 SHA512 72d05f7f925a99e82cad36e84d24c339ad6cf1ede30aaa66d24954e79fd1a41cda8bba4b74e31bee05214e8df96de0c9960fb6d1cdac695040eb172c659ed16c
+SLACKBUILD libgnome.SlackBuild 7164 MD5 57d2a669a194dbbb539a3b892337a471 RMD160 b6ed2200aea4d4c95044e023d9d33b1ed471ebc6 SHA1 5ef3abbab5d3287016f2690873dc563b4938bfb5 SHA256 9d6e65cbfb2fc46508a98c5edbe012c6c69aadbf992c56908079562d23c8b32c SHA512 a1e265725990b8b43b6681e6919a5610aee94cedeb8b795ebb4067f8c10d7bbf03ff86ab9a5941cc0fcc50dac39bd1a1d17c8d06c835b072291befdbb8dee393
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyY2PAAoJEEHL93ESzgeimFcQAI36lOt1VFoC5SfOAPaW6N7C
+pkupnpwpWexmjWlWH2YRfOfM42cDoYov1Gb2klwiT77HIwuy/E4kYNJHDsfPqHas
+OXVKpVTULnlRzKO6onbs0KDh6ISGHS9dsQGTLZ5zb8k50IQYapr/bfGmFOlmprGK
+QOO85YYR9fRF5Ah2fSRFf2NV227bHLLf6+3p9wjsec1G24crymlhlRk7WwZqqxj0
+napkgsOr4kPZxKQw/opBB/prEo/FujlHMFiLtyy7TqK5jdK7Tky91J1R1QBBNEn0
+g83JK6Ql8TwAyYnm9MPKt9/Cpdqm2SMYrZXv6SYSbYv4O3vJacT2VVMMpf1x4kC+
+z9Fu2wL+WXChGYYcF5+UDYMaTCtEASi0Y+86oq8Jvy74xLwau5rREqf0a6X3vb2p
+GmfUpdPsLike9CLs68JQ3o43Tzxu3+sBxaetjpl6j3FKMuZnboA+xFDD7YwLh+Xt
+pF6kcXB3PiXc77dwtKsObGui/yQS/No9JzvOkofhjTgYIecpWlKi71MLQjUAULat
+SLblsJYeX2AeTe208yUjpc7i+30w8v8treUVAMYo6csTLGafnS1M8HMjH9e00euD
+fX+ortdwQsfTyKXR/uWNXs8uQ5rM26cCLV45/JnwTYFnOtZpDiK0GEIB0MugU2gh
+DV7muYshe9UbY784zGlR
+=n5JO
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/libgnome/libgnome.SlackBuild b/gnome/base/libgnome/libgnome.SlackBuild
index 07ada2e8..9fed75a7 100644
--- a/gnome/base/libgnome/libgnome.SlackBuild
+++ b/gnome/base/libgnome/libgnome.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libgnome, by Rudson R. Alves
-# requires: glib gnome-vfs libbonobo esound audiofile 
+# requires:  
 # tested: libgnome-2.22.0
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/libgnome"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -85,6 +88,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -152,7 +221,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/gnome/base/libgnomeui/Manifest b/gnome/base/libgnomeui/Manifest
new file mode 100644
index 00000000..bc5378f9
--- /dev/null
+++ b/gnome/base/libgnomeui/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libgnomeui-2.22.1.tar.bz2 1450063 MD5 5a60405f006e873ba7bc97ec9c8e4c5d RMD160 222362add689353aa5f7a68767b60588d33245cf SHA1 fedbc56ac42d32e97310220469a8d6c52c3732cc SHA256 7631bc19eab79412ec621e3bc98e94185d79ae59946990f54a09b80940385ad7 SHA512 b064d0e55ce1601fe5c284d5e465952b1e9d4400106c0aa0f54eeb0ee18bf26d7363214703a319e2ab712a5dc6b5f34c6cccd6645942716e2b11684b3d7b452d
+MKBUILD libgnomeui.mkbuild 4518 MD5 fff69fc4bdd11d98888b830d449f3c19 RMD160 28aec31802231da03079e5deb5bb0dff60d86a0e SHA1 f2f12b82861ed1236bc1c522380b5bbca2fccb63 SHA256 ef2650fffa8ee00319f92a0a4bc0369b052dc5670cc64048c4c1e73d55e5e74e SHA512 99e44ff4f309e8204b1367eca3f8b6893b655eca52767597d87fc79eb51ab2019b254d63d5d15e7af9cc68716a3bcb179c281a34840647f23b263fcb8cafbf6b
+SLACK-REQUIRED slack-required 257 MD5 137b8f6e3c2fe5fcff7e566067ce7a43 RMD160 60ab0773176fc34439206fdd88c02be584db5c5b SHA1 89b6981c287256c31378bbb50dfed0729e18dd0b SHA256 44e2408c41d90701a492ab54d01b539c28ecbec8ac1a3ca79149b1492865341c SHA512 f97e02788ff35c4e5b6044fc56ac8e1a9fc98e6e1730cf7e0e25b92b6694e4a8ebf5a0e9fc786d3ee88943d81e6ba16f1ffa8ce30e2f83f4012c1b725247cced
+SLACKBUILD libgnomeui.SlackBuild 7104 MD5 f6b69b8220cd46d51fa61469ec4a9533 RMD160 cccbd26454065ee59fdddb2ba3500ccdd2dbfd65 SHA1 d6f43e2ab948ccff2c9d4278cc9fda5201b19d7b SHA256 e86500a18638277a815387d0d3f0eb6897c21e3e25dcef5242c2375883af50e5 SHA512 1fff06be7327db69ee87d691f4bb7a919194020f73f09a7d3c96c21b41147f73fc247ee4c60b1b68fe36b45f6741ac810d957c66a95b7427c556b205a0ad90bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyY4XAAoJEEHL93ESzgeicEoP/3aXhm72+z30jyxEAe9lsd5Y
+G0THEMsZqGVydFzUm3d48bNpG88nyDwMJsBZYFtKQvU5HD3UZ1iGzPp3BaDl1+03
+RJv2JNFXmtqhvnMvIQEr/8wNgfI/BzTpD3scEhXNC9B1Lk3023jFJsnXgWNsusZM
+5Tgkr+GkKccTBAn8FLn4jTPRkssIFd0t4Rh6g0/x9sNXyj0o30nKkcmJdSQ+aMyI
+/FPc9WSUf20tqBBXTn3oAmzFhp/iEvdbUI2uGj/edeBZ/umXWqFERpPmZFkVumGT
+lCLgwrLpLfeKCyh1/7eS5thWZJtHG8URxHBhL+hTx9MrdESrCM3xn6FsDDpAJ0S3
+/mjHGzCu5dcgCVCgqJqMP4jju9NgyKsgTxYDR9sqLLPOco+mHbs5rCEGDtSXxiUd
+C07CP3KHV2HtXpAqyS92zBDmJPCVzwqplgYM9AMyXxjDCFAgT0rIQMvadsn/5Olc
+uoQQjcBFCNAnlbgaUu2O0Y1IJ5KjWUh/m4521/iF8GtYhGeMwH5lQ/djWg21cFsi
+4PCvCAh6f2gxHrpoKLzuVIL0eIqM8xBc+yKTkLDR/XBoSphdJCLSfHRctY77oAHv
+FeDikFYNmEGoXijLvCLRONu6mz7itvgJRnoJVl4ruZIWY+XjkaBPiD4J5cLTK+NU
+9NzKs5X7/fUbrC6p4FGo
+=QwqX
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/libgnomeui/libgnomeui.SlackBuild b/gnome/base/libgnomeui/libgnomeui.SlackBuild
index 087ae18c..8649c9be 100644
--- a/gnome/base/libgnomeui/libgnomeui.SlackBuild
+++ b/gnome/base/libgnomeui/libgnomeui.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libgnomeui, by Rudson R. Alves
-# requires: libxml2 libgnome libgnomecanvas libbonoboui pango glib gnome-vfs gnome-keyring 
+# requires:  
 # tested: libgnomeui-2.22.1
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/libgnomeui"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -85,6 +88,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -152,7 +221,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/gnome/base/orbit/Manifest b/gnome/base/orbit/Manifest
new file mode 100644
index 00000000..4956c9a7
--- /dev/null
+++ b/gnome/base/orbit/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ORBit2-2.14.13.tar.bz2 739650 MD5 1326b6775aaa87601b4cb7579234e1ce RMD160 917d5011af564b84653166ecd490823bfc0ae277 SHA1 eb565df83480ccab606821a7d1942c0c23a4e8d7 SHA256 3321a816a5053eb25e5b4f5d099331871bdc09ece38924a7e8a8d80fbafd733a SHA512 29fb54f2ea809419e412c908f58dfc2a2a14172d8c2cc2c1f8f2da4c4f4f646b157ffb8427b7f9fd5685f2fd5cbcf516aa29d64cdb341e279659a2b26f909f0a
+MKBUILD ORBit2.mkbuild 4237 MD5 e91bc288e962cbacc0ca4bd289bf2e0b RMD160 5891483ff9c92524b9dd4d0a638f908c3611cfb6 SHA1 a9769416205fad0e1ca387edd8a0658b0644e0fa SHA256 c84e81066a0afa266ef8756db266ca5be2dd15563a901cd95669d4e4fedc2e50 SHA512 46d9c320df2c11a75f61d2cf02d99f9752d32f7877fa573059e617680cc0bd82f9985900c07438fb1de799ddb71dc58b02c14dbc8af50eceee27b0a36aa80ada
+SLACKBUILD ORBit2.SlackBuild 6964 MD5 22514f1d0ade8b29c7ddcbac9b184bff RMD160 fec21032a38196553577c1a46e0525f01970d96d SHA1 3626053ff4384134f0137aa823ff941e4be4e785 SHA256 7e29be7df64d8d3d0e66a29052cebabf451c863e912d19a727058f21ae32de55 SHA512 c10fb3813c36df30cbf1c593a09e25cbf02772ac55fa110f009704a74a298d5fe16afe2b2ec55f550abb6f2b913e72ce1d484db2c87a324580c0287878e46e63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyYSXAAoJEEHL93ESzgei3eUP/1L8KJvqLyo5jI3a8weYDgCM
+hvFjIYxnsgIVmAzu9H+e1k37IC9XZn+NnCkjBZSXkeyuO3HCFCN1ar8cpIFM72g4
+DtbfWTXW24HlSihyHTm5pb/VGGEjTffUjI8TvIna0tQb4V5tzQWxth4ZfAOlvhxF
+3fXKtxH427GjQqEex+1nTGw/eUu4n+EXAeeQ8n5iljfX4cxHk1zhzDrxkH6rr/jY
+V2ybYh27BdASR2woWkYcS1s14fsdanBzkhuY6YBe32LrU/i1mlb2jDx45gL2wHOm
+1TArdLTfqSdG2Jkc/gtNPZ1ZeDbYxajG/w+aRFwNghFENQk9QMQU2WvjFoh+Exf4
+evF91G3wd15A9jbf+ZVto532VW8K9UIVwzEM59h3hm6W3wJD1sud4DYJHj4Sc4pY
+ASNxy1zHjP8AGtMFl4RqFIihx6z6QGBr+yRTYTw8JxoXDMb/cHH/H4OTjY4cBiHr
+KKHlyqADNhU4qScajb+6Aj69IltSfDgeL1R/mEIu+/YGaUntBJvnlSlDEfEBSAcw
+pXJpZyn/JSHkmse0jMtzfe7yat4T49Dsn8AuDHqGuoF8OzRuqcZFFaqtGgYxzFRk
+EFNZ1IVIFFX7MfpEdQKNTx6D5dhLWxmW33kdsERsiPSFXPblBZqjC9wiOKZZybW/
+N+Gps0L4HflNPGSh4Bmk
+=RMhl
+-----END PGP SIGNATURE-----
diff --git a/gnome/base/orbit/ORBit2.SlackBuild b/gnome/base/orbit/ORBit2.SlackBuild
index 20ff0a12..ab105522 100644
--- a/gnome/base/orbit/ORBit2.SlackBuild
+++ b/gnome/base/orbit/ORBit2.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for ORBit2, by Rudson R. Alves
 # requires:  
 # tested: ORBit2-2.14.13
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/orbit"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS="-j1"
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -145,9 +214,10 @@ EODESC
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/gnome/extra/evolution-data-server/Manifest b/gnome/extra/evolution-data-server/Manifest
new file mode 100644
index 00000000..6082c7ff
--- /dev/null
+++ b/gnome/extra/evolution-data-server/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST evolution-data-server-2.22.1.tar.bz2 7602166 MD5 1972fa3dbd46c25216b00c1d35f83eaf RMD160 d0082d45c40d8a76897343778dcca00df4f511e6 SHA1 b78f6865db1358c1dbece6c09f92e9ba6a523d6d SHA256 c68cdbfa960068adb76bd3e14affcc7f919435b4b17e12306e641f2a0aceed11 SHA512 242a839fe3b54410584d454c28db06fd9e57ead392e688e93565ef13f20dec95dae88f84b705ecd9103cf506341f7afffa071bbeb3b802ed51e1daf5e6396a27
+MKBUILD evolution-data-server.mkbuild 5833 MD5 e4ad1c1f7ccc7e7eb08a314e775919cd RMD160 bb6a272d3f228ace68bf99702c06c688a455d8e2 SHA1 a49f23935f1b223b0658d91ef1e9df9f2ef0733a SHA256 1d053d295b1ca5a564d5ef8dfce4e8f1594a358fa10afcca4e8d029310154743 SHA512 b3056e57a97c7b602251e1d375d7e2c48414c7eac8f1eb3a7f73575e8f8c3165b2c170b5990c5f3b7254dc317cf25bca82bff21ef7c3f7893eaeb539c76ac7de
+SLACK-REQUIRED slack-required 252 MD5 d72822c27958d8918b033ebba68117d1 RMD160 aa8c8c135690ea8b7e327a281fff7944eb60b91e SHA1 a20b85bf38d7643bc03c2b9ef74bbc17a205b162 SHA256 08c139405034d16be9a2d51115379bf53ffb3e38904899d4449a75c7676e64bb SHA512 49baed9f55c750e1c1cb0df19f4dd0d5b1c8106c20c65c99a3bde19c773fb06cab4fd56f5280f18db8dad3fd885de3f8a0c1f41998ed038dff50fc339b16df0f
+SLACKBUILD evolution-data-server.SlackBuild 8503 MD5 a511d98bbb6ff706b8ffffdb447a2ef6 RMD160 6a458a55c3a2e2e954aa293e52f0ef3e474b4337 SHA1 a9f4e6aa81f9d048661a50b40ef50020dc685645 SHA256 ca645df6ba06ddd6733a557baddd7fe8c1ac5709a0d143ef3069de8663e4c36b SHA512 a0d70b24d933f0c2ba8947941b264987d5a835aea5c42c2b1cfba70a3065d41256b43cebd5851bd904505ed113410b5f3dd3b1b4d3fca67b735a2592e54900ab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyanGAAoJEEHL93ESzgei+wAP/i/uMrahOjz0A89v5RxbLv2R
+c9U6cIqUiHrvUSru21seBfjx4mZi4DmofdRT6XYzpaO9ChC45ajtMQKPexjSHVeA
+kmJ64db2uDNJ+kv9+cpCuNqZRmE4RcXEf7eyNwr0f1GCbKFhSavrlx3BwV00Olok
+iZRGvu/GkHkxUF3HviAFaeeiN26euDVjbkS9m82KatKTN6SULirIiHTPYWcn8Eew
+qxEGYXtdDJoVnWgsFdQMR7ZrxP32VbLtamyldEqPLLQyFj4kv1rGY9cRksQSECWU
+UmVPPRq1pWxYvOZCbmXCmOC2m7SU/3th4LuvAg6REK7RZ3yew1Cqfr1orDXo95JS
+l5Fmp8ZC0VE1+73g1QE2KaXH9f5ZpJy+NLszroOtGnQ6e+N78YwMIQ6L0cokcik7
+XuBZPUIUJmhYU2pYZwrbO9Oj13xpdYlIUKCUi3pd3P10rXm81X6vcK4VTRgUaL68
+3FZncmFXboHpv5zWjgvSj3yltIwkllM/mmJ1zktHKbyiLcwfDItFb+KxZrwZxUgl
+JBfZypROLbV4qZr88WYF3nQoDI+O0TAJdadXXMrnrwz1KG2adKmln92VNHxBcMHo
+Qz9Zr8c/K6ieLneYr2tEdPjiNaNeUz5dxr0uxC/I6y/idsMF+KtIzjAd5O/tmWGS
+62e5W9DUHniqJ43Ll2T2
+=7k6B
+-----END PGP SIGNATURE-----
diff --git a/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild b/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild
index 9a67319b..037d9cf5 100755
--- a/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild
+++ b/gnome/extra/evolution-data-server/evolution-data-server.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for evolution-data-server, by Alexandre Vieira de Souza
-# requires: gtk+ gnome-vfs libbonobo gconf libglade libgnome libxml libsoup 
+# requires:  
 # tested: evolution-data-server-2.22.1
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/extra/evolution-data-server"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="
+patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
          $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
+  patch="`basename $patch`"
   if [ -f "$CWD/$patch" ]; then
     patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +173,7 @@ for patch in $patches; do
     gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch.gz" ]; then
     gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
-  fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
-  for patch_url in [[PATCH URLS]]; do
-    patch="`basename $patch_url`"
-    if [ ! -s "$SRC_DIR/$patch" ]; then
-      wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
-    fi
+  elif [ -f "$SRC_DIR/$patch" ]; then
     if [ "`basename $patch .gz`" != "$patch" ]; then
       gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
     elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Configure
 CFLAGS="$SLKCFLAGS" \
@@ -183,7 +245,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/net/dns/avahi/Manifest b/net/dns/avahi/Manifest
index 5fb5aa58..aca0e5c2 100644
--- a/net/dns/avahi/Manifest
+++ b/net/dns/avahi/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST avahi-0.6.24.tar.gz 1115626 MD5 068c1d220b07037e64caf87d4a7a0504 RMD160 94f59ccbd14d99e91e259b27dd7f03404c6691e6 SHA1 a187af361fefc8bda026936bb07ccdeb41dc74bc SHA256 260070d46188ed58f5dc1174ce632c096679f6391a2b729366e7aba349d4b950 SHA512 bc72304caad87205ca52c46b695605d678c22c9ac219d31e4f6c244c59d523e8370ac707f2b6b283ca866246a8c0440b6bcc48af996b1eafd2f002d8940b2ede
-MKBUILD avahi.mkbuild 4475 MD5 6e99c0cd52ea25ce4c6e876c4fcc5227 RMD160 a4f2d4ffbb24c7faffe305bd74ad1bb76a528413 SHA1 35ca34c95c84634d76ce463e0fcea9864f5a4a6a SHA256 fa1f9dc4e6c1a5f566a33829bc95cfade5cbae28c7b15e6916d5c4335c2cef98 SHA512 6450ca95bd4c895e044788cdf41df23d23dc99459af9a4e545590fa3cac4c269a717716d745e5833d337c71d9240038af5b0a624187cddd51638ce71b08dddf6
-SLACK-REQUIRED slack-required 133 MD5 9b5a33f59c87224064de35c338a670dd RMD160 714525861f80459117f45bac7e71193154f36979 SHA1 5cd4a9485d424999731e94ea489b502ffd2a8329 SHA256 665e17cb4f58b08ad997687d9a8362637628c098f80010ae100d0b61e6dd1b36 SHA512 46db069f654bf19b51a4a1e0c8b40202b22e5b897420b12f6fef7aa6942db20b3512f0077ffba84b94b5896736affec6cbb215b648e6f953163b26f036364f4a
-SLACKBUILD avahi.SlackBuild 5503 MD5 fe4bf9a989808e473df56fa42eed27c6 RMD160 e944a003075a35f2ed5051ffa56f0e28d93f63ae SHA1 69fae48b20268c24ed2db9a2871c2e61c4b8fba3 SHA256 3a313f1344bb9f603f3371e6af9cf578d02ae39565c7dcb8c921b72fd21ea7ca SHA512 82a79ee18f9966275f1e2d903725388aba60cfad5d57ffefd99b7be7d9f69b0286865a9e91b645a3fd6c8901024ec0ff5e9898a84459e683d5184b1e3e796c95
+MKBUILD avahi.mkbuild 4513 MD5 a577507bf6be1b638e562698988c2422 RMD160 859d94caef035454cdbe3791cc96e55bcdf55bf5 SHA1 b46023941c5b6fd8767a613c0444df41f5d890a7 SHA256 51c9efb18146aba00769af461d7b0f49b3963b6daea8b3573b8b8769adce6913 SHA512 d65f3543cf19a7652f7311bdb999d1eb57f794b28c621483acd54afa5858327ba7f24e340901894fd207737ea579d2f99f05a12a6562946f4dee127ee936cd53
+SLACK-REQUIRED slack-required 112 MD5 48cea600e27ae5b6861f02631f6e41b0 RMD160 8f39f0e02e6f639e7120c85d92d448cbe05e893b SHA1 d6cf690e660163122e5471013cc095298b5a9e09 SHA256 af8712865f6fc6fe5a0268819f59ef95be31f708fd2e2e86ab18500a7e92699b SHA512 e47d5d36ebb340e8d5f26f75395586182e74f6700eaf4e5493fece9370932fd7deabd87cbf950927a179df73da61e3ab620308d9602429a7850f121763595183
+SLACKBUILD avahi.SlackBuild 7725 MD5 5d1357d3b09c11d60f21959afc67ca5a RMD160 abee8060957c48a39c6fef98ee9cf79ee503d958 SHA1 d6e5a367a46c1a339965d445c123c907bc630c0a SHA256 0984130423f6c2d25216661b2ba64b3d29fbc1914a1f77625299a9faa3c4c499 SHA512 51a785458d0eaebcd987305780d1019b97d66a328915f16d1dbfa4591eb78b3078b80c430cea2ed8c9f65784c6fa391fb6aacd7ac091fc14364dbb0d38941d39
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJybHZAAoJEEHL93ESzgeiLlgP/20ISj2GmYuZiW9Bxe84dq6U
+TbP2LXEhDq3FtbToLCDJFv9bfv6LnZ8ca08dcwCcFYDW/O7eFMywyX4wqofYHN3E
+YUOmzCVRAKD6eWJOgJG2DXGyuWovUly8gHZ1ESNJ9YHPrZlZorLfkjoXdV5UW7pP
+w9uQcq5PTIvragTjTSDphzJNOT7iZ21a1Osj0jO7m3GTZTUln2+KltE2xOKGdgIn
+8Mp+3V0nHJ9+6wlxf+i5bnwPnkCwSEEhBaPWKwPnbl/wEXC7v9aoe99f5h8iEs84
+DGH5NFoR0bqhCpMJfKi/Gc6fBfwKaIGS1dwDne9uuT6vECLNETaqBxsLs2yU3ofb
+WIA6K8SIWb7If04oVKvhHor7TbUurToUqS5jZvCcUgZRhLVBgX10mu2pDCGM2cyh
+RPwFIPQ+jZtZOOCFFumE1DZyXi5XqCfeCF9oKSBYSOREvZ66mEE+gIVxpPC3LzOg
+eoJVItb27hG7+rDolwiA4fBQKFLobzfiW6AR/DPSefYamxsOVs2sxN9tQszNL7/3
+4Jdivg8QnUS0SzgiWjk1nzPlKmdHmx5+vRls5AQxxAiyFVYvUMVjZvEjeNdr1amc
+7iFf9JHbWjn80xPr8ihVSb5rJkrnGs4kbbrCANcs/gCrXx7WzgqDcEDQ7SykKu/9
+eibS6SeDgIM9RnkAvvZa
+=Qgtk
+-----END PGP SIGNATURE-----
diff --git a/net/dns/avahi/avahi.SlackBuild b/net/dns/avahi/avahi.SlackBuild
index 1e50be3f..58ec33ac 100755
--- a/net/dns/avahi/avahi.SlackBuild
+++ b/net/dns/avahi/avahi.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for avahi, by Rudson R. Alves
 # requires:  
 # tested: avahi-0.6.24
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -38,9 +39,10 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/dns/avahi"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --localstatedir=/var --program-prefix= --program-suffix= --disable-qt4 --with-avahi-priv-access-group=root --with-distro=slackware --disable-static"}
+CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --localstatedir=/var --program-prefix= --program-suffix= --disable-qt4 --with-avahi-priv-access-group=root --with-distro=slackware --disable-static --disable-mono --disable-monodoc"}
 NUMJOBS=${NUMJOBS:="-j7"}
 
 # Set system libraries' path and optmization flags based on $ARCH
@@ -85,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -152,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/net/dns/avahi/slack-required b/net/dns/avahi/slack-required
index 5b57ed4b..2aefc2fa 100644
--- a/net/dns/avahi/slack-required
+++ b/net/dns/avahi/slack-required
@@ -4,6 +4,4 @@
 glib2				
 expat				
 libdaemon				
-mono				
-monodoc				
 xmltoman				
diff --git a/net/im/ekiga/Manifest b/net/im/ekiga/Manifest
new file mode 100644
index 00000000..f252af10
--- /dev/null
+++ b/net/im/ekiga/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ekiga-3.0.2.tar.gz 8826118 MD5 616930d9ab92fb21c238c13101ce5879 RMD160 cbf820a8c8f715931a664d4e27e47d74f0a68dea SHA1 dacb75af3d1b4802865c4b27b2a8db62ce62ebbe SHA256 fefd63c13ca28713f7f03320c1e341430ea2d016d3ab3e49163a12f4df2123e7 SHA512 2c139e0c2ceeb29478458ff9eee6d1a60ee021dd76d0fd342e43cf3440e001a35b9650818d3e5871e45b0330e8683dfbdfc3584ff8c5a8c3c7dc91b7d697094a
+MKBUILD ekiga.mkbuild 4381 MD5 35f19440bb839a1ea3e4565ad30f0fc1 RMD160 b46f437b0d5d9d94439d395ff3364fd2eabdd19f SHA1 236d34677835003affc82940e80bdac0e5b834ab SHA256 c13847c27a1ddb50cf3fbc73787c10dd438a7afd757c3997055f75191a450c0d SHA512 93aa1fd22bf985e6742fc3d84fb5c90fb92f0fa094c976b9ec1b5db0cb19a9e3e37530e9dd6951d506c92f0d79d3e934ea06651b55201417c75651d8b8c41438
+SLACK-REQUIRED slack-required 152 MD5 68309f3129bd329974e43e7ae9199af4 RMD160 b88836016bc6e9554c5c97308050ed38e83cab24 SHA1 5d03de760e2b80fb1ab5f97432ab1b494dccc3e9 SHA256 bfd1cad993c911e500389d51e5f91f764bc33f101c6cc2e657023d1fbd002969 SHA512 8263a6fe62e42668135a6022c20647ff18e8334fd40c15582eb51c17fcb5cc16d63a364156b7ee33127f9f2bb31263d29011615bbd6b9d1d84c3db5cee7847a6
+SLACKBUILD ekiga.SlackBuild 7245 MD5 a1f2f4f2c78f5d21f8cf78d6bfd4365c RMD160 19b1178ec918872a10ebc378ff5748da21fa763f SHA1 e57fe5814088eac5a25ed57ea21deccae87eb418 SHA256 ac62296b19d2c981a0b0b374ea81fa70a4adda4466097ee2175d1dfe6cd05b2b SHA512 901bf8da511e4a6be1b0b60765a49ec8986934867b3d14d938f8c5b1456275905f33b7aa1ef9a1481ea6f19a51ce18622586b02a91e68149997eebd5d105b627
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJykTUAAoJEEHL93ESzgeitZ8P/0Ve8HwBWzP+lbpsmyAH3ZY5
+jbyo2LkTlRxj40ADZ4hn7w8CooUNVSBvx3NcD4q+eRrVD/HpgO737tzBG7UIR8iV
+Q3jXNrkeNJqxKcDxuh4ljySrdAaFKdjwErwgZ8HzTfIxP0xa+ia0vhLziavQ2gW4
+Cc60pi2p+lAojVsfSnbjD4M08MNc5layCDM3Q6fwXva3ih9JNIcx/LqfxJmtUZil
+DXXdR9OJiBtgs9kfzyQiRc9WjseL4DBVbohk3BIVzM52vJ7UYVwvqGam4w74615n
++oXskXOyjnezvQ52IEsAXpAWJgbWaGhlYltE3uzOr+KUfQs7+6O/70R1zDTwTHE8
+XqSY/B3yIm5LT+W9oJZC2Ht4oX551lsVPoOVyezC0DYiwb67nPLO0EC90aijzCi4
+o7yd4b39uxwVxHSAgcOpb0I6IxXODUQuOjSs1+edQtUO89vILmERdZ+j+IM7gc2s
+s7jBA0OLBRcocmyjG/i44DQNJWkHdSy6UyLtvTCgf+aZKkpUZYFbqGW9bmfKNLAl
+OCk1Zsfn2I7SkdDidR1BEC7fJjUsDeMPu6wAiqUcnpCeOpTu21sLGjnCHgMwI2Fv
+gDLAH+IxUsgv6ut5YsOXXEwkwHJDjcOyNLXJyKze4wOBfh3vjuAl06ddliJA6MnD
+gxakEaqkow/+r84T2C9Q
+=Zjm7
+-----END PGP SIGNATURE-----
diff --git a/net/im/ekiga/ekiga.SlackBuild b/net/im/ekiga/ekiga.SlackBuild
index 313639c6..37d6568f 100755
--- a/net/im/ekiga/ekiga.SlackBuild
+++ b/net/im/ekiga/ekiga.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for ekiga, by rafael
-# requires: opal gnome-doc-utils libgnome libgnomeui 
-# tested: ekiga-2.0.12
+# requires:  
+# tested: ekiga-3.0.2
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,25 +32,26 @@ CWD="$(pwd)"
 SRC_NAME="ekiga"
 PKG_NAME="ekiga"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.0.12}
+SRC_VERSION=${VERSION:=3.0.2}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rd}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/im/ekiga"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
-CONF_OPTIONS=${CONF_OPTIONS:=""}
-NUMJOBS=${NUMJOBS:="-j4"}
+CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --disable-eds"}
+NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -78,12 +81,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://www.ekiga.org/admin/downloads/latest/sources/sources/$SRC"
+URL="http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -151,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/net/im/ekiga/slack-required b/net/im/ekiga/slack-required
index a3bc9b66..7801ee91 100644
--- a/net/im/ekiga/slack-required
+++ b/net/im/ekiga/slack-required
@@ -6,3 +6,5 @@ gnome-doc-utils
 GConf				
 libgnome				
 libgnomeui				
+ptlib				
+avahi				
diff --git a/net/libs/libproxy/Manifest b/net/libs/libproxy/Manifest
new file mode 100644
index 00000000..5f7cb454
--- /dev/null
+++ b/net/libs/libproxy/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libproxy-0.2.3.tar.gz 378773 MD5 86b635e1eb2d665cfbef4c6134fe6604 RMD160 c86c4f8403cb879380e101d074af469c960b5c1c SHA1 2b2b00a179740548035a1145bbae600db9b0a2ce SHA256 59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a SHA512 6b5619f7bb060258215e6de40f2d3ec903b8492599922b5e6a5affc0fca83cab8867980415c6a6356f6e649fcf4038359491ada30b089a04f67f4f984d7a7173
+MKBUILD libproxy.mkbuild 4842 MD5 63dc198276072c91f8d1893cde5b9321 RMD160 6b54b9d7d874b554bee022faf5437a1eca7fb6ba SHA1 a87a8416e123c3fca2d5a0f412126d5489d4c591 SHA256 5fcdf9609b3189e5ee87c7783ca5e6f142cb6804dbd1b3afeb12d24354dc4014 SHA512 d9e0541e20340fa0bf2f020d5dea0c015d21b7c049e2ce9c0f68c31fe1d2f65fd0219756b7d8bf964c7b7111a82799c82b51b065b8daf943ba2323eff796b04c
+SLACKBUILD libproxy.SlackBuild 6903 MD5 f9ee991cd88e8565269449243e9b0770 RMD160 04cd5b82dc9b2c56e62f2dfc2a3e4df89788e8f7 SHA1 787a1e90b841860b19c7a9d70421aff07ccc658a SHA256 604ae520004a315236276d6a6d115f81ce18bfe8867844d1a29a9b26f1804bb1 SHA512 c21a171c2c67a459abb07715ffdf7ff74e843d5da8cb0f1c5a809a215e2e829e2120ecc1d9de8386ac5faabd8f9bc9b84fc18d9e42e86dc549da6b719f308df7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyZ1yAAoJEEHL93ESzgeiDdEP/29htVr7C5SZjnspVdsg/I7I
++0S/uX9VTNRQOZGbpwLR5cXbxSkpzbgXM5b9AUHS5fk/IY0srjojrDdpJfbBeYqz
+RcmIi9kf5xLLpZTYuIuXHOvNVK+EpjcVnAqDbQ3Lo9TG6gXj+C5xE9CsDKZOrhyA
+olcYr4EqwSWr14ogEjjyKyiUO33fe3IML2r5AFkK+lXgJKbOfFJJ+htLrAIKYkHQ
+U+MDsje1QSdvAzbv/N5t33bDKoBY7DypDwigQ/mnj/7DViDNce25g4OZaiQc1dpc
+NLhFasgNfq3ctaho/ZAXHtsvJZL2DoxtLaAbq3dNPt6bLwCqt5p2Q4odyiAVhgem
+Cb+uaRdpx7OG4bM+IwFZMKeDoQsgrlnUdmFaCSMzf8c6bLgxGDfyYsf+GWqI4uul
+hqTNDG2sMZYmKQnbr9htgVAtZkFJ6Xeu5efRe1qInj+uVYmIUdkfIop7fyZxQNTX
+LqdE6FuqsNBKCxshX1wzv7wanBIuS4cLXEskjUeiiZDAtaR0DaQEPZyYMjQm2Rqd
+4YbvcS5fhoAZvjlFoyy8UKzxmfoLgq7NEeNEnvqOPZ3z6mH3xB2mXSnFvyJMh1nR
+dz4AzadhEi+K+l8z8kxHXKaNxrLbPHw6M7+lSL4OTGFzBDkvIGy96WpsitZsiDDd
+2iLFC9mJYMRjpFlYYlof
+=r062
+-----END PGP SIGNATURE-----
diff --git a/net/libs/libproxy/libproxy.SlackBuild b/net/libs/libproxy/libproxy.SlackBuild
new file mode 100644
index 00000000..04447ac2
--- /dev/null
+++ b/net/libs/libproxy/libproxy.SlackBuild
@@ -0,0 +1,223 @@
+#!/bin/bash
+#
+#  libproxy.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
+#
+#  libproxy.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+#  Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# slackbuild for libproxy, by Silvio Rhatto
+# requires:  
+# tested: libproxy-0.2.3
+# model: generic.mkSlackBuild $Rev: 796 $
+#
+
+# Look for slackbuildrc
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
+  source /etc/slackbuildrc
+fi
+
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="libproxy"
+PKG_NAME="libproxy"
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=0.2.3}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
+BUILD=${BUILD:=1rha}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
+TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
+REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/libs/libproxy"}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:="-j4"}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
+fi
+
+# Set error codes (used by createpkg)
+ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
+ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
+ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
+
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
+
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
+
+# Dowload source if necessary
+SRC="$SRC_NAME-$VERSION.tar.gz"
+URL="http://libproxy.googlecode.com/files/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
+  wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
+fi
+
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
+# Untar
+cd "$PKG_WORK"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+cd "$PKG_SRC"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
+
+# Add package description (slack-desc)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EODESC > "$PKG/install/slack-desc"
+# 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 ':'.
+
+        |-----handy-ruler-----------------------------------------------------|
+libproxy: libproxy
+libproxy:
+libproxy: libproxy is a library that provides automatic
+libproxy: proxy configuration management.
+libproxy:
+libproxy:
+libproxy:
+libproxy:
+libproxy:
+libproxy:
+libproxy:
+EODESC
+
+# Build the package
+cd "$PKG"
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
+fi
diff --git a/net/libs/libsoup/Manifest b/net/libs/libsoup/Manifest
new file mode 100644
index 00000000..89b21a75
--- /dev/null
+++ b/net/libs/libsoup/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libsoup-2.2.105.tar.bz2 505095 MD5 7fa48b06a0e2b0ff3d2fa45cf331f169 RMD160 c6850dbccd074ab5bc3178248d139ecc953fde63 SHA1 45756c61d48bc9ec3919d5375b06d952bb65bf58 SHA256 3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f SHA512 00e60bab053a3924733f7c1638f5e1558c7ee437433f5e8b5a3a9fe9d274cf88dde4bd778f513a2b683fe3e45fe12be2cab978958840bbfc541a76f03ddc29fe
+DIST libsoup-2.26.0.tar.bz2 736527 MD5 9df9d2b3304213641d3214a774d75ee1 RMD160 51ddd3fb779be777be886f26a90366d746fe6ed4 SHA1 6236dc3795da226b52ae3087ab447111d4efa648 SHA256 47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d SHA512 e12cbfff590af9cda97d84af4f863b8c089fa578c77782a460b0f74c8610733263be16843d81dd01efebed7d97e6af7808b460bb7aeaf70a0aaa681fc174c5bc
+DIST libsoup-2.4.1.tar.bz2 627890 MD5 d0fc91ccb9da401e9e40d2f4612bdac9 RMD160 8e3877aa929089a82aaaec3ae6d0d63e4cc82cca SHA1 a63a1124abffa1a335642c78ce87a606162361dc SHA256 774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd SHA512 fde5e775aa2b453919598f2ad4441286395e387599e8e2c09b21d077ffc9da34038b2647ffdcb9bcca69676b4b5d37ecd45846cfc3e0d4db4774d655597b2b66
+MKBUILD libsoup.mkbuild 4909 MD5 e6cf6bba657c5f83a1379af014cbc6dc RMD160 b5f0634462af94b8d4e0e77cb5763626a7b5b286 SHA1 8e5cf7f4b603bff5faec3b8aa5a2cb554393e7da SHA256 71c8a694f9b163acc7cd992d16d71968af4d3f86c8a844e0270b29fd6e27e1d5 SHA512 cb20d19d574437df590efa860f3192084fd994481f35d1d04c6623e7f985078873d536abd958f341dfdd121f3dc0c8f3dd031cc655ae62461af8e5fdd11f9a35
+SLACK-REQUIRED slack-required 80 MD5 e8a4078293e9072abf34c37721ea5076 RMD160 64581f68b0a5158f40c0086d05e72e8a96d25388 SHA1 7f8855d8b9a9fd162dfcc7390355ef6aab9f018d SHA256 1bace51a3df6d512d096cdb487206963bd6366abfbe71e95cff3a0ed4f71f261 SHA512 c299a8a8845337b2bae28e17e773d77ca28d4bdf661c2ce0c8a51d3b9038d2d692ef0b7940062ff47984b9737d59907a994b7324fd279b55f666ee02f145a467
+SLACKBUILD libsoup.SlackBuild 6959 MD5 e321cca264706252f435f4dccef253b0 RMD160 ae60ea9c7f4f7d68789c27ee7e3559ad34da883c SHA1 6c3aa5342323641534912b92bc55460e8fb31210 SHA256 957b848a8e791a7633435f60829f435ba5c9b91fd9657c82d760fac2e6e4f47d SHA512 d7fb236361c7cc73b55f4d82e3ec6e7f080547f4f21c59126d1229a5a3b4131367ae5a630e2f249260a07d8cf8d711fddc1e7ff1fb13c58c0de5f3525902cd7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyajoAAoJEEHL93ESzgeiV4gP/1WPuUj8hoa3SrBS5UAHktrB
+FBDKAyXohaQxruQL5aIssNnNAarvB0IC7YtQ0WzCC9sa9scokyoaJ4xbGcMF+jpW
+9jiQoB6ysbSLuOARpn9AlEL3SZc2OUfdTrHmuuvbBeEoCM7fFxiz90PKuBuEUkMn
+jULFSmxp8VhKJ4g8cseOkdfIUzjgTVNOWpIa6W7H9sKrukYcE14bE2ZOcEeFBGXy
+SzdEmcVNjUiEfDrxXOlDExW58CqmcFSrFaTGz99SN9luWr75Ibx1f4TmIGIDhZf8
+uvqoTa+cV6JY6Xc9olmFYgFrXYj4U9/9cnphV5nuPMStKMIjPtV09WGi0lMRvMFl
+u4Z/uqieiueyj28nw4DskQ+ZXaoUOiJ774Z1EPfPsTMk3d1TIzKqcGRWUuz8bN5A
+UKtD0KxkLndjCCOw7O6qMAP6EOh5TIvcZ2XId1qlHwL3PXvuzpKtqVDY8KjuHt65
+glNttUe+3VaqI7zNoi+Tym6ns2Mm06qrN4avigrrVpuiSagabf9jgFU4HuYtKJIr
+RCp6EGkAeqFE0VtU+pHs4fDohmbIIVDH6Qw/fRRo+xsgt2b7tOggMulzWZITHprj
+LITK3hFygaGP18nP2ArNudddhOP0C06CZVKR3W3GM+RSpqZlDeY6QdfJHnGs6om0
+m/5eXJXM1VCBrhQTsqx/
+=5fwB
+-----END PGP SIGNATURE-----
diff --git a/net/libs/libsoup/libsoup.SlackBuild b/net/libs/libsoup/libsoup.SlackBuild
index 3fd81069..6fa1d7b7 100755
--- a/net/libs/libsoup/libsoup.SlackBuild
+++ b/net/libs/libsoup/libsoup.SlackBuild
@@ -1,133 +1,223 @@
 #!/bin/bash
 #
-#  libsoup.SlackBuild is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
+#  libsoup.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
 #
-#  libsoup.SlackBuild is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#  libsoup.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+#  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
-# slackbuild script for libsoup
-# by rhatto at riseup.net
+# slackbuild for libsoup, by Silvio Rhatto
+# requires:  
+# tested: libsoup-2.4.1
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
-if [ -s "slack-required" ]; then
-  echo Recomended and required packages for building libsoup are:
-  cat slack-required | sed -e 's/^/\t/'
-  if [ "$INTERACT" != "no" ]; then
-    echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
-    read crap
-#  else
-#    echo Sleeping 3 seconds...
-#    sleep 3
-  fi
-fi
-
-CWD="`pwd`"
-
+# Look for slackbuildrc
 if [ -f ~/.slackbuildrc ]; then
   source ~/.slackbuildrc
 elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-# default settings
-PACKAGE="libsoup"
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="libsoup"
+PKG_NAME="libsoup"
 ARCH=${ARCH:=i486}
-VERSION=${VERSION:=2.4.1}
+SRC_VERSION=${VERSION:=2.4.1}
+PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
-SRC_DIR=${SRC:=$CWD}
+SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
+PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
-
-if [ "$ARCH" == "x86_64" ]; then
-  export LDFLAGS="-L/lib64 -L/usr/lib64"
-  LIBDIR=/usr/lib64
-else
-  LIBDIR=/usr/lib
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/libs/libsoup"}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:="-j4"}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
-# -------  error codes for createpkg  --------------
+# Set error codes (used by createpkg)
 ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
-ERROR_PATCH=40
+ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
-RTOOL="wget"
-PACKAGE_EXT="gz"
-SRC=$PACKAGE-$VERSION.tar.$PACKAGE_EXT
-URL="http://ftp.acc.umu.se/pub/gnome/sources/libsoup/2.4/$SRC"
+# Clean up any leftovers of previous builds
+rm -rf "$PKG_WORK" 2> /dev/null
+rm -rf "$PKG" 2> /dev/null
 
-SRC_DIR="$SRC_DIR/$PACKAGE"
-mkdir -p $SRC_DIR
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
-if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
+# Dowload source if necessary
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.4/$SRC"
+
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-TMP="$TMP/$PACKAGE"
-rm -rf $TMP
-mkdir -p $TMP
-cd $TMP
-
-tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR
-cd $PACKAGE-$VERSION
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
 
-if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
-  patch -p1 < $CWD/$PACKAGE-$VERSION.diff || exit $ERROR_PATCH
-fi
-
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR || exit $ERROR_CONF
-make || exit $ERROR_MAKE
-make DESTDIR=$TMP/package-$PACKAGE install || exit $ERROR_INSTALL
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
 
-CWD="`pwd`"
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
 
-cd $TMP/package-$PACKAGE
+else
+  exit $ERROR_MANIFEST
+fi
 
-find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Untar
+cd "$PKG_WORK"
+tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+cd "$PKG_SRC"
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
 
-mkdir install
-cat << EOF > install/slack-desc
+# Add package description (slack-desc)
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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
+# 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 ':'.
 
-       |-----handy-ruler-----------------------------------------------------|
+       |-----handy-ruler------------------------------------------------------|
 libsoup: libsoup
 libsoup:
-libsoup: An HTTP library implementation in C.
-libsoup:
-libsoup:
+libsoup: libsoup is an HTTP client/server library. It uses GObjects
+libsoup: and the glib main loop and integrates well with GNOME and
+libsoup: GTK+ applications. 
 libsoup:
 libsoup:
 libsoup:
 libsoup:
 libsoup:
 libsoup:
-EOF
+EODESC
 
-# docs
-mkdir -p usr/doc/$PACKAGE-$VERSION
+# Build the package
+cd "$PKG"
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
-
-for file in $DOCS; do
-  cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/
-done
-
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
-
-if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $TMP
+# Delete source and build directories if requested
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
+  rm -rf "$PKG_WORK" "$PKG"
 fi
-
diff --git a/net/libs/libsoup/slack-required b/net/libs/libsoup/slack-required
index db5ab1b3..db5940fb 100644
--- a/net/libs/libsoup/slack-required
+++ b/net/libs/libsoup/slack-required
@@ -1 +1,4 @@
-glib2 >= 2.15.3
+# Dependency list to libsoup
+#
+# dependency [condition] [version]]
+libproxy				
diff --git a/net/libs/opal/Manifest b/net/libs/opal/Manifest
new file mode 100644
index 00000000..41afd304
--- /dev/null
+++ b/net/libs/opal/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST opal-3.4.4.tar.bz2 8135224 MD5 01e76bc1261ab6c5b537387a81e7fdd9 RMD160 2f359f1226dd074a47155298bd7bb5cd19d572df SHA1 b7ff5a449355a5d5d133b2f06f79d6156b5f8403 SHA256 3ed39e1dc74b4e1adb3d8a3430b18bcfd19d21406375faf420cbdcd5499a4594 SHA512 91eddd1fe57fd048ecb7b9b08331001373102afa9e81dcd9c72108243784d6ff55af93dd84f936e17c83228b392578e488b130f7086bfdc2ff94e465615d08cd
+DIST opal-3.4.5.tar.bz2 8000318 MD5 5c53c26bbd7ac9b06acf51edf9c0fd2f RMD160 71125ff5237d3efd9c534ce23fcd814614b1fbfb SHA1 2604489702f19860f18b24244a9bd16504471e64 SHA256 efeeaad5a6d6eff7952a9f4f896fae31b0bb852e07a863f6f16f08422602503d SHA512 5018a9f7c71133c3a3f834a5e0a066f01a6d0b5b8084144dc4ce020f75d4d3bac092fca9a0492f87d1e8cf9d1b6f0b0e28a4c085cc287904915e4c2695c76fca
+DIST opal-3.6.1.tar.bz2 6993734 MD5 c2b4f12822cef2182267ea0d020bddf6 RMD160 3a19a46d67957d26b3261804e1489ffd83ef1662 SHA1 989bad4d3bc35828da8198740eaabe249f4c30df SHA256 e6b48a294b35449c851c2a6ea6969041ed7f4148e92b3faa03a330b7bb5a59af SHA512 f2a9049a61d853bf6d14a6b63206083030c67579c3e19f6f6252a33720a1f827226eab36c918a56719f326248d37422f1d1a0f51cff102ba48abc8f6a05f47c4
+MKBUILD opal.mkbuild 4307 MD5 935c2d8afaaeea26d9a49c808d230db4 RMD160 58b72dc9976647cc23c39d5325103b1f9a8af25c SHA1 ab4fe7e7edb59b80a26be818ee5c272851c70f44 SHA256 b9d8564ed9110c6d1a1b90ea4ebd60b3a119e823b433aea564f5654cabc1bed4 SHA512 f6bd78a20c827e8a5493089afecdfefae48ae3c3fb4c64015f680541360e1a4f74a9d873d379e9ebb3ba2e2defd8b88bb4f043d169aad7696c9e720d54a51a98
+SLACK-REQUIRED slack-required 74 MD5 b3dd765ba346ea9c31b4cfd256123c92 RMD160 237a3df437a602ab46d4a335a4c96081ed611df4 SHA1 83e0fb9473ebe9d8b5d6f90085877b3d647e4194 SHA256 a0a7a9e01163a758f629508527c72d4183c425e4f5489059c605d8b279de6fcf SHA512 bdc31c0488b71b8296e07c6199cc0d235181662e9b8253aba4cfbe3835a5bc775f8540e3d74c147c7bc27ca9bdbbedcaff54a9043980ddc79c9c4ec8cc47154a
+SLACKBUILD opal.SlackBuild 7316 MD5 cbcb72b6ffa6f353fe1061820c384710 RMD160 64d6f1a4da55cfad7f034a3a36e30f1759f43e49 SHA1 9b299926db0222dbea068e37a53208b053b0270c SHA256 b5f53daaccfff42024db252beea20cad4b8aec27e960729cbabafa2d22ef7843 SHA512 7198b6304ce21f5cd4e99ea4cb694d0fc03d233d0d9610bc2f80a680171bd38ffa9f6089be2c5b5f2b11c6bce3dc0bb8cea9060b8cc13811d54e540b669b04f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJyjIdAAoJEEHL93ESzgeiWGQQAK8b5f60NtNxhHBhMvMf3Ayy
+tdTjap5Mh4DN991NL/VOqFKf2EBEbSMXzObg4k6lphopU4LWQ+DtPveIG/n41BgF
+JzCXUskl0sDoxPFrz/ebpT5ZUCV/VT5YR93nJttkHNYQ5PmpCqo7JvOUp0s4Jb4C
+X8IAyy4+rhYfvNAf+ysoSdKuaUul+7e5M6U5ZadKle/F6QEf82sQAW/FYXvVq0h0
+ygAID6JPli96FqKVmaVN/sSAbzWZiTn9UZ7FjmD+IPuEXbnjI6vwOoEimCDg0j11
+CU88PlKZxE/JFPNQEQ2gYqeJmnwNpCEkY/TieH7Upi0UHsdsBdymCE8SeZvsyxTz
+lO1NdqVcOSLJfGiiNCnBs8V3ocDRu/49EctXlUq6bFqaInGbJ+FOZ4oKarDK2xiz
+x1pr3MQd9XIcZUzR1hwy9Cm6mG2YDHRsJg6CylD1z8p3Zutfc35U0bDp0zB2CVqN
+Poknz5IKi8ye0pXA0ba+oSpm84tYN51OBvM+pJibnw08xNZHytp7NFNbhLdoCWMn
+g+6OSebdDtWyNwIzhw2pGG+qZYKlgzSQ3STP+hh3jMQyYpyK22H8tVt9pd3NFgr0
+1/Fa55Y3j4rKpPdZ6QrX6xtROZgCRppurK3cv0H79GyTlmc3bxOANdg/98qpKmvY
+E3KGL70oNKYphyTf0MOb
+=XtOn
+-----END PGP SIGNATURE-----
diff --git a/net/libs/opal/opal.SlackBuild b/net/libs/opal/opal.SlackBuild
index 62773ad6..5a534112 100755
--- a/net/libs/opal/opal.SlackBuild
+++ b/net/libs/opal/opal.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for opal, by Rudson R. Alves
-# requires: pwlib 
-# tested: opal-2.2.11
+# requires:  
+# tested: opal-3.4.4
+# model: generic.mkSlackBuild $Rev: 796 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="opal"
 PKG_NAME="opal"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.2.11}
+SRC_VERSION=${VERSION:=3.4.4}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/libs/opal"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -77,13 +80,79 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://www.ekiga.org/admin/downloads/latest/sources/sources/$SRC"
+SRC="$SRC_NAME-$VERSION.tar.bz2"
+URL="http://www.ekiga.org/admin/downloads/latest/sources/ekiga_3.0.2/$SRC"
 
-if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
+if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -130,17 +199,17 @@ cat << EODESC > "$PKG/install/slack-desc"
 # customary to leave one space after the ':'.
 
     |-----handy-ruler---------------------------------------------------------|
-opal: opal by Slack.Sarava
-opal:
-opal:
-opal:
-opal:
-opal:
-opal:
-opal:
-opal:
-opal:
+opal: opal
 opal:
+opal: Opal is a full-featured library which supports:
+opal: 
+opal:   * Low latency RTP stack designed specifically for
+opal:     real-time multimedia
+opal:   * Full featured H.323, SIP and IAX2 protocol stacks
+opal:   * Audio codecs including G.711, GSM06.10, Speex and iLBC.
+opal:   * Video codecs including H.261 and H.263
+opal:   * Run-time loadable codec interface for proprietary or
+opal:     codecs such as G.729, H.263, H.264 and MPEG4
 EODESC
 
 # Copy slack-required
@@ -151,7 +220,8 @@ fi
 
 # Build the package
 cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
 if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
diff --git a/net/libs/opal/slack-required b/net/libs/opal/slack-required
index 4bdd4dfa..5fc871b7 100644
--- a/net/libs/opal/slack-required
+++ b/net/libs/opal/slack-required
@@ -1,4 +1,4 @@
 # Dependency list to opal
 #
 # dependency [condition] [version]]
-pwlib				
+ptlib				
-- 
cgit v1.2.3