tahoe: updating dependencies

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

7 files changed, 214 insertions, 26 deletions

diff --git a/app/backup/tahoe/Manifest b/app/backup/tahoe/Manifest
index 860d0c28..c44a6649 100644
--- a/app/backup/tahoe/Manifest
+++ b/app/backup/tahoe/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA1
 
 DIST allmydata-tahoe-1.4.1.tar.bz2 2238916 MD5 a602682366d70a6a2f8bb5026fc75917 RMD160 fe290f528ca1f81a0c5d13d2d598a8c73b119374 SHA1 d7a3f0d9a593f148526d39f6c8a382b0be52e683 SHA256 ebe780fb55ca188bcbbdb16aac5eae73f6fe89cd5c9ae2a3a9e3966ec3e8517c SHA512 623ce96bbb4ffd77e4128b0c37e91e573335cb88c57e65fafcf42df949e880ab6be21369c632d7fb6d01fbd69bd5ed890145e80c9c57a2da9333d14f050a7a40
-MKBUILD tahoe.mkbuild 2935 MD5 0ac99ccd890ef96beb66d4873c441d19 RMD160 51971ce9b58b53790df873876166827316206fd6 SHA1 2a6a08f09e2dccd0070002df865075d1f60b4b77 SHA256 db68e8a609717d6dab1e25b766f3d93b65bb356ee76aa42e3918f756ddf8bcbf SHA512 2fa9ddf695bbde9236150adeafa064b9b5b387dc018e4229882e45d0feef9f84016c134c0f610f929b053adfc2033244fc3d72a9f61e3058668a86077c345637
-SLACK-REQUIRED slack-required 223 MD5 4a1dca9716f46125bfa35f9e04d6d078 RMD160 29d0e0829d169ada4a42cbc3e8ed4b6c7d68ecb7 SHA1 5688f34b6f1f41c51b8f74027457263c4ea2457c SHA256 d8599d1c4927d0eddb5f1f6bf83075370cdfa69e899083da53457859a8441458 SHA512 abad9f1b26a82899e1a9f5eb0f25b927ffdb09973410ac4d1e6738871a2063512be90b89d12dac00a95c347b5f6c7622ac5b489ce7a67a5c0aad0c6695f011f6
+MKBUILD tahoe.mkbuild 2942 MD5 5b718d17fbb6d33d2535f5945d6f7fa9 RMD160 cf2ef4758b09c2133f7a1532e61b3bdb5a314e1f SHA1 ffbe826144ea65f45ffb885f8a73374a8a5cde56 SHA256 db4ea7e8ab5af645ff8c6490c4279cd15abdb5ccd697df9d610b4436b52f06cb SHA512 c6bc6909339cc9a86f7f8f09f769bdce7e5f747a9a089705eac6fc2a3ef9709a3ef54f7276222e34819b964211caafed3d6d351be75d8beb37aaeb24f8b34489
+SLACK-REQUIRED slack-required 233 MD5 68d3dcf15f07ff15c258d6bb387cdbbe RMD160 fb587e1b2dd8927ba67ab53a6dac49c0d838813a SHA1 cdbc4ece96534cb9fbadcfd7f3a36d9b1c9954e6 SHA256 2649b283753ac00383d93eb1ebcdb353e33e6765197944825f7e5160e5ba0898 SHA512 6e42fef71e7b3ed9fa745acef678bc1c5251416206ccf222b181be3c63da5203473583056f65710271e146766e85a42333a1249b0f0901a52c1f5c1800d2263d
 SLACKBUILD tahoe.SlackBuild 6910 MD5 d22c1c9a02c0d2a7850b330815d998dd RMD160 bc36def815c9b7f3e35a10e62de475ebe5b11e71 SHA1 83e67b96bd32bb014ccdd3506622837cf4e856b0 SHA256 005e841dc73e1a5b6d9fd1bd60ac3baaee9c39d23ed797dc5bc70479df85f905 SHA512 c8307ca0037302a9f790d5f1466703025a24a18c11e5d61ab202d91a37c745b2b7922895ef814117d071766956e9fe352370ad8c9a6dbf07f0bb4e8211fea0a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iQIcBAEBAgAGBQJJ+xYQAAoJEEHL93ESzgeiQPQQALos7VFWhMGxScDS6Zc0fzDx
-eC9JLUH4C7UGsTS8SbERIb8dnxT6RjfgkxKTwNYIwEmiubgrx2lfT0JA0lu1in84
-t9xKfO5EVaD0Y646PuMEydd+c7BDzESgs2y0GBPL0OaMr4rWE4KnT9ODHvoFoIKC
-v0j1eNDHpa4S1nwnKW5Yv8xTHOZksmPT9ySDWpP/F9P09ijsV0QAEicgQizR6CjF
-DHEeimCY8OLGbBvy1TVI72lOxH68m9mSziIFRJel/JBPz7m65hkLCWFExHznMQAq
-WDcaw9kl7MDOMRC9xEmKtTlETyk+6k5CzN2zXRib4rfcbEIGDzz+v5JVIAtG6FhS
-ifosT16YutwWsBF1TkJMOHXFVuX85082dBOChCUmRMTemb6HVMv2HjznismPp/JU
-BjRHboj8qwlq7ac2R7uS3fVzAtjjXfYMCLaisSUtgb8d9ptNhuedEu1O6Xl0wIeu
-xHElnwzlmrFqhYW2q2HQyTmkPM8WNibpO3Y8p8UzrsLs1KsAmSOvPHMt9CicZUFv
-s0wsy7fVscoi+jrelb8wdNyGBeu5nk2p6L0GUTQm/Qe75o8xB2tK+XAM3+rjXvt0
-+wokcbJrTFB64pruKXB1PrvrYtxBr3Oui+c0+AUrNNIXY7X62qc+T5157hWtxMdx
-mUSMTGbzSea5FVJCxFZq
-=Jo/n
+iQIcBAEBAgAGBQJJ+2AXAAoJEEHL93ESzgei1acP/32KNhxm8FO263txqYbBZo7D
+3fpoF1pqhDyNjzZ/+6Te3XU6Lt5M7O7qOl7P1M8bl67DBUUpxf2TKAIyHKVIjq+x
+uCHxpVSyljDyObsIFJQIJe95Kjj1ZSXyOMgkciYYdm5AbiZRSkw0xmI1yWTecr7J
+xFsUNKZYP3a2sbKDVQzpTQDYM5zDg4o2KUFaJ1ttNqbhyANU+Tan9aWUq9AFDrq/
+3uUOfVYcbUCJQV9e+lU/x/SqBoJYypMLNf4CGeILi7pal90B403oM7IqEKQmkUAq
+x7f14QqFuVT1BXk5UTYnhn2bzI4MAqWQhxa6kRiR8hwWXy59EfEaI8twkRnUiqC+
+X2g/3o03jKBq/X+a/9deGhodV0dWgGbasq7Te/NeaSouH2LulT6S6j1mSI61m5uA
+mzxRhZ1DCnmvRMVgBCeHGd2dMw2oLbM68DwaO0i1Q6G7eHzIQoj7fUUcHL9fyuz/
+sdfTPtcNcsveDOkQQBpbdbhg276fKsJIBdofCpAFLOOoQq8bajglzDFPyC2FaKjj
+UG2VfmW7Ceff56uzHT6uLg6wwH6XPCnzSFB18VHy9PBJefzpGdbZCgOUpA1Gp0vM
+uyJ/63doKOXDYjqhblu8LxfeMJNxMEHFeeKr6lcGjJjS3Y/b4fTicIQIle8TKkNA
+tTCjLI8mKOG7E5DQ9tw8
+=VtAF
 -----END PGP SIGNATURE-----
diff --git a/app/backup/tahoe/slack-required b/app/backup/tahoe/slack-required
index 1851d0a1..98ff43aa 100644
--- a/app/backup/tahoe/slack-required
+++ b/app/backup/tahoe/slack-required
@@ -13,3 +13,4 @@ pyOpenSSL
 pyutil				
 argparse				
 zbase32				
+numpy				
diff --git a/dev/python/numpy/Manifest b/dev/python/numpy/Manifest
new file mode 100644
index 00000000..945a8b39
--- /dev/null
+++ b/dev/python/numpy/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST numpy-1.0.4.tar.gz 1547541 MD5 8f011e9d7697da570efaac61c51725e0 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd SHA512 97d1631639afa248d5ecdc213264dc150a78a5cd7a7c146b34b221e6d538ea513a653e208dfb454787d2ee713b6fd9e406daef555d08e18493a6ad9904eca5e2
+DIST numpy-1.3.0.tar.gz 1995868 MD5 3f7773ff0971a5ebb8591536d8ec7bd6 RMD160 a75155d2014204e16c59857b92356353505c39b9 SHA1 c04998a1fbf7d990c9a2b99a7b62486012c570ac SHA256 7524687cce85aa78103046db5e617c626b0ef871a203a049159f88f35647c90d SHA512 f52027b5e9411a60d98376d9f2f12eb0afa9dc0414abd5b2d95c757e1f154cb1eb0804c4bf4a313c90ae228d61393d2f995728c10721f39a38b0aa64a6bccac6
+MKBUILD numpy.mkbuild 4453 MD5 b59b12bb41dffad1facf3881b70f4c40 RMD160 ac198d0d20c1bc5ef421622a78f8505f7d206abc SHA1 b95ecda53f5dd38795cb97b76e63d9071311e8f0 SHA256 48c66aa400902ec86699165a6f33e6fdc644008df17c17f6c424f78919cbf28b SHA512 30abac16e3d2491f7faf4266465dc9c84782e487dff950cdef95d502b611eb90a6cb6481212f8305b34b6e5188889ce3db7acf719725b46a2b96b9970789905f
+SLACK-REQUIRED slack-required 76 MD5 be7600d3d2486e1db43fc328218625dd RMD160 6e9a735c86aeeaf29adb3ab95d52032e1988ddd9 SHA1 8aa80197fa133e1794bdd0a58353f830ba6a4cc8 SHA256 080dda42d596aee9f388853234a837072473da5e823171fdfa55ef4516f914fa SHA512 9b27ded2a98cc178b1367e82508a7e3b2a7002b2322f068f4aeb62c2cb0902f62862bc026475526ff754746ea28cc005f7140d79d864a97b42c848aab90f2f67
+SLACKBUILD numpy.SlackBuild 6879 MD5 d3bdfdc13afc6927336b0a9efd86766b RMD160 ad5484b83ed48b12ba606fe9be1dad5e4ed8f157 SHA1 ee71ea090c121d7ea0f55d6349d42ad84132dcae SHA256 a80ff137458c95bc33f316e7c8ff01dc8e16b5da0c8856cf3626aea11a3690d5 SHA512 b77886bb318efb080a2930f486074774c40b2d5763b890a7b18e1d13a6915510076d2883fe6440f4924125e2cf832dc1e29b4eddf22c1577872815069497b462
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+1FiAAoJEEHL93ESzgeiNjMP/1gyPRdK/xiUryMs8NWDwRqw
+0iQNdJt8DMshPqJNQCcUSRpFeHp6meAJjSKP+1X3c7FKm1a1aSdu9q9vJhohrpSq
+cl1ZR8uf8edkx8s9IcLEahO8L80Y2vhckIrK+e8l3ss5wCfcf6oIJaw1NlNBHLhB
+JghbXFr/4nKJfCi8SqByFrHGqq0eHtPZ9i6paDP40Z9eQo8voLYhj8iBHG5iC7eG
+xiC4V16St6yieHg2rs8CVq1MJNQxLJPJjyiKeehEDRnsU2/+l56FIetBSTuk9m2y
+Q7RjNO1BqlVMy99kTkFO3nHngRWaBTGKGmV8R2rQ4cpQoV17dcapJ6J7KWQPE9N5
+lnW1tdYEozz6eRL1mgp3FR0puNBNKw8L8+DdTghA7fCFG2vvMuz3wu0c3cPpauB3
+T921Gh8oTs8sYJiBiT6XSU9qijrJS5iA2sJnS7dd5PwJyNdmkTnKiayneFwaiJI0
+9cOV4Awy1/OrkcRE0xczQLQCHkqpjP+ouU4Zrfk4E43rtRqDPTvthfYDYIL+awDn
+fnhRRaljdmyN0hUaeiWMDjRbQJxzOPcUmJDdJxvLguCDtPdzhu6hjg4pD6aGzmax
+a92T6FF5J6z/6d/GRa46ESm18fEXdYFuJkwg0eZEYSMZbjB7wyCWdlCl3xU20Fbk
+iH4+DpbsSF+OqiTsrK8w
+=RhZB
+-----END PGP SIGNATURE-----
diff --git a/dev/python/numpy/numpy.SlackBuild b/dev/python/numpy/numpy.SlackBuild
index 7009dec7..d753b59c 100755
--- a/dev/python/numpy/numpy.SlackBuild
+++ b/dev/python/numpy/numpy.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for numpy, by Rudson R. Alves
-# requires: python lapack 
-# tested: numpy-1.0.4
+# requires:  
+# tested: numpy-1.3.0
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="numpy"
 PKG_NAME="numpy"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.0.4}
+SRC_VERSION=${VERSION:=1.3.0}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1srv}
 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/numpy"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -145,7 +214,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/numpy/slack-required b/dev/python/numpy/slack-required
index a8ce98af..28dc4159 100644
--- a/dev/python/numpy/slack-required
+++ b/dev/python/numpy/slack-required
@@ -1,5 +1,4 @@
 # Dependency list to numpy
 #
 # dependency [condition] [version]]
-python				
 lapack				
diff --git a/sci/libs/lapack/Manifest b/sci/libs/lapack/Manifest
new file mode 100644
index 00000000..87db12d5
--- /dev/null
+++ b/sci/libs/lapack/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST lapack.tgz 4792502 MD5 a3202a4f9e2f15ffd05d15dab4ac7857 RMD160 e8fabba2fdd944afbc02a83599cf45a0d721030d SHA1 c75223fdef3258c461370af5d2b889d580d7f38a SHA256 5825f83971157001fd4235514afe8ff5fc16e1c06b2e872e442c242efd6c166d SHA512 a89b88540f8e5b05b7c58e8e301a5068729ceb35fcb2143edfff1644458ff1a375e5185492cf116b50409fe0c17b51c253a2987f4df83e9f9c3968a4b77e5d97
+MKBUILD lapack.mkbuild 4823 MD5 e453dafab8313e000e3339e13f5b69fa RMD160 8175005aa824bd3bfca6d3a7766df933a66d38f6 SHA1 5e2844e1580903083661b7886fbe3e6ff8638045 SHA256 f774d7a8d42ea8f5d241f8daadbea178e160c303a76ad8b235b24be75f767ca7 SHA512 663998a129763b90102df2d23343263e550809a382f0276824b1df0c80655ecfbc7cb67ed386a88db0491c78f6cf6bb4c6a62d08931bdff71da539f1e3c99bc8
+SLACKBUILD lapack.SlackBuild 7083 MD5 10138b5bcad9e559d319e148e8446eff RMD160 28b6358145acc59f906a141d1465c125b71f64c2 SHA1 b7e5326cf41a1de277cbcd0f785c62feed781c54 SHA256 84bf3232ce4e7098c0c948910cf54387a15739b8fac372d775ed6c399c67ab89 SHA512 c75ae18bbd2ce85d542f03445810716a6bd42a7539060c7f8fb2d7a291eb6e48d7b9e5421354c782066ead6830f84db2f903a3b37026c78b3b817128d56d1fc1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+0+nAAoJEEHL93ESzgeioM8QALmgolbKL+yBogLvkJwK68+y
+I+L2pBdFznOHQlVdoKkHD8aLKolDsQjcNNvBAGlK82ieW7vi9KVdKY4Ed4JpKRuc
+57/f1p2ERPQTiCnnldGbsSta4o598VPxTLx3P9wsrUB48ASZsdWGwHN7YuK54oCu
+111y8o0dIrGAqlhF3uCmiy3mSgeXM8Et/Xld/6RmlaEs/bqIq6gy91e5AVXnt14Y
+7HyWD+srKB2sL5W4XqvW9n2MVyhh8y5k0TU91wPMCXGMR0gXdB+NA2wBz8sXlkR7
+OVUc6SIayj3zaQJH0W7RINj4uMZOoUh66Js9ENL8Lz78j5OecuGt9hEFbBzGCAA8
+yjBTiCiNdSDJxMBS+ATJMMCkZJATQFYQyQKVQFlYYulkqL7yPnsRFww6m2vdcKr8
+Fw+EWPRHTG/ybdxMu4LPCyoWtFYPkNJUjvwezAM+4raEI5mFvwlwesHLN27a6E3g
+WS+O9gkAaxHISLuCSqN4/jEpaQjLi3ZjO7+B8QeAwoZoDXHN8C9HfJlASgOd4MIL
+0HkpoO7EYpLL43Di0NnLHxr9e6MB9vwZZyR+ujJ1agwAc3pRxrfqndTTTUavUEaa
+J0ef5iJE9lxhU3j+R5Py7EtrOYb7g4IFD53e6fsBRRNRqW5aTmtzPWQ8ADiiLWQ9
+rSYYb/BT1n8rsJaqWOP3
+=B0UR
+-----END PGP SIGNATURE-----
diff --git a/sci/libs/lapack/lapack.SlackBuild b/sci/libs/lapack/lapack.SlackBuild
index d68259ca..94b9645f 100644
--- a/sci/libs/lapack/lapack.SlackBuild
+++ b/sci/libs/lapack/lapack.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for lapack, by Rudson R. Alves
 # requires:  
 # tested: lapack-3.1.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:="sci/libs/lapack"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"}
 LIBDIR="$PREFIX/lib"
 
 if [ "$ARCH" = "i386" ]; then
-  SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
 elif [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686"
 elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ ERROR_WGET=31;      ERROR_MAKE=32;      ERROR_INSTALL=33
 ERROR_MD5=34;       ERROR_CONF=35;      ERROR_HELP=36
 ERROR_TAR=37;       ERROR_MKPKG=38;     ERROR_GPG=39
 ERROR_PATCH=40;     ERROR_VCS=41;       ERROR_MKDIR=42
+ERROR_MANIFEST=43;
 
 # Clean up any leftovers of previous builds
 rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+  # Manifest signature checking
+  if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+    echo "Checking Manifest signature..."
+    gpg --verify $CWD/Manifest
+    if [ "$?" != "0" ]; then
+      exit $ERROR_MANIFEST
+    fi
+  fi
+
+  MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+  for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+    MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+    MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+    MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+    if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+      MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+    else
+      MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+    fi
+
+    if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+      continue
+    fi
+
+    echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+    SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+    SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+    # Check source code size
+    if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+      echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+      exit $ERROR_MANIFEST
+    else
+      echo "Size match."
+    fi
+
+    # Check source code integrity
+    for ALGO in md5 rmd160 sha1 sha256 sha512; do
+      if [ $ALGO = "rmd160" ]; then
+        ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+      else
+        ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+      fi
+      ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+      ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+      if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+        echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+        exit $ERROR_MANIFEST
+      else
+        echo "$ALGO match."
+      fi
+    done
+
+  done
+
+else
+  exit $ERROR_MANIFEST
+fi
+
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -152,9 +221,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