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