Updated calibre to 2.58.0.

- version: 2.58.0
  date: 2016-06-02

  new features:
    - title: "Edit Book: A text search tool to conveniently search
    for text even if it crosses multiple HTML tags (Search->Search
    ignoring HTML markup)"

    - title: "OSX: Allow drag and drop of file onto viewer dock
    icon to view file"

  bug fixes:
    - title: "Workaround for incompatibility between Qt 5.5+ and
    Ubuntu that caused the context menu for the book list to flicker."
      tickets: [1534936]

    - title: "Windows: Workaround for explorer shell extensions on
    windows that write to stdout"

    - title: "Edit Book: When jumping to next occurrence of a word,
    take language into account"

    - title: "Edit Book: Fix import of words into user dictionary
    not working"

    - title: "Fix use of non-ascii characters in identifiers causing
    an error when identifier rules are used."
      tickets: [1584470]

    - title: "Fix a regression that caused the paste from clipboard
    button to paste two times in the Add books from ISBN dialog"

    - title: "Fix for incompatibility with PyQt 5.6"

  improved recipes:
    - Denver Post
    - Financial Times
    - bild.de

3 files changed, 11 insertions, 9 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index a3a5646ed72..ea7db103c77 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.141 2016/06/04 12:07:23 joerg Exp $
+# $NetBSD: Makefile,v 1.142 2016/06/06 11:53:49 wiz Exp $
 
-DISTNAME=	calibre-2.57.1
-PKGREVISION=	2
+DISTNAME=	calibre-2.58.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 f6346f63f89..5cea6d2b50e 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2016/05/21 06:37:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.60 2016/06/06 11:53:49 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -131,6 +131,8 @@ lib/calibre/calibre/devices/nook/__init__.py
 lib/calibre/calibre/devices/nook/driver.py
 lib/calibre/calibre/devices/nuut2/__init__.py
 lib/calibre/calibre/devices/nuut2/driver.py
+lib/calibre/calibre/devices/paladin/__init__.py
+lib/calibre/calibre/devices/paladin/driver.py
 lib/calibre/calibre/devices/prs505/__init__.py
 lib/calibre/calibre/devices/prs505/driver.py
 lib/calibre/calibre/devices/prs505/sony_cache.py
@@ -1092,6 +1094,7 @@ lib/calibre/calibre/gui2/tweak_book/save.py
 lib/calibre/calibre/gui2/tweak_book/search.py
 lib/calibre/calibre/gui2/tweak_book/spell.py
 lib/calibre/calibre/gui2/tweak_book/templates.py
+lib/calibre/calibre/gui2/tweak_book/text_search.py
 lib/calibre/calibre/gui2/tweak_book/toc.py
 lib/calibre/calibre/gui2/tweak_book/ui.py
 lib/calibre/calibre/gui2/tweak_book/undo.py
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 6abcff6de09..8d30f394866 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.66 2016/06/04 12:06:07 joerg Exp $
+$NetBSD: distinfo,v 1.67 2016/06/06 11:53:49 wiz Exp $
 
-SHA1 (calibre-2.57.1.tar.xz) = 25ac0fcc480c2416f70e3231192642df78f36792
-RMD160 (calibre-2.57.1.tar.xz) = e762ea9889e12ab30ecfe036d9613f7e2c7cdcff
-SHA512 (calibre-2.57.1.tar.xz) = 482dec810d0ca2220a7c2b291750aefd3133c9969a0237841283995ee5c07bda0e6fa2a266a7fd876be283dcfb71d5bb8aca6c9270e7f6772ab40cc0cb410ca0
-Size (calibre-2.57.1.tar.xz) = 40495212 bytes
+SHA1 (calibre-2.58.0.tar.xz) = c138cf551471cf19d7d29162e43d08b8c85e6669
+RMD160 (calibre-2.58.0.tar.xz) = 8387a60d8c90f7803b91e4cfba03e1b0c719299b
+SHA512 (calibre-2.58.0.tar.xz) = 14467b280d3d17d6b498ccb070591e54e4ab6291fa7a98f0cf6d8b6cf86f5f47e4717727e6d0684638ca255ecc4f853dc3c69edb58a0f7ed51da78d2e4113c29
+Size (calibre-2.58.0.tar.xz) = 40495912 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662