Fri May 1 18:05:38 UTC 202020200501180538

a/cryptsetup-2.3.2-x86_64-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-30.txz:  Rebuilt.
  rc.S: contents of mounts below /run or /var/run should be visible in both
  /run and /var/run. Thanks to Markus Wiesner.
d/Cython-0.29.17-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
d/python-pip-20.1-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
d/python-setuptools-46.1.3-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/M2Crypto-0.35.2-x86_64-5.txz:  Rebuilt.
  Dropped python2 support.
l/Mako-1.1.2-x86_64-2.txz:  Rebuilt.
  Dropped python2 support.
l/gsettings-desktop-schemas-3.36.1-x86_64-1.txz:  Upgraded.
l/libzip-1.6.1-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
l/oniguruma-6.9.5_rev1-x86_64-1.txz:  Upgraded.
l/pycairo-1.19.1-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/pycups-2.0.1-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/pycurl-7.43.0.5-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/pyparsing-2.4.7-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/python-appdirs-1.4.3-x86_64-5.txz:  Rebuilt.
  Dropped python2 support.
l/python-certifi-2020.4.5.1-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/python-chardet-3.0.4-x86_64-5.txz:  Rebuilt.
  Dropped python2 support.
l/python-docutils-0.16-x86_64-3.txz:  Rebuilt.
  Dropped python2 support.
l/python-enum34-1.1.10-x86_64-1.txz:  Removed.
l/python-future-0.18.2-x86_64-2.txz:  Rebuilt.
  Dropped python2 support.
l/python-idna-2.9-x86_64-2.txz:  Rebuilt.
  Dropped python2 support.
l/python-notify2-0.3.1-x86_64-5.txz:  Rebuilt.
  Dropped python2 support.
l/python-packaging-20.3-x86_64-2.txz:  Rebuilt.
  Dropped python2 support.
l/python-ply-3.11-x86_64-3.txz:  Rebuilt.
  Dropped python2 support.
l/python-pygments-2.6.1-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/python-requests-2.23.0-x86_64-2.txz:  Rebuilt.
  Dropped python2 support.
l/python-sane-2.8.3-x86_64-5.txz:  Rebuilt.
  Dropped python2 support.
l/python-six-1.14.0-x86_64-2.txz:  Rebuilt.
  Dropped python2 support.
l/python-urllib3-1.25.9-x86_64-1.txz:  Upgraded.
  Dropped python2 support.
l/python2-module-collection-2.7.18-x86_64-1.txz:  Added.
  Time to quarantine these python2 modules and pin the versions where they
  are (or in the case of setuptools, downgrade to the last version that doesn't
  complain). This will keep most of the standard python2 add-ons in one package
  so that we can upgrade modules for python3 without having to worry about
  python2 support getting dropped upstream.
n/dnsmasq-2.81-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
n/gnutls-3.6.13-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
n/nettle-3.6-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
x/mesa-20.0.6-x86_64-1.txz:  Upgraded.
x/pyxdg-0.26-x86_64-3.txz:  Rebuilt.
  Dropped python2 support.
x/ttf-tlwg-0.7.2-noarch-1.txz:  Upgraded.
x/xorg-server-1.20.8-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
x/xorg-server-xephyr-1.20.8-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
x/xorg-server-xnest-1.20.8-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
x/xorg-server-xvfb-1.20.8-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
x/xorg-server-xwayland-1.20.8-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
x/xterm-355-x86_64-1.txz:  Upgraded.
xap/rdesktop-1.9.0-x86_64-2.txz:  Rebuilt.
  Recompiled against nettle-3.6.
extra/tigervnc/tigervnc-1.10.1-x86_64-3.txz:  Rebuilt.
  Recompiled against nettle-3.6.

3 files changed, 9 insertions, 19 deletions

diff --git a/source/d/Cython/Cython.SlackBuild b/source/d/Cython/Cython.SlackBuild
index 326cc7525..54eae3ced 100755
--- a/source/d/Cython/Cython.SlackBuild
+++ b/source/d/Cython/Cython.SlackBuild
@@ -63,17 +63,19 @@ find -L . \
 
 python3 setup.py install --root=$PKG --prefix=/usr || exit 1
 
-for i in cython cythonize cygdb; do
-  mv $PKG/usr/bin/$i $PKG/usr/bin/${i}3
-done
-
-python setup.py install --root=$PKG --prefix=/usr || exit 1
-
 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/doc/$PKGNAM-$VERSION
-cp -a *.txt Doc/* $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a *.rst *.txt docs/* $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a CHANGES.rst, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES.rst ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
+  touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/d/python-pip/python-pip.SlackBuild b/source/d/python-pip/python-pip.SlackBuild
index c4171e8b2..1ee81c396 100755
--- a/source/d/python-pip/python-pip.SlackBuild
+++ b/source/d/python-pip/python-pip.SlackBuild
@@ -63,12 +63,6 @@ find -L . \
 
 python3 setup.py install --root=$PKG || exit 1
 
-# Drop the python3 version of pip so the python 2.7
-# one is installed. We prefer that one to be the default for now.
-rm -rf $PKG/usr/bin/pip
-
-python setup.py install --root=$PKG || exit 1
-
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a *.txt PKG-INFO README.rst \
   $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/d/python-setuptools/python-setuptools.SlackBuild b/source/d/python-setuptools/python-setuptools.SlackBuild
index c44ac34f5..366b4f9c5 100755
--- a/source/d/python-setuptools/python-setuptools.SlackBuild
+++ b/source/d/python-setuptools/python-setuptools.SlackBuild
@@ -75,12 +75,6 @@ rm -f setuptools/*.exe
 
 python3 setup.py install --root=$PKG || exit 1
 
-# Drop the python3 version of easy_install so the python 2.7
-# one is installed. We prefer that one to be the default for now.
-rm -rf $PKG/usr/bin/easy_install
-
-python setup.py install --root=$PKG || exit 1
-
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \
   $PKG/usr/doc/$PKGNAM-$VERSION