20201107.1 global branch merge.current-20201107.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

62 files changed, 246 insertions, 2048 deletions

diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 14fd0f2042..2747bc62a1 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -4,7 +4,7 @@
 
 # Slackware build script for LibreOffice
 
-# Copyright 2015-2019 Christoph Willing Brisbane, Australia
+# Copyright 2015-2020 Christoph Willing Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@
 
 PRGNAM=LibreOffice
 SRCNAM=libreoffice
-VERSION=${VERSION:-6.2.8.2}
+VERSION=${VERSION:-7.0.0.3}
 SHORT_VERSION=${VERSION%.*.*}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -91,15 +91,15 @@ jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
 # If PARALLEL environment variable is set, use that to override everything.
 [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL"
 
-JAVA=${JAVA:-openjdk7}
+JAVA=${JAVA:-jdk11}
 if [ "$JAVA" = "openjdk7" ]; then
   . /etc/profile.d/openjdk7.sh
   use_java="--with-java=java"
 elif [ "$JAVA" = "openjdk8" ]; then
   . /etc/profile.d/openjdk8.sh
   use_java="--with-java=java"
-elif [ "$JAVA" = "jdk" ]; then
-  . /etc/profile.d/jdk.sh
+elif [ "$JAVA" = "jdk11" ]; then
+  . /etc/profile.d/jdk11.sh
   use_java="--with-java=java"
 elif [ "$JAVA" = "no" ]; then
   use_java="--with-java=no"
@@ -154,7 +154,6 @@ if pkg-config --exists python3 ; then Python3="--enable-python=system" ; else Py
 if pkg-config --exists Qt5 ; then qt5="--enable-qt5" ; else qt5="" ; fi
 if pkg-config --exists valgrind ; then valgrind="--with-valgrind" ; else valgrind="" ; fi
 
-kde4="--enable-kde4" ; [ "${KDE4:-yes}" != "yes" ]     && kde4="--disable-kde4"
 use_ccache="--disable-ccache" ; [ "${USE_CCACHE:-no}" != "no" ] && use_ccache=""
 
 # Extensions
@@ -168,7 +167,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ]     &
 ./autogen.sh \
     CFLAGS="$SLKCFLAGS" \
     CXXFLAGS="$SLKCFLAGS" \
-    NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\
     --prefix=/usr   \
     --mandir=/usr/man \
     --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -188,7 +186,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ]     &
     $avahi \
     $Python3 \
     $vlc \
-    $kde4 \
     $use_ccache \
     $use_java \
     $parallel \
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index fc9a4c48ec..0bd741bde9 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,12 +1,12 @@
 PRGNAM="LibreOffice"
-VERSION="6.2.8.2"
+VERSION="7.0.0.3"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/6.2.8/libreoffice-6.2.8.2.tar.xz \
-          http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-6.2.8.2-srcs.tar.xz"
-MD5SUM="1438fdfae3076b8b1b1460054a318f0b \
-        b5d5e57832056d8a5625b1d5dc3aa024"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.0.0/libreoffice-7.0.0.3.tar.xz \
+          http://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.0.0.3-srcs.tar.xz"
+MD5SUM="5326d58cf100ec0e9796afe4536f177d \
+        8d05fa43ce5c036d8273982f3d81606a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 openjdk7 apache-ant perl-Archive-Zip"
+REQUIRES="apache-ant perl-Archive-Zip jdk11"
 MAINTAINER="Christoph Willing"
 EMAIL="chris.willing@linux.com"
diff --git a/office/LibreOffice/README b/office/LibreOffice/README
index dc7ee5981e..12c452a089 100644
--- a/office/LibreOffice/README
+++ b/office/LibreOffice/README
@@ -35,30 +35,22 @@ Build time environment variables that may be set to vary features are as follows
   VLC="yes"
    This requires the vlc package (available from SBo) to be installed.
 
-2. disable kde4 support (enabled by default) with:
-  KDE4="no"
-
-3. support additional languages by overriding the LOLANGS variable, whose
+2. support additional languages by overriding the LOLANGS variable, whose
    default setting is LOLANGS="de es fr id it ja nl vi zh-CN". Note that en-US
    is always added to whatever LOLANGS is set. Thus building with, for example,
-      LOLANGS="de" sh LibreOffice
+      LOLANGS="de" sh LibreOffice.SlackBuild
    would build LibreOffice with support for german and US english languages.
    Additionally, setting LOLANGS="ALL" will build in support for all available
    languages.
 
-4. A number of Java Development Kits are suitable for building LibreOffice.
-   The default JDK for this SlackBuild is openjdk7. Others may be chosen by
-   setting the JAVA environment variable when running the SlackBuild. Recognised
-   values are openjdk7 (the default, not explicitly required), openjdk8 and jdk
-   e.g. JAVA=jdk (to use SBo jdk package with Oracle binary version). Using an
-   alternate JDK will require presence of the appropriate package when building
-   LibreOffice. Since the apache-ant package is already required by openjdk7,
-   hence openjdk8, its listing in the REQUIRES field is redundant in these cases.
-   However it remains listed to accomodate the case of JAVA=jdk, in which the
-   apache-ant package is needed to build LibreOffice.
-   Finally, setting JAVA=no will build LibreOffice without any Java support.
+3. Previously, a number of Java Development Kits have been suitable for building
+   LibreOffice. At the moment however (since, at least, LO version 7.0.0.3) this
+   build has been tested only with jdk11 - this is now the default. If the jdk11
+   prerequisite is not acceptable for some reason, it is still possible to build
+   LibreOffice (with somewhat reduced capability in LO Base) by running:
+        JAVA=no sh LibreOffice.SlackBuild
 
-5. The number of parallel make jobs used by the LibreOffice build system defaults
+4. The number of parallel make jobs used by the LibreOffice build system defaults
    to the number of available cpu cores. If the MAKEFLAGS environment variable
    contains the -j option e.g.
        MAKEFLAGS=-j6
@@ -69,7 +61,7 @@ Build time environment variables that may be set to vary features are as follows
    which would limit building to a single make process, overriding any value set
    with the -j option in MAKEFLAGS.
 
-6. Use of ccache during building is turned off by default to save disk space (and
+5. Use of ccache during building is turned off by default to save disk space (and
    possible build failure due to lack of disk space). It may be reinstated by
    setting the USE_CCACHE environment to "yes" e.g.
        USE_CCACHE=yes sh LibreOffice.SlackBuild
diff --git a/office/LibreOffice/no-check-if-root.diff b/office/LibreOffice/no-check-if-root.diff
index ff63ada2f7..3d1cc6907f 100644
--- a/office/LibreOffice/no-check-if-root.diff
+++ b/office/LibreOffice/no-check-if-root.diff
@@ -1,20 +1,10 @@
---- Makefile.orig	2018-02-07 22:18:13.161535968 +1000
-+++ Makefile	2018-02-07 22:17:41.560533422 +1000
-@@ -9,7 +9,7 @@
- 
- gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
- 
--.PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
-+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch get-submodules id install install-gdb-printers install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
- 
- MAKECMDGOALS?=all
- build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
-@@ -254,7 +254,7 @@
- #
- # Bootstrap
- #
--bootstrap: check-if-root compilerplugins
-+bootstrap: compilerplugins
- 
- #
- # Build
+--- Makefile.orig	2020-08-24 20:32:27.135000000 +1000
++++ Makefile	2020-08-24 20:33:56.988000000 +1000
+@@ -63,7 +63,6 @@
+ 		echo; \
+ 		echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
+ 		echo; \
+-		exit 1; \
+ 	fi
+ 
+ gb_Side ?= host
diff --git a/office/abook/abook.SlackBuild b/office/abook/abook.SlackBuild
index 45031e240b..5f8fef6ccf 100644
--- a/office/abook/abook.SlackBuild
+++ b/office/abook/abook.SlackBuild
@@ -75,7 +75,7 @@ find -L . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 aclocal && automake --add-missing && autoconf
-sed 's/0.18/0.19/g' -i po/Makefile.in.in
+sed 's/0.18/0.20/g' -i po/Makefile.in.in
 # thanks to the archers for this patch ;)
 patch -p1 -i $CWD/gcc5.patch
 
diff --git a/office/apvlv/apvlv.SlackBuild b/office/apvlv/apvlv.SlackBuild
index 5246eb400f..62eff77de8 100644
--- a/office/apvlv/apvlv.SlackBuild
+++ b/office/apvlv/apvlv.SlackBuild
@@ -23,15 +23,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 PRGNAM=apvlv
-VERSION=${VERSION:-0.1.4}
+VERSION=${VERSION:-20160627_9ab7626}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,21 +60,21 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-Source
-tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.gz
-cd $PRGNAM-$VERSION-Source
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+cd $PRGNAM-$VERSION
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
 
 mkdir -p build
 cd build
   cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE="$SLKCFLAGS -fpermissive" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DAPVLV_WITH_UMD=false \
     -DMANDIR=/usr/man \
diff --git a/office/apvlv/apvlv.info b/office/apvlv/apvlv.info
index da882def19..4df540a600 100644
--- a/office/apvlv/apvlv.info
+++ b/office/apvlv/apvlv.info
@@ -1,8 +1,8 @@
 PRGNAM="apvlv"
-VERSION="0.1.4"
+VERSION="20160627_9ab7626"
 HOMEPAGE="http://naihe2010.github.com/apvlv/"
-DOWNLOAD="https://github.com/downloads/naihe2010/apvlv/apvlv-0.1.4-Source.tar.gz"
-MD5SUM="bcd3e96350a2378662e2f2d0fa02d342"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/apvlv-20160627_9ab7626.tar.xz"
+MD5SUM="e7a285ca7ac4d3abc1842519c0f20987"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/asymptote/asymptote.SlackBuild b/office/asymptote/asymptote.SlackBuild
index c591eca5ff..f5ac8e6c59 100644
--- a/office/asymptote/asymptote.SlackBuild
+++ b/office/asymptote/asymptote.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asymptote
-VERSION=${VERSION:-2.44}
+VERSION=${VERSION:-2.65}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/asymptote/asymptote.info b/office/asymptote/asymptote.info
index 2d7de25278..c7392afa3d 100644
--- a/office/asymptote/asymptote.info
+++ b/office/asymptote/asymptote.info
@@ -1,10 +1,10 @@
 PRGNAM="asymptote"
-VERSION="2.44"
+VERSION="2.65"
 HOMEPAGE="http://asymptote.sourceforge.net/"
-DOWNLOAD="https://downloads.sourceforge.net/sourceforge/asymptote/asymptote-2.44.src.tgz"
-MD5SUM="98cd8858841e6e833039b85e0b814257"
+DOWNLOAD="https://downloads.sourceforge.net/asymptote/asymptote-2.65.src.tgz"
+MD5SUM="97b80ad03dfbcad7cae0fdb2c666fdb5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="texlive"
+REQUIRES="glm texlive"
 MAINTAINER="Johannes Schoepfer"
 EMAIL="slackbuilds[at]schoepfer[dot]info"
diff --git a/office/calibre/calibre.SlackBuild b/office/calibre/calibre.SlackBuild
index 048798bcf9..a3ea02f20d 100644
--- a/office/calibre/calibre.SlackBuild
+++ b/office/calibre/calibre.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calibre
-VERSION=${VERSION:-3.34.0}
+VERSION=${VERSION:-3.48.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,6 +70,8 @@ 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 {} \;
 
+# Patch for qt-5.15.x
+patch -p1 < $CWD/patches/qt-5.15.patch
 # Remove desktop integration.  We'll do that later.
 patch -p1 < $CWD/patches/remove-desktop-integration.patch
 # Fix calibre module location.
@@ -79,10 +81,6 @@ patch -p1 < $CWD/patches/calibre-no-update.patch
 # Remove calibre portable scripts.
 rm -f resources/calibre-portable.*
 
-PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-export SIP_BIN=/usr/bin/python2-sip
-export SIP_INC_DIR="/usr/include/python$PYTHONVER/python2-sip"
-
 OVERRIDE_CFLAGS="$SLKCFLAGS" \
 OVERRIDE_LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
 python setup.py build
diff --git a/office/calibre/calibre.info b/office/calibre/calibre.info
index ef7454be15..a2716dfff7 100644
--- a/office/calibre/calibre.info
+++ b/office/calibre/calibre.info
@@ -1,10 +1,10 @@
 PRGNAM="calibre"
-VERSION="3.34.0"
+VERSION="3.48.0"
 HOMEPAGE="https://calibre-ebook.com"
-DOWNLOAD="https://download.calibre-ebook.com/3.34.0/calibre-3.34.0.tar.xz"
-MD5SUM="8d462959dba64b829529b63fd3f78b8c"
+DOWNLOAD="https://download.calibre-ebook.com/3.48.0/calibre-3.48.0.tar.xz"
+MD5SUM="ec7431dcdeea8a9d8eca3edc83bdec42"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cssutils dnspython mechanize podofo python-dateutil netifaces psutil cssselect apsw optipng PyQt5 Pygments msgpack-python regex html5-parser dukpy unrardll"
+REQUIRES="css-parser dnspython mechanize podofo python-dateutil netifaces psutil cssselect apsw optipng PyQt5 Pygments msgpack-python regex html5-parser dukpy unrardll python2-pillow"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/office/calibre/patches/qt-5.15.patch b/office/calibre/patches/qt-5.15.patch
new file mode 100644
index 0000000000..bfcb486e9b
--- /dev/null
+++ b/office/calibre/patches/qt-5.15.patch
@@ -0,0 +1,40 @@
+From db7007a25faefb0cc90e64dda1c0793393b9512d Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Tue, 26 May 2020 20:10:48 +0200
+Subject: [PATCH] Update fontconfig database for Qt 5.15
+
+---
+ src/calibre/headless/fontconfig_database.cpp | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
+index d867f02948..96a6365ba2 100644
+--- a/src/calibre/headless/fontconfig_database.cpp
++++ b/src/calibre/headless/fontconfig_database.cpp
+@@ -295,7 +295,26 @@ static const char specialLanguages[][6] = {
+     "", // MasaramGondi
+     "", // Nushu
+     "", // Soyombo
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++    "", // ZanabazarSquare
++    "", // Dogra
++    "", // GunjalaGondi
++    "", // HanifiRohingya
++    "", // Makasar
++    "", // Medefaidrin
++    "", // OldSogdian
++    "", // Sogdian
++    "", // Elymaic
++    "", // Nandinagari
++    "", // NyiakengPuachueHmong
++    "", // Wancho
++    "", // Chorasmian
++    "", // DivesAkuru
++    "", // KhitanSmallScript
++    "" // Yezidi
++#else
+     "" // ZanabazarSquare
++#endif // Qt >= 5.15
+ #else
+     ""  // SignWriting
+ #endif // Qt >= 5.11
diff --git a/office/calibre/patches/remove-desktop-integration.patch b/office/calibre/patches/remove-desktop-integration.patch
index dbf54d6cb0..0272a7c6eb 100644
--- a/office/calibre/patches/remove-desktop-integration.patch
+++ b/office/calibre/patches/remove-desktop-integration.patch
@@ -1,13 +1,14 @@
-diff -Naur calibre.orig/src/calibre/linux.py calibre/src/calibre/linux.py
---- calibre.orig/src/calibre/linux.py	2012-06-29 04:53:39.000000000 +0000
-+++ calibre/src/calibre/linux.py	2012-07-03 02:57:13.834849391 +0000
-@@ -177,9 +177,6 @@
-         self.mime_resources = []
+diff -Naur calibre-3.48.0.orig/src/calibre/linux.py calibre-3.48.0/src/calibre/linux.py
+--- calibre-3.48.0.orig/src/calibre/linux.py	2019-09-13 04:46:46.000000000 +0200
++++ calibre-3.48.0/src/calibre/linux.py	2020-03-04 15:02:49.789055000 +0100
+@@ -725,10 +725,6 @@
+         self.appdata_resources = []
          if islinux or isbsd:
              self.setup_completion()
 -        if islinux or isbsd:
 -            self.setup_desktop_integration()
--        self.create_uninstaller()
+-        if not getattr(self.opts, 'staged_install', False):
+-            self.create_uninstaller()
  
          from calibre.utils.config import config_dir
          if os.path.exists(config_dir):
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index a1f6e48489..b944aacad0 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -33,7 +33,7 @@
 #   some fugly hackery to work, see shim.h for gory details and polemic.
 
 PRGNAM=evince
-VERSION=${VERSION:-3.28.5}
+VERSION=${VERSION:-3.34.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -89,20 +89,6 @@ if [ "$NLS" != "YES" ]; then
       -e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
 fi
 
-# 20200101 bkw: "shim" to let us actually compile with gtk+-3.18 and
-# glib-2.46.2. Supposedly these versions are supported by evince-3.28.5,
-# but upstream uses a couple of functions that are new in gtk+-3.22
-# and glib-2.52. Fortunately it's stuff we can work around with a few
-# #defines.
-SLKCFLAGS="$SLKCFLAGS -include $CWD/shim.h"
-
-# 20200101 bkw: 14.2's mime stuff identifies djvu files as
-# image/vnd.djvu only, but evince wants image/vnd.djvu+multipage.
-sed -i '/^ *DJVU_MIME_TYPES/s|="|&image/vnd.djvu;|' configure
-
-# If we were building 3.30.x, we'd need this:
-# --without-gspell \
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -126,23 +112,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --disable-nautilus \
   --disable-maintainer-mode \
+  --without-gspell \
   --with-systemduserunitdir=no \
   --build=$ARCH-slackware-linux
 
-# ugh. glib-genmarshal's flags changed gratuitously.
-sed -i 's,--prototypes,--header,' libview/Makefile
-
 make V=1
 make install-strip DESTDIR=$PKG
 
-# Fix desktop entry
-sed -i "/NoDisplay=true/d" $PKG/usr/share/applications/evince.desktop
-
 gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 rm -rf $PKG/{usr/share/gtk-doc,etc}
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README.md MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/office/evince/evince.info b/office/evince/evince.info
index 91a6eca4f1..a5814eea74 100644
--- a/office/evince/evince.info
+++ b/office/evince/evince.info
@@ -1,8 +1,8 @@
 PRGNAM="evince"
-VERSION="3.28.5"
+VERSION="3.34.2"
 HOMEPAGE="http://projects.gnome.org/evince/"
-DOWNLOAD="https://download.gnome.org/sources/evince/3.28/evince-3.28.5.tar.xz"
-MD5SUM="855600d64544a959add349e32f5185e0"
+DOWNLOAD="https://download.gnome.org/sources/evince/3.34/evince-3.34.2.tar.xz"
+MD5SUM="9e9e82fa8f6045ad7817157d9335d185"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/evince/shim.h b/office/evince/shim.h
deleted file mode 100644
index 8439c34ac5..0000000000
--- a/office/evince/shim.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 20191231 bkw: This seems like stupidity: g_content_type_is_mime_type
-   is a new function in glib-2.52, which literally just calls the
-   g_content_type_is_a function from older glibs, and returns its
-   result. Here's the function from the glib-2.52 source:
-
-   gboolean
-   g_content_type_is_mime_type (const gchar *type,
-                                const gchar *mime_type)
-   {
-     return g_content_type_is_a (type, mime_type);
-   }
-
-   The docs describe it as a "convenience wrapper" but there's
-   nothing more or less convenient about it, except that it breaks builds
-   with older glib versions. Why does it even exist?
- */
-#define g_content_type_is_mime_type(x,y) g_content_type_is_a(x,y)
-
-/* 20191231 bkw: We'd need gtk+-3.22 to have gtk_popover_popup and
-   gtk_popover_popdown. They're functionally the same as gtk_widget_show
-   and gtk_widget_hide, except they have a "transition" (fade-in/out).
-   Some folks might actually prefer it without the fade.
- */
-#define gtk_popover_popup(x) gtk_widget_show(GTK_WIDGET(x))
-#define gtk_popover_popdown(x) gtk_widget_hide(GTK_WIDGET(x))
diff --git a/office/fbreader/fbreader.SlackBuild b/office/fbreader/fbreader.SlackBuild
index d5c54adeac..d19b2904a3 100644
--- a/office/fbreader/fbreader.SlackBuild
+++ b/office/fbreader/fbreader.SlackBuild
@@ -56,6 +56,9 @@ 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 {} \;
 
+# Needed for gcc >= 6.x
+sed -i "s|-Wall|-Wall -Wno-narrowing|" makefiles/arch/desktop.mk
+
 patch -p1 < $CWD/fbreader-0.99.4.patch
 
 export TARGET_ARCH=desktop
diff --git a/office/gbgoffice/gbgoffice.SlackBuild b/office/gbgoffice/gbgoffice.SlackBuild
index 08a3eac59b..268a1f6f00 100644
--- a/office/gbgoffice/gbgoffice.SlackBuild
+++ b/office/gbgoffice/gbgoffice.SlackBuild
@@ -78,6 +78,7 @@ patch -p1 -i $CWD/patches/08_fix_const_conversion.patch
 patch -p1 -i $CWD/patches/09_deprecated_SigC.patch
 patch -p1 -i $CWD/patches/10_workhelper-buttonbox.patch
 patch -p1 -i $CWD/patches/11_explicit-linkage.patch
+patch -p1 -i $CWD/patches/12_gcc6.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
diff --git a/office/gbgoffice/patches/12_gcc6.patch b/office/gbgoffice/patches/12_gcc6.patch
new file mode 100644
index 0000000000..2ec2c344f4
--- /dev/null
+++ b/office/gbgoffice/patches/12_gcc6.patch
@@ -0,0 +1,21 @@
+Description: fixes compilation with GCC-6
+ return type must be Translator* and can't be boolean
+Author: Damyan Ivanov <dmn@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811619
+
+--- a/src/translator_manager.cpp
++++ b/src/translator_manager.cpp
+@@ -176,11 +176,11 @@ Translator *TranslatorManager::getTestDi
+ 		isDataOk = isDataOk && tr->init(tr->BG_EN, string(string(prop->getDirectory()) + prop->getString("data")).c_str());
+ 	} else {
+ 		cerr << "TranslatorManager::getTestDictionaryObject - Wrong description file: " << testDictionaries[index].fileName << "\n";
+-		return false;
++		return NULL;
+ 	}
+ 	if (!isDataOk) {
+ 		cerr << "TranslatorManager::getTestDictionaryObject - Problem initialazing dictionary: " << testDictionaries[index].fileName << "\n";
+-		return false;
++		return NULL;
+ 	}
+ 	char c[16];
+ 	sprintf(c, "%d", level);
diff --git a/office/gnokii/gnokii-0.6.31-gcc7.patch b/office/gnokii/gnokii-0.6.31-gcc7.patch
new file mode 100644
index 0000000000..6637a6af62
--- /dev/null
+++ b/office/gnokii/gnokii-0.6.31-gcc7.patch
@@ -0,0 +1,17 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
+build failures with GCC 7.x as "../common/.libs/libgnokii.so: undefined reference
+to `local_atoi'". The "inline" is only a hint that the compiler doesn't complain
+about double defined symbols, but does not guarantee that a function is inlined
+or that a symbol is generated when needed.
+
+--- gnokii-0.6.31/common/gsm-filetypes.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/common/gsm-filetypes.c.gcc7	2017-02-12 00:55:39.000000000 +0100
+@@ -1409,7 +1409,7 @@
+ #define GET_NEXT_TOKEN()	o = get_next_token(line + offset, ';')
+ #define STORE_TOKEN(a)		strip_slashes(a, line + offset, sizeof(a) - 1, o - 1)
+ 
+-inline int local_atoi(char *str, int len)
++static int local_atoi(char *str, int len)
+ {
+ 	int retval;
+ 	char *aux = strndup(str, len);
diff --git a/office/gnokii/gnokii.SlackBuild b/office/gnokii/gnokii.SlackBuild
index eb3b4f1519..5301e1c7cf 100644
--- a/office/gnokii/gnokii.SlackBuild
+++ b/office/gnokii/gnokii.SlackBuild
@@ -73,6 +73,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Thnx to fedora for this patch
+patch -p1 < $CWD/gnokii-0.6.31-gcc7.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/office/gnucash-docs/README b/office/gnucash-docs/README
index 0dbc6ce019..cb542cedc1 100644
--- a/office/gnucash-docs/README
+++ b/office/gnucash-docs/README
@@ -25,6 +25,6 @@ Note 1: This script builds the internal guides in all available
 languages, but the HTML guides are only in the spacified language
 to save space and avoid excessive package bloat.
 
-Note 2: This builds the docs for version 3.x of Gnucash.  If you
+Note 2: This builds the docs for version 4.x of Gnucash.  If you
 need the old stable 2.6 branch, use gnucash-legacy-docs, also
 available on SBo.
diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild
index d43e8ff27f..f533faff82 100644
--- a/office/gnucash-docs/gnucash-docs.SlackBuild
+++ b/office/gnucash-docs/gnucash-docs.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=gnucash-docs
 DESTNAM=gnucash
-VERSION=${VERSION:-3.11}
+VERSION=${VERSION:-4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info
index e2e666940f..eddcb897b2 100644
--- a/office/gnucash-docs/gnucash-docs.info
+++ b/office/gnucash-docs/gnucash-docs.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash-docs"
-VERSION="3.11"
+VERSION="4.1"
 HOMEPAGE="http://www.gnucash.org"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-3.11.tar.gz"
-MD5SUM="1886563b1fc7b2582a19a96484609581"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-4.1.tar.gz"
+MD5SUM="c9e4a2e5673b890cc4adfcdd429bbc47"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gnucash rarian yelp"
diff --git a/office/gnucash-legacy/gnucash-legacy.info b/office/gnucash-legacy/gnucash-legacy.info
index 7c4ad9d1f9..5449ab2e68 100644
--- a/office/gnucash-legacy/gnucash-legacy.info
+++ b/office/gnucash-legacy/gnucash-legacy.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-2.6.21.tar.bz2"
 MD5SUM="63226e9b49e11dc0d7106bd15c09996b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnomecanvas goffice0.8 webkitgtk"
+REQUIRES="libgnomecanvas goffice0.8 guile1.8 webkitgtk"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/office/gnucash/gnucash.SlackBuild b/office/gnucash/gnucash.SlackBuild
index 1257563bab..935b493262 100644
--- a/office/gnucash/gnucash.SlackBuild
+++ b/office/gnucash/gnucash.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnucash
-VERSION=${VERSION:-3.11}
+VERSION=${VERSION:-4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/office/gnucash/gnucash.info b/office/gnucash/gnucash.info
index c899627c28..6c231ea806 100644
--- a/office/gnucash/gnucash.info
+++ b/office/gnucash/gnucash.info
@@ -1,8 +1,8 @@
 PRGNAM="gnucash"
-VERSION="3.11"
+VERSION="4.1"
 HOMEPAGE="http://www.gnucash.org/"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-3.11.tar.bz2"
-MD5SUM="391f07eb0934618154d9e9c7d717d8e6"
+DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-4.1.tar.bz2"
+MD5SUM="3d613853a3bf1b1a29f7ec4cdebda17a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="webkit2gtk pygobject3-python3 gtest"
diff --git a/office/gnumeric/gnumeric.SlackBuild b/office/gnumeric/gnumeric.SlackBuild
index 0a5d0ee899..e87c652629 100644
--- a/office/gnumeric/gnumeric.SlackBuild
+++ b/office/gnumeric/gnumeric.SlackBuild
@@ -66,6 +66,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 {} \;
 
+# Avoid the cs help or build will break
+sed -i "s|cs\ de\ es|de es|" doc/Makefile.am || exit 1
+autoreconf -fi
+
 # Thanks to mancha for this gem :-)
 # The docs will still be missing, but at least we can build the app itself
 touch doc/C/gnumeric-C.omf.out
diff --git a/office/juffed/README b/office/juffed/README
deleted file mode 100644
index b322d42743..0000000000
--- a/office/juffed/README
+++ /dev/null
@@ -1,6 +0,0 @@
-JuffEd is a free, cross-platform text editor for programmers and
-advanced users. Has syntax highlighting for many languages, code
-folding, find/replace using plain text and regexps, code completion,
-multiple charsets and many other useful features.
-
-enca is an optional dependency (for auto language detection).
diff --git a/office/juffed/doinst.sh b/office/juffed/doinst.sh
deleted file mode 100644
index 5fb28930db..0000000000
--- a/office/juffed/doinst.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
diff --git a/office/juffed/juffed.SlackBuild b/office/juffed/juffed.SlackBuild
deleted file mode 100644
index f37a401a21..0000000000
--- a/office/juffed/juffed.SlackBuild
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for juffed
-
-# Copyright 2011-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
-# 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.
-
-PRGNAM=juffed
-VERSION=${VERSION:-20180114_9b7af21}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-DOCS="COPYING ChangeLog README"
-
-set -e 
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
-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 {} \;
-
-mkdir -p build
-cd build
-  cmake \
-    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX=$LIBDIRSUFFIX \
-    -DCMAKE_BUILD_TYPE=Release ..
-  make
-  make install DESTDIR=$PKG
-cd ..
-
-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/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/juffed/juffed.info b/office/juffed/juffed.info
deleted file mode 100644
index 0b6740222a..0000000000
--- a/office/juffed/juffed.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="juffed"
-VERSION="20180114_9b7af21"
-HOMEPAGE="http://juffed.com"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/juffed-20180114_9b7af21.tar.xz"
-MD5SUM="6b6c56fecdcfd408638a8023deda09cf"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Matteo Bernardini"
-EMAIL="ponce@slackbuilds.org"
diff --git a/office/juffed/slack-desc b/office/juffed/slack-desc
deleted file mode 100644
index ae39cf2747..0000000000
--- a/office/juffed/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------------------------------------------------------|
-juffed: juffed (light qt editor)
-juffed:
-juffed: JuffEd is a free, cross-platform text editor for programmers and
-juffed: advanced users. Has syntax highlighting for many languages, code
-juffed: folding, find/replace using plain text and regexps, code completion,
-juffed: multiple charsets and many other useful features.
-juffed:
-juffed: homepage: http://juffed.com
-juffed:
-juffed:
-juffed:
diff --git a/office/kbgoffice/gcc6.patch b/office/kbgoffice/gcc6.patch
new file mode 100644
index 0000000000..6e2d45e572
--- /dev/null
+++ b/office/kbgoffice/gcc6.patch
@@ -0,0 +1,17 @@
+diff -Naur kbgoffice-2.1.orig/src/translator_manager.cpp kbgoffice-2.1/src/translator_manager.cpp
+--- kbgoffice-2.1.orig/src/translator_manager.cpp	2010-04-30 14:37:42.000000000 +0200
++++ kbgoffice-2.1/src/translator_manager.cpp	2017-06-01 18:10:20.308920738 +0200
+@@ -141,11 +141,11 @@
+                 isDataOk = isDataOk && tr->init(tr->BG_EN, string(string(dataDir) + prop->getString("data")).c_str());
+         } else {
+                 cerr << "TranslatorManager::getTestDictionaryObject - Wrong description file: " << testDictionaries[index].file << "\n";
+-                return false;
++                return NULL;
+         }
+         if (!isDataOk) {
+                 cerr << "TranslatorManager::getTestDictionaryObject - Problem initialazing dictionary: " << testDictionaries[index].file << "\n";
+-                return false;
++                return NULL;
+         }
+         char c[16];
+         sprintf(c, "%d", level);
diff --git a/office/kbgoffice/kbgoffice.SlackBuild b/office/kbgoffice/kbgoffice.SlackBuild
index c4f4cbb1af..91069ba041 100644
--- a/office/kbgoffice/kbgoffice.SlackBuild
+++ b/office/kbgoffice/kbgoffice.SlackBuild
@@ -52,6 +52,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Thanks debian
+patch -p1 < $CWD/gcc6.patch
+
 cd src
   sed "s:/usr/local:/usr:" -i.orig $PRGNAM.pro
   sed "s:/usr/local:/usr:" -i.orig main.cpp
diff --git a/office/mu/mu.SlackBuild b/office/mu/mu.SlackBuild
index c4c856b5bf..3f9a255f3a 100644
--- a/office/mu/mu.SlackBuild
+++ b/office/mu/mu.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mu
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/office/mu/mu.info b/office/mu/mu.info
index 534da643df..18d17d047f 100644
--- a/office/mu/mu.info
+++ b/office/mu/mu.info
@@ -1,8 +1,8 @@
 PRGNAM="mu"
-VERSION="1.0"
+VERSION="1.2.0"
 HOMEPAGE="http://www.djcbsoftware.nl/code/mu/"
-DOWNLOAD="https://github.com/djcb/mu/archive/v1.0.tar.gz"
-MD5SUM="b415f84d4538cf05ec3360a449c1de4d"
+DOWNLOAD="https://github.com/djcb/mu/releases/download/1.2/mu-1.2.0.tar.xz"
+MD5SUM="e90fcd4abfed0e36ff97807d0194e9f9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/pdfjam/README b/office/pdfjam/README
deleted file mode 100644
index 7d3d58266c..0000000000
--- a/office/pdfjam/README
+++ /dev/null
@@ -1,4 +0,0 @@
-PDFjam is a collection of shell scripts providing a simple interface
-to functionality of the pdfpages package for pdfLaTeX. PDFjam can
-rotate pages, join PDFs, n-up several pages onto one page, generate a
-printer spread for books, and much much more.
diff --git a/office/pdfjam/pdfjam.SlackBuild b/office/pdfjam/pdfjam.SlackBuild
deleted file mode 100644
index 79a862e459..0000000000
--- a/office/pdfjam/pdfjam.SlackBuild
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for pdfjam
-# Copyright 2016  Klaatu klaatu@member.fsf.org
-#
-# GNU All-Permissive License
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-
-PRGNAM=pdfjam
-VERSION=${VERSION:-2.08}
-VERTAR=${VERTAR:-latest}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-ARCH='noarch'
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/"$PRGNAM"_"$VERTAR".tgz
-cd $PRGNAM
-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 {} \;
-
-# already in PRGNAM
-mkdir $PKG/usr
-mv bin $PKG/usr/bin
-mkdir -p $PKG/usr/man/man1
-mkdir $PKG/etc
-mv pdfjam.conf $PKG/etc
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-
-for i in man1/* ; do gzip -9c "$i" > $PKG/usr/man/"$i".gz ; done
-
-cp -a COPYING VERSION tests.zip PDFjam-README.html pdfdroplets.png \
-  $PKG/usr/doc/$PRGNAM-$VERSION/
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/pdfjam/pdfjam.info b/office/pdfjam/pdfjam.info
deleted file mode 100644
index d97fbbdeed..0000000000
--- a/office/pdfjam/pdfjam.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="pdfjam"
-VERSION="2.08"
-HOMEPAGE="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic-research/firth/software/pdfjam"
-DOWNLOAD="https://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_latest.tgz"
-MD5SUM="7df075df7f129091f826275ce8c1f374"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Klaatu"
-EMAIL="klaatu@member.fsf.org"
diff --git a/office/pdfjam/slack-desc b/office/pdfjam/slack-desc
deleted file mode 100644
index 8f35a106b2..0000000000
--- a/office/pdfjam/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------------------------------------------------------|
-pdfjam: pdfjam (pdf toolkit)
-pdfjam:
-pdfjam: PDFjam is a collection of shell scripts for PDF manipulation, like
-pdfjam: joining, rotating, modifying page layout, generating printer
-pdfjam: spreads, and more.
-pdfjam:
-pdfjam: https://www2.warwick.ac.uk/fac/sci/statistics/staff/\
-pdfjam: academic-research/firth/software/pdfjam/
-pdfjam:
-pdfjam:
-pdfjam:
diff --git a/office/pdftk/README b/office/pdftk/README
index c84c0b6589..6f0d6399e0 100644
--- a/office/pdftk/README
+++ b/office/pdftk/README
@@ -4,3 +4,10 @@ command-line tool for doing everyday things with PDF documents.  Keep one
 in the top drawer of your desktop and use it to merge PDF documents, 
 split PDF documents, apply watermarks, repair corrupt PDF, update PDF 
 metadata, and more.  pdftk does not require Acrobat and is free software.
+
+NOTE: Starting with Slackware 15.0 pdftk compilation requires SBo gcc-5
+because gcc-java was dropped from the GNU Compiler Collection as of gcc-7:
+don't forget to source /etc/profile.d/gcc5.sh before starting to build
+this, like
+
+  . /etc/profile.d/gcc5.sh
diff --git a/office/pdftk/pdftk-1.44-add_custom_optflags.patch b/office/pdftk/pdftk-1.44-add_custom_optflags.patch
deleted file mode 100644
index 660073115f..0000000000
--- a/office/pdftk/pdftk-1.44-add_custom_optflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nurp pdftk-1.44-dist-orig/pdftk/Makefile.Slackware-13.1 pdftk-1.44-dist/pdftk/Makefile.Slackware-13.1
---- pdftk-1.44-dist-orig/pdftk/Makefile.Slackware-13.1	2010-10-25 20:04:51.000000000 +0100
-+++ pdftk-1.44-dist/pdftk/Makefile.Slackware-13.1	2010-10-31 01:44:31.000000000 +0000
-@@ -34,7 +34,7 @@ export CXX= $(TOOLPATH)g++
- export GCJ= $(TOOLPATH)gcj
- export GCJH= $(TOOLPATH)gcjh
- export GJAR= $(TOOLPATH)gjar
--export LIBGCJ= /usr/share/java/libgcj$(VERSUFF).jar
-+export LIBGCJ= /usr/share/java
- export AR= ar
- export RM= rm
- export ARFLAGS= rs
-@@ -71,9 +71,10 @@ export RMFLAGS= -vf
- # only effects libraries following option on the command line
- #
- #  
--export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
--export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
--export GCJFLAGS= -Wall -fsource=1.3 -O2
-+export OPT= -O2
-+export CPPFLAGS= $(OPT) -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
-+export CXXFLAGS= $(OPT) -Wall -Wextra -Weffc++
-+export GCJFLAGS= $(OPT) -Wall -fsource=1.3
- export GCJHFLAGS= -force
- export LDLIBS= -lgcj
- 
diff --git a/office/pdftk/pdftk-2.02-use-gcc5.patch b/office/pdftk/pdftk-2.02-use-gcc5.patch
new file mode 100644
index 0000000000..d1e6e124de
--- /dev/null
+++ b/office/pdftk/pdftk-2.02-use-gcc5.patch
@@ -0,0 +1,15 @@
+# diff -Nurp pdftk/Makefile.Slackware-13.1.orig pdftk/Makefile.Slackware-13.1
+--- orig/pdftk/Makefile.Slackware-13.1  2013-07-24 13:27:46.000000000 -0500
++++ pdftk/Makefile.Slackware-13.1       2018-03-04 06:20:55.312900883 -0600
+@@ -21,8 +21,9 @@
+ # tools
+ # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÃRÃME)
+ TOOLPATH=
+-export VERSUFF=-4.4.4
+-export CXX= $(TOOLPATH)g++
++GCCMAJORTAG=-5                            # kjh was here
++export VERSUFF=-5.5.0                     # kjh was here
++export CXX= $(TOOLPATH)g++$(GCCMAJORTAG)  # kjh was here
+ export GCJ= $(TOOLPATH)gcj
+ export GCJH= $(TOOLPATH)gcjh
+ export GJAR= $(TOOLPATH)gjar
diff --git a/office/pdftk/pdftk.SlackBuild b/office/pdftk/pdftk.SlackBuild
index aa5bad4885..854b6da935 100644
--- a/office/pdftk/pdftk.SlackBuild
+++ b/office/pdftk/pdftk.SlackBuild
@@ -30,7 +30,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -68,10 +68,9 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Use our SLKCFLAGS
-patch -p1 < $CWD/pdftk-1.44-add_custom_optflags.patch
+patch -p1 < $CWD/pdftk-2.02-use-gcc5.patch
 
 cd $PRGNAM
   # Hardcode "-j1" since this fails with multiple make jobs
diff --git a/office/pdftk/pdftk.info b/office/pdftk/pdftk.info
index 01151c62f1..b4e36211a9 100644
--- a/office/pdftk/pdftk.info
+++ b/office/pdftk/pdftk.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
 MD5SUM="6534365fd6727724f288a556ede33faa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="gcc5"
 MAINTAINER="ArTourter"
 EMAIL="artourter@gmail.com"
diff --git a/office/referencer/referencer-lib_path.patch b/office/referencer/referencer-lib_path.patch
new file mode 100644
index 0000000000..78a1952089
--- /dev/null
+++ b/office/referencer/referencer-lib_path.patch
@@ -0,0 +1,11 @@
+--- referencer-1.2.2/src/Document.C	2014-01-27 03:43:00.000000000 +0700
++++ referencer-1.2.2_/src/Document.C	2016-11-03 16:25:00.698676538 +0700
+@@ -297,7 +297,7 @@
+ 
+ 			lib_path = lib_path->get_parent();
+ 			up_dir_level += "../";
+-			if (lib_path == 0) {
++			if (!lib_path) {
+ 				doc_is_relative_to_library = false;
+ 				break;
+ 			}
diff --git a/office/referencer/referencer.SlackBuild b/office/referencer/referencer.SlackBuild
index 8d279093fd..0a3da09354 100644
--- a/office/referencer/referencer.SlackBuild
+++ b/office/referencer/referencer.SlackBuild
@@ -69,6 +69,9 @@ 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 {} \;
 
+# Fix comparison with zero - thanks archlinux
+patch -p1 < $CWD/referencer-lib_path.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
diff --git a/office/sc-im/README b/office/sc-im/README
deleted file mode 100644
index d63f9fca91..0000000000
--- a/office/sc-im/README
+++ /dev/null
@@ -1,2 +0,0 @@
-SC-IM - Spreadsheet Calculator Improvised -- An ncurses spreadsheet program
-for terminal. SC-IM is a spreadsheet program that is based on SC.
diff --git a/office/sc-im/sc-im.SlackBuild b/office/sc-im/sc-im.SlackBuild
deleted file mode 100644
index 25e318343e..0000000000
--- a/office/sc-im/sc-im.SlackBuild
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for sc-im
-
-# Copyright 2016-2018  Jostein Berntsen <jbernts@broadpark.no>
-# 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.
-
-PRGNAM=sc-im
-VERSION=${VERSION:-0.7.0}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
-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 {} \;
-
-cd src/
-
-perl -pi -e 's#name = scim#name = sc-im#g|s#prefix  = /usr/local#prefix = /usr#g' Makefile
-
-CFLAGS="-DXLS $SLKCFLAGS" \
-CXXFLAGS="-DXLS $SLKCFLAGS" \
-LDLIBS="-lxlsreader" \
-make
-make install DESTDIR=$PKG
-
-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
-
-mv $PKG/usr/share/man $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd ..
-cp -a BUGS CHANGES HELP KNOWN_ISSUES LICENSE Readme.md USER_REQUESTS WIKI \
-        $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/sc-im/sc-im.info b/office/sc-im/sc-im.info
deleted file mode 100644
index 69ea4bfb9b..0000000000
--- a/office/sc-im/sc-im.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="sc-im"
-VERSION="0.7.0"
-HOMEPAGE="https://github.com/andmarti1424/sc-im"
-DOWNLOAD="https://github.com/andmarti1424/sc-im/archive/v0.7.0/sc-im-0.7.0.tar.gz"
-MD5SUM="2f270d957a215f0124d15d0a82c5abfa"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="libxls libxlsxwriter"
-MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
diff --git a/office/sc-im/slack-desc b/office/sc-im/slack-desc
deleted file mode 100644
index d0321b449a..0000000000
--- a/office/sc-im/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------------------------------------------------------|
-sc-im: sc-im (spreadsheet)
-sc-im:
-sc-im: SC-IM is a spreadsheet program that is based on SC
-sc-im:
-sc-im: SC-IM - Spreadsheet Calculator Improvised
-sc-im: An ncurses spreadsheet program for terminal
-sc-im:
-sc-im:
-sc-im: https://github.com/andmarti1424/sc-im
-sc-im:
-sc-im:
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index 5842344c68..5f92f22b53 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -27,13 +27,13 @@
 # Including input by Yalla-One and some code cleanup by rworkman
 
 PRGNAM=scribus
-VERSION=${VERSION:-1.4.6}
+VERSION=${VERSION:-1.4.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -78,7 +78,7 @@ cmake \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-  -DRENDER_LIB=CAIRO
+  -DRENDER_LIB=CAIRO .
 
 make
 make install DESTDIR=$PKG
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index 10e5f6a05f..41872c4856 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,8 @@
 PRGNAM="scribus"
-VERSION="1.4.6"
+VERSION="1.4.8"
 HOMEPAGE="https://www.scribus.net"
-DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.4.6.tar.xz"
-MD5SUM="f6161785e24755ea77c8f14b319ff1aa"
+DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.4.8.tar.xz"
+MD5SUM="ef61b996b6d07f8a19475f51330d3535"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/office/texlive/README b/office/texlive/README
deleted file mode 100644
index d08796d591..0000000000
--- a/office/texlive/README
+++ /dev/null
@@ -1,14 +0,0 @@
-TeXLive (TeXLive binaries, support files, TeX formats)
-
-This package contains binaries and many support files, TeX formats and
-packages, and other files included in the TeXLive TeX distribution.
-This should be adequate for the needs of most TeX users.
-
-The remaining stuff can be found in texlive-extra and texlive-docs,
-all of which are also available at SlackBuilds.org.
-
-Have a look at the scripts in the prep/ directory to see how the texmf
-archives were created from the original Texlive netarchives.
-
-Note that this package conflicts with the tetex packages in Slackware,
-so you'll need to remove tetex and tetex-doc before installing TeXLive.
diff --git a/office/texlive/README.tlpkg b/office/texlive/README.tlpkg
deleted file mode 100644
index 7a6f790ca8..0000000000
--- a/office/texlive/README.tlpkg
+++ /dev/null
@@ -1,17 +0,0 @@
-The TeXLive Package Manager, i.e. tlmgr(1), is not shipped with this
-TeXLive package, as it's not expected to work properly (if at all).
-The general consensus from the TeXLive users mailing list is that
-distributions should not be shipping tlpkg.
-
-The *proper* way to upgrade the TeXLive Slackware package (or any
-part of it) is through your Slackware's package manager.  If you
-elect to try tlmgr(1), and it doesn't work at all, or worse, it messes
-up part of your TeXLive installation, too bad.  On the other hand,
-if you are able to document exactly what we need to do in order to
-make it:
-  1) work
-  2) put updates and such in a user-specific directory, i.e.
-     *not* alter/replace system package contents
-then we would love to hear from you.  :-)
-
---rworkman  :-)
diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh
deleted file mode 100644
index f864e767d6..0000000000
--- a/office/texlive/doinst.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
-printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null
-chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null
-chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
-chroot . /usr/bin/mtxrun --generate 1>/dev/null 2>/dev/null
diff --git a/office/texlive/patches/tabu.sty.diff b/office/texlive/patches/tabu.sty.diff
deleted file mode 100644
index 8ebe034d18..0000000000
--- a/office/texlive/patches/tabu.sty.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./tabu.sty.orig	2019-01-14 16:10:48.000000000 -0600
-+++ ./tabu.sty	2019-06-30 16:24:01.975474339 -0500
-@@ -57,7 +57,7 @@
- %% 
- 
- \NeedsTeXFormat{LaTeX2e}
--\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed)]
-+\ProvidesPackage{tabu}[2019/01/11 v2.9 - flexible LaTeX tabulars (FC+tabu-fixed) + intermediate FMi]
- \RequirePackage{array}[2008/09/09]
- \RequirePackage{varwidth}[2009/03/30]
- \AtEndOfPackage{\tabu@AtEnd \let\tabu@AtEnd \@undefined}
-@@ -727,6 +727,10 @@
-                       \tabu@currentgrouptype\expandafter{\the\currentgrouptype}}%
- \fi
- }% \tabu@init
-+%%TABU-FIXED set up \tabu@currentgrouptype
-+%FMi cancel for nested arrays ...
-+\def\@tabarray{\m@th\def\tabu@currentgrouptype{\currentgrouptype}\@ifnextchar[\@array{\@array[c]}}
-+
- \def\tabu@indent{% correction for indentation
-     \ifdim \parindent>\z@\ifx \linewidth\tabudefaulttarget
-     \everypar\expandafter{%
-@@ -1663,6 +1667,9 @@
-         \ifdim \tabu@temp\p@>\z@ \ifdim \tabu@temp\tabucolX<\tabu@target
-                                         \tabu@target=\tabu@temp\tabucolX \fi\fi
-         \setbox\tabu@box  \hbox \bgroup
-+%%TABU-FIXED add \color@begingroup
-+%%FMi not yet understood why this one is also needed ...
-+    \color@begingroup
-             \begin{varwidth}\tabu@target
-                 \let\FV@ListProcessLine \tabu@FV@ListProcessLine  % \hbox to natural width...
-                 \narrowragged \arraybackslash \parfillskip \@flushglue
diff --git a/office/texlive/prep/texmf_get.sh b/office/texlive/prep/texmf_get.sh
deleted file mode 100644
index c66a71b7f2..0000000000
--- a/office/texlive/prep/texmf_get.sh
+++ /dev/null
@@ -1,1146 +0,0 @@
-#!/bin/bash
-
-# texmf_get.sh
-#
-# Copyright 2016 - 2020  Johannes Schoepfer, Germany, slackbuilds@schoepfer.info
-# 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.
-#
-#  V 15.0.4
-#
-#  Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb
-#  This script takes care of dependencies(as far as these are present in texlive.tlpdb)
-#  of collections and packages, and that every texlive-package is included only once.
-#  The editions(base/extra/docs) should contain no binaries(exception biber)
-# -base: the most usefull stuff, most binaries/scripts,
-#  manpages for compiled binaries  65mb 2017-11-07
-# -docs: -base documentation only, no manpages/GNU infofiles
-# -extra: remaining stuff and corresponding docs
-#
-#  texlive netarchive policy: Every package is included as dependency 
-#  in exactly one collection. A package may have dependencies on other
-#  packages from any collection.
-
-#set -e
-MAJORVERSION=2020
-mirror="http://mirror.ctan.org/systems/texlive/tlnet/"
-TMP=${TMP:-$PWD/tmp}	
-
-# Globally excluded packages, which are/contain
-# -useless without tlmgr-installer
-# -non-linux, e.g. texworks
-# -covered by an external package, e.g. asymptote on SBo
-# -obsolete, e.g. omega
-# -binaries provided already by texlive.Slackbuild
-# -binaries which texlive upstream recommends to build natively, e.g. dvisvgm on SBo
-# -only sources, e.g. metatype1, patch, ...
-
-global_exclude="
-  00texlive.config
-  00texlive.image
-  00texlive.installation
-  00texlive.installer
-  aleph
-  antomega
-  asymptote
-  bibtexu
-  cslatex
-  dviout.win32
-  lambda
-  ocherokee
-  oinuit
-  omega
-  omegaware
-  otibet
-  texlive-common
-  texlive-docindex
-  texlive-msg-translations
-  texosquery
-  texworks
-  tlcockpit
-  tlshell
-  wintools.win32
-  dvisvgm
-  "
-
-  # special packages, move their type1 fonts(if metafonts are present)
-  # and/or docs to -extra
-special_packages="
-  koma-script
-  velthuis
-  armtex
-  montex
-  vntex
-  pl
-  cc-pl
-  cs
-  musixtex-fonts
-  tipa
-  cbfonts
-  ptex-fonts
-  uptex-fonts
-  "
-#Todo: split type1 fonts, or keep subset of type1 fonts in base
-#  cm-super
-
-# keep precompiled binaries, list binary, not package name 
-keep_precompiled="
-  biber
-  "
-
-texmf_editions () {
-  
-  # "excludes from -base", also dependencies are excluded
-  PACKAGES="
-    cm-super
-    biber
-    bib2gls
-    knitting
-    pst-cox
-    pst-poker
-    pst-vectorian
-    pst-geo
-    bclogo
-    texplate
-    texliveonfly
-    kerkis
-    " texmfget extra || exit 1
- 
-    # packages/collections and their dependencies for -base
-  PACKAGES="
-    $(grep ^"name hyphen-.*" $db | cut -d' ' -f2 )
-    $special_packages
-    etoolbox
-    memoir
-    ptex
-    platex
-    revtex
-    ucs
-    uplatex
-    uptex
-    velthuis
-    wasy
-    xcolor
-    xypic
-    collection-basic
-    collection-latex
-    collection-metapost
-    collection-plaingeneric
-    collection-luatex
-    collection-context
-    collection-fontutils
-    collection-langczechslovak
-    collection-langeuropean
-    collection-langenglish
-    collection-langfrench
-    collection-langgreek
-    collection-langitalian
-    collection-langpolish
-    collection-langportuguese
-    collection-langspanish
-    collection-latexrecommended
-    $(collection_by_size fontsextra   70000 || exit 1)
-    $(collection_by_size latexextra    1000 || exit 1)
-    $(collection_by_size langchinese   5000 || exit 1)
-    $(collection_by_size langcjk       3000 || exit 1)
-    $(collection_by_size pictures    100000 || exit 1)
-    $(collection_by_size publishers   10000 || exit 1)
-    " texmfget base
-
-    # packages/collections and their dependencies for -extra
-  PACKAGES="
-    $(grep ^"name .*biblatex" $db | cut -d' ' -f2 )
-    amiri
-    arabi
-    arabi-add
-    arara
-    arev
-    bangorcsthesis
-    beamer2thesis
-    beamertheme-detlevcm
-    beamertheme-epyt
-    beamertheme-npbt
-    beamertheme-saintpetersburg
-    beebe
-    bhcexam
-    bxtexlogo
-    collection-fontsextra
-    collection-langchinese
-    collection-langcjk
-    collection-langjapanese
-    collection-langkorean
-    collection-pictures
-    collection-publishers
-    collection-texworks
-    collection-wintools
-    ctan-o-mat
-    ctanify
-    ctanupload
-    dad
-    duckuments
-    ethiop-t1
-    fibeamer
-    fithesis
-    ghsystem
-    gregoriotex
-    hustthesis
-    ijsra
-    iwhdp
-    jpsj
-    kerkis
-    ketcindy
-    kpfonts
-    langsci
-    latex2nemeth
-    libertine
-    lilyglyphs
-    lni
-    luatexko
-    media9
-    musuos
-    mwe
-    newtx
-    nwejm
-    padauk
-    pdfwin
-    pdfx
-    powerdot-tuliplab
-    powerdot-fuberlin
-    quran
-    quran-de
-    realhats
-    resumecls
-    sanskrit-t1
-    sapthesis
-    sduthesis
-    seuthesix
-    simurgh
-    skaknew
-    stellenbosch
-    suanpan
-    texdoctk
-    tudscr
-    uantwerpendocs
-    udesoftec
-    universalis
-    uowthesis
-    wasy-type1
-    xduthesis
-    xetexko 
-    xq
-    " texmfget extra || exit 1
- 
-   # What's left, for base again 
-  PACKAGES="
-    collection-fontsrecommended
-    collection-xetex
-    collection-langcyrillic
-    collection-langarabic
-    collection-langgerman
-    collection-langother
-    collection-humanities
-    collection-mathscience
-    collection-pstricks
-    collection-music
-    collection-games
-    collection-binextra
-    collection-bibtexextra
-    collection-formatsextra
-    collection-latexextra
-    " texmfget base || exit 1
-
-}
-
-# ==== Nothing to edit beyond this line ====
-
-usage () {
-  echo
-  echo "Generate texmf trees/editions based on collections/packages"
-  echo "and their (hard)dependencies."
-  echo "./texmf_get.sh [base|docs|extra|lint]"
-  echo
-  echo "-base:  texfiles, no docs"
-  echo "-docs:  docs of -base"
-  echo "-extra: remaining texfiles and docs"
-  echo "[lint]: compare filename contents of all generated editions,"
-  echo " to detect overlapping files"
-  echo 
-  echo "Only new/updated/missing tex packages are downloaded."
-  echo "The first run takes \"long\", tex packages(about 3Gb)"
-  echo "need to be downloaded."
-  echo "To check out a new version/release, delete"
-  echo "$db"
-  echo "A new ascii index file/database(texlive.tlpdb) is will be"
-  echo "pulled on the next run, and a new version yymmdd will be set."
-  echo
-  echo "All generated tarballs, logs etc. are going to"
-  echo "$TMP"
-  echo
-}
-
-collection_by_size () {
-  # from collection $1, pull packages smaller $2 bytes 
-  start_n="$(grep -n ^"name collection-$1"$ $db | cut -d':' -f1)"
-  # find end of package/collection
-  for emptyline in $emptylines
-  do
-    if [ "$emptyline" -gt "$start_n" ]
-    then
-      end_n=$emptyline
-      break
-    fi
-  done
-  extrapackages="$(sed "${start_n},${end_n}!d" $db | grep ^"depend " | grep -v ^"depend collection" | sed "s/^depend//g" )"
-  
-  # add if smaller than ...
-  for checksize in $extrapackages
-  do
-    package_meta $checksize || exit 1
-    size=$(grep ^"containersize " $texmf/$checksize.meta | cut -d' ' -f2)
-    # for $2, e.g. 3000 means 3kb
-    [ $size -lt $2 ] && echo $checksize
-  done
-}
-
-package_meta () {
-  if [ ! -s "$texmf/$1.meta" ]
-  then
-    # collection start linenumer
-    start_n="$(grep -n ^"name ${1}"$ $db | cut -d':' -f1)"
-    [ -z "$start_n" ] && echo "$1 was not found in $db, bye." && exit 1
-    # find end of package/collection
-    for emptyline in $emptylines
-    do
-      if [ "$emptyline" -gt "$start_n" ]
-      then
-        end_n=$emptyline
-        break
-      fi
-    done
-    # Don't handle collections as dependency of other collections
-    sed "${start_n},${end_n}!d;/^depend collection/d" $db > $texmf/$1.meta 
-  fi
-}
-
-download () {
-  # Download packages, if not already available. Not every packages has a corresponding .doc package.
-  # Try multiple times if package isn't present or checksum fails
-  
-  unset checksum_ok
-  if [ "$flavour" = ".doc" ]
-  then
-    sha512="$(grep ^doccontainerchecksum $texmf/$1.meta | cut -d' ' -f2 )"
-  else
-    sha512="$(grep ^containerchecksum $texmf/$1.meta | cut -d' ' -f2 )"
-  fi
-  
-  cd $texmf
- 
-  for run in {1..8}
-  do
-    [ ! -s "${1}${flavour}.tar.xz" ] && \
-      wget -q --show-progress -t1 -c ${mirror}archive/${1}${flavour}.tar.xz
-    [ ! -s "${1}${flavour}.tar.xz" ] && continue
-    if [ "$(sha512sum ${1}${flavour}.tar.xz | cut -d' ' -f1 )" != "$sha512" ]
-    then
-      echo "sha512sum of ${1}${flavour}.tar.xz doesn't match $texmf/$1.meta"
-      echo "deleting ${1}${flavour}.tar.xz"
-      rm ${1}${flavour}.tar.xz
-    else
-      checksum_ok=yes
-      break
-    fi
-  done
-  
-  # If no success by downloading, write error log
-  if [ -z "$checksum_ok" ]
-  then
-    echo "Downloading ${1}${flavour}.tar.xz or sh512sum check was not successful,\\
-    writing to $errorlog" 
-    echo "Delete ${db}* and try again."
-    echo "$VERSION" >> $errorlog
-    echo "Error downloading ${1}${flavour}.tar.xz" >> $errorlog
-    exit 1
-  fi
-}
-
-untar () {
-  # leave if $1 has no content
-  if [ -s "$1" ]
-  then
-    while read package
-    do
-      echo "untar $package$flavour"
-      # untar all packages, check for relocation, "relocate 1" -> untar in texmf-dist
-      download $package || exit 1
-      # untar package, relocate to texmf-dist if necessary, binary packages always need relocation
-      relocated='.'
-      [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" -o -n "$(grep ^"binfiles " $texmf/$package.meta)" ] && relocated="texmf-dist" 
-      # if not .doc package, investigate files for dependencies/provides
-      if [ -n "$flavour" ]
-      then
-        tar xf ${package}${flavour}.tar.xz --exclude tlpkg -C $relocated || exit 1
-      else
-        tar vxf ${package}${flavour}.tar.xz \
-	  --exclude tlpkg/tlpobj \
-	  -C $relocated | grep -E '\.sty$|\.bbx$|\.cls$' > $texmf/$package.deps
-        if [ -n "$texmf/$package.deps" ]
-        then
-          unset provide
-          unset depends
-          for depfile in $(cat $texmf/$package.deps)
-          do
-            filename="$( echo $depfile | rev | cut -d'.' -f2- | cut -d'/' -f1 | rev)"
-            # always add $filename as "ProvidesPackage", if it's a .sty
-            echo $depfile | grep '\.sty'$ &>/dev/null
-            [ $? = 0 ] && provide+="${filename},"
-            # remove comments, if there are backslashes ignore that content, except it is \filename
-            #provide+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\\\ProvidesPackage{\([^}]*\)}.*/\1/p" | sed "s/\\\filename/$filename/g;/\\\/d" | sort -u | tr '\n' ',')"
-            #sed -z "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\)*.\n//g" | sed "s/[[:space:]]//
-           #provide+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -z "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\)*.\n//g" | sed "s/[[:space:]]// | sed -n "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\){\([^}]*\)}.*/\2/p" | sed "s/\\\filename/$filename/g;s/\\\ExplFileName/$filename/g;/\\\/d" | sed "s/\(\.sty$\|\.cls$\)//g" | sort -u | tr '\n' ',')"
-            provide+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -z "s/\(Package\|ExplPackage\|File\|Class\)\n/\1/g" | sed "s/[[:space:]]//" | sed -n "s/.*\\\Provides\(Package\|ExplPackage\|File\|Class\){\([^}]*\)}.*/\2/p" | sed "s/\\\filename/$filename/g;s/\\\ExplFileName/$filename/g" | sed "s/\(\.sty$\|\.cls$\)//g" | sort -u | tr '\n' ',')"
-            #depends+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\(\\\require\|\\\use\)package{\([^}]*\)}.*/\2/p" | sed "/\\\/d" | sort -u | tr '\n' ',')"
-            depends+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\(\\\require\|\\\use\)package{\([^}]*\)}.*/\2/p" | sort -u | tr '\n' ',')"
-            #depends+="$(sed "s/%.*//g" $texmf/$relocated/$depfile | sed -n "s/.*\\\\(require\|use\)package{\([^}]*\)}.*/\2/p" | sed "/\\\/d" | sort -u | tr '\n' ',')"
-          done
-          if  [ -n "$provide" ]
-          then
-            echo "$package $provide" >> $TMP/provides.run.$edition
-          fi
-          if [ -n "$depends" ]
-          then
-            echo "$package $depends" >> $TMP/depends.run.$edition
-          fi
-        fi
-      fi
-
-      # Delete binaries, these are provided
-      # by the buildscript, keep symlinks and scripts
-      
-      for arch in $platforms
-      do
-        if [ -d $texmf/texmf-dist/bin/$arch ]
-        then
-          [ ! -d $texmf/texmf-dist/linked_scripts ] && \
-            mkdir $texmf/texmf-dist/linked_scripts
-	  # remove the unfortunate "man" link
-	  [ -L "$texmf/texmf-dist/bin/$arch/man" ] && \
-	    rm $texmf/texmf-dist/bin/$arch/man 
-          for link in $(find $texmf/texmf-dist/bin/$arch -type l)
-          do
-	    link_valid_dest=$texmf/texmf-dist/linked_scripts/${link##*/}
-            # move symlink to linked_scripts
-            mv $link $link_valid_dest
-            # some links have to dangle, because target binaries are coming from the buildscript
-            # fix SELFAUTOPARENT in some scripts
-            if [ -e "$link_valid_dest" ]
-            then
-              sed -i "s/kpsewhich -var-value=SELFAUTOPARENT/kpsewhich -var-value=TEXMFROOT/g" \
-                $link_valid_dest || exit 1
-            fi
-          done
-           
-          # keep only binaries of special packages
-          # remove xindy.mem(gzip compresses data) to prevent overwriting
-          for bin in $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \
-            grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) 
-          do
-            for binary in $keep_precompiled
-            do
-              if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ]
-              then
-                rm $bin
-                echo -n "$package:" >> $binary_removed.$edition
-                echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
-              fi
-            done
-          done
-          # move scripts to linked-scripts
-          for script in \
-	    $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + |\
-	    grep -wv ELF | cut -f 1 -d : )
-          do
-            echo "Moving script/bin $script to $texmf/texmf-dist/linked_scripts/"
-            mv $script $texmf/texmf-dist/linked_scripts/
-          done
-        fi
-      done
-     
-      for tlpkg_dir in $texmf/tlpkg $texmf/texmf-dist/tlpkg
-      do
-        if [ -d $tlpkg_dir ]
-        then
-          for bin in $(find $tlpkg_dir -type f -exec file '{}' + | \
-            grep -e "executable" -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) 
-          do
-            echo "Deleting binary $bin found in $tlpkg_dir"
-            rm $bin
-            echo -n "$package:" >> $binary_removed.$edition
-            echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition
-          done
-          [ -d $tlpkg_dir/TeXLive ] && \
-            mkdir -p $texmf/texmf-dist/scripts/texlive && \
-            mv $tlpkg_dir/TeXLive $texmf/texmf-dist/scripts/texlive
-        fi
-      done
-
-      if [ "$flavour" = ".doc" ]
-      then
-        size=$(grep ^doccontainersize $texmf/$package.meta | cut -d' ' -f2) 
-      else
-        size=$(grep ^containersize $texmf/$package.meta | cut -d' ' -f2)
-	# add maps to updmap.cfg, don't add special_packages map files to -base
-	add_map=yes 
-	if [ $edition = base ]
-	then
-	  for no_map in $special_packages
-	  do
-	    [ $no_map = $package ] && add_map=no && break 
-          done
-	fi
-	[ $add_map = yes ] && grep ^'execute ' $texmf/$package.meta | grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
-      fi
-      shortdesc="$(grep ^shortdesc $texmf/$package.meta | cut -d' ' -f2- )"
-      echo "$size byte, $package$flavour: $shortdesc" >> $output.meta
-      # make index of uncompressed size of each package
-      echo "$(xz -l --verbose ${package}${flavour}.tar.xz | grep "Uncompressed size" | \
-        cut -d'(' -f2 | cut -d' ' -f1 ) byte, $package$flavour: $shortdesc" >> $output.meta.uncompressed
-    done < $1
-    
-    # add a path to updmap
-    if [ -s "$texmf/texmf-dist/linked_scripts/updmap" ]
-    then
-      sed -i '/unshift.*@INC.*/a unshift(@INC, "$TEXMFROOT/texmf-dist/scripts/texlive");' $texmf/texmf-dist/linked_scripts/updmap || exit 1
-    fi
-    
-    # copy packages index to texmf-dist, to have a list of included packages in the final installation
-    # don't list binary packages, as the binaries itself are not contained, only the symlinks.
-    cat $output.meta | grep -v '\-linux:'  >> $output.$edition.meta
-    cat $output.meta.uncompressed | grep -v '\-linux:' >> $output.$edition.meta.uncompressed
-    
-    # cleanup
-    [ -f $output.meta ] && rm $output.meta
-    [ -f $output.meta.uncompressed ] && rm $output.meta.uncompressed
-  fi
-}
-
-remove_cruft () {
-  # Remove m$-stuff, ConTeXt single-user-system stuff, empty files/directories and pdf-manpages
-  rm -rf $texmf/texmf-dist/source
-  rm -rf $texmf/texmf-dist/scripts/context/stubs/source/
-  find $texmf/texmf-dist/ -type d -name 'win32'         -exec rm -rf {} +
-  find $texmf/texmf-dist/ -type d -name 'win64'         -exec rm -rf {} +
-  find $texmf/texmf-dist/ -type d -name 'mswin'         -exec rm -rf {} +
-  find $texmf/texmf-dist/ -type d -name 'win'           -exec rm -rf {} +
-  find $texmf/texmf-dist/ -type d -name 'setup'         -exec rm -rf {} +
-  find $texmf/texmf-dist/ -type d -name 'install'       -exec rm -rf {} +
-  find $texmf/texmf-dist/ -type f -name 'uninstall*.sh' -delete
-  find $texmf/texmf-dist/ -type f -name '*.bat'         -delete
-  find $texmf/texmf-dist/ -type f -name '*.bat.w95'     -delete
-  find $texmf/texmf-dist/ -type f -name '*.vbs'         -delete
-  find $texmf/texmf-dist/ -type f -name '*win32*'       -delete
-  find $texmf/texmf-dist/ -type f -name 'winansi*'      -delete
-  find $texmf/texmf-dist/ -type f -name '*man1.pdf'     -delete
-  find $texmf/texmf-dist/ -type f -name '*man5.pdf'     -delete
-  find $texmf/texmf-dist/ -type f -empty -delete
-  find $texmf/texmf-dist/ -type d -empty -delete
-}
-
-texmfget () {
-  # make sure no package is added more than once.
-  echo "Preparing index of packages to be added to -${1} ..."
-  echo "$PACKAGES" | sed "s/[[:space:]]//g;/^$/d" > $collections_tobedone
-  # Remove outputfile if already present
-  >$output
-  >$output_doc
-  
-  # Only do something if $collection wasn't already done before
-  while [ -s $collections_tobedone ]
-  do
-    collection=$(tail -n1 $collections_tobedone)
-  
-    # continue with next collection if collection was already done
-    if [ -s "$collections_done" ]
-    then
-      grep -w "^${collection}$" $collections_done &> /dev/null
-      if [ $? = 0 ]
-      then
-        # remove from $collections_tobedone
-        sed -i "/^$collection$/d" $collections_tobedone
-        if [ -n "$(grep "^${collection} added to" $logfile)" ]
-        then
-          echo "$collection already added " >> $logfile
-        fi
-        continue
-      fi
-    fi
-    
-    package_meta $collection || exit 1
- 
-    # If $collection is a singel package(not a collection-), add it here
-    if [ -n "$(head -n1 $texmf/$collection.meta | grep -v "name collection" )" ]
-    then
-      unset addpackage 
-      # if package contains docs, add to docs-packages
-      if [ -n "$(grep ^docfiles $texmf/$collection.meta)" ]
-      then
-        echo "$collection" >> $output_doc
-        echo "$collection added to docs $1" >> $logfile
-        addpackage=yes 
-      fi
-      # if package contains runfiles, binfiles or depend, add to edition
-      if [ \
-	   -n "$(grep ^runfiles $texmf/$collection.meta)" -o \
-           -n "$(grep ^binfiles $texmf/$collection.meta)" -o \
-           -n "$(grep ^depend $texmf/$collection.meta)" \
-	 ]
-      then
-        echo "$collection" >> $output
-        echo "$collection added to -$1" >> $logfile
-        addpackage=yes 
-      fi
-      # if package contains only srcfiles, don't add to a edition
-      if [ -n "$(grep ^srcfiles $texmf/$collection.meta)" -a -z "$addpackage" ]
-      then
-        echo "$collection only contains srcfiles, added nowhere" >> $logfile
-        addpackage=yes
-      fi
-      # abort if package seems broken
-      if [ -z "$addpackage" ]
-      then
-        echo "$collection doesn't contain any docfiles/runfiles/binfiles/depends or srcfiles"
-        echo "Please exclude package/report to upstream mailinglist tex-live@tug.org, bye."
-        exit 1
-      fi
-    fi
-
-    # Don't handle collections as dependency of other collections, as this destroys control over what packages to be added
-    # add dependend packages, but no binary(ARCH) and no packages containing a '.'. Packges with dot indicate binary/texlive-manager/windows packages
-    
-    grep ^"depend " $texmf/$collection.meta | cut -d' ' -f2- > $dependencies
-    
-    if [ -s "$dependencies" ]
-    then
-      # check for .ARCH packages which may be binaries, scripts or links
-      # Binaries should all come from the sourcebuild(exception biber)
-      for dependency in $(cat $dependencies)
-      do
-        echo $dependency | grep '\.ARCH'$ &>/dev/null
-        if [ $? = 0 ] 
-        then
-          for arch in $platforms
-          do
-            archpackage="$(echo $dependency | sed "s/\.ARCH$/\.$arch/")"
-            grep ^"name $archpackage"$ $db &>/dev/null && echo "$archpackage" >> $dependencies.verified_arch
-          done
-        else
-          echo $dependency >> $dependencies.verified_arch
-        fi
-      done
-      if [ -f $dependencies.verified_arch ]
-      then
-        mv $dependencies.verified_arch $dependencies
-      else
-        rm $dependencies
-      fi
-    fi
-
-    if [ -s "$dependencies" ]
-    then
-      echo "----------------" >> $logfile
-      echo "Dependencies of $collection: $(cat $dependencies | tr '\n' ' ')" >> $logfile
-      for dependency in $(cat $dependencies)
-      do
-        if [ -n "$(grep ^"${dependency}"$ $collections_done)" ]
-        then
-          sed -i "/^${dependency}$/d" $dependencies
-          continue
-        else
-          for exclude in $global_exclude
-          do
-            if [ "$exclude" = "$dependency" ]
-            then
-              sed -i "/^${exclude}$/d" $dependencies
-              echo "$exclude excluded, see \$global_exclude" >> $logfile
-            fi
-          done
-        fi
-      done
-      cat $dependencies >> $collections_tobedone
-      echo "----------------" >> $logfile
-    fi
-    
-    sed -i "/^${collection}$/d" $collections_tobedone
-    echo "$collection" >> $collections_done
-  done
-  # handle package index list per edition
-  cat $output >> $TMP/packages.$1
-  # handle doc package index, one for each edition
-  cat $output_doc >> $TMP/packages.$1.doc
-
-  # untar only one $edition, untar docs together with -extra edition
-  if [ "$1" = $edition -o docs = $edition ]
-  then
-    cd $texmf
-    # Cleanup tar-directory
-    [ -d $texmf/texmf-dist ] && rm -rf $texmf/texmf-dist
-    mkdir $texmf/texmf-dist
-    
-    # Make tarball/checksum reproducible by setting mtime(clamp-mtime),
-    # owner, group and sort content.
-    # --clamp-mtime --mtime doesn't work with tar 1.13,
-    # when makepkg creates the tarball:
-    # tar-1.13: time_t value 9223372036854775808 too large (max=68719476735)
-    echo "Adding files to $( echo $tarball | rev | cut -d'/' -f1 | rev ) ..."
-    case $edition in
-      base)
-      unset flavour
-      untar $output || exit 1
-      remove_cruft || exit 1
-      tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
-      rm -rf texmf-dist
-      ;;
-      extra)
-      unset flavour
-      untar $output || exit 1
-      export flavour=".doc"
-      untar $output_doc || exit 1
-      remove_cruft || exit 1
-      #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1
-      tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
-      rm -rf texmf-dist
-      ;;
-      docs)
-      export flavour=".doc"
-      # only add -base docs to -docs
-      if [ $1 = base ]
-      then
-        untar $output_doc || exit 1
-        remove_cruft || exit 1
-        #tar vrf $tarball --clamp-mtime --mtime --owner=0 --group=0 --sort=name texmf-dist || exit 1
-        tar rf $tarball --owner=0 --group=0 --sort=name texmf-dist || exit 1
-        rm -rf texmf-dist
-      fi
-      ;;
-    esac
-  fi
-}
-
-lint () {
-
-echo "Comparing content of all editions, this may take a while ..." 
-cd $TMP
-# check if all editions of same VERSION are there, take -base as reference
-lint_version=$( ls texlive-base-*tar.xz | head -n1 | cut -d'.' -f2 || exit 1)
-if [ -s texlive-extra-$MAJORVERSION.$lint_version.tar.xz \
-  -a -s texlive-docs-$MAJORVERSION.$lint_version.tar.xz  ]
-then
-  for edition in base extra docs
-  do
-    echo "Extracting index of texlive-${edition}-$MAJORVERSION.$lint_version.tar.xz ..."
-    # don't list directories
-    tar tf texlive-${edition}-$MAJORVERSION.$lint_version.tar.xz | grep -v '/'$ > $TMP/packages.$edition.lint
-  done
-
-  # compare content
-  for edition in base extra docs
-  do
-    >$TMP/packages.$edition.lint.dup
-    if [ $edition = base ]
-    then
-      echo "check if files of base are present in another edition"
-      while read line
-      do
-        grep ^"$line"$ $TMP/packages.extra.lint >> $TMP/packages.base.lint.dup
-        grep ^"$line"$ $TMP/packages.docs.lint >> $TMP/packages.base.lint.dup
-      done < $TMP/packages.$edition.lint
-    fi
-  done
-else
-  echo "Not all editions are present to lint them. Create them first by"
-  echo "$0 [base|docs|extra]"
-  echo "bye."
-  exit 1
-fi
-
-exit 0
-
-}
-
-# Main
-
-LANG=C
-output=$TMP/packages
-output_doc=$TMP/packages.doc.tmp
-errorlog=$TMP/error.log
-texmf=$TMP/texmf
-db=$TMP/texlive.tlpdb
-tmpfile=$TMP/tmpfile
-collections_done=$TMP/done
-collections_tobedone=$TMP/tobedone
-allcollections=$TMP/allcollections
-binary_removed=$TMP/binaries.removed
-manpages=$TMP/manpages
-dependencies=$TMP/deps
-packages_base=$TMP/packages.base
-packages_extra=$TMP/packages.extra
-packages_manpages=$TMP/packages.manpages
-updmap=$TMP/updmap.cfg
-files_split=$TMP/files.split
-platforms="x86_64-linux i386-linux"
-
-mkdir -p $texmf
-cd $TMP
-
-case "$1" in
-  base|docs|extra) edition=$1;;
-  lint) lint ;;
-  *) usage; exit 0 ;;
-esac
-
-echo "Building $edition tarball ..."
-
-# Set VERSION, get texlive.tlpdb and keep unshorten $db.orig 
-if [ ! -s ${db}.orig -o ! -s $db -o ! -s VERSION ]
-then
-  echo $MAJORVERSION.$(date +%y%m%d) > VERSION
-  #wget -q --show-progress -c -O ${db}.orig ${mirror}tlpkg/texlive.tlpdb 
-  wget -q --show-progress -c -O ${db}.orig.xz ${mirror}tlpkg/texlive.tlpdb.xz
-  unxz ${db}.orig.xz 
-   
-  # remove most content from $db to be faster on later processing. 
-  # keep dependencies/manpages/binfiles/shortdesc/sizes
-  grep -E \
-    '^\S|^ RELOC/doc/man|^ texmf-dist/doc/man/man|^ RELOC/doc/info/|^ texmf-dist/doc/info/|^ bin|^$' \
-    ${db}.orig | grep -v ^longdesc > $db
-  
-  # As $db might be renewed, remove the all package meta-files
-  # to make them be created again based on (new) $db
-  rm -rf $texmf/*.meta
-fi
-
-# Get linenumbers of empty lines from $db
-emptylines="$(grep -n ^$ $db | cut -d':' -f1)"
-
-# Make a list of all collections
-grep ^"name collection-" $db | cut -d' ' -f2 > $allcollections
-
-# translate .ARCH to platforms in excludes, to make .ARCH packages excludeable by $global_exclude
-for exclude in $global_exclude
-do
-  if [ -n "$(echo $exclude | grep '\.ARCH'$ )" ]
-  then
-    for arch in $platforms
-    do
-      global_exclude+=" $(echo $exclude | sed "s/\.ARCH$/\.$arch/")" 
-    done
-    global_exclude=${global_exclude/$exclude/}
-  fi
-done
- 
-VERSION=$(cat $TMP/VERSION)
-tarball=$TMP/texlive-$edition-$VERSION.tar
-# set logfile
-logfile=$TMP/$VERSION.log
-
-# reset some files
->$logfile
->$tarball
->$collections_done
->$files_split
->$manpages
->$packages_manpages
->$updmap.$edition
->$packages_base
->$packages_extra
->$packages_base.doc
->$packages_extra.doc
->$TMP/packages.$edition.meta
->$TMP/packages.$edition.meta.uncompressed
->$TMP/provides.run.$edition
->$TMP/depends.run.$edition
->$binary_removed.$edition
-
-# put the editions base/extra together
-texmf_editions || exit 1
-
-# Check if all collections are part in at least one edition
-while read collection
-do
-  grep -w "$collection" $collections_done &> /dev/null
-  if [ $? != 0 ]
-  then
-    echo "Error: $collection was not handled."
-    echo "Edit packages/collections in the texmfget function." | tee -a $logfile
-    exit 1
-  fi
-done < $allcollections
-
-# cleanup 
-rm $allcollections
-rm $collections_done
-rm $collections_tobedone
-rm $output
-rm $output_doc
-rm $dependencies
-
-# untar special- and manpage packages to be splitted/moved to other editions
-# splitting special packages, files index
-echo "Prepare index of to be splitted/moved files from -base"
-[ ! -d texmf-dist ] && mkdir texmf-dist
-for package in $special_packages
-do
-  echo "Splitting $package"
-  # special packages have to be in -base, as only here are special
-  # tasks done to reduce size of -base edition
-  if [ -z "$( grep ^"$package"$ $packages_base )" ]
-  then
-    echo "$package was not found to be part of -base"
-    echo "Edit \$special_packages in $0,"
-    echo "it should contain only packages from -base, bye."
-    exit 1
-  fi
-  unset relocated
-  pathprefix="texmf-dist/"
-  [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" ] && \
-    relocated="-C texmf-dist" && unset pathprefix
-  # avoid big pdf docs which are also present as html
-  # move (big)type1 fonts to -extra
-  # $files_split lists files to be moved from -base to -extra
-  if [ $package = "cm-super" ]
-  then
-    # cm-super minimal for -base, create index of extended cm-super
-    tar tf $texmf/$package.tar.xz | sed \
-      "/1000\.pfb$/d;/^tlpkg/d;/\.sty$/d;/\.enc$/d;/\.GS$/d" \
-      | tee -a $files_split > $files_split.tmp
-  else
-    tar tf $texmf/${package}.tar.xz | sed \
-    -ne "/.*doc\/latex\/.*\.pdf$/p" \
-    -ne "/.*fonts\/map\/.*\.map$/p" \
-    -ne "/.*fonts\/enc\/.*\.enc$/p" \
-    -ne "/.*fonts\/afm\/.*\.\(afm\|afm\.gz\)$/p" \
-    -ne "/.*fonts\/type1\/.*\.pfb$/p" \
-    -ne "/.*fonts\/vf\/.*\.vf$/p" \
-    | tee -a $files_split > $files_split.tmp
-  fi
-
-  if [ $edition = base ]
-  then
-    # Calculate package-minimal size, uncompressed and compressed
-    mkdir -p calculate/texmf-dist
-    tar xf $texmf/$package.tar.xz -C calculate/texmf-dist --exclude-from=$files_split.tmp
-    tar cf calculate/calc.tar.xz -I 'xz -9' calculate/texmf-dist
-    size_minimal=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//")
-    size_minimal_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )"
-    sed -i \
-      -e "s/^[0-9]* byte, $package: /$size_minimal byte, $package-minimal: /" \
-      $output.base.meta
-    sed -i \
-      -e "s/^[0-9]* byte, $package: /$size_minimal_uncompressed byte, $package-minimal: /" \
-      $output.base.meta.uncompressed
-    rm -rf calculate
-  fi
-  
-  if [ $edition = extra ]
-  then
-    mkdir -p calculate/texmf-dist
-    tar xf $texmf/${package}.tar.xz -C calculate/texmf-dist $(paste $files_split.tmp)
-    tar cf calculate/calc.tar.xz -I 'xz -9' calculate/texmf-dist
-    size_extended=$(du -bc calculate/calc.tar.xz | tail -n1 | sed "s/[[:space:]].*//")
-    size_extended_uncompressed="$(xz -l --verbose calculate/calc.tar.xz | \
-      grep "Uncompressed size" | cut -d'(' -f2 | cut -d' ' -f1 )"
- 
-    # put new sizes in package index uncompressed
-    sed -i \
-      -e "s/^[0-9]* byte, $package: /$size_extended byte, $package-extended: /" \
-      $output.extra.meta
-    sed -i \
-      -e "s/^[0-9]* byte, $package: /$size_extended_uncompressed byte, $package-extended: /" \
-      $output.extra.meta.uncompressed
-    rm -rf calculate
-    
-    # put map files from splitted packages in -extra
-    mkdir meta_tmp
-    tar xf $texmf/${package}.tar.xz -C meta_tmp tlpkg/tlpobj/$package.tlpobj
-    grep ^'execute ' meta_tmp/tlpkg/tlpobj/$package.tlpobj | \
-      grep Map | cut -d' ' -f2- | sed "s/^add//g" >> $updmap.$edition
-    rm -rf meta_tmp
-  fi
- 
-  # untar to provide files for -extra
-  tar xf $texmf/${package}.tar.xz $relocated $(paste $files_split.tmp)
-  if [ $package = "cm-super" ]
-  then
-    # create cm-super- minimal config/maps with 10pt glyphs only
-    sed "s/cm-super/cm-super-minimal/g" $texmf/texmf-dist/dvips/cm-super/config.cm-super \
-      > $texmf/texmf-dist/dvips/cm-super/config-minimal.cm-super
-    for map in t1 t2a t2b t2c ts1 x2
-    do
-      grep 1000 $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map \
-        > $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-$map.map 
-      sed -i "/.*1000\.pfb/d" $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-$map.map 
-    done
-  fi
-done
-
-# cleanup
-rm $files_split.tmp
-
-# fix relocation in index for splitted packages
-sed -i \
-  -e "s|^doc|texmf-dist\/doc|g" \
-  -e "s|^fonts|texmf-dist\/fonts|g" \
-  -e "s|^dvips|texmf-dist\/dvips|g" \
-  $files_split
-
-# sort meta data about added packages
-sort -n $output.$edition.meta > $tmpfile
-mv $tmpfile $output.$edition.meta 
-sort -n $output.$edition.meta.uncompressed > $tmpfile
-mv $tmpfile $output.$edition.meta.uncompressed 
-
-sort -u $binary_removed.$edition > $tmpfile
-mv $tmpfile $binary_removed.$edition
-
-# include manpages/GNU infofiles in -base, write index for later exclusion from other editions.
-# In -extra/-docs there should not be any manpage left.
-echo "Looking for manpages/GNU infofiles to be included in -base ..."
-for package in $(paste -s $packages_base.doc | sort -u)
-do
-  if [ -n "$(grep -E "(doc/man/man|doc/info/)" $texmf/$package.meta )" ]
-  then
-    echo "Adding manpage from $package.doc to -base"
-    flavour=".doc" download $package || exit 1
-    unset relocated
-    pathprefix="texmf-dist/"
-    [ -n "$(grep -w ^"relocated 1" $texmf/$package.meta)" ] \
-      && relocated="-C texmf-dist" && unset pathprefix
-    tar tf $texmf/${package}.doc.tar.xz | sed \
-    -ne "/.*doc\/man\/.*\.1$/p" \
-    -ne "/.*doc\/man\/.*\.5$/p" \
-    -ne "/.*doc\/info\/.*\.info$/p" \
-    | tee -a $manpages > $manpages.tmp
-    # untar to provide files for -/extra/-docs
-    tar xf $texmf/${package}.doc.tar.xz $relocated $(paste $manpages.tmp)
-    echo "$package" >> $packages_manpages
-  fi
-done 
-# cleanup
-rm $manpages.tmp
-sed -i \
-  -e "s/^doc/texmf-dist\/doc/g" \
-  $manpages
-  
-case $edition in
-  base) 
-  # Content info
-  cat << EOF | gzip -9 >> $texmf/texmf-dist/packages.$edition.gz
-Content of -$edition:
-$(sed "/-linux$/d" $packages_base | sort)
-EOF
-  # create texdoc cache file
-  if [ $(command -v texdoc) ]
-  then
-    mkdir -p texmf-dist/scripts/texdoc || exit 1
-    TEXMFVAR=$texmf/texmf-dist \
-      texdoc -c texlive_tlpdb=$TMP/texlive.tlpdb.orig \
-      -DlM texlive-en >/dev/null 2>&1 
-    mv texmf-dist/texdoc/cache-tlpdb.lua \
-      texmf-dist/scripts/texdoc/Data.tlpdb.lua || exit 1
-    # add cache to tarball
-    tar rf $tarball --owner=0 --group=0 --sort=name \
-      texmf-dist/scripts/texdoc/Data.tlpdb.lua || exit 1
-  else
-    echo "WARNING: texdoc binary(comming with texlive) is not installed, the texdoc cache"
-    echo "Data.tlpdb.lua can't be created and wont't be available."
-    echo "Texdoc will not wotk without this."
-    echo ""
-    echo "Continue with any key or abort with ctrl-c"
-    read -n1
-  fi
-
-  # prepare updmap.cfg
-  tar xf $tarball texmf-dist/web2c/updmap.cfg
-  end_n="$(grep -n 'end of updmap-hdr' texmf-dist/web2c/updmap.cfg | cut -d':' -f1)"
-  
-  sed "1,${end_n}!d" texmf-dist/web2c/updmap.cfg > $TMP/updmap.cfg.tmp
-  cat $updmap.$edition >> $TMP/updmap.cfg.tmp
-  mv $TMP/updmap.cfg.tmp texmf-dist/web2c/updmap.cfg
-  tar f $tarball --delete texmf-dist/web2c/updmap.cfg
-  tar rf $tarball --owner=0 --group=0 --sort=name \
-    texmf-dist/web2c/updmap.cfg
-
-# add manpages/GNU infofiles to the tarball
-  tar rf $tarball --owner=0 --group=0 --sort=name \
-    texmf-dist/doc/man/ texmf-dist/doc/info/ \
-    texmf-dist/packages.$edition.gz \
-    || exit 1
-#  # add cm-super minimal maps/config
-#  tar rf $tarball --owner=0 --group=0 --sort=name \
-#    texmf-dist/dvips/cm-super/config-minimal.cm-super \
-#    --wildcards texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-*.map \
-#    || exit 1
-  echo "Removing files -from base, splitted from special packages to be included in -extra"
-  tar f $tarball --delete $(paste $files_split) || exit 1
-  ;;
-  extra)
-  echo "Removing manpages from $edition which now reside in -base" 
-  tar f $tarball --delete $(paste $manpages) 2>/dev/null 
-  # content info
-  echo "Content of -$edition, including documentation:" > $texmf/texmf-dist/packages.$edition
-  sed "/-linux$/d" $TMP/packages.$edition | sort >> $texmf/texmf-dist/packages.$edition
-  gzip -9 $texmf/texmf-dist/packages.$edition
-#  # remove cm-super minimal config, which resides in -base
-#  rm \
-#    $texmf/texmf-dist/dvips/cm-super/config-minimal.cm-super \
-#    $texmf/texmf-dist/fonts/map/dvips/cm-super/cm-super-minimal-*.map 
-
-    # add -extra updmap.cfg
-    mkdir -p $texmf/texmf-dist/web2c
-    mv $updmap.$edition $texmf/texmf-dist/web2c
-  tar rf $tarball --owner=0 --group=0 --sort=name \
-    --exclude texmf-dist/doc \
-    texmf-dist \
-    || exit 1
-  ;;
-  docs)
-  # add docs splittet from base from special packages, add packages index
-  # content info, this edition contains all docs from -base
-  echo "Content of -$edition, documentation for -base:" > $texmf/texmf-dist/packages.$edition
-  sort $packages_base.doc >> $texmf/texmf-dist/packages.$edition
-  gzip -9 $texmf/texmf-dist/packages.$edition
-  tar rf $tarball --owner=0 --group=0 --sort=name \
-    texmf-dist/doc/ \
-    texmf-dist/packages.$edition.gz \
-    || exit 1
-  echo "Removing manpages from $edition which now reside in -base" 
-  tar f $tarball --delete $(paste $manpages) || exit 1
-  ;;
-esac
-  
-rm -rf texmf-dist
-[ -f $updmap.$edition ] && rm $updmap.$edition
-
-# compress the tarball as everything is in place now
-echo "Compressing $tarball ..."
-[ -f $tarball.xz ] && rm $tarball.xz
-xz -9 -T0 $tarball || exit 1
-md5sum $tarball.xz
-ls -lh $tarball.xz
-echo "Logfile: $logfile"
diff --git a/office/texlive/slack-desc b/office/texlive/slack-desc
deleted file mode 100644
index 5feea19c55..0000000000
--- a/office/texlive/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------------------------------------------------------|
-texlive: texlive (TeX binaries, support files, and formats)
-texlive:
-texlive: This package contains binaries, support files, TeX formats and
-texlive: packages,and other files included in the TeXLive TeX distribution.
-texlive: Included are input files for TeX, runtime configuration files,
-texlive: hyphenation tables, manpages, and the computer modern fonts.
-texlive:
-texlive: SlackBuilds.org has more texmf files and documentation in the
-texlive: texlive-extra and texlive-docs packages.
-texlive:
-texlive:
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
deleted file mode 100644
index f33177ed05..0000000000
--- a/office/texlive/texlive.SlackBuild
+++ /dev/null
@@ -1,253 +0,0 @@
-#!/bin/sh
-
-# TeXLive build script for Slackware
-
-# Copyright 2009, 2017 - 2020  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2009 - 2014  Robby Workman, Northport, AL, USA
-# Copyright 2016 - 2017  Johannes Schoepfer, Germany
-# 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.
-
-# URL: ftp://tug.org/historic/systems/texlive/
-# Testrelease: ftp://tug.org/texlive/Images/test/
-# Upstream stable fixes: svn://tug.org/texlive/branches/branch2020/Build/source
-
-PRGNAM=texlive
-SOURCEVERSION=20200327
-VERSION=${VERSION:-2020.200608}
-BUILD=${BUILD:-2}
-TAG=${TAG:-_SBo}
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-texlive
-OUTPUT=${OUTPUT:-/tmp}
-
-set -e
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i586 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-TEXMFROOT=/usr/share
-
-# NOTE: Using the system version of poppler will require texlive to be
-# recompiled with pretty much every poppler update, as they almost always
-# bump the shared library version. But sometimes you do what you have
-# to do...
-SYSTEMPOPPLER=${SYSTEMPOPPLER:-NO}
-if [ "$SYSTEMPOPPLER" = "NO" ]; then
-  POPPLER="--without-system-poppler --without-system-xpdf"
-else
-  POPPLER="--with-system-poppler --with-system-xpdf"
-fi
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf texlive-$SOURCEVERSION-source
-tar xvf $CWD/texlive-${SOURCEVERSION}-source.tar.xz || exit 1
-cd texlive-$SOURCEVERSION-source || exit 1
-chown -R root:root .
-chmod -R u+w,go-w,a+rX-st .
-
-export LANG=C
-export PATH="$PKG/usr/bin:$PATH"
-export LD_LIBRARY_PATH="$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRARY_PATH"
-
-# set TEXMFROOT and TEXMFLOCAL
-sed -i \
-  -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \
-  -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
-  texk/kpathsea/texmf.cnf
-
-# prevent compiling Xdvi with libXp
-sed -i 's|-lXp ||' texk/xdvik/configure
-
-mkdir build
-cd build
-  CFLAGS="$SLKCFLAGS" \
-  CXXFLAGS="$SLKCFLAGS -fpermissive" \
-  ../configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --infodir=/usr/info \
-    --with-banner-add=' on Slackware (SlackBuilds.org)' \
-    --disable-native-texlive-build \
-    --enable-largefile \
-    --enable-shared \
-    --disable-static \
-    --disable-missing \
-    --disable-multiplatform \
-    --disable-debug \
-    --disable-dialog \
-    --disable-bibtexu \
-    --disable-xz \
-    --with-x \
-    --disable-dvisvgm \
-    --enable-xindy \
-    --disable-xindy-docs \
-    --disable-xindy-rules \
-    --with-clisp-runtime=system \
-    --enable-gc=system \
-    --with-system-zlib \
-    --with-system-libpng \
-    --with-system-t1lib \
-    --with-system-gd \
-    --with-system-freetype2 \
-    --with-system-libgs \
-    --with-system-icu \
-    --with-system-pixman \
-    --with-system-cairo \
-    --with-system-gmp \
-    --with-system-mpfr \
-    --with-system-fontconfig \
-    --with-system-ncurses \
-    --without-system-harfbuzz \
-    --disable-aleph \
-    --disable-dump-share \
-    --disable-linked-scripts \
-    $POPPLER \
-    --build=$ARCH-slackware-linux || exit 1
-
-  make || exit 1
-  #make check || exit 1
-  make install-strip DESTDIR=$PKG || exit 1
-
-cd ..
-
-# Don't ship .la files:
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-# Remove all files which are covered by tlnet
-rm -rf $PKG$TEXMFROOT $PKG/usr/man $PKG/usr/info
-
-# install the tlnet stuff
-mkdir -p $PKG$TEXMFROOT
-tar xvf $CWD/texlive-base-$VERSION.tar.xz -C $PKG$TEXMFROOT || exit 1
-chown -R root:root $PKG
-chmod -R u+w,go-w,a+rX-st $PKG
-
-# use symlinks/scripts from tlnet
-for link in $PKG$TEXMFROOT/texmf-dist/linked_scripts/* ;do \
-  if [ -e "$link" ]; then
-    ln -sf $TEXMFROOT/texmf-dist/linked_scripts/bin/${link##*/} $PKG/usr/bin/${link##*/}
-  else
-    mv $link $PKG/usr/bin/${link##*/}
-  fi
-done
-mkdir -p $PKG$TEXMFROOT/texmf-dist/bin
-mv $PKG$TEXMFROOT/texmf-dist/linked_scripts/* $PKG$TEXMFROOT/texmf-dist/bin
-mv $PKG$TEXMFROOT/texmf-dist/bin $PKG$TEXMFROOT/texmf-dist/linked_scripts
-
-# set some paths
-sed -i \
-  -e "s|^TEXMFROOT.*|TEXMFROOT = $TEXMFROOT|" \
-  -e "s|^TEXMFLOCAL.*|TEXMFLOCAL = \$TEXMFROOT/texmf-local|" \
-  -e "s|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|" \
-  $PKG$TEXMFROOT/texmf-dist/web2c/texmf.cnf
-
-# disable obsolete aleph/lamed/cslatex/pdfcslatex
-sed -i \
-  -e 's|^aleph|#! aleph|' \
-  -e 's|^lamed|#! lamed|' \
-  -e 's|^cslatex|#! cslatex|' \
-  -e 's|^pdfcslatex|#! pdfcslatex|' \
-  $PKG$TEXMFROOT/texmf-dist/web2c/fmtutil.cnf
-
-# make ConTeXt work
-sed -i \
-  -e "s|selfautoparent:|$TEXMFROOT/|g" \
-  -e "s|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1\"$TEXMFROOT/texmf-local\"|" \
-  $PKG$TEXMFROOT/texmf-dist/web2c/texmfcnf.lua
-
-# provide texlive fonts optionally for other system apps
-mkdir -p $PKG/etc/fonts/conf.avail
-cat > $PKG/etc/fonts/conf.avail/09-texlive.conf << EOF
-<?xml version='1.0'?>
-<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
-<fontconfig>
-   <dir>$TEXMFROOT/texmf-dist/fonts/opentype</dir>
-   <dir>$TEXMFROOT/texmf-dist/fonts/truetype</dir>
-</fontconfig>
-EOF
-
-# Install the docs while we're still here
-mkdir -p $PKG/usr/doc/texlive-$VERSION
-cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
-# Install index of provided tex packages to the docs
-mv $PKG$TEXMFROOT/texmf-dist/packages.base.gz $PKG/usr/doc/texlive-$VERSION
-
-# Put a symlink to $TEXMFROOT/texmf-dist/doc in our Slackware docdir
-ln -sf $TEXMFROOT/texmf-dist/doc $PKG/usr/doc/texlive-$VERSION/doc
-
-# We won't make tlmgr easily available; it's still there, but
-# we'll make it harder to void the warranty :-)
-rm $PKG/usr/bin/tlmgr
-cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg
-
-# Create some directories to make it clear that they're owned by this package
-mkdir -p $PKG$TEXMFROOT/{texmf-config,texmf-var,texmf-local}
-
-# Use patch for tabu.sty from https://github.com/tabu-fixed/tabu to fix
-# breakage when compiling doxygen:
-( cd $PKG$TEXMFROOT/texmf-dist/tex/latex/tabu
-  cat $CWD/patches/tabu.sty.diff | patch -p1 --verbose || exit 1
-  ) || exit 1
-
-# Add texlive perl modules
-mkdir -p $PKG/usr/share/perl5
-mv $PKG$TEXMFROOT/texmf-dist/scripts/texlive/TeXLive $PKG/usr/share/perl5/
-
-# Move manual pages to the correct place
-mkdir $PKG/usr/man
-mv $PKG$TEXMFROOT/texmf-dist/doc/man/man1 $PKG/usr/man
-mv $PKG$TEXMFROOT/texmf-dist/doc/man/man5 $PKG/usr/man
-rmdir $PKG$TEXMFROOT/texmf-dist/doc/man
-
-# Handle the man pages
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
-# Handle the GNU info pages
-mv $PKG$TEXMFROOT/texmf-dist/doc/info $PKG/usr
-gzip -9 $PKG/usr/info/*
-
-mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
deleted file mode 100644
index af079541e7..0000000000
--- a/office/texlive/texlive.info
+++ /dev/null
@@ -1,12 +0,0 @@
-PRGNAM="texlive"
-VERSION="2020.200608"
-HOMEPAGE="https://tug.org/texlive/"
-DOWNLOAD="http://slackware.schoepfer.info/slackbuilds/texlive/texlive-20200327-source.tar.xz \
-	http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-2020.200608.tar.xz"
-MD5SUM="02963bd8eae94b278407e86c9604e761 \
-	448c337b359fdfc44321cd7928176b74"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Johannes Schoepfer"
-EMAIL="slackbuilds@schoepfer.info"