system/borgbackup: Updated for version 1.1.5.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 23 insertions, 33 deletions

diff --git a/system/borgbackup/README b/system/borgbackup/README
index 4c7978f37a..26302d1265 100644
--- a/system/borgbackup/README
+++ b/system/borgbackup/README
@@ -12,8 +12,7 @@ Borg is a fork of Attic and is maintained by "The Borg collective".
 Optional dependencies:
 - llfuse (https://slackbuilds.org/apps/llfuse/) is required,
   if you wish to mount an archive as a FUSE filesystem,
-- Sphinx (https://slackbuilds.org/apps/Sphinx/) and
-  sphinx_rtd_theme (https://slackbuilds.org/apps/sphinx_rtd_theme/)
-  are required if you wish to build the docs (man, html).
-  Please note that the build will fail if Sphinx is installed,
-  but sphinx_rtd_theme is not.
+- Sphinx (https://slackbuilds.org/apps/Sphinx/) and guzzle_sphinx_theme
+  (https://slackbuilds.org/apps/guzzle_sphinx_theme/) are required if
+  you wish to build the docs (html, man). Please note that the build
+  will fail if Sphinx is installed, but guzzle_sphinx_theme is not.
diff --git a/system/borgbackup/borgbackup.SlackBuild b/system/borgbackup/borgbackup.SlackBuild
index d5b8ff4ea9..b02473bad1 100644
--- a/system/borgbackup/borgbackup.SlackBuild
+++ b/system/borgbackup/borgbackup.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for borgbackup
 
-# Copyright 2017 Andrzej Telszewski, Banie
+# Copyright 2018 Andrzej Telszewski, Szczecin
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=borgbackup
-VERSION=${VERSION:-1.0.11}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.1.5}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -74,21 +74,25 @@ python3 setup.py install --root=$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
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS LICENSE README.rst $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
 if [ -x /usr/bin/sphinx-build ]; then
   cd docs
-  patch -p0 < $CWD/unicode_docs.patch
-  make -j1 html man
+
+  make html
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
   cp -a _build/html $PKG/usr/doc/$PRGNAM-$VERSION
+
+  make man
   mkdir -p $PKG/usr/man/man1
-  cp -a _build/man/borg.1 $PKG/usr/man/man1
-  gzip -9 $PKG/usr/man/man1/borg.1
+  cp -a _build/man/*.1 $PKG/usr/man/man1
+  gzip -9 $PKG/usr/man/man1/*.1
+
   cd ..
 fi
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CHANGES.rst LICENSE README.rst $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
 
diff --git a/system/borgbackup/borgbackup.info b/system/borgbackup/borgbackup.info
index e911795ca6..c5b2130b75 100644
--- a/system/borgbackup/borgbackup.info
+++ b/system/borgbackup/borgbackup.info
@@ -1,10 +1,10 @@
 PRGNAM="borgbackup"
-VERSION="1.0.11"
+VERSION="1.1.5"
 HOMEPAGE="https://borgbackup.readthedocs.io/"
-DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.0.11/borgbackup-1.0.11.tar.gz"
-MD5SUM="2b5967e5a671c30fe68481c2b4a73dee"
+DOWNLOAD="https://github.com/borgbackup/borg/releases/download/1.1.5/borgbackup-1.1.5.tar.gz"
+MD5SUM="38736d939d39fa0f5523b58dc3e135d5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python3 setuptools-scm msgpack-python lz4"
+REQUIRES="libb2 lz4 msgpack-python python3 setuptools-scm zstd"
 MAINTAINER="Andrzej Telszewski"
 EMAIL="atelszewski@gmail.com"
diff --git a/system/borgbackup/unicode_docs.patch b/system/borgbackup/unicode_docs.patch
deleted file mode 100644
index e70e77af17..0000000000
--- a/system/borgbackup/unicode_docs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- conf.py.orig	2016-08-17 20:36:40.160264073 +0200
-+++ conf.py	2016-08-17 20:36:12.631648017 +0200
-@@ -43,8 +43,8 @@
- master_doc = 'index'
- 
- # General information about the project.
--project = 'Borg - Deduplicating Archiver'
--copyright = '2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)'
-+project = u'Borg - Deduplicating Archiver'
-+copyright = u'2010-2014 Jonas Borgström, 2015-2016 The Borg Collective (see AUTHORS file)'
- 
- # The version info for the project you're documenting, acts as replacement for
- # |version| and |release|, also used in various other places throughout the