TracFootNoteMacro: adding TracFootNoteMacro and updating dependencies

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2131 370017ae-e619-0410-ac65-c121f96126d4

8 files changed, 397 insertions, 21 deletions

diff --git a/dev/python/genshi/Genshi.SlackBuild b/dev/python/genshi/Genshi.SlackBuild
index 9516ad86..f3344aca 100755
--- a/dev/python/genshi/Genshi.SlackBuild
+++ b/dev/python/genshi/Genshi.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for Genshi, by Silvio Rhatto
-# requires: setuptools 
-# tested: Genshi-0.5
+# requires:  
+# tested: Genshi-0.5.1
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Genshi"
 PKG_NAME="Genshi"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.5}
+SRC_VERSION=${VERSION:=0.5.1}
 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/python/Genshi"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -142,7 +211,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/python/genshi/Manifest b/dev/python/genshi/Manifest
new file mode 100644
index 00000000..2a1a2251
--- /dev/null
+++ b/dev/python/genshi/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Genshi-0.5.1.tar.bz2 303939 MD5 822942bbc3109da9f6b472eb8ea4e3a4 RMD160 f24143e4930d2a2afc3655c5b1764a38664efbec SHA1 c00e30a00e605b29fcee8322ff933dbb6c2d31a2 SHA256 3aa37624fc42b1ccbfc992344e1da7085e43ddb6b4e57a368da9fcb7ffe05dbc SHA512 6ca314ab6678bc2c62fba74518715c75d90e2663c021ab927bbeabccc295ed0de5abbb4d26ab268173009b360962a58294813f37f15a1bfca3a035f21bb7a697
+DIST Genshi-0.5.tar.bz2 302637 MD5 d8514ce763330d450bfa55869b375e5d RMD160 a04ab15033857abd64a4cab7eb1e536c1d298072 SHA1 b5166105a228da7d570a4bebe9d78854bc5f8b41 SHA256 e20311781919d86e6012f791e777e85f3b61fa88a85525aca065eb457d728004 SHA512 83c7117fe47ed55b26bc702e94e8048c046c95db21e6c01ef93fbd8cb2ecc429472d1f13be1638d05609c41d22899fd8bc19a22bc0b8acc4cca1a7034695b163
+MKBUILD Genshi.mkbuild 2766 MD5 ddd0b93f9f3ec817398cc457e939c10b RMD160 3f4dc9a5dfef9babdc14db115ab9229f4f77127a SHA1 8b373e7498c9b8b29a276aaf6e9bc15216446fef SHA256 b24e99bc947148f3fccd8176e5f4d5bbee0a6cfec7864283f39bf740cc0820ba SHA512 763fda16f3807492a88878e3736c5eb7d94da5b4aa42fb018ef63220111b45c1ca34addefcd8191ee64b2f0ee2637eacc922a1e0c5b1fe1f3c136bc6aa82f3bf
+SLACK-REQUIRED slack-required 81 MD5 fb05a05fa9be8186bad68b1d564e90fa RMD160 ab8f9cc13fb868a1a13dabbcb4cbfe342a013c4d SHA1 c465da3bc4ec63560f9a58926b037df61c8e6017 SHA256 e2b54a7c7bb00e738568a31f210e3c10303aae2cfdf405f58d0259c6321e6510 SHA512 ec083f51a9d8061a52733b77eff3a7d809401962d7f528a2cf121fe3e7825dfeb8936a7489f957b874b9a5415ea221580bbd6528b261788b8be12debaacba96d
+SLACKBUILD Genshi.SlackBuild 6909 MD5 1ef2d25a18c6ae1fff245a60d0c639b9 RMD160 15257be6409abfa878754e619fa47798d5b00921 SHA1 ecf8339254b1e06ee0ef6a22e7e771a4df44aeec SHA256 bff4537d42e8db1b52edb07c98a5152f79eefa4a75afa2cc99e33422d0c1bbcc SHA512 5234dc586bc97d9cc5ca08754db41fcdf1777e0109d0521709b27c5b0bee05854549547085cb4c1fd60acf1e51e9928b6e00d664e82f2993619bf285602979e4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIbBAEBAgAGBQJJ0749AAoJEEHL93ESzgein2wP90V5ksJWnbl57VGzY8fQbreK
+NTAwEVOZ8XgcnIbHlNkBTWPDEruc3QEkS8UcaTfrOjY1vgj3U6Xx+iZ4cnpxSB92
+04HRDrzgKqtxjcem5KMaxjbVARsgTFsi3YcSKHDaYH853+6cnDi8Nj0XzPepNWQX
+0SGZ0jR9tZVX0eeTrO0AjwNTECgc2A737rfnIiSLsOkHasT9FWFqn1uB9Vof9ELR
+x2WvjaB2rIN8GaEqpsuwxJo0R0MFj+YwbdA3de4c5Fx5eZ3XwfjjnCuuAsH1UUqv
+/FtqtRmYLwMRzTM0jqskRtW2ILcSGiJejEsi4xCestl9VT6pLLiDsMzrZ4nqDe1L
+93ckPYc0tISnJWfAQvFRHChonBPT0py5hjtgjBGRVklnJeIS6grQPIrWHK00pD3p
+wDTRnSP64DrYVovb+82OP0K/lnHtn/TfQVJnj/Ux8D9MG54TUC9SZaQWmG2oB0d2
+Gdyi9RTZWxSrOP1CVIOiu03xKJV5uj5d7JH78bVkBsBNWvE01UEzjUcvTIHr1ReZ
+ZkhaMmq9It9goJevhMWe+tscARhP3o0ggt3irLCUxNv9ptdopaCM70HPbAra9v0K
+B5VEY9ex/abwAhxP0KESUQsk9ktph+809ytQsNuvYQA27jPp3Az7mGXi3tpz3qdV
+cYc+eu8cNNjgE8chzEs=
+=IG1K
+-----END PGP SIGNATURE-----
diff --git a/dev/python/pygments/Manifest b/dev/python/pygments/Manifest
new file mode 100644
index 00000000..65b7070e
--- /dev/null
+++ b/dev/python/pygments/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST Pygments-0.10.tar.gz 836229 MD5 1f24bee773010d0d53690a6f4bdc8bdb RMD160 8bfe3e3f9267f8f9366ff4dd2c3ae9b10fa778d8 SHA1 09ca526b40655db993fdc9f1c1b89de525f32080 SHA256 62a73fd3a009804910398aac2c5850609b7528d3e04dd003b0abd0f068bf684d SHA512 c03b2bf13f2efa009f5ea5974d566d46d7a14dad1ef8eeeede20555f9bb1ab401b27520659e93b1947296d9b7484c9ba5573781f51a0f3efa7d74490cb97c711
+DIST Pygments-1.0.tar.gz 930751 MD5 70c40ff5331460cabfcb24f86a8d451d RMD160 aa9d4816bb1bd1b67a5e6ac0f94d9ae3410df71b SHA1 b71e33147fc402e361227b30e1f589eecafd42a7 SHA256 bbd1e8661e674b359a1717f13bfa9b2ff84991469b4fc3c1fa5c4d78b40766ff SHA512 dc285e8a8ef94658e78e4a0f3129d27f473edba0ceeda6bb84be5338b4942b7a9c03438b442fe192c69fa1c2c3a406ba18f2f812c0d1aa5123da4bf14134dc16
+MKBUILD Pygments.mkbuild 2479 MD5 166a810e4efc272c0da215d737eb3060 RMD160 3e63d4b8f4849addcf427de7a9fd568a4b133527 SHA1 c27b7861cd458bb8fdd1e85f271e7bd2b22a61ea SHA256 e0d825bcb4da791e1d3f4c91012b8bc4adb62bfb689f436253e074c037e3bd5c SHA512 8b96819d80dacecbe89f0621af0ca15199d3b686ab161c9517eb5fb5cddbb856ef15a619104886e8944cb0de0935a30f775beaa8ca2c2625fbaf8c0445c75375
+SLACKBUILD Pygments.SlackBuild 6669 MD5 156cebcdeb36283b1e3730fefa2e1e72 RMD160 e7a7c7c82c1b21c6fdcb5f4dfe4a3feacdcac8ea SHA1 a04f8c5521bdd9055d18b46b969fca912ce47ae9 SHA256 a378c9ba02cc0a5735fa7ec09c3dc6f2259f0776eedddbed25af5b13a33af6fd SHA512 7829c8b0d033bb7f1436c203a3cebd4542e8c6a5c09bb008bf3ebdc2f7c8b205674ef532ce77860c3366e7f5074df1c4e4339d60c39ab5a36c9b0db8f4759d2c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ072BAAoJEEHL93ESzgeiE34P/0d95aqB40zcOkCixeO8aKB7
+yA2wFsDDwyuXlApzgxGBhPgTIA+E2Fqo+ok6JWTSkBPHcp2Z1WUoLeLSrD12YtAS
++U2nVJf7ZhPLakwT9cgtpUbvT+ZPLpzsAog5cJoEVuMsQYE60otxUX3IGSbyj9KY
+3tJLaBD1C32c4iSfhjDzt03c5wfwXwCTQ5h6rO0ibHHFnk6blY1rMr2xc1fpic2a
+dCrGLMg6HNH3v2V+s9c7TBIVGarBd51NC6uArlrg5gTv8XzzCitY5ofEvh4NzeCn
+kTLab/jPCfX9YCojJQDVQlrQSQMSIhPmdtAo7HfZQ5d78+XvVuBRR+6DSirqAywq
+66DEvdruqevMQ1t8agKYLNoWIRDSJWR9XfiuFyKDB8FTycZFafmbcYNVc48+1/o7
+dAZbmp1EQpwHHCtPenrxkoYUtOmDOYgo7RYLOMC3QZLIjEAtVdTw+HrfRBLHV5E6
+9QCEUNk4hCFr61kB1ngeluUK+VQf4FhQHKfFH4Jr5V7In8kouLhIabhEHxfiliq8
+x7H53zgBHpaFmxdx8g+BFQ/xwhSVhA9RUUUl0hFiXA9D1F96I7Mh3wPeNB5REbt9
+R+1aC/6jUHGAQE4cMvqZW4DnBZZUel2jcqQ+U3tnW7bGApJUkXxnOkbnvVqemR3R
++wel7EqSPwol4ejDyHp3
+=mDjY
+-----END PGP SIGNATURE-----
diff --git a/dev/python/pygments/Pygments.SlackBuild b/dev/python/pygments/Pygments.SlackBuild
index 290570a5..c0a9c304 100755
--- a/dev/python/pygments/Pygments.SlackBuild
+++ b/dev/python/pygments/Pygments.SlackBuild
@@ -16,7 +16,8 @@
 #
 # slackbuild for Pygments, by Silvio Rhatto
 # requires:  
-# tested: Pygments-0.10
+# tested: Pygments-1.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="Pygments"
 PKG_NAME="Pygments"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.10}
+SRC_VERSION=${VERSION:=1.0}
 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/python/pygments"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -91,7 +160,7 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Build and install package
-python setup.py build install --root=$PKG
+python setup.py build install --root=$PKG || exit $ERROR_INSTALL
 
 # Strip binaries
 ( cd "$PKG"
@@ -136,9 +205,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/python/pysqlite/Manifest b/dev/python/pysqlite/Manifest
new file mode 100644
index 00000000..8b5a2b44
--- /dev/null
+++ b/dev/python/pysqlite/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST pysqlite-2.4.1.tar.gz 84996 MD5 7d9a4875a7107b94eb4aa2dc861a2537 RMD160 693f4d789388ef0456449d01b0d342aaf1990832 SHA1 03d2c52c65e017e657d852c0583aa39bb6563a73 SHA256 8240f1ac057e2e38982cc0a8a1299bd88c7b84ef144487f3c7c6e01a34f2c807 SHA512 9240ac97ca545313c9d6cbf50da2348a4e6d8cedea443ca75e72dcd1957e6cf99147a3ed3421a354da602bf63a1e102682802dc5105ec67514ec9a3be5ea6283
+MKBUILD pysqlite.mkbuild 2650 MD5 a9fdafb328bb93cf611b2112934931de RMD160 44152091cfb65b9af2afc17404968ee7b8f82948 SHA1 05120b15b200417cbadb71a1efaefaf9c856701f SHA256 c84e472c45187fd7d7cd02a86d6093fd73f8d96b124f53bbfe4bdbfa3a66e59e SHA512 abcf99767cfc898252b8772333ad3ec26af9f9f1c1112f14876aba73a0c2d5ee44a3fe815939ac194fab635ac16525ec9a2c7a95012c52e4cb0e2b88a7facd94
+SLACK-REQUIRED slack-required 79 MD5 eef00f70e247114c9fd8e85138ba1dbb RMD160 123f6e9e78a63952280b67ba707a3a1befd48851 SHA1 146fa1e84d6c93f5db5bd6e19bb62e2b953694e2 SHA256 5e9dbdb14a8184cc44b832a52a8c4131ad56d04ec3137b39430cc9c8eb3c954f SHA512 64e434b7139f4e072009125802e58dee72861d054f93ea46a1c7276e91fa82c94a1ab36421cc405074e9d5f221b71750b2a689e04a288df9f71587c3546f9709
+SLACKBUILD pysqlite.SlackBuild 6973 MD5 647a13b5e6020cf4d2516b79a43b0427 RMD160 8443b0e992413e3b95a1eb6adcb0c979220a0677 SHA1 75e0c1bdb7a837551568f754dc8385f2843a0559 SHA256 091a9d686969c7bc4baadd52ecf0931123f2dbfbcfd38ff3118aa008154d7d82 SHA512 cd38240c515d1fd131484a59af29840fa7f187c7c7f860086b19c604d5807172c140826f1c5e456288e5d4073e4ebe0391884b89b64a56eeeae2567a28be3bcb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ07y7AAoJEEHL93ESzgei0fEP/3IMS9HPrzYXaMwxtr5oc4x4
+8EunOkdBegpKGXkCiRZ4KkoOAOUmdfYPErum72bgV5FMpXQGztS6JEoIkl76FKJG
+3qK3tJwQB/l1D1nuUIAx12lHI/AEWHgGpoBM6RARIIjtCpeK6wqTwMYSladEquQY
+8LOLMntlp3MSwXHqdSoqoxmNQZ5xKXNo+htIHnljhufJ2xILclz3ybqnT7MeLP2t
+Ll5Fh/Zss5GieCBI+zrHV/Suysp3YlJllWyTbpyIMSVS9it1pYOWFRlRrItMB5CB
+aZnoOzBKrvoZuuJZkIYqy5YnEFo1LVmmbfnXC6R9nfAuuP0BUhRMObqv5pi6cXE3
+9lu3LHdU09K55jSJd6Hx+ifUTJLSIy/YJAIx98MEGqT+MClNR8H4+/gl7NvUWyuF
+XDxj4cyADYGIR603uXNGYiGRy6/RsqU+Ahk1q6PXJ8L2q2Wbn/eRfLmZGUL1tUxn
+A+qx/v8bVSSYXvyh2V4dPBWaeUdz4Zs7ZYnXTX+OGyxB5Zo9fxeNIs4gatzBf0N/
+kkzNUl8IdK1iUau4K4tx1+lWx2BLGFziQvyeTvRpXglfjeq29X9YIhfSMnTfr2T+
+SBEQQ9uuqlYdkhgMXFe7NxEhT2rJSf91E48EaGyhGGW/KRSLJSHd0y3UGPfJqlvg
+Ux/sfDPMprsMWjTztR4E
+=cdpk
+-----END PGP SIGNATURE-----
diff --git a/dev/python/pysqlite/pysqlite.SlackBuild b/dev/python/pysqlite/pysqlite.SlackBuild
index 0434c30f..7ee8fda5 100755
--- a/dev/python/pysqlite/pysqlite.SlackBuild
+++ b/dev/python/pysqlite/pysqlite.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for pysqlite, by Silvio Rhatto
-# requires: sqlite 
+# requires:  
 # tested: pysqlite-2.4.1
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # 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/python/pysqlite"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -144,7 +213,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/python/setuptools/Manifest b/dev/python/setuptools/Manifest
new file mode 100644
index 00000000..8fb7f1e0
--- /dev/null
+++ b/dev/python/setuptools/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST setuptools-0.6c9.tar.gz 252744 MD5 3864c01d9c719c8924c455714492295e RMD160 bc0ee3821e76b57fd13425b16c4419dbccf95ed9 SHA1 79086433b341f0c1df45e10d586a7d3cc25089f1 SHA256 e6190497301b6cb1484b9e6173723452c8df1b4cd9ea97af75c9589b1c34b3d8 SHA512 d6a51dd7e7b42aa5167baee6ea4b4d0ebff1c1c2d2a81f0668fcaebf39ca6547ec07bf69603855b80290e49cadc7e0a4492915dc3b9c3b0ff07dce36c4fec4cb
+MKBUILD setuptools.mkbuild 2510 MD5 1f6d5c00411300eec74c9ba6c72faed1 RMD160 4dac0aec81fa73eb9fa6f091f6796b47c40b5a9e SHA1 7df3e27e9afd7766fd4c03627e8552cc82f30665 SHA256 35c0be9c26777dc93ab34c6fd0307e8872905f233b7ab5aba33f22d65930c7f2 SHA512 c62b2323808da8f9d46f71e548855f9b6870fa1e4f6cacb016f1e661d5df40d6a791e1bddf684a7785f013c9f652a3795280d866b71cba5a133ca3e2f4e04668
+SLACKBUILD setuptools.SlackBuild 6712 MD5 331fb201e2e481db984176444a343c58 RMD160 adc6f9963af89b0625afe1bdd13de29ccb0627a2 SHA1 46128117dd8ceafa4b1ab95af318cef9d5b10a15 SHA256 2bd5ae0318c0ca6b35261344b3509df327eee78acfe90764354362ce4a5b479f SHA512 e9d9167bca8312971a8f33d09b887f6b0d57d72bcb39ed13d549f69d17aed79332a12bfcbe314acf16e9b320140690c9ee396149bb29767c5a77c3bc4dc8f68d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ07w6AAoJEEHL93ESzgeizHIP/0UkRMKBN3Dn3an2Yvu2WVin
+A5Tgc28kRCULc97EE5lUi+xbrF260zabKSNU+1IA5/bVcxmgc0WblQQsxxHPPDQ6
+0p/jC3dTLAS/aene3Lbog3fakIdr5fZ1r2/amd2GP/5uKbTQN9tsO6Hig6sWXQlC
+0IlwGupbg8p/16phwGJEYv730kSPXeImk9WAxAGd9pD5sz7ivCdCpfhsIoCg49sS
+Xwob/7u9HbiLPWMf3cKAUlTPqkOhc4gm4jGEzlmr9YccrzeXldSH2d8KQdmjXqGL
+sKHI3IftFcuHv46X2MC1/lMz9aX4VdNroNAJeQ7TSXAT0utWDea/o+twmZbC6cXk
+uX8OTMddQSGfQpzFPmLd7XMH5BjdOEZ+B/NsfqcyWkqL38xsp1AgrIcbg7ADwklz
+rW3hvdqsC4YEJt1KQhFjqRRcWmNr582t+JYWnutCSUpbeIQwE3qkGR4c+9pGqZr1
+iq/hv4b31CLvIfZif8+Bdfb4Ba/szFyDfKDkzGRBVMFaGZS4/ZnQu/iCa6rAZyVU
+grf3VtyFzESBEuqxaeXf4dq6Ou6ocBDe8qKFd9C9dZLkU0mPji4hVGexmkOEOnYB
+7mb4mOFCNrQ568NPj/uewmgnjxdhESrHwq09bNrgF8i95rdxg2wLyc0ZYbSogz+K
+tW4V224OnmuIAjPtRwF2
+=WfTC
+-----END PGP SIGNATURE-----
diff --git a/dev/python/setuptools/setuptools.SlackBuild b/dev/python/setuptools/setuptools.SlackBuild
index 01c436ea..419d72e8 100755
--- a/dev/python/setuptools/setuptools.SlackBuild
+++ b/dev/python/setuptools/setuptools.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for setuptools, by Silvio Rhatto
 # requires:  
 # tested: setuptools-0.6c9
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # 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/python/setuptools"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
 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
@@ -136,9 +205,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