Sat May 14 22:37:30 UTC 2011

1 files changed, 20 insertions, 20 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 333a63acb..e6f9c227c 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,45 +1,45 @@
-# $Id: PKGBUILD 45966 2011-04-30 22:16:22Z giovanni $
+# $Id: PKGBUILD 46560 2011-05-09 06:22:55Z andrea $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
 pkgver=0.7.59
-pkgrel=1
+pkgrel=3
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
-url="http://calibre.kovidgoyal.net/"
+url="http://calibre-ebook.com/"
 license=('GPL3')
-depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'cherrypy' 
+depends=('python-dateutil' 'python2-cssutils' 'python-pypdf' 'python2-cherrypy' 
          'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' 
          'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' 
          'python-imaging' 'desktop-file-utils' 'shared-mime-info' 
-         'python-dnspython' 'unrar' 'python2-qt' 'icu')
+         'python-dnspython' 'unrar' 'python2-pyqt' 'icu')
 makedepends=('python2-pycountry')
 optdepends=('ipython: to use calibre-debug')
 install=calibre.install
-source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
 md5sums=('78ebed5248758b9be1d135ae018b8dfe'
          'bcc538a3b004429bf8f5a0ac1d89a37f')
 
 build() {
-  cd "${pkgname}"
+  cd "${srcdir}/${pkgname}"
 
   rm -rf src/{cherrypy,pyPdf}
   sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
   sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
     $(find . -regex ".*.py\|.*.recipe")
 
-  python2 setup.py build || return 1
-  python2 setup.py resources || return 1
-  python2 setup.py translations || return 1
+  python2 setup.py build
+  python2 setup.py resources
+  python2 setup.py translations
 }
 
 package() {
-  cd ${pkgname}
+  cd "${srcdir}/${pkgname}"
   
-  patch -Np1 -i $srcdir/desktop_integration.patch || return 1
+  patch -Np1 -i "${srcdir}/desktop_integration.patch"
 
   # More on desktop integration (e.g. enforce arch defaults)
   sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
@@ -51,16 +51,16 @@ package() {
   # Fix the environment module location
   sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py
 
-  mkdir -p ${pkgdir}/usr/lib/python2.7/site-packages
-  python2 setup.py install --root=${pkgdir}/ --prefix=/usr \
-    --staging-bindir=${pkgdir}/usr/bin \
-    --staging-libdir=${pkgdir}/usr/lib \
-    --staging-sharedir=${pkgdir}/usr/share
+  install -d "${pkgdir}/usr/lib/python2.7/site-packages"
+  python2 setup.py install --root="${pkgdir}" --prefix=/usr \
+    --staging-bindir="${pkgdir}/usr/bin" \
+    --staging-libdir="${pkgdir}/usr/lib" \
+    --staging-sharedir="${pkgdir}/usr/share"
 
-  find ${pkgdir} -type d -empty -delete
+  find "${pkgdir}" -type d -empty -delete
 
   # Decompress the man pages so makepkg will do it for us.
-  for decom in ${pkgdir}/usr/share/man/man1/*.bz2; do
-    bzip2 -d ${decom}
+  for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do
+    bzip2 -d "${decom}"
   done
 }