TracFootNoteMacro: adding TracFootNoteMacro and updating dependencies

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

2 files changed, 101 insertions, 7 deletions

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