Update calibre to 2.40.0:

New Features

    A new tool to apply Tag mapper rules to existing books in the
    library. To use it, go to Preferences->Toolbars and add the
    tool to the toolbar.

    Kindle driver: Detect books in Amazon's new KFX format present
    on e-ink kindles.

    Note that this only detects KFX books and allows you to delete
    them. You cannot copy them to your calibre library. Doing so
    would be pointless anyway, as KFX books are specialised for
    individual devices. Instead go to your 'Manage my content' page
    an amazon.com and download them from there -- this will give
    you a regular azw3 file you can add to calibre.

Bug Fixes

    TXT Output: Do not fail when input contains HTML comments with
    double hyphens in the comment text.
    E-book polishing: Show a confirmation if the user selects both
    the add and remove jacket actions.
    Edit Book: Fix order of checkboxes in filter style information
    tool is random
    PDB Input: Ingore malformed metadata records.

    Closes tickets: 1499878
    Revert change in previous release to workaround broken xdg-open
    on linux. Apparently xdg-open is so badly broken that working
    around it is not possible.

    Closes tickets: 1500226
    ZIP Output: Fix system encoding being used instead of UTF-8
    for html files.

    Closes tickets: 1499514

Improved news sources

    The Philosopher's Magazine
    Harper's Magazine
    Ambito
    Perfil
    Telam
    Infobae.com
    La Nacion
    Clarin

3 files changed, 12 insertions, 8 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 88c1ddbc4ce..88395891deb 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.119 2015/10/10 01:58:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.120 2015/10/15 11:15:12 wiz Exp $
 
-DISTNAME=	calibre-2.39.0
-PKGREVISION=	2
+DISTNAME=	calibre-2.40.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 97a5bd86b87..f13e70950b3 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2015/09/30 19:13:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.48 2015/10/15 11:15:12 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -343,6 +343,7 @@ lib/calibre/calibre/ebooks/metadata/haodoo.py
 lib/calibre/calibre/ebooks/metadata/html.py
 lib/calibre/calibre/ebooks/metadata/imp.py
 lib/calibre/calibre/ebooks/metadata/kdl.py
+lib/calibre/calibre/ebooks/metadata/kfx.py
 lib/calibre/calibre/ebooks/metadata/library_thing.py
 lib/calibre/calibre/ebooks/metadata/lit.py
 lib/calibre/calibre/ebooks/metadata/lrx.py
@@ -659,6 +660,7 @@ lib/calibre/calibre/gui2/actions/show_template_tester.py
 lib/calibre/calibre/gui2/actions/similar_books.py
 lib/calibre/calibre/gui2/actions/sort.py
 lib/calibre/calibre/gui2/actions/store.py
+lib/calibre/calibre/gui2/actions/tag_mapper.py
 lib/calibre/calibre/gui2/actions/toc_edit.py
 lib/calibre/calibre/gui2/actions/tweak_epub.py
 lib/calibre/calibre/gui2/actions/unpack_book.py
@@ -1761,6 +1763,8 @@ 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/elementmaker.pyj
+share/calibre/rapydscript/lib/gettext.pyj
 share/calibre/rapydscript/lib/math.pyj
 share/calibre/rapydscript/lib/operator.pyj
 share/calibre/rapydscript/lib/random.pyj
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 7941342a2da..1a311239fb3 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.50 2015/09/30 19:13:14 wiz Exp $
+$NetBSD: distinfo,v 1.51 2015/10/15 11:15:12 wiz Exp $
 
-SHA1 (calibre-2.39.0.tar.xz) = 23d953ab58af38d75784c73d55e3a267e95cfc80
-RMD160 (calibre-2.39.0.tar.xz) = 5b809a66c64ec36d22321132d6d3dab85e723d9e
-Size (calibre-2.39.0.tar.xz) = 37739212 bytes
+SHA1 (calibre-2.40.0.tar.xz) = bd8667d15e3d4fe4e9d154d1d5e66844561ddb3b
+RMD160 (calibre-2.40.0.tar.xz) = b159441afc8731e45893017bef982ad0d9e2bd46
+SHA512 (calibre-2.40.0.tar.xz) = 101312a5a2a22bf741ee98924e23c5cec04c15cc8900756bcb3b7656e00486fd83167f2e33c66e87bd46d8d5992f0fe7041912077f250ee29dde07ed66046a4a
+Size (calibre-2.40.0.tar.xz) = 37776180 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556