Update to 2.21.0:

New Features

    Allow opening ebook files and covers in external applications
    by simply right clicking on them in the Book Details panel.

    Now, you can right click on an ebook format or the cover in
    the Book Details panel, and open it with any application
    installed on your computer. calibre will automatically present
    you with a list of application capable of opening the file.
    Simply choose one, or if your particular application is not
    auto-detected, you can browse for it manually.
    Tag Browser: Make rename and delete for items in the Tag Browser
    restrict themselves to the current Virtual Library (if any).
    There is also an additional menu entry you can use to rename
    and delete across all books while in a Virtual Library.
    Conversion: Use a new (written from scratch) implementation of
    CSS Level 3 selectors that fixes various bugs in handling of
    the more advanced/uncommon CSS selectors such as nth-last-child()
    Edit Book: Allow restoring of disabled confirmation prompts in
    preferences and add a confirmation when removing saved searches
    Edit ToC button: Remember the last used ebook formats

Bug Fixes

    E-book viewer: Fix regression that prevented pasting of text
    with formatting from the viewer.

    Table of Contents Editor: Fix selecting a location inside a
    file and then clicking on another file causes the previous
    location to be used in the new file.

    DOCX Input: Fix incorrect bold font weight being used for
    heading styles even if the style definition does not specify
    bold.

    AZW3 Input: Fix a bug that prevented conversion of AZW3 files
    that contained an empty CSS media block.

    PDF Output: Fix incorrect rendering of text in elements that
    use font-variant:small-caps and also have children.

    Get Books: Update Amazon Europe, Empik and CDP store plugins
    PDF Output: Fix incorrect conversion of source document that
    specify dir='rtl' on the root element.

    PDF Output: Ignore unparseable links instead of aborting the
    conversion on them.

    Fix reading metadata from filenames tester not working for
    dates before 1900.

    Linux binary install: Fix SSL CA certificates not being detected
    on Fedora based distributions
    Books list: Fix column alignment incorrectly propagating when
    changing libraries
    FB2 Input: Do not put a border around images
    Fixes for various incompatibilities with (Py)Qt 5.4.1 which is
    used by some calibre distro packages on linux
    Fix error when running calibredb backup_metadata on a library
    that contains book records with no path information
    Edit Book: Fix extra search being hidden when removing a saved
    search
    Fix a regression in 2.20 that prevented some changes to
    per-library preferences from being saved
    Linux installer: Do not register application/octet-stream as
    one of the mimetypes calibre can handle

New news sources

    Pando Daily by Darko Miletic

Improved news sources

    Spektrum der Wissenschaft
    New Musical Express
    The Daily Mirror

4 files changed, 14 insertions, 130 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 64ccdc48859..b80c862c7e6 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2015/03/09 09:02:20 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2015/03/15 21:23:47 wiz Exp $
 
-DISTNAME=	calibre-2.20.0
-PKGREVISION=	1
+DISTNAME=	calibre-2.21.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index b05b5b8f914..c1a5f58492c 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2015/02/27 09:47:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.32 2015/03/15 21:23:47 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -6,6 +6,7 @@ bin/calibre-debug
 bin/calibre-parallel
 bin/calibre-server
 bin/calibre-smtp
+bin/calibre-uninstall
 bin/calibredb
 bin/ebook-convert
 bin/ebook-device
@@ -789,7 +790,6 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
 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/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
@@ -827,7 +827,6 @@ 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
@@ -1250,6 +1249,10 @@ lib/calibre/calibre/utils/mem.py
 lib/calibre/calibre/utils/monotonic.py
 lib/calibre/calibre/utils/mreplace.py
 lib/calibre/calibre/utils/network.py
+lib/calibre/calibre/utils/open_with/__init__.py
+lib/calibre/calibre/utils/open_with/linux.py
+lib/calibre/calibre/utils/open_with/osx.py
+lib/calibre/calibre/utils/open_with/windows.py
 lib/calibre/calibre/utils/opensearch/__init__.py
 lib/calibre/calibre/utils/opensearch/description.py
 lib/calibre/calibre/utils/opensearch/query.py
@@ -1311,7 +1314,7 @@ lib/calibre/calibre/web/jsbrowser/test.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
-lib/calibre/css_selectors/parse.py
+lib/calibre/css_selectors/parser.py
 lib/calibre/css_selectors/select.py
 lib/calibre/css_selectors/tests.py
 lib/calibre/odf/__init__.py
@@ -1382,10 +1385,6 @@ ${PYSITELIB}/init_calibre.py
 share/appdata/calibre-ebook-edit.appdata.xml
 share/appdata/calibre-ebook-viewer.appdata.xml
 share/appdata/calibre-gui.appdata.xml
-share/applications/calibre-ebook-edit.desktop
-share/applications/calibre-ebook-viewer.desktop
-share/applications/calibre-gui.desktop
-share/applications/calibre-lrfviewer.desktop
 share/bash-completion/completions/calibre
 share/calibre/builtin_recipes.xml
 share/calibre/builtin_recipes.zip
@@ -2807,6 +2806,7 @@ share/calibre/recipes/pagina_12_print_ed.recipe
 share/calibre/recipes/pajama.recipe
 share/calibre/recipes/palmtop_pl.recipe
 share/calibre/recipes/pambianco.recipe
+share/calibre/recipes/pandodaily.recipe
 share/calibre/recipes/panorama.recipe
 share/calibre/recipes/paperli_topic.recipe
 share/calibre/recipes/parlamentni_listy.recipe
@@ -3514,8 +3514,4 @@ share/doc/calibre/Changelog.yaml
 share/doc/calibre/INSTALL
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
-share/pixmaps/calibre-ebook-edit.png
-share/pixmaps/calibre-gui.png
-share/pixmaps/calibre-lrf.png
-share/pixmaps/calibre-viewer.png
 @pkgdir lib/calibre/calibre/plugins/.libs
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 5fe814d98cb..a4e448b0656 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.32 2015/02/27 09:47:47 wiz Exp $
+$NetBSD: distinfo,v 1.33 2015/03/15 21:23:47 wiz Exp $
 
-SHA1 (calibre-2.20.0.tar.xz) = 7c06eb8ce2b8ef66b6224a7767cc17b6b0821be7
-RMD160 (calibre-2.20.0.tar.xz) = 3f52ab8642a4eaef8505cb83336c7320ab4981c4
-Size (calibre-2.20.0.tar.xz) = 36187720 bytes
+SHA1 (calibre-2.21.0.tar.xz) = eb420d22b6a740a4b0cbd05d7f5277a1615c2b86
+RMD160 (calibre-2.21.0.tar.xz) = 28b595e091b07f7d7116d5c636b61e18e37ec77d
+Size (calibre-2.21.0.tar.xz) = 36415844 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556
-SHA1 (patch-src_calibre_linux.py) = 2bab5511078e20893136a8f1098bab703f739b0d
diff --git a/misc/calibre/patches/patch-src_calibre_linux.py b/misc/calibre/patches/patch-src_calibre_linux.py
deleted file mode 100644
index b996190450a..00000000000
--- a/misc/calibre/patches/patch-src_calibre_linux.py
+++ /dev/null
@@ -1,110 +0,0 @@
-$NetBSD: patch-src_calibre_linux.py,v 1.5 2015/02/08 00:37:10 wiz Exp $
-
-Lifted from ArchLinux, saves mime and desktop files on disk
-instead of trying to add them directly.
-
-See https://www.archlinux.org/packages/community/x86_64/calibre/ ->
-https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/calibre ->
-https://projects.archlinux.org/svntogit/community.git/plain/trunk/desktop_integration.patch?h=packages/calibre
-
---- src/calibre/linux.py.orig	2014-08-29 03:59:29.000000000 +0000
-+++ src/calibre/linux.py
-@@ -691,18 +691,6 @@ class PostInstall:
-             self.setup_completion()
-         if islinux or isbsd:
-             self.setup_desktop_integration()
--        self.create_uninstaller()
--
--        from calibre.utils.config import config_dir
--        if os.path.exists(config_dir):
--            os.chdir(config_dir)
--            if islinux or isbsd:
--                for f in os.listdir('.'):
--                    if os.stat(f).st_uid == 0:
--                        import shutil
--                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
--                if os.stat(config_dir).st_uid == 0:
--                    os.rmdir(config_dir)
- 
-         if warn is None and self.warnings:
-             self.info('\n\nThere were %d warnings\n'%len(self.warnings))
-@@ -776,56 +764,39 @@ class PostInstall:
- 
-             with TemporaryDirectory() as tdir, CurrentDir(tdir), \
-                                 PreserveMIMEDefaults():
--                render_img('mimetypes/lrf.png', 'calibre-lrf.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-lrs',
--                '128'))
--                render_img('mimetypes/mobi.png', 'calibre-mobi.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128'))
--                render_img('mimetypes/tpz.png', 'calibre-tpz.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128'))
--                render_img('mimetypes/azw2.png', 'calibre-azw2.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128'))
--                render_img('mimetypes/azw3.png', 'calibre-azw3.png')
--                cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True)
--                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
--                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
--                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
--                self.icon_resources.append(('apps', 'calibre-gui', '256'))
--                render_img('viewer.png', 'calibre-viewer.png', width=256, height=256)
--                cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True)
--                self.icon_resources.append(('apps', 'calibre-viewer', '256'))
--                render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256)
--                cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
-+                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
-+                os.mkdir(dir)
-+                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
-+                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
-+                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
-+                render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
-                 self.icon_resources.append(('apps', 'calibre-ebook-edit', '256'))
- 
-                 mimetypes = set([])
-                 for x in all_input_formats():
-                     mt = guess_type('dummy.'+x)[0]
--                    if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
-+                    if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
-                         mimetypes.add(mt)
- 
-                 def write_mimetypes(f):
-                     f.write('MimeType=%s;\n'%';'.join(mimetypes))
- 
-                 from calibre.ebooks.oeb.polish.main import SUPPORTED
--                f = open('calibre-lrfviewer.desktop', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../applications')
-+                os.mkdir(dir)
-+                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
-+                
-                 f.write(VIEWER)
-                 f.close()
--                f = open('calibre-ebook-viewer.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
-                 f.write(EVIEWER)
-                 write_mimetypes(f)
--                f = open('calibre-ebook-edit.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
-                 f.write(ETWEAK)
-                 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
-                 f.write('MimeType=%s;\n'%';'.join(mt))
-                 f.close()
--                f = open('calibre-gui.desktop', 'wb')
-+                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
-                 f.write(GUI)
-                 write_mimetypes(f)
-                 f.close()
-@@ -845,7 +816,7 @@ class PostInstall:
- 
-                 APPDATA = get_appdata()
-                 for x in des:
--                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
-+                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', appdata + '/../applications/'+x]
-                     cc(' '.join(cmd), shell=True)
-                     self.menu_resources.append(x)
-                     ak = x.partition('.')[0]