summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.S2
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
-rwxr-xr-xsource/d/Cython/Cython.SlackBuild16
-rwxr-xr-xsource/d/python-pip/python-pip.SlackBuild6
-rwxr-xr-xsource/d/python-setuptools/python-setuptools.SlackBuild6
-rwxr-xr-xsource/l/M2Crypto/M2Crypto.SlackBuild35
-rw-r--r--source/l/M2Crypto/typing.url1
-rwxr-xr-xsource/l/Mako/Mako.SlackBuild5
-rwxr-xr-xsource/l/libzip/libzip.SlackBuild2
-rwxr-xr-xsource/l/pycairo/pycairo.SlackBuild3
-rwxr-xr-xsource/l/pycups/pycups.SlackBuild4
-rwxr-xr-xsource/l/pycurl/pycurl.SlackBuild3
-rw-r--r--source/l/pycurl/pycurl.url2
-rwxr-xr-xsource/l/pyparsing/pyparsing.SlackBuild11
-rwxr-xr-xsource/l/python-appdirs/python-appdirs.SlackBuild3
-rwxr-xr-xsource/l/python-certifi/python-certifi.SlackBuild3
-rwxr-xr-xsource/l/python-chardet/python-chardet.SlackBuild6
-rwxr-xr-xsource/l/python-docutils/python-docutils.SlackBuild3
-rwxr-xr-xsource/l/python-enum34/python-enum34.SlackBuild112
-rw-r--r--source/l/python-enum34/python-enum34.url1
-rw-r--r--source/l/python-enum34/slack-desc19
-rwxr-xr-xsource/l/python-future/python-future.SlackBuild8
-rwxr-xr-xsource/l/python-idna/python-idna.SlackBuild3
-rwxr-xr-xsource/l/python-notify2/python-notify2.SlackBuild4
-rwxr-xr-xsource/l/python-packaging/python-packaging.SlackBuild3
-rwxr-xr-xsource/l/python-ply/python-ply.SlackBuild3
-rwxr-xr-xsource/l/python-pygments/python-pygments.SlackBuild3
-rwxr-xr-xsource/l/python-requests/python-requests.SlackBuild3
-rwxr-xr-xsource/l/python-sane/python-sane.SlackBuild3
-rwxr-xr-xsource/l/python-six/python-six.SlackBuild5
-rwxr-xr-xsource/l/python2-module-collection/python2-module-collection.SlackBuild463
-rw-r--r--source/l/python2-module-collection/slack-desc19
-rwxr-xr-xsource/n/dnsmasq/dnsmasq.SlackBuild2
-rwxr-xr-xsource/n/gnutls/gnutls.SlackBuild2
-rwxr-xr-xsource/x/pyxdg/pyxdg.SlackBuild3
-rw-r--r--source/x/x11/build/xorg-server2
-rwxr-xr-xsource/xap/rdesktop/rdesktop.SlackBuild2
37 files changed, 533 insertions, 240 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index eb1765e1..0fecf21f 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -25,6 +25,8 @@ if [ -d /run ]; then
if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then
/sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755,size=32M,nodev,nosuid,noexec
fi
+ # Make sure that mounts below /run are visible in both /run and /var/run:
+ /sbin/mount --make-shared /run
fi
# Load the loop device kernel module:
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index d3537dab..3f69fb4b 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit-scripts
VERSION=${VERSION:-2.1}
ARCH=noarch
-BUILD=${BUILD:-29}
+BUILD=${BUILD:-30}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
diff --git a/source/d/Cython/Cython.SlackBuild b/source/d/Cython/Cython.SlackBuild
index 326cc752..54eae3ce 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 c4171e8b..1ee81c39 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 c44ac34f..366b4f9c 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
diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild
index 1c8dda67..0aefd8c5 100755
--- a/source/l/M2Crypto/M2Crypto.SlackBuild
+++ b/source/l/M2Crypto/M2Crypto.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=M2Crypto
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -61,39 +61,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
python3 setup.py install --root=$PKG || exit 1
-mkdir -p $PKG/usr/doc/M2Crypto-$VERSION
-cp -a \
- CHANGES INSTALL* LICENCE* PKG-INFO README* doc/* \
- $PKG/usr/doc/M2Crypto-$VERSION
-
-# Embed required dep typing module:
-cd $TMP
-rm -rf typing-3.7.4.1
-tar xvf $CWD/typing-3.7.4.1.tar.xz || exit 1
-cd typing-3.7.4.1 || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
-# *Don't* package typing with python3:
-#python3 setup.py install --root=$PKG || exit 1
-mkdir -p $PKG/usr/doc/typing-3.7.4.1
-cp -a \
- CHANGES INSTALL* LICENCE* PKG-INFO README* doc/* \
- $PKG/usr/doc/typing-3.7.4.1
-
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
- xargs strip --strip-unneeded 2> /dev/null
-)
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /
mkdir -p $PKG/usr/doc/M2Crypto-$VERSION
cp -a \
diff --git a/source/l/M2Crypto/typing.url b/source/l/M2Crypto/typing.url
deleted file mode 100644
index 1c61f277..00000000
--- a/source/l/M2Crypto/typing.url
+++ /dev/null
@@ -1 +0,0 @@
-http://pypi.python.org/pypi/typing/
diff --git a/source/l/Mako/Mako.SlackBuild b/source/l/Mako/Mako.SlackBuild
index 82e42f2e..b4f25224 100755
--- a/source/l/Mako/Mako.SlackBuild
+++ b/source/l/Mako/Mako.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=Mako
VERSION=${VERSION:-$(echo $PKGNAM-*.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
@@ -59,11 +59,10 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a *.rst *.txt PKG-INFO \
+cp -a AUTHORS CHANGES LICENSE PKG-INFO *.rst *.txt \
$PKG/usr/doc/$PKGNAM-$VERSION
find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+
diff --git a/source/l/libzip/libzip.SlackBuild b/source/l/libzip/libzip.SlackBuild
index 1ab157a6..52e7ca1e 100755
--- a/source/l/libzip/libzip.SlackBuild
+++ b/source/l/libzip/libzip.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libzip
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
diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild
index c7de96ba..509f707f 100755
--- a/source/l/pycairo/pycairo.SlackBuild
+++ b/source/l/pycairo/pycairo.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pycairo
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -81,7 +81,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
python3 setup.py install --root=$PKG || exit 1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/l/pycups/pycups.SlackBuild b/source/l/pycups/pycups.SlackBuild
index e9586a40..d6c7b3f6 100755
--- a/source/l/pycups/pycups.SlackBuild
+++ b/source/l/pycups/pycups.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pycups
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -65,9 +65,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
python3 setup.py install --root=$PKG || exit 1
-
make install-rpmhook DESTDIR=$PKG || exit 1
find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \
diff --git a/source/l/pycurl/pycurl.SlackBuild b/source/l/pycurl/pycurl.SlackBuild
index ff5bc99a..a0f0b2b5 100755
--- a/source/l/pycurl/pycurl.SlackBuild
+++ b/source/l/pycurl/pycurl.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pycurl
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -62,7 +62,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py --with-openssl install --root=$PKG || exit 1
python3 setup.py --with-openssl install --root=$PKG || exit 1
find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \
diff --git a/source/l/pycurl/pycurl.url b/source/l/pycurl/pycurl.url
index 52db3a34..16638fdd 100644
--- a/source/l/pycurl/pycurl.url
+++ b/source/l/pycurl/pycurl.url
@@ -1 +1 @@
-https://pypi.python.org/pypi/
+https://pypi.python.org/pypi/pycurl
diff --git a/source/l/pyparsing/pyparsing.SlackBuild b/source/l/pyparsing/pyparsing.SlackBuild
index a03d7bae..c55c5348 100755
--- a/source/l/pyparsing/pyparsing.SlackBuild
+++ b/source/l/pyparsing/pyparsing.SlackBuild
@@ -63,16 +63,23 @@ 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
python3 setup.py install --root=$PKG || exit 1
find $PKG -print0 | xargs -0 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 CHANGES LICENSE* PKG-INFO README* HowToUsePyparsing.html \
+cp -a CHANGES LICENSE* PKG-INFO README* docs/HowToUsePyparsing.* \
$PKG/usr/doc/$PKGNAM-$VERSION
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+ touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/python-appdirs/python-appdirs.SlackBuild b/source/l/python-appdirs/python-appdirs.SlackBuild
index b806a7b9..d7f64a5a 100755
--- a/source/l/python-appdirs/python-appdirs.SlackBuild
+++ b/source/l/python-appdirs/python-appdirs.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-appdirs
VERSION=${VERSION:-$(echo appdirs-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
SRCNAM=appdirs
@@ -61,7 +61,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-certifi/python-certifi.SlackBuild b/source/l/python-certifi/python-certifi.SlackBuild
index 3e627782..7ff3d423 100755
--- a/source/l/python-certifi/python-certifi.SlackBuild
+++ b/source/l/python-certifi/python-certifi.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-certifi
VERSION=${VERSION:-$(echo certifi-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
SRCNAM=certifi
@@ -61,7 +61,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-chardet/python-chardet.SlackBuild b/source/l/python-chardet/python-chardet.SlackBuild
index 61dd9bef..65500355 100755
--- a/source/l/python-chardet/python-chardet.SlackBuild
+++ b/source/l/python-chardet/python-chardet.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-chardet
VERSION=${VERSION:-$(echo chardet-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
SRCNAM=chardet
@@ -63,10 +63,6 @@ find -L . \
python3 setup.py install --root=$PKG || exit 1
-mv $PKG/usr/bin/chardetect $PKG/usr/bin/chardetect-py3
-
-python setup.py install --root=$PKG || exit 1
-
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a *.rst LICENSE* PKG-INFO \
$PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-docutils/python-docutils.SlackBuild b/source/l/python-docutils/python-docutils.SlackBuild
index d5fb7a9e..33e4f7cf 100755
--- a/source/l/python-docutils/python-docutils.SlackBuild
+++ b/source/l/python-docutils/python-docutils.SlackBuild
@@ -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:-2}
+BUILD=${BUILD:-3}
SRCNAM=docutils
@@ -61,7 +61,6 @@ 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 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
diff --git a/source/l/python-enum34/python-enum34.SlackBuild b/source/l/python-enum34/python-enum34.SlackBuild
deleted file mode 100755
index e7c167e6..00000000
--- a/source/l/python-enum34/python-enum34.SlackBuild
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# Copyright 2018 Eric Hameleers, Eindhoven, NL
-# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=python-enum34
-SRCNAM=enum34
-VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
-
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
- case "$(uname -m)" in
- i?86) ARCH=i586 ;;
- arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) ARCH=$(uname -m) ;;
- esac
- export ARCH
-fi
-
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
- exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "armv7hl" ]; then
- SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
- LIBDIRSUFFIX=""
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
-cd $SRCNAM-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-python setup.py install --root=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" \
- | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a \
- PKG-INFO enum/LICENSE enum/README enum/doc/* \
- $PKG/usr/doc/$PKGNAM-$VERSION
-chown -R root:root $PKG/usr/doc
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
- DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
- cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
- touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/python-enum34/python-enum34.url b/source/l/python-enum34/python-enum34.url
deleted file mode 100644
index cfa02c74..00000000
--- a/source/l/python-enum34/python-enum34.url
+++ /dev/null
@@ -1 +0,0 @@
-https://pypi.python.org/pypi/enum34
diff --git a/source/l/python-enum34/slack-desc b/source/l/python-enum34/slack-desc
deleted file mode 100644
index 14e5b6c3..00000000
--- a/source/l/python-enum34/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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-enum34: python-enum34 (Python 3.x enum backported to Python 2)
-python-enum34:
-python-enum34: An enumeration is a set of symbolic names (members) bound to unique,
-python-enum34: constant values. Within an enumeration, the members can be compared by
-python-enum34: identity, and the enumeration itself can be iterated over.
-python-enum34:
-python-enum34: Homepage: https://pypi.python.org/pypi/enum34
-python-enum34:
-python-enum34:
-python-enum34:
-python-enum34:
diff --git a/source/l/python-future/python-future.SlackBuild b/source/l/python-future/python-future.SlackBuild
index 80a1c8d4..da58e46c 100755
--- a/source/l/python-future/python-future.SlackBuild
+++ b/source/l/python-future/python-future.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-future
SRCNAM=future
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
@@ -61,12 +61,6 @@ 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
-
-# Move the python2 versions:
-mv $PKG/usr/bin/futurize $PKG/usr/bin/futurize2
-mv $PKG/usr/bin/pasteurize $PKG/usr/bin/pasteurize2
-
# Clear the build folder:
rm -rf build
diff --git a/source/l/python-idna/python-idna.SlackBuild b/source/l/python-idna/python-idna.SlackBuild
index 6a609b15..a5e6f9d2 100755
--- a/source/l/python-idna/python-idna.SlackBuild
+++ b/source/l/python-idna/python-idna.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-idna
VERSION=${VERSION:-$(echo idna-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
SRCNAM=idna
@@ -61,7 +61,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-notify2/python-notify2.SlackBuild b/source/l/python-notify2/python-notify2.SlackBuild
index f73ce8be..0fdb60f2 100755
--- a/source/l/python-notify2/python-notify2.SlackBuild
+++ b/source/l/python-notify2/python-notify2.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-notify2
VERSION=${VERSION:-$(echo notify2-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
SRCNAM=notify2
@@ -54,6 +54,7 @@ cd $TMP
rm -rf $SRCNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
cd $SRCNAM-$VERSION || exit 1
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -61,7 +62,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-packaging/python-packaging.SlackBuild b/source/l/python-packaging/python-packaging.SlackBuild
index 412640f4..26d8f4c2 100755
--- a/source/l/python-packaging/python-packaging.SlackBuild
+++ b/source/l/python-packaging/python-packaging.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-packaging
VERSION=${VERSION:-$(echo packaging-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
SRCNAM=packaging
@@ -61,7 +61,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-ply/python-ply.SlackBuild b/source/l/python-ply/python-ply.SlackBuild
index 5121256f..68cab39a 100755
--- a/source/l/python-ply/python-ply.SlackBuild
+++ b/source/l/python-ply/python-ply.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-ply
SRCNAM=ply
VERSION=${VERSION:-$(echo ${SRCNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -60,7 +60,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-pygments/python-pygments.SlackBuild b/source/l/python-pygments/python-pygments.SlackBuild
index 5ba9c4ea..99f26600 100755
--- a/source/l/python-pygments/python-pygments.SlackBuild
+++ b/source/l/python-pygments/python-pygments.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-pygments
VERSION=${VERSION:-$(echo Pygments-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
SRCNAM=Pygments
@@ -61,7 +61,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild
index 077cbcbc..bd9f89ba 100755
--- a/source/l/python-requests/python-requests.SlackBuild
+++ b/source/l/python-requests/python-requests.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-requests
VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
SRCNAM=requests
@@ -62,7 +62,6 @@ 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
python3 setup.py install --root=$PKG || exit 1
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/python-sane/python-sane.SlackBuild b/source/l/python-sane/python-sane.SlackBuild
index df36a478..851c90cb 100755
--- a/source/l/python-sane/python-sane.SlackBuild
+++ b/source/l/python-sane/python-sane.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-sane
VERSION=${VERSION:-$(echo Sane-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -76,7 +76,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
python3 setup.py install --root=$PKG || exit 1
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/l/python-six/python-six.SlackBuild b/source/l/python-six/python-six.SlackBuild
index fae7e8b7..36892840 100755
--- a/source/l/python-six/python-six.SlackBuild
+++ b/source/l/python-six/python-six.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-six
VERSION=${VERSION:-$(echo six-*.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
@@ -78,14 +78,13 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
python3 setup.py install --root=$PKG || exit 1
find $PKG -print0 | xargs -0 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 LICENSE PKG-INFO README $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a LICENSE* PKG-INFO README* $PKG/usr/doc/$PKGNAM-$VERSION
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/l/python2-module-collection/python2-module-collection.SlackBuild b/source/l/python2-module-collection/python2-module-collection.SlackBuild
new file mode 100755
index 00000000..c3497699
--- /dev/null
+++ b/source/l/python2-module-collection/python2-module-collection.SlackBuild
@@ -0,0 +1,463 @@
+#!/bin/bash
+
+# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=python2-module-collection
+VERSION=2.7.18
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+mkdir -p $PKGNAM-$VERSION
+# This is a trick to allow the directory to be automatically cleaned up by a cron job here:
+touch $PKGNAM-$VERSION/configure
+
+fix_perms() {
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+}
+
+# Cython-0.29.16:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/Cython-0.29.16.tar.lz || exit 1
+cd Cython-0.29.16
+fix_perms
+python2 setup.py install --root=$PKG --prefix=/usr || exit 1
+# Rename the python2 version with "2" suffix:
+for i in cython cythonize cygdb; do
+ mv $PKG/usr/bin/$i $PKG/usr/bin/${i}2
+done
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Cython-0.29.16
+cp -a *.rst *.txt $PKG/usr/doc/$PKGNAM-$VERSION/Cython-0.29.16
+# 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/Cython-0.29.16)
+ cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
+ touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
+fi
+
+# pip-20.0.2:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/pip-20.0.2.tar.lz || exit 1
+cd pip-20.0.2
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+# Don't package this. We want /usr/bin/pip in the main python-pip package to be
+# the python3 version:
+rm -f $PKG/usr/bin/pip
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.0.2
+cp -a *.txt PKG-INFO README.rst \
+ $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.0.2
+find $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.0.2 -type f -exec chmod 0644 {} \+
+
+# setuptools-44.0.0:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/setuptools-44.0.0.tar.lz || exit 1
+cd setuptools-44.0.0
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+# Drop the python2 version of easy_install so the python 3.x
+# one is the default:
+rm -f $PKG/usr/bin/easy_install
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0
+cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \
+ $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0
+find $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.0.0 -type f -exec chmod 0644 {} \+
+# 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/setuptools-44.0.0)
+ cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
+ touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
+fi
+
+# M2Crypto-0.35.2 and typing-3.7.4.1:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/M2Crypto-0.35.2.tar.xz || exit 1
+cd M2Crypto-0.35.2
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/M2Crypto-0.35.2
+cp -a \
+ CHANGES INSTALL* LICENCE* PKG-INFO README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION/M2Crypto-0.35.2
+# Embed required dep typing module:
+cd ..
+rm -rf typing-3.7.4.1
+tar xf $CWD/modules/typing-3.7.4.1.tar.xz || exit 1
+cd typing-3.7.4.1 || exit 1
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/typing-3.7.4.1
+cp -a \
+ CHANGES INSTALL* LICENCE* PKG-INFO README* doc/* \
+ $PKG/usr/doc/$PKGNAM-$VERSION/typing-3.7.4.1
+
+# Mako-1.1.2:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/Mako-1.1.2.tar.lz || exit 1
+cd Mako-1.1.2
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+# Don't package this:
+rm -f $PKG/usr/bin/mako-render
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Mako-1.1.2
+cp -a AUTHORS CHANGES LICENSE PKG-INFO *.rst *.txt \
+ $PKG/usr/doc/$PKGNAM-$VERSION/Mako-1.1.2
+find $PKG/usr/doc/$PKGNAM-$VERSION/Mako-1.1.2 -type f -exec chmod 0644 {} \+
+
+# pycairo-1.18.2:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/pycairo-1.18.2.tar.lz || exit 1
+cd pycairo-1.18.2
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pycairo-1.18.2
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS PKG-INFO README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION/pycairo-1.18.2
+
+# pycups-1.9.74:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/pycups-1.9.74.tar.lz || exit 1
+cd pycups-1.9.74
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pycups-1.9.74
+cp -a COPYING* NEWS README TODO $PKG/usr/doc/$PKGNAM-$VERSION/pycups-1.9.74
+
+# pycurl-7.43.0.3:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/pycurl-7.43.0.3.tar.lz || exit 1
+cd pycurl-7.43.0.3
+fix_perms
+python2 setup.py --with-openssl install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pycurl-7.43.0.3
+cp -a COPYING* NEWS README TODO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/pycurl-7.43.0.3
+rm -rf $PKG/usr/share/doc/pycurl
+rmdir $PKG/usr/share/doc
+rmdir $PKG/usr/share
+
+# pyparsing-2.4.6:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/pyparsing-2.4.6.tar.lz || exit 1
+cd pyparsing-2.4.6
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pyparsing-2.4.6
+cp -a CHANGES LICENSE* PKG-INFO README* docs/HowToUsePyparsing.* \
+ $PKG/usr/doc/$PKGNAM-$VERSION/pyparsing-2.4.6
+# If there's a CHANGES file, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/pyparsing-2.4.6)
+ cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
+ touch -r CHANGES $DOCSDIR/CHANGES
+fi
+
+# appdirs-1.4.3:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/appdirs-1.4.3.tar.xz || exit 1
+cd appdirs-1.4.3
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/appdirs-1.4.3
+cp -a *.rst LICENSE* PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/appdirs-1.4.3
+find $PKG/usr/doc/$PKGNAM-$VERSION/appdirs-1.4.3 -type f -exec chmod 0644 {} \+
+# 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/appdirs-1.4.3)
+ cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
+ touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
+fi
+
+# certifi-2019.11.28:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/certifi-2019.11.28.tar.lz || exit 1
+cd certifi-2019.11.28
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/certifi-2019.11.28
+cp -a *.rst LICENSE PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/certifi-2019.11.28
+find $PKG/usr/doc/$PKGNAM-$VERSION/certifi-2019.11.28 -type f -exec chmod 0644 {} \+
+
+# chardet-3.0.4:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/chardet-3.0.4.tar.xz || exit 1
+cd chardet-3.0.4
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mv $PKG/usr/bin/chardetect $PKG/usr/bin/chardetect2
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/chardet-3.0.4
+cp -a *.rst LICENSE* PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/chardet-3.0.4
+find $PKG/usr/doc/$PKGNAM-$VERSION/chardet-3.0.4 -type f -exec chmod 0644 {} \+
+
+# docutils-0.16:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/docutils-0.16.tar.lz || exit 1
+cd docutils-0.16
+fix_perms
+python2 setup.py build --build-lib=build/python install --root=$PKG || exit 1
+# Don't package python2 versions of /usr/bin scripts:
+for file in rst2html.py rst2html4.py rst2html5.py rst2latex.py rst2man.py rst2odt.py rst2odt_prepstyles.py rst2pseudoxml.py rst2s5.py rst2xetex.py rst2xml.py rstpep2html.py ; do
+ rm -f $PKG/usr/bin/$file
+done
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/docutils-0.16
+cp -a *.txt PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/docutils-0.16
+find $PKG/usr/doc/$PKGNAM-$VERSION/docutils-0.16 -type f -exec chmod 0644 {} \+
+# If there's a HISTORY.txt, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r HISTORY.txt ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/docutils-0.16)
+ cat HISTORY.txt | head -n 1000 > $DOCSDIR/HISTORY.txt
+ touch -r HISTORY.txt $DOCSDIR/HISTORY.txt
+fi
+
+# enum34-1.1.10:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/enum34-1.1.10.tar.gz || exit 1
+cd enum34-1.1.10
+fix_perms
+python2 setup.py install --root=$PKG
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/enum34-1.1.10
+cp -a \
+ PKG-INFO enum/LICENSE enum/README enum/doc/* \
+ $PKG/usr/doc/$PKGNAM-$VERSION/enum34-1.1.10
+
+# future-0.18.2:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/future-0.18.2.tar.lz || exit 1
+cd future-0.18.2
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+# Move the python2 versions:
+mv $PKG/usr/bin/futurize $PKG/usr/bin/futurize2
+mv $PKG/usr/bin/pasteurize $PKG/usr/bin/pasteurize2
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/future-0.18.2
+cp -a *.rst LICENSE* NOTICE PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/future-0.18.2
+find $PKG/usr/doc/$PKGNAM-$VERSION/future-0.18.2 -type f -exec chmod 0644 {} \+
+
+# idna-2.9:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/idna-2.9.tar.lz || exit 1
+cd idna-2.9
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/idna-2.9
+cp -a *.rst PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/idna-2.9
+find $PKG/usr/doc/$PKGNAM-$VERSION/idna-2.9 -type f -exec chmod 0644 {} \+
+# If there's a HISTORY.rst, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r HISTORY.rst ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/idna-2.9)
+ cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst
+ touch -r HISTORY.rst $DOCSDIR/HISTORY.rst
+fi
+
+# notify2-0.3.1:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/notify2-0.3.1.tar.gz || exit 1
+cd notify2-0.3.1
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/notify2-0.3.1
+cp -a *.rst LICENSE PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/notify2-0.3.1
+find $PKG/usr/doc/$PKGNAM-$VERSION/notify2-0.3.1 -type f -exec chmod 0644 {} \+
+
+# packaging-20.3:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/packaging-20.3.tar.lz || exit 1
+cd packaging-20.3
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/packaging-20.3
+cp -a *.rst LICENSE* PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/packaging-20.3
+find $PKG/usr/doc/$PKGNAM-$VERSION/packaging-20.3 -type f -exec chmod 0644 {} \+
+# If there's a CHANGELOG.rst, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGELOG.rst ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/packaging-20.3)
+ cat CHANGELOG.rst | head -n 1000 > $DOCSDIR/CHANGELOG.rst
+ touch -r CHANGELOG.rst $DOCSDIR/CHANGELOG.rst
+fi
+
+# ply-3.11:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/ply-3.11.tar.lz || exit 1
+cd ply-3.11
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/ply-3.11
+cp -a *.rst LICENSE PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/ply-3.11
+find $PKG/usr/doc/$PKGNAM-$VERSION/ply-3.11 -type f -exec chmod 0644 {} \+
+
+# Pygments-2.5.2:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/Pygments-2.5.2.tar.lz || exit 1
+cd Pygments-2.5.2
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mv $PKG/usr/bin/pygmentize $PKG/usr/bin/pygmentize2
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Pygments-2.5.2
+cp -a *.rst LICENSE PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/Pygments-2.5.2
+find $PKG/usr/doc/$PKGNAM-$VERSION/Pygments-2.5.2 -type f -exec chmod 0644 {} \+
+
+# requests-2.23.0:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/requests-2.23.0.tar.lz || exit 1
+cd requests-2.23.0
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/requests-2.23.0
+cp -a *.rst LICENSE* NOTICE PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/requests-2.23.0
+find $PKG/usr/doc/$PKGNAM-$VERSION/requests-2.23.0 -type f -exec chmod 0644 {} \+
+# If there's a HISTORY.rst, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r HISTORY.rst ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION/requests-2.23.0)
+ cat HISTORY.rst | head -n 1000 > $DOCSDIR/HISTORY.rst
+ touch -r HISTORY.rst $DOCSDIR/HISTORY.rst
+fi
+
+# Sane-2.8.3:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/Sane-2.8.3.tar.xz || exit 1
+cd Sane-2.8.3
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/Sane-2.8.3
+cp -a \
+ *.md *.rst COPYING \
+ $PKG/usr/doc/$PKGNAM-$VERSION/Sane-2.8.3
+
+# six-1.14.0:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/six-1.14.0.tar.lz || exit 1
+cd six-1.14.0
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/six-1.14.0
+cp -a LICENSE* PKG-INFO README* $PKG/usr/doc/$PKGNAM-$VERSION/six-1.14.0
+
+# urllib3-1.25.8:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/urllib3-1.25.8.tar.lz || exit 1
+cd urllib3-1.25.8
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.8
+cp -a *.rst *.txt PKG-INFO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.8
+find $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.8 -type f -exec chmod 0644 {} \+
+# 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/urllib3-1.25.8)
+ cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
+ touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
+fi
+
+# pyxdg-0.26:
+cd $TMP/$PKGNAM-$VERSION || exit 1
+tar xf $CWD/modules/pyxdg-0.26.tar.lz || exit 1
+cd pyxdg-0.26
+fix_perms
+python2 setup.py install --root=$PKG || exit 1
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/pyxdg-0.26
+cp -a \
+ AUTHORS COPYING ChangeLog INSTALL PKG-INFO README TODO \
+ $PKG/usr/doc/$PKGNAM-$VERSION/pyxdg-0.26
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/l/python2-module-collection/slack-desc b/source/l/python2-module-collection/slack-desc
new file mode 100644
index 00000000..5561d8df
--- /dev/null
+++ b/source/l/python2-module-collection/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-module-collection: python2-module-collection (modules for python2)
+python2-module-collection:
+python2-module-collection: These are additional modules that have traditionally been supplied by
+python2-module-collection: Slackware for python2. As python2 is officially EOL but is still
+python2-module-collection: required by some software, these modules have been collected here in
+python2-module-collection: a single package to reduce clutter and to allow them to be pinned at
+python2-module-collection: these versions since upstream has been dropping python2 support in
+python2-module-collection: newer versions.
+python2-module-collection:
+python2-module-collection:
+python2-module-collection:
diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild
index 29a79927..329ca627 100755
--- a/source/n/dnsmasq/dnsmasq.SlackBuild
+++ b/source/n/dnsmasq/dnsmasq.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dnsmasq
VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"}
diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild
index af1cc2eb..2db9928c 100755
--- a/source/n/gnutls/gnutls.SlackBuild
+++ b/source/n/gnutls/gnutls.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gnutls
VERSION=${VERSION:-$(echo gnutls-*.tar.xz | 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
diff --git a/source/x/pyxdg/pyxdg.SlackBuild b/source/x/pyxdg/pyxdg.SlackBuild
index c786f665..d77adf58 100755
--- a/source/x/pyxdg/pyxdg.SlackBuild
+++ b/source/x/pyxdg/pyxdg.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pyxdg
VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -75,7 +75,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
python3 setup.py install --root=$PKG || exit 1
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd..0cfbf088 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+2
diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild
index d78045fa..381f0d96 100755
--- a/source/xap/rdesktop/rdesktop.SlackBuild
+++ b/source/xap/rdesktop/rdesktop.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rdesktop
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