Updated calibre to 2.60.0.

New Features

    Edit metadata: In the drop down list for languages, show the five most recently used languages first.
    Edit Book: Check Book: Add a check for missing navigation documents in EPUB 3 books
    Kobo driver: Improved configuration dialog for the Kobo Touch device driver
    Copy to Library: Do not abort the copy process if only some books fail to copy, instead report which books failed and copy the rest.
    News download: Make all relative links (those starting with /) absolute. Useful when reading on a device that supports web browsing.
    EPUB metadata: Add an option to disable adding of cover images to EPUB files that declare no cover image in their metadata (Preferences->Plugins->Customize the Set EPUB metadata plugin)

Bug Fixes

    ToC Editor: Fix ToC detection in EPUB 3 files with only an NCX and no nav not working
    E-book viewer: In paged mode, when the window is toggled between full screen and window, repeatedly, preserve the position more accurately.
    E-book viewer: Fix incorrect page turning when multiple pages are displayed on screen for books that wrap all their content in a single 100% height tag.
    Fix a regression that broke scheduling a new news download in timezones west of GMT
    Edit Book: Fix undocked windows not resizable on OS X
    Fix a regression in 2.57 that broke rescaling of images to fit the output profile screen size during conversion.
    Fix for file dialogs not working on windows when non-ascii environment variables are present
    HTML Input: Fix error when converting HTML file with URL encoded filename.

3 files changed, 14 insertions, 8 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 0f5e0ed4514..b7900b95e36 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.143 2016/06/19 20:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2016/06/30 17:41:17 wiz Exp $
 
-DISTNAME=	calibre-2.59.0
+DISTNAME=	calibre-2.60.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 e82bcaea4fd..c7b897f3627 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.61 2016/06/19 20:29:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.62 2016/06/30 17:41:17 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -108,6 +108,7 @@ lib/calibre/calibre/devices/kobo/__init__.py
 lib/calibre/calibre/devices/kobo/bookmark.py
 lib/calibre/calibre/devices/kobo/books.py
 lib/calibre/calibre/devices/kobo/driver.py
+lib/calibre/calibre/devices/kobo/kobotouch_config.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
 lib/calibre/calibre/devices/misc.py
@@ -353,6 +354,8 @@ lib/calibre/calibre/ebooks/metadata/mobi.py
 lib/calibre/calibre/ebooks/metadata/odt.py
 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/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
 lib/calibre/calibre/ebooks/metadata/plucker.py
@@ -474,6 +477,7 @@ 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
+lib/calibre/calibre/ebooks/oeb/polish/tests/structure.py
 lib/calibre/calibre/ebooks/oeb/polish/toc.py
 lib/calibre/calibre/ebooks/oeb/polish/utils.py
 lib/calibre/calibre/ebooks/oeb/reader.py
@@ -772,6 +776,7 @@ lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
 lib/calibre/calibre/gui2/device_drivers/mtp_config.py
 lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
+lib/calibre/calibre/gui2/device_drivers/tabbed_device_config.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
 lib/calibre/calibre/gui2/dialogs/add_empty_book.py
 lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
@@ -1347,6 +1352,7 @@ lib/calibre/calibre/utils/rapydscript.py
 lib/calibre/calibre/utils/recycle_bin.py
 lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
+lib/calibre/calibre/utils/run_tests.py
 lib/calibre/calibre/utils/search_query_parser.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 0560dec74cf..2baeb756f87 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2016/06/19 20:29:44 wiz Exp $
+$NetBSD: distinfo,v 1.69 2016/06/30 17:41:17 wiz Exp $
 
-SHA1 (calibre-2.59.0.tar.xz) = 5fa0bdaa6b631c35f5d890f45cbd1060a24c513e
-RMD160 (calibre-2.59.0.tar.xz) = 49fd7000cf3e4af38a8d8d2f10400ac21c317a0a
-SHA512 (calibre-2.59.0.tar.xz) = fe7a3c710054dd218a583fc21c0e0c2508773e8fa3de96cef2c73eb64dd03dc7bd2eefe94f5a98555f538e5e9656cfb7db0c2351b982864700c1a2f247a41151
-Size (calibre-2.59.0.tar.xz) = 40487560 bytes
+SHA1 (calibre-2.60.0.tar.xz) = f06bdf1093750927cd25b83cca22947211892f20
+RMD160 (calibre-2.60.0.tar.xz) = 688a888b9f597c21cdf9dd91132dbe41c8532b67
+SHA512 (calibre-2.60.0.tar.xz) = c394cc632ac2985243dba8db53a7c2adc13cfaf66371ea73f4db1f88aaf79fa536d2cb0882a31ee28fe2b0b41d4117afa2efa4cd07dc00207872223378ed5525
+Size (calibre-2.60.0.tar.xz) = 40604012 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662