Update calibre to 0.8.26

PR:	ports/162384
Approved by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)
Feature safe:	yes

7 files changed, 18 insertions, 220 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 73ae50694866..8fac1a179445 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.8.21
-PORTREVISION=	1
+PORTVERSION=	0.8.26
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 58b0f7737b5a..296053d67679 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.8.21.tar.gz) = a688cfce1cc168e74fe28c0320b6e7534d238460211055ba5e2f544d31d2719c
-SIZE (calibre-0.8.21.tar.gz) = 37419648
+SHA256 (calibre-0.8.26.tar.gz) = 59e713e126ddb5739bfe33acf52581ccad944a9f05c3e1d3d0b3958b4762f91a
+SIZE (calibre-0.8.26.tar.gz) = 37784724
diff --git a/deskutils/calibre/files/patch-device.py b/deskutils/calibre/files/patch-device.py
index c98191a7537e..e69de29bb2d1 100644
--- a/deskutils/calibre/files/patch-device.py
+++ b/deskutils/calibre/files/patch-device.py
@@ -1,187 +0,0 @@
---- src/calibre/devices/usbms/device.py.orig	2011-07-08 12:29:30.000000000 -0500
-+++ src/calibre/devices/usbms/device.py	2011-07-12 20:02:45.000000000 -0500
-@@ -704,14 +704,12 @@
- # ------------------------------------------------------
- #
- #  open for FreeBSD
--#   find the device node or nodes that match the S/N we already have from the scanner
--#   and attempt to mount each one
--#       1.  get list of disk devices from sysctl
--#       2.  compare that list with the one from camcontrol
--#       3.  and see if it has a matching s/n
--#       6.  find any partitions/slices associated with each node
--#       7.  attempt to mount, using calibre-mount-helper, each one
--#       8.  when finished, we have a list of mount points and associated device nodes
-+#      find the device node or nodes that match the S/N we already have from the scanner
-+#      and attempt to mount each one
-+#              1.  get list of da devices in /dev
-+#              2.  find the ones with matching s/n
-+#              3.  attempt to mount each one using calibre-mount-helper
-+#              4.  when finished, we have a list of mount points and associated device nodes
- #
-     def open_freebsd(self):
- 
-@@ -722,81 +720,68 @@
-         if not d.serial:
-             raise DeviceError("Device has no S/N.  Can't continue")
-             return False
--
-+        
-         devs={}
-         di=0
--        ndevs=4     # number of possible devices per reader (main, carda, cardb, launcher)
--
--        #get list of disk devices
--        p=subprocess.Popen(["sysctl", "kern.disks"], stdout=subprocess.PIPE)
--        kdsks=subprocess.Popen(["sed", "s/kern.disks: //"], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]
--        p.stdout.close()
--        #print kdsks
--        for dvc in kdsks.split():
--            # for each one that's also in the list of cam devices ...
--            p=subprocess.Popen(["camcontrol", "devlist"], stdout=subprocess.PIPE)
--            devmatch=subprocess.Popen(["grep", dvc], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]
--            p.stdout.close()
--            if devmatch:
--                #print "Checking ", devmatch
--                # ... see if we can get a S/N from the actual device node
--                sn=subprocess.Popen(["camcontrol", "inquiry", dvc, "-S"], stdout=subprocess.PIPE).communicate()[0]
--                sn=sn[0:-1]             # drop the trailing newline
--                #print "S/N = ", sn
--                if sn and d.match_serial(sn):
--                    # we have a matching s/n, record this device node
--                    #print "match found: ", dvc
--                    devs[di]=dvc
--                    di += 1
--
--        # sort the list of devices
--        for i in range(1,ndevs+1):
--            for j in reversed(range(1,i)):
--                if devs[j-1] > devs[j]:
--                    x=devs[j-1]
--                    devs[j-1]=devs[j]
--                    devs[j]=x
--        #print devs
-+        
-+        # delay for user to set device if necessary
-+        time.sleep(5)
- 
-+        # get list of disk devices and
-+        # see if we can get a S/N from the actual device node
-+        #dsks=['/dev/da1', '/dev/da3s1']
-+        dsks=glob.glob('/dev/da*')
-+        dsks.sort()
-+        for ndvc in dsks:
-+            dvc = ndvc.replace('/dev/', '')
-+            print "FBSD:	Checking ", dvc
-+            #sn="08004610011F550C"
-+            try:
-+                sn=subprocess.Popen("/sbin/camcontrol inquiry "+dvc+" -S", shell=True, stdout=subprocess.PIPE).communicate()[0]
-+            except:
-+                print "FBSD:	inquiry failed:"
-+            sn=sn[0:-1]             # drop the trailing newline
-+            print "FBSD:	S/N = ", sn
-+            if sn and d.match_serial(sn):
-+                # we have a matching s/n, record this device node
-+                print "FBSD:	match found: ", dvc
-+                devs[di]=dvc
-+                di += 1
-+        
-+        print "FBSD:	", devs
-+        
-         # now we need to see if any of these have slices/partitions
-         mtd=0
--        label="READER"      # could use something more unique, like S/N or productID...
-+        label="READER"          # could use something more unique, like S/N or productID...
-         cmd = '/usr/local/bin/calibre-mount-helper'
--        cmd = [cmd, 'mount']
--        for i in range(0,ndevs):
--            cmd2="ls /dev/"+devs[i]+"*"
--            p=subprocess.Popen(cmd2, shell=True, stdout=subprocess.PIPE)
--            devs[i]=subprocess.Popen(["cut", "-d", "/", "-f" "3"], stdin=p.stdout, stdout=subprocess.PIPE).communicate()[0]
--            p.stdout.close()
--
-+        for i in range(0,di):
-             # try all the nodes to see what we can mount
-             for dev in devs[i].split():
--                mp='/media/'+label+'-'+dev
--                #print "trying ", dev, "on", mp
-+                mp='/mnt/'+label+'-'+dev+'/'
-+                print "FBSD:	trying ", dev, "on", mp
-                 try:
--                    p = subprocess.Popen(cmd + ["/dev/"+dev, mp])
--                except OSError:
--                    raise DeviceError(_('Could not find mount helper: %s.')%cmd[0])
-+                    p = subprocess.Popen([cmd, "mount", "/dev/"+dev, mp])
-+                except:
-+                    print "FBSD:	mount failed:"
-                 while p.poll() is None:
-                     time.sleep(0.1)
--
-+    
-                 if p.returncode == 0:
--                    #print "  mounted", dev
--                    if i == 0:
-+                    print "FBSD:	  mounted", dev, "on", mp
-+                    if mtd == 0:
-                         self._main_prefix = mp
-                         self._main_dev = "/dev/"+dev
--                        #print "main = ", self._main_dev, self._main_prefix
--                    if i == 1:
-+                        print "FBSD:	main = ", self._main_dev, self._main_prefix
-+                    if mtd == 1:
-                         self._card_a_prefix = mp
-                         self._card_a_dev = "/dev/"+dev
--                        #print "card a = ", self._card_a_dev, self._card_a_prefix
--                    if i == 2:
-+                        print "FBSD:	card a = ", self._card_a_dev, self._card_a_prefix
-+                    if mtd == 2:
-                         self._card_b_prefix = mp
-                         self._card_b_dev = "/dev/"+dev
--                        #print "card b = ", self._card_b_dev, self._card_b_prefix
--
-+                        print "FBSD:	card b = ", self._card_b_dev, self._card_b_prefix
-+                        break
-                     mtd += 1
--                    break
- 
-         if mtd > 0:
-             return True
-@@ -805,16 +790,16 @@
- #
- # ------------------------------------------------------
- #
--#   this one is pretty simple:
--#       just umount each of the previously
--#       mounted filesystems, using the mount helper
-+#    this one is pretty simple:
-+#        just umount each of the previously
-+#        mounted filesystems, using the mount helper
- #
-     def eject_freebsd(self):
-         cmd = '/usr/local/bin/calibre-mount-helper'
-         cmd = [cmd, 'eject']
- 
-         if self._main_prefix:
--            #print "umount main:", cmd, self._main_dev, self._main_prefix
-+            print "FBSD:	umount main:", cmd, self._main_dev, self._main_prefix
-             try:
-                 p = subprocess.Popen(cmd + [self._main_dev, self._main_prefix])
-             except OSError:
-@@ -824,7 +809,7 @@
-                 time.sleep(0.1)
- 
-         if self._card_a_prefix:
--            #print "umount card a:", cmd, self._card_a_dev, self._card_a_prefix
-+            print "FBSD:	umount card a:", cmd, self._card_a_dev, self._card_a_prefix
-             try:
-                 p = subprocess.Popen(cmd + [self._card_a_dev,  self._card_a_prefix])
-             except OSError:
-@@ -834,7 +819,7 @@
-                 time.sleep(0.1)
- 
-         if self._card_b_prefix:
--            #print "umount card b:", cmd, self._card_b_dev, self._card_b_prefix
-+            print "FBSD:	umount card b:", cmd, self._card_b_dev, self._card_b_prefix
-             try:
-                 p = subprocess.Popen(cmd + [self._card_b_dev, self._card_b_prefix])
-             except OSError:
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp
index 9f13078ba714..e69de29bb2d1 100644
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp
+++ b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.cpp
@@ -1,14 +0,0 @@
---- src/calibre/ebooks/pdf/reflow.cpp.orig	2011-10-26 01:52:43.000000000 +0000
-+++ src/calibre/ebooks/pdf/reflow.cpp	2011-10-26 12:02:17.000000000 +0000
-@@ -625,11 +625,7 @@ static string get_link_dest(LinkAction *
-   return oss.str();
- }
- 
--#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
--void XMLOutputDev::process_link(Link* link){
--#else
- void XMLOutputDev::process_link(AnnotLink* link){
--#endif
- 
-   double _x1, _y1, _x2, _y2;
-   int x1, y1, x2, y2;
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h
index 47ab911dcd79..e69de29bb2d1 100644
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h
+++ b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_reflow.h
@@ -1,14 +0,0 @@
---- src/calibre/ebooks/pdf/reflow.h.orig	2011-10-26 12:04:54.000000000 +0000
-+++ src/calibre/ebooks/pdf/reflow.h	2011-10-26 12:09:04.000000000 +0000
-@@ -244,11 +244,7 @@ class XMLOutputDev : public OutputDev {
-     XMLImages *images;
-     PDFDoc *doc;
- 
--#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
--    void process_link(Link* link);
--#else
-     void process_link(AnnotLink* link);
--#endif
- 
- };
- }
diff --git a/deskutils/calibre/pkg-descr b/deskutils/calibre/pkg-descr
index 5dbef18c5f49..373377b75432 100644
--- a/deskutils/calibre/pkg-descr
+++ b/deskutils/calibre/pkg-descr
@@ -3,4 +3,4 @@ library management, format conversion, news feeds to ebook conversion,
 as well as e-book reader sync features and an integrated e-book viewer.
 
 Author:	Kovid Goyal <kovid@kovidgoyal.net>
-WWW:	http://calibre.kovidgoyal.net/
+WWW:	http://calibre-ebook.com
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 58ec91489dec..58d06e39d6dd 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -77,6 +77,7 @@ lib/calibre/calibre/devices/kindle/driver.py
 lib/calibre/calibre/devices/kobo/__init__.py
 lib/calibre/calibre/devices/kobo/books.py
 lib/calibre/calibre/devices/kobo/driver.py
+lib/calibre/calibre/devices/kobo/bookmark.py
 lib/calibre/calibre/devices/libusb.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
@@ -96,6 +97,8 @@ lib/calibre/calibre/devices/prs500/prstypes.py
 lib/calibre/calibre/devices/prs505/__init__.py
 lib/calibre/calibre/devices/prs505/driver.py
 lib/calibre/calibre/devices/prs505/sony_cache.py
+lib/calibre/calibre/devices/prst1/__init__.py
+lib/calibre/calibre/devices/prst1/driver.py
 lib/calibre/calibre/devices/scanner.py
 lib/calibre/calibre/devices/sne/__init__.py
 lib/calibre/calibre/devices/sne/driver.py
@@ -179,6 +182,10 @@ lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
 lib/calibre/calibre/ebooks/conversion/utils.py
 lib/calibre/calibre/ebooks/cssselect.py
+lib/calibre/calibre/ebooks/djvu/__init__.py
+lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
+lib/calibre/calibre/ebooks/djvu/djvu.py
+lib/calibre/calibre/ebooks/djvu/input.py
 lib/calibre/calibre/ebooks/epub/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/container.py
@@ -546,6 +553,8 @@ lib/calibre/calibre/gui2/convert/comic_input.py
 lib/calibre/calibre/gui2/convert/comic_input_ui.py
 lib/calibre/calibre/gui2/convert/debug.py
 lib/calibre/calibre/gui2/convert/debug_ui.py
+lib/calibre/calibre/gui2/convert/djvu_input_ui.py
+lib/calibre/calibre/gui2/convert/djvu_input.py
 lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
 lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -766,7 +775,9 @@ lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/opensearch_store.py
 lib/calibre/calibre/gui2/store/web_store_dialog.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
+lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
 lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
 lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
 lib/calibre/calibre/gui2/store/stores/gandalf_plugin.py
 lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
@@ -1218,6 +1229,7 @@ share/calibre/images/cover_flow.png
 share/calibre/images/debug.png
 share/calibre/images/default_cover.png
 share/calibre/images/devices/bambook.png
+share/calibre/images/devices/boox.jpg
 share/calibre/images/devices/folder.png
 share/calibre/images/devices/ipad.png
 share/calibre/images/devices/italica.png
@@ -1548,6 +1560,7 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/ebooks/fb2
 @dirrm lib/calibre/calibre/ebooks/epub/fix
 @dirrm lib/calibre/calibre/ebooks/epub
+@dirrm lib/calibre/calibre/ebooks/djvu
 @dirrm lib/calibre/calibre/ebooks/conversion
 @dirrm lib/calibre/calibre/ebooks/compression
 @dirrm lib/calibre/calibre/ebooks/comic
@@ -1565,6 +1578,7 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/devices/prs505
 @dirrm lib/calibre/calibre/devices/prs500/cli
 @dirrm lib/calibre/calibre/devices/prs500
+@dirrm lib/calibre/calibre/devices/prst1
 @dirrm lib/calibre/calibre/devices/nuut2
 @dirrm lib/calibre/calibre/devices/nook
 @dirrm lib/calibre/calibre/devices/nokia