libraries/lxml: Updated for version 2.2.4

4 files changed, 22 insertions, 12 deletions

diff --git a/libraries/lxml/README b/libraries/lxml/README
index 08750c71a9..e258753366 100644
--- a/libraries/lxml/README
+++ b/libraries/lxml/README
@@ -2,4 +2,4 @@ lxml is a Pythonic binding for the libxml2 and libxslt libraries.
 It is unique in that it combines the speed and feature completeness
 of these libraries with the simplicity of a native Python API.
 
-Optionally Cython and pysetuptools can be used.
\ No newline at end of file
+Lxml can optionally use Cython and pysetuptools.
diff --git a/libraries/lxml/lxml.SlackBuild b/libraries/lxml/lxml.SlackBuild
index 94e5d1ce27..7a97b0b0e2 100644
--- a/libraries/lxml/lxml.SlackBuild
+++ b/libraries/lxml/lxml.SlackBuild
@@ -3,7 +3,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=lxml
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.2.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -13,6 +13,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
 set -e
 
 rm -rf $PKG
@@ -28,7 +36,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+CFLAGS="$SLKCFLAGS" python setup.py install --root=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -41,11 +49,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   *.txt doc/licenses/* doc/FAQ.txt \
     $PKG/usr/doc/$PRGNAM-$VERSION
-rm -f $PKG/usr/doc/$PRGNAM-$VERSION/version.txt
+rm $PKG/usr/doc/$PRGNAM-$VERSION/version.txt
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/lxml/lxml.info b/libraries/lxml/lxml.info
index dad40d602e..719b8b440c 100644
--- a/libraries/lxml/lxml.info
+++ b/libraries/lxml/lxml.info
@@ -1,8 +1,10 @@
 PRGNAM="lxml"
-VERSION="2.2.1"
+VERSION="2.2.4"
 HOMEPAGE="http://codespeak.net/lxml/"
-DOWNLOAD="http://codespeak.net/lxml/lxml-2.2.1.tgz"
-MD5SUM="f18b17e4c83edcfc8a8649c498210e20"
+DOWNLOAD="http://codespeak.net/lxml/lxml-2.2.4.tgz"
+MD5SUM="077841e74ee728e7746b65d8483274be"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"
diff --git a/libraries/lxml/slack-desc b/libraries/lxml/slack-desc
index 4d2625b4ff..35c7735bb9 100644
--- a/libraries/lxml/slack-desc
+++ b/libraries/lxml/slack-desc
@@ -6,12 +6,12 @@
 # leave one space after the ':'.
 
     |-----handy-ruler------------------------------------------------------|
-lxml: lxml (python bindings for libxml2 and libxslt)
-lxml:
+lxml: lxml
+lxml: 
 lxml: lxml is a Pythonic binding for the libxml2 and libxslt libraries. It
 lxml: is unique in that it combines the speed and feature completeness of
 lxml: these libraries with the simplicity of a native Python API.
-lxml:
+lxml: 
 lxml: Homepage: http://codespeak.net/lxml/
 lxml:
 lxml: