6 files changed, 24 insertions, 18 deletions
diff --git a/source/ap/rpm/rpm.SlackBuild b/source/ap/rpm/rpm.SlackBuild
index 50073f4a..9713ff4d 100755
--- a/source/ap/rpm/rpm.SlackBuild
+++ b/source/ap/rpm/rpm.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rpm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -120,7 +120,8 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 cd python
-  python setup.py install --root=$PKG || exit 1
+  # python2 dropped dropped as obsolete.
+  #python setup.py install --root=$PKG || exit 1
   python3 setup.py install --root=$PKG || exit 1
 cd -
 
diff --git a/source/l/libcaca/libcaca.SlackBuild b/source/l/libcaca/libcaca.SlackBuild
index 34270c35..13e27461 100755
--- a/source/l/libcaca/libcaca.SlackBuild
+++ b/source/l/libcaca/libcaca.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libcaca
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -105,7 +105,8 @@ make install DESTDIR=$PKG || exit 1
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 cd python
-  python setup.py install --root=$PKG || exit 1
+  # python2 dropped dropped as obsolete.
+  #python setup.py install --root=$PKG || exit 1
   python3 setup.py install --root=$PKG || exit 1
 cd -
 
diff --git a/source/l/libwebp/libwebp.SlackBuild b/source/l/libwebp/libwebp.SlackBuild
index 2385f6f4..4474c8d2 100755
--- a/source/l/libwebp/libwebp.SlackBuild
+++ b/source/l/libwebp/libwebp.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libwebp
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -109,9 +109,10 @@ make install DESTDIR=$PKG || exit 1
   # Fix temporary working directory:
   sed -i "/^tmpdir/s|=.*|= 'tmpdir'|" setup.py
 
-  CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
-  LDFLAGS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lwebp" \
-  python setup.py install --root=$PKG
+  # python2 dropped dropped as obsolete.
+  #CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
+  #LDFLAGS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lwebp" \
+  #python setup.py install --root=$PKG
 
   CFLAGS="$SLKCFLAGS -I$PKG/usr/include" \
   LDFLAGS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lwebp" \
diff --git a/source/l/python-distro/python-distro.SlackBuild b/source/l/python-distro/python-distro.SlackBuild
index 082560e0..c6ac2d18 100755
--- a/source/l/python-distro/python-distro.SlackBuild
+++ b/source/l/python-distro/python-distro.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=python-distro
 SRCNAM=distro
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -60,7 +60,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-python setup.py install --root=$PKG || exit 1
+# python2 dropped dropped as obsolete.
+#python setup.py install --root=$PKG || exit 1
 python3 setup.py install --root=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-docutils/python-docutils.SlackBuild b/source/l/python-docutils/python-docutils.SlackBuild
index 174e016e..d5fb7a9e 100755
--- a/source/l/python-docutils/python-docutils.SlackBuild
+++ b/source/l/python-docutils/python-docutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2018, 2019, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2017  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
 #
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=python-docutils
 VERSION=${VERSION:-$(echo docutils-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 SRCNAM=docutils
 
@@ -61,11 +61,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
-# Build python3 version first, so binaries in /usr/bin get overwritten
-# by the python2 versions. We prefer these ones for the time being.
-
-python3 setup.py build --build-lib=build/python3 install --root=$PKG || exit 1
 python setup.py build --build-lib=build/python install --root=$PKG || exit 1
+python3 setup.py build --build-lib=build/python3 install --root=$PKG || exit 1
 
 cd $PKG/usr/bin
   for i in *.py; do
diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild
index 795febb1..4153529c 100755
--- a/source/l/system-config-printer/system-config-printer.SlackBuild
+++ b/source/l/system-config-printer/system-config-printer.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=system-config-printer
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -95,6 +95,7 @@ find . \
 LDFLAGS="$SLKLDFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 CFLAGS="$SLKCFLAGS" \
+PYTHON=/usr/bin/python3 \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -111,8 +112,12 @@ CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# python2 dropped dropped as obsolete.
 # install python2 cupshelpers
-python setup.py install --root=$PKG || exit 1
+#python setup.py install --root=$PKG || exit 1
+
+# install python3 cupshelpers
+python3 setup.py install --root=$PKG || exit 1
 
 # Generate .pyc files
 python3 -m compileall "${PKG}/usr/share/system-config-printer"