libraries/PyXML: Updated for version 0.8.4

3 files changed, 55 insertions, 11 deletions

diff --git a/libraries/PyXML/PyXML-0.8.4-python2.6.patch b/libraries/PyXML/PyXML-0.8.4-python2.6.patch
new file mode 100644
index 0000000000..7a54ac5b96
--- /dev/null
+++ b/libraries/PyXML/PyXML-0.8.4-python2.6.patch
@@ -0,0 +1,42 @@
+diff -up PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.patch PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
+--- PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py.patch	2008-12-24 06:35:27.000000000 +0100
++++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2008-12-24 06:35:39.000000000 +0100
+@@ -24,8 +24,8 @@ class ParsedAbbreviatedAbsoluteLocationP
+         self._rel = rel
+         nt = ParsedNodeTest.ParsedNodeTest('node', '')
+         ppl = ParsedPredicateList.ParsedPredicateList([])
+-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+-        self._step = ParsedStep.ParsedStep(as, nt, ppl)
++        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++        self._step = ParsedStep.ParsedStep(as_, nt, ppl)
+         return
+ 
+     def evaluate(self, context):
+diff -up PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.patch PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
+--- PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py.patch	2008-12-24 06:37:27.000000000 +0100
++++ PyXML-0.8.4/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2008-12-24 06:37:48.000000000 +0100
+@@ -28,8 +28,8 @@ class ParsedAbbreviatedRelativeLocationP
+         self._right = right
+         nt = ParsedNodeTest.ParsedNodeTest('node','')
+         ppl = ParsedPredicateList.ParsedPredicateList([])
+-        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
+-        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
++        as_ = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
++        self._middle = ParsedStep.ParsedStep(as_, nt, ppl)
+ 
+     def evaluate(self, context):
+         res = []
+diff -ru PyXML-0.8.4.orig/xml/xslt/Stylesheet.py PyXML-0.8.4/xml/xslt/Stylesheet.py
+--- PyXML-0.8.4/xml/xslt/Stylesheet.py.patch	2009-03-03 08:20:01.000000000 +0000
++++ PyXML-0.8.4/xml/xslt/Stylesheet.py	2009-03-03 08:21:18.000000000 +0000
+@@ -373,8 +373,8 @@
+ 
+         #Attribute sets
+         attribute_sets = filter(lambda x: x.nodeType == Node.ELEMENT_NODE and (x.namespaceURI, x.localName) == (XSL_NAMESPACE, 'attribute-set'), self.childNodes)
+-        for as in attribute_sets:
+-            as.instantiate(context, processor)
++        for as_ in attribute_sets:
++            as_.instantiate(context, processor)
+         overridden_params = {}
+         for k in topLevelParams.keys():
+             if type(k) != types.TupleType:
diff --git a/libraries/PyXML/PyXML.SlackBuild b/libraries/PyXML/PyXML.SlackBuild
index 853b2a70c4..25e0acb0c4 100644
--- a/libraries/PyXML/PyXML.SlackBuild
+++ b/libraries/PyXML/PyXML.SlackBuild
@@ -30,8 +30,9 @@
 PRGNAM=PyXML
 VERSION=0.8.4
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,8 +40,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
-rm -rf $PKG 
-mkdir -p $TMP $PKG $OUTPUT 
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
@@ -48,13 +49,12 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-python setup.py build
+patch -p1 -i $CWD/PyXML-0.8.4-python2.6.patch
+
 python setup.py install --prefix=/usr --root=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/man/man1
 cp $TMP/$PRGNAM-$VERSION/doc/man/* $PKG/usr/man/man1
@@ -62,7 +62,7 @@ cp $TMP/$PRGNAM-$VERSION/doc/man/* $PKG/usr/man/man1
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-) 
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 
@@ -75,4 +75,4 @@ 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/PyXML/PyXML.info b/libraries/PyXML/PyXML.info
index e06f75a6db..f305b40fe0 100644
--- a/libraries/PyXML/PyXML.info
+++ b/libraries/PyXML/PyXML.info
@@ -2,7 +2,9 @@ PRGNAM="PyXML"
 VERSION="0.8.4"
 HOMEPAGE="http://pyxml.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/pyxml/PyXML-0.8.4.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="1f7655050cebbb664db976405fdba209"
+MD5SUM_x86_64=""
 MAINTAINER="Alex Lysenka"
 EMAIL="me@alkos333.net"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"