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.

2 files changed, 3 insertions, 33 deletions

diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild
index 1c8dda67c..0aefd8c5f 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 1c61f277a..000000000
--- a/source/l/M2Crypto/typing.url
+++ /dev/null
@@ -1 +0,0 @@
-http://pypi.python.org/pypi/typing/