Updated calibre to 2.85.1.

- version: 2.85.1
  date: 2017-05-12

  new features:
    - title: "Book details panel: Allow right click to search the internet for the current book"

    - title: "Book details panel: Allow right clicking on an author name to search the internet for works by that author"

    - title: "Book details panel: Clicking an author name now searches Goodreads by default instead of Wikipedia. Can be changed in Preferences->Look & feel->Book details"

    - title: "Kobo driver: Add support for the Kobo Auro H2O Edition 2"

  bug fixes:
    - title: "PDF Output: Fix a regression in the previous release that broke conversion to PDF for some files."

    - title: "DOCX Output: Fix lengths specified in percentage of page size not being converted correctly."

    - title: "DOCX Output: Fix some hyperlinks not working in word because the bookmark name is longer than forty characters."

    - title: "DOCX Output: Prevent images from being larger than the page size."

    - title: "Comic Input: Fix the number of colors control not allowing values less than 8"

    - title: "Kobo driver: Fix main memory and Card A being swapped on some systems"

    - title: "Kobo driver: Fix the ignore collections option being accidentally case-insensitive"

    - title: "Preferences->Toolbars: Show an error message when the user tries to remove either the Preferences or Location Manager buttons instead of just silently adding them back."

    - title: "version 2.85.1 contains a fix for a regression that cause the Open with action to go missing from the right click menu of the Book details panel"

  improved recipes:
    - Private Eye

  new recipes:
    - title: Balkanist
      author: Darko Miletic

- version: 2.84.0
  date: 2017-05-05

  new features:
    - title: "Kindle driver: Also delete book thumbnails from the system directory when deleting books."

    - title: "Conversion: Use the same regular expression engine as is used by the Edit Book tool. The new engine has much better support for Unicode characters/character classes."

    - title: "Edit Book: Add keyboard shortcuts to jump to opening and closing tags (Ctrl+{ and Ctrl+})"

    - title: "Add API to pre-process image data in recipes easily"

    - title: "fetch-ebook-metadata: add option to use only a single metadata plugin"

  bug fixes:
    - title: "E-book viewer: Fix a regression in the previous release that broke printing from inside the viewer."

    - title: "DOCX Output: When the input document contains paragraphs inside a block with a background color preserve the background color in the resulting paragraphs in the DOCX document."

    - title: "DOCX Output: Fix links to empty inline tags not working."

    - title: "DOCX Input: Fix links that point to anchors placed in empty paragraphs not working."

    - title: "PDF Output: Do not crash when unable to find page for link destination, instead use previous page."

    - title: "Edit Book: Fix sorting by language in Report->Words not working"

    - title: "Edit Book: Fix drag and drop of multiple items in the File Browser causing item order to be reversed."

    - title: "Get Books: Update Baen store plugin for website changes"

    - title: "Linux: When adding books from directories ignore files that have undecodable names."

    - title: "AZW3: Preserve the primary-writing-mode EXTH header field when round-tripping AZW3 files. Should fix editing/conversion of RTL AZW3 files causing page turning to become left-to-right on the Kindle"

    - title: "AZW3 Output: Set the primary-writing-mode EXTH header when the input document has page-progression-direction set to RTL as this is apparently required on newer Kindle firmware for right-to-left page turning"

    - title: "Fix a misbehaving wireless device connection can cause calibre to hang when opening the Connect/Share menu."

  improved recipes:
    - Private Eye
    - Die Zeit
    - NYTimes Tech Beat

  new recipes:
    - title: First Things
      author: John Hutson

3 files changed, 12 insertions, 24 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 1cddf6b904a..e9bf5a46179 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.180 2017/05/02 13:37:31 wiz Exp $
+# $NetBSD: Makefile,v 1.181 2017/05/16 13:37:24 wiz Exp $
 
-DISTNAME=	calibre-2.83.0
-PKGREVISION=	2
+DISTNAME=	calibre-2.85.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 df5f132d0b3..913939f3e89 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.81 2017/04/18 13:51:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.82 2017/05/16 13:37:24 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -217,6 +217,7 @@ lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py
 lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py
 lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
+lib/calibre/calibre/ebooks/conversion/search_replace.py
 lib/calibre/calibre/ebooks/conversion/utils.py
 lib/calibre/calibre/ebooks/covers.py
 lib/calibre/calibre/ebooks/css_transform_rules.py
@@ -362,6 +363,7 @@ lib/calibre/calibre/ebooks/metadata/pml.py
 lib/calibre/calibre/ebooks/metadata/rar.py
 lib/calibre/calibre/ebooks/metadata/rb.py
 lib/calibre/calibre/ebooks/metadata/rtf.py
+lib/calibre/calibre/ebooks/metadata/search_internet.py
 lib/calibre/calibre/ebooks/metadata/snb.py
 lib/calibre/calibre/ebooks/metadata/sources/__init__.py
 lib/calibre/calibre/ebooks/metadata/sources/amazon.py
@@ -686,7 +688,6 @@ lib/calibre/calibre/gui2/catalog/__init__.py
 lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
 lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
-lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
@@ -703,7 +704,6 @@ lib/calibre/calibre/gui2/convert/debug_ui.py
 lib/calibre/calibre/gui2/convert/docx_input.py
 lib/calibre/calibre/gui2/convert/docx_input_ui.py
 lib/calibre/calibre/gui2/convert/docx_output.py
-lib/calibre/calibre/gui2/convert/docx_output_ui.py
 lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
 lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -781,7 +781,6 @@ 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
-lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py
 lib/calibre/calibre/gui2/dialogs/authors_edit.py
 lib/calibre/calibre/gui2/dialogs/book_info.py
 lib/calibre/calibre/gui2/dialogs/catalog.py
@@ -790,7 +789,6 @@ lib/calibre/calibre/gui2/dialogs/check_library.py
 lib/calibre/calibre/gui2/dialogs/choose_format.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
-lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_library.py
 lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
@@ -801,7 +799,6 @@ lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
-lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_merge.py
 lib/calibre/calibre/gui2/dialogs/conversion_error.py
 lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
@@ -816,12 +813,10 @@ 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
 lib/calibre/calibre/gui2/dialogs/match_books_ui.py
 lib/calibre/calibre/gui2/dialogs/message_box.py
-lib/calibre/calibre/gui2/dialogs/message_box_ui.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
 lib/calibre/calibre/gui2/dialogs/opml.py
@@ -829,14 +824,12 @@ lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
 lib/calibre/calibre/gui2/dialogs/plugin_updater.py
 lib/calibre/calibre/gui2/dialogs/progress.py
-lib/calibre/calibre/gui2/dialogs/progress_ui.py
 lib/calibre/calibre/gui2/dialogs/quickview.py
 lib/calibre/calibre/gui2/dialogs/quickview_ui.py
 lib/calibre/calibre/gui2/dialogs/restore_library.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
-lib/calibre/calibre/gui2/dialogs/scheduler_ui.py
 lib/calibre/calibre/gui2/dialogs/search.py
 lib/calibre/calibre/gui2/dialogs/search_item_ui.py
 lib/calibre/calibre/gui2/dialogs/search_ui.py
@@ -852,9 +845,7 @@ lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/template_dialog.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
-lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 lib/calibre/calibre/gui2/dialogs/trim_image.py
-lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/dnd.py
 lib/calibre/calibre/gui2/ebook_download.py
 lib/calibre/calibre/gui2/email.py
@@ -901,7 +892,6 @@ lib/calibre/calibre/gui2/preferences/coloring.py
 lib/calibre/calibre/gui2/preferences/columns.py
 lib/calibre/calibre/gui2/preferences/columns_ui.py
 lib/calibre/calibre/gui2/preferences/conversion.py
-lib/calibre/calibre/gui2/preferences/conversion_ui.py
 lib/calibre/calibre/gui2/preferences/create_custom_column.py
 lib/calibre/calibre/gui2/preferences/device_debug.py
 lib/calibre/calibre/gui2/preferences/device_user_defined.py
@@ -937,14 +927,12 @@ lib/calibre/calibre/gui2/preferences/texture_chooser.py
 lib/calibre/calibre/gui2/preferences/toolbar.py
 lib/calibre/calibre/gui2/preferences/toolbar_ui.py
 lib/calibre/calibre/gui2/preferences/tweaks.py
-lib/calibre/calibre/gui2/preferences/tweaks_ui.py
 lib/calibre/calibre/gui2/proceed.py
 lib/calibre/calibre/gui2/progress_indicator/__init__.py
 lib/calibre/calibre/gui2/save.py
 lib/calibre/calibre/gui2/search_box.py
 lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
-lib/calibre/calibre/gui2/shortcuts_ui.py
 lib/calibre/calibre/gui2/splash_screen.py
 lib/calibre/calibre/gui2/store/__init__.py
 lib/calibre/calibre/gui2/store/basic_config.py
@@ -1994,6 +1982,7 @@ share/calibre/recipes/ba_herald.recipe
 share/calibre/recipes/babyonline.recipe
 share/calibre/recipes/badania_net.recipe
 share/calibre/recipes/balkaninsight.recipe
+share/calibre/recipes/balkanist.recipe
 share/calibre/recipes/baltimore_sun.recipe
 share/calibre/recipes/banat_news.recipe
 share/calibre/recipes/bangkok_biz.recipe
@@ -2381,6 +2370,7 @@ share/calibre/recipes/financial_times_us.recipe
 share/calibre/recipes/financialsense.recipe
 share/calibre/recipes/financiarul.recipe
 share/calibre/recipes/financieele_dagblad.recipe
+share/calibre/recipes/first_things.recipe
 share/calibre/recipes/fisco_oggi.recipe
 share/calibre/recipes/fleshbot.recipe
 share/calibre/recipes/flickr.recipe
@@ -2878,7 +2868,6 @@ share/calibre/recipes/naszdziennik.recipe
 share/calibre/recipes/natemat_pl.recipe
 share/calibre/recipes/natgeo.recipe
 share/calibre/recipes/nation_ke.recipe
-share/calibre/recipes/national_geographic_de.recipe
 share/calibre/recipes/national_geographic_es.recipe
 share/calibre/recipes/national_geographic_it.recipe
 share/calibre/recipes/national_geographic_pl.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 27dcbfe0b02..4518abf2012 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.91 2017/04/18 13:51:24 wiz Exp $
+$NetBSD: distinfo,v 1.92 2017/05/16 13:37:24 wiz Exp $
 
-SHA1 (calibre-2.83.0.tar.xz) = 642d5895435ef02a2024e93320be10a0b6109d3d
-RMD160 (calibre-2.83.0.tar.xz) = 9ecff112b985d8a39b8e375e946322cfacc48ac7
-SHA512 (calibre-2.83.0.tar.xz) = a28aa52379bc317e648087b28859a8e2c50dd4e2ccb3352e135f896ad95ab9c85c1fba162fe3acd5056be80e7c4e9481ea1396cb638661cfdb27795051124821
-Size (calibre-2.83.0.tar.xz) = 38875672 bytes
+SHA1 (calibre-2.85.1.tar.xz) = 31d880c9da01ad16a2d6f0502b41b77ff32c13a9
+RMD160 (calibre-2.85.1.tar.xz) = 345e4c28f2ded44a88f0b06e8d18774a47535509
+SHA512 (calibre-2.85.1.tar.xz) = ce29924213fa7461bbf2fc62f26bd53e4eafdf3b0dd58e241071592be4ee038cdb3ac6ac2982229dd0e52595a93aca7d921640ea55796950d1f3ac3c2742af4f
+Size (calibre-2.85.1.tar.xz) = 37783284 bytes
 SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
 SHA1 (patch-setup_build__environment.py) = 84d0084d4fe49c883ba5c4ac6e1c3ba47a88c8d5
 SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 62d02b7b901efac6ee3bb1b6628ab99b4a13a926