Updated misc/calibre to 0.8.36

pkgsrc changes:
- upstream archive to .tar.xz, modify Makefile accordingly.
- Rely on pkgsrc libraries when possible (py-html5lib and py-chardet).

Upstream changes:
- version: 0.8.36 date: 2011-01-20

  new features: - title: "Decrease startup time for large libraries with at
  least one composite custom column by reading format info on demand"

    - title: "When automatically deleting news older than x days, from the
    calibre library, only delete the book if it both has the tag News and the
    author calibre. This prevents accidental deletion of books tagged with News
    by the user."

    - title: "Driver for Infibeam Pi 2"

    - title: "Add a Tag Editor for tags like custom columns to the edit
    metadata dialog"

  bug fixes: - title: "E-book viewer: Fix regression in 0.8.35 that caused
  viewer to raise an error on books that did not define a language"

    - title: "Content server: Fix grouping for categories based on custom
    columns." tickets: [919011]

    - title: "Edit metadata dialog: When setting the series from a format or
    via metadata download, ensure that the series index is not automatically
    changed, when closing the dialog." tickets: [918751]

    - title: "When reading metadata from Topaz (azw1) files, handle non ascii
    metadata correctly." tickets: [917419]

    - title: "CHM Input: Do not choke on CHM files with non ascii internal
    filenames on windows." tickets: [917696]

    - title: "Fix reading metadata from CHM files with non-ascii titles"

    - title: "Fix HTML 5 parser choking on comments"

    - title: "If calibre is started from a directory that does not exist,
    automatically use the home directory as the working directory, instead of
    crashing"

    - title: "Fix iriver story HD Wi-Fi device and external SD card swapped"
    tickets: [916364]

    - title: "Content server: Fix ugly URLs for specific format download in the
    book details and permalink panels"

    - title: "When adding FB2 files do not set the date field from the metadata
    in the file"

  improved recipes: - OReilly Premuim - Variety - Blic - New Journal of Physics
  - Der Tagesspiegel

  new recipes: - title: Tweakers.net author: Roedi06

    - title: Village Voice author: Barty

    - title: Edge.org Conversations author: levien

    - title: Novi list - printed edition author: Darko Miletic

- version: 0.8.35 date: 2011-01-13

  new features: - title: "Metadata plugboards: Allow creation of plugboards for
  email delivery." tickets: [914012]

    - title: "Tweak EPUB: Also allow tweaking of HTMLZ files (when both EPUB
    and HTMLZ are present, EPUB is preferred, this can be changed via
    Preferences->Tweaks)."

    - title: "TXT Input: Support direct conversion of files with extensions
    .md, .markdown and .textile." tickets: [912931]

    - title: "E-book viewer: Speed up the optional hyphenation algorithm by
    upgrading the hyphenator library calibre uses"

    - title: "Drivers for PocketBook 611, Motorola Razr Droid and Onyx Boox
    i62"

  bug fixes: - title: "MOBI Output: When converting a paragraph that contains
  only a non-breaking space into a line break, ignore paragraphs with height
  less than 2pt." tickets: [915150]

    - title: "MOBI Input: Handle MOBI files that specify anchor point exactly
    at pagebreaks. These are apparently produced by John Wiley and Sons."
    tickets: [914036]

    - title: "Fetch news dialog: The Download now button is no longer scrolled
    out of view on OS X for news sources that require credentials"

    - title: "Fix commas being removed from author names when generating
    filenames in the calibre library"

    - title: "ODT Input: Dont crash on empty links"

    - title: "ebook-convert: Allow use of leading ./ when specifying output
    file names." tickets: [913954]

    - title: "Fix deleting of hierarchical searches broken in Tag Browser"
    tickets: [912345]

    - title: "Metadata search and replace: Fix rendering error when choosing
    {template}" tickets: [913154]

    - title: "Fix calibre not starting when stray .po files are present in the
    working directory" tickets: [913054]

    - title: "Do not error out when getting metadata for authors if the author
    name has either ::: or :#: in it." tickets: [912713]

  improved recipes: - Pagina 12 - USA Today - LWN Weekly - Seattle Times - San
  Jose Mercury - Grantland.com

  new recipes: - title: Lega Nerd and Pambianco author: faber1971

    - title: Various Turkish news sources author: asalet_r

    - title: Microwave Journal author: Kiavash

    - title: OReilly Premium author: TechnoCat

    - title: Hamilton Spectator and Tillsonburg/Norfolk County author: Eric
    Coolman

    - title: Opinion Bolivia author: Piet van Oostrum

    - title: ideal.es author: Josemi Liebana

    - title: Novilist Portal author: Darko Miletic

- version: 0.8.34 date: 2012-01-06

  new features: - title: "Apple driver: Set the year field in iTunes based on
  the published date in calibre." tickets: [909050]

    - title: "EPUB Input: When converting a file that has entries in the
    manifest that do no exist, remove them, instead of aborting the
    conversion." tickets: [910933]

    - title: "Kindle driver: Ensure page counts are correctly sent to the
    device when connecting to Kindle 4/Touch." tickets: [910279]

    - title: "Allow user to set the number of recently viewed books shown in
    the dropdown menu of the view button, via a tweak in Preferences->Tweaks."
    tickets: [910292]

  bug fixes: - title: "Fix regression in 0.8.33 that caused calibre to crash
  when starting the Content Server, if the port the content server is trying to
  listen on is blocked/busy." tickets: [910512]

    - title: "MOBI Input: Fix regression that caused a mixup of images when the
    MOBI file header contains an incorrect first image index pointer." tickets:
    [911243]

    - title: "Do not remove leading and trailing spaces from the replace fields
    in the Search and Replace conversion options" tickets: [910523]

    - title: "Conversion pipeline: Fix regression in 0.8.31 that broke parsing
    of documents containing a self closing <title/> tag." tickets: [910325]

  improved recipes: - Kopalnia Wiedzy - Alternet - Tagesspiegel - Philadelphia
  Inquirer - Seattle Times - La Razon

  new recipes: - title: Various Italian news sources author: faber1971

    - title: money.pl author: intromatyk

    - title: Diario Rio Negro author: Darko Miletic.

    - title: FHM UK author: Dave Asbury

- version: 0.8.33 date: 2011-12-30

  new features: - title: "LIT Input: Switch to non-recursive algorithm, to
  allow conversion of files with deeply nested markup." tickets: [909535]

    - title: "Content server: Do not show the original_* formats in the mobile
    interface. Also upgrade to the latest CherryPy release."

    - title: "E-book viewer: Add option in viewer preferences to control how
    much the font size is changed when you click the make fonts bigger/smaller
    buttons." tickets: [908980]

    - title: "E-book viewer: Allow changing font size via Ctrl+Mouse wheel"
    tickets: [908975]

    - title: "Kobo driver: Hide previews and recommendations from the book
    list. You can customize the Kobo plugin if you would like to see them via
    Preferences->Plugins"

  bug fixes: - title: "Copy to library: Fix title sort not being copied"

    - title: "PDF Output: Add custom size conversion option to the GUI (it was
    only present on the command line before)"

    - title: "Add missing --keep-ligatures option to the ebook-convert command
    line" tickets: [909182]

    - title: "Fix rendering of non ascii characters in generated masthead
    images when downloading news for the Kindle"

    - title: "Linux binary: Disable qt-sp-api as it causes crashes/performance
    issues on various distros"

    - title: "E-book viewer: Ensure that reference mode highlighting is removed
    from the book when reference mode is closed." tickets: [908982]

    - title: "Fix unable to load plugins from files on GNOME/XFCE desktops"

    - title: "Fix regression that broke customizing toolbars on non English
    calibre installs"

    - title: "Conversion pipeline: Disable HTML 5 parsing if it results in
    deeply nested trees." tickets: [908818]

    - title: "Do not loose position in book list on device connection/sync, if
    a search is active." tickets: [908553]

    - title: "Fix regression in 0.8.32 that broke deleting books if the path to
    the library contained non-ascii characters on linux" tickets: [908068]

  improved recipes: - Echo Online - La Razon

  new recipes: - title: NYTimes Global author: Krittika Goyal

    - title: Grantland author: Barty

- version: 0.8.32 date: 2011-12-23

  new features: - title: "Linux: When deleting books, send them to the recycle
  bin, instead of permanently deleting. This is the same behavior as on Windows
  and OS X."

    - title: "Add a checkbox to allow users to disable the popup that asks if
    books should be auto-converted before sending to device"

    - title: "Drivers for Droid Razr, Samsung GT-I9003 and Bookeen Odyssey"
    tickets: [906356, 906056, 905862]

    - title: "Allow passing multiple filenames as command line arguments to
    calibre, to add multiple books." tickets: [907968]

  bug fixes: - title: "MOBI Output: Fix regression in 0.8.30 that caused the
  use of hidden heading elements for the TOC to generate links in the wrong
  place." tickets: [907156]

    - title: "EPUB Output: Ensure directories have the correct permissions bits
    set when unzipping an epub with unzip on Unix"

    - title: "Fix bottom most shortcuts in keyboard shortcuts for viewer not
    editable"

    - title: "EPUB Output: Fix handling of self closing <audio> tags." tickets:
    [906521]

    - title: "MOBI Input: Map invalid <o:p> tags to <p> tags before parsing, to
    handle broken nesting." tickets: [905715]

    - title: "Conversion pipeline: HTML5 parsing: Fix handling of XML
    namespaces. Fixes regression in 0.8.30 that caused some articles in some
    news downloads to appear blank when viewed in Adobe Digital Editions based
    readers"

    - title: "Get Books: Gandalf store, fix price and cover detection"

    - title: "EPUB Output: Fix the Flatten filenames option in EPUB Output
    causing duplicated manifest ids in rare cases." tickets: [905692]

    - title: "When adding books via ISBN, show the user the list of invalid
    ISBNs that will be ignored, if any, before starting the add operation."
    tickets: [905690]

    - title: "Fix unsmarten punctuation conversion option broken in 0.8.31."
    tickets: [905596]

    - title: "Fix broken evaluation of composite columns in save-to-disk"

  improved recipes: - Cosmopolitan UK - Hindustan Times - HVG - moneynews.com -
  Ming Pao - Glasgow Herald - Times of India - Focus Magazine - Hacker News -
  Independent - Sueddeutsche

  new recipes: - title: Prospect Magazine UK author: Barty and duoloz

    - title: Elet es Irodalom and NOL author: Bigpapa

    - title: Salonica Press News author: SteliosGero

    - title: Echo Online author: Armin Geller

    - title: Various Polish news sources author: fenuks

    - title: Various Italian news sources author: faber1971

- version: 0.8.31 date: 2011-12-16

  new features: - title: "Conversion engine: When parsing invalid XHTML use the
  HTML 5 algorithm, for greater robustness." tickets: [901466]

    - title: "Driver for PocketBook 611 and Lenovo IdeaPad"

    - title: "Allow customization of the order in which custom column editing
    is performed in the edit metadata dialog. Setting is available via
    Preferences->Tweaks." tickets: [902731]

    - title: "MOBI news download: Allow recipes to set a thumbnail for entries
    in the periodical table of contents. Currently used by the NYTimes, WSJ,
    Independent, GUardian and Globe and Mail recipes" tickets: [900130]

    - title: "E-book viewer: Add an option to the right click menu to search
    for the currently selected word"

    - title: "Automatically hide the no internet connection available error
    message if the connection is restored before the user clicks OK"

  bug fixes: - title: "Fix comments not hidden in Book details panel when they
  are turned off via Preferences->Look & Feel->Book Details"

    - title: "E-book viewer: Do not popup an error message if the user tries to
    use the mouse wheel to scroll before a document is loaded." tickets:
    [903449]

    - title: "Add docx to the list of ebook extensions." tickets: [903452]

    - title: "When downloading metadata from non-English Amazon websites, do
    not correct the case of book titles."

    - title: "Fix regression in 0.8.30 that broke bulk conversion of a single
    book." tickets: [902506]

    - title: "When minimized to system tray do not display the no internet
    connection error as a dialog box, instead use a system tray notification"

    - title: "Catalog generation: Include the series_index field for custom
    series columns as well"

    - title: "Comic Input: Do not rescale images when using the Tablet output
    profile (or any output profile with a screen size larger than 3000x3000)"

    - title: "HTML Input: Ignore unparseable URLs instead of crashing on them."
    tickets: [902372]


  improved recipes: - La Republica - CND - Berliner Zeitung - Zaman Gazetesi

  new recipes: - title: CND Weekly author: Derek Liang

    - title: descopera.org author: Marius Ignatescu

    - title: Rynek Zdrowia author: spi630

- version: 0.8.30 date: 2011-12-09

  new features: - title: "Get Books: Add amazon.es and amazon.it"

    - title: "Bulk convert dialog: Disable the Use saved conversion settings
    checkbox when none of the books being converted has saved conversion
    settings"

    - title: "ebook-viewer: And a command line switch to specify the position
    at which the file should be opened." tickets: [899325]

    - title: "Distribute calibre source code compressed with xz instead of gzip
    for a 40% reduction in size"

  bug fixes: - title: "Get Books: Fix ebooks.com and amazon.fr. Fix cover
  display in Diesel ebooks store."

    - title: "HTML Input: Fix regression that broke processing of a small
    fraction of HTML files encoded in a multi-byte character encoding."
    tickets: [899691]

    - title: "Greatly reduce the delay at the end of a bulk metadata edit
    operation that operates on a very large number (thousands) of books"

    - title: "Template language: Fix the subitems formatter function to split
    only when the period is surrounded by non-white space and not another
    period"

    - title: "Fix ampersands in titles not displaying in the Cover Browser"

    - title: "MOBI Output: Do not ignore an empty anchor at the end of a block
    element."

    - title: "MOBI Output: Handle links to inline anchors placed inside large
    blocks of text correctly, i.e. the link should not point to the start of
    the block." tickets: [899831]

    - title: "E-book viewer: Fix searching for text that is represented as
    entities in the underlying HTML." tickets: [899573]

    - title: "Have the Esc shortcut perform exactly the same set of actions as
    clicking the clear button." tickets: [900048]

    - title: "Prevent the adding books dialog from becoming too wide"

    - title: "Fix custom column editing not behaving correctly with the
    Previous button in the edit metadata dialog." tickets: [899836]

    - title: "T1 driver. More fixes to datetime handling to try to convince the
    T1's buggy firmware to not rescan metadata." tickets: [899514]

    - title: "Only allow searching via non accented author names if the user
    interface language in calibre is set to English." tickets: [899227]

  improved recipes: - Die Zeit subscription - Metro UK - suedeutsche.de

  new recipes: - title: Blues News author: Oskar Kunicki

    - title: "TVXS" author: Hargikas

3 files changed, 78 insertions, 83 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 4c8efd52787..117f45da2b3 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.30 2012/01/13 10:55:18 obache Exp $
+# $NetBSD: Makefile,v 1.31 2012/01/21 17:53:32 gls Exp $
 #
 
-DISTNAME=	calibre-0.8.29
-#PKGREVISION=	2
-PKGREVISION=	1
+DISTNAME=	calibre-0.8.36
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.calibre-ebook.com/
@@ -25,6 +24,8 @@ DEPENDS+=	${PYPKGPREFIX}-cssutils>=0.9.7:../../textproc/py-cssutils
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 DEPENDS+=	${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
 DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
+DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -63,6 +64,7 @@ FIX_PYTHON+=	src/calibre/devices/kobo/*.py
 FIX_PYTHON+=	src/calibre/devices/prs505/*.py
 FIX_PYTHON+=	src/calibre/devices/prst1/*.py
 FIX_PYTHON+=	src/calibre/devices/teclast/*.py
+FIX_PYTHON+=	src/calibre/ebooks/*.py
 FIX_PYTHON+=	src/calibre/ebooks/chm/*.py
 FIX_PYTHON+=	src/calibre/ebooks/comic/*.py
 FIX_PYTHON+=	src/calibre/ebooks/compression/*.py
@@ -84,6 +86,8 @@ FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/*.py
 FIX_PYTHON+=	src/calibre/ebooks/mobi/*.py
 FIX_PYTHON+=	src/calibre/ebooks/mobi/writer2/*.py
 FIX_PYTHON+=	src/calibre/ebooks/odt/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/*.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/display/test-cfi/*.py
 FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/*.py
 FIX_PYTHON+=	src/calibre/ebooks/pdf/__init__.py
 FIX_PYTHON+=	src/calibre/ebooks/pdf/reflow.py
@@ -156,7 +160,7 @@ MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
 pre-configure:
-	cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf
+	cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
 
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 032bf2478f9..1e1261e3b34 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/12/06 20:16:16 gls Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/01/21 17:53:32 gls Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -33,6 +33,7 @@ lib/calibre/calibre/db/backend.py
 lib/calibre/calibre/db/cache.py
 lib/calibre/calibre/db/errors.py
 lib/calibre/calibre/db/fields.py
+lib/calibre/calibre/db/lazy.py
 lib/calibre/calibre/db/locking.py
 lib/calibre/calibre/db/schema_upgrades.py
 lib/calibre/calibre/db/tables.py
@@ -129,41 +130,7 @@ lib/calibre/calibre/ebooks/__init__.py
 lib/calibre/calibre/ebooks/azw4/__init__.py
 lib/calibre/calibre/ebooks/azw4/input.py
 lib/calibre/calibre/ebooks/azw4/reader.py
-lib/calibre/calibre/ebooks/chardet/__init__.py
-lib/calibre/calibre/ebooks/chardet/big5freq.py
-lib/calibre/calibre/ebooks/chardet/big5prober.py
-lib/calibre/calibre/ebooks/chardet/chardistribution.py
-lib/calibre/calibre/ebooks/chardet/charsetgroupprober.py
-lib/calibre/calibre/ebooks/chardet/charsetprober.py
-lib/calibre/calibre/ebooks/chardet/codingstatemachine.py
-lib/calibre/calibre/ebooks/chardet/constants.py
-lib/calibre/calibre/ebooks/chardet/escprober.py
-lib/calibre/calibre/ebooks/chardet/escsm.py
-lib/calibre/calibre/ebooks/chardet/eucjpprober.py
-lib/calibre/calibre/ebooks/chardet/euckrfreq.py
-lib/calibre/calibre/ebooks/chardet/euckrprober.py
-lib/calibre/calibre/ebooks/chardet/euctwfreq.py
-lib/calibre/calibre/ebooks/chardet/euctwprober.py
-lib/calibre/calibre/ebooks/chardet/gb2312freq.py
-lib/calibre/calibre/ebooks/chardet/gb2312prober.py
-lib/calibre/calibre/ebooks/chardet/hebrewprober.py
-lib/calibre/calibre/ebooks/chardet/jisfreq.py
-lib/calibre/calibre/ebooks/chardet/jpcntx.py
-lib/calibre/calibre/ebooks/chardet/langbulgarianmodel.py
-lib/calibre/calibre/ebooks/chardet/langcyrillicmodel.py
-lib/calibre/calibre/ebooks/chardet/langgreekmodel.py
-lib/calibre/calibre/ebooks/chardet/langhebrewmodel.py
-lib/calibre/calibre/ebooks/chardet/langhungarianmodel.py
-lib/calibre/calibre/ebooks/chardet/langthaimodel.py
-lib/calibre/calibre/ebooks/chardet/latin1prober.py
-lib/calibre/calibre/ebooks/chardet/mbcharsetprober.py
-lib/calibre/calibre/ebooks/chardet/mbcsgroupprober.py
-lib/calibre/calibre/ebooks/chardet/mbcssm.py
-lib/calibre/calibre/ebooks/chardet/sbcharsetprober.py
-lib/calibre/calibre/ebooks/chardet/sbcsgroupprober.py
-lib/calibre/calibre/ebooks/chardet/sjisprober.py
-lib/calibre/calibre/ebooks/chardet/universaldetector.py
-lib/calibre/calibre/ebooks/chardet/utf8prober.py
+lib/calibre/calibre/ebooks/chardet.py
 lib/calibre/calibre/ebooks/chm/__init__.py
 lib/calibre/calibre/ebooks/chm/input.py
 lib/calibre/calibre/ebooks/chm/metadata.py
@@ -331,9 +298,10 @@ lib/calibre/calibre/ebooks/odt/__init__.py
 lib/calibre/calibre/ebooks/odt/input.py
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
-lib/calibre/calibre/ebooks/oeb/entitydefs.py
+lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
 lib/calibre/calibre/ebooks/oeb/iterator.py
 lib/calibre/calibre/ebooks/oeb/output.py
+lib/calibre/calibre/ebooks/oeb/parse_utils.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
 lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
@@ -795,7 +763,9 @@ lib/calibre/calibre/gui2/store/search_result.py
 lib/calibre/calibre/gui2/store/search_ui.py
 lib/calibre/calibre/gui2/store/stores/__init__.py
 lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
@@ -867,7 +837,7 @@ lib/calibre/calibre/gui2/viewer/config_ui.py
 lib/calibre/calibre/gui2/viewer/dictionary.py
 lib/calibre/calibre/gui2/viewer/documentview.py
 lib/calibre/calibre/gui2/viewer/flip.py
-lib/calibre/calibre/gui2/viewer/gestures.py
+lib/calibre/calibre/gui2/viewer/javascript.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
 lib/calibre/calibre/gui2/viewer/main_ui.py
@@ -973,7 +943,10 @@ lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
 lib/calibre/calibre/utils/ipc/proxy.py
 lib/calibre/calibre/utils/ipc/server.py
+lib/calibre/calibre/utils/ipc/simple_worker.py
 lib/calibre/calibre/utils/ipc/worker.py
+lib/calibre/calibre/utils/ipython.py
+lib/calibre/calibre/utils/linux_trash.py
 lib/calibre/calibre/utils/localization.py
 lib/calibre/calibre/utils/lock.py
 lib/calibre/calibre/utils/logging.py
@@ -1004,6 +977,7 @@ lib/calibre/calibre/utils/recycle_bin.py
 lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/search_query_parser.py
+lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
 lib/calibre/calibre/utils/sigil.py
 lib/calibre/calibre/utils/smartypants.py
@@ -1153,6 +1127,7 @@ share/calibre/content_server/star-half.png
 share/calibre/content_server/star-off.png
 share/calibre/content_server/star-on.png
 share/calibre/default_tweaks.py
+share/calibre/display/cfi.js
 share/calibre/ebook-convert-complete.pickle
 share/calibre/fonts/liberation/LiberationMono-Bold.ttf
 share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
@@ -1449,11 +1424,14 @@ share/calibre/recipes/biggovernment.recipe
 share/calibre/recipes/bighollywood.recipe
 share/calibre/recipes/bild_de.recipe
 share/calibre/recipes/billorielly.recipe
+share/calibre/recipes/biolog_pl.recipe
 share/calibre/recipes/birgun_gazetesi.recipe
+share/calibre/recipes/birmingham_post.recipe
 share/calibre/recipes/bitacora.recipe
 share/calibre/recipes/biz_portal.recipe
 share/calibre/recipes/blic.recipe
 share/calibre/recipes/blog_da_cidadania.recipe
+share/calibre/recipes/blues.recipe
 share/calibre/recipes/boortz.recipe
 share/calibre/recipes/borba.recipe
 share/calibre/recipes/borse_online.recipe
@@ -1518,6 +1496,7 @@ share/calibre/recipes/clic_rbs.recipe
 share/calibre/recipes/climate_progress.recipe
 share/calibre/recipes/cm_journal.recipe
 share/calibre/recipes/cnd.recipe
+share/calibre/recipes/cnd_weekly.recipe
 share/calibre/recipes/cnetjapan.recipe
 share/calibre/recipes/cnetjapan_digital.recipe
 share/calibre/recipes/cnetjapan_release.recipe
@@ -1528,6 +1507,7 @@ share/calibre/recipes/columbusdispatch.recipe
 share/calibre/recipes/comics_com.recipe
 share/calibre/recipes/common_dreams.recipe
 share/calibre/recipes/computer_active.recipe
+share/calibre/recipes/computerworld_pl.recipe
 share/calibre/recipes/consumerist.recipe
 share/calibre/recipes/corren2.recipe
 share/calibre/recipes/corriere_della_sera_en.recipe
@@ -1562,6 +1542,7 @@ share/calibre/recipes/danas.recipe
 share/calibre/recipes/dani.recipe
 share/calibre/recipes/dark_horizons.recipe
 share/calibre/recipes/darknet.recipe
+share/calibre/recipes/datasport.recipe
 share/calibre/recipes/daum_net.recipe
 share/calibre/recipes/dawn.recipe
 share/calibre/recipes/daytona_beach.recipe
@@ -1577,7 +1558,9 @@ share/calibre/recipes/denver_post.recipe
 share/calibre/recipes/der_spiegel.recipe
 share/calibre/recipes/der_standard.recipe
 share/calibre/recipes/deredactie.recipe
+share/calibre/recipes/derin_dusunce.recipe
 share/calibre/recipes/descopera.recipe
+share/calibre/recipes/descopera_org.recipe
 share/calibre/recipes/detroit_news.recipe
 share/calibre/recipes/deutsche_welle_bs.recipe
 share/calibre/recipes/deutsche_welle_en.recipe
@@ -1616,15 +1599,20 @@ share/calibre/recipes/dotpod.recipe
 share/calibre/recipes/down_to_earth.recipe
 share/calibre/recipes/dr_dk.recipe
 share/calibre/recipes/drivelry.recipe
+share/calibre/recipes/dunya_bizim.recipe
+share/calibre/recipes/dunya_bulteni.recipe
 share/calibre/recipes/dvhn.recipe
 share/calibre/recipes/dzieje_pl.recipe
+share/calibre/recipes/dziennik_pl.recipe
 share/calibre/recipes/e_novine.recipe
+share/calibre/recipes/echo_online.recipe
 share/calibre/recipes/eclicto.recipe
 share/calibre/recipes/ecogeek.recipe
 share/calibre/recipes/economist.recipe
 share/calibre/recipes/economist_free.recipe
 share/calibre/recipes/ecotrend.recipe
 share/calibre/recipes/ecuisine.recipe
+share/calibre/recipes/edge_conversations.recipe
 share/calibre/recipes/editor_and_publisher.recipe
 share/calibre/recipes/edmonton_journal.recipe
 share/calibre/recipes/egirl.recipe
@@ -1655,6 +1643,7 @@ share/calibre/recipes/elcomercio.recipe
 share/calibre/recipes/elcronista.recipe
 share/calibre/recipes/ele.recipe
 share/calibre/recipes/elektroda_pl.recipe
+share/calibre/recipes/elet_es_irodalom.recipe
 share/calibre/recipes/elmundo.recipe
 share/calibre/recipes/elpais_impreso.recipe
 share/calibre/recipes/elpais_semanal.recipe
@@ -1667,6 +1656,7 @@ share/calibre/recipes/eluniversalimpresa.recipe
 share/calibre/recipes/eluniverso_ec.recipe
 share/calibre/recipes/emg_en.recipe
 share/calibre/recipes/emg_rs.recipe
+share/calibre/recipes/emuzica_pl.recipe
 share/calibre/recipes/endgadget.recipe
 share/calibre/recipes/endgadget_ja.recipe
 share/calibre/recipes/entrepeneur.recipe
@@ -1696,6 +1686,7 @@ share/calibre/recipes/fastcompany.recipe
 share/calibre/recipes/faznet.recipe
 share/calibre/recipes/fe_india.recipe
 share/calibre/recipes/felicia.recipe
+share/calibre/recipes/fhm_uk.recipe
 share/calibre/recipes/fhmro.recipe
 share/calibre/recipes/film_web.recipe
 share/calibre/recipes/financial_times.recipe
@@ -1703,6 +1694,7 @@ share/calibre/recipes/financial_times_uk.recipe
 share/calibre/recipes/financialsense.recipe
 share/calibre/recipes/financiarul.recipe
 share/calibre/recipes/financieele_dagblad.recipe
+share/calibre/recipes/fisco_oggi.recipe
 share/calibre/recipes/fleshbot.recipe
 share/calibre/recipes/flickr.recipe
 share/calibre/recipes/flickr_es.recipe
@@ -1757,6 +1749,7 @@ share/calibre/recipes/globe_and_mail.recipe
 share/calibre/recipes/globes_co_il.recipe
 share/calibre/recipes/go4it.recipe
 share/calibre/recipes/go_comics.recipe
+share/calibre/recipes/goal.recipe
 share/calibre/recipes/golem_de.recipe
 share/calibre/recipes/good_house_keeping.recipe
 share/calibre/recipes/good_to_know.recipe
@@ -1764,6 +1757,7 @@ share/calibre/recipes/googlemobileblog.recipe
 share/calibre/recipes/gosc_niedzielny.recipe
 share/calibre/recipes/gram_pl.recipe
 share/calibre/recipes/granma.recipe
+share/calibre/recipes/grantland.recipe
 share/calibre/recipes/greader.recipe
 share/calibre/recipes/greader_uber.recipe
 share/calibre/recipes/greenlinux_pl.recipe
@@ -1783,7 +1777,9 @@ share/calibre/recipes/h7_tumspor.recipe
 share/calibre/recipes/haaretz_en.recipe
 share/calibre/recipes/haber7.recipe
 share/calibre/recipes/hackernews.recipe
+share/calibre/recipes/haksoz.recipe
 share/calibre/recipes/hallo_assen.recipe
+share/calibre/recipes/hamilton_spectator.recipe
 share/calibre/recipes/handelsblatt.recipe
 share/calibre/recipes/hankyoreh.recipe
 share/calibre/recipes/hankyoreh21.recipe
@@ -1821,6 +1817,9 @@ share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
 share/calibre/recipes/hvg.recipe
 share/calibre/recipes/ibm_smarter_planet.recipe
+share/calibre/recipes/ideal_almeria.recipe
+share/calibre/recipes/ideal_granada.recipe
+share/calibre/recipes/ideal_jaen.recipe
 share/calibre/recipes/idg_now.recipe
 share/calibre/recipes/idg_se.recipe
 share/calibre/recipes/idnes.recipe
@@ -1829,6 +1828,7 @@ share/calibre/recipes/ieeespectrum.recipe
 share/calibre/recipes/ifzm.recipe
 share/calibre/recipes/ihned.recipe
 share/calibre/recipes/iht.recipe
+share/calibre/recipes/iktibas.recipe
 share/calibre/recipes/il_fatto.recipe
 share/calibre/recipes/il_giornale.recipe
 share/calibre/recipes/il_messaggero.recipe
@@ -1859,6 +1859,7 @@ share/calibre/recipes/ionline_pt.recipe
 share/calibre/recipes/iprofesional.recipe
 share/calibre/recipes/irish_independent.recipe
 share/calibre/recipes/irish_times.recipe
+share/calibre/recipes/izdiham.com.recipe
 share/calibre/recipes/izvestia.recipe
 share/calibre/recipes/jakarta_post.recipe
 share/calibre/recipes/jalopnik.recipe
@@ -1902,6 +1903,7 @@ share/calibre/recipes/kopalniawiedzy.recipe
 share/calibre/recipes/korben.recipe
 share/calibre/recipes/korea_herald.recipe
 share/calibre/recipes/korespondent.recipe
+share/calibre/recipes/kosmonauta_pl.recipe
 share/calibre/recipes/kotaku.recipe
 share/calibre/recipes/krstarica.recipe
 share/calibre/recipes/krstarica_en.recipe
@@ -1941,6 +1943,7 @@ share/calibre/recipes/le_monde.recipe
 share/calibre/recipes/le_temps.recipe
 share/calibre/recipes/ledevoir.recipe
 share/calibre/recipes/leduc.recipe
+share/calibre/recipes/lega_nerd.recipe
 share/calibre/recipes/legeartis.recipe
 share/calibre/recipes/leggo_it.recipe
 share/calibre/recipes/legitymizm.recipe
@@ -1975,6 +1978,7 @@ share/calibre/recipes/lwn_weekly.recipe
 share/calibre/recipes/mac_video.recipe
 share/calibre/recipes/mac_world.recipe
 share/calibre/recipes/mac_world_uk.recipe
+share/calibre/recipes/macity.recipe
 share/calibre/recipes/macleans.recipe
 share/calibre/recipes/mail_and_guardian.recipe
 share/calibre/recipes/mainichi.recipe
@@ -2008,11 +2012,13 @@ share/calibre/recipes/ming_pao.recipe
 share/calibre/recipes/ming_pao_toronto.recipe
 share/calibre/recipes/ming_pao_vancouver.recipe
 share/calibre/recipes/miradasalsur.recipe
+share/calibre/recipes/mlody_technik_pl.recipe
 share/calibre/recipes/mmc_rtv.recipe
 share/calibre/recipes/modoros.recipe
 share/calibre/recipes/moldovaazi.recipe
 share/calibre/recipes/mondedurable.recipe
 share/calibre/recipes/monden.recipe
+share/calibre/recipes/money_pl.recipe
 share/calibre/recipes/moneycontrol.recipe
 share/calibre/recipes/moneynews.recipe
 share/calibre/recipes/moneyro.recipe
@@ -2024,6 +2030,7 @@ share/calibre/recipes/motherjones.recipe
 share/calibre/recipes/msdnmag_en.recipe
 share/calibre/recipes/msnbc.recipe
 share/calibre/recipes/msnsankei.recipe
+share/calibre/recipes/mwjournal.recipe
 share/calibre/recipes/nacional_cro.recipe
 share/calibre/recipes/nacionred.recipe
 share/calibre/recipes/naczytniki.recipe
@@ -2073,10 +2080,13 @@ share/calibre/recipes/njp.recipe
 share/calibre/recipes/njuz_net.recipe
 share/calibre/recipes/nme.recipe
 share/calibre/recipes/noaa.recipe
+share/calibre/recipes/nol.recipe
 share/calibre/recipes/nortecastilla.recipe
 share/calibre/recipes/noticias_r7.recipe
 share/calibre/recipes/noticias_unb.recipe
 share/calibre/recipes/novaya_gazeta.recipe
+share/calibre/recipes/novilist_novine_hr.recipe
+share/calibre/recipes/novilist_portal_hr.recipe
 share/calibre/recipes/novinite.recipe
 share/calibre/recipes/novinky.recipe
 share/calibre/recipes/novistandard.recipe
@@ -2116,7 +2126,9 @@ share/calibre/recipes/omgubuntu.recipe
 share/calibre/recipes/onemagazine.recipe
 share/calibre/recipes/onionavclub.recipe
 share/calibre/recipes/open_left.recipe
+share/calibre/recipes/opinion_bo.recipe
 share/calibre/recipes/oregonian.recipe
+share/calibre/recipes/oreilly_premium.recipe
 share/calibre/recipes/oriental_daily.recipe
 share/calibre/recipes/orlando_sentinel.recipe
 share/calibre/recipes/orsai.recipe
@@ -2127,6 +2139,7 @@ share/calibre/recipes/outlook_india.recipe
 share/calibre/recipes/pagina12.recipe
 share/calibre/recipes/pagina_12_print_ed.recipe
 share/calibre/recipes/pajama.recipe
+share/calibre/recipes/pambianco.recipe
 share/calibre/recipes/panorama.recipe
 share/calibre/recipes/paperli_topic.recipe
 share/calibre/recipes/patente_de_corso.recipe
@@ -2174,6 +2187,7 @@ share/calibre/recipes/pro_physik.recipe
 share/calibre/recipes/projo.recipe
 share/calibre/recipes/promotor.recipe
 share/calibre/recipes/propublica.recipe
+share/calibre/recipes/prospectmaguk.recipe
 share/calibre/recipes/prosport.recipe
 share/calibre/recipes/prostamerika.recipe
 share/calibre/recipes/protagon.recipe
@@ -2211,6 +2225,7 @@ share/calibre/recipes/rheinische_post.recipe
 share/calibre/recipes/ria_ru.recipe
 share/calibre/recipes/rian_eng.recipe
 share/calibre/recipes/rian_spa.recipe
+share/calibre/recipes/rionegro.recipe
 share/calibre/recipes/rmf24_ESKN.recipe
 share/calibre/recipes/rmf24_fakty.recipe
 share/calibre/recipes/rmf24_opinie.recipe
@@ -2225,9 +2240,11 @@ share/calibre/recipes/rtnews.recipe
 share/calibre/recipes/rts.recipe
 share/calibre/recipes/rue89.recipe
 share/calibre/recipes/rusiahoy.recipe
+share/calibre/recipes/rynek_zdrowia.recipe
 share/calibre/recipes/rzeczpospolita.recipe
 share/calibre/recipes/sabah.recipe
 share/calibre/recipes/salon.recipe
+share/calibre/recipes/salonica_press_news.recipe
 share/calibre/recipes/samanyolu_haber.recipe
 share/calibre/recipes/samanyolu_teknoloji.recipe
 share/calibre/recipes/san_fran_chronicle.recipe
@@ -2258,7 +2275,9 @@ share/calibre/recipes/sign_on_sd.recipe
 share/calibre/recipes/silicon_republic.recipe
 share/calibre/recipes/sinfest.recipe
 share/calibre/recipes/singtao_daily.recipe
+share/calibre/recipes/singtaohk.recipe
 share/calibre/recipes/siol.recipe
+share/calibre/recipes/sivil_dusunce.recipe
 share/calibre/recipes/sizinti_derigisi.recipe
 share/calibre/recipes/skai.recipe
 share/calibre/recipes/skeptic.recipe
@@ -2309,6 +2328,7 @@ share/calibre/recipes/taggeschau_de.recipe
 share/calibre/recipes/taipei.recipe
 share/calibre/recipes/tanea.recipe
 share/calibre/recipes/tanjug.recipe
+share/calibre/recipes/tasfiye_dergisi.recipe
 share/calibre/recipes/taz.recipe
 share/calibre/recipes/taz_rss.recipe
 share/calibre/recipes/tech_world.recipe
@@ -2357,6 +2377,7 @@ share/calibre/recipes/thn.recipe
 share/calibre/recipes/tidbits.recipe
 share/calibre/recipes/tijd.recipe
 share/calibre/recipes/tijolaco.recipe
+share/calibre/recipes/tillsonburg.recipe
 share/calibre/recipes/time_magazine.recipe
 share/calibre/recipes/times_online.recipe
 share/calibre/recipes/timesnewroman.recipe
@@ -2378,9 +2399,12 @@ share/calibre/recipes/trouw.recipe
 share/calibre/recipes/trv.recipe
 share/calibre/recipes/tsn.recipe
 share/calibre/recipes/tulsaworld.recipe
+share/calibre/recipes/tuttojove.recipe
 share/calibre/recipes/tuttosport.recipe
 share/calibre/recipes/tvmania.recipe
+share/calibre/recipes/tvxs.recipe
 share/calibre/recipes/tweakers.recipe
+share/calibre/recipes/tweakers_net.recipe
 share/calibre/recipes/twitchfilms.recipe
 share/calibre/recipes/twtfb.recipe
 share/calibre/recipes/tyzden.recipe
@@ -2405,6 +2429,7 @@ share/calibre/recipes/veintitres.recipe
 share/calibre/recipes/version2.recipe
 share/calibre/recipes/vic_times.recipe
 share/calibre/recipes/vijesti.recipe
+share/calibre/recipes/villagevoice.recipe
 share/calibre/recipes/vio_mundo.recipe
 share/calibre/recipes/virtualshackles.recipe
 share/calibre/recipes/vitalia.recipe
@@ -2435,6 +2460,7 @@ share/calibre/recipes/winsupersite.recipe
 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/wnp.recipe
 share/calibre/recipes/words_without_borders.recipe
@@ -2479,42 +2505,7 @@ share/calibre/templates/rtf.xsl
 share/calibre/tracer.epub
 share/calibre/viewer/bookmarks.js
 share/calibre/viewer/hyphenate/Hyphenator.js
-share/calibre/viewer/hyphenate/patterns/be.js
-share/calibre/viewer/hyphenate/patterns/bn.js
-share/calibre/viewer/hyphenate/patterns/cs.js
-share/calibre/viewer/hyphenate/patterns/da.js
-share/calibre/viewer/hyphenate/patterns/de.js
-share/calibre/viewer/hyphenate/patterns/el-monoton.js
-share/calibre/viewer/hyphenate/patterns/el-polyton.js
-share/calibre/viewer/hyphenate/patterns/en-gb.js
-share/calibre/viewer/hyphenate/patterns/en-us.js
-share/calibre/viewer/hyphenate/patterns/es.js
-share/calibre/viewer/hyphenate/patterns/fi.js
-share/calibre/viewer/hyphenate/patterns/fr.js
-share/calibre/viewer/hyphenate/patterns/grc.js
-share/calibre/viewer/hyphenate/patterns/gu.js
-share/calibre/viewer/hyphenate/patterns/hi.js
-share/calibre/viewer/hyphenate/patterns/hu.js
-share/calibre/viewer/hyphenate/patterns/hy.js
-share/calibre/viewer/hyphenate/patterns/it.js
-share/calibre/viewer/hyphenate/patterns/kn.js
-share/calibre/viewer/hyphenate/patterns/la.js
-share/calibre/viewer/hyphenate/patterns/lt.js
-share/calibre/viewer/hyphenate/patterns/lv.js
-share/calibre/viewer/hyphenate/patterns/ml.js
-share/calibre/viewer/hyphenate/patterns/nl.js
-share/calibre/viewer/hyphenate/patterns/no-nb.js
-share/calibre/viewer/hyphenate/patterns/or.js
-share/calibre/viewer/hyphenate/patterns/pa.js
-share/calibre/viewer/hyphenate/patterns/pl.js
-share/calibre/viewer/hyphenate/patterns/pt.js
-share/calibre/viewer/hyphenate/patterns/ru.js
-share/calibre/viewer/hyphenate/patterns/sl.js
-share/calibre/viewer/hyphenate/patterns/sv.js
-share/calibre/viewer/hyphenate/patterns/ta.js
-share/calibre/viewer/hyphenate/patterns/te.js
-share/calibre/viewer/hyphenate/patterns/tr.js
-share/calibre/viewer/hyphenate/patterns/uk.js
+share/calibre/viewer/hyphenate/patterns.zip
 share/calibre/viewer/hyphenation.js
 share/calibre/viewer/images.js
 share/calibre/viewer/jquery_scrollTo.js
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 64cc2615fd4..50b2e9e99d4 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2011/12/06 20:16:16 gls Exp $
+$NetBSD: distinfo,v 1.9 2012/01/21 17:53:32 gls Exp $
 
-SHA1 (calibre-0.8.29.tar.gz) = c211880d2c7e7bc9113be5e94dad24b33d5bfb5e
-RMD160 (calibre-0.8.29.tar.gz) = ae0e4f1a3d1b3e0230a939028e6f20d86ea136f6
-Size (calibre-0.8.29.tar.gz) = 38118963 bytes
+SHA1 (calibre-0.8.36.tar.xz) = f034f374e6017a110cbfe58898d22d44a9591f6b
+RMD160 (calibre-0.8.36.tar.xz) = 7ae9a76e8bbb9a4ed8c0bd521bda397a61e473ba
+Size (calibre-0.8.36.tar.xz) = 23581852 bytes
 SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 950f0302f3c387fb9b4ee41cd96d7c5103b7ad45
 SHA1 (patch-src_calibre_linux_py) = 0f4b9c09d2a6de22ca0044895e1ab35184ae7d72