Update calibre to 2.55.0:

New Features

Allow creation of rules to convert arbitrary identifiers into clickable links in the book details panel (Prefrences->Look & Feel->Book details)
Tag mapper: A new rule type 'split' allows you to easily split tags on a character
Make the shutting down message an overlay so it is less disruptive
Allow right clicking on Virtual Library tabs to edit/delete the virtual library.
Tag mapper: Add a button to edit the list of tags in a tag mapper rule using the tag editor dialog.

Bug Fixes

Conversion: Fix the obsolete HTML align=center markup (produced by Microsoft Word) not working for tables.
Font subsetting: When font-variant: small-caps is used include the capital letters as well, in case either the font or the renderer do not support OpenType smcp.
Font subsetting: Implement support for text-transform.
Fix the target book entry in the book list not being refreshed after merging books. Only matters if you have a column based on book formats.
E-book viewer: Fix a link that has some text along with a superscript/subscript being incorrectly detected as a footnote link
Fix device detection on windows failing if the registry entries for the device contain a very long item.
Edit Book: Fix an extra colon being added when setting the 'notes' semantic
Ensure that author folder names are never windows reserved names
E-book viewer: When displaying an EPUB 3 document that uses epub:switch to provide a fallback for MathML content, prevent both the MathML and fallback from being shown together.
PDF Output: When displaying an EPUB 3 document that uses epub:switch to provide a fallback for MathML content, prevent both the MathML and fallback from being rendered together.
Fix exception in custom column preferences when the column lookup key is changed
Catalog generation: Do not crash is a book in the library has no uuid.

3 files changed, 14 insertions, 16 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 53b14b791ab..f288a567879 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.136 2016/04/15 14:42:52 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2016/04/21 11:10:14 wiz Exp $
 
-DISTNAME=	calibre-2.54.0
-PKGREVISION=	1
+DISTNAME=	calibre-2.55.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 960b4bdce14..811e9f08db2 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.56 2016/04/15 08:43:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.57 2016/04/21 11:10:14 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -426,6 +426,7 @@ lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/display/__init__.py
 lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
+lib/calibre/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py
 lib/calibre/calibre/ebooks/oeb/display/webview.py
 lib/calibre/calibre/ebooks/oeb/iterator/__init__.py
 lib/calibre/calibre/ebooks/oeb/iterator/book.py
@@ -434,6 +435,7 @@ lib/calibre/calibre/ebooks/oeb/iterator/spine.py
 lib/calibre/calibre/ebooks/oeb/normalize_css.py
 lib/calibre/calibre/ebooks/oeb/parse_utils.py
 lib/calibre/calibre/ebooks/oeb/polish/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/cascade.py
 lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
 lib/calibre/calibre/ebooks/oeb/polish/check/base.py
 lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
@@ -464,6 +466,7 @@ lib/calibre/calibre/ebooks/oeb/polish/stats.py
 lib/calibre/calibre/ebooks/oeb/polish/subset.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/__init__.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/base.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/cascade.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/container.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
@@ -1474,13 +1477,6 @@ share/calibre/compiled_coffeescript.zip
 share/calibre/content-server/autoreload.js
 share/calibre/content-server/calibre.png
 share/calibre/content-server/empty.html
-share/calibre/content-server/font-awesome/FontAwesome.otf
-share/calibre/content-server/font-awesome/fa.css
-share/calibre/content-server/font-awesome/fontawesome-webfont.eot
-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/locales.zip
@@ -1808,8 +1804,10 @@ share/calibre/rapydscript/lib/encodings.pyj
 share/calibre/rapydscript/lib/gettext.pyj
 share/calibre/rapydscript/lib/math.pyj
 share/calibre/rapydscript/lib/operator.pyj
+share/calibre/rapydscript/lib/pythonize.pyj
 share/calibre/rapydscript/lib/random.pyj
 share/calibre/rapydscript/lib/re.pyj
+share/calibre/rapydscript/lib/traceback.pyj
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/20_minutos.recipe
@@ -2555,6 +2553,7 @@ share/calibre/recipes/kellog_faculty.recipe
 share/calibre/recipes/kellog_insight.recipe
 share/calibre/recipes/kerrang.recipe
 share/calibre/recipes/kidney.recipe
+share/calibre/recipes/kitekinto.recipe
 share/calibre/recipes/kitsapun.recipe
 share/calibre/recipes/kleinezeitung.recipe
 share/calibre/recipes/klip_me.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 38e787892ce..e500f3558c0 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.62 2016/04/15 08:43:20 wiz Exp $
+$NetBSD: distinfo,v 1.63 2016/04/21 11:10:14 wiz Exp $
 
-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 (calibre-2.55.0.tar.xz) = 70108800829bd87d2f52486f634690afa61d1ea0
+RMD160 (calibre-2.55.0.tar.xz) = 914fccaa74ecc78fff998654035e6b4cc9d54fac
+SHA512 (calibre-2.55.0.tar.xz) = f067c93f7b32dbb8f94e30831df1bf755c25edaeb9dd4793ec79941738e2431e5fe51219d169056b3bb1f71b4223e933cc29fdae6572f212109b44b696bd6af4
+Size (calibre-2.55.0.tar.xz) = 39854472 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662