Updated calibre to 2.74.0.

- version: 2.74.0
  date: 2016-12-09

  new features:
    - title: "Amazon metadata download: Allow downloading from amazon.cn as well. To use go to Preferences->Metadata download and customize the amazon plugin to download from amazon.cn"

    - title: "Edit Book: Allow disabling the 'Files already arranged into folders' message popup"

  bug fixes:
    - title: "Edit Book: Fix selected text not being fully highlighted when using the solarized color schemes."
      tickets: [1647448]

    - title: "calibredb: Fix CSV output for the check_library command not being properly escaped"

    - title: "Fix subsetting of fonts whose names start with 'and' not working"

    - title: "Fix a regression in 2.72 that broke the --start-in-tray command line option."
      tickets: [1644876]

    - title: "Fix third party plugins that create dynamic context menus not working in linux"

    - title: "DOCX Input: Fix images wider than 50% of the page width being incorrectly right aligned even when anchored to the center of the page."
      tickets: [1646086]

    - title: "Catalog generation: Ensure all citation keys in BiBTeX catalogs have only ascii characters."
      tickets: [1646239]

    - title: "Get Books: Update ebookpoint and legimi plugins for website changes"

    - title: "EPUB3 metadata: Ensure updating metadata never produces empty dc:contributor elements."
      tickets: [1644702]

    - title: "DOCX Output: Fix an error when converting tables with spanning cells."
      tickets: [1644912]

    - title: "Nicer error message if the user tries to import data while the content server is running"

  improved recipes:
    - Frontline
    - Korea Herald
    - Pagina 12
    - Edge Conversations
    - Kitsapun
    - Mobile Nations
    - NME
    - Security Watch
    - Sign on SD
    - Star Advertiser
    - tyzden

3 files changed, 9 insertions, 14 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 68bfd592aa6..78d063e6369 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.162 2016/12/04 05:17:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.163 2016/12/12 12:28:22 wiz Exp $
 
-DISTNAME=	calibre-2.73.0
-PKGREVISION=	1
+DISTNAME=	calibre-2.74.0
 CATEGORIES=	misc
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
@@ -78,7 +77,6 @@ REPLACE_BASH+=		resources/calibre-portable.sh
 # These ones are for replacing python[0-9*] with PYTHONBIN
 REPLACE_PYTHON+=	recipes/animal_politico.recipe
 REPLACE_PYTHON+=	recipes/respekt_magazine.recipe
-REPLACE_PYTHON+=	recipes/respekt_web.recipe
 REPLACE_PYTHON+=	recipes/kompiutierra.recipe
 REPLACE_PYTHON+=	recipes/trouw.recipe
 REPLACE_PYTHON+=	src/calibre/ebooks/markdown/extensions/*.py
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 16fb7559a8e..e672a9c7257 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.72 2016/11/28 12:32:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.73 2016/12/12 12:28:22 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1174,7 +1174,7 @@ lib/calibre/calibre/library/server/opds.py
 lib/calibre/calibre/library/server/utils.py
 lib/calibre/calibre/library/server/xml.py
 lib/calibre/calibre/library/sqlite.py
-lib/calibre/calibre/library/test.py
+lib/calibre/calibre/library/test_cli.py
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/linux.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
@@ -2277,7 +2277,6 @@ share/calibre/recipes/estadao.recipe
 share/calibre/recipes/eu_commission.recipe
 share/calibre/recipes/europa_press.recipe
 share/calibre/recipes/europasur.recipe
-share/calibre/recipes/european_voice.recipe
 share/calibre/recipes/evangelizo.recipe
 share/calibre/recipes/everett_herald.recipe
 share/calibre/recipes/evz.ro.recipe
@@ -3058,7 +3057,6 @@ share/calibre/recipes/republica.recipe
 share/calibre/recipes/republika.recipe
 share/calibre/recipes/res_publica.recipe
 share/calibre/recipes/respekt_magazine.recipe
-share/calibre/recipes/resurgence.recipe
 share/calibre/recipes/reuters.recipe
 share/calibre/recipes/reuters_ja.recipe
 share/calibre/recipes/revista_bla.recipe
@@ -3230,7 +3228,6 @@ share/calibre/recipes/telepolis.recipe
 share/calibre/recipes/telepolis_artikel.recipe
 share/calibre/recipes/telepolis_pl.recipe
 share/calibre/recipes/teleread.recipe
-share/calibre/recipes/television_without_pity.recipe
 share/calibre/recipes/thai_post_daily.recipe
 share/calibre/recipes/thairath.recipe
 share/calibre/recipes/the_age.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 09d40913be0..32f4acf57f2 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.81 2016/11/28 12:32:11 wiz Exp $
+$NetBSD: distinfo,v 1.82 2016/12/12 12:28:22 wiz Exp $
 
-SHA1 (calibre-2.73.0.tar.xz) = ce4e26322449fd652e5a400903e087d70b47c4e7
-RMD160 (calibre-2.73.0.tar.xz) = 5bb701eb8b3f2ab101df3ee7aecc87d4441b12a5
-SHA512 (calibre-2.73.0.tar.xz) = 395ae04ca580b25ec5d72bf2134c073a9182eccf9c30b053a52e342ddf7bec27d2479acba8cde15da175dfd0b6f5f9add54c9a13d9da421c494b70de3217968d
-Size (calibre-2.73.0.tar.xz) = 38674308 bytes
+SHA1 (calibre-2.74.0.tar.xz) = 011dffa720defa7aac4aacf8cc6190ff3d53510b
+RMD160 (calibre-2.74.0.tar.xz) = 1a5e13f89521716a9aa5981caed79b0c28feff9c
+SHA512 (calibre-2.74.0.tar.xz) = 84a2d80b4a07ba053d12f65cb87e41628a21efbf8ad6204a557faffa9f54881e7e1553d403be53ac80c7b7cbcf089c373ad7ada7c4081bd6e98d79fffe39b3a3
+Size (calibre-2.74.0.tar.xz) = 38620816 bytes
 SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
 SHA1 (patch-setup_build__environment.py) = d44460d96f9fb76cd80814a9cba8b153c52b5bfc
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662