Update to 2.35.0:

- version: 2.35.0
  date: 2015-08-14

  new features:
    - title: "Kobo driver: Add support for the new firmware version
    3.17"

    - title: "E-book viewer: Allow setting the number of pages per
    screen separately for portrait and landscape modes."

  bug fixes:
    - title: "DOCX Input: Fix a regression in the previous release
    that broke conversion of some documents that specify vertical
    alignment in absolute units"

    - title: "Book list: Fix the current row number being partially
    cutoff on some windows 10 machines."

    - title: "Fix 'stopping content server' message popping up
    repeatedly even when it is closed while the content server has
    not fully stopped"

    - title: "Conversion: Fix error when converting a file that
    uses media queries with comments in the media selector."

  improved recipes:
    - American Spectator
    - South China Morning Post

  new recipes:
    - title: 3D News and iXBT.com
      author: bugmen00t

- version: 2.34.0
  date: 2015-08-07

  new features:
    - title: "Amazon metadata download: Add support for amazon.nl.
    To use it go to Preferences->Metadata download and configure
    the amazon plugin to use Netherlands as the source."

    - title: "Catalogs: Add an option to not add the generated
    catalog to the library."

    - title: "E-book viewer: Improve performance of hyphenation
    (by updating the version of the hyphenation library it uses)"

  bug fixes:
    - title: "DOCX Input: Add support for text whose vertical
    position is adjusted by offsets from the baseline"

    - title: "DOCX Output: Handle length and percentage values for
    vertical-align in the input document."

    - title: "Edit Book: Check Book: Fix automatic correction of
    invalid ids not updating the idrefs in the spine for ids in
    the manifest of the OPF file."

    - title: "E-book viewer: Fix printing to PDF could result in
    filenames with characters not supported by windows"

    - title: "E-book viewer: Also fix a bug in the hyphenation
    algorithm that could cause the word 'undefined' to be mangled
    during hyphenation."

    - title: "ODT Input: Fix custom styles with a dot in their name
    not being inherited."

  improved recipes:
    - Daily Express
    - The New Yorker
    - XKCD
    - Wired Magazine
    - Wired UK

3 files changed, 19 insertions, 11 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 41b54de4dac..7ddfe0d5004 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.110 2015/07/27 16:28:44 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2015/08/14 18:15:08 wiz Exp $
 
-DISTNAME=	calibre-2.33.0
+DISTNAME=	calibre-2.35.0
 CATEGORIES=	misc
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 2b416bcb90e..df5667ce2ff 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2015/07/27 16:28:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.43 2015/08/14 18:15:08 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1159,6 +1159,7 @@ lib/calibre/calibre/plugins/html.so
 lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/libheadless.so
+lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/magick.so
 lib/calibre/calibre/plugins/matcher.so
@@ -1171,7 +1172,6 @@ lib/calibre/calibre/plugins/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
 lib/calibre/calibre/plugins/tokenizer.so
 lib/calibre/calibre/plugins/unrar.so
-lib/calibre/calibre/plugins/woff.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
 lib/calibre/calibre/spell/__init__.py
@@ -1251,7 +1251,6 @@ lib/calibre/calibre/utils/fonts/sfnt/metrics.py
 lib/calibre/calibre/utils/fonts/sfnt/subset.py
 lib/calibre/calibre/utils/fonts/utils.py
 lib/calibre/calibre/utils/fonts/win_fonts.py
-lib/calibre/calibre/utils/fonts/woff/__init__.py
 lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/formatter_functions.py
 lib/calibre/calibre/utils/html2text.py
@@ -1356,6 +1355,10 @@ lib/calibre/css_selectors/select.py
 lib/calibre/css_selectors/tests.py
 lib/calibre/duktape/__init__.py
 lib/calibre/duktape/tests.py
+lib/calibre/lzma/__init__.py
+lib/calibre/lzma/errors.py
+lib/calibre/lzma/lzma1.py
+lib/calibre/lzma/xz.py
 lib/calibre/odf/__init__.py
 lib/calibre/odf/anim.py
 lib/calibre/odf/attrconverters.py
@@ -1752,7 +1755,11 @@ share/calibre/quick_start/deu.epub
 share/calibre/quick_start/eng.epub
 share/calibre/quick_start/fra.epub
 share/calibre/quick_start/ita.epub
-share/calibre/rapydscript/compiler.js
+share/calibre/rapydscript/compiler.js.xz
+share/calibre/rapydscript/lib/math.pyj
+share/calibre/rapydscript/lib/operator.pyj
+share/calibre/rapydscript/lib/random.pyj
+share/calibre/rapydscript/lib/re.pyj
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/20_minutos.recipe
@@ -1760,6 +1767,7 @@ share/calibre/recipes/20minutes.recipe
 share/calibre/recipes/20minutos.recipe
 share/calibre/recipes/24sata.recipe
 share/calibre/recipes/24sata_rs.recipe
+share/calibre/recipes/3dnews.recipe
 share/calibre/recipes/7dias.recipe
 share/calibre/recipes/7seri.recipe
 share/calibre/recipes/Ansa.recipe
@@ -2462,6 +2470,7 @@ share/calibre/recipes/irish_times.recipe
 share/calibre/recipes/isar-loisachbote.recipe
 share/calibre/recipes/ittechblog.recipe
 share/calibre/recipes/ivanamilakovic.recipe
+share/calibre/recipes/ixbt.recipe
 share/calibre/recipes/izdiham.com.recipe
 share/calibre/recipes/izvestia.recipe
 share/calibre/recipes/jagran_josh.recipe
@@ -3299,7 +3308,6 @@ share/calibre/recipes/winter_olympics.recipe
 share/calibre/recipes/wired.recipe
 share/calibre/recipes/wired_daily.recipe
 share/calibre/recipes/wired_it.recipe
-share/calibre/recipes/wired_uk.recipe
 share/calibre/recipes/wirtscafts_woche.recipe
 share/calibre/recipes/wirtualnemedia_pl.recipe
 share/calibre/recipes/wnp.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index e8f8cde3cea..e11d08a1290 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.44 2015/07/27 16:28:44 wiz Exp $
+$NetBSD: distinfo,v 1.45 2015/08/14 18:15:08 wiz Exp $
 
-SHA1 (calibre-2.33.0.tar.xz) = 40972236aef1d2a27429cd2e8ffbd42736453adf
-RMD160 (calibre-2.33.0.tar.xz) = 28f5d25534137efcc271c729ac5d6563037ea630
-Size (calibre-2.33.0.tar.xz) = 37269672 bytes
+SHA1 (calibre-2.35.0.tar.xz) = c93e7516a17212a890926db67765660ca7b04a3a
+RMD160 (calibre-2.35.0.tar.xz) = 3574023f787ab1a6899443003aa8b969c9d1e334
+Size (calibre-2.35.0.tar.xz) = 37470944 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556