Update calibre to 2.47.0:

2.47

New Features
* A new tool to easily export and import all calibre data -- books,
settings and plugins
* Get Books: Add plugins for Amazon Australia and Amazon India.
Also restore the Amazon EU plugins.

Bug Fixes
* PDF Input: Fix conversion of PDF documents that contain ASCII
control codes in their outlines not working.
* Edit book: Fix image compression utilities opening a new console
per invocation on windows
* Image compression: If the compression tools return a zero byte
image ignore it and use the original image
* Fix a regression that caused book titles in the Book Details
panel to become clickable

2.46

New Features

    PDF Input: Add support for PDF outlines (bookmarks), if present, they are used as the metadata Table of Contents.
    Book polishing: Add tool to losslessly compress images in the book in order to reduce its filesize, without affecting image quality
    Edit Book: Add a new tool to compress images in the book losslessly, accessed from the Tools menu
    Kobo driver: add support for new Kobo firmware
    Bulk metadata edit dialog: Allow entering fractional numbers into the series number start with control.
    Speed up moving libraries by using hardlinks instead of file copies when moving to a location on the same filesystem
    Get Books: Disable the Amazon EU stores, at Amazon's request

Bug Fixes

    Fix moving libraries via calibre leaving behind a copy of the metadata_db_prefs_backup.json file in the original library folder
    MOBI Input: Warn about corrupted trailing data entries, instead of aborting. Getting some, even partially corrupted text is better than no text.
    Book details: Fix single value custom text column not clickable.
    Saving to disk: Fix custom date column being rendered in GMT instead of the local time zone when used in a save to disk template.

4 files changed, 19 insertions, 19 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 35774618f33..041865509b9 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.124 2015/12/05 21:25:50 adam Exp $
+# $NetBSD: Makefile,v 1.125 2015/12/30 00:08:33 wiz Exp $
 
-DISTNAME=	calibre-2.45.0
+DISTNAME=	calibre-2.47.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 bd2661ccd57..92a61141151 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2015/11/27 13:52:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.51 2015/12/30 00:08:33 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -64,9 +64,6 @@ lib/calibre/calibre/devices/android/driver.py
 lib/calibre/calibre/devices/apple/__init__.py
 lib/calibre/calibre/devices/apple/driver.py
 lib/calibre/calibre/devices/apple/itunes.py
-lib/calibre/calibre/devices/bambook/__init__.py
-lib/calibre/calibre/devices/bambook/driver.py
-lib/calibre/calibre/devices/bambook/libbambookcore.py
 lib/calibre/calibre/devices/binatone/__init__.py
 lib/calibre/calibre/devices/binatone/driver.py
 lib/calibre/calibre/devices/blackberry/__init__.py
@@ -450,6 +447,7 @@ lib/calibre/calibre/ebooks/oeb/polish/css.py
 lib/calibre/calibre/ebooks/oeb/polish/embed.py
 lib/calibre/calibre/ebooks/oeb/polish/errors.py
 lib/calibre/calibre/ebooks/oeb/polish/fonts.py
+lib/calibre/calibre/ebooks/oeb/polish/images.py
 lib/calibre/calibre/ebooks/oeb/polish/import_book.py
 lib/calibre/calibre/ebooks/oeb/polish/jacket.py
 lib/calibre/calibre/ebooks/oeb/polish/main.py
@@ -800,6 +798,7 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
 lib/calibre/calibre/gui2/dialogs/duplicates.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/exim.py
 lib/calibre/calibre/gui2/dialogs/job_view_ui.py
 lib/calibre/calibre/gui2/dialogs/jobs_ui.py
 lib/calibre/calibre/gui2/dialogs/match_books.py
@@ -958,10 +957,12 @@ lib/calibre/calibre/gui2/store/search/search.py
 lib/calibre/calibre/gui2/store/search/search_ui.py
 lib/calibre/calibre/gui2/store/search_result.py
 lib/calibre/calibre/gui2/store/stores/__init__.py
+lib/calibre/calibre/gui2/store/stores/amazon_au_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_in_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
@@ -1137,7 +1138,6 @@ lib/calibre/calibre/library/custom_columns.py
 lib/calibre/calibre/library/database.py
 lib/calibre/calibre/library/database2.py
 lib/calibre/calibre/library/field_metadata.py
-lib/calibre/calibre/library/move.py
 lib/calibre/calibre/library/prefs.py
 lib/calibre/calibre/library/restore.py
 lib/calibre/calibre/library/save_to_disk.py
@@ -1156,7 +1156,6 @@ lib/calibre/calibre/library/server/xml.py
 lib/calibre/calibre/library/sqlite.py
 lib/calibre/calibre/library/test.py
 lib/calibre/calibre/libunzip.py
-lib/calibre/calibre/libwand.py
 lib/calibre/calibre/linux.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/_regex.so
@@ -1244,6 +1243,7 @@ lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/config_base.py
 lib/calibre/calibre/utils/date.py
 lib/calibre/calibre/utils/dbus_service.py
+lib/calibre/calibre/utils/exim.py
 lib/calibre/calibre/utils/file_associations.py
 lib/calibre/calibre/utils/file_type_icons.py
 lib/calibre/calibre/utils/filenames.py
@@ -1313,7 +1313,6 @@ lib/calibre/calibre/utils/opensearch/description.py
 lib/calibre/calibre/utils/opensearch/query.py
 lib/calibre/calibre/utils/opensearch/url.py
 lib/calibre/calibre/utils/ordered_dict.py
-lib/calibre/calibre/utils/pdftk.py
 lib/calibre/calibre/utils/podofo/__init__.py
 lib/calibre/calibre/utils/pyconsole/__init__.py
 lib/calibre/calibre/utils/pyconsole/console.py
@@ -1571,6 +1570,7 @@ share/calibre/images/character-set.png
 share/calibre/images/clear_left.png
 share/calibre/images/code.png
 share/calibre/images/column.png
+share/calibre/images/compress-image.png
 share/calibre/images/config.png
 share/calibre/images/connect_share.png
 share/calibre/images/connect_share_on.png
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index a2dfd0a3d66..f226407b19e 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.55 2015/11/27 13:52:50 wiz Exp $
+$NetBSD: distinfo,v 1.56 2015/12/30 00:08:33 wiz Exp $
 
-SHA1 (calibre-2.45.0.tar.xz) = 0d8bbc49488a8aecb48afd9f6f9f298b6f46c212
-RMD160 (calibre-2.45.0.tar.xz) = b2181a6bc2b5b08e8ced5f438dee8087001dce27
-SHA512 (calibre-2.45.0.tar.xz) = afd76aeed20cf09b9623a79e4e054bc9d02992225f4299bafd5facad228257ddde352f78c481e45a13719ffaddcd5200c8865b2974a7281b36c13ed015a82800
-Size (calibre-2.45.0.tar.xz) = 38686284 bytes
+SHA1 (calibre-2.47.0.tar.xz) = 8e9a63f7fd4a0cfcbf1da8af2c1264941c5eac31
+RMD160 (calibre-2.47.0.tar.xz) = f0edf91792113cc646966eb510530524465a8c5a
+SHA512 (calibre-2.47.0.tar.xz) = 932ab2bae12ce128fa497bdd95d3c5f4f67e65bced5b73882f9b812cd9290c0a89c04c89ad3e1b421119c1ca88b5bfb7870a3060c91b5c8198e5ad709dbfdc96
+Size (calibre-2.47.0.tar.xz) = 38924632 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
-SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556
+SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
diff --git a/misc/calibre/patches/patch-setup_extensions.py b/misc/calibre/patches/patch-setup_extensions.py
index a8d20f704a3..a4f4deb3740 100644
--- a/misc/calibre/patches/patch-setup_extensions.py
+++ b/misc/calibre/patches/patch-setup_extensions.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-setup_extensions.py,v 1.5 2015/02/08 00:37:10 wiz Exp $
+$NetBSD: patch-setup_extensions.py,v 1.6 2015/12/30 00:08:33 wiz Exp $
 
 Fix build for pictureflow.
 
---- setup/extensions.py.orig	2014-08-29 03:59:29.000000000 +0000
+--- setup/extensions.py.orig	2015-12-21 03:57:33.000000000 +0000
 +++ setup/extensions.py
-@@ -602,7 +602,7 @@ class Build(Command):
+@@ -636,7 +636,7 @@ class Build(Command):
          if iswindows:
-             qmc += ['-spec', 'win32-msvc2008']
+             qmc += ['-spec', qmakespec]
          fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
 -        name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
 +        name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)