Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 25 insertions, 14 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index ac3046760..1ef8b1d76 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,24 +1,27 @@
 # $Id$
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor: Larry Hajali <larryhaja@gmail.com>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.14
+pkgver=0.9.27
 pkgrel=1
-pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
-arch=('i686' 'x86_64') 
+pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
+arch=('i686' 'x86_64' 'mips64el') 
 url="http://calibre-ebook.com/"
 license=('GPL3')
-depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 
          'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' 
          'python2-imaging' 'shared-mime-info' 'python2-dnspython' 
          'unar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' 
          'python2-netifaces' 'python2-cssselect')
-makedepends=('python2-pycountry' 'qt-private-headers')
+makedepends=('python2-pycountry' 'qt4-private-headers')
 optdepends=('ipython2: to use calibre-debug')
 replaces=$_pkgname
 conflicts=$_pkgname
@@ -27,8 +30,8 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('0a809b1c1378f95a69337b9bc8207493'
-         '42c07b43d575b5e7e7524bd7b9528f0e'
+md5sums=('1d5bbe102e3ec6ec71399aad5d074137'
+         '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
 build() {
@@ -36,6 +39,7 @@ build() {
 
   #rm -rf src/{cherrypy,pyPdf}
   rm -rf src/cherrypy
+  rm -rf resources/${pkgname}-portable.*
   sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
 
   # Fix for calibre-0.8.58
@@ -72,6 +76,7 @@ package() {
   sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
 
   install -d "${pkgdir}/usr/lib/python2.7/site-packages"
+  install -d "${pkgdir}/usr/share/zsh/site-functions"
   LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \
     --staging-bindir="${pkgdir}/usr/bin" \
     --staging-libdir="${pkgdir}/usr/lib" \
@@ -82,4 +87,10 @@ package() {
   # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
   rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
   install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
+
+  # Compiling bytecode FS33392
+  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+
+  # Compiling optimized bytecode FS33392
+  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
 }
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
index 4c756f5d4..2c6f07672 100644
--- a/libre/calibre-libre/desktop_integration.patch
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -1,6 +1,6 @@
---- a/src/calibre/linux.py	2012-09-21 06:56:20.000000000 +0200
-+++ b/src/calibre/linux.py	2012-09-22 18:51:12.000000000 +0200
-@@ -179,19 +179,6 @@
+--- a/src/calibre/linux.py	2013-03-01 05:49:28.000000000 +0100
++++ b/src/calibre/linux.py	2013-03-03 14:53:05.000000000 +0100
+@@ -447,19 +447,6 @@
              self.setup_completion()
          if islinux or isbsd:
              self.setup_desktop_integration()
@@ -20,7 +20,7 @@
          if warn is None and self.warnings:
              self.info('There were %d warnings'%len(self.warnings))
              for args, kwargs in self.warnings:
-@@ -237,7 +224,7 @@
+@@ -508,7 +495,7 @@
                  if isnetbsd:
                      f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
                  else:
@@ -28,8 +28,8 @@
 +                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
              if not os.path.exists(os.path.dirname(f)):
                  os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -357,63 +344,39 @@
+             if zsh.dest:
+@@ -651,63 +638,39 @@
  
              with TemporaryDirectory() as tdir, CurrentDir(tdir), \
                                  PreserveMIMEDefaults():