python-lxml: updated to 4.6.1

1 files changed, 18 insertions, 19 deletions

diff --git a/python-lxml/build/python-lxml.SlackBuild b/python-lxml/build/python-lxml.SlackBuild
index 4d11e7a2..2e673d6b 100755
--- a/python-lxml/build/python-lxml.SlackBuild
+++ b/python-lxml/build/python-lxml.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2020  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -27,8 +27,8 @@
 # By:         Eric Hameleers <alien@slackware.com>
 # For:        python-lxml
 # Descr:      Python bindings for libxml2 and libxslt
-# URL:        http://codespeak.net/lxml/
-# Needs:      pysetuptools
+# URL:        https://lxml.de/
+# Needs:      
 # Changelog:  
 # 2.2.8-1:    25/Sep/2010 by Eric Hameleers <alien@slackware.com>
 #             * Initial build.
@@ -38,6 +38,8 @@
 #             * Update.
 # 3.2.1-1:    14/jun/2013 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 4.6.1-1:    08/nov/2020 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh python-lxml.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -49,9 +51,9 @@
 
 PRGNAM=python-lxml
 SRCNAM=lxml
-VERSION=${VERSION:-3.2.1}
+VERSION=${VERSION:-4.6.1}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
 DOCS="*.txt doc/*.txt doc/licenses"
@@ -64,24 +66,22 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${SRCNAM}-${VERSION}.tgz"
-#SRCURL="http://codespeak.net/${SRCNAM}/${SRCNAM}-${VERSION}.tgz"
-SRCURL="http://lxml.de/files/${SRCNAM}-${VERSION}.tgz"
+SOURCE="$SRCDIR/${SRCNAM}-${VERSION}.tar.gz"
+SRCURL="https://github.com/${SRCNAM}/${SRCNAM}/archive/${SRCNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i486 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  case "$(uname -m)" in
+    i?86) ARCH=i586 ;;
+    arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 # Exit the script on errors:
@@ -138,12 +138,13 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
-cd ${SRCNAM}-${VERSION}
+cd ${SRCNAM}*-${VERSION}
 chown -R root:root .
-chmod -R u+w,go+r-w,a+X-s .
+chmod -R u+w,go+r-w,a+rX-st .
 
 echo Building ...
-python setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-$PRGNAM.log
+python2 setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_py2.log
+python3 setup.py install --root=$PKG 2>&1 | tee $OUTPUT/make-${PRGNAM}_py3.log
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -159,7 +160,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-cat $SRCDIR/slack-required > $PKG/install/slack-required
 
 # Build the package:
 cd $PKG
@@ -168,7 +168,6 @@ cd $OUTPUT
 md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
-cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 
 # Restore the original umask:
 umask ${_UMASK_}