From f865389b3576be57c0d24f2218c135552abde6b3 Mon Sep 17 00:00:00 2001
From: Larry Hajali
Date: Sun, 7 Apr 2013 19:12:53 -0300
Subject: office/calibre: Updated for version 0.9.24.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 office/calibre/calibre.SlackBuild | 12 +++++++++---
 office/calibre/calibre.info       | 10 +++++-----
 office/calibre/slack-desc         |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'office')

diff --git a/office/calibre/calibre.SlackBuild b/office/calibre/calibre.SlackBuild
index 7a34cb9afa..654c308d6d 100644
--- a/office/calibre/calibre.SlackBuild
+++ b/office/calibre/calibre.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=calibre
-VERSION=${VERSION:-0.9.13}
+VERSION=${VERSION:-0.9.24}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,6 +81,8 @@ sed -i "/^numeric_version/s|(.*)|(${VERSION//\./, })|" src/calibre/constants.py
 # Don't build qt_hack. Calibre dev won't fix. Patch from AlienBob.
 # https://bugs.launchpad.net/calibre/+bug/1094719
 patch -p1 < $CWD/patches/calibre_noqthack.patch
+# Remove calibre portable scripts.
+rm -f resources/calibre-portable.*
 
 OVERRIDE_CFLAGS="$SLKCFLAGS" \
 OVERRIDE_LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \
@@ -90,6 +92,9 @@ python setup.py build
 # calibre installation while the build process takes place. :/
 mkdir -p "$PWD/tmp/config"
 
+# Hack for installing zsh completion.
+mkdir -p $PKG/usr/share/zsh/site-functions
+
 CALIBRE_CONFIG_DIRECTORY="$PWD/tmp/config" \
 python setup.py install \
   --root=$PKG \
@@ -104,8 +109,9 @@ python setup.py install \
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Fix permissions on calibre's bash completion.
-chmod 0755 $PKG/etc/bash_completion.d/$PRGNAM
+# Fix permissions.
+find $PKG/usr/lib${LIBDIRSUFFIX} -iname "*\.py" -exec chmod 0644 '{}' \;
+find $PKG/usr/share/$PRGNAM -type f -exec chmod 0644 '{}' \;
 
 # Install the necessary desktop items.
 mkdir -p $PKG/usr/share/{applications,mime/packages}
diff --git a/office/calibre/calibre.info b/office/calibre/calibre.info
index 3e474164b9..523859baeb 100644
--- a/office/calibre/calibre.info
+++ b/office/calibre/calibre.info
@@ -1,10 +1,10 @@
 PRGNAM="calibre"
-VERSION="0.9.13"
-HOMEPAGE="http://calibre-ebook.com/"
-DOWNLOAD="http://downloads.sourceforge.net/calibre/calibre-0.9.13.tar.xz"
-MD5SUM="3ad062f85eca072c3990c766bc05412a"
+VERSION="0.9.24"
+HOMEPAGE="http://calibre-ebook.com"
+DOWNLOAD="http://downloads.sourceforge.net/calibre/calibre-0.9.24.tar.xz"
+MD5SUM="62e976dcf0bdc9e2c7150c298d5df73f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cssutils cssselect dnspython lxml mechanize podofo python-dateutil netifaces psutil"
+REQUIRES="cssutils dnspython lxml mechanize podofo python-dateutil netifaces psutil cssselect"
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
diff --git a/office/calibre/slack-desc b/office/calibre/slack-desc
index 38e00b1a0f..f23da149a1 100644
--- a/office/calibre/slack-desc
+++ b/office/calibre/slack-desc
@@ -15,5 +15,5 @@ calibre: solution and thus includes library management, format conversion,
 calibre: news feeds to ebook conversion, as well as e-book reader sync
 calibre: features and an integrated e-book viewer.
 calibre:
-calibre: Homepage: http://calibre.kovidgoyal.net/
+calibre: Homepage: http://calibre-ebook.com
 calibre:
-- 
cgit v1.2.3