20210109.1 global branch merge.current-20210109.1

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

33 files changed, 1402 insertions, 306 deletions

diff --git a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
index b1a80a48e4..73ab6e425d 100644
--- a/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
+++ b/academic/Gridcoin-Research/Gridcoin-Research.SlackBuild
@@ -70,6 +70,12 @@ 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 {} \;
 
+# For boost >= 1.73.0
+patch -p1 < $CWD/boost-1.73.patch
+
+# For qt-5.15.x, thanks to kingbeowulf!
+sed -i '/^#include <QPainter>$/a #include <QPainterPath>' src/qt/trafficgraphwidget.cpp
+
 if [ "${QRENC:-no}" = "yes" ]; then
   useqr="--with-qrencode"
 else
diff --git a/academic/Gridcoin-Research/boost-1.73.patch b/academic/Gridcoin-Research/boost-1.73.patch
new file mode 100644
index 0000000000..d47fe78a6e
--- /dev/null
+++ b/academic/Gridcoin-Research/boost-1.73.patch
@@ -0,0 +1,54 @@
+diff -Naur Gridcoin-Research-4.0.6.0.orig/src/qt/clientmodel.cpp Gridcoin-Research-4.0.6.0/src/qt/clientmodel.cpp
+--- Gridcoin-Research-4.0.6.0.orig/src/qt/clientmodel.cpp	2019-10-22 20:36:49.000000000 +0200
++++ Gridcoin-Research-4.0.6.0/src/qt/clientmodel.cpp	2020-05-12 08:45:16.926818550 +0200
+@@ -270,9 +270,9 @@
+     // Connect signals to client
+     uiInterface.NotifyBlocksChanged.connect(boost::bind(NotifyBlocksChanged, this));
+     uiInterface.BannedListChanged.connect(boost::bind(BannedListChanged, this));
+-    uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+-    uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, _1, _2));
+-    uiInterface.NotifyScraperEvent.connect(boost::bind(NotifyScraperEvent, this, _1, _2, _3));
++    uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
++    uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, boost::placeholders::_1, boost::placeholders::_2));
++    uiInterface.NotifyScraperEvent.connect(boost::bind(NotifyScraperEvent, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+ 
+ void ClientModel::unsubscribeFromCoreSignals()
+@@ -280,7 +280,7 @@
+     // Disconnect signals from client
+     uiInterface.NotifyBlocksChanged.disconnect(boost::bind(NotifyBlocksChanged, this));
+     uiInterface.BannedListChanged.disconnect(boost::bind(BannedListChanged, this));
+-    uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
+-    uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, _1, _2));
+-    uiInterface.NotifyScraperEvent.disconnect(boost::bind(NotifyScraperEvent, this, _1, _2, _3));
++    uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, boost::placeholders::_1));
++    uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, boost::placeholders::_1, boost::placeholders::_2));
++    uiInterface.NotifyScraperEvent.disconnect(boost::bind(NotifyScraperEvent, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+diff -Naur Gridcoin-Research-4.0.6.0.orig/src/qt/walletmodel.cpp Gridcoin-Research-4.0.6.0/src/qt/walletmodel.cpp
+--- Gridcoin-Research-4.0.6.0.orig/src/qt/walletmodel.cpp	2019-10-22 20:36:49.000000000 +0200
++++ Gridcoin-Research-4.0.6.0/src/qt/walletmodel.cpp	2020-05-12 08:47:46.494818550 +0200
+@@ -369,17 +369,17 @@
+ void WalletModel::subscribeToCoreSignals()
+ {
+     // Connect signals to wallet
+-    wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1));
+-    wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
+-    wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
++    wallet->NotifyStatusChanged.connect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
++    wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
++    wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+ 
+ void WalletModel::unsubscribeFromCoreSignals()
+ {
+     // Disconnect signals from wallet
+-    wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, _1));
+-    wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5));
+-    wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
++    wallet->NotifyStatusChanged.disconnect(boost::bind(&NotifyKeyStoreStatusChanged, this, boost::placeholders::_1));
++    wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4, boost::placeholders::_5));
++    wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3));
+ }
+ 
+ // WalletModel::UnlockContext implementation
diff --git a/academic/antiprism/antiprism.SlackBuild b/academic/antiprism/antiprism.SlackBuild
index 271184a166..f3c6c291e6 100644
--- a/academic/antiprism/antiprism.SlackBuild
+++ b/academic/antiprism/antiprism.SlackBuild
@@ -55,7 +55,7 @@ find -L . \
 sed "/^docdir/s|= .*|= @docdir@|" -i Makefile.in
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib$LIBDIRSUFFIX \
diff --git a/academic/arpack-ng/arpack-ng.SlackBuild b/academic/arpack-ng/arpack-ng.SlackBuild
index b5639de58b..b989ee503d 100644
--- a/academic/arpack-ng/arpack-ng.SlackBuild
+++ b/academic/arpack-ng/arpack-ng.SlackBuild
@@ -71,6 +71,8 @@ chown -R root:root .
 chmod -R u+w,go-w,a+rX-st .
 
 patch -p1 < $CWD/patches/atlas-lib-rename.diff
+# thanks fedora!
+patch -p1 < $CWD/patches/239.patch
 
 ./bootstrap
 ./configure \
diff --git a/academic/arpack-ng/patches/239.patch b/academic/arpack-ng/patches/239.patch
new file mode 100644
index 0000000000..27d3406d34
--- /dev/null
+++ b/academic/arpack-ng/patches/239.patch
@@ -0,0 +1,1246 @@
+From 9418632214acf6d387896ab29a8f5bdff2d4e38a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?David=20Schw=C3=B6rer?= <davidsch@fedoraproject.org>
+Date: Wed, 19 Feb 2020 20:07:47 +0000
+Subject: ?vout expects a vector, so make sure to pass a vector
+
+gcc10 throws an error otherwise
+---
+ SRC/cgetv0.f |  6 +++---
+ SRC/cnaitr.f |  8 ++++----
+ SRC/cnapps.f | 14 +++++++-------
+ SRC/cnaup2.f | 14 +++++++-------
+ SRC/cnaupd.f |  4 ++--
+ SRC/cneupd.f |  4 ++--
+ SRC/cngets.f |  4 ++--
+ SRC/dgetv0.f |  6 +++---
+ SRC/dnaitr.f |  8 ++++----
+ SRC/dnapps.f | 16 ++++++++--------
+ SRC/dnaup2.f | 14 +++++++-------
+ SRC/dnaupd.f |  4 ++--
+ SRC/dneupd.f |  4 ++--
+ SRC/dngets.f |  4 ++--
+ SRC/dsaitr.f |  8 ++++----
+ SRC/dsapps.f |  6 +++---
+ SRC/dsaup2.f | 14 +++++++-------
+ SRC/dsaupd.f |  4 ++--
+ SRC/dseupd.f |  4 ++--
+ SRC/dsgets.f |  4 ++--
+ SRC/sgetv0.f |  6 +++---
+ SRC/snaitr.f |  8 ++++----
+ SRC/snapps.f | 16 ++++++++--------
+ SRC/snaup2.f | 14 +++++++-------
+ SRC/snaupd.f |  4 ++--
+ SRC/sneupd.f |  4 ++--
+ SRC/sngets.f |  4 ++--
+ SRC/ssaitr.f |  8 ++++----
+ SRC/ssapps.f |  6 +++---
+ SRC/ssaup2.f | 14 +++++++-------
+ SRC/ssaupd.f |  4 ++--
+ SRC/sseupd.f |  4 ++--
+ SRC/ssgets.f |  4 ++--
+ SRC/zgetv0.f |  6 +++---
+ SRC/znaitr.f |  8 ++++----
+ SRC/znapps.f | 14 +++++++-------
+ SRC/znaup2.f | 14 +++++++-------
+ SRC/znaupd.f |  4 ++--
+ SRC/zneupd.f |  4 ++--
+ SRC/zngets.f |  4 ++--
+ 40 files changed, 150 insertions(+), 150 deletions(-)
+
+diff --git a/SRC/cgetv0.f b/SRC/cgetv0.f
+index 322b35c7..a91ef926 100644
+--- a/SRC/cgetv0.f
++++ b/SRC/cgetv0.f
+@@ -361,9 +361,9 @@ subroutine cgetv0
+ c     %--------------------------------------%
+ c
+       if (msglvl .gt. 2) then
+-          call svout (logfil, 1, rnorm0, ndigit,
++          call svout (logfil, 1, [rnorm0], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm0 is')
+-          call svout (logfil, 1, rnorm, ndigit,
++          call svout (logfil, 1, [rnorm], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm is')
+       end if
+ c
+@@ -394,7 +394,7 @@ subroutine cgetv0
+    50 continue
+ c
+       if (msglvl .gt. 0) then
+-         call svout (logfil, 1, rnorm, ndigit,
++         call svout (logfil, 1, [rnorm], ndigit,
+      &        '_getv0: B-norm of initial / restarted starting vector')
+       end if
+       if (msglvl .gt. 2) then
+diff --git a/SRC/cnaitr.f b/SRC/cnaitr.f
+index 2bb93fff..bebd8236 100644
+--- a/SRC/cnaitr.f
++++ b/SRC/cnaitr.f
+@@ -378,9 +378,9 @@ subroutine cnaitr
+  1000 continue
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &                  '_naitr: generating Arnoldi vector number')
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &                  '_naitr: B-norm of the current residual is')
+          end if
+ c
+@@ -400,7 +400,7 @@ subroutine cnaitr
+ c           %---------------------------------------------------%
+ c
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, j, ndigit,
++               call ivout (logfil, 1, [j], ndigit,
+      &                     '_naitr: ****** RESTART AT STEP ******')
+             end if
+ c
+@@ -729,7 +729,7 @@ subroutine cnaitr
+          end if
+ c
+          if (msglvl .gt. 0 .and. iter .gt. 0 ) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &           '_naitr: Iterative refinement for Arnoldi residual')
+             if (msglvl .gt. 2) then
+                 rtemp(1) = rnorm
+diff --git a/SRC/cnapps.f b/SRC/cnapps.f
+index fdf878d8..c3a55623 100644
+--- a/SRC/cnapps.f
++++ b/SRC/cnapps.f
+@@ -268,9 +268,9 @@ subroutine cnapps
+          sigma = shift(jj)
+ c
+          if (msglvl .gt. 2 ) then
+-            call ivout (logfil, 1, jj, ndigit,
++            call ivout (logfil, 1, [jj], ndigit,
+      &               '_napps: shift number.')
+-            call cvout (logfil, 1, sigma, ndigit,
++            call cvout (logfil, 1, [sigma], ndigit,
+      &               '_napps: Value of the shift ')
+          end if
+ c
+@@ -291,9 +291,9 @@ subroutine cnapps
+             if ( abs(real(h(i+1,i)))
+      &           .le. max(ulp*tst1, smlnum) )  then
+                if (msglvl .gt. 0) then
+-                  call ivout (logfil, 1, i, ndigit,
++                  call ivout (logfil, 1, [i], ndigit,
+      &                 '_napps: matrix splitting at row/column no.')
+-                  call ivout (logfil, 1, jj, ndigit,
++                  call ivout (logfil, 1, [jj], ndigit,
+      &                 '_napps: matrix splitting with shift number.')
+                   call cvout (logfil, 1, h(i+1,i), ndigit,
+      &                 '_napps: off diagonal element.')
+@@ -307,9 +307,9 @@ subroutine cnapps
+    40    continue
+ c
+          if (msglvl .gt. 2) then
+-             call ivout (logfil, 1, istart, ndigit,
++             call ivout (logfil, 1, [istart], ndigit,
+      &                   '_napps: Start of current block ')
+-             call ivout (logfil, 1, iend, ndigit,
++             call ivout (logfil, 1, [iend], ndigit,
+      &                   '_napps: End of current block ')
+          end if
+ c
+@@ -485,7 +485,7 @@ subroutine cnapps
+      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
+          call cvout (logfil, 1, h(kev+1,kev), ndigit,
+      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
+-         call ivout (logfil, 1, kev, ndigit,
++         call ivout (logfil, 1, [kev], ndigit,
+      &               '_napps: Order of the final Hessenberg matrix ')
+          if (msglvl .gt. 2) then
+             call cmout (logfil, kev, kev, h, ldh, ndigit,
+diff --git a/SRC/cnaup2.f b/SRC/cnaup2.f
+index e528a890..3f106f05 100644
+--- a/SRC/cnaup2.f
++++ b/SRC/cnaup2.f
+@@ -389,7 +389,7 @@ subroutine cnaup2
+          iter = iter + 1
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, iter, ndigit,
++            call ivout (logfil, 1, [iter], ndigit,
+      &           '_naup2: **** Start of major iteration number ****')
+          end if
+ c
+@@ -402,9 +402,9 @@ subroutine cnaup2
+          np  = kplusp - nev
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, nev, ndigit,
++            call ivout (logfil, 1, [nev], ndigit,
+      &     '_naup2: The length of the current Arnoldi factorization')
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &           '_naup2: Extend the Arnoldi factorization by')
+          end if
+ c
+@@ -430,7 +430,7 @@ subroutine cnaup2
+          update = .false.
+ c
+          if (msglvl .gt. 1) then
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &           '_naup2: Corresponding B-norm of the residual')
+          end if
+ c
+@@ -658,7 +658,7 @@ subroutine cnaup2
+          end if
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, nconv, ndigit,
++            call ivout (logfil, 1, [nconv], ndigit,
+      &           '_naup2: no. of "converged" Ritz values at this iter.')
+             if (msglvl .gt. 1) then
+                kp(1) = nev
+@@ -698,7 +698,7 @@ subroutine cnaup2
+          end if
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &                  '_naup2: The number of shifts to apply ')
+             call cvout (logfil, np, ritz, ndigit,
+      &                  '_naup2: values of the shifts')
+@@ -762,7 +762,7 @@ subroutine cnaup2
+          cnorm = .false.
+ c
+          if (msglvl .gt. 2) then
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &      '_naup2: B-norm of residual for compressed factorization')
+             call cmout (logfil, nev, nev, h, ldh, ndigit,
+      &        '_naup2: Compressed upper Hessenberg matrix H')
+diff --git a/SRC/cnaupd.f b/SRC/cnaupd.f
+index 7bf37fd1..57be328b 100644
+--- a/SRC/cnaupd.f
++++ b/SRC/cnaupd.f
+@@ -601,9 +601,9 @@ subroutine cnaupd
+       if (info .eq. 2) info = 3
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, mxiter, ndigit,
++         call ivout (logfil, 1, [mxiter], ndigit,
+      &               '_naupd: Number of update iterations taken')
+-         call ivout (logfil, 1, np, ndigit,
++         call ivout (logfil, 1, [np], ndigit,
+      &               '_naupd: Number of wanted "converged" Ritz values')
+          call cvout (logfil, np, workl(ritz), ndigit,
+      &               '_naupd: The final Ritz values')
+diff --git a/SRC/cneupd.f b/SRC/cneupd.f
+index c557fa08..34a78f70 100644
+--- a/SRC/cneupd.f
++++ b/SRC/cneupd.f
+@@ -536,9 +536,9 @@ subroutine cneupd(rvec , howmny, select, d     ,
+ c        %-----------------------------------------------------------%
+ c
+          if (msglvl .gt. 2) then
+-             call ivout(logfil, 1, numcnv, ndigit,
++             call ivout(logfil, 1, [numcnv], ndigit,
+      &            '_neupd: Number of specified eigenvalues')
+-             call ivout(logfil, 1, nconv, ndigit,
++             call ivout(logfil, 1, [nconv], ndigit,
+      &            '_neupd: Number of "converged" eigenvalues')
+          end if
+ c
+diff --git a/SRC/cngets.f b/SRC/cngets.f
+index 7686e133..20626a2d 100644
+--- a/SRC/cngets.f
++++ b/SRC/cngets.f
+@@ -161,8 +161,8 @@ subroutine cngets ( ishift, which, kev, np, ritz, bounds)
+       tcgets = tcgets + (t1 - t0)
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
+-         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
++         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
++         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
+          call cvout (logfil, kev+np, ritz, ndigit,
+      &        '_ngets: Eigenvalues of current H matrix ')
+          call cvout (logfil, kev+np, bounds, ndigit,
+diff --git a/SRC/dgetv0.f b/SRC/dgetv0.f
+index fbb4fe2a..1d6dc01b 100644
+--- a/SRC/dgetv0.f
++++ b/SRC/dgetv0.f
+@@ -366,9 +366,9 @@ subroutine dgetv0
+ c     %--------------------------------------%
+ c
+       if (msglvl .gt. 2) then
+-          call dvout (logfil, 1, rnorm0, ndigit,
++          call dvout (logfil, 1, [rnorm0], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm0 is')
+-          call dvout (logfil, 1, rnorm, ndigit,
++          call dvout (logfil, 1, [rnorm], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm is')
+       end if
+ c
+@@ -399,7 +399,7 @@ subroutine dgetv0
+    50 continue
+ c
+       if (msglvl .gt. 0) then
+-         call dvout (logfil, 1, rnorm, ndigit,
++         call dvout (logfil, 1, [rnorm], ndigit,
+      &        '_getv0: B-norm of initial / restarted starting vector')
+       end if
+       if (msglvl .gt. 3) then
+diff --git a/SRC/dnaitr.f b/SRC/dnaitr.f
+index baaec038..c02cd390 100644
+--- a/SRC/dnaitr.f
++++ b/SRC/dnaitr.f
+@@ -371,9 +371,9 @@ subroutine dnaitr
+  1000 continue
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &                  '_naitr: generating Arnoldi vector number')
+-            call dvout (logfil, 1, rnorm, ndigit,
++            call dvout (logfil, 1, [rnorm], ndigit,
+      &                  '_naitr: B-norm of the current residual is')
+          end if
+ c
+@@ -393,7 +393,7 @@ subroutine dnaitr
+ c           %---------------------------------------------------%
+ c
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, j, ndigit,
++               call ivout (logfil, 1, [j], ndigit,
+      &                     '_naitr: ****** RESTART AT STEP ******')
+             end if
+ c
+@@ -721,7 +721,7 @@ subroutine dnaitr
+          end if
+ c
+          if (msglvl .gt. 0 .and. iter .gt. 0) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &           '_naitr: Iterative refinement for Arnoldi residual')
+             if (msglvl .gt. 2) then
+                 xtemp(1) = rnorm
+diff --git a/SRC/dnapps.f b/SRC/dnapps.f
+index 872d35ae..7fb37d87 100644
+--- a/SRC/dnapps.f
++++ b/SRC/dnapps.f
+@@ -266,11 +266,11 @@ subroutine dnapps
+          sigmai = shifti(jj)
+ c
+          if (msglvl .gt. 2 ) then
+-            call ivout (logfil, 1, jj, ndigit,
++            call ivout (logfil, 1, [jj], ndigit,
+      &               '_napps: shift number.')
+-            call dvout (logfil, 1, sigmar, ndigit,
++            call dvout (logfil, 1, [sigmar], ndigit,
+      &               '_napps: The real part of the shift ')
+-            call dvout (logfil, 1, sigmai, ndigit,
++            call dvout (logfil, 1, [sigmai], ndigit,
+      &               '_napps: The imaginary part of the shift ')
+          end if
+ c
+@@ -335,9 +335,9 @@ subroutine dnapps
+      &         tst1 = dlanhs( '1', kplusp-jj+1, h, ldh, workl )
+             if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then
+                if (msglvl .gt. 0) then
+-                  call ivout (logfil, 1, i, ndigit,
++                  call ivout (logfil, 1, [i], ndigit,
+      &                 '_napps: matrix splitting at row/column no.')
+-                  call ivout (logfil, 1, jj, ndigit,
++                  call ivout (logfil, 1, [jj], ndigit,
+      &                 '_napps: matrix splitting with shift number.')
+                   call dvout (logfil, 1, h(i+1,i), ndigit,
+      &                 '_napps: off diagonal element.')
+@@ -351,9 +351,9 @@ subroutine dnapps
+    40    continue
+ c
+          if (msglvl .gt. 2) then
+-             call ivout (logfil, 1, istart, ndigit,
++             call ivout (logfil, 1, [istart], ndigit,
+      &                   '_napps: Start of current block ')
+-             call ivout (logfil, 1, iend, ndigit,
++             call ivout (logfil, 1, [iend], ndigit,
+      &                   '_napps: End of current block ')
+          end if
+ c
+@@ -627,7 +627,7 @@ subroutine dnapps
+      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
+          call dvout (logfil, 1, h(kev+1,kev), ndigit,
+      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
+-         call ivout (logfil, 1, kev, ndigit,
++         call ivout (logfil, 1, [kev], ndigit,
+      &               '_napps: Order of the final Hessenberg matrix ')
+          if (msglvl .gt. 2) then
+             call dmout (logfil, kev, kev, h, ldh, ndigit,
+diff --git a/SRC/dnaup2.f b/SRC/dnaup2.f
+index 4c9948d4..18ad20a0 100644
+--- a/SRC/dnaup2.f
++++ b/SRC/dnaup2.f
+@@ -388,7 +388,7 @@ subroutine dnaup2
+          iter = iter + 1
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, iter, ndigit,
++            call ivout (logfil, 1, [iter], ndigit,
+      &           '_naup2: **** Start of major iteration number ****')
+          end if
+ c
+@@ -401,9 +401,9 @@ subroutine dnaup2
+          np  = kplusp - nev
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, nev, ndigit,
++            call ivout (logfil, 1, [nev], ndigit,
+      &     '_naup2: The length of the current Arnoldi factorization')
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &           '_naup2: Extend the Arnoldi factorization by')
+          end if
+ c
+@@ -435,7 +435,7 @@ subroutine dnaup2
+          update = .false.
+ c
+          if (msglvl .gt. 1) then
+-            call dvout  (logfil, 1, rnorm, ndigit,
++            call dvout  (logfil, 1, [rnorm], ndigit,
+      &           '_naup2: Corresponding B-norm of the residual')
+          end if
+ c
+@@ -689,7 +689,7 @@ subroutine dnaup2
+          end if
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, nconv, ndigit,
++            call ivout (logfil, 1, [nconv], ndigit,
+      &           '_naup2: no. of "converged" Ritz values at this iter.')
+             if (msglvl .gt. 1) then
+                kp(1) = nev
+@@ -741,7 +741,7 @@ subroutine dnaup2
+          end if
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &                  '_naup2: The number of shifts to apply ')
+             call dvout  (logfil, np, ritzr, ndigit,
+      &                  '_naup2: Real part of the shifts')
+@@ -807,7 +807,7 @@ subroutine dnaup2
+          cnorm = .false.
+ c
+          if (msglvl .gt. 2) then
+-            call dvout  (logfil, 1, rnorm, ndigit,
++            call dvout  (logfil, 1, [rnorm], ndigit,
+      &      '_naup2: B-norm of residual for compressed factorization')
+             call dmout  (logfil, nev, nev, h, ldh, ndigit,
+      &        '_naup2: Compressed upper Hessenberg matrix H')
+diff --git a/SRC/dnaupd.f b/SRC/dnaupd.f
+index 51d3018e..dcf1f77a 100644
+--- a/SRC/dnaupd.f
++++ b/SRC/dnaupd.f
+@@ -628,9 +628,9 @@ subroutine dnaupd
+       if (info .eq. 2) info = 3
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, mxiter, ndigit,
++         call ivout (logfil, 1, [mxiter], ndigit,
+      &               '_naupd: Number of update iterations taken')
+-         call ivout (logfil, 1, np, ndigit,
++         call ivout (logfil, 1, [np], ndigit,
+      &               '_naupd: Number of wanted "converged" Ritz values')
+          call dvout  (logfil, np, workl(ritzr), ndigit,
+      &               '_naupd: Real part of the final Ritz values')
+diff --git a/SRC/dneupd.f b/SRC/dneupd.f
+index 424ad2bf..9c2ece0e 100644
+--- a/SRC/dneupd.f
++++ b/SRC/dneupd.f
+@@ -601,9 +601,9 @@ subroutine dneupd (rvec , howmny, select, dr    , di,
+ c        %-----------------------------------------------------------%
+ c
+          if (msglvl .gt. 2) then
+-             call ivout(logfil, 1, numcnv, ndigit,
++             call ivout(logfil, 1, [numcnv], ndigit,
+      &            '_neupd: Number of specified eigenvalues')
+-             call ivout(logfil, 1, nconv, ndigit,
++             call ivout(logfil, 1, [nconv], ndigit,
+      &            '_neupd: Number of "converged" eigenvalues')
+          end if
+ c
+diff --git a/SRC/dngets.f b/SRC/dngets.f
+index a3145506..47d3ac2c 100644
+--- a/SRC/dngets.f
++++ b/SRC/dngets.f
+@@ -212,8 +212,8 @@ subroutine dngets ( ishift, which, kev, np, ritzr, ritzi, bounds,
+       tngets = tngets + (t1 - t0)
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
+-         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
++         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
++         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
+          call dvout (logfil, kev+np, ritzr, ndigit,
+      &        '_ngets: Eigenvalues of current H matrix -- real part')
+          call dvout (logfil, kev+np, ritzi, ndigit,
+diff --git a/SRC/dsaitr.f b/SRC/dsaitr.f
+index 00dabfd2..3460d990 100644
+--- a/SRC/dsaitr.f
++++ b/SRC/dsaitr.f
+@@ -364,9 +364,9 @@ subroutine dsaitr
+  1000 continue
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &                  '_saitr: generating Arnoldi vector no.')
+-            call dvout (logfil, 1, rnorm, ndigit,
++            call dvout (logfil, 1, [rnorm], ndigit,
+      &                  '_saitr: B-norm of the current residual =')
+          end if
+ c
+@@ -384,7 +384,7 @@ subroutine dsaitr
+ c           %---------------------------------------------------%
+ c
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, j, ndigit,
++               call ivout (logfil, 1, [j], ndigit,
+      &                     '_saitr: ****** restart at step ******')
+             end if
+ c
+@@ -735,7 +735,7 @@ subroutine dsaitr
+          end if
+ c
+          if (msglvl .gt. 0 .and. iter .gt. 0) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &           '_saitr: Iterative refinement for Arnoldi residual')
+             if (msglvl .gt. 2) then
+                 xtemp(1) = rnorm
+diff --git a/SRC/dsapps.f b/SRC/dsapps.f
+index 12108d0f..f84ef838 100644
+--- a/SRC/dsapps.f
++++ b/SRC/dsapps.f
+@@ -261,9 +261,9 @@ subroutine dsapps
+             big   = abs(h(i,2)) + abs(h(i+1,2))
+             if (h(i+1,1) .le. epsmch*big) then
+                if (msglvl .gt. 0) then
+-                  call ivout (logfil, 1, i, ndigit,
++                  call ivout (logfil, 1, [i], ndigit,
+      &                 '_sapps: deflation at row/column no.')
+-                  call ivout (logfil, 1, jj, ndigit,
++                  call ivout (logfil, 1, [jj], ndigit,
+      &                 '_sapps: occurred before shift number.')
+                   call dvout (logfil, 1, h(i+1,1), ndigit,
+      &                 '_sapps: the corresponding off diagonal element')
+@@ -432,7 +432,7 @@ subroutine dsapps
+          big   = abs(h(i,2)) + abs(h(i+1,2))
+          if (h(i+1,1) .le. epsmch*big) then
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, i, ndigit,
++               call ivout (logfil, 1, [i], ndigit,
+      &              '_sapps: deflation at row/column no.')
+                call dvout (logfil, 1, h(i+1,1), ndigit,
+      &              '_sapps: the corresponding off diagonal element')
+diff --git a/SRC/dsaup2.f b/SRC/dsaup2.f
+index f4c5f90c..f7d4a119 100644
+--- a/SRC/dsaup2.f
++++ b/SRC/dsaup2.f
+@@ -402,13 +402,13 @@ subroutine dsaup2
+          iter = iter + 1
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, iter, ndigit,
++            call ivout (logfil, 1, [iter], ndigit,
+      &           '_saup2: **** Start of major iteration number ****')
+          end if
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, nev, ndigit,
++            call ivout (logfil, 1, [nev], ndigit,
+      &     '_saup2: The length of the current Lanczos factorization')
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &           '_saup2: Extend the Lanczos factorization by')
+          end if
+ c
+@@ -446,7 +446,7 @@ subroutine dsaup2
+          update = .false.
+ c
+          if (msglvl .gt. 1) then
+-            call dvout (logfil, 1, rnorm, ndigit,
++            call dvout (logfil, 1, [rnorm], ndigit,
+      &           '_saup2: Current B-norm of residual for factorization')
+          end if
+ c
+@@ -695,7 +695,7 @@ subroutine dsaup2
+          end if
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, nconv, ndigit,
++            call ivout (logfil, 1, [nconv], ndigit,
+      &           '_saup2: no. of "converged" Ritz values at this iter.')
+             if (msglvl .gt. 1) then
+                kp(1) = nev
+@@ -743,7 +743,7 @@ subroutine dsaup2
+          if (ishift .eq. 0) call dcopy (np, workl, 1, ritz, 1)
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &                  '_saup2: The number of shifts to apply ')
+             call dvout (logfil, np, workl, ndigit,
+      &                  '_saup2: shifts selected')
+@@ -810,7 +810,7 @@ subroutine dsaup2
+   130    continue
+ c
+          if (msglvl .gt. 2) then
+-            call dvout (logfil, 1, rnorm, ndigit,
++            call dvout (logfil, 1, [rnorm], ndigit,
+      &      '_saup2: B-norm of residual for NEV factorization')
+             call dvout (logfil, nev, h(1,2), ndigit,
+      &           '_saup2: main diagonal of compressed H matrix')
+diff --git a/SRC/dsaupd.f b/SRC/dsaupd.f
+index bd4afc26..c5b08d6b 100644
+--- a/SRC/dsaupd.f
++++ b/SRC/dsaupd.f
+@@ -628,9 +628,9 @@ subroutine dsaupd
+       if (info .eq. 2) info = 3
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, mxiter, ndigit,
++         call ivout (logfil, 1, [mxiter], ndigit,
+      &               '_saupd: number of update iterations taken')
+-         call ivout (logfil, 1, np, ndigit,
++         call ivout (logfil, 1, [np], ndigit,
+      &               '_saupd: number of "converged" Ritz values')
+          call dvout  (logfil, np, workl(Ritz), ndigit,
+      &               '_saupd: final Ritz values')
+diff --git a/SRC/dseupd.f b/SRC/dseupd.f
+index e89fdccf..ae123a20 100644
+--- a/SRC/dseupd.f
++++ b/SRC/dseupd.f
+@@ -513,9 +513,9 @@ subroutine dseupd (rvec  , howmny, select, d    ,
+ c        %-----------------------------------------------------------%
+ c
+          if (msglvl .gt. 2) then
+-             call ivout(logfil, 1, numcnv, ndigit,
++             call ivout(logfil, 1, [numcnv], ndigit,
+      &            '_seupd: Number of specified eigenvalues')
+-             call ivout(logfil, 1, nconv, ndigit,
++             call ivout(logfil, 1, [nconv], ndigit,
+      &            '_seupd: Number of "converged" eigenvalues')
+          end if
+ c
+diff --git a/SRC/dsgets.f b/SRC/dsgets.f
+index 800a02f4..436a4fe8 100644
+--- a/SRC/dsgets.f
++++ b/SRC/dsgets.f
+@@ -202,8 +202,8 @@ subroutine dsgets ( ishift, which, kev, np, ritz, bounds, shifts )
+       tsgets = tsgets + (t1 - t0)
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is')
+-         call ivout (logfil, 1, np, ndigit, '_sgets: NP is')
++         call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is')
++         call ivout (logfil, 1, [np], ndigit, '_sgets: NP is')
+          call dvout (logfil, kev+np, ritz, ndigit,
+      &        '_sgets: Eigenvalues of current H matrix')
+          call dvout (logfil, kev+np, bounds, ndigit,
+diff --git a/SRC/sgetv0.f b/SRC/sgetv0.f
+index c768daae..d861b2d6 100644
+--- a/SRC/sgetv0.f
++++ b/SRC/sgetv0.f
+@@ -366,9 +366,9 @@ subroutine sgetv0
+ c     %--------------------------------------%
+ c
+       if (msglvl .gt. 2) then
+-          call svout (logfil, 1, rnorm0, ndigit,
++          call svout (logfil, 1, [rnorm0], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm0 is')
+-          call svout (logfil, 1, rnorm, ndigit,
++          call svout (logfil, 1, [rnorm], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm is')
+       end if
+ c
+@@ -399,7 +399,7 @@ subroutine sgetv0
+    50 continue
+ c
+       if (msglvl .gt. 0) then
+-         call svout (logfil, 1, rnorm, ndigit,
++         call svout (logfil, 1, [rnorm], ndigit,
+      &        '_getv0: B-norm of initial / restarted starting vector')
+       end if
+       if (msglvl .gt. 3) then
+diff --git a/SRC/snaitr.f b/SRC/snaitr.f
+index 5ecdebb7..8a5d795b 100644
+--- a/SRC/snaitr.f
++++ b/SRC/snaitr.f
+@@ -371,9 +371,9 @@ subroutine snaitr
+  1000 continue
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &                  '_naitr: generating Arnoldi vector number')
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &                  '_naitr: B-norm of the current residual is')
+          end if
+ c
+@@ -393,7 +393,7 @@ subroutine snaitr
+ c           %---------------------------------------------------%
+ c
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, j, ndigit,
++               call ivout (logfil, 1, [j], ndigit,
+      &                     '_naitr: ****** RESTART AT STEP ******')
+             end if
+ c
+@@ -721,7 +721,7 @@ subroutine snaitr
+          end if
+ c
+          if (msglvl .gt. 0 .and. iter .gt. 0) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &           '_naitr: Iterative refinement for Arnoldi residual')
+             if (msglvl .gt. 2) then
+                 xtemp(1) = rnorm
+diff --git a/SRC/snapps.f b/SRC/snapps.f
+index 914c9b8b..9b767285 100644
+--- a/SRC/snapps.f
++++ b/SRC/snapps.f
+@@ -266,11 +266,11 @@ subroutine snapps
+          sigmai = shifti(jj)
+ c
+          if (msglvl .gt. 2 ) then
+-            call ivout (logfil, 1, jj, ndigit,
++            call ivout (logfil, 1, [jj], ndigit,
+      &               '_napps: shift number.')
+-            call svout (logfil, 1, sigmar, ndigit,
++            call svout (logfil, 1, [sigmar], ndigit,
+      &               '_napps: The real part of the shift ')
+-            call svout (logfil, 1, sigmai, ndigit,
++            call svout (logfil, 1, [sigmai], ndigit,
+      &               '_napps: The imaginary part of the shift ')
+          end if
+ c
+@@ -335,9 +335,9 @@ subroutine snapps
+      &         tst1 = slanhs( '1', kplusp-jj+1, h, ldh, workl )
+             if( abs( h( i+1,i ) ).le.max( ulp*tst1, smlnum ) ) then
+                if (msglvl .gt. 0) then
+-                  call ivout (logfil, 1, i, ndigit,
++                  call ivout (logfil, 1, [i], ndigit,
+      &                 '_napps: matrix splitting at row/column no.')
+-                  call ivout (logfil, 1, jj, ndigit,
++                  call ivout (logfil, 1, [jj], ndigit,
+      &                 '_napps: matrix splitting with shift number.')
+                   call svout (logfil, 1, h(i+1,i), ndigit,
+      &                 '_napps: off diagonal element.')
+@@ -351,9 +351,9 @@ subroutine snapps
+    40    continue
+ c
+          if (msglvl .gt. 2) then
+-             call ivout (logfil, 1, istart, ndigit,
++             call ivout (logfil, 1, [istart], ndigit,
+      &                   '_napps: Start of current block ')
+-             call ivout (logfil, 1, iend, ndigit,
++             call ivout (logfil, 1, [iend], ndigit,
+      &                   '_napps: End of current block ')
+          end if
+ c
+@@ -625,7 +625,7 @@ subroutine snapps
+      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
+          call svout (logfil, 1, h(kev+1,kev), ndigit,
+      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
+-         call ivout (logfil, 1, kev, ndigit,
++         call ivout (logfil, 1, [kev], ndigit,
+      &               '_napps: Order of the final Hessenberg matrix ')
+          if (msglvl .gt. 2) then
+             call smout (logfil, kev, kev, h, ldh, ndigit,
+diff --git a/SRC/snaup2.f b/SRC/snaup2.f
+index 53e39461..12b2cfed 100644
+--- a/SRC/snaup2.f
++++ b/SRC/snaup2.f
+@@ -388,7 +388,7 @@ subroutine snaup2
+          iter = iter + 1
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, iter, ndigit,
++            call ivout (logfil, 1, [iter], ndigit,
+      &           '_naup2: **** Start of major iteration number ****')
+          end if
+ c
+@@ -401,9 +401,9 @@ subroutine snaup2
+          np  = kplusp - nev
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, nev, ndigit,
++            call ivout (logfil, 1, [nev], ndigit,
+      &     '_naup2: The length of the current Arnoldi factorization')
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &           '_naup2: Extend the Arnoldi factorization by')
+          end if
+ c
+@@ -435,7 +435,7 @@ subroutine snaup2
+          update = .false.
+ c
+          if (msglvl .gt. 1) then
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &           '_naup2: Corresponding B-norm of the residual')
+          end if
+ c
+@@ -690,7 +690,7 @@ subroutine snaup2
+          end if
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, nconv, ndigit,
++            call ivout (logfil, 1, [nconv], ndigit,
+      &           '_naup2: no. of "converged" Ritz values at this iter.')
+             if (msglvl .gt. 1) then
+                kp(1) = nev
+@@ -742,7 +742,7 @@ subroutine snaup2
+          end if
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &                  '_naup2: The number of shifts to apply ')
+             call svout (logfil, np, ritzr, ndigit,
+      &                  '_naup2: Real part of the shifts')
+@@ -808,7 +808,7 @@ subroutine snaup2
+          cnorm = .false.
+ c
+          if (msglvl .gt. 2) then
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &      '_naup2: B-norm of residual for compressed factorization')
+             call smout (logfil, nev, nev, h, ldh, ndigit,
+      &        '_naup2: Compressed upper Hessenberg matrix H')
+diff --git a/SRC/snaupd.f b/SRC/snaupd.f
+index 19284d06..e0be1bfd 100644
+--- a/SRC/snaupd.f
++++ b/SRC/snaupd.f
+@@ -628,9 +628,9 @@ subroutine snaupd
+       if (info .eq. 2) info = 3
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, mxiter, ndigit,
++         call ivout (logfil, 1, [mxiter], ndigit,
+      &               '_naupd: Number of update iterations taken')
+-         call ivout (logfil, 1, np, ndigit,
++         call ivout (logfil, 1, [np], ndigit,
+      &               '_naupd: Number of wanted "converged" Ritz values')
+          call svout (logfil, np, workl(ritzr), ndigit,
+      &               '_naupd: Real part of the final Ritz values')
+diff --git a/SRC/sneupd.f b/SRC/sneupd.f
+index ecd8f164..4c472fef 100644
+--- a/SRC/sneupd.f
++++ b/SRC/sneupd.f
+@@ -601,9 +601,9 @@ subroutine sneupd(rvec , howmny, select, dr    , di,
+ c        %-----------------------------------------------------------%
+ c
+          if (msglvl .gt. 2) then
+-             call ivout(logfil, 1, numcnv, ndigit,
++             call ivout(logfil, 1, [numcnv], ndigit,
+      &            '_neupd: Number of specified eigenvalues')
+-             call ivout(logfil, 1, nconv, ndigit,
++             call ivout(logfil, 1, [nconv], ndigit,
+      &            '_neupd: Number of "converged" eigenvalues')
+          end if
+ c
+diff --git a/SRC/sngets.f b/SRC/sngets.f
+index 800282f8..7e48c0bb 100644
+--- a/SRC/sngets.f
++++ b/SRC/sngets.f
+@@ -212,8 +212,8 @@ subroutine sngets ( ishift, which, kev, np, ritzr, ritzi, bounds,
+       tngets = tngets + (t1 - t0)
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
+-         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
++         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
++         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
+          call svout (logfil, kev+np, ritzr, ndigit,
+      &        '_ngets: Eigenvalues of current H matrix -- real part')
+          call svout (logfil, kev+np, ritzi, ndigit,
+diff --git a/SRC/ssaitr.f b/SRC/ssaitr.f
+index 721bdb58..a5df2c2e 100644
+--- a/SRC/ssaitr.f
++++ b/SRC/ssaitr.f
+@@ -364,9 +364,9 @@ subroutine ssaitr
+  1000 continue
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &                  '_saitr: generating Arnoldi vector no.')
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &                  '_saitr: B-norm of the current residual =')
+          end if
+ c
+@@ -384,7 +384,7 @@ subroutine ssaitr
+ c           %---------------------------------------------------%
+ c
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, j, ndigit,
++               call ivout (logfil, 1, [j], ndigit,
+      &                     '_saitr: ****** restart at step ******')
+             end if
+ c
+@@ -735,7 +735,7 @@ subroutine ssaitr
+          end if
+ c
+          if (msglvl .gt. 0 .and. iter .gt. 0) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &           '_saitr: Iterative refinement for Arnoldi residual')
+             if (msglvl .gt. 2) then
+                 xtemp(1) = rnorm
+diff --git a/SRC/ssapps.f b/SRC/ssapps.f
+index c8143111..77bd9d52 100644
+--- a/SRC/ssapps.f
++++ b/SRC/ssapps.f
+@@ -261,9 +261,9 @@ subroutine ssapps
+             big   = abs(h(i,2)) + abs(h(i+1,2))
+             if (h(i+1,1) .le. epsmch*big) then
+                if (msglvl .gt. 0) then
+-                  call ivout (logfil, 1, i, ndigit,
++                  call ivout (logfil, 1, [i], ndigit,
+      &                 '_sapps: deflation at row/column no.')
+-                  call ivout (logfil, 1, jj, ndigit,
++                  call ivout (logfil, 1, [jj], ndigit,
+      &                 '_sapps: occurred before shift number.')
+                   call svout (logfil, 1, h(i+1,1), ndigit,
+      &                 '_sapps: the corresponding off diagonal element')
+@@ -432,7 +432,7 @@ subroutine ssapps
+          big   = abs(h(i,2)) + abs(h(i+1,2))
+          if (h(i+1,1) .le. epsmch*big) then
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, i, ndigit,
++               call ivout (logfil, 1, [i], ndigit,
+      &              '_sapps: deflation at row/column no.')
+                call svout (logfil, 1, h(i+1,1), ndigit,
+      &              '_sapps: the corresponding off diagonal element')
+diff --git a/SRC/ssaup2.f b/SRC/ssaup2.f
+index a73c9a58..8cc04638 100644
+--- a/SRC/ssaup2.f
++++ b/SRC/ssaup2.f
+@@ -402,13 +402,13 @@ subroutine ssaup2
+          iter = iter + 1
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, iter, ndigit,
++            call ivout (logfil, 1, [iter], ndigit,
+      &           '_saup2: **** Start of major iteration number ****')
+          end if
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, nev, ndigit,
++            call ivout (logfil, 1, [nev], ndigit,
+      &     '_saup2: The length of the current Lanczos factorization')
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &           '_saup2: Extend the Lanczos factorization by')
+          end if
+ c
+@@ -446,7 +446,7 @@ subroutine ssaup2
+          update = .false.
+ c
+          if (msglvl .gt. 1) then
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &           '_saup2: Current B-norm of residual for factorization')
+          end if
+ c
+@@ -694,7 +694,7 @@ subroutine ssaup2
+          end if
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, nconv, ndigit,
++            call ivout (logfil, 1, [nconv], ndigit,
+      &           '_saup2: no. of "converged" Ritz values at this iter.')
+             if (msglvl .gt. 1) then
+                kp(1) = nev
+@@ -742,7 +742,7 @@ subroutine ssaup2
+          if (ishift .eq. 0) call scopy (np, workl, 1, ritz, 1)
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &                  '_saup2: The number of shifts to apply ')
+             call svout (logfil, np, workl, ndigit,
+      &                  '_saup2: shifts selected')
+@@ -809,7 +809,7 @@ subroutine ssaup2
+   130    continue
+ c
+          if (msglvl .gt. 2) then
+-            call svout (logfil, 1, rnorm, ndigit,
++            call svout (logfil, 1, [rnorm], ndigit,
+      &      '_saup2: B-norm of residual for NEV factorization')
+             call svout (logfil, nev, h(1,2), ndigit,
+      &           '_saup2: main diagonal of compressed H matrix')
+diff --git a/SRC/ssaupd.f b/SRC/ssaupd.f
+index d139ac53..a8d2f2d5 100644
+--- a/SRC/ssaupd.f
++++ b/SRC/ssaupd.f
+@@ -628,9 +628,9 @@ subroutine ssaupd
+       if (info .eq. 2) info = 3
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, mxiter, ndigit,
++         call ivout (logfil, 1, [mxiter], ndigit,
+      &               '_saupd: number of update iterations taken')
+-         call ivout (logfil, 1, np, ndigit,
++         call ivout (logfil, 1, [np], ndigit,
+      &               '_saupd: number of "converged" Ritz values')
+          call svout (logfil, np, workl(Ritz), ndigit,
+      &               '_saupd: final Ritz values')
+diff --git a/SRC/sseupd.f b/SRC/sseupd.f
+index 9b94ed7c..03ba7ac5 100644
+--- a/SRC/sseupd.f
++++ b/SRC/sseupd.f
+@@ -513,9 +513,9 @@ subroutine sseupd(rvec  , howmny, select, d    ,
+ c        %-----------------------------------------------------------%
+ c
+          if (msglvl .gt. 2) then
+-             call ivout(logfil, 1, numcnv, ndigit,
++             call ivout(logfil, 1, [numcnv], ndigit,
+      &            '_seupd: Number of specified eigenvalues')
+-             call ivout(logfil, 1, nconv, ndigit,
++             call ivout(logfil, 1, [nconv], ndigit,
+      &            '_seupd: Number of "converged" eigenvalues')
+          end if
+ c
+diff --git a/SRC/ssgets.f b/SRC/ssgets.f
+index ce84d673..f40ca76a 100644
+--- a/SRC/ssgets.f
++++ b/SRC/ssgets.f
+@@ -202,8 +202,8 @@ subroutine ssgets ( ishift, which, kev, np, ritz, bounds, shifts )
+       tsgets = tsgets + (t1 - t0)
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, kev, ndigit, '_sgets: KEV is')
+-         call ivout (logfil, 1, np, ndigit, '_sgets: NP is')
++         call ivout (logfil, 1, [kev], ndigit, '_sgets: KEV is')
++         call ivout (logfil, 1, [np], ndigit, '_sgets: NP is')
+          call svout (logfil, kev+np, ritz, ndigit,
+      &        '_sgets: Eigenvalues of current H matrix')
+          call svout (logfil, kev+np, bounds, ndigit,
+diff --git a/SRC/zgetv0.f b/SRC/zgetv0.f
+index d71f3c03..ff5c2b19 100644
+--- a/SRC/zgetv0.f
++++ b/SRC/zgetv0.f
+@@ -361,9 +361,9 @@ subroutine zgetv0
+ c     %--------------------------------------%
+ c
+       if (msglvl .gt. 2) then
+-          call dvout (logfil, 1, rnorm0, ndigit,
++          call dvout (logfil, 1, [rnorm0], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm0 is')
+-          call dvout (logfil, 1, rnorm, ndigit,
++          call dvout (logfil, 1, [rnorm], ndigit,
+      &                '_getv0: re-orthonalization ; rnorm is')
+       end if
+ c
+@@ -394,7 +394,7 @@ subroutine zgetv0
+    50 continue
+ c
+       if (msglvl .gt. 0) then
+-         call dvout (logfil, 1, rnorm, ndigit,
++         call dvout (logfil, 1, [rnorm], ndigit,
+      &        '_getv0: B-norm of initial / restarted starting vector')
+       end if
+       if (msglvl .gt. 2) then
+diff --git a/SRC/znaitr.f b/SRC/znaitr.f
+index b8331c06..1c5aa57f 100644
+--- a/SRC/znaitr.f
++++ b/SRC/znaitr.f
+@@ -378,9 +378,9 @@ subroutine znaitr
+  1000 continue
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &                  '_naitr: generating Arnoldi vector number')
+-            call dvout (logfil, 1, rnorm, ndigit,
++            call dvout (logfil, 1, [rnorm], ndigit,
+      &                  '_naitr: B-norm of the current residual is')
+          end if
+ c
+@@ -400,7 +400,7 @@ subroutine znaitr
+ c           %---------------------------------------------------%
+ c
+             if (msglvl .gt. 0) then
+-               call ivout (logfil, 1, j, ndigit,
++               call ivout (logfil, 1, [j], ndigit,
+      &                     '_naitr: ****** RESTART AT STEP ******')
+             end if
+ c
+@@ -729,7 +729,7 @@ subroutine znaitr
+          end if
+ c
+          if (msglvl .gt. 0 .and. iter .gt. 0 ) then
+-            call ivout (logfil, 1, j, ndigit,
++            call ivout (logfil, 1, [j], ndigit,
+      &           '_naitr: Iterative refinement for Arnoldi residual')
+             if (msglvl .gt. 2) then
+                 rtemp(1) = rnorm
+diff --git a/SRC/znapps.f b/SRC/znapps.f
+index a1f116d3..6d8d12a8 100644
+--- a/SRC/znapps.f
++++ b/SRC/znapps.f
+@@ -268,9 +268,9 @@ subroutine znapps
+          sigma = shift(jj)
+ c
+          if (msglvl .gt. 2 ) then
+-            call ivout (logfil, 1, jj, ndigit,
++            call ivout (logfil, 1, [jj], ndigit,
+      &               '_napps: shift number.')
+-            call zvout (logfil, 1, sigma, ndigit,
++            call zvout (logfil, 1, [sigma], ndigit,
+      &               '_napps: Value of the shift ')
+          end if
+ c
+@@ -291,9 +291,9 @@ subroutine znapps
+             if ( abs(dble(h(i+1,i)))
+      &           .le. max(ulp*tst1, smlnum) )  then
+                if (msglvl .gt. 0) then
+-                  call ivout (logfil, 1, i, ndigit,
++                  call ivout (logfil, 1, [i], ndigit,
+      &                 '_napps: matrix splitting at row/column no.')
+-                  call ivout (logfil, 1, jj, ndigit,
++                  call ivout (logfil, 1, [jj], ndigit,
+      &                 '_napps: matrix splitting with shift number.')
+                   call zvout (logfil, 1, h(i+1,i), ndigit,
+      &                 '_napps: off diagonal element.')
+@@ -307,9 +307,9 @@ subroutine znapps
+    40    continue
+ c
+          if (msglvl .gt. 2) then
+-             call ivout (logfil, 1, istart, ndigit,
++             call ivout (logfil, 1, [istart], ndigit,
+      &                   '_napps: Start of current block ')
+-             call ivout (logfil, 1, iend, ndigit,
++             call ivout (logfil, 1, [iend], ndigit,
+      &                   '_napps: End of current block ')
+          end if
+ c
+@@ -485,7 +485,7 @@ subroutine znapps
+      &        '_napps: sigmak = (e_{kev+p}^T*Q)*e_{kev}')
+          call zvout (logfil, 1, h(kev+1,kev), ndigit,
+      &        '_napps: betak = e_{kev+1}^T*H*e_{kev}')
+-         call ivout (logfil, 1, kev, ndigit,
++         call ivout (logfil, 1, [kev], ndigit,
+      &               '_napps: Order of the final Hessenberg matrix ')
+          if (msglvl .gt. 2) then
+             call zmout (logfil, kev, kev, h, ldh, ndigit,
+diff --git a/SRC/znaup2.f b/SRC/znaup2.f
+index 469aafb2..b814cf15 100644
+--- a/SRC/znaup2.f
++++ b/SRC/znaup2.f
+@@ -389,7 +389,7 @@ subroutine znaup2
+          iter = iter + 1
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, iter, ndigit,
++            call ivout (logfil, 1, [iter], ndigit,
+      &           '_naup2: **** Start of major iteration number ****')
+          end if
+ c
+@@ -402,9 +402,9 @@ subroutine znaup2
+          np  = kplusp - nev
+ c
+          if (msglvl .gt. 1) then
+-            call ivout (logfil, 1, nev, ndigit,
++            call ivout (logfil, 1, [nev], ndigit,
+      &     '_naup2: The length of the current Arnoldi factorization')
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &           '_naup2: Extend the Arnoldi factorization by')
+          end if
+ c
+@@ -430,7 +430,7 @@ subroutine znaup2
+          update = .false.
+ c
+          if (msglvl .gt. 1) then
+-            call dvout  (logfil, 1, rnorm, ndigit,
++            call dvout  (logfil, 1, [rnorm], ndigit,
+      &           '_naup2: Corresponding B-norm of the residual')
+          end if
+ c
+@@ -658,7 +658,7 @@ subroutine znaup2
+          end if
+ c
+          if (msglvl .gt. 0) then
+-            call ivout (logfil, 1, nconv, ndigit,
++            call ivout (logfil, 1, [nconv], ndigit,
+      &           '_naup2: no. of "converged" Ritz values at this iter.')
+             if (msglvl .gt. 1) then
+                kp(1) = nev
+@@ -698,7 +698,7 @@ subroutine znaup2
+          end if
+ c
+          if (msglvl .gt. 2) then
+-            call ivout (logfil, 1, np, ndigit,
++            call ivout (logfil, 1, [np], ndigit,
+      &                  '_naup2: The number of shifts to apply ')
+             call zvout  (logfil, np, ritz, ndigit,
+      &                  '_naup2: values of the shifts')
+@@ -762,7 +762,7 @@ subroutine znaup2
+          cnorm = .false.
+ c
+          if (msglvl .gt. 2) then
+-            call dvout  (logfil, 1, rnorm, ndigit,
++            call dvout  (logfil, 1, [rnorm], ndigit,
+      &      '_naup2: B-norm of residual for compressed factorization')
+             call zmout  (logfil, nev, nev, h, ldh, ndigit,
+      &        '_naup2: Compressed upper Hessenberg matrix H')
+diff --git a/SRC/znaupd.f b/SRC/znaupd.f
+index 779eb2bc..c7d58aaa 100644
+--- a/SRC/znaupd.f
++++ b/SRC/znaupd.f
+@@ -601,9 +601,9 @@ subroutine znaupd
+       if (info .eq. 2) info = 3
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, mxiter, ndigit,
++         call ivout (logfil, 1, [mxiter], ndigit,
+      &               '_naupd: Number of update iterations taken')
+-         call ivout (logfil, 1, np, ndigit,
++         call ivout (logfil, 1, [np], ndigit,
+      &               '_naupd: Number of wanted "converged" Ritz values')
+          call zvout  (logfil, np, workl(ritz), ndigit,
+      &               '_naupd: The final Ritz values')
+diff --git a/SRC/zneupd.f b/SRC/zneupd.f
+index f1eb68a3..9889e30e 100644
+--- a/SRC/zneupd.f
++++ b/SRC/zneupd.f
+@@ -536,9 +536,9 @@ subroutine zneupd(rvec , howmny, select, d     ,
+ c        %-----------------------------------------------------------%
+ c
+          if (msglvl .gt. 2) then
+-             call ivout(logfil, 1, numcnv, ndigit,
++             call ivout(logfil, 1, [numcnv], ndigit,
+      &            '_neupd: Number of specified eigenvalues')
+-             call ivout(logfil, 1, nconv, ndigit,
++             call ivout(logfil, 1, [nconv], ndigit,
+      &            '_neupd: Number of "converged" eigenvalues')
+          end if
+ c
+diff --git a/SRC/zngets.f b/SRC/zngets.f
+index 27f25803..e7d24334 100644
+--- a/SRC/zngets.f
++++ b/SRC/zngets.f
+@@ -161,8 +161,8 @@ subroutine zngets ( ishift, which, kev, np, ritz, bounds)
+       tcgets = tcgets + (t1 - t0)
+ c
+       if (msglvl .gt. 0) then
+-         call ivout (logfil, 1, kev, ndigit, '_ngets: KEV is')
+-         call ivout (logfil, 1, np, ndigit, '_ngets: NP is')
++         call ivout (logfil, 1, [kev], ndigit, '_ngets: KEV is')
++         call ivout (logfil, 1, [np], ndigit, '_ngets: NP is')
+          call zvout (logfil, kev+np, ritz, ndigit,
+      &        '_ngets: Eigenvalues of current H matrix ')
+          call zvout (logfil, kev+np, bounds, ndigit,
+
diff --git a/academic/bibletime/bibletime.SlackBuild b/academic/bibletime/bibletime.SlackBuild
index c1b839302f..b07a24b7f4 100644
--- a/academic/bibletime/bibletime.SlackBuild
+++ b/academic/bibletime/bibletime.SlackBuild
@@ -77,7 +77,7 @@ sed -i "/BTTests/s/^/#/" cmake/BTApplication.cmake
 
 mkdir -p build
 cd build
-  /opt/cmake-202x/bin/cmake \
+  cmake \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/academic/cadabra2/cadabra2.SlackBuild b/academic/cadabra2/cadabra2.SlackBuild
index b2c66c9cab..036659ab43 100644
--- a/academic/cadabra2/cadabra2.SlackBuild
+++ b/academic/cadabra2/cadabra2.SlackBuild
@@ -92,7 +92,7 @@ find ./ -type f -name '*.py' -exec \
 
 mkdir -p build
 cd build
-  /opt/cmake-202x/bin/cmake \
+  cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/academic/geda-gaf/geda-gaf.info b/academic/geda-gaf/geda-gaf.info
index 3664fa7fb5..1362c53982 100644
--- a/academic/geda-gaf/geda-gaf.info
+++ b/academic/geda-gaf/geda-gaf.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.
 MD5SUM="fa8a807615decf47027e22a217dd0ded"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="guile1.8"
 MAINTAINER="Stephen Van Berg"
 EMAIL="stephen_van_berg@earlicker.com"
diff --git a/academic/gelemental/gcc.patch b/academic/gelemental/gcc.patch
new file mode 100644
index 0000000000..eeb16293d9
--- /dev/null
+++ b/academic/gelemental/gcc.patch
@@ -0,0 +1,12 @@
+diff -Naur gelemental-1.2.0.orig/src/dialogs.cc gelemental-1.2.0/src/dialogs.cc
+--- gelemental-1.2.0.orig/src/dialogs.cc	2007-09-25 06:49:33.000000000 +0200
++++ gelemental-1.2.0/src/dialogs.cc	2017-07-27 21:45:34.356776770 +0200
+@@ -247,7 +247,7 @@
+ 	const Gtk::TreePath& tpath, bool)
+ {
+ 	Gtk::TreeIter iter = store->get_iter (tpath);
+-	return iter ? iter->get_value (cols.property) : false;
++	return iter ? static_cast<bool>(iter->get_value (cols.property)) : false;
+ }
+ 
+ 
diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild
index e4b332e18a..d2ae765eb6 100644
--- a/academic/gelemental/gelemental.SlackBuild
+++ b/academic/gelemental/gelemental.SlackBuild
@@ -70,6 +70,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 for the newer gcc
+patch -p1 -i $CWD/gcc.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
diff --git a/academic/genius/README b/academic/genius/README
index d4a270574c..fa2fa4b67b 100644
--- a/academic/genius/README
+++ b/academic/genius/README
@@ -7,5 +7,5 @@ or educational tool. The syntax is very intuitive and
 is designed to mimic how mathematics is usually written.
 
 If you would like the GUI interface as well, it requires
-libgnomeui and gtksourceview.  If you have these dependencies, 
+libgnomeui, gtksourceview and vte2.  If you have these dependencies, 
 pass the variable of GNOME=YES (or anything that isn't NO ;)
diff --git a/academic/genometools/genometools.SlackBuild b/academic/genometools/genometools.SlackBuild
index 0814b7dc9e..6b3c0a762c 100644
--- a/academic/genometools/genometools.SlackBuild
+++ b/academic/genometools/genometools.SlackBuild
@@ -77,7 +77,7 @@ sed -i "s:lib/libgenometools:lib${LIBDIRSUFFIX}/libgenometools:g" Makefile
 sed -i "s:\$(prefix)/lib:\$(prefix)/lib${LIBDIRSUFFIX}:g" Makefile
 sed -i "s:/share/man/:/man/:g" Makefile
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS  -Wno-error=format-truncation=" \
 CXXFLAGS="$SLKCFLAGS" \
 make $BUILDARCH \
   prefix=/usr
diff --git a/academic/kile/README b/academic/kile/README
deleted file mode 100644
index d083e911fe..0000000000
--- a/academic/kile/README
+++ /dev/null
@@ -1,4 +0,0 @@
-To build Kile, you will need a Latex distribution like TeTeX or
-Tex-Live. Slackware 13.0 (and lower) include the former distribution
-and it is available on the installation disk(s) if you did not do a
-full install.
diff --git a/academic/kile/doinst.sh b/academic/kile/doinst.sh
deleted file mode 100644
index aea0f894eb..0000000000
--- a/academic/kile/doinst.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/academic/kile/kile.SlackBuild b/academic/kile/kile.SlackBuild
deleted file mode 100644
index 8b054abe8f..0000000000
--- a/academic/kile/kile.SlackBuild
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for Kile
-
-# Copyright 2012 Heinz Wiesinger, Amsterdam, The Netherlands
-# 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=kile
-VERSION=${VERSION:-2.1.3}
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
-
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -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.bz2
-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 {} \;
-
-mkdir build && cd build
-  cmake \
-    -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_SUFFIX="$LIBDIRSUFFIX" \
-   ..
-  make
-  make install DESTDIR=$PKG
-cd -
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING* README* \
-  $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/academic/kile/kile.info b/academic/kile/kile.info
deleted file mode 100644
index edc969bd33..0000000000
--- a/academic/kile/kile.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="kile"
-VERSION="2.1.3"
-HOMEPAGE="http://kile.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/kile/kile-2.1.3.tar.bz2"
-MD5SUM="f3129e73eea21890c40781de80b44808"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Heinz Wiesinger"
-EMAIL="pprkut@liwjatan.at"
diff --git a/academic/kile/slack-desc b/academic/kile/slack-desc
deleted file mode 100644
index a98e5da34c..0000000000
--- a/academic/kile/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------------------------------------------------------|
-kile: kile (Latex editor)
-kile:
-kile: Kile is a user friendly TeX/LaTeX editor for the KDE
-kile: desktop environment.
-kile: This package is a Beta version for use with KDE 4.
-kile:
-kile: Homepage: http://kile.sourceforge.net/
-kile: License: GNU General Public License v2
-kile:
-kile:
-kile:
diff --git a/academic/libqalculate/README b/academic/libqalculate/README
deleted file mode 100644
index aa40e23964..0000000000
--- a/academic/libqalculate/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Qalculate! is a multi-purpose desktop calculator for GNU/Linux (and Mac
-OS). It is small and simple to use but with much power and versatility
-underneath.  Features include customizable functions, units, arbitrary
-precision, plotting, and a user-friendly interface (GTK+ and CLI).
diff --git a/academic/libqalculate/libqalculate.SlackBuild b/academic/libqalculate/libqalculate.SlackBuild
deleted file mode 100644
index 9d906e36f5..0000000000
--- a/academic/libqalculate/libqalculate.SlackBuild
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-# Slackware build script for libqalculate
-
-# Copyright 2016-2020 Larry Hajali <larryhaja[at]gmail[dot]com>
-# 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=libqalculate
-VERSION=${VERSION:-3.10.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 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --mandir=/usr/man \
-  --disable-silent-rules \
-  --enable-static=no \
-  --disable-rpath \
-  --enable-defs2doc \
-  --with-libcurl \
-  --with-icu \
-  --build=$ARCH-slackware-linux
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
-cp -a AUTHORS ChangeLog COPYING NEWS README* TODO $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/academic/libqalculate/libqalculate.info b/academic/libqalculate/libqalculate.info
deleted file mode 100644
index a2ac9c6801..0000000000
--- a/academic/libqalculate/libqalculate.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="libqalculate"
-VERSION="3.10.0"
-HOMEPAGE="https://qalculate.github.io/"
-DOWNLOAD="https://github.com/Qalculate/libqalculate/releases/download/v3.10.0/libqalculate-3.10.0.tar.gz"
-MD5SUM="2f68e3dfeb36de2c88fc7078cb86ab4c"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Larry Hajali"
-EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/academic/libqalculate/slack-desc b/academic/libqalculate/slack-desc
deleted file mode 100644
index 84c06b2451..0000000000
--- a/academic/libqalculate/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------------------------------------------------------|
-libqalculate: libqalculate (desktop caculator library)
-libqalculate:
-libqalculate: Qalculate! is a multi-purpose desktop calculator for GNU/Linux (and
-libqalculate: Mac OS). It is small and simple to use but with much power and
-libqalculate: versatility underneath. Features include customizable functions,
-libqalculate: units, arbitrary precision, plotting, and a user-friendly interface
-libqalculate: (GTK+ and CLI).
-libqalculate:
-libqalculate: Homepage: http://qalculate.github.io/
-libqalculate:
-libqalculate:
diff --git a/academic/primer3/primer3.SlackBuild b/academic/primer3/primer3.SlackBuild
index d3ae1b399c..514f65fd23 100644
--- a/academic/primer3/primer3.SlackBuild
+++ b/academic/primer3/primer3.SlackBuild
@@ -75,13 +75,11 @@ patch -p1 -i $CWD/gcc-7.patch
 cd ./src
 
 # Use our CFLAGS
-sed -i "/^CFLAGS/s/=/+=/" Makefile
+sed -i -e "s|-O2|$SLKCFLAGS|" -e "s|-g -Wall|-fpermissive|" Makefile
 
 # Look for configuration files in /usr/share instead of /opt
 sed -i "s:/opt/primer3_config:/usr/share/$PRGNAM/primer3_config:g" thal_main.c primer3_boulder_main.c
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 make
 
 # This is recommended, but the tests take a really long time. Be patient
diff --git a/academic/pulseview/pulseview.SlackBuild b/academic/pulseview/pulseview.SlackBuild
index afeee1876a..65f1943ebf 100644
--- a/academic/pulseview/pulseview.SlackBuild
+++ b/academic/pulseview/pulseview.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pulseview
-VERSION=${VERSION:-0.4.1}
+VERSION=${VERSION:-20210103_d023660}
 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/$PRGNAM-$VERSION.tar.?z
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/academic/pulseview/pulseview.info b/academic/pulseview/pulseview.info
index 631c5fefbc..29f53cc1eb 100644
--- a/academic/pulseview/pulseview.info
+++ b/academic/pulseview/pulseview.info
@@ -1,8 +1,8 @@
 PRGNAM="pulseview"
-VERSION="0.4.1"
+VERSION="20210103_d023660"
 HOMEPAGE="https://sigrok.org/wiki/PulseView"
-DOWNLOAD="https://sigrok.org/download/source/pulseview/pulseview-0.4.1.tar.gz"
-MD5SUM="6056c6e42cc6eae094110cac2351558a"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/pulseview-20210103_d023660.tar.xz"
+MD5SUM="b9160d5d5777d723db68b5139a4b4ea6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qt5 libsigrok libsigrokdecode"
diff --git a/academic/root/root.SlackBuild b/academic/root/root.SlackBuild
index bb507f0536..e0ec409dca 100644
--- a/academic/root/root.SlackBuild
+++ b/academic/root/root.SlackBuild
@@ -18,7 +18,7 @@
 # Modified by the slackbuilds.org project
 
 PRGNAM=root
-VERSION=${VERSION:-5.34.36}
+VERSION=${VERSION:-6.10.02}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -79,9 +79,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
+rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM\_v$VERSION.source.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -134,9 +134,8 @@ mkdir -p $PKG$PYTHONDIR
 mv \
   $PKG$PREFIX/lib$LIBDIRSUFFIX/*.py \
   $PKG$PREFIX/lib$LIBDIRSUFFIX/*.pyc \
-  $PKG$PREFIX/lib$LIBDIRSUFFIX/python/genreflex \
+  $PKG$PREFIX/lib$LIBDIRSUFFIX/*.pyo \
   $PKG$PYTHONDIR
-rm -fr $PKG$PREFIX/lib$LIBDIRSUFFIX/python
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneded 2> /dev/null || true
diff --git a/academic/root/root.info b/academic/root/root.info
index 450e1bde00..7df5c81738 100644
--- a/academic/root/root.info
+++ b/academic/root/root.info
@@ -1,10 +1,10 @@
 PRGNAM="root"
-VERSION="5.34.36"
+VERSION="6.10.02"
 HOMEPAGE="http://root.cern.ch/drupal/"
-DOWNLOAD="https://root.cern.ch/download/root_v5.34.36.source.tar.gz"
-MD5SUM="6a1ad549b3b79b10bbb1f116b49067ee"
+DOWNLOAD="https://root.cern.ch/download/root_v6.10.02.source.tar.gz"
+MD5SUM="19f2285c845a48355db779938fb4db99"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ftgl"
+REQUIRES="ftgl unixODBC"
 MAINTAINER="Jože Zobec"
 EMAIL="jozze.zepl@gmail.com"
diff --git a/academic/scipy3/scipy3.SlackBuild b/academic/scipy3/scipy3.SlackBuild
index 22cbb37f31..bd54ad5152 100644
--- a/academic/scipy3/scipy3.SlackBuild
+++ b/academic/scipy3/scipy3.SlackBuild
@@ -30,7 +30,7 @@
 
 PRGNAM="scipy3"
 SRCNAM="scipy"
-VERSION=${VERSION:-1.1.0}
+VERSION=${VERSION:-1.5.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/academic/scipy3/scipy3.info b/academic/scipy3/scipy3.info
index afdc113a2e..12af2fd433 100644
--- a/academic/scipy3/scipy3.info
+++ b/academic/scipy3/scipy3.info
@@ -1,8 +1,8 @@
 PRGNAM="scipy3"
-VERSION="1.1.0"
+VERSION="1.5.4"
 HOMEPAGE="https://www.scipy.org/"
-DOWNLOAD="https://github.com/scipy/scipy/releases/download/v1.1.0/scipy-1.1.0.tar.gz"
-MD5SUM="aa6bcc85276b6f25e17bcfc4dede8718"
+DOWNLOAD="https://github.com/scipy/scipy/releases/download/v1.5.4/scipy-1.5.4.tar.gz"
+MD5SUM="293401ee7ac354a2f2313373b497f40e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="numpy3 lapack"
diff --git a/academic/tophat/make_pair.patch b/academic/tophat/make_pair.patch
new file mode 100644
index 0000000000..44b71d1059
--- /dev/null
+++ b/academic/tophat/make_pair.patch
@@ -0,0 +1,24 @@
+diff -uBw -aur tophat-2.1.1/src/juncs_db.cpp tophat-2.1.1-patched/src/juncs_db.cpp
+--- tophat-2.1.1/src/juncs_db.cpp	2016-02-14 19:21:17.354079000 +0100
++++ tophat-2.1.1-patched/src/juncs_db.cpp	2016-06-02 11:26:34.097425159 +0200
+@@ -338,7 +338,7 @@
+ 			uint32_t left_coord = atoi(scan_left_coord);
+ 			uint32_t right_coord = atoi(scan_right_coord);
+ 			bool antisense = *orientation == '-';
+-			junctions.insert(make_pair<Junction, JunctionStats>(Junction(ref_id, left_coord, right_coord, antisense), JunctionStats()));
++			junctions.insert(make_pair(Junction(ref_id, left_coord, right_coord, antisense), JunctionStats()));
+ 		}
+ 	}
+ 
+diff -uBw -aur tophat-2.1.1/src/tophat_reports.cpp tophat-2.1.1-patched/src/tophat_reports.cpp
+--- tophat-2.1.1/src/tophat_reports.cpp	2016-02-23 22:20:44.320710000 +0100
++++ tophat-2.1.1-patched/src/tophat_reports.cpp	2016-06-02 11:26:22.057239478 +0200
+@@ -2705,7 +2705,7 @@
+ 				junction_stat.gtf_match = true;
+ 				junction_stat.accepted = true;
+ 
+-				gtf_junctions.insert(make_pair<Junction, JunctionStats>(Junction(ref_id, left_coord, right_coord, antisense), junction_stat));
++				gtf_junctions.insert(make_pair(Junction(ref_id, left_coord, right_coord, antisense), junction_stat));
+ 			}
+ 		}
+ 		fprintf(stderr, "Loaded %d GFF junctions from %s.\n", (int)(gtf_junctions.size()), gtf_juncs.c_str());
diff --git a/academic/tophat/tophat.SlackBuild b/academic/tophat/tophat.SlackBuild
index f32fb590f5..e3e97fcc85 100644
--- a/academic/tophat/tophat.SlackBuild
+++ b/academic/tophat/tophat.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 {} \;
 
+# Thanks archlinux
+patch -p1 < $CWD/make_pair.patch
+
 ./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch b/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch
new file mode 100644
index 0000000000..6bc26e1f19
--- /dev/null
+++ b/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch
@@ -0,0 +1,24 @@
+diff -up ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri.dont_hardcode_includes ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri
+--- ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri.dont_hardcode_includes	2016-03-31 07:21:56.000000000 -0500
++++ ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri	2016-06-02 17:49:02.383069490 -0500
+@@ -3,7 +3,7 @@ UGENE_RELATIVE_DESTDIR = ''
+ 
+ TEMPLATE = lib
+ CONFIG +=thread debug_and_release staticlib warn_off
+-INCLUDEPATH += src src/samtools ../../include /usr/include
++INCLUDEPATH += src src/samtools ../../include
+ win32 : INCLUDEPATH += src/samtools/win32
+ DEFINES+="_FILE_OFFSET_BITS=64" _LARGEFILE64_SOURCE _USE_KNETFILE
+ win32 : DEFINES += _USE_MATH_DEFINES "inline=__inline" "__func__=__FUNCTION__" "R_OK=4" "atoll=_atoi64" "alloca=_alloca"
+diff -up ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri.dont_hardcode_includes ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri
+--- ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri.dont_hardcode_includes	2016-03-31 07:22:09.000000000 -0500
++++ ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri	2016-06-02 20:26:35.265356432 -0500
+@@ -20,7 +20,7 @@ use_bundled_zlib() {
+ win32 : LIBS += -lwsock32
+ 
+ 
+-INCLUDEPATH += src ../../include /usr/include
++INCLUDEPATH += src ../../include
+ INCLUDEPATH += ../../libs_3rdparty/samtools/src/samtools 
+ INCLUDEPATH += ../../libs_3rdparty/samtools/src
+ INCLUDEPATH += ../../libs_3rdparty/samtools/src/samtools/bcftools
diff --git a/academic/ugene/ugene.SlackBuild b/academic/ugene/ugene.SlackBuild
index 45a5a5885a..9ebc39636d 100644
--- a/academic/ugene/ugene.SlackBuild
+++ b/academic/ugene/ugene.SlackBuild
@@ -73,6 +73,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 {} \;
 
+# Thanks fedora
+patch -p1 < $CWD/ugene-1.22.0-dont_hardcode_includes.patch
+
 # Fix libraries and man pages paths
 sed -i "s:/lib:/lib${LIBDIRSUFFIX}:g" src/ugene_globals.pri
 sed -i "s:/share/man:/man:g" src/ugene_globals.pri
diff --git a/academic/veusz/veusz.SlackBuild b/academic/veusz/veusz.SlackBuild
index b11846a622..6be6101ac4 100644
--- a/academic/veusz/veusz.SlackBuild
+++ b/academic/veusz/veusz.SlackBuild
@@ -69,8 +69,7 @@ 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 {} \;
 
-PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
-export SIP_EXE=/usr/bin/python3-sip
+export SIP_EXE=/usr/bin/sip3
 
 python3 setup.py install --root $PKG