calibre: updated to 3.9.0. Hardcoded the use of python2

1 files changed, 34 insertions, 32 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index c2b09e3a..b7733e38 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -85,6 +85,8 @@
 #             * Update.
 # 3.7.0-1:    12/sep/2017 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.9.0-1:    13/oct/2017 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -94,14 +96,14 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-3.7.0}
+VERSION=${VERSION:-3.9.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j4 "}
 TAG=${TAG:-alien}
 
 DOCS="LICENSE* Changelog* COPYRIGHT README*"
 
-PYTHON=$(python -c 'import sys; print sys.version.split( )[0]')
+PYTHON=$(python2 -c 'import sys; print (sys.version.split( )[0])')
 SLACKVER=${SLACKVER:-$(cat /etc/slackware-version |cut -d' ' -f2)}
 
 REQUIRED_QT="5.6.2"
@@ -112,16 +114,16 @@ INT_QT=5.7.1
 REQUIRED_MTP="1.1.11"
 
 # Only used in case we need to build our own libmtp:
-INT_MTP=1.1.11
+INT_MTP=1.1.14
 
 # Only used when we build our own ImageMagick:
-INT_MAGICK=6.9.8-3
+INT_MAGICK=6.9.9-19
 
 REQUIRED_PYTHON="2.7"
 REQUIRED_PYTHON_MIN="12"
 
 # Only used in case we need to build our own python:
-INT_PYTHON=2.7.13
+INT_PYTHON=2.7.14
 
 # Only used in case we need to build our own python modules:
 #INT_SETUPTOOLS=23.1.0
@@ -731,7 +733,7 @@ make_setuptools() {
   rm -f setuptools/*.exe
 
   # Compile and install
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -752,7 +754,7 @@ make_dnspython() {
   cd $TMP/tmp-$PRGNAM/dnspython-${INT_DNSPYTHON}
 
   # Compile and install
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -778,7 +780,7 @@ make_cssutils() {
     || true
 
   # Compile and install
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -799,7 +801,7 @@ make_dateutil() {
   cd $TMP/tmp-$PRGNAM/python-dateutil-${INT_DATEUTIL}
 
   # Compile and install
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -820,7 +822,7 @@ make_pillow() {
   cd $TMP/tmp-$PRGNAM/Pillow-${INT_IMAGING}
 
   # Installation path for headers:
-  PYTHONINC=$( python -c 'from distutils.sysconfig import *;print get_python_inc()' )
+  PYTHONINC=$( python2 -c 'from distutils.sysconfig import *;print (get_python_inc())' )
 
   # Fix the python path for Scripts/*.py :
   for script in Scripts/*.py ; do
@@ -835,7 +837,7 @@ make_pillow() {
 
   # Compile and install
   CFLAGS="$SLKCFLAGS" \
-  python setup.py install --root $PKG \
+  python2 setup.py install --root $PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -856,7 +858,7 @@ make_lxml() {
   cd $TMP/tmp-$PRGNAM/lxml-${INT_LXML}
 
   # Compile and install
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -878,7 +880,7 @@ make_mechanize() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -901,7 +903,7 @@ make_sip() {
   # Compile and install:
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-    python configure.py 2>&1 | tee $OUTPUT/configure-${PRGNAM}_${MOD}.log
+    python2 configure.py 2>&1 | tee $OUTPUT/configure-${PRGNAM}_${MOD}.log
   make $NUMJOBS || make 2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
   make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_${MOD}.log
 
@@ -956,7 +958,7 @@ make_pygments() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -986,7 +988,7 @@ make_pyqt5() {
   export CFLAGS="$SLKCFLAGS"
   export CXXFLAGS="$SLKCFLAGS"
 
-  python configure.py --confirm-license --verbose --qmake=$QTDIR/bin/qmake \
+  python2 configure.py --confirm-license --verbose --qmake=$QTDIR/bin/qmake \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}_${MOD}.log
   make $NUMJOBS || make \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
@@ -1018,7 +1020,7 @@ make_pycrypto() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1040,7 +1042,7 @@ make_netifaces() {
 
   # Compile and install
   export CFLAGS="-I/usr/lib${LIBDIRSUFFIX}/calibre/include"
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
   unset CFLAGS
 
@@ -1064,7 +1066,7 @@ make_apsw() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1087,7 +1089,7 @@ make_psutil() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG \
+  python2 setup.py install --root=$PKG \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1135,7 +1137,7 @@ make_regex() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1158,7 +1160,7 @@ make_msgpack() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1181,7 +1183,7 @@ make_six() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1204,7 +1206,7 @@ make_dukpy() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 --skip-build \
+  python2 setup.py install --root=$PKG --optimize=1 --skip-build \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1227,7 +1229,7 @@ make_webenc() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1250,7 +1252,7 @@ make_html5lib() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1273,7 +1275,7 @@ make_html5parser() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1296,7 +1298,7 @@ make_unrardll() {
 
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
-  python setup.py install --root=$PKG --optimize=1 \
+  python2 setup.py install --root=$PKG --optimize=1 \
     2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
 
   # Add documentation:
@@ -1351,13 +1353,13 @@ make_calibre () {
   CFLAGS=${CFLAGS:-""}
 
   # Place where we have to install stuff:
-  PYTHONLIB=$( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" )
+  PYTHONLIB=$( python2 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())" )
 
   # Create the directory for calibre's environment module:
   mkdir -p $PKG$PYTHONLIB
 
   # Find the prefix python was installed to (may be different from calibre's):
-  PYTHONROOT=$( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(prefix='/')" )
+  PYTHONROOT=$( python2 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(prefix='/'))" )
   PYTHONPREF="${PYTHONLIB%$PYTHONROOT}"
 
   # Massage the install script to actually install to that python libdir:
@@ -1535,8 +1537,8 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
   SLK_PYTHON_INCLUDES="-I/usr/lib${LIBDIRSUFFIX}/calibre/include/python${REQUIRED_PYTHON}"
   SLK_PYTHON_LIBS="-L/usr/lib${LIBDIRSUFFIX}/calibre/lib -lpython${REQUIRED_PYTHON}"
 else
-  SLK_PYTHON_INCLUDES="-I/usr/lib${LIBDIRSUFFIX}/calibre/include/python${REQUIRED_PYTHON} $(python -c 'from distutils.sysconfig import *;print get_python_inc()')"
-  SLK_PYTHON_LIBS="-L/usr/lib${LIBDIRSUFFIX}/calibre/lib -lpython${REQUIRED_PYTHON} $(python -c 'from distutils.sysconfig import *;print get_python_lib()')"
+  SLK_PYTHON_INCLUDES="-I/usr/lib${LIBDIRSUFFIX}/calibre/include/python${REQUIRED_PYTHON} $(python2 -c 'from distutils.sysconfig import *;print (get_python_inc())')"
+  SLK_PYTHON_LIBS="-L/usr/lib${LIBDIRSUFFIX}/calibre/lib -lpython${REQUIRED_PYTHON} $(python2 -c 'from distutils.sysconfig import *;print (get_python_lib())')"
 fi
 
 if [ "$BUILD_PYTHONMODS" = "YES" ]; then