4 files changed, 38 insertions, 16 deletions
diff --git a/academic/cadabra2/README b/academic/cadabra2/README
index 8fe21c13e8..8c30a82171 100644
--- a/academic/cadabra2/README
+++ b/academic/cadabra2/README
@@ -4,7 +4,28 @@ It has extensive functionality for tensor computer algebra, tensor
 polynomial simplification including multi-term symmetries, fermions and
 anti-commuting variables, Clifford algebras and Fierz transformations,
 component computations, implicit coordinate dependence, multiple index
-types and many more. The input format is a subset of TeX. Programmable
-in Python. Both a command-line and a graphical interface are available.
+types and many more. The input format is a subset of TeX. Both a
+command-line and a graphical interface are available.
 
-Optional runtime dependencies are matplotlib, mpmath, and sympy.
+* Designed for field-theory problems, with handling of anti-commuting
+  and non-commuting objects without special notations for their
+  products, gamma matrix algebra, Fierz identities, Dirac conjugation,
+  vielbeine, flat and curved, covariant and contravariant indices,
+  implicit dependence of tensors on coordinates, partial and covariant
+  derivatives...
+
+* Powerful tensor simplification algorithms, not just for mono-term
+  symmetries but also for multi-terms symmetries like the Bianchi
+  identity, or dimensionally-dependent symmetries like the Schouten
+  identity.
+
+* Allows for both abstract and component computations.
+
+* A standalone graphical notebook interface which can also be used as a
+  front-end for SymPy.
+
+* Input and output using a subset of LaTeX notation.
+
+* Programmable using Python.
+
+python3-sympy is an optional runtime dependency.
diff --git a/academic/cadabra2/cadabra2.SlackBuild b/academic/cadabra2/cadabra2.SlackBuild
index 35083bc221..6d0c356e43 100644
--- a/academic/cadabra2/cadabra2.SlackBuild
+++ b/academic/cadabra2/cadabra2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for cadabra2
 
-# Copyright 2017-2018, Alexander Verbovetsky, Moscow, Russia
+# Copyright 2017-2019, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cadabra2
-VERSION=${VERSION:-2.2.0}
+VERSION=${VERSION:-2.2.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,12 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# workaround for https://github.com/kpeeters/cadabra2/issues/12
-# (caused by https://github.com/zaphoyd/websocketpp/issues/587)
-sed --in-place \
-  -e 's/listen(lib::asio::ip::tcp::v6(),/listen(lib::asio::ip::tcp::v4(),/' \
-  client_server/websocketpp/websocketpp/transport/asio/endpoint.hpp
-
 sed --in-place \
   -e "s/\(DESTINATION lib\)/\1${LIBDIRSUFFIX}/" \
   client_server/CMakeLists.txt
@@ -91,6 +85,10 @@ sed --in-place \
   -e '/^install(CODE\s\+"execute_process(COMMAND \(touch\|gtk-update-icon-cache.*\|chmod go+r\) ${ICON_PREFIX}\/share\/icons\/hicolor\(\|\/icon-theme\.cache\))")$/d' \
   frontend/gtkmm/CMakeLists.txt
 
+find ./ -type f -name '*.py' -exec \
+  sed -i -e 's|#!/usr/bin/python\>|#!/usr/bin/python3|' \
+  -e 's|#!/usr/bin/env python\>|#!/usr/bin/env python3|' {} \;
+
 mkdir -p build
 cd build
   cmake \
@@ -106,6 +104,9 @@ 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
 
+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
 cp -a  doc examples README.rst $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/academic/cadabra2/cadabra2.info b/academic/cadabra2/cadabra2.info
index 31eeb0a2ed..6cfce1a423 100644
--- a/academic/cadabra2/cadabra2.info
+++ b/academic/cadabra2/cadabra2.info
@@ -1,10 +1,10 @@
 PRGNAM="cadabra2"
-VERSION="2.2.0"
+VERSION="2.2.7"
 HOMEPAGE="https://cadabra.science"
-DOWNLOAD="https://downloads.sourceforge.net/slackbuildsdirectlinks/cadabra2/cadabra2-2.2.0.tar.gz"
-MD5SUM="a6d2d94584a2b917a04df01e64b7a237"
+DOWNLOAD="https://downloads.sourceforge.net/slackbuildsdirectlinks/cadabra2/cadabra2-2.2.7.tar.gz"
+MD5SUM="4fd9c1c8648b0ed20860eb2b1cb385f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3-matplotlib"
 MAINTAINER="Alexander Verbovetsky"
 EMAIL="alik@ejik.org"
diff --git a/academic/cadabra2/slack-desc b/academic/cadabra2/slack-desc
index ae9caa674d..913802570b 100644
--- a/academic/cadabra2/slack-desc
+++ b/academic/cadabra2/slack-desc
@@ -10,7 +10,7 @@ cadabra2: cadabra2 (a field-theory motivated approach to computer algebra)
 cadabra2:
 cadabra2: Cadabra is a symbolic computer algebra system designed specifically
 cadabra2: for the solution of problems encountered in field theory. The input
-cadabra2: format is a subset of TeX. Programmable in Python. Both a
+cadabra2: format is a subset of TeX. Programmable using Python. Both a
 cadabra2: command-line and a graphical interface are available.
 cadabra2:
 cadabra2: Homepage: https://cadabra.science