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
---
 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 ++++++++++++++++++----
 20 files changed, 1000 insertions(+), 68 deletions(-)
 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

(limited to 'gnome')

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
-- 
cgit v1.2.3