calibre: update to 3.22.1.

- version: 3.22.1
  date: 2018-04-19

  new features:
    - title: "Edit book: Add a tool to upgrade books from EPUB 2 to EPUB 3 (Tools->Upgrade book internals)"
      description: "Automatically upgrades metadata, converts the NCX table of contents and adds required manifest annotations"
      type: major

    - title: "Add support for the FBZ format (zipped FB2)"

    - title: "Kindle driver: Change the height of generated thumbnails to 500px, needed for the Oasis 2017"

    - title: "Edit book: When bulk renaming files add an option to rename by the order in which the files appear in the book."

    - title: "Polishing: Recognize titlepages that are marked as covers in the EPUB 3 landmarks section"

    - title: "Edit Book: Automatically updated the modified timestamp in the OPF when saving EPUB 3 books."

    - title: "Remove the ISBNDB metadata plugin as ISBNDB no longer allows free lookups."

  bug fixes:
    - title: "EPUB 3 metadata: If the book defines more than one author sort value for an author use the first instead of the last"

    - title: "Check Book: Dont warn for nav document not in spine in EPUB 3 books"

    - title: "Linux installer: Fix umask question not working with the recommended install command because stdin is a pipe"

    - title: "Browser viewer: Show an error message when trying to use the Sync function without being logged in"

    - title: "When setting cover from a PDF file and the user clicks cancel, do not delete the existing cover"

3 files changed, 11 insertions, 9 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 9434aebff7d..ca592a41825 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.199 2018/04/17 09:03:27 wiz Exp $
+# $NetBSD: Makefile,v 1.200 2018/04/27 14:57:29 wiz Exp $
 
-DISTNAME=	calibre-3.21.0
+DISTNAME=	calibre-3.22.1
 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 d68b4bf7d8c..7147ea751ab 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.84 2018/03/11 17:40:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.85 2018/04/27 14:57:29 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -376,6 +376,7 @@ lib/calibre/calibre/ebooks/metadata/opf.py
 lib/calibre/calibre/ebooks/metadata/opf2.py
 lib/calibre/calibre/ebooks/metadata/opf3.py
 lib/calibre/calibre/ebooks/metadata/opf3_test.py
+lib/calibre/calibre/ebooks/metadata/opf_2_to_3.py
 lib/calibre/calibre/ebooks/metadata/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
 lib/calibre/calibre/ebooks/metadata/plucker.py
@@ -396,7 +397,6 @@ lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
 lib/calibre/calibre/ebooks/metadata/sources/google.py
 lib/calibre/calibre/ebooks/metadata/sources/google_images.py
 lib/calibre/calibre/ebooks/metadata/sources/identify.py
-lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
 lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
 lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
 lib/calibre/calibre/ebooks/metadata/sources/ozon.py
@@ -503,6 +503,7 @@ lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/structure.py
 lib/calibre/calibre/ebooks/oeb/polish/toc.py
+lib/calibre/calibre/ebooks/oeb/polish/upgrade.py
 lib/calibre/calibre/ebooks/oeb/polish/utils.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
@@ -2610,6 +2611,7 @@ share/calibre/recipes/le_journal.recipe
 share/calibre/recipes/le_monde.recipe
 share/calibre/recipes/le_monde_diplomatique_fr.recipe
 share/calibre/recipes/le_monde_sub.recipe
+share/calibre/recipes/le_monde_sub_paper.recipe
 share/calibre/recipes/le_nouvel_observateur.recipe
 share/calibre/recipes/le_temps.recipe
 share/calibre/recipes/ledevoir.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 493179bbf0a..1b5f7d9d988 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.95 2018/04/17 09:03:27 wiz Exp $
+$NetBSD: distinfo,v 1.96 2018/04/27 14:57:29 wiz Exp $
 
-SHA1 (calibre-3.21.0.tar.xz) = e84c1715ffb881a35e7ef21761cb2d316a309178
-RMD160 (calibre-3.21.0.tar.xz) = 3b3a0e96a366b7419867c1f7d1d252d77695cb9a
-SHA512 (calibre-3.21.0.tar.xz) = 68c9d5e67b67e9360c98dd360893b69cac2a2fd64a31e822cb8f18a286c2385f27fce3d5bbf7b6d1507084276cf6136295c250fac0c85f26c935dbd3b53d5505
-Size (calibre-3.21.0.tar.xz) = 38384704 bytes
+SHA1 (calibre-3.22.1.tar.xz) = c2e056dd94ef5a4f4e902f7ee6f34a8650157522
+RMD160 (calibre-3.22.1.tar.xz) = 3cfc53f12c3b758cfb418fb4879124a82ee1b5b4
+SHA512 (calibre-3.22.1.tar.xz) = 2c2a3dfabdedf992b66b6462495029bd6bee428c05fc4fd4221b0b52c2c7221d5d89c515f588616f00bae147ceda2d7e8cac83035361967042c61b4023b4ce35
+Size (calibre-3.22.1.tar.xz) = 38440292 bytes
 SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5
 SHA1 (patch-setup_build__environment.py) = 8973ede2128cea065860dcc210c45f5f688a93be
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662