7 files changed, 36 insertions, 36 deletions
diff --git a/source/d/python/slack-desc b/source/d/python/slack-desc
deleted file mode 100644
index d7db551f..00000000
--- a/source/d/python/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
-
-      |-----handy-ruler------------------------------------------------------|
-python: python (object-oriented interpreted programming language)
-python:
-python: Python is an interpreted, interactive, object-oriented programming
-python: language that combines remarkable power with very clear syntax. 
-python: Python's basic power can be extended with your own modules written in
-python: C or C++. Python is also adaptable as an extension language for
-python: existing applications. 
-python:
-python:
-python:
-python:
diff --git a/source/d/python/python.no-static-library.diff b/source/d/python2/python.no-static-library.diff
index 96209897..96209897 100644
--- a/source/d/python/python.no-static-library.diff
+++ b/source/d/python2/python.no-static-library.diff
diff --git a/source/d/python/python.readline.set_pre_input_hook.diff b/source/d/python2/python.readline.set_pre_input_hook.diff
index 8af4b4be..8af4b4be 100644
--- a/source/d/python/python.readline.set_pre_input_hook.diff
+++ b/source/d/python2/python.readline.set_pre_input_hook.diff
diff --git a/source/d/python/python.url b/source/d/python2/python.url
index 8738d0b1..8738d0b1 100644
--- a/source/d/python/python.url
+++ b/source/d/python2/python.url
diff --git a/source/d/python/python.x86_64.diff b/source/d/python2/python.x86_64.diff
index 55cdf499..55cdf499 100644
--- a/source/d/python/python.x86_64.diff
+++ b/source/d/python2/python.x86_64.diff
diff --git a/source/d/python/python.SlackBuild b/source/d/python2/python2.SlackBuild
index e4cee053..b4698415 100755
--- a/source/d/python/python.SlackBuild
+++ b/source/d/python2/python2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2012, 2013, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2013, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,11 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PKGNAM=python
+PKGNAM=python2
 SRCNAM=Python
 VERSION=$(echo $SRCNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
 BRANCH_VERSION=$(echo $VERSION | cut -f 1,2 -d . )
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -68,9 +68,9 @@ elif [ "$ARCH" = "armel" ]; then
 fi
 
 # Location for Python site-packages:
-SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages
+SITEPK=$PKG/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
 # same as above without $PKG
-TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/${PKGNAM}${BRANCH_VERSION}/site-packages
+TOOLSDIR=/usr/lib${LIBDIRSUFFIX}/python${BRANCH_VERSION}/site-packages
 
 cd $TMP
 rm -rf $SRCNAM-$VERSION
@@ -101,7 +101,7 @@ sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
-  --docdir=/usr/doc/python-$VERSION \
+  --docdir=/usr/doc/python2-$VERSION \
   --with-threads \
   --enable-ipv6 \
   --enable-shared \
@@ -115,16 +115,16 @@ make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 # Install some python-demo files:
-mkdir -p $PKG/usr/doc/python-$VERSION
-cp -a Demo $PKG/usr/doc/python-$VERSION
+mkdir -p $PKG/usr/doc/python2-$VERSION
+cp -a Demo $PKG/usr/doc/python2-$VERSION
 
 # We'll install the python-tools under site-packages:
 mkdir -p $SITEPK
 cp -a Tools/* $SITEPK
 
-mkdir -p $PKG/usr/doc/python-$VERSION
-mv $SITEPK/README $PKG/usr/doc/python-$VERSION/README.python-tools
-( cd $PKG/usr/doc/python-$VERSION
+mkdir -p $PKG/usr/doc/python2-$VERSION
+mv $SITEPK/README $PKG/usr/doc/python2-$VERSION/README.python-tools
+( cd $PKG/usr/doc/python2-$VERSION
   ln -sf $TOOLSDIR Tools
 )
 
@@ -137,12 +137,12 @@ mkdir -p $PKG/usr/bin
 )
 
 # Install docs:
-mkdir -p $PKG/usr/doc/python-$VERSION/Documentation
-cp -a README LICENSE $PKG/usr/doc/python-$VERSION
-cp -a Misc $PKG/usr/doc/python-$VERSION
+mkdir -p $PKG/usr/doc/python2-$VERSION/Documentation
+cp -a README LICENSE $PKG/usr/doc/python2-$VERSION
+cp -a Misc $PKG/usr/doc/python2-$VERSION
 tar xf $CWD/python-$VERSION-docs-text.tar.?z*
-mv python-${VERSION}-docs-text/* $PKG/usr/doc/python-$VERSION/Documentation
-chown -R root:root $PKG/usr/doc/python-$VERSION
+mv python-${VERSION}-docs-text/* $PKG/usr/doc/python2-$VERSION/Documentation
+chown -R root:root $PKG/usr/doc/python2-$VERSION
 
 # Fix possible incorrect permissions:
 ( cd $PKG
@@ -179,5 +179,5 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/python-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/python2-$VERSION-$ARCH-$BUILD.txz
 
diff --git a/source/d/python2/slack-desc b/source/d/python2/slack-desc
new file mode 100644
index 00000000..05d05ac1
--- /dev/null
+++ b/source/d/python2/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+python2: python2 (object-oriented interpreted programming language, v2)
+python2:
+python2: Python is an interpreted, interactive, object-oriented programming
+python2: language that combines remarkable power with very clear syntax. 
+python2: Python's basic power can be extended with your own modules written in
+python2: C or C++. Python is also adaptable as an extension language for
+python2: existing applications. 
+python2:
+python2: Homepage: http://www.python.org
+python2:
+python2: