Update to 1.36.0:

- version: 1.36.0
  date: 2014-05-09

  new features:
    - title: "Edit Book: A new tool to filter style information
    (Tools->Filter style information). Useful to easily remove some
    CSS properties from the entire book."

    - title: "DOCX Input: Add support for cross references. Cross
    references that are used to insert hyperlinks are now converted
    into hyperlinks in the output document. Features to insert
    paragraph/page numbers are not supported."

    - title: "Add support for viewing kepub files in the calibre
    viewer, by treating them as plain epub files"

    - title: "Edit book: In the Insert Link tool show a few words
    of text alongside the location anchor name, to make it easier
    to know what a location is"

    - title: "Manage user dictionaries: Allow copying all selected
    words by right clicking them and choosing 'Copy to clipboard'."

    - title: "Content server: Make .ibook format files available
    in OPDS feeds"

    - title: "Edit book: Allow copying the list of errors from the
    Check Book tool to the clipboard by right clicking on the list
    of errors"

    - title: "Book polishing: If the books being polished have an
    ORIGINAL_EPUB/AZW3 format, warn the user that polishing will
    use it as the source and ask for confirmation."

  bug fixes:
    - title: "Fix metadata plugin to download metadata from OZON
    for website changes."

    - title: "Subsetting embedded fonts: Fix an error when subsetting
    embedded fonts on windows if the username contains quotes or
    apostrophes."

    - title: "Edit Book: Fix error when checking spelling if one
    of the files in the book declares an invalid (empty) language
    code."

    - title: "Linux install: Have the calibre GUI programs redirect
    stdout and stderr to null when launched via .desktop files to
    workaround systems where the GUI launchers are broken."

    - title: "Edit Book: Fix inserting a < in text that contains
    a colon causing a hang."

    - title: "DOCX Input: Fix error when converting document with
    nested frames."

  improved recipes:
    - Various Japanese news sources
    - National Geographic

3 files changed, 7 insertions, 15 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 1fb494f6ee5..b16e22406ea 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2014/05/09 07:37:11 wiz Exp $
+# $NetBSD: Makefile,v 1.76 2014/05/09 16:53:16 wiz Exp $
 
-DISTNAME=	calibre-1.35.0
+DISTNAME=	calibre-1.36.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 1b6d10a3a54..477b81a93a4 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2014/05/02 11:22:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2014/05/09 16:53:16 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1824,7 +1824,6 @@ share/calibre/recipes/china_press.recipe
 share/calibre/recipes/china_times.recipe
 share/calibre/recipes/chinadaily.recipe
 share/calibre/recipes/chipro.recipe
-share/calibre/recipes/chouchoublog.recipe
 share/calibre/recipes/chowk.recipe
 share/calibre/recipes/chr_mon.recipe
 share/calibre/recipes/christian_post.recipe
@@ -2128,7 +2127,6 @@ share/calibre/recipes/freakonomics.recipe
 share/calibre/recipes/freenature.recipe
 share/calibre/recipes/freeway.recipe
 share/calibre/recipes/fria.recipe
-share/calibre/recipes/fronda.recipe
 share/calibre/recipes/frontlineonnet.recipe
 share/calibre/recipes/fstream.recipe
 share/calibre/recipes/ftd.recipe
@@ -2600,12 +2598,6 @@ share/calibre/recipes/nightflier.recipe
 share/calibre/recipes/nikkei_free.recipe
 share/calibre/recipes/nikkei_news.recipe
 share/calibre/recipes/nikkei_sub.recipe
-share/calibre/recipes/nikkei_sub_economy.recipe
-share/calibre/recipes/nikkei_sub_industry.recipe
-share/calibre/recipes/nikkei_sub_life.recipe
-share/calibre/recipes/nikkei_sub_main.recipe
-share/calibre/recipes/nikkei_sub_shakai.recipe
-share/calibre/recipes/nikkei_sub_sports.recipe
 share/calibre/recipes/nin.recipe
 share/calibre/recipes/njp.recipe
 share/calibre/recipes/njuz_net.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index a779682f12e..b5c3461ead4 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2014/05/02 11:22:45 wiz Exp $
+$NetBSD: distinfo,v 1.20 2014/05/09 16:53:16 wiz Exp $
 
-SHA1 (calibre-1.35.0.tar.xz) = b9d4458c6694e150d5e8b5ae0227d0acc5578300
-RMD160 (calibre-1.35.0.tar.xz) = 2ab2de662be7c7073a17b4c389b0b2a7e53f09f7
-Size (calibre-1.35.0.tar.xz) = 34006392 bytes
+SHA1 (calibre-1.36.0.tar.xz) = d32e054d2ad23419df739327da2ae89b671deb2b
+RMD160 (calibre-1.36.0.tar.xz) = d0464b301c93e3ac3c5fbdc68337e4d790148c37
+Size (calibre-1.36.0.tar.xz) = 34023596 bytes
 SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
 RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
 Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes