Update to 1.32.0:

New Features

    Fetch news: Allow automatically creating custom news sources
    by importing OPML files. Many RSS news reader programs can
    export their list of RSS feeds in the OPML format.
    Conversion: When inserting metadata as a jacket page, alter
    the font sizes in the jacket so that the sizes match the sizes
    used in the rest of the book. Also pretty print the generated
    jacket HTML.
    Allow searching for books by id and uuid using the id: and
    uuid: prefixes
    Allow specifying arbitrary colors for column coloring rules

Bug Fixes

    Update the version of openssl shipped in the binary builds (the
    version in the windows 64bit build was vulnerable to the
    Heartbleed bug)
    Edit Book: Fix book being marked as modified even when no actual
    changes were done by various automated tools such as Smarten
    Punctuation, Subset Fonts, etc.
    Fix ebook-device cp -f failing when destination file already
    exists

    Closes tickets: 1303181
    Ensure that the rendered dates in the book list and edit metadata
    dialogs are always in the same language as the calibre interface,
    regardless of system language setting
    Edit metadata dialog: Remember window size for the cover download
    window
    DOCX Input: Dont fail on DOCX files that contain pages with
    zero effective width.

    Closes tickets: 1303022
    Content server: Fix page not found error when clicking on a
    category that has only a single item in it
    Send books to the Books folder for the Tolino Vision, as it
    cannot find books placed outside this folder
    Edit book: Fix error when beautifying HTML files that contain
    un-indented <script> or <style> tags

Improved news sources

    Ekantipur
    NRC Handelsblad
    Frontline

4 files changed, 22 insertions, 7 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 010c0bb7ac3..68d427cab0a 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2014/04/16 17:22:30 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2014/04/17 13:01:13 wiz Exp $
 
-DISTNAME=	calibre-1.31.0
+DISTNAME=	calibre-1.32.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index b7f52272087..ad09314ffb5 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/04/16 17:22:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/04/17 13:01:13 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -777,6 +777,7 @@ 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
 lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
 lib/calibre/calibre/gui2/dialogs/plugin_updater.py
@@ -1506,6 +1507,7 @@ share/calibre/images/mimetypes/lrf.png
 share/calibre/images/mimetypes/lrx.png
 share/calibre/images/mimetypes/mobi.png
 share/calibre/images/mimetypes/odt.png
+share/calibre/images/mimetypes/opml.png
 share/calibre/images/mimetypes/pdf.png
 share/calibre/images/mimetypes/png.png
 share/calibre/images/mimetypes/rar.png
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 4698370703b..229ff024cd4 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.15 2014/04/16 17:22:30 wiz Exp $
+$NetBSD: distinfo,v 1.16 2014/04/17 13:01:13 wiz Exp $
 
-SHA1 (calibre-1.31.0.tar.xz) = 36854aded8fb67a7d8a529ce84ed7a56341c4591
-RMD160 (calibre-1.31.0.tar.xz) = 127193d6abc5b6d62d9b316416191ebb96bc7063
-Size (calibre-1.31.0.tar.xz) = 33189956 bytes
+SHA1 (calibre-1.32.0.tar.xz) = 536881dee5acaeb6af1ae87ff8d917437823b537
+RMD160 (calibre-1.32.0.tar.xz) = 27c937c3f5f86d2fd27c12116e1b1cd11cd37afa
+Size (calibre-1.32.0.tar.xz) = 33183068 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
+SHA1 (patch-recipes_mojegotowanie.recipe) = d633337bec19ea466cb6d939e06d4aae18f75287
 SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65
 SHA1 (patch-src_calibre_linux.py) = 06e953e3a437ae76783d80bf0986bbbece991431
diff --git a/misc/calibre/patches/patch-recipes_mojegotowanie.recipe b/misc/calibre/patches/patch-recipes_mojegotowanie.recipe
new file mode 100644
index 00000000000..c8ca2a6ea7c
--- /dev/null
+++ b/misc/calibre/patches/patch-recipes_mojegotowanie.recipe
@@ -0,0 +1,12 @@
+$NetBSD: patch-recipes_mojegotowanie.recipe,v 1.1 2014/04/17 13:01:13 wiz Exp $
+
+Fix shebang line.
+
+--- recipes/mojegotowanie.recipe.orig	2014-04-11 02:51:32.000000000 +0000
++++ recipes/mojegotowanie.recipe
+@@ -1,4 +1,4 @@
+-#!usr/bin/env python
++#!/usr/bin/env python
+ 
+ __license__ = 'GPL v3'
+ __copyright__ = 'MrStefan, teepel'