Wed Mar 20 21:10:30 UTC 202420240320211030

a/libblockdev-2.28-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
a/sysvinit-scripts-15.1-noarch-15.txz:  Rebuilt.
  rc.M: start rc.iceccd and rc.icecc-scheduler earlier.
a/util-linux-2.39.3-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
a/volume_key-0.3.12-x86_64-6.txz:  Rebuilt.
  Drop python2 support.
ap/man-pages-6.7-noarch-1.txz:  Upgraded.
d/cmake-3.28.4-x86_64-1.txz:  Upgraded.
d/llvm-18.1.2-x86_64-1.txz:  Upgraded.
d/python2-2.7.18-x86_64-7.txz:  Rebuilt.
  Bundle the final python2 versions of pip and setuptools.
  Drop the /usr/bin/python symlink.
d/python3-3.9.19-x86_64-1.txz:  Upgraded.
  Point the /usr/bin/python symlink at python3.9.
  PEP 394 says we can do this, and in a world of ambigious shebangs, this
  is probably the best of the available options.
  This update also fixes security issues:
  bundled libexpat was updated to 2.6.0.
  zipfile is now protected from the "quoted-overlap" zipbomb.
  tempfile.TemporaryDirectory cleanup no longer dereferences symlinks when
  working around file system permission errors.
  For more information, see:
    https://pythoninsider.blogspot.com/2024/03/python-31014-3919-and-3819-is-now.html
    https://www.cve.org/CVERecord?id=CVE-2023-52425
    https://www.cve.org/CVERecord?id=CVE-2024-0450
    https://www.cve.org/CVERecord?id=CVE-2023-6597
  (* Security fix *)
d/strace-6.8-x86_64-1.txz:  Upgraded.
kde/kross-interpreters-23.08.5-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
l/libxml2-2.12.6-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
l/mozjs115-115.9.0esr-x86_64-2.txz:  Rebuilt.
  Fixed installed library name. Thanks to reddog83.
  Fixed slack-desc. Thanks to r1w1s1.
l/phonon-4.12.0-x86_64-1.txz:  Upgraded.
l/pilot-link-0.12.5-x86_64-17.txz:  Rebuilt.
  Drop python2 support.
l/python2-module-collection-2.7.18-x86_64-6.txz:  Removed.
  Good bye!
l/python2-pycairo-1.18.2-x86_64-1.txz:  Added.
  We'll need this (along with pygtk and pygobject) until we get gimp3.
  Well, we could build gimp without python support, but I really don't think
  that's the route we want to take.
n/bind-9.18.25-x86_64-1.txz:  Upgraded.
n/crda-4.15-x86_64-1.txz:  Removed.
  The kernel is able to load from wireless-regdb directly. Obsolete.
n/getmail-6.18.14-x86_64-1.txz:  Upgraded.
n/gpgme-1.23.2-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
n/obexftp-0.24.2-x86_64-11.txz:  Rebuilt.
  Drop python2 support.
n/wireless-regdb-2024.01.23-x86_64-1.txz:  Added.
  Wireless regulatory database, previously bundled with crda.
x/ibus-1.5.29-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
x/libkkc-0.3.5-x86_64-4.txz:  Rebuilt.
  Still forcing python2 with this one, but perhaps a python3 marisa module
  could work around this.
x/libkkc-data-0.2.7-x86_64-4.txz:  Rebuilt.
  Still forcing python2 with this one, but perhaps a python3 marisa module
  could work around this.
x/xcb-proto-1.16.0-x86_64-2.txz:  Rebuilt.
  Drop python2 support.
x/xpyb-1.3.1-x86_64-7.txz:  Removed.
  Nothing uses it, and it was never updated for python3. Removed as obsolete.

44 files changed, 627 insertions, 812 deletions

diff --git a/source/a/libblockdev/libblockdev.SlackBuild b/source/a/libblockdev/libblockdev.SlackBuild
index 68681eee4..2a2dd5378 100755
--- a/source/a/libblockdev/libblockdev.SlackBuild
+++ b/source/a/libblockdev/libblockdev.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2017-2019  Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2020  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2024  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libblockdev
 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
@@ -107,6 +107,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --infodir=/usr/info \
   --disable-static \
   --without-dm \
+  --without-python2 \
+  --with-python3 \
   --build=$ARCH-slackware-linux || exit 1
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index ecb510913..fc63ce083 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -88,6 +88,18 @@ if [ -x /etc/rc.d/rc.syslog ]; then
   /etc/rc.d/rc.syslog start
 fi
 
+# Start the Icecream scheduler. This needs to run on only one machine that is
+# part of the compile cluster:
+if [ -x /etc/rc.d/rc.icecc-scheduler ]; then
+  /etc/rc.d/rc.icecc-scheduler start
+fi
+
+# Start the Icecream daemon. This needs to run on every machine that will be
+# part of the compile cluster (including the machine running the scheduler):
+if [ -x /etc/rc.d/rc.iceccd ]; then
+  /etc/rc.d/rc.iceccd start
+fi
+
 # Update the X font indexes:
 if [ -x /usr/bin/fc-cache ]; then
   echo "Updating X font indexes:  /usr/bin/fc-cache -f &"
@@ -413,18 +425,6 @@ if [ -x /etc/rc.d/rc.gpm ]; then
   /etc/rc.d/rc.gpm start
 fi
 
-# Start the Icecream scheduler. This needs to run on only one machine that is
-# part of the compile cluster:
-if [ -x /etc/rc.d/rc.icecc-scheduler ]; then
-  /etc/rc.d/rc.icecc-scheduler start
-fi
-
-# Start the Icecream daemon. This needs to run on every machine that will be
-# part of the compile cluster (including the machine running the scheduler):
-if [ -x /etc/rc.d/rc.iceccd ]; then
-  /etc/rc.d/rc.iceccd start
-fi
-
 # If there are SystemV init scripts for this runlevel, run them.
 if [ -x /etc/rc.d/rc.sysvinit ]; then
   /etc/rc.d/rc.sysvinit
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 06160485c..b4ea662e1 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:-15.1}
 ARCH=noarch
-BUILD=${BUILD:-14}
+BUILD=${BUILD:-15}
 
 # 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/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index 21ac283ea..35858a799 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021, 2022, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020, 2021, 2022, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=util-linux
 VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3  | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 ADJTIMEXVERS=1.29
 SETSERIALVERS=2.17
@@ -129,15 +129,7 @@ zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1
 # /dev/ram* devices in 'fdisk -l' output:
 zcat $CWD/util-linux.do.not.list.ram.devices.diff.gz | patch -p1 --verbose || exit 1
 
-# This just call the configure script with $1 either being 2 for python2
-# or 3 for python3.
-#
-# The releasenotes say to use --runstatedir, but it doesn't work and the
-# configure script fails. So we'll leave things using localstatedir, but
-# check again later:
-#
-#   --runstatedir=/run
-configure_with_python(){
+CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -167,12 +159,8 @@ configure_with_python(){
   --disable-libmount-mountfd-support \
   --enable-libuuid \
   --disable-uuidd \
-  --with-python=$1 \
-  --build=$ARCH-slackware-linux
-}
-
-CFLAGS="$SLKCFLAGS" \
-  configure_with_python 2 || exit 1
+  --with-python=3 \
+  --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
 make install $NUMJOBS DESTDIR=$PKG || exit 1
@@ -185,15 +173,6 @@ if [ -r $PKG/usr/bin/chsh ]; then
   chmod 4711 $PKG/usr/bin/chsh
 fi
 
-# Build python3 bindings for libmount:
-make clean
-CFLAGS="$SLKCFLAGS" \
-  configure_with_python 3 || exit 1
-make $NUMJOBS \
-  install-pylibmountexecLTLIBRARIES \
-  install-pylibmountexecPYTHON \
-  DESTDIR=$PKG || exit 1
-
 # Remove all overlap with the shadow package, since --disable-login doesn't quite do that:
 rm $PKG/sbin/nologin $PKG/usr/man/man8/nologin.8 $PKG/sbin/sulogin $PKG/usr/man/man8/sulogin.8
 
diff --git a/source/a/volume_key/volume_key.SlackBuild b/source/a/volume_key/volume_key.SlackBuild
index 97b30eccc..0649ba48f 100755
--- a/source/a/volume_key/volume_key.SlackBuild
+++ b/source/a/volume_key/volume_key.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=volume_key
 VERSION=${VERSION:-$(echo $PKGNAM-$PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -109,6 +109,9 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Nope.
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/python2.7/
+
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
diff --git a/source/ap/man-pages/man-pages.SlackBuild b/source/ap/man-pages/man-pages.SlackBuild
index 87303f8ab..7acba4656 100755
--- a/source/ap/man-pages/man-pages.SlackBuild
+++ b/source/ap/man-pages/man-pages.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=man-pages
 VERSION=${VERSION:-$(/bin/ls man-pages-*.tar.?z | head -n 1 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # 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/cmake/cmake.url b/source/d/cmake/cmake.url
index 8ddccb9a4..bd2252069 100644
--- a/source/d/cmake/cmake.url
+++ b/source/d/cmake/cmake.url
@@ -1,2 +1,2 @@
 https://github.com/Kitware/CMake/releases
-https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3.tar.gz
+https://github.com/Kitware/CMake/releases/download/v3.28.4/cmake-3.28.4.tar.gz
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 7e87a7a3a..aab67ce71 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -94,8 +94,6 @@ if [ "$BUILD_CLANGD" = "NO" ]; then
   CLANGD="-DCLANG_ENABLE_CLANGD=OFF"
 fi
 
-# Python2 short version:
-PY2=$(python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' | cut -f 2 -d n | cut -f 1 -d /)
 # Python3 short version:
 PY3=$(python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' | cut -f 2 -d n | cut -f 1 -d /)
 
@@ -267,21 +265,17 @@ fi
 rm -f $PKG/usr/lib$LIBDIRSUFFIX/libgomp.so
 
 # Install Python bindings:
-for pyver in ${PY2} ${PY3}; do
+for pyver in ${PY3}; do
   mkdir -p "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages"
   cp -a tools/clang/bindings/python/clang "$PKG/usr/lib$LIBDIRSUFFIX/python$pyver/site-packages/"
 done
 
 # Remove bundled python-six:
-rm -f "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/six.py"
+rm -f "$PKG/usr/lib$LIBDIRSUFFIX/python2*/site-packages/six.py"
 
 # Compile Python scripts:
-python -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/clang"
-python -O -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/clang"
 python3 -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY3}/site-packages/clang"
 python3 -O -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY3}/site-packages/clang"
-python -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/lldb"
-python -O -m compileall "$PKG/usr/lib$LIBDIRSUFFIX/python${PY2}/site-packages/lldb"
 python3 -m compileall "$PKG/usr/share/scan-view"
 python3 -O -m compileall "$PKG/usr/share/scan-view"
 python3 -m compileall "$PKG/usr/share/clang"
@@ -290,7 +284,7 @@ python3 -m compileall "$PKG/usr/share/opt-viewer"
 python3 -O -m compileall "$PKG/usr/share/opt-viewer"
 
 # Nevermind, we're not shipping this python2 crap:
-rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python${PY2}
+rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python2*
 
 # Move man page directory:
 mv $PKG/usr/share/man $PKG/usr/
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index 5b0ca1eb0..493f26074 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,15 +1,15 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/llvm-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/clang-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/clang-tools-extra-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/compiler-rt-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/flang-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/lldb-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/openmp-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/polly-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/libcxx-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/libcxxabi-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/lld-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/libunwind-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/cmake-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/third-party-18.1.1.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.1/runtimes-18.1.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/llvm-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/clang-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/clang-tools-extra-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/compiler-rt-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/flang-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/lldb-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/openmp-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/polly-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/libcxx-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/libcxxabi-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/lld-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/libunwind-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/cmake-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/third-party-18.1.2.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.2/runtimes-18.1.2.src.tar.xz
diff --git a/source/d/python2/python2.SlackBuild b/source/d/python2/python2.SlackBuild
index 26effbb01..c360fd8a8 100755
--- a/source/d/python2/python2.SlackBuild
+++ b/source/d/python2/python2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2012, 2013, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2013, 2016, 2018, 2020, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ 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:-6}
+BUILD=${BUILD:-7}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -114,6 +114,53 @@ sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# This conflicts with python3. We'll assume the python3 version is more
+# up-to-date and just get rid of it:
+rm -f $PKG/usr/bin/2to3
+
+# We don't want these now:
+rm -f $PKG/usr/bin/python
+rm -f $PKG/usr/bin/python-config
+
+# Bundle the very last pip for python2:
+tar xf $CWD/pip-20.3.tar.lz || exit 1
+cd pip-20.3
+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.3
+cp -a *.txt PKG-INFO README.rst \
+  $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.3
+find $PKG/usr/doc/$PKGNAM-$VERSION/pip-20.3 -type f -exec chmod 0644 {} \+
+cd ..
+
+# Bundle the very last setuptools for python2:
+tar xf $CWD/setuptools-44.1.1.tar.lz || exit 1
+cd setuptools-44.1.1
+fix_perms
+# Install setuptools to the system if it's not there:
+if [ ! -d /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/setuptools/version.py ]; then
+  python2 setup.py install --root=/ || exit 1
+fi
+python2 setup.py install --root=$PKG || exit 1
+# It's tempting to get rid of this entirely, but we'll leave the -2.7 versioned
+# binary:
+rm -f $PKG/usr/bin/easy_install
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.1.1
+cp -a CHANGES.rst PKG-INFO README.rst docs/*.txt \
+  $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.1.1
+find $PKG/usr/doc/$PKGNAM-$VERSION/setuptools-44.1.1 -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.1.1)
+  cat CHANGES.rst | head -n 1000 > $DOCSDIR/CHANGES.rst
+  touch -r CHANGES.rst $DOCSDIR/CHANGES.rst
+fi
+cd ..
+
 # Install some python-demo files:
 mkdir -p $PKG/usr/doc/python2-$VERSION
 cp -a Demo $PKG/usr/doc/python2-$VERSION
@@ -128,14 +175,6 @@ mv $SITEPK/README $PKG/usr/doc/python2-$VERSION/README.python-tools
   ln -sf $TOOLSDIR Tools
 )
 
-# Make a few useful symlinks:
-mkdir -p $PKG/usr/bin
-( cd $PKG/usr/bin
-  ln -sf $TOOLSDIR/pynche/pynche pynche
-  ln -sf $TOOLSDIR/i18n/msgfmt.py .
-  ln -sf $TOOLSDIR/i18n/pygettext.py .
-)
-
 # Install docs:
 mkdir -p $PKG/usr/doc/python2-$VERSION/Documentation
 cp -a README LICENSE $PKG/usr/doc/python2-$VERSION
@@ -151,12 +190,6 @@ chown -R root:root $PKG/usr/doc/python2-$VERSION
   find . -perm 750 -exec chmod 755 "{}" \+
 )
 
-
-( cd $PKG/usr/bin
-  rm -f python
-  ln -sf python${BRANCH_VERSION} python
-)
-
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/d/python3/python3.SlackBuild b/source/d/python3/python3.SlackBuild
index c437325c4..d7a577a3b 100755
--- a/source/d/python3/python3.SlackBuild
+++ b/source/d/python3/python3.SlackBuild
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-# Slackware build script for python3
-
 # Copyright 2012-2017 Audrius Kažukauskas <audrius@neutrino.lt>
-# Copyright 2017, 2018, 2019  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2018, 2019, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -123,8 +121,11 @@ find -L . \
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-# Remove to avoid overwriting a copy from Python2.
-rm -f $PKG/usr/bin/2to3
+# PEP says we can claim this link:
+( cd $PKG/usr/bin
+  rm -f python
+  ln -sf python${BRANCH_VERSION} python
+)
 
 ## NOPE, let's try using -I instead.
 ## Add a symlink to cpython include directory to fix various builds that
diff --git a/source/d/strace/strace.url b/source/d/strace/strace.url
index d41382895..7f8c04ea1 100644
--- a/source/d/strace/strace.url
+++ b/source/d/strace/strace.url
@@ -1,2 +1,2 @@
 https://github.com/strace/strace
-https://github.com/strace/strace/releases/download/v6.7/strace-6.7.tar.xz
+https://github.com/strace/strace/releases/download/v6.8/strace-6.8.tar.xz
diff --git a/source/kde/kde/build/kross-interpreters b/source/kde/kde/build/kross-interpreters
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kross-interpreters
+++ b/source/kde/kde/build/kross-interpreters
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/kross-interpreters.patch b/source/kde/kde/patch/kross-interpreters.patch
new file mode 100644
index 000000000..0c0038b19
--- /dev/null
+++ b/source/kde/kde/patch/kross-interpreters.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kross-interpreters/dump-python2.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kross-interpreters/dump-python2.patch b/source/kde/kde/patch/kross-interpreters/dump-python2.patch
new file mode 100644
index 000000000..c4fa64268
--- /dev/null
+++ b/source/kde/kde/patch/kross-interpreters/dump-python2.patch
@@ -0,0 +1,42 @@
+--- ./CMakeLists.txt.orig	2024-01-11 15:29:12.000000000 -0600
++++ ./CMakeLists.txt	2024-03-19 22:59:23.005420760 -0500
+@@ -16,28 +16,6 @@
+ find_package(Qt5 5.2.0 CONFIG REQUIRED Core Gui Widgets)
+ find_package(KF5 5.11.0 REQUIRED Kross)
+ 
+-# ========================= Find Python 2 =========================
+-
+-# TODO: CMake's FindPythonLibs.cmake needs fixing, because without the
+-# following hack find_package(PythonLibs 3) would find the previously found
+-# version 2.7. Due to this hack one cannot predefine PYTHON_LIBRARY and/or
+-# PYTHON_INCLUDE_DIR by editing CMakeCache.txt.
+-unset(PYTHON_INCLUDE_DIR CACHE)
+-unset(PYTHON_LIBRARY CACHE)
+-unset(PYTHON_LIBRARY_DEBUG CACHE)
+-# Unset variables set by find_package(PythonInterp) which is called by KI18n
+-unset(PYTHON_VERSION_MAJOR)
+-unset(PYTHON_VERSION_MINOR)
+-find_package(PythonLibs 2 EXACT)
+-
+-set(PYTHON2_LIBS_FOUND ${PYTHONLIBS_FOUND})
+-set(PYTHON2_LIBRARIES ${PYTHON_LIBRARIES})
+-set(PYTHON2_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
+-set(PYTHON2_LIBS_VERSION_STRING ${PYTHONLIBS_VERSION_STRING})
+-if(PYTHON2_LIBS_FOUND)
+-    message(STATUS "Found Python 2: ${PYTHON2_LIBRARIES} (found version \"${PYTHON2_LIBS_VERSION_STRING}\")")
+-endif()
+-
+ # ========================= Find FALCON =========================
+ 
+ ### Falcon support disabled because it does not work with most modern falcon-0.9.x
+@@ -61,10 +39,6 @@
+ 
+ # ========================= Traverse subdirectories for actual targets =========================
+ 
+-if(PYTHON2_LIBS_FOUND)
+-    ecm_optional_add_subdirectory(python)
+-endif(PYTHON2_LIBS_FOUND)
+-
+ ### Falcon support disabled because it does not work with most modern falcon-0.9.x
+ # if(FALCON_FOUND)
+ #     ecm_optional_add_subdirectory(falcon)
diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild
index 3ab2261c5..fae202b3a 100755
--- a/source/l/libxml2/libxml2.SlackBuild
+++ b/source/l/libxml2/libxml2.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2018, 2022, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2018, 2022, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libxml2
 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
@@ -60,7 +60,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-PYTHONLIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
 PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
 
 TMP=${TMP:-/tmp}
@@ -87,37 +86,6 @@ if [ ! -r configure ]; then
   fi
 fi
 
-# Build for python2, for now...
-
-PYTHON=/usr/bin/python2 \
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-static \
-  --with-python \
-  --with-legacy \
-  --with-ftp \
-  --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-python2 -m compileall "${PKG}$PYTHONLIB"
-python2 -O -m compileall "${PKG}$PYTHONLIB"
-
-make clean
-
-# Next build for python3...
-
-## Fixes for python-3.9.x:
-#sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}
-#sed -i '/_PyVerify_fd/,+1d' python/types.c
-#sed -i 's/test.test/#&/' python/tests/tstLastError.py
-
 # Patch from openSUSE.
 # See:  https://bugzilla.gnome.org/show_bug.cgi?id=789714
 cat $CWD/libxml2-2.12.0-python3-unicode-errors.patch | patch -p1 --verbose || exit 1
diff --git a/source/l/mozjs115/mozjs115.SlackBuild b/source/l/mozjs115/mozjs115.SlackBuild
index 16b521b23..f6a794aa4 100755
--- a/source/l/mozjs115/mozjs115.SlackBuild
+++ b/source/l/mozjs115/mozjs115.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=mozjs115
 SRCNAME=firefox
 VERSION=$(basename $(ls $SRCNAME-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -146,10 +146,15 @@ rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libjs_static.*
 rm -f $PKG/usr/bin/js*-config
 
 # Rename shared library to have a proper soname:
-mv $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-102.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-102.so.0.0.0
+SHORTVER=$(echo $PKGNAM | cut -b 6-)
+if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-${SHORTVER}.so ]; then
+  echo "FATAL: trying to rename library but $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-${SHORTVER}.so is not found."
+  exit 1
+fi
+mv $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-${SHORTVER}.so $PKG/usr/lib${LIBDIRSUFFIX}/libmozjs-${SHORTVER}.so.0.0.0
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}
-  ln -sf libmozjs-102.so.0.0.0 libmozjs-102.so.0
-  ln -sf libmozjs-102.so.0 libmozjs-102.so
+  ln -sf libmozjs-${SHORTVER}.so.0.0.0 libmozjs-${SHORTVER}.so.0
+  ln -sf libmozjs-${SHORTVER}.so.0 libmozjs-${SHORTVER}.so
 )
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/source/l/mozjs115/slack-desc b/source/l/mozjs115/slack-desc
index 00b13046e..155713c30 100644
--- a/source/l/mozjs115/slack-desc
+++ b/source/l/mozjs115/slack-desc
@@ -6,15 +6,15 @@
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-mozjs102: mozjs102 (Mozilla's JavaScript Engine)
-mozjs102:
-mozjs102: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is
-mozjs102: used in various Mozilla products (including Firefox) and is available
-mozjs102: under MPL/GPL/LGPL tri-license.
-mozjs102:
-mozjs102: Homepage:
-mozjs102: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-mozjs102:
-mozjs102:
-mozjs102:
-mozjs102:
+mozjs115: mozjs115 (Mozilla's JavaScript Engine)
+mozjs115:
+mozjs115: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. It is
+mozjs115: used in various Mozilla products (including Firefox) and is available
+mozjs115: under MPL/GPL/LGPL tri-license.
+mozjs115:
+mozjs115: Homepage:
+mozjs115: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
+mozjs115:
+mozjs115:
+mozjs115:
+mozjs115:
diff --git a/source/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild
index fa8e7f12e..f29b53863 100755
--- a/source/l/phonon/phonon.SlackBuild
+++ b/source/l/phonon/phonon.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh 
 
 # Copyright 2008  Robby Workman, Northport, Alabama, USA
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2020, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # Copyright 2010, 2011, 2012, 2014, 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=phonon
 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
diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild
index 4f42f44f7..80e15ce26 100755
--- a/source/l/pilot-link/pilot-link.SlackBuild
+++ b/source/l/pilot-link/pilot-link.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2015, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2015, 2018, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pilot-link
 VERSION=${VERSION:-0.12.5}
-BUILD=${BUILD:-16}
+BUILD=${BUILD:-17}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -93,7 +93,7 @@ CFLAGS="$SLKCFLAGS" \
   --enable-libusb \
   --with-libpng \
   --with-perl \
-  --with-python \
+  --without-python \
   --program-prefix="" \
   --program-suffix="" \
   --build=$ARCH-slackware-linux || exit 1
diff --git a/source/l/python2-module-collection/python2-module-collection.SlackBuild b/source/l/python2-module-collection/python2-module-collection.SlackBuild
deleted file mode 100755
index 8b754ae5d..000000000
--- a/source/l/python2-module-collection/python2-module-collection.SlackBuild
+++ /dev/null
@@ -1,496 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020, 2021  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:-6}
-
-# 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 | grep -E -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 {} \+
-}
-
-# 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
-# Install setuptools to the system if it's not there:
-if [ ! -d /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/setuptools/version.py ]; then
-  python2 setup.py install --root=/ || exit 1
-fi
-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
-
-# 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 {} \+
-
-# 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.11:
-cd $TMP/$PKGNAM-$VERSION || exit 1
-tar xf $CWD/modules/urllib3-1.25.11.tar.lz || exit 1
-cd urllib3-1.25.11
-fix_perms
-python2 setup.py install --root=$PKG || exit 1
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.11
-cp -a *.rst *.txt PKG-INFO \
-  $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.11
-find $PKG/usr/doc/$PKGNAM-$VERSION/urllib3-1.25.11 -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.11)
-  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
-
-# dbus-python-1.2.16:
-cd $TMP/$PKGNAM-$VERSION || exit 1
-tar xf $CWD/modules/dbus-python-1.2.16.tar.lz
-cd dbus-python-1.2.16
-fix_perms
-PYTHON_VERSION=2 \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --disable-html-docs \
-  --enable-shared=yes \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux \
-  || exit 1
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/dbus-python-1.2.16
-cp -a \
-  AUTHORS COPYING* INSTALL NEWS README* \
-  $PKG/usr/doc/$PKGNAM-$VERSION/dbus-python-1.2.16
-
-# Remove overlap with main package:
-rm -rf $PKG/usr/include/dbus-1.0
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/dbus-python.pc
-
-# 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
deleted file mode 100644
index 5561d8df4..000000000
--- a/source/l/python2-module-collection/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------------------------------------------------------|
-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/l/python2-pycairo/pycairo.url b/source/l/python2-pycairo/pycairo.url
new file mode 100644
index 000000000..251924169
--- /dev/null
+++ b/source/l/python2-pycairo/pycairo.url
@@ -0,0 +1 @@
+https://pypi.python.org/pypi/pycairo
diff --git a/source/l/python2-pycairo/python2-pycairo.SlackBuild b/source/l/python2-pycairo/python2-pycairo.SlackBuild
new file mode 100755
index 000000000..d02f40954
--- /dev/null
+++ b/source/l/python2-pycairo/python2-pycairo.SlackBuild
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Copyright 2024  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=python2-pycairo
+SRCNAM=pycairo
+VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i586 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+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
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+python2 setup.py build install --root=$PKG || exit 1
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a *.txt PKG-INFO README.rst \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+
+
+# If there's a CHANGES.txt, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGES.txt ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat CHANGES.txt | head -n 1000 > $DOCSDIR/CHANGES.txt
+  touch -r CHANGES.txt $DOCSDIR/CHANGES.txt
+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/python2-pycairo/slack-desc b/source/l/python2-pycairo/slack-desc
new file mode 100644
index 000000000..6bf5c7971
--- /dev/null
+++ b/source/l/python2-pycairo/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-pycairo: python2-pycairo (Python bindings for the cairo graphics library)
+python2-pycairo:
+python2-pycairo: Pycairo is set of Python bindings for the cairo graphics library.
+python2-pycairo: 
+python2-pycairo: Pycairo's web site: https://python2-pycairo.readthedocs.io/en/latest/
+python2-pycairo:
+python2-pycairo:
+python2-pycairo:
+python2-pycairo:
+python2-pycairo:
+python2-pycairo:
diff --git a/source/n/crda/crda.url b/source/n/crda/crda.url
deleted file mode 100644
index ea4bf7802..000000000
--- a/source/n/crda/crda.url
+++ /dev/null
@@ -1,2 +0,0 @@
-#https://www.kernel.org/pub/software/network/crda/
-https://git.kernel.org/cgit/linux/kernel/git/mcgrof/crda.git/
diff --git a/source/n/crda/get_regdb.sh b/source/n/crda/get_regdb.sh
deleted file mode 100644
index ce886f488..000000000
--- a/source/n/crda/get_regdb.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-_DATE="$(date +%Y%m%d)"
-
-rm -rf wireless-regdb-git_${_DATE} wireless-regdb-git_${_DATE}.tar.bz2
-
-git clone \
-  git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git \
-  wireless-regdb-git_${_DATE}
-
-chown -R root:root wireless-regdb-git_${_DATE}
-rm -rf wireless-regdb-git_${_DATE}/.git*
-tar cjf wireless-regdb-git_${_DATE}.tar.bz2 wireless-regdb-git_${_DATE}
-rm -rf wireless-regdb-git_${_DATE}
-
diff --git a/source/n/crda/slack-desc b/source/n/crda/slack-desc
deleted file mode 100644
index 794493d70..000000000
--- a/source/n/crda/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------------------------------------------------------|
-crda: crda (Central Regulatory Domain Agent)
-crda: 
-crda: This is the Central Regulatory Domain Agent for Linux. 
-crda: It serves one purpose: tell the Linux kernel what to enforce. 
-crda: In essence, it is a udev helper for communication between
-crda: the kernel and userspace. 
-crda: 
-crda: You only need to run this manually for debugging purposes.
-crda: 
-crda: Homepage: http://wireless.kernel.org
-crda: 
diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild
index 097a0225f..ec40fcfad 100755
--- a/source/n/gpgme/gpgme.SlackBuild
+++ b/source/n/gpgme/gpgme.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gpgme
 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
@@ -96,6 +96,9 @@ make install DESTDIR=$PKG || exit 1
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+# Nope.
+rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/python2.7/
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
   | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild
index 900850df8..16437b094 100755
--- a/source/n/obexftp/obexftp.SlackBuild
+++ b/source/n/obexftp/obexftp.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2015, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2015, 2017, 2018, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=obexftp
 VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)}
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -62,7 +62,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
 PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
 
 rm -rf $PKG
@@ -98,21 +97,6 @@ cd build
   make install DESTDIR=$PKG || exit 1
 cd ..
 
-mkdir -p build-python2
-cd build-python2
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-    -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PKGNAM-$VERSION \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DPython_ADDITIONAL_VERSIONS=2.7 ..
-  cd swig/python
-  make $NUMJOBS || make || exit 1
-  make install DESTDIR=$PKG || exit 1
-cd ../../../
-
 # Relocate man pages:
 mv $PKG/usr/share/man $PKG/usr
 rmdir $PKG/usr/share 2> /dev/null
@@ -133,8 +117,6 @@ fi
 )
 
 # Generate .pyc files
-python -m compileall "${PKG}$PYTHONLIB"
-python -O -m compileall "${PKG}$PYTHONLIB"
 python3 -m compileall "${PKG}$PYTHON3LIB"
 python3 -O -m compileall "${PKG}$PYTHON3LIB"
 
diff --git a/source/n/wireless-regdb/slack-desc b/source/n/wireless-regdb/slack-desc
new file mode 100644
index 000000000..d7e240d5e
--- /dev/null
+++ b/source/n/wireless-regdb/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------------------------------------------------------|
+wireless-regdb: wireless-regdb (radio regulatory compliance database)
+wireless-regdb: 
+wireless-regdb: This package provides a machine-readable database of legal regulations
+wireless-regdb: on radio emissions that affect use of wireless networking. The Linux
+wireless-regdb: kernel and drivers use this to maintain compliance with those
+wireless-regdb: regulations.
+wireless-regdb: 
+wireless-regdb: Homepage: https://wireless.wiki.kernel.org
+wireless-regdb: 
+wireless-regdb: 
+wireless-regdb: 
diff --git a/source/n/crda/crda.SlackBuild b/source/n/wireless-regdb/wireless-regdb.SlackBuild
index cf7a0a8e7..a38f6891c 100755
--- a/source/n/crda/crda.SlackBuild
+++ b/source/n/wireless-regdb/wireless-regdb.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2009  Robby Workman, Northport, AL, USA
-# Copyright 2009, 2010, 2016, 2018, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2016, 2018, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 
 cd $(dirname $0) ; CWD=$(pwd)
 
-PKGNAM=crda
-VERSION=${VERSION:-4.15}
+PKGNAM=wireless-regdb
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -45,10 +45,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-REGDBVERS=2023.05.03
-
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-crda
+PKG=$TMP/package-wireless-regdb
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -70,8 +68,8 @@ mkdir -p $TMP $PKG
 
 # First, we need to install the wireless regulatory bin
 cd $TMP
-tar xvf $CWD/wireless-regdb-$REGDBVERS.tar.xz || exit 1
-cd wireless-regdb-$REGDBVERS || exit 1
+tar xvf $CWD/wireless-regdb-$VERSION.tar.xz || exit 1
+cd wireless-regdb-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,56 +77,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-# If this isn't installed on the system, crda will not build:
-make install MANDIR=/usr/man || exit 1
-
-# Install to the package directory:
-make install DESTDIR=$PKG MANDIR=/usr/man || exit 1
+make install DESTDIR=$PKG MANDIR=/usr/man FIRMWARE_PATH=/lib/firmware || exit 1
 
-mkdir -p $PKG/usr/doc/crda-$VERSION/regdb
-cp -a LICENSE README db.txt $PKG/usr/doc/crda-$VERSION/regdb
-
-# Now we'll do crda itself
-cd $TMP
-rm -rf crda-$VERSION
-tar xvf $CWD/crda-$VERSION.tar.?z* || exit 1
-cd crda-$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 {} \+
-
-# This thing uses our CFLAGS on its own, but if we specify them,
-# it fails to build. The build failure is wacky, as if it's not
-# linking libnl into crda.o -- the detection for libnl is broken,
-# but even if it's fixed, the errors still occur. This works, so...
-sed -i -e "s,-Werror ,,g" -e "s,fpic,fPIC,g" Makefile
-
-make \
-  MANDIR=/usr/man \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  || exit 1
-make install \
-  MANDIR=/usr/man \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  DESTDIR=$PKG \
-  || 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
+mkdir -p $PKG/usr/doc/wireless-regdb-$VERSION/regdb
+cp -a LICENSE README db.txt $PKG/usr/doc/wireless-regdb-$VERSION/regdb
 
 # Manpages are already compressed
 
-mkdir -p $PKG/usr/doc/crda-$VERSION
-cp -a \
-  LICENSE README \
-  $PKG/usr/doc/crda-$VERSION
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/crda-$VERSION-$ARCH-$BUILD.txz
-
+/sbin/makepkg -l y -c n $TMP/wireless-regdb-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/crda/wireless-regdb.url b/source/n/wireless-regdb/wireless-regdb.url
index a795b6947..a795b6947 100644
--- a/source/n/crda/wireless-regdb.url
+++ b/source/n/wireless-regdb/wireless-regdb.url
diff --git a/source/x/ibus/ibus.SlackBuild b/source/x/ibus/ibus.SlackBuild
index 27b9629ee..a2a5c5f57 100755
--- a/source/x/ibus/ibus.SlackBuild
+++ b/source/x/ibus/ibus.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2017  Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2017, 2020, 2022, 2023  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2017, 2020, 2022, 2023, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ibus
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -117,6 +117,7 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-python-library \
   --with-python=python3 \
+  --disable-python2 \
   --with-unicode-emoji-dir=$TMP/ibus-$VERSION \
   --with-ucd-dir=$TMP/ibus-$VERSION \
   --disable-systemd-services \
@@ -124,7 +125,14 @@ CFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux || exit 1
 
 make $NUMJOBS || make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# cleanup temporary files:
+rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python*/site-packages/gi
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cu
+t -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # Compress manual pages:
 find $PKG/usr/man -type f -exec gzip -9 {} \+
@@ -139,9 +147,6 @@ install -m 644 $CWD/ibus-autostart-plasma.desktop $PKG/etc/xdg/autostart/
 install -m 755 $CWD/ibus-autostart $PKG/usr/bin/
 sed -i "s|LIBDIRSUFFIX|$LIBDIRSUFFIX|" $PKG/usr/bin/ibus-autostart
 
-# cleanup temporary files
-rm -rf $PKG/usr/lib$LIBDIRSUFFIX/python2.7/site-packages/gi
-
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
diff --git a/source/x/libkkc-data/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch b/source/x/libkkc-data/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch
new file mode 100644
index 000000000..91d3f6956
--- /dev/null
+++ b/source/x/libkkc-data/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch
@@ -0,0 +1,138 @@
+From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Mon, 30 Jul 2018 15:26:37 +0900
+Subject: [PATCH] build: Enable python3
+
+---
+ data/templates/libkkc-data/tools/genfilter.py | 18 +++++++--------
+ data/templates/libkkc-data/tools/sortlm.py    | 23 ++++++++-----------
+ 2 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/data/templates/libkkc-data/tools/genfilter.py b/data/templates/libkkc-data/tools/genfilter.py
+index 5ffab32..0c5f75a 100644
+--- a/data/templates/libkkc-data/tools/genfilter.py
++++ b/data/templates/libkkc-data/tools/genfilter.py
+@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
+ 
+     def generate(self):
+         size = os.fstat(self.infile.fileno()).st_size
+-        n = size / self.record_size
++        n = size // self.record_size
+         m = int(math.ceil(-n*math.log10(ERROR_RATE) /
+                           math.pow(math.log10(2), 2)))
+-        m = (m/8 + 1)*8
++        m = (m//8 + 1)*8
+         inmem = mmap.mmap(self.infile.fileno(),
+                           size,
+                           access=mmap.ACCESS_READ)
+-        outmem = bytearray(m/8)
+-        for i in xrange(0, n):
++        outmem = bytearray(m//8)
++        for i in range(0, n):
+             offset = i*self.record_size
+             b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
+-            for k in xrange(0, 4):
++            for k in range(0, 4):
+                 h = murmur_hash3_32(b0, b1, k)
+                 h = int(h * (m / float(0xFFFFFFFF)))
+-                outmem[h/8] |= (1 << (h%8))
++                outmem[h//8] |= (1 << (h%8))
+         inmem.close()
+-        # Convert bytearray to str, for Python 2.6 compatibility.
+-        self.outfile.write(str(outmem))
++        # Convert bytearray to bytes, for Python 3 compatibility.
++        self.outfile.write(bytes(outmem))
+ 
+ if __name__ == '__main__':
+     import sys
+@@ -110,7 +110,7 @@ def generate(self):
+     parser = argparse.ArgumentParser(description='filter')
+     parser.add_argument('infile', type=argparse.FileType('r'),
+                         help='input file')
+-    parser.add_argument('outfile', type=argparse.FileType('w'),
++    parser.add_argument('outfile', type=argparse.FileType('wb'),
+                         help='output file')
+     parser.add_argument('record_size', type=int,
+                         help='record size')
+diff --git a/data/templates/libkkc-data/tools/sortlm.py b/data/templates/libkkc-data/tools/sortlm.py
+index a0dd8fe..40f0837 100644
+--- a/data/templates/libkkc-data/tools/sortlm.py
++++ b/data/templates/libkkc-data/tools/sortlm.py
+@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
+         self.__min_cost = 0.0
+ 
+     def read(self):
+-        print "reading N-grams"
++        print("reading N-grams")
+         self.__read_tries()
+         self.__read_ngrams()
+-        print "min cost = %lf" % self.__min_cost
++        print("min cost = %lf" % self.__min_cost)
+ 
+     def __read_tries(self):
+         while True:
+@@ -58,7 +58,7 @@ def __read_tries(self):
+             line = self.__infile.readline()
+             if line == "":
+                 break
+-            line = line.strip()
++            line = line.strip('\n')
+             if line == "":
+                 break
+             match = self.__ngram_line_regex.match(line)
+@@ -89,7 +89,7 @@ def __read_ngrams(self):
+                 line = self.__infile.readline()
+                 if line == "":
+                     break
+-                line = line.strip()
++                line = line.strip('\n')
+                 if line == "":
+                     break
+                 match = self.__ngram_line_regex.match(line)
+@@ -125,14 +125,11 @@ def __write_ngrams(self):
+         def quantize(cost, min_cost):
+             return max(0, min(65535, int(cost * 65535 / min_cost)))
+ 
+-        def cmp_header(a, b):
+-            return cmp(a[0], b[0])
+-
+-        print "writing 1-gram file"
++        print("writing 1-gram file")
+         unigram_offsets = {}
+         unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
+         offset = 0
+-        for ids, value in sorted(self.__ngram_entries[0].iteritems()):
++        for ids, value in sorted(self.__ngram_entries[0].items()):
+             unigram_offsets[ids[0]] = offset
+             s = struct.pack("=HHH",
+                             quantize(value[0], self.__min_cost),
+@@ -143,13 +140,13 @@ def cmp_header(a, b):
+             offset += 1
+         unigram_file.close()
+ 
+-        print "writing 2-gram file"
++        print("writing 2-gram file")
+         bigram_offsets = {}
+         bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
+         keys = self.__ngram_entries[1].keys()
+         items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
+         offset = 0
+-        for header, ids in sorted(items, cmp=cmp_header):
++        for header, ids in sorted(items, key=lambda x: x[0]):
+             value = self.__ngram_entries[1][ids]
+             bigram_offsets[ids] = offset
+             s = struct.pack("=HH",
+@@ -160,11 +157,11 @@ def cmp_header(a, b):
+         bigram_file.close()
+ 
+         if len(self.__ngram_entries[2]) > 0:
+-            print "writing 3-gram file"
++            print("writing 3-gram file")
+             trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
+             keys = self.__ngram_entries[2].keys()
+             items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
+-            for header, ids in sorted(items, cmp=cmp_header):
++            for header, ids in sorted(items, key=lambda x: x[0]):
+                 value = self.__ngram_entries[2][ids]
+                 s = struct.pack("=H",
+                                 quantize(value[0], self.__min_cost))
diff --git a/source/x/libkkc-data/libkkc-data.SlackBuild b/source/x/libkkc-data/libkkc-data.SlackBuild
index c35d3b623..fc24a2637 100755
--- a/source/x/libkkc-data/libkkc-data.SlackBuild
+++ b/source/x/libkkc-data/libkkc-data.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libkkc-data
 
 # Copyright 2015-2016  Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2016, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2020, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libkkc-data
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -85,6 +85,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Something for later?
+#cat $CWD/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch | patch -p1 --verbose || exit 1
+#sed -i "s|#!/usr/bin/python$|#!/usr/bin/python3|g" data/templates/libkkc-data/tools/*.py
+
 if [ ! -r configure ]; then
   if [ -x ./autogen.sh ]; then
     NOCONFIGURE=1 ./autogen.sh
@@ -93,6 +97,10 @@ if [ ! -r configure ]; then
   fi
 fi
 
+###########################
+# FORCING PYTHON2 FOR NOW #
+###########################
+PYTHON=python2 \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/x/libkkc/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch b/source/x/libkkc/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch
new file mode 100644
index 000000000..91d3f6956
--- /dev/null
+++ b/source/x/libkkc/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch
@@ -0,0 +1,138 @@
+From ba1c1bd3eb86d887fc3689c3142732658071b5f7 Mon Sep 17 00:00:00 2001
+From: Takao Fujiwara <tfujiwar@redhat.com>
+Date: Mon, 30 Jul 2018 15:26:37 +0900
+Subject: [PATCH] build: Enable python3
+
+---
+ data/templates/libkkc-data/tools/genfilter.py | 18 +++++++--------
+ data/templates/libkkc-data/tools/sortlm.py    | 23 ++++++++-----------
+ 2 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/data/templates/libkkc-data/tools/genfilter.py b/data/templates/libkkc-data/tools/genfilter.py
+index 5ffab32..0c5f75a 100644
+--- a/data/templates/libkkc-data/tools/genfilter.py
++++ b/data/templates/libkkc-data/tools/genfilter.py
+@@ -84,24 +84,24 @@ def __init__(self, infile, outfile, record_size):
+ 
+     def generate(self):
+         size = os.fstat(self.infile.fileno()).st_size
+-        n = size / self.record_size
++        n = size // self.record_size
+         m = int(math.ceil(-n*math.log10(ERROR_RATE) /
+                           math.pow(math.log10(2), 2)))
+-        m = (m/8 + 1)*8
++        m = (m//8 + 1)*8
+         inmem = mmap.mmap(self.infile.fileno(),
+                           size,
+                           access=mmap.ACCESS_READ)
+-        outmem = bytearray(m/8)
+-        for i in xrange(0, n):
++        outmem = bytearray(m//8)
++        for i in range(0, n):
+             offset = i*self.record_size
+             b0, b1 = struct.unpack("=LL", inmem[offset:offset+8])
+-            for k in xrange(0, 4):
++            for k in range(0, 4):
+                 h = murmur_hash3_32(b0, b1, k)
+                 h = int(h * (m / float(0xFFFFFFFF)))
+-                outmem[h/8] |= (1 << (h%8))
++                outmem[h//8] |= (1 << (h%8))
+         inmem.close()
+-        # Convert bytearray to str, for Python 2.6 compatibility.
+-        self.outfile.write(str(outmem))
++        # Convert bytearray to bytes, for Python 3 compatibility.
++        self.outfile.write(bytes(outmem))
+ 
+ if __name__ == '__main__':
+     import sys
+@@ -110,7 +110,7 @@ def generate(self):
+     parser = argparse.ArgumentParser(description='filter')
+     parser.add_argument('infile', type=argparse.FileType('r'),
+                         help='input file')
+-    parser.add_argument('outfile', type=argparse.FileType('w'),
++    parser.add_argument('outfile', type=argparse.FileType('wb'),
+                         help='output file')
+     parser.add_argument('record_size', type=int,
+                         help='record size')
+diff --git a/data/templates/libkkc-data/tools/sortlm.py b/data/templates/libkkc-data/tools/sortlm.py
+index a0dd8fe..40f0837 100644
+--- a/data/templates/libkkc-data/tools/sortlm.py
++++ b/data/templates/libkkc-data/tools/sortlm.py
+@@ -40,10 +40,10 @@ def __init__(self, infile, output_prefix):
+         self.__min_cost = 0.0
+ 
+     def read(self):
+-        print "reading N-grams"
++        print("reading N-grams")
+         self.__read_tries()
+         self.__read_ngrams()
+-        print "min cost = %lf" % self.__min_cost
++        print("min cost = %lf" % self.__min_cost)
+ 
+     def __read_tries(self):
+         while True:
+@@ -58,7 +58,7 @@ def __read_tries(self):
+             line = self.__infile.readline()
+             if line == "":
+                 break
+-            line = line.strip()
++            line = line.strip('\n')
+             if line == "":
+                 break
+             match = self.__ngram_line_regex.match(line)
+@@ -89,7 +89,7 @@ def __read_ngrams(self):
+                 line = self.__infile.readline()
+                 if line == "":
+                     break
+-                line = line.strip()
++                line = line.strip('\n')
+                 if line == "":
+                     break
+                 match = self.__ngram_line_regex.match(line)
+@@ -125,14 +125,11 @@ def __write_ngrams(self):
+         def quantize(cost, min_cost):
+             return max(0, min(65535, int(cost * 65535 / min_cost)))
+ 
+-        def cmp_header(a, b):
+-            return cmp(a[0], b[0])
+-
+-        print "writing 1-gram file"
++        print("writing 1-gram file")
+         unigram_offsets = {}
+         unigram_file = open("%s.1gram" % self.__output_prefix, "wb")
+         offset = 0
+-        for ids, value in sorted(self.__ngram_entries[0].iteritems()):
++        for ids, value in sorted(self.__ngram_entries[0].items()):
+             unigram_offsets[ids[0]] = offset
+             s = struct.pack("=HHH",
+                             quantize(value[0], self.__min_cost),
+@@ -143,13 +140,13 @@ def cmp_header(a, b):
+             offset += 1
+         unigram_file.close()
+ 
+-        print "writing 2-gram file"
++        print("writing 2-gram file")
+         bigram_offsets = {}
+         bigram_file = open("%s.2gram" % self.__output_prefix, "wb")
+         keys = self.__ngram_entries[1].keys()
+         items = [(struct.pack("=LL", ids[1], unigram_offsets[ids[0]]), ids) for ids in keys]
+         offset = 0
+-        for header, ids in sorted(items, cmp=cmp_header):
++        for header, ids in sorted(items, key=lambda x: x[0]):
+             value = self.__ngram_entries[1][ids]
+             bigram_offsets[ids] = offset
+             s = struct.pack("=HH",
+@@ -160,11 +157,11 @@ def cmp_header(a, b):
+         bigram_file.close()
+ 
+         if len(self.__ngram_entries[2]) > 0:
+-            print "writing 3-gram file"
++            print("writing 3-gram file")
+             trigram_file = open("%s.3gram" % self.__output_prefix, "wb")
+             keys = self.__ngram_entries[2].keys()
+             items = [(struct.pack("=LL", ids[2], bigram_offsets[(ids[0], ids[1])]), ids) for ids in keys]
+-            for header, ids in sorted(items, cmp=cmp_header):
++            for header, ids in sorted(items, key=lambda x: x[0]):
+                 value = self.__ngram_entries[2][ids]
+                 s = struct.pack("=H",
+                                 quantize(value[0], self.__min_cost))
diff --git a/source/x/libkkc/libkkc.SlackBuild b/source/x/libkkc/libkkc.SlackBuild
index ee44d61ba..ec67ff4f9 100755
--- a/source/x/libkkc/libkkc.SlackBuild
+++ b/source/x/libkkc/libkkc.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for libkkc
 
 # Copyright 2016  Heinz Wiesinger, Amsterdam, The Netherlands
-# Copyright 2016, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2020, 2024  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libkkc
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -85,6 +85,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+# Something for later?
+#cat $CWD/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch | patch -p1 --verbose || exit 1
+#sed -i "s|#!/usr/bin/python$|#!/usr/bin/python3|g" data/templates/libkkc-data/tools/*.py
+
 if [ ! -r configure ]; then
   if [ -x ./autogen.sh ]; then
     NOCONFIGURE=1 ./autogen.sh
@@ -93,6 +97,10 @@ if [ ! -r configure ]; then
   fi
 fi
 
+###########################
+# FORCING PYTHON2 FOR NOW #
+###########################
+PYTHON=python2 \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/x/x11/build/xcb-proto b/source/x/x11/build/xcb-proto
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xcb-proto
+++ b/source/x/x11/build/xcb-proto
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/configure/xcb-proto b/source/x/x11/configure/xcb-proto
index 2df1aaf74..4074f1583 100644
--- a/source/x/x11/configure/xcb-proto
+++ b/source/x/x11/configure/xcb-proto
@@ -1,26 +1,8 @@
-mkdir python2 python3
-
-cd python2
-  CFLAGS=$SLKCFLAGS \
-  CXXFLAGS=$SLKCFLAGS \
-  PYTHON=python3 \
-  ../configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --infodir=/usr/info \
-    --mandir=/usr/man \
-    --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
-    --with-udev-rules-dir=/lib/udev/rules.d \
-    --disable-static \
-    --build=$ARCH-slackware-linux
-cd -
-
+mkdir python3
 cd python3
   CFLAGS=$SLKCFLAGS \
   CXXFLAGS=$SLKCFLAGS \
-  PYTHON=python \
+  PYTHON=python3 \
   ../configure \
     --prefix=/usr \
     --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/source/x/x11/make/xcb-proto b/source/x/x11/make/xcb-proto
index a4c380bbc..b39aa7786 100644
--- a/source/x/x11/make/xcb-proto
+++ b/source/x/x11/make/xcb-proto
@@ -1,17 +1,7 @@
-cd python2
-  if ! make $NUMJOBS ; then
-    touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
-    continue
-  fi
-
-  make install DESTDIR=$PKG
-cd -
-
 cd python3
   if ! make $NUMJOBS ; then
     touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed
     continue
   fi
-
   make install DESTDIR=$PKG
 cd -
diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist
index 75a3ace30..51c508d07 100644
--- a/source/x/x11/package-blacklist
+++ b/source/x/x11/package-blacklist
@@ -41,6 +41,7 @@ xf86-video-vboxvideo
 xf86-video-voodoo
 xf86-video-xgi
 xf86-video-xgixp
+xpyb
 
 # CAREFUL NOT TO "SHIP" THE STUFF BELOW IN THE MAIN X PACKAGES DIR!
 
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 1ca4c5e36..ab6c28373 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -278,7 +278,10 @@ if [ ! -z $MOZLOCALIZE ]; then
     browser/installer/package-manifest.in || exit 1
 fi
 
+# They say to use the second line, not the first.
+# But they're not the boos of me.
 export MACH_USE_SYSTEM_PYTHON="1"
+#export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 export MOZILLA_OFFICIAL="1"
 export BUILD_OFFICIAL="1"
 export MOZ_PHOENIX="1"
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index f857cb827..b4cfb0cde 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -249,7 +249,10 @@ if [ ! -z $MOZLOCALIZE ]; then
     mail/installer/package-manifest.in || exit 1
 fi
 
+# They say to use the second line, not the first.
+# But they're not the boos of me.
 export MACH_USE_SYSTEM_PYTHON="1"
+#export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 export MOZ_PHOENIX=1