Update calibre to 2.54.0.

2.54.0

New Features
Edit metadata in bulk dialog: Allow configuring the types of generated covers.
E-book viewer: Make the detection of note boundaries for popup footnotes a little more robust
E-book viewer: Add options to control the amount the mouse wheel and arrow keys scroll by in flow mode
When running the content server do not hide the main calibre window during shutdown until the content server has stopped. Show a shutting down message in the window so that the user knows what is happening.
Edit Book: Check Book: Add a check for empty links
DOCX Input: When the document has a Table of Contents created using the Word Table of Contents tool, keep a reference to it in the metadata. This is useful when converting to old style MOBI and you want to precisely control placement of the ToC.
Bug Fixes
Fix auto-mounting of some types of devices not working on FreeBSD
calibredb add: Fix the --cover option not working if the book being added has its own cover.
E-book viewer: Fix mathematics being typeset at too small a font size on windows
PDF Output: Fix occasional blank pages erroneously inserted in the text (at the end of an internal html file).
Book details panel: Fix url:file:// identifiers not becoming links
Fix fetch news dialog not rendering properly on HiDPI screens
Fix a hard to trigger crash introduced in the previous release when using the conversion dialog

2.53.0

New Features

    Edit Book: A new tool to transform book styling using easy to create rules.
    Conversion: Allow creating rules to transform styles during conversion, as above. Available in the conversion dialog at 'Look & Feel->Transform style'
    Edit metadata dialog: Make the hide toolbars right click menu action persistent. Also fix very large number of custom fields causing the basic metadata tab to not be aligned properly
    Portable Installer: Do not ask to launch calibre when running an automated install. Automated installs will now never launch calibre.

Bug Fixes

    E-book viewer: Hide list numbers for popup footnotes when the footnotes are use
        as the number are likely to be incorrect.
    DOCX Input: Ignore the hidden bookmark Word 2010 inserts to enable the go to last edit feature.
    Fix keyboard focus lost after merging book records
    E-book viewer: Handle
    Edit Book: Fix spelling correction suggestions not being shown when using the context menu key with the cursor at the end of the word

3 files changed, 19 insertions, 10 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index f467ef49645..a18eb777dda 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.134 2016/04/11 19:01:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.135 2016/04/15 08:43:20 wiz Exp $
 
-DISTNAME=	calibre-2.52.0
-PKGREVISION=	2
+DISTNAME=	calibre-2.54.0
 CATEGORIES=	misc
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 18292ddea5c..960b4bdce14 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.55 2016/03/03 12:28:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.56 2016/04/15 08:43:20 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -216,6 +216,7 @@ 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/covers.py
+lib/calibre/calibre/ebooks/css_transform_rules.py
 lib/calibre/calibre/ebooks/djvu/__init__.py
 lib/calibre/calibre/ebooks/djvu/djvu.py
 lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
@@ -748,6 +749,7 @@ lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
 lib/calibre/calibre/gui2/covers.py
+lib/calibre/calibre/gui2/css_transform_rules.py
 lib/calibre/calibre/gui2/custom_column_widgets.py
 lib/calibre/calibre/gui2/dbus_export/__init__.py
 lib/calibre/calibre/gui2/dbus_export/demo.py
@@ -1198,12 +1200,14 @@ lib/calibre/calibre/srv/ajax.py
 lib/calibre/calibre/srv/auth.py
 lib/calibre/calibre/srv/auto_reload.py
 lib/calibre/calibre/srv/bonjour.py
+lib/calibre/calibre/srv/books.py
 lib/calibre/calibre/srv/code.py
 lib/calibre/calibre/srv/content.py
 lib/calibre/calibre/srv/errors.py
 lib/calibre/calibre/srv/handler.py
 lib/calibre/calibre/srv/http_request.py
 lib/calibre/calibre/srv/http_response.py
+lib/calibre/calibre/srv/jobs.py
 lib/calibre/calibre/srv/legacy.py
 lib/calibre/calibre/srv/loop.py
 lib/calibre/calibre/srv/metadata.py
@@ -1211,6 +1215,7 @@ lib/calibre/calibre/srv/opds.py
 lib/calibre/calibre/srv/opts.py
 lib/calibre/calibre/srv/pool.py
 lib/calibre/calibre/srv/pre_activated.py
+lib/calibre/calibre/srv/render_book.py
 lib/calibre/calibre/srv/routes.py
 lib/calibre/calibre/srv/sendfile.py
 lib/calibre/calibre/srv/standalone.py
@@ -1476,8 +1481,9 @@ share/calibre/content-server/font-awesome/fontawesome-webfont.svg
 share/calibre/content-server/font-awesome/fontawesome-webfont.ttf
 share/calibre/content-server/font-awesome/fontawesome-webfont.woff
 share/calibre/content-server/font-awesome/fontawesome-webfont.woff2
+share/calibre/content-server/index-generated.html
 share/calibre/content-server/index.html
-share/calibre/content-server/main.js
+share/calibre/content-server/locales.zip
 share/calibre/content-server/mobile.css
 share/calibre/content-server/reset.css
 share/calibre/content_server/av.jpg
@@ -1796,7 +1802,9 @@ share/calibre/quick_start/eng.epub
 share/calibre/quick_start/fra.epub
 share/calibre/quick_start/ita.epub
 share/calibre/rapydscript/compiler.js.xz
+share/calibre/rapydscript/lib/aes.pyj
 share/calibre/rapydscript/lib/elementmaker.pyj
+share/calibre/rapydscript/lib/encodings.pyj
 share/calibre/rapydscript/lib/gettext.pyj
 share/calibre/rapydscript/lib/math.pyj
 share/calibre/rapydscript/lib/operator.pyj
@@ -2674,6 +2682,7 @@ share/calibre/recipes/mac_world_uk.recipe
 share/calibre/recipes/macity.recipe
 share/calibre/recipes/macleans.recipe
 share/calibre/recipes/maekyung.recipe
+share/calibre/recipes/magyar_nemzet.recipe
 share/calibre/recipes/maharashtra_times.recipe
 share/calibre/recipes/mail_and_guardian.recipe
 share/calibre/recipes/mainichi.recipe
@@ -2739,6 +2748,7 @@ share/calibre/recipes/motherjones.recipe
 share/calibre/recipes/msdnmag_en.recipe
 share/calibre/recipes/msnbc.recipe
 share/calibre/recipes/msnsankei.recipe
+share/calibre/recipes/mult_kor.recipe
 share/calibre/recipes/mumbai_mirror.recipe
 share/calibre/recipes/munchner_merkur_nord.recipe
 share/calibre/recipes/munchner_merkur_stadt.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 4c6c8a1a106..38e787892ce 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.61 2016/03/03 12:28:22 wiz Exp $
+$NetBSD: distinfo,v 1.62 2016/04/15 08:43:20 wiz Exp $
 
-SHA1 (calibre-2.52.0.tar.xz) = 12fa3b848cda22e357c8eb4bb441b9e1fb67636e
-RMD160 (calibre-2.52.0.tar.xz) = 3a6222d04f9991d49af36e29b21ab248a8023650
-SHA512 (calibre-2.52.0.tar.xz) = cc53f7d5b9554e16828c1ec76bceb0f832e9e1c218ded719fa632b5e22ede038fd71c085c6c95e82d11736c07f35a8f31b97b1e772922ffed4f38ec94e93a8d1
-Size (calibre-2.52.0.tar.xz) = 39904084 bytes
+SHA1 (calibre-2.54.0.tar.xz) = 72cf8ab2d3c326acbb8f2d3cef268be976d3a0c4
+RMD160 (calibre-2.54.0.tar.xz) = 7ce780aaa1434e94107d6022255173ce047eee10
+SHA512 (calibre-2.54.0.tar.xz) = 63e6ceaebcac865124bbb2c5e260c530f60007169e3992cbf1fa7ace536de581df6d281fc389cdd11ecb24e0394832c0d52584a2ba465a194ffcc37b0a94304c
+Size (calibre-2.54.0.tar.xz) = 40211808 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662