Update to 2.30.0:

- version: 2.30.0
  date: 2015-06-05

  new features:
    - title: "An option to auto-convert a book on adding even if
    it is already in the output format (Preferences->Adding Books)."

    - title: "E-book viewer: If there are entries in the Table of
    Contents that are long enough to be truncated, display the full
    text in a popup menu when the mouse hovers over the item."

    - title: "News download: Add support for turning off SSL
    certificate verification in individual recipes"

    - title: "Kobo driver: Support for upcoming firmware version
    3.16"

  bug fixes:
    - title: "DOCX Output: Fix aspect ratio of images being distorted
    when the input document specifies image width but not height
    or vice-versa."

    - title: "DOCX Output: Fix extra page breaks being inserted in
    some situations."

    - title: "LIT Input: Fix smarten punctuation not working for
    text (as opposed to HTML) based LIT files."

    - title: "EPUB metadata: Fix extraction of cover image from
    EPUB 3 files that do not use EPUB 2 backward compatible markup
    and that have incorrect cover page markup as well."

    - title: "Book details panel: On windows use only \\ as a path
    separator when copying file paths"

    - title: "Edit Book: Fix Saved searches panel not working well
    with very long search/replace expressions"

    - title: "OS X: Fix changing preferences causing 'Email to
    selected recipients...' appearing multiple times in the
    Connect/Share menu."


- version: 2.29.0
  date: 2015-05-29

  new features:
    - title: "Allow opening the full Tag Editor dialog directly
    from the book list by holding down the Shift key while starting
    an edit of a tag-like field. For example, click on the tags
    field for a book and press Shift-F2"

    - title: "Tag Browser: Allow undoing the deletion of items in
    the Manage categories window"

    - title: "calibredb add: Allow setting arbitrary identifiers,
    not just ISBN."

    - title: "Add a 'Retry' button to the news download failed
    error message."

  bug fixes:
    - title: "DOCX Output: Detect the common idiom of placing
    centered images as inline images inside a containing centered
    block and render the resulting image as a floating centered
    image in the DOCX file."

    - title: "DOCX Output: Fix incorrect handling of bold/italic
    in paragraphs where the majority of text is either bold or
    italic instead of normal"

    - title: "Table of Contents editor: Fix save/load of settings
    in the XPath wizard not working across restarts"

    - title: "Get Books: Update the Kobo Store plugin for website
    changes"

  improved recipes:
    - Popular Science
    - General Knowledge Today
    - Scientific American
    - Wired Magazine

3 files changed, 29 insertions, 9 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index ab77e8e4a2f..90dd263730f 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.105 2015/05/28 07:04:04 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2015/06/10 09:00:40 wiz Exp $
 
-DISTNAME=	calibre-2.28.0
+DISTNAME=	calibre-2.30.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index e36f6b57f69..64c371619b5 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2015/05/28 07:04:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.39 2015/06/10 09:00:40 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1151,6 +1151,7 @@ lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/_regex.so
 lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
+lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/freetype.so
@@ -1177,6 +1178,26 @@ lib/calibre/calibre/spell/__init__.py
 lib/calibre/calibre/spell/break_iterator.py
 lib/calibre/calibre/spell/dictionary.py
 lib/calibre/calibre/spell/import_from.py
+lib/calibre/calibre/srv/__init__.py
+lib/calibre/calibre/srv/bonjour.py
+lib/calibre/calibre/srv/errors.py
+lib/calibre/calibre/srv/handler.py
+lib/calibre/calibre/srv/http_request.py
+lib/calibre/calibre/srv/http_response.py
+lib/calibre/calibre/srv/loop.py
+lib/calibre/calibre/srv/opts.py
+lib/calibre/calibre/srv/pool.py
+lib/calibre/calibre/srv/pre_activated.py
+lib/calibre/calibre/srv/routes.py
+lib/calibre/calibre/srv/sendfile.py
+lib/calibre/calibre/srv/standalone.py
+lib/calibre/calibre/srv/tests/__init__.py
+lib/calibre/calibre/srv/tests/base.py
+lib/calibre/calibre/srv/tests/http.py
+lib/calibre/calibre/srv/tests/loop.py
+lib/calibre/calibre/srv/tests/main.py
+lib/calibre/calibre/srv/tests/routes.py
+lib/calibre/calibre/srv/utils.py
 lib/calibre/calibre/startup.py
 lib/calibre/calibre/test_build.py
 lib/calibre/calibre/translations/__init__.py
@@ -1187,6 +1208,7 @@ lib/calibre/calibre/utils/__init__.py
 lib/calibre/calibre/utils/apsw_shell.py
 lib/calibre/calibre/utils/bibtex.py
 lib/calibre/calibre/utils/browser.py
+lib/calibre/calibre/utils/certgen.py
 lib/calibre/calibre/utils/chm/__init__.py
 lib/calibre/calibre/utils/chm/chm.py
 lib/calibre/calibre/utils/chm/chmlib.py
@@ -2606,7 +2628,6 @@ share/calibre/recipes/marketing_sensoriale.recipe
 share/calibre/recipes/mateusz_czytania.recipe
 share/calibre/recipes/matichon.recipe
 share/calibre/recipes/max_planck.recipe
-share/calibre/recipes/maximum_pc.recipe
 share/calibre/recipes/mayra.recipe
 share/calibre/recipes/mdj.recipe
 share/calibre/recipes/media2.recipe
@@ -3520,4 +3541,3 @@ share/doc/calibre/Changelog.yaml
 share/doc/calibre/INSTALL
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
-@pkgdir lib/calibre/calibre/plugins/.libs
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 3e437ac2340..5461897f022 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.40 2015/05/28 07:04:04 wiz Exp $
+$NetBSD: distinfo,v 1.41 2015/06/10 09:00:40 wiz Exp $
 
-SHA1 (calibre-2.28.0.tar.xz) = 9fbe5a34a586184cb19ae6769213146ee5ef97ac
-RMD160 (calibre-2.28.0.tar.xz) = 0b8e13024f87e240b5ca93cbe2ea6170c9d9bea3
-Size (calibre-2.28.0.tar.xz) = 36965956 bytes
+SHA1 (calibre-2.30.0.tar.xz) = 0b95fe511ad77d541d6115cbb39cbce28021e699
+RMD160 (calibre-2.30.0.tar.xz) = 6a3e84fde6e5bf1b9036425c67b26ec0d440f00e
+Size (calibre-2.30.0.tar.xz) = 36851416 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556