1 files changed, 9 insertions, 18 deletions
diff --git a/office/calibre-bin/calibre-bin.SlackBuild b/office/calibre-bin/calibre-bin.SlackBuild
index d7ff9345b0..e746d657f1 100644
--- a/office/calibre-bin/calibre-bin.SlackBuild
+++ b/office/calibre-bin/calibre-bin.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calibre-bin
-VERSION=${VERSION:-5.7.2}
+VERSION=${VERSION:-5.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,9 +45,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $PKG
-mkdir -p opt/calibre usr/{share/zsh/site-functions,bin}
+mkdir -p opt/calibre usr/bin \
+  usr/share/{desktop-directories,applications,metainfo,mime/packages,icons/hicolor,zsh/site-functions}
 tar xvf $CWD/${PRGNAM%-bin}-$VERSION-$ARCH.txz -C opt/calibre
-opt/calibre/calibre_postinstall --root=usr
+XDG_DATA_DIRS=$PKG/usr/share XDG_CONFIG_HOME=$PKG/root/.config opt/calibre/calibre_postinstall --root=$PKG/usr
+rmdir -p root/.config
+shopt -s extglob
+rm -r usr/share/{desktop-directories,mime/!(packages)}
+shopt -u extglob
+rm -f usr/share/applications/mimeinfo.cache
 
 cd usr/bin
 for f in $(find . -maxdepth 1 -type l); do
@@ -56,21 +62,6 @@ done
 rm calibre-uninstall
 cd ../..
 
-mkdir -p usr/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256}/apps
-cp -a opt/calibre/resources/images/{lt,tweak,viewer}.png \
-  usr/share/icons/hicolor/256x256/apps
-for s in 16 32 48 64 128; do
-  convert opt/calibre/resources/images/lt.png -resize ${s}x${s} \
-    usr/share/icons/hicolor/${s}x${s}/apps/${PRGNAM%-bin}-gui.png
-  convert opt/calibre/resources/images/viewer.png -resize ${s}x${s} \
-    usr/share/icons/hicolor/${s}x${s}/apps/${PRGNAM%-bin}-viewer.png
-  convert opt/calibre/resources/images/tweak.png -resize ${s}x${s} \
-    usr/share/icons/hicolor/${s}x${s}/apps/${PRGNAM%-bin}-ebook-edit.png
-done
-
-mkdir -p usr/share/applications
-cp -a $CWD/calibre-{ebook-edit,viewer,gui}.desktop usr/share/applications/
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \