calibre: update to 3.16.0.

Lots of changes since 2.x, too many to list here.
(2.x does not build against current qt5...)

6 files changed, 95 insertions, 276 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 17a3004a57c..5e48f383c66 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.192 2018/01/10 22:16:25 wiz Exp $
+# $NetBSD: Makefile,v 1.193 2018/02/01 16:05:56 wiz Exp $
 
-DISTNAME=	calibre-2.85.1
-PKGREVISION=	8
+DISTNAME=	calibre-3.16.0
 CATEGORIES=	misc
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
@@ -13,36 +12,29 @@ HOMEPAGE=	http://www.calibre-ebook.com/
 COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
-#DEPENDS+=	help2man>=1.36.4:../../converters/help2man
-DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
-#DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
-DEPENDS+=	${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
-DEPENDS+=	${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
+DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+DEPENDS+=	${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
 DEPENDS+=	${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
+DEPENDS+=	${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
+DEPENDS+=	${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
-DEPENDS+=	${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
-DEPENDS+=	${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
-DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
-# not sure if pkgsrc version would be ok or not
-#DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-# includes own, modified copy of html5lib
-#DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+DEPENDS+=	${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
-DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+# for installation
+BUILD_DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 
 EXTRACT_USING=	bsdtar
 
+PYTHON_VERSIONS_ACCEPTED=	27 # as of 3.16.0
+
 USE_LANGUAGES=			c c++
 USE_LIBTOOL=			yes
 USE_TOOLS+=			pkg-config pax
-PYTHON_VERSIONS_ACCEPTED=	27
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup
-PYDISTUTILSPKG=			yes
 PYSETUPOPTARGS=			# empty
 PYSETUPINSTALLARGS=		--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
 
@@ -90,11 +82,6 @@ MAKE_ENV+=		PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
 MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 MAKE_ENV+=		SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
 MAKE_ENV+=		LFLAGS=${LDFLAGS:Q}
-#MAKE_ENV+=		WITH_USB=no
-
-# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-pre-configure:
-	cd ${WRKSRC} && rm -rf src/cherrypy
 
 # Turn off x bits on non-executable files.
 post-extract:
@@ -103,15 +90,12 @@ post-extract:
 	chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
 	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 
-# not sure why libheadless installed into wrong directory
-# side effect of patch-setup_extensions.py?
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
 	    ${DESTDIR}${PREFIX}/share/calibre/recipes
 	cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
 	    COPYRIGHT INSTALL LICENSE.* \
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
-	cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
 	${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
 
 .include "../../lang/python/application.mk"
@@ -130,7 +114,6 @@ _PYSETUPTOOLSINSTALLARGS=	# empty
 # Get rid of --root=${DESTDIR}, use our own version from above instead.
 # because the setup.py is not the standard one and behaves differently.
 _PYSETUPINSTALLARGS=	${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
-#.include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.8.2
 .include "../../print/podofo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.20.2
@@ -143,9 +126,7 @@ BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../textproc/py-elementtree/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-qt5+=	${PYPKGPREFIX}-qt5>=5.4
 .include "../../x11/py-qt5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 913939f3e89..7c43aabf54a 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.82 2017/05/16 13:37:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.83 2018/02/01 16:05:56 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -33,6 +33,31 @@ lib/calibre/calibre/db/backend.py
 lib/calibre/calibre/db/backup.py
 lib/calibre/calibre/db/cache.py
 lib/calibre/calibre/db/categories.py
+lib/calibre/calibre/db/cli/__init__.py
+lib/calibre/calibre/db/cli/cmd_add.py
+lib/calibre/calibre/db/cli/cmd_add_custom_column.py
+lib/calibre/calibre/db/cli/cmd_add_format.py
+lib/calibre/calibre/db/cli/cmd_backup_metadata.py
+lib/calibre/calibre/db/cli/cmd_catalog.py
+lib/calibre/calibre/db/cli/cmd_check_library.py
+lib/calibre/calibre/db/cli/cmd_clone.py
+lib/calibre/calibre/db/cli/cmd_custom_columns.py
+lib/calibre/calibre/db/cli/cmd_embed_metadata.py
+lib/calibre/calibre/db/cli/cmd_export.py
+lib/calibre/calibre/db/cli/cmd_list.py
+lib/calibre/calibre/db/cli/cmd_list_categories.py
+lib/calibre/calibre/db/cli/cmd_remove.py
+lib/calibre/calibre/db/cli/cmd_remove_custom_column.py
+lib/calibre/calibre/db/cli/cmd_remove_format.py
+lib/calibre/calibre/db/cli/cmd_restore_database.py
+lib/calibre/calibre/db/cli/cmd_saved_searches.py
+lib/calibre/calibre/db/cli/cmd_search.py
+lib/calibre/calibre/db/cli/cmd_set_custom.py
+lib/calibre/calibre/db/cli/cmd_set_metadata.py
+lib/calibre/calibre/db/cli/cmd_show_metadata.py
+lib/calibre/calibre/db/cli/main.py
+lib/calibre/calibre/db/cli/tests.py
+lib/calibre/calibre/db/cli/utils.py
 lib/calibre/calibre/db/delete_service.py
 lib/calibre/calibre/db/errors.py
 lib/calibre/calibre/db/fields.py
@@ -61,9 +86,6 @@ lib/calibre/calibre/debug.py
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
 lib/calibre/calibre/devices/android/driver.py
-lib/calibre/calibre/devices/apple/__init__.py
-lib/calibre/calibre/devices/apple/driver.py
-lib/calibre/calibre/devices/apple/itunes.py
 lib/calibre/calibre/devices/binatone/__init__.py
 lib/calibre/calibre/devices/binatone/driver.py
 lib/calibre/calibre/devices/blackberry/__init__.py
@@ -88,9 +110,6 @@ lib/calibre/calibre/devices/hanlin/__init__.py
 lib/calibre/calibre/devices/hanlin/driver.py
 lib/calibre/calibre/devices/hanvon/__init__.py
 lib/calibre/calibre/devices/hanvon/driver.py
-lib/calibre/calibre/devices/idevice/__init__.py
-lib/calibre/calibre/devices/idevice/libimobiledevice.py
-lib/calibre/calibre/devices/idevice/parse_xml.py
 lib/calibre/calibre/devices/iliad/__init__.py
 lib/calibre/calibre/devices/iliad/driver.py
 lib/calibre/calibre/devices/interface.py
@@ -336,6 +355,7 @@ lib/calibre/calibre/ebooks/metadata/book/base.py
 lib/calibre/calibre/ebooks/metadata/book/formatter.py
 lib/calibre/calibre/ebooks/metadata/book/json_codec.py
 lib/calibre/calibre/ebooks/metadata/book/render.py
+lib/calibre/calibre/ebooks/metadata/book/serialize.py
 lib/calibre/calibre/ebooks/metadata/cli.py
 lib/calibre/calibre/ebooks/metadata/docx.py
 lib/calibre/calibre/ebooks/metadata/epub.py
@@ -691,6 +711,7 @@ lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
+lib/calibre/calibre/gui2/changes.py
 lib/calibre/calibre/gui2/comments_editor.py
 lib/calibre/calibre/gui2/complete2.py
 lib/calibre/calibre/gui2/convert/__init__.py
@@ -831,8 +852,6 @@ lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
 lib/calibre/calibre/gui2/dialogs/search.py
-lib/calibre/calibre/gui2/dialogs/search_item_ui.py
-lib/calibre/calibre/gui2/dialogs/search_ui.py
 lib/calibre/calibre/gui2/dialogs/select_formats.py
 lib/calibre/calibre/gui2/dialogs/smartdevice.py
 lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
@@ -851,6 +870,7 @@ lib/calibre/calibre/gui2/ebook_download.py
 lib/calibre/calibre/gui2/email.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
 lib/calibre/calibre/gui2/font_family_chooser.py
+lib/calibre/calibre/gui2/gestures.py
 lib/calibre/calibre/gui2/icon_theme.py
 lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/job_indicator.py
@@ -858,12 +878,14 @@ lib/calibre/calibre/gui2/jobs.py
 lib/calibre/calibre/gui2/keyboard.py
 lib/calibre/calibre/gui2/languages.py
 lib/calibre/calibre/gui2/layout.py
+lib/calibre/calibre/gui2/layout_menu.py
 lib/calibre/calibre/gui2/library/__init__.py
 lib/calibre/calibre/gui2/library/alternate_views.py
 lib/calibre/calibre/gui2/library/caches.py
 lib/calibre/calibre/gui2/library/delegates.py
 lib/calibre/calibre/gui2/library/models.py
 lib/calibre/calibre/gui2/library/views.py
+lib/calibre/calibre/gui2/linux_file_dialogs.py
 lib/calibre/calibre/gui2/lrf_renderer/__init__.py
 lib/calibre/calibre/gui2/lrf_renderer/bookview.py
 lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@@ -920,7 +942,6 @@ lib/calibre/calibre/gui2/preferences/search_ui.py
 lib/calibre/calibre/gui2/preferences/sending.py
 lib/calibre/calibre/gui2/preferences/sending_ui.py
 lib/calibre/calibre/gui2/preferences/server.py
-lib/calibre/calibre/gui2/preferences/server_ui.py
 lib/calibre/calibre/gui2/preferences/template_functions.py
 lib/calibre/calibre/gui2/preferences/template_functions_ui.py
 lib/calibre/calibre/gui2/preferences/texture_chooser.py
@@ -929,6 +950,7 @@ lib/calibre/calibre/gui2/preferences/toolbar_ui.py
 lib/calibre/calibre/gui2/preferences/tweaks.py
 lib/calibre/calibre/gui2/proceed.py
 lib/calibre/calibre/gui2/progress_indicator/__init__.py
+lib/calibre/calibre/gui2/qt_file_dialogs.py
 lib/calibre/calibre/gui2/save.py
 lib/calibre/calibre/gui2/search_box.py
 lib/calibre/calibre/gui2/search_restriction_mixin.py
@@ -978,7 +1000,6 @@ lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
 lib/calibre/calibre/gui2/store/stores/bn_plugin.py
 lib/calibre/calibre/gui2/store/stores/bubok_portugal_plugin.py
 lib/calibre/calibre/gui2/store/stores/bubok_publishing_plugin.py
-lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
 lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
@@ -991,7 +1012,6 @@ lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
 lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
 lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
-lib/calibre/calibre/gui2/store/stores/koobe_plugin.py
 lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
 lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/litres_plugin.py
@@ -1008,17 +1028,14 @@ lib/calibre/calibre/gui2/store/stores/mobileread/models.py
 lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
 lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
 lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
-lib/calibre/calibre/gui2/store/stores/nook_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
 lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
 lib/calibre/calibre/gui2/store/stores/publio_plugin.py
 lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
 lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
-lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
-lib/calibre/calibre/gui2/store/stores/sony_plugin.py
+lib/calibre/calibre/gui2/store/stores/swiatebookow_plugin.py
 lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
-lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
@@ -1140,7 +1157,6 @@ lib/calibre/calibre/library/catalogs/epub_mobi.py
 lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
 lib/calibre/calibre/library/catalogs/utils.py
 lib/calibre/calibre/library/check_library.py
-lib/calibre/calibre/library/cli.py
 lib/calibre/calibre/library/coloring.py
 lib/calibre/calibre/library/comments.py
 lib/calibre/calibre/library/custom_columns.py
@@ -1151,29 +1167,15 @@ lib/calibre/calibre/library/prefs.py
 lib/calibre/calibre/library/restore.py
 lib/calibre/calibre/library/save_to_disk.py
 lib/calibre/calibre/library/schema_upgrades.py
-lib/calibre/calibre/library/server/__init__.py
-lib/calibre/calibre/library/server/ajax.py
-lib/calibre/calibre/library/server/base.py
-lib/calibre/calibre/library/server/browse.py
-lib/calibre/calibre/library/server/cache.py
-lib/calibre/calibre/library/server/content.py
-lib/calibre/calibre/library/server/main.py
-lib/calibre/calibre/library/server/mobile.py
-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_cli.py
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/linux.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
-lib/calibre/calibre/plugins/_regex.so
 lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
-lib/calibre/calibre/plugins/dukpy.so
 lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html.so
 lib/calibre/calibre/plugins/hunspell.so
@@ -1192,7 +1194,6 @@ lib/calibre/calibre/plugins/qt_hack.so
 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/zlib2.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
@@ -1206,15 +1207,20 @@ lib/calibre/calibre/srv/auth.py
 lib/calibre/calibre/srv/auto_reload.py
 lib/calibre/calibre/srv/bonjour.py
 lib/calibre/calibre/srv/books.py
+lib/calibre/calibre/srv/cdb.py
+lib/calibre/calibre/srv/changes.py
 lib/calibre/calibre/srv/code.py
 lib/calibre/calibre/srv/content.py
+lib/calibre/calibre/srv/embedded.py
 lib/calibre/calibre/srv/errors.py
 lib/calibre/calibre/srv/handler.py
 lib/calibre/calibre/srv/http_request.py
 lib/calibre/calibre/srv/http_response.py
 lib/calibre/calibre/srv/jobs.py
 lib/calibre/calibre/srv/legacy.py
+lib/calibre/calibre/srv/library_broker.py
 lib/calibre/calibre/srv/loop.py
+lib/calibre/calibre/srv/manage_users_cli.py
 lib/calibre/calibre/srv/metadata.py
 lib/calibre/calibre/srv/opds.py
 lib/calibre/calibre/srv/opts.py
@@ -1235,6 +1241,7 @@ lib/calibre/calibre/srv/tests/main.py
 lib/calibre/calibre/srv/tests/routes.py
 lib/calibre/calibre/srv/tests/web_sockets.py
 lib/calibre/calibre/srv/users.py
+lib/calibre/calibre/srv/users_api.py
 lib/calibre/calibre/srv/utils.py
 lib/calibre/calibre/srv/web_socket.py
 lib/calibre/calibre/startup.py
@@ -1338,6 +1345,8 @@ lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/run_tests.py
 lib/calibre/calibre/utils/search_query_parser.py
+lib/calibre/calibre/utils/search_query_parser_test.py
+lib/calibre/calibre/utils/serialize.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
 lib/calibre/calibre/utils/shared_file.py
@@ -1350,9 +1359,11 @@ lib/calibre/calibre/utils/soupparser.py
 lib/calibre/calibre/utils/speedups.py
 lib/calibre/calibre/utils/spell/__init__.py
 lib/calibre/calibre/utils/terminal.py
+lib/calibre/calibre/utils/test_lock.py
 lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
 lib/calibre/calibre/utils/titlecase.py
+lib/calibre/calibre/utils/unicode_getpass.py
 lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
 lib/calibre/calibre/utils/winreg/__init__.py
@@ -1375,42 +1386,6 @@ lib/calibre/calibre/web/feeds/templates.py
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
 lib/calibre/calibre/web/fetch/utils.py
-lib/calibre/chardet/__init__.py
-lib/calibre/chardet/big5freq.py
-lib/calibre/chardet/big5prober.py
-lib/calibre/chardet/chardistribution.py
-lib/calibre/chardet/charsetgroupprober.py
-lib/calibre/chardet/charsetprober.py
-lib/calibre/chardet/codingstatemachine.py
-lib/calibre/chardet/constants.py
-lib/calibre/chardet/escprober.py
-lib/calibre/chardet/escsm.py
-lib/calibre/chardet/eucjpprober.py
-lib/calibre/chardet/euckrfreq.py
-lib/calibre/chardet/euckrprober.py
-lib/calibre/chardet/euctwfreq.py
-lib/calibre/chardet/euctwprober.py
-lib/calibre/chardet/gb2312freq.py
-lib/calibre/chardet/gb2312prober.py
-lib/calibre/chardet/hebrewprober.py
-lib/calibre/chardet/jisfreq.py
-lib/calibre/chardet/jpcntx.py
-lib/calibre/chardet/langbulgarianmodel.py
-lib/calibre/chardet/langcyrillicmodel.py
-lib/calibre/chardet/langgreekmodel.py
-lib/calibre/chardet/langhebrewmodel.py
-lib/calibre/chardet/langhungarianmodel.py
-lib/calibre/chardet/langthaimodel.py
-lib/calibre/chardet/latin1prober.py
-lib/calibre/chardet/mbcharsetprober.py
-lib/calibre/chardet/mbcsgroupprober.py
-lib/calibre/chardet/mbcssm.py
-lib/calibre/chardet/sbcharsetprober.py
-lib/calibre/chardet/sbcsgroupprober.py
-lib/calibre/chardet/sjisprober.py
-lib/calibre/chardet/test.py
-lib/calibre/chardet/universaldetector.py
-lib/calibre/chardet/utf8prober.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
@@ -1419,42 +1394,6 @@ lib/calibre/css_selectors/select.py
 lib/calibre/css_selectors/tests.py
 lib/calibre/duktape/__init__.py
 lib/calibre/duktape/tests.py
-lib/calibre/html5lib/__init__.py
-lib/calibre/html5lib/constants.py
-lib/calibre/html5lib/filters/__init__.py
-lib/calibre/html5lib/filters/_base.py
-lib/calibre/html5lib/filters/alphabeticalattributes.py
-lib/calibre/html5lib/filters/inject_meta_charset.py
-lib/calibre/html5lib/filters/lint.py
-lib/calibre/html5lib/filters/optionaltags.py
-lib/calibre/html5lib/filters/sanitizer.py
-lib/calibre/html5lib/filters/whitespace.py
-lib/calibre/html5lib/html5parser.py
-lib/calibre/html5lib/ihatexml.py
-lib/calibre/html5lib/inputstream.py
-lib/calibre/html5lib/sanitizer.py
-lib/calibre/html5lib/serializer/__init__.py
-lib/calibre/html5lib/serializer/htmlserializer.py
-lib/calibre/html5lib/tokenizer.py
-lib/calibre/html5lib/treeadapters/__init__.py
-lib/calibre/html5lib/treeadapters/sax.py
-lib/calibre/html5lib/treebuilders/__init__.py
-lib/calibre/html5lib/treebuilders/_base.py
-lib/calibre/html5lib/treebuilders/dom.py
-lib/calibre/html5lib/treebuilders/etree.py
-lib/calibre/html5lib/treebuilders/etree_lxml.py
-lib/calibre/html5lib/treewalkers/__init__.py
-lib/calibre/html5lib/treewalkers/_base.py
-lib/calibre/html5lib/treewalkers/dom.py
-lib/calibre/html5lib/treewalkers/etree.py
-lib/calibre/html5lib/treewalkers/genshistream.py
-lib/calibre/html5lib/treewalkers/lxmletree.py
-lib/calibre/html5lib/treewalkers/pulldom.py
-lib/calibre/html5lib/trie/__init__.py
-lib/calibre/html5lib/trie/_base.py
-lib/calibre/html5lib/trie/datrie.py
-lib/calibre/html5lib/trie/py.py
-lib/calibre/html5lib/utils.py
 lib/calibre/lzma/__init__.py
 lib/calibre/lzma/errors.py
 lib/calibre/lzma/lzma1.py
@@ -1493,15 +1432,6 @@ lib/calibre/odf/text.py
 lib/calibre/odf/thumbnail.py
 lib/calibre/odf/userfield.py
 lib/calibre/odf/xforms.py
-lib/calibre/regex/__init__.py
-lib/calibre/regex/_regex_core.py
-lib/calibre/routes/__init__.py
-lib/calibre/routes/base.py
-lib/calibre/routes/lru.py
-lib/calibre/routes/mapper.py
-lib/calibre/routes/middleware.py
-lib/calibre/routes/route.py
-lib/calibre/routes/util.py
 lib/calibre/templite/__init__.py
 lib/calibre/tinycss/__init__.py
 lib/calibre/tinycss/color3.py
@@ -1548,54 +1478,6 @@ share/calibre/content-server/mathjax.version
 share/calibre/content-server/mathjax.zip.xz
 share/calibre/content-server/mobile.css
 share/calibre/content-server/reset.css
-share/calibre/content_server/av.jpg
-share/calibre/content_server/bg_search_box.png
-share/calibre/content_server/browse/browse.css
-share/calibre/content_server/browse/browse.html
-share/calibre/content_server/browse/browse.js
-share/calibre/content_server/browse/details.html
-share/calibre/content_server/browse/summary.html
-share/calibre/content_server/btn_search_box.png
-share/calibre/content_server/button-donate.png
-share/calibre/content_server/calibre.png
-share/calibre/content_server/calibre_banner.png
-share/calibre/content_server/date.js
-share/calibre/content_server/default_cover.jpg
-share/calibre/content_server/first.png
-share/calibre/content_server/gui.css
-share/calibre/content_server/gui.js
-share/calibre/content_server/index.html
-share/calibre/content_server/jquery.corner.js
-share/calibre/content_server/jquery.js
-share/calibre/content_server/jquery.multiselect.css
-share/calibre/content_server/jquery.multiselect.min.js
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_flat_75_aaaaaa_40x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_25_cb842e_1x400.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_c47a23_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_cb672b_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ffffff_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css
-share/calibre/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.min.js
-share/calibre/content_server/last.png
-share/calibre/content_server/loading.gif
-share/calibre/content_server/logo.png
-share/calibre/content_server/mobile.css
-share/calibre/content_server/next.png
-share/calibre/content_server/previous.png
-share/calibre/content_server/read/monocle.js
-share/calibre/content_server/stacktrace.js
-share/calibre/content_server/star-half.png
-share/calibre/content_server/star-off.png
-share/calibre/content_server/star-on.png
 share/calibre/csscolorparser.js
 share/calibre/default_tweaks.py
 share/calibre/dictionaries/en-GB/en-GB.aff
@@ -1630,6 +1512,7 @@ share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
 share/calibre/images.qrc
 share/calibre/images/add_book.png
+share/calibre/images/apple-touch-icon.png
 share/calibre/images/arrow-down.png
 share/calibre/images/arrow-up.png
 share/calibre/images/auto-reload.png
@@ -1710,12 +1593,14 @@ share/calibre/images/format-list-unordered.png
 share/calibre/images/format-text-bold.png
 share/calibre/images/format-text-color.png
 share/calibre/images/format-text-heading.png
+share/calibre/images/format-text-hr.png
 share/calibre/images/format-text-italic.png
 share/calibre/images/format-text-strikethrough.png
 share/calibre/images/format-text-subscript.png
 share/calibre/images/format-text-superscript.png
 share/calibre/images/format-text-underline.png
 share/calibre/images/forward.png
+share/calibre/images/gear.png
 share/calibre/images/gmail_logo.png
 share/calibre/images/grid.png
 share/calibre/images/help.png
@@ -1800,12 +1685,14 @@ share/calibre/images/polish.png
 share/calibre/images/previous.png
 share/calibre/images/print.png
 share/calibre/images/publisher.png
+share/calibre/images/quickview.png
 share/calibre/images/random.png
 share/calibre/images/rating.png
 share/calibre/images/reader.png
 share/calibre/images/remove_books.png
 share/calibre/images/reports.png
 share/calibre/images/resize.png
+share/calibre/images/restart.png
 share/calibre/images/rotate-right.png
 share/calibre/images/save.png
 share/calibre/images/scheduler.png
@@ -1816,6 +1703,7 @@ share/calibre/images/search_add_saved.png
 share/calibre/images/search_copy_saved.png
 share/calibre/images/search_delete_saved.png
 share/calibre/images/series.png
+share/calibre/images/similar.png
 share/calibre/images/smarten-punctuation.png
 share/calibre/images/snippets.png
 share/calibre/images/sort.png
@@ -1856,6 +1744,7 @@ share/calibre/localization/pykakasi/itaijidict2.pickle
 share/calibre/localization/pykakasi/kanadict2.pickle
 share/calibre/localization/pykakasi/kanwadict2.pickle
 share/calibre/localization/stats.pickle
+share/calibre/localization/website-languages.txt
 share/calibre/metadata_sqlite.sql
 share/calibre/mime.types
 share/calibre/mozilla-ca-certs.pem
@@ -1863,6 +1752,7 @@ 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/quick_start/swe.epub
 share/calibre/rapydscript/compiler.js.xz
 share/calibre/rapydscript/lib/aes.pyj
 share/calibre/rapydscript/lib/elementmaker.pyj
@@ -1882,9 +1772,9 @@ share/calibre/recipes/20_minutos.recipe
 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/7seri.recipe
+share/calibre/recipes/7x7.recipe
 share/calibre/recipes/Ansa.recipe
 share/calibre/recipes/DrawAndCook.recipe
 share/calibre/recipes/ZIVE.sk.recipe
@@ -1914,8 +1804,6 @@ share/calibre/recipes/air_force_times.recipe
 share/calibre/recipes/ajc.recipe
 share/calibre/recipes/ajiajin.recipe
 share/calibre/recipes/aksiyon_derigisi.recipe
-share/calibre/recipes/akter.recipe
-share/calibre/recipes/akter_dnevnik.recipe
 share/calibre/recipes/aktualne.cz.recipe
 share/calibre/recipes/al_ahram.recipe
 share/calibre/recipes/al_jazeera.recipe
@@ -1925,7 +1813,6 @@ share/calibre/recipes/albert_mohler.recipe
 share/calibre/recipes/albertslundlokalavisen_dk.recipe
 share/calibre/recipes/alejakomiksu_com.recipe
 share/calibre/recipes/alleroedlokalavisen_dk.recipe
-share/calibre/recipes/alo_novine.recipe
 share/calibre/recipes/alt_om_herning.recipe
 share/calibre/recipes/alternet.recipe
 share/calibre/recipes/altomdata_dk.recipe
@@ -1940,6 +1827,7 @@ share/calibre/recipes/anandtech.recipe
 share/calibre/recipes/anchorage_daily.recipe
 share/calibre/recipes/android_com_pl.recipe
 share/calibre/recipes/animal_politico.recipe
+share/calibre/recipes/anthony_muroni.recipe
 share/calibre/recipes/antyweb.recipe
 share/calibre/recipes/ap.recipe
 share/calibre/recipes/apcom.recipe
@@ -1954,7 +1842,6 @@ share/calibre/recipes/arbetaren.recipe
 share/calibre/recipes/arcadia.recipe
 share/calibre/recipes/arcamax.recipe
 share/calibre/recipes/arizona_republic.recipe
-share/calibre/recipes/army_times.recipe
 share/calibre/recipes/arret_sur_images.recipe
 share/calibre/recipes/ars_technica.recipe
 share/calibre/recipes/asco_de_vida.recipe
@@ -2005,8 +1892,6 @@ share/calibre/recipes/berlin_policy_journal.recipe
 share/calibre/recipes/berliner_zeitung.recipe
 share/calibre/recipes/berlingske_dk.recipe
 share/calibre/recipes/berria.recipe
-share/calibre/recipes/beta.recipe
-share/calibre/recipes/beta_en.recipe
 share/calibre/recipes/biamag.recipe
 share/calibre/recipes/biamag_en.recipe
 share/calibre/recipes/bianet.recipe
@@ -2020,7 +1905,6 @@ share/calibre/recipes/birgun_gazetesi.recipe
 share/calibre/recipes/birmingham_evening_mail.recipe
 share/calibre/recipes/birmingham_post.recipe
 share/calibre/recipes/bitacora.recipe
-share/calibre/recipes/biweekly.recipe
 share/calibre/recipes/biz_portal.recipe
 share/calibre/recipes/blesk.recipe
 share/calibre/recipes/blic.recipe
@@ -2029,8 +1913,10 @@ share/calibre/recipes/boortz.recipe
 share/calibre/recipes/borse_online.recipe
 share/calibre/recipes/borsen_dk.recipe
 share/calibre/recipes/boston.com.recipe
+share/calibre/recipes/boxis.recipe
 share/calibre/recipes/brand_eins.recipe
 share/calibre/recipes/brasil_de_fato.recipe
+share/calibre/recipes/breaking_mad.recipe
 share/calibre/recipes/brecha.recipe
 share/calibre/recipes/brewiarz.recipe
 share/calibre/recipes/brigitte_de.recipe
@@ -2138,6 +2024,7 @@ share/calibre/recipes/courrierinternational.recipe
 share/calibre/recipes/cracked_com.recipe
 share/calibre/recipes/craigslist.recipe
 share/calibre/recipes/credit_slips.recipe
+share/calibre/recipes/cronica.recipe
 share/calibre/recipes/csid.recipe
 share/calibre/recipes/ct24.recipe
 share/calibre/recipes/cubadebate.recipe
@@ -2245,6 +2132,8 @@ share/calibre/recipes/drivelry.recipe
 share/calibre/recipes/drytooling_pl.recipe
 share/calibre/recipes/dunya_bizim.recipe
 share/calibre/recipes/dunya_bulteni.recipe
+share/calibre/recipes/dunyahalleri.recipe
+share/calibre/recipes/dunyahalleri_haftaninozeti.recipe
 share/calibre/recipes/dvhn.recipe
 share/calibre/recipes/dwutygodnik.recipe
 share/calibre/recipes/dzial_zagraniczny.recipe
@@ -2256,13 +2145,11 @@ share/calibre/recipes/dziennik_polski.recipe
 share/calibre/recipes/dziennik_wschodni.recipe
 share/calibre/recipes/dziennik_zachodni.recipe
 share/calibre/recipes/dziennikzwiazkowy.recipe
-share/calibre/recipes/e_novine.recipe
 share/calibre/recipes/ebeltoftlokalavisen_dk.recipe
 share/calibre/recipes/ebetrsberger_zeitung.recipe
 share/calibre/recipes/echo_dnia.recipe
 share/calibre/recipes/echo_moskvy.recipe
 share/calibre/recipes/echo_online.recipe
-share/calibre/recipes/eclicto.recipe
 share/calibre/recipes/eclipseonline.recipe
 share/calibre/recipes/ecogeek.recipe
 share/calibre/recipes/economia.recipe
@@ -2304,6 +2191,7 @@ share/calibre/recipes/el_publico.recipe
 share/calibre/recipes/el_tiempo.recipe
 share/calibre/recipes/el_universal.recipe
 share/calibre/recipes/elclubdelebook.recipe
+share/calibre/recipes/elcohetealaluna.recipe
 share/calibre/recipes/elcomercio.recipe
 share/calibre/recipes/ele.recipe
 share/calibre/recipes/elektroda_pl.recipe
@@ -2319,7 +2207,6 @@ share/calibre/recipes/eluniversal_ve.recipe
 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/empire_magazine.recipe
 share/calibre/recipes/endgadget.recipe
 share/calibre/recipes/endgadget_ja.recipe
@@ -2446,9 +2333,7 @@ share/calibre/recipes/gildia_pl.recipe
 share/calibre/recipes/gizmodo.recipe
 share/calibre/recipes/gkt.recipe
 share/calibre/recipes/glamour.recipe
-share/calibre/recipes/glas_srpske.recipe
 share/calibre/recipes/glasgow_herald.recipe
-share/calibre/recipes/glasjavnosti.recipe
 share/calibre/recipes/glenn_greenwald.recipe
 share/calibre/recipes/glennbeck.recipe
 share/calibre/recipes/globaltimes.recipe
@@ -2551,6 +2436,7 @@ share/calibre/recipes/hvg.recipe
 share/calibre/recipes/hvidovreavis_dk.recipe
 share/calibre/recipes/hvidovrelokalavisen_dk.recipe
 share/calibre/recipes/ibm_smarter_planet.recipe
+share/calibre/recipes/id_pixel.recipe
 share/calibre/recipes/ideal_almeria.recipe
 share/calibre/recipes/ideal_granada.recipe
 share/calibre/recipes/ideal_jaen.recipe
@@ -2594,8 +2480,6 @@ share/calibre/recipes/insan_okur.recipe
 share/calibre/recipes/insider.recipe
 share/calibre/recipes/instapaper.recipe
 share/calibre/recipes/intelligencer.recipe
-share/calibre/recipes/interia_fakty.recipe
-share/calibre/recipes/interia_sport.recipe
 share/calibre/recipes/intrefete.recipe
 share/calibre/recipes/io9.recipe
 share/calibre/recipes/iol_za.recipe
@@ -2604,7 +2488,6 @@ share/calibre/recipes/iprofesional.recipe
 share/calibre/recipes/irish_independent.recipe
 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/izvestia.recipe
@@ -2676,7 +2559,6 @@ share/calibre/recipes/kp.recipe
 share/calibre/recipes/krebs_on_security.recipe
 share/calibre/recipes/kresy_pl.recipe
 share/calibre/recipes/kristeligt_dagblad_dk.recipe
-share/calibre/recipes/krstarica.recipe
 share/calibre/recipes/krstarica_en.recipe
 share/calibre/recipes/ksiazka_pl.recipe
 share/calibre/recipes/kstar.recipe
@@ -2745,7 +2627,6 @@ share/calibre/recipes/lesoir_be.recipe
 share/calibre/recipes/letsgetcritical.recipe
 share/calibre/recipes/levante.recipe
 share/calibre/recipes/lexpress.recipe
-share/calibre/recipes/libartes.recipe
 share/calibre/recipes/liberation.recipe
 share/calibre/recipes/liberatorio_politico.recipe
 share/calibre/recipes/libero.recipe
@@ -2755,8 +2636,8 @@ share/calibre/recipes/lidovky.recipe
 share/calibre/recipes/lifehacker.recipe
 share/calibre/recipes/lifehacker_pl.recipe
 share/calibre/recipes/lightspeed_magazine.recipe
+share/calibre/recipes/limba_sarda.recipe
 share/calibre/recipes/limes.recipe
-share/calibre/recipes/linux_journal.recipe
 share/calibre/recipes/linux_magazine.recipe
 share/calibre/recipes/linuxportal_pl.recipe
 share/calibre/recipes/list_apart.recipe
@@ -2838,7 +2719,6 @@ share/calibre/recipes/monden.recipe
 share/calibre/recipes/money_pl.recipe
 share/calibre/recipes/moneycontrol.recipe
 share/calibre/recipes/moneyro.recipe
-share/calibre/recipes/monitor.recipe
 share/calibre/recipes/montevideo_com.recipe
 share/calibre/recipes/montreal_gazette.recipe
 share/calibre/recipes/more_intelligent_life.recipe
@@ -2885,7 +2765,6 @@ share/calibre/recipes/nejm.recipe
 share/calibre/recipes/neowin.recipe
 share/calibre/recipes/nepszabadsag.recipe
 share/calibre/recipes/netzpolitik.recipe
-share/calibre/recipes/neu_osnabrucker_zeitung.recipe
 share/calibre/recipes/neviditelny_pes.recipe
 share/calibre/recipes/new_london_day.recipe
 share/calibre/recipes/new_scientist.recipe
@@ -2932,7 +2811,6 @@ share/calibre/recipes/novinite.recipe
 share/calibre/recipes/novinite_bg.recipe
 share/calibre/recipes/novinky.cz.recipe
 share/calibre/recipes/novinky.recipe
-share/calibre/recipes/novistandard.recipe
 share/calibre/recipes/novosti.recipe
 share/calibre/recipes/now_toronto.recipe
 share/calibre/recipes/nowa_fantastyka.recipe
@@ -2968,6 +2846,7 @@ share/calibre/recipes/nzz_ger.recipe
 share/calibre/recipes/nzz_webpaper.recipe
 share/calibre/recipes/o_globo.recipe
 share/calibre/recipes/oakland_north.recipe
+share/calibre/recipes/oba.recipe
 share/calibre/recipes/observa_digital.recipe
 share/calibre/recipes/observatorul_cultural.recipe
 share/calibre/recipes/observer.recipe
@@ -2997,7 +2876,6 @@ share/calibre/recipes/osworld_pl.recipe
 share/calibre/recipes/ottawa_citizen.recipe
 share/calibre/recipes/ourdailybread.recipe
 share/calibre/recipes/outlook_india.recipe
-share/calibre/recipes/overclock_pl.recipe
 share/calibre/recipes/oxford_mail.recipe
 share/calibre/recipes/padreydecano.recipe
 share/calibre/recipes/pagina12.recipe
@@ -3008,6 +2886,7 @@ share/calibre/recipes/pambianco.recipe
 share/calibre/recipes/pandodaily.recipe
 share/calibre/recipes/panorama.recipe
 share/calibre/recipes/paperli_topic.recipe
+share/calibre/recipes/parisreview.recipe
 share/calibre/recipes/parlamentni_listy.recipe
 share/calibre/recipes/patente_de_corso.recipe
 share/calibre/recipes/pc_advisor.recipe
@@ -3066,7 +2945,6 @@ share/calibre/recipes/poughkeepsie_journal.recipe
 share/calibre/recipes/ppe_pl.recipe
 share/calibre/recipes/praguemonitor.recipe
 share/calibre/recipes/pravda.recipe
-share/calibre/recipes/pravda_en.recipe
 share/calibre/recipes/pravda_it.recipe
 share/calibre/recipes/pravda_por.recipe
 share/calibre/recipes/pravda_rs.recipe
@@ -3091,6 +2969,7 @@ share/calibre/recipes/protvmagazin.recipe
 share/calibre/recipes/psych.recipe
 share/calibre/recipes/psychologies.recipe
 share/calibre/recipes/pubblico_giornale.recipe
+share/calibre/recipes/publicdomainreview_org.recipe
 share/calibre/recipes/publico.recipe
 share/calibre/recipes/publika.recipe
 share/calibre/recipes/puls_biznesu.recipe
@@ -3130,6 +3009,7 @@ share/calibre/recipes/revista_muy.recipe
 share/calibre/recipes/revista_piaui.recipe
 share/calibre/recipes/revista_semana.recipe
 share/calibre/recipes/revista_summa.recipe
+share/calibre/recipes/revista_veintitres.recipe
 share/calibre/recipes/rga.recipe
 share/calibre/recipes/rheinische_post.recipe
 share/calibre/recipes/ria_ru.recipe
@@ -3152,11 +3032,13 @@ share/calibre/recipes/rudersdallokalavisen_dk.recipe
 share/calibre/recipes/rue89.recipe
 share/calibre/recipes/rushisaband.recipe
 share/calibre/recipes/rusiahoy.recipe
+share/calibre/recipes/russiafeed.recipe
 share/calibre/recipes/rybinski.recipe
 share/calibre/recipes/rynek_infrastruktury.recipe
 share/calibre/recipes/rynek_kolejowy.recipe
 share/calibre/recipes/rynek_zdrowia.recipe
 share/calibre/recipes/rzeczpospolita.recipe
+share/calibre/recipes/sa_gazeta.recipe
 share/calibre/recipes/sabah.recipe
 share/calibre/recipes/sabit_fikir.recipe
 share/calibre/recipes/sage_news.recipe
@@ -3273,7 +3155,6 @@ share/calibre/recipes/tagesspiegel.recipe
 share/calibre/recipes/taggeschau_de.recipe
 share/calibre/recipes/taipei.recipe
 share/calibre/recipes/tanea.recipe
-share/calibre/recipes/tanjug.recipe
 share/calibre/recipes/tanuki.recipe
 share/calibre/recipes/tawernarpg_pl.recipe
 share/calibre/recipes/taz.recipe
@@ -3305,6 +3186,7 @@ share/calibre/recipes/the_escapist.recipe
 share/calibre/recipes/the_feature.recipe
 share/calibre/recipes/the_freeman.recipe
 share/calibre/recipes/the_friday_times.recipe
+share/calibre/recipes/the_insider.recipe
 share/calibre/recipes/the_journal.recipe
 share/calibre/recipes/the_manila_bulletin.recipe
 share/calibre/recipes/the_manila_times.recipe
@@ -3526,6 +3408,7 @@ share/calibre/viewer/hyphenate/Hyphenator.js
 share/calibre/viewer/hyphenate/patterns.zip
 share/calibre/viewer/hyphenation.js
 share/calibre/viewer/images.js
+share/calibre/viewer/jquery.js
 share/calibre/viewer/jquery_scrollTo.js
 share/calibre/viewer/mathjax/MathJax.js
 share/calibre/viewer/mathjax/extensions/AssistiveMML.js
@@ -3736,4 +3619,3 @@ share/doc/calibre/Changelog.yaml
 share/doc/calibre/INSTALL
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
-@pkgdir lib/calibre/calibre/plugins/.libs
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 4518abf2012..4939e5fd0cc 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.92 2017/05/16 13:37:24 wiz Exp $
+$NetBSD: distinfo,v 1.93 2018/02/01 16:05:56 wiz Exp $
 
-SHA1 (calibre-2.85.1.tar.xz) = 31d880c9da01ad16a2d6f0502b41b77ff32c13a9
-RMD160 (calibre-2.85.1.tar.xz) = 345e4c28f2ded44a88f0b06e8d18774a47535509
-SHA512 (calibre-2.85.1.tar.xz) = ce29924213fa7461bbf2fc62f26bd53e4eafdf3b0dd58e241071592be4ee038cdb3ac6ac2982229dd0e52595a93aca7d921640ea55796950d1f3ac3c2742af4f
-Size (calibre-2.85.1.tar.xz) = 37783284 bytes
-SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6
-SHA1 (patch-setup_build__environment.py) = 84d0084d4fe49c883ba5c4ac6e1c3ba47a88c8d5
-SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 62d02b7b901efac6ee3bb1b6628ab99b4a13a926
+SHA1 (calibre-3.16.0.tar.xz) = 22fe843c3e06071cd2e65c4e10cba070924890e5
+RMD160 (calibre-3.16.0.tar.xz) = a13f29ee8601d80f4d97563979ace1511e153077
+SHA512 (calibre-3.16.0.tar.xz) = a5208e1e781d71265bcb10757c5cb51afaa8fa89331ef075bfe8451efc8d5e2a1e70704423440cddf90c6e70e074dc9d296a7df5347639a5f7b7f1a81697e96b
+Size (calibre-3.16.0.tar.xz) = 38121688 bytes
+SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5
+SHA1 (patch-setup_build__environment.py) = 8973ede2128cea065860dcc210c45f5f688a93be
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
diff --git a/misc/calibre/patches/patch-setup_build.py b/misc/calibre/patches/patch-setup_build.py
index e7122a64d36..e29175b560c 100644
--- a/misc/calibre/patches/patch-setup_build.py
+++ b/misc/calibre/patches/patch-setup_build.py
@@ -1,6 +1,5 @@
-$NetBSD: patch-setup_build.py,v 1.2 2016/09/29 12:13:43 joerg Exp $
+$NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
 
-Find libtool output correctly.
 Fix linking against native X.
 
 --- setup/build.py.orig	2016-09-29 10:28:31.000000000 +0000
@@ -21,12 +20,3 @@ Fix linking against native X.
          win32 {{
              LIBS += {py_lib}
              TARGET_EXT = .dll
-@@ -456,7 +458,7 @@ class Build(Command):
-         if iswindows:
-             qmc += ['-spec', qmakespec]
-         fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
--        name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
-+        name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
-         try:
-             os.chdir(src_dir)
-             if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):
diff --git a/misc/calibre/patches/patch-setup_build__environment.py b/misc/calibre/patches/patch-setup_build__environment.py
index dbddb5961b5..5b4db80116b 100644
--- a/misc/calibre/patches/patch-setup_build__environment.py
+++ b/misc/calibre/patches/patch-setup_build__environment.py
@@ -1,10 +1,10 @@
-$NetBSD: patch-setup_build__environment.py,v 1.4 2017/02/17 15:43:43 wiz Exp $
+$NetBSD: patch-setup_build__environment.py,v 1.5 2018/02/01 16:05:56 wiz Exp $
 
 Always build like on Linux.
 
---- setup/build_environment.py.orig	2017-02-12 02:09:49.000000000 +0000
+--- setup/build_environment.py.orig	2017-08-25 03:47:17.000000000 +0000
 +++ setup/build_environment.py
-@@ -97,8 +97,8 @@ def get_sip_dir():
+@@ -93,8 +93,8 @@ def get_sip_dir():
  pyqt['pyqt_sip_dir'] = get_sip_dir()
  pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include'))
  
@@ -15,12 +15,3 @@ Always build like on Linux.
  qt_inc = pyqt['inc']
  qt_lib = pyqt['lib']
  ft_lib_dirs = []
-@@ -121,7 +121,7 @@ QT_DLLS = ['Qt5' + x for x in (
- 'WebKit', 'WebKitWidgets', 'Widgets',  'Multimedia', 'MultimediaWidgets', 'Xml',  # 'XmlPatterns',
- )]
- QT_PLUGINS = ('imageformats', 'audio', 'iconengines', 'mediaservice', 'platforms', 'playlistformats', 'printsupport', 'sqldrivers')
--if islinux or ishaiku:
-+if True:
-     # platformthemes cause crashes in Ubuntu
-     QT_PLUGINS += ('platforminputcontexts', 'generic',)
- 
diff --git a/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py b/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py
deleted file mode 100644
index 87c803ea92b..00000000000
--- a/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_calibre_ebooks_oeb_polish_parsing.py,v 1.1 2017/01/17 23:19:24 wiz Exp $
-
-html5lib 0.99999999 moved treebuilders._base to .base to clarify its
-status as public, and ihatexml to _ihatexml to clarify as private.
-
---- src/calibre/ebooks/oeb/polish/parsing.py.orig	2017-01-13 03:38:35.000000000 +0000
-+++ src/calibre/ebooks/oeb/polish/parsing.py
-@@ -13,8 +13,14 @@ from bisect import bisect
- from lxml.etree import ElementBase, XMLParser, ElementDefaultClassLookup, CommentBase, fromstring, Element as LxmlElement
- 
- from html5lib.constants import namespaces, tableInsertModeElements, EOF
--from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
--from html5lib.ihatexml import InfosetFilter, DataLossWarning
-+try:
-+    from html5lib.treebuilders.base import TreeBuilder as BaseTreeBuilder
-+except:
-+    from html5lib.treebuilders._base import TreeBuilder as BaseTreeBuilder
-+try:
-+    from html5lib._ihatexml import InfosetFilter, DataLossWarning
-+except:
-+    from html5lib.ihatexml import InfosetFilter, DataLossWarning
- from html5lib.html5parser import HTMLParser
- 
- from calibre import xml_replace_entities