From 8660e94571b5eebdea4888aff9e4732050e9a2e9 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Thu, 9 Aug 2018 01:50:31 -0500
Subject: calibre-3.28.0-2.parabola1: updating version

---
 libre/calibre/PKGBUILD | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'libre/calibre/PKGBUILD')

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 6f7e7c6d5..2c624f00d 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -15,8 +15,8 @@
 #  - removed decrompession engine for rar archives
 
 pkgname=calibre
-pkgver=3.20.0
-pkgrel=1
+pkgver=3.28.0
+pkgrel=2
 pkgrel+=.parabola1
 pkgdesc="Ebook management application"
 pkgdesc+=", without nonfree decompression engine for RAR archives"
@@ -32,28 +32,29 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-dukpy'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
          'qt5-svg' 'python2-regex' 'python2-pygments' 'mtdev'
          'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
-makedepends=('qt5-x11extras' 'xdg-utils')
+makedepends=('qt5-x11extras' 'sip' 'xdg-utils')
 optdepends=('ipython2: to use calibre-debug'
             'poppler: required for converting pdf to html'
 )
-# for updated libre.patch commit id see: https://gitlab.com/libreforks/calibre/tags
-_commit='d4f41a48fd0110c1df9219ccbbda335b'
 source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
-        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
-source+=("https://gitlab.com/libreforks/calibre/uploads/$_commit/libre.patch")
-sha256sums=('be3e82f455f154db154c46d57f8f4d93d4e1c79afc9b6b1eb316c3d48880d5e6'
+        "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig"
+        'libre.patch')
+sha256sums=('241050cb89e5a70d3195cfd91ccf406919ac0bfb437e34b538c954c306d87b2c'
             'SKIP'
-            '72a44e11013582eed029463e51906a677648d40ac34bd9afceb289eaa81e080b')
-validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
+            'eebb25512888b663c30ff3bd642d8b6af0edffbed5b019d12a47bbcf18a8dced')
+validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid@kovidgoyal.net>
 
-prepare(){
+prepare() {
   cd "${pkgname}-${pkgver}"
 
   # Remove unneeded files
-  rm -rf resources/${pkgname}-portable.*
+  rm -rf resources/calibre-portable.*
 
   # fix freedom issues
-  rm -rf resources/images/mimetypes/{cbr,rar}.png
+  rm -v imgsrc/mimetypes/rar.svg
+  rm -v src/calibre/ebooks/metadata/rar.py
+  rm -v src/calibre/utils/unrar.py
+  rm -v resources/images/mimetypes/{cbr,rar}.png
   patch -fNp1 -i "$srcdir/libre.patch"
 
   # Desktop integration (e.g. enforce arch defaults)
-- 
cgit v1.2.3