misc/calibre: update major version, to 5.34.0.

Major change: now uses Python 3.
Other changes: too many to list; see the file Changelog.txt in the distfile.

New option: rar, to allow calibre to look inside rar archives.

Actually connecting an ebook-reader device is still untested, but might
work better with the libusb and libmtp extensions that are enabled since
version 4.23.0.

9 files changed, 185 insertions, 155 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index e5e5aac56a8..9467e547f65 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.260 2022/01/09 16:26:31 rhialto Exp $
+# $NetBSD: Makefile,v 1.261 2022/01/20 19:03:07 rhialto Exp $
 
-DISTNAME=	calibre-4.23.0
+DISTNAME=	calibre-5.34.0
 CATEGORIES=	misc
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
@@ -11,34 +11,37 @@ HOMEPAGE=	https://www.calibre-ebook.com/
 COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
-DEPENDS+=	${PYPKGPREFIX}-beautifulsoup-[0-9]*:../../www/py-beautifulsoup
+DEPENDS+=	${PYPKGPREFIX}-apsw>=3.37.0nb1:../../databases/py-apsw
+DEPENDS+=	${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
 DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-cryptodome-[0-9]*:../../security/py-cryptodome
 DEPENDS+=	${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
 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}-feedparser<6.0.0:../../textproc/py-feedparser5
-DEPENDS+=	${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11
+DEPENDS+=	${PYPKGPREFIX}-feedparser>=6.0.0:../../textproc/py-feedparser
+DEPENDS+=	${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 DEPENDS+=	${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
+DEPENDS+=	${PYPKGPREFIX}-jeepney>=0.6.0:../../sysutils/py-jeepney
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=	${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
-DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments25
+DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-qt5-webengine-[0-9]*:../../x11/py-qt5-webengine
 DEPENDS+=	${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
+DEPENDS+=	${PYPKGPREFIX}-sip5>=5.5<6:../../x11/py-sip5
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+
 # for installation
+BUILD_DEPENDS+=	${PYPKGPREFIX}-qt-builder>=1:../../x11/py-qt-builder
 BUILD_DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 
 EXTRACT_USING=	bsdtar
 
-PYTHON_VERSIONS_ACCEPTED=	27 # as of 3.16.0
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # as of 5.x
 PYTHON_VERSIONED_DEPENDENCIES+=	markdown
 
 USE_LANGUAGES=			c99 c++
@@ -46,6 +49,7 @@ USE_LIBTOOL=			yes
 USE_TOOLS+=			pkg-config pax
 PYSETUPOPTARGS=			# empty
 PYSETUPINSTALLARGS=		--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
+MAKE_JOBS_SAFE=			no	# setup.py does not like -j
 
 INSTALLATION_DIRS=	share/applications
 INSTALLATION_DIRS+=	share/icons
@@ -87,16 +91,13 @@ REPLACE_PYTHON+=	src/odf/*.py
 
 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+=		SIP_DIR=${BUILDLINK_PREFIX.py-sip}/share/sip${PYVERSSUFFIX}
+MAKE_ENV+=		SIP_DIR=${PREFIX}/share/sip${PYVERSSUFFIX}/PyQt5
 MAKE_ENV+=		LFLAGS=${LDFLAGS:Q}
 
 # Turn off x bits on non-executable files.
 post-extract:
 	find  ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
 	find  ${WRKSRC}/resources/images/mimetypes  -name '*.png' -exec chmod a-x \{} \;
-	chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
-	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
 
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
@@ -108,6 +109,8 @@ post-install:
 do-test:
 	cd ${WRKSRC} && ${PYTHONBIN} ./setup.py test
 
+.include "options.mk"
+
 .include "../../lang/python/application.mk"
 .include "../../archivers//bzip2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
@@ -127,7 +130,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}
-BUILDLINK_API_DEPENDS.podofo+=	podofo>=0.8.2
 .include "../../print/podofo/buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.20.2
 .include "../../print/poppler-includes/buildlink3.mk"
@@ -135,14 +137,13 @@ BUILDLINK_API_DEPENDS.poppler+=	poppler>=0.20.2
 .include "../../print/poppler-qt5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/hal/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
-.include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../textproc/hyphen/buildlink3.mk"
+.include "../../textproc/libstemmer/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
-.include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../x11/py-qt5/buildlink3.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 06050132390..193b7b23ef0 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.94 2022/01/09 16:26:31 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.95 2022/01/20 19:03:07 rhialto Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -19,11 +19,9 @@ bin/lrfviewer
 bin/lrs2lrf
 bin/markdown-calibre
 bin/web2disk
-lib/calibre/backports/__init__.py
-lib/calibre/backports/functools_lru_cache.py
-lib/calibre/backports/ipaddress.py
-lib/calibre/biplist/__init__.py
+lib/${PYVERSSUFFIX}/site-packages/init_calibre.py
 lib/calibre/calibre/__init__.py
+lib/calibre/calibre/build_forms.py
 lib/calibre/calibre/constants.py
 lib/calibre/calibre/customize/__init__.py
 lib/calibre/calibre/customize/builtins.py
@@ -33,6 +31,7 @@ lib/calibre/calibre/customize/ui.py
 lib/calibre/calibre/customize/zipplugin.py
 lib/calibre/calibre/db/__init__.py
 lib/calibre/calibre/db/adding.py
+lib/calibre/calibre/db/annotations.py
 lib/calibre/calibre/db/backend.py
 lib/calibre/calibre/db/backup.py
 lib/calibre/calibre/db/cache.py
@@ -63,11 +62,13 @@ 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/copy_to_library.py
+lib/calibre/calibre/db/covers.py
 lib/calibre/calibre/db/delete_service.py
 lib/calibre/calibre/db/errors.py
 lib/calibre/calibre/db/fields.py
 lib/calibre/calibre/db/lazy.py
 lib/calibre/calibre/db/legacy.py
+lib/calibre/calibre/db/listeners.py
 lib/calibre/calibre/db/locking.py
 lib/calibre/calibre/db/restore.py
 lib/calibre/calibre/db/schema_upgrades.py
@@ -77,6 +78,7 @@ lib/calibre/calibre/db/tests/__init__.py
 lib/calibre/calibre/db/tests/add_remove.py
 lib/calibre/calibre/db/tests/base.py
 lib/calibre/calibre/db/tests/filesystem.py
+lib/calibre/calibre/db/tests/fts.py
 lib/calibre/calibre/db/tests/legacy.py
 lib/calibre/calibre/db/tests/locking.py
 lib/calibre/calibre/db/tests/main.py
@@ -148,7 +150,6 @@ lib/calibre/calibre/devices/mtp/unix/sysfs.py
 lib/calibre/calibre/devices/mtp/unix/upstream/update.py
 lib/calibre/calibre/devices/mtp/windows/__init__.py
 lib/calibre/calibre/devices/mtp/windows/driver.py
-lib/calibre/calibre/devices/mtp/windows/remote.py
 lib/calibre/calibre/devices/nokia/__init__.py
 lib/calibre/calibre/devices/nokia/driver.py
 lib/calibre/calibre/devices/nook/__init__.py
@@ -176,6 +177,7 @@ lib/calibre/calibre/devices/usbms/cli.py
 lib/calibre/calibre/devices/usbms/device.py
 lib/calibre/calibre/devices/usbms/deviceconfig.py
 lib/calibre/calibre/devices/usbms/driver.py
+lib/calibre/calibre/devices/usbms/hal.py
 lib/calibre/calibre/devices/user_defined/__init__.py
 lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/devices/utils.py
@@ -289,6 +291,7 @@ lib/calibre/calibre/ebooks/html/input.py
 lib/calibre/calibre/ebooks/html/meta.py
 lib/calibre/calibre/ebooks/html/to_zip.py
 lib/calibre/calibre/ebooks/html_entities.py
+lib/calibre/calibre/ebooks/html_transform_rules.py
 lib/calibre/calibre/ebooks/htmlz/__init__.py
 lib/calibre/calibre/ebooks/htmlz/oeb2html.py
 lib/calibre/calibre/ebooks/hyphenate.py
@@ -364,20 +367,18 @@ lib/calibre/calibre/ebooks/metadata/sources/base.py
 lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py
 lib/calibre/calibre/ebooks/metadata/sources/cli.py
 lib/calibre/calibre/ebooks/metadata/sources/covers.py
-lib/calibre/calibre/ebooks/metadata/sources/douban.py
 lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
 lib/calibre/calibre/ebooks/metadata/sources/google.py
 lib/calibre/calibre/ebooks/metadata/sources/google_images.py
 lib/calibre/calibre/ebooks/metadata/sources/identify.py
 lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
-lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
-lib/calibre/calibre/ebooks/metadata/sources/ozon.py
 lib/calibre/calibre/ebooks/metadata/sources/prefs.py
 lib/calibre/calibre/ebooks/metadata/sources/search_engines.py
 lib/calibre/calibre/ebooks/metadata/sources/test.py
 lib/calibre/calibre/ebooks/metadata/sources/update.py
 lib/calibre/calibre/ebooks/metadata/sources/worker.py
 lib/calibre/calibre/ebooks/metadata/tag_mapper.py
+lib/calibre/calibre/ebooks/metadata/test_author_sort.py
 lib/calibre/calibre/ebooks/metadata/toc.py
 lib/calibre/calibre/ebooks/metadata/topaz.py
 lib/calibre/calibre/ebooks/metadata/txt.py
@@ -536,7 +537,6 @@ lib/calibre/calibre/ebooks/pdf/render/gradients.py
 lib/calibre/calibre/ebooks/pdf/render/graphics.py
 lib/calibre/calibre/ebooks/pdf/render/links.py
 lib/calibre/calibre/ebooks/pdf/render/serialize.py
-lib/calibre/calibre/ebooks/pdf/test_html_writer.py
 lib/calibre/calibre/ebooks/pml/__init__.py
 lib/calibre/calibre/ebooks/pml/pmlconverter.py
 lib/calibre/calibre/ebooks/pml/pmlml.py
@@ -639,6 +639,8 @@ lib/calibre/calibre/gui2/actions/add.py
 lib/calibre/calibre/gui2/actions/add_to_library.py
 lib/calibre/calibre/gui2/actions/annotate.py
 lib/calibre/calibre/gui2/actions/author_mapper.py
+lib/calibre/calibre/gui2/actions/auto_scroll.py
+lib/calibre/calibre/gui2/actions/browse_annots.py
 lib/calibre/calibre/gui2/actions/catalog.py
 lib/calibre/calibre/gui2/actions/choose_library.py
 lib/calibre/calibre/gui2/actions/convert.py
@@ -662,6 +664,7 @@ lib/calibre/calibre/gui2/actions/restart.py
 lib/calibre/calibre/gui2/actions/save_to_disk.py
 lib/calibre/calibre/gui2/actions/show_book_details.py
 lib/calibre/calibre/gui2/actions/show_quickview.py
+lib/calibre/calibre/gui2/actions/show_stored_templates.py
 lib/calibre/calibre/gui2/actions/show_template_tester.py
 lib/calibre/calibre/gui2/actions/similar_books.py
 lib/calibre/calibre/gui2/actions/sort.py
@@ -739,7 +742,6 @@ lib/calibre/calibre/gui2/convert/rtf_input_ui.py
 lib/calibre/calibre/gui2/convert/search_and_replace.py
 lib/calibre/calibre/gui2/convert/search_and_replace_ui.py
 lib/calibre/calibre/gui2/convert/single.py
-lib/calibre/calibre/gui2/convert/single_ui.py
 lib/calibre/calibre/gui2/convert/snb_output.py
 lib/calibre/calibre/gui2/convert/snb_output_ui.py
 lib/calibre/calibre/gui2/convert/structure_detection.py
@@ -751,21 +753,12 @@ lib/calibre/calibre/gui2/convert/txt_input_ui.py
 lib/calibre/calibre/gui2/convert/txt_output.py
 lib/calibre/calibre/gui2/convert/txt_output_ui.py
 lib/calibre/calibre/gui2/convert/txtz_output.py
-lib/calibre/calibre/gui2/convert/xexp_edit_ui.py
 lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
 lib/calibre/calibre/gui2/covers.py
 lib/calibre/calibre/gui2/css_transform_rules.py
 lib/calibre/calibre/gui2/custom_column_widgets.py
-lib/calibre/calibre/gui2/dbus_export/__init__.py
-lib/calibre/calibre/gui2/dbus_export/demo.py
-lib/calibre/calibre/gui2/dbus_export/gtk.py
-lib/calibre/calibre/gui2/dbus_export/menu.py
-lib/calibre/calibre/gui2/dbus_export/menu2.py
-lib/calibre/calibre/gui2/dbus_export/tray.py
-lib/calibre/calibre/gui2/dbus_export/utils.py
-lib/calibre/calibre/gui2/dbus_export/widgets.py
 lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/device_drivers/__init__.py
 lib/calibre/calibre/gui2/device_drivers/configwidget.py
@@ -787,9 +780,7 @@ lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_library.py
 lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
-lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
 lib/calibre/calibre/gui2/dialogs/comments_dialog.py
-lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
@@ -806,6 +797,7 @@ lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
 lib/calibre/calibre/gui2/dialogs/duplicates.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/enum_values_edit.py
 lib/calibre/calibre/gui2/dialogs/exim.py
 lib/calibre/calibre/gui2/dialogs/jobs_ui.py
 lib/calibre/calibre/gui2/dialogs/match_books.py
@@ -813,6 +805,7 @@ lib/calibre/calibre/gui2/dialogs/match_books_ui.py
 lib/calibre/calibre/gui2/dialogs/message_box.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
+lib/calibre/calibre/gui2/dialogs/multisort.py
 lib/calibre/calibre/gui2/dialogs/opml.py
 lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
@@ -822,7 +815,6 @@ lib/calibre/calibre/gui2/dialogs/quickview.py
 lib/calibre/calibre/gui2/dialogs/quickview_ui.py
 lib/calibre/calibre/gui2/dialogs/restore_library.py
 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/select_formats.py
@@ -836,6 +828,8 @@ lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
 lib/calibre/calibre/gui2/dialogs/tag_list_editor_table_widget.py
 lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/template_dialog.py
+lib/calibre/calibre/gui2/dialogs/template_dialog_box_layout.py
+lib/calibre/calibre/gui2/dialogs/template_dialog_code_widget.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/trim_image.py
@@ -843,8 +837,10 @@ lib/calibre/calibre/gui2/dnd.py
 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/flow_toolbar.py
 lib/calibre/calibre/gui2/font_family_chooser.py
 lib/calibre/calibre/gui2/gestures.py
+lib/calibre/calibre/gui2/html_transform_rules.py
 lib/calibre/calibre/gui2/icon_theme.py
 lib/calibre/calibre/gui2/image_popup.py
 lib/calibre/calibre/gui2/init.py
@@ -856,11 +852,13 @@ 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/annotations.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/listener.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
@@ -983,7 +981,6 @@ lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
-lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
 lib/calibre/calibre/gui2/store/stores/empik_plugin.py
 lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
 lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
@@ -1013,7 +1010,6 @@ lib/calibre/calibre/gui2/store/stores/smashwords_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/weightless_books_plugin.py
-lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
 lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py
 lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
@@ -1030,6 +1026,17 @@ lib/calibre/calibre/gui2/toc/__init__.py
 lib/calibre/calibre/gui2/toc/location.py
 lib/calibre/calibre/gui2/toc/main.py
 lib/calibre/calibre/gui2/tools.py
+lib/calibre/calibre/gui2/tts/__init__.py
+lib/calibre/calibre/gui2/tts/common.py
+lib/calibre/calibre/gui2/tts/develop.py
+lib/calibre/calibre/gui2/tts/errors.py
+lib/calibre/calibre/gui2/tts/implementation.py
+lib/calibre/calibre/gui2/tts/linux.py
+lib/calibre/calibre/gui2/tts/linux_config.py
+lib/calibre/calibre/gui2/tts/macos.py
+lib/calibre/calibre/gui2/tts/macos_config.py
+lib/calibre/calibre/gui2/tts/windows.py
+lib/calibre/calibre/gui2/tts/windows_config.py
 lib/calibre/calibre/gui2/tweak_book/__init__.py
 lib/calibre/calibre/gui2/tweak_book/boss.py
 lib/calibre/calibre/gui2/tweak_book/char_select.py
@@ -1072,6 +1079,7 @@ lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 lib/calibre/calibre/gui2/tweak_book/file_list.py
 lib/calibre/calibre/gui2/tweak_book/function_replace.py
 lib/calibre/calibre/gui2/tweak_book/job.py
+lib/calibre/calibre/gui2/tweak_book/jump_to_class.py
 lib/calibre/calibre/gui2/tweak_book/live_css.py
 lib/calibre/calibre/gui2/tweak_book/main.py
 lib/calibre/calibre/gui2/tweak_book/manage_fonts.py
@@ -1094,6 +1102,8 @@ lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/annotations.py
 lib/calibre/calibre/gui2/viewer/bookmarks.py
+lib/calibre/calibre/gui2/viewer/config.py
+lib/calibre/calibre/gui2/viewer/control_sleep.py
 lib/calibre/calibre/gui2/viewer/convert_book.py
 lib/calibre/calibre/gui2/viewer/highlights.py
 lib/calibre/calibre/gui2/viewer/integration.py
@@ -1105,8 +1115,10 @@ lib/calibre/calibre/gui2/viewer/search.py
 lib/calibre/calibre/gui2/viewer/shortcuts.py
 lib/calibre/calibre/gui2/viewer/toc.py
 lib/calibre/calibre/gui2/viewer/toolbars.py
+lib/calibre/calibre/gui2/viewer/tts.py
 lib/calibre/calibre/gui2/viewer/ui.py
 lib/calibre/calibre/gui2/viewer/web_view.py
+lib/calibre/calibre/gui2/viewer/widgets.py
 lib/calibre/calibre/gui2/webengine.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/widgets2.py
@@ -1143,11 +1155,12 @@ lib/calibre/calibre/library/schema_upgrades.py
 lib/calibre/calibre/library/sqlite.py
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/linux.py
+lib/calibre/calibre/live.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/certgen.so
-lib/calibre/calibre/plugins/chmlib.so
+lib/calibre/calibre/plugins/fast_css_transform.so
 lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html_as_json.so
 lib/calibre/calibre/plugins/html_syntax_highlighter.so
@@ -1158,19 +1171,18 @@ lib/calibre/calibre/plugins/imageops.so
 lib/calibre/calibre/plugins/libheadless.so
 lib/calibre/calibre/plugins/libmtp.so
 lib/calibre/calibre/plugins/libusb.so
-lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/matcher.so
-lib/calibre/calibre/plugins/monotonic.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pictureflow.so
 lib/calibre/calibre/plugins/podofo.so
 lib/calibre/calibre/plugins/progress_indicator.so
 lib/calibre/calibre/plugins/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
+lib/calibre/calibre/plugins/sqlite_extension.so
 lib/calibre/calibre/plugins/tokenizer.so
 lib/calibre/calibre/plugins/unicode_names.so
-lib/calibre/calibre/plugins/zlib2.so
+lib/calibre/calibre/prints.py
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
 lib/calibre/calibre/spell/__init__.py
@@ -1205,13 +1217,13 @@ lib/calibre/calibre/srv/pool.py
 lib/calibre/calibre/srv/pre_activated.py
 lib/calibre/calibre/srv/render_book.py
 lib/calibre/calibre/srv/routes.py
-lib/calibre/calibre/srv/sendfile.py
 lib/calibre/calibre/srv/standalone.py
 lib/calibre/calibre/srv/tests/__init__.py
 lib/calibre/calibre/srv/tests/ajax.py
 lib/calibre/calibre/srv/tests/auth.py
 lib/calibre/calibre/srv/tests/base.py
 lib/calibre/calibre/srv/tests/content.py
+lib/calibre/calibre/srv/tests/fast_css_transform.py
 lib/calibre/calibre/srv/tests/http.py
 lib/calibre/calibre/srv/tests/loop.py
 lib/calibre/calibre/srv/tests/main.py
@@ -1226,19 +1238,15 @@ lib/calibre/calibre/test_build.py
 lib/calibre/calibre/translations/__init__.py
 lib/calibre/calibre/translations/dynamic.py
 lib/calibre/calibre/translations/msgfmt.py
-lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/__init__.py
 lib/calibre/calibre/utils/bibtex.py
 lib/calibre/calibre/utils/browser.py
 lib/calibre/calibre/utils/certgen.py
-lib/calibre/calibre/utils/chm/__init__.py
-lib/calibre/calibre/utils/chm/chm.py
 lib/calibre/calibre/utils/cleantext.py
 lib/calibre/calibre/utils/complete.py
 lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/config_base.py
 lib/calibre/calibre/utils/date.py
-lib/calibre/calibre/utils/dbus_service.py
 lib/calibre/calibre/utils/exim.py
 lib/calibre/calibre/utils/file_type_icons.py
 lib/calibre/calibre/utils/filenames.py
@@ -1323,6 +1331,7 @@ 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/seven_zip.py
 lib/calibre/calibre/utils/shared_file.py
 lib/calibre/calibre/utils/short_uuid.py
 lib/calibre/calibre/utils/smartypants.py
@@ -1337,11 +1346,11 @@ 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/unicode_names.py
 lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
 lib/calibre/calibre/utils/windows/__init__.py
+lib/calibre/calibre/utils/windows/winsapi.py
 lib/calibre/calibre/utils/windows/wintest.py
 lib/calibre/calibre/utils/winreg/__init__.py
 lib/calibre/calibre/utils/winreg/dde.py
@@ -1363,10 +1372,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/calibre_lzma/__init__.py
-lib/calibre/calibre_lzma/errors.py
-lib/calibre/calibre_lzma/lzma1.py
-lib/calibre/calibre_lzma/xz.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
@@ -1422,6 +1427,13 @@ lib/calibre/polyglot/reprlib.py
 lib/calibre/polyglot/smtplib.py
 lib/calibre/polyglot/socketserver.py
 lib/calibre/polyglot/urllib.py
+lib/calibre/qt/__init__.py
+lib/calibre/qt/__main__.py
+lib/calibre/qt/core.py
+lib/calibre/qt/core_name_map.py
+lib/calibre/qt/loader.py
+lib/calibre/qt/webengine.py
+lib/calibre/qt/webengine_name_map.py
 lib/calibre/templite/__init__.py
 lib/calibre/tinycss/__init__.py
 lib/calibre/tinycss/color3.py
@@ -1443,7 +1455,6 @@ lib/calibre/tinycss/tests/tokenizing.py
 lib/calibre/tinycss/token_data.py
 lib/calibre/tinycss/tokenizer.py
 lib/calibre/tinycss/version.py
-${PYSITELIB}/init_calibre.py
 share/bash-completion/completions/calibre
 share/bash-completion/completions/calibre-debug
 share/bash-completion/completions/calibre-server
@@ -1468,6 +1479,8 @@ share/calibre/catalog/mastheadImage.gif
 share/calibre/catalog/section_list_templates.conf
 share/calibre/catalog/stylesheet.css
 share/calibre/catalog/template.xhtml
+share/calibre/changelog.json
+share/calibre/common-english-words.txt
 share/calibre/content-server/calibre.png
 share/calibre/content-server/empty.html
 share/calibre/content-server/index-generated.html
@@ -1510,6 +1523,7 @@ share/calibre/fonts/liberation/LiberationSerif-Bold.ttf
 share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
+share/calibre/fonts/liberation/version.txt
 share/calibre/hyphenation/dictionaries.tar.xz
 share/calibre/hyphenation/locales.json
 share/calibre/hyphenation/sha1sum
@@ -1527,6 +1541,7 @@ share/calibre/images/blank.png
 share/calibre/images/book.png
 share/calibre/images/bookmarks.png
 share/calibre/images/books_in_series.png
+share/calibre/images/bullhorn.png
 share/calibre/images/catalog.png
 share/calibre/images/chapters.png
 share/calibre/images/character-set.png
@@ -1613,6 +1628,7 @@ share/calibre/images/grid.png
 share/calibre/images/h-ellipsis.png
 share/calibre/images/help.png
 share/calibre/images/heuristics.png
+share/calibre/images/highlight.png
 share/calibre/images/highlight_only_off.png
 share/calibre/images/highlight_only_on.png
 share/calibre/images/hotmail.png
@@ -1717,6 +1733,7 @@ share/calibre/images/smarten-punctuation.png
 share/calibre/images/snippets.png
 share/calibre/images/sort.png
 share/calibre/images/spell-check.png
+share/calibre/images/split.png
 share/calibre/images/store.png
 share/calibre/images/subset-fonts.png
 share/calibre/images/swap.png
@@ -1747,7 +1764,6 @@ share/calibre/images/window-close.png
 share/calibre/images/wizard.png
 share/calibre/jacket/stylesheet.css
 share/calibre/jacket/template.xhtml
-share/calibre/jquery.simulate.js
 share/calibre/localization/iso3166.calibre_msgpack
 share/calibre/localization/iso639.calibre_msgpack
 share/calibre/localization/locales.zip
@@ -1800,6 +1816,7 @@ 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/quick_start/tur.epub
 share/calibre/rapydscript/compiler.js.xz
 share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
@@ -1829,6 +1846,7 @@ share/calibre/recipes/adevarul.recipe
 share/calibre/recipes/adnkronos.recipe
 share/calibre/recipes/adventuregamers.recipe
 share/calibre/recipes/aftenposten.recipe
+share/calibre/recipes/aftonbladet.recipe
 share/calibre/recipes/agrogerila.recipe
 share/calibre/recipes/aif_ru.recipe
 share/calibre/recipes/ainonline.recipe
@@ -1915,7 +1933,6 @@ share/calibre/recipes/bbc_sport.recipe
 share/calibre/recipes/bbcvietnamese.recipe
 share/calibre/recipes/benchmark_pl.recipe
 share/calibre/recipes/beppe_grillo.recipe
-share/calibre/recipes/berlin_policy_journal.recipe
 share/calibre/recipes/berliner_zeitung.recipe
 share/calibre/recipes/berlingske_dk.recipe
 share/calibre/recipes/biamag.recipe
@@ -1987,9 +2004,7 @@ share/calibre/recipes/champion.recipe
 share/calibre/recipes/chicago_breaking_news.recipe
 share/calibre/recipes/chicago_tribune.recipe
 share/calibre/recipes/china_economic_net.recipe
-share/calibre/recipes/china_post.recipe
 share/calibre/recipes/china_times.recipe
-share/calibre/recipes/chinadaily.recipe
 share/calibre/recipes/chipro.recipe
 share/calibre/recipes/chosun.recipe
 share/calibre/recipes/chowk.recipe
@@ -2039,6 +2054,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/crikey.recipe
 share/calibre/recipes/cronica.recipe
 share/calibre/recipes/csid.recipe
 share/calibre/recipes/ct24.recipe
@@ -2095,6 +2111,7 @@ share/calibre/recipes/descopera_org.recipe
 share/calibre/recipes/desiring_god.recipe
 share/calibre/recipes/detroit_news.recipe
 share/calibre/recipes/deutsche_welle_bs.recipe
+share/calibre/recipes/deutsche_welle_de.recipe
 share/calibre/recipes/deutsche_welle_en.recipe
 share/calibre/recipes/deutsche_welle_es.recipe
 share/calibre/recipes/deutsche_welle_hr.recipe
@@ -2159,7 +2176,6 @@ 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/eclipseonline.recipe
 share/calibre/recipes/ecogeek.recipe
 share/calibre/recipes/economia.recipe
@@ -2184,6 +2200,7 @@ share/calibre/recipes/ekot.recipe
 share/calibre/recipes/el_colombiano.recipe
 share/calibre/recipes/el_correo.recipe
 share/calibre/recipes/el_cultural.recipe
+share/calibre/recipes/el_diario.recipe
 share/calibre/recipes/el_diplo.recipe
 share/calibre/recipes/el_espectador.recipe
 share/calibre/recipes/el_faro.recipe
@@ -2222,6 +2239,7 @@ share/calibre/recipes/endgadget_ja.recipe
 share/calibre/recipes/entrepeneur.recipe
 share/calibre/recipes/eos_wetenschap.recipe
 share/calibre/recipes/epl_talk.recipe
+share/calibre/recipes/epoch_times.recipe
 share/calibre/recipes/epw.recipe
 share/calibre/recipes/erdinger_anzeiger.recipe
 share/calibre/recipes/erhvervs_avisen_dk.recipe
@@ -2348,6 +2366,7 @@ share/calibre/recipes/gofin_pl.recipe
 share/calibre/recipes/golem_de.recipe
 share/calibre/recipes/good_house_keeping.recipe
 share/calibre/recipes/good_to_know.recipe
+share/calibre/recipes/google_news.recipe
 share/calibre/recipes/googlemobileblog.recipe
 share/calibre/recipes/gosc_full.recipe
 share/calibre/recipes/gosc_niedzielny.recipe
@@ -2382,7 +2401,6 @@ share/calibre/recipes/hannoversche_zeitung.recipe
 share/calibre/recipes/harpers.recipe
 share/calibre/recipes/harpers_full.recipe
 share/calibre/recipes/hatalska.recipe
-share/calibre/recipes/hbr.recipe
 share/calibre/recipes/heavy_metal_it.recipe
 share/calibre/recipes/heise.recipe
 share/calibre/recipes/heise_ct.recipe
@@ -2392,6 +2410,8 @@ share/calibre/recipes/helsingin_sanomat.recipe
 share/calibre/recipes/high_country_news.recipe
 share/calibre/recipes/hindu.recipe
 share/calibre/recipes/hindu_business_line.recipe
+share/calibre/recipes/hindu_human_rights.recipe
+share/calibre/recipes/hindu_post.recipe
 share/calibre/recipes/historia_pl.recipe
 share/calibre/recipes/history_today.recipe
 share/calibre/recipes/hln_be.recipe
@@ -2412,7 +2432,6 @@ share/calibre/recipes/howtogeek.recipe
 share/calibre/recipes/hoy.recipe
 share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
-share/calibre/recipes/huffingtonpost_uk.recipe
 share/calibre/recipes/hurriyet.recipe
 share/calibre/recipes/hvg.recipe
 share/calibre/recipes/hvidovreavis_dk.recipe
@@ -2448,8 +2467,11 @@ share/calibre/recipes/inc.recipe
 share/calibre/recipes/independent.recipe
 share/calibre/recipes/independent_australia.recipe
 share/calibre/recipes/index_hu.recipe
+share/calibre/recipes/india_facts.recipe
+share/calibre/recipes/india_speaks_reddit.recipe
 share/calibre/recipes/india_today.recipe
 share/calibre/recipes/indian_express.recipe
+share/calibre/recipes/indic_today.recipe
 share/calibre/recipes/indy_star.recipe
 share/calibre/recipes/infobae.recipe
 share/calibre/recipes/infomotori.recipe
@@ -2627,6 +2649,7 @@ share/calibre/recipes/livemint.recipe
 share/calibre/recipes/living_stones.recipe
 share/calibre/recipes/lomza.recipe
 share/calibre/recipes/london_free_press.recipe
+share/calibre/recipes/los_danieles.recipe
 share/calibre/recipes/los_tiempos_bo.recipe
 share/calibre/recipes/losservatoreromano_it.recipe
 share/calibre/recipes/lrb.recipe
@@ -2651,6 +2674,7 @@ share/calibre/recipes/mainichi_en.recipe
 share/calibre/recipes/mainichi_science_news.recipe
 share/calibre/recipes/malaya_business_insight.recipe
 share/calibre/recipes/malaysian_mirror.recipe
+share/calibre/recipes/mallorca_zeitung.recipe
 share/calibre/recipes/mandidner.recipe
 share/calibre/recipes/manila_standard_today.recipe
 share/calibre/recipes/marca.recipe
@@ -2673,6 +2697,7 @@ share/calibre/recipes/mediterraneo.recipe
 share/calibre/recipes/medscape.recipe
 share/calibre/recipes/melbourne_herald_sun.recipe
 share/calibre/recipes/men24_gr.recipe
+share/calibre/recipes/mens_day_out.recipe
 share/calibre/recipes/mens_health.recipe
 share/calibre/recipes/merco_press.recipe
 share/calibre/recipes/mesec.recipe
@@ -2712,6 +2737,7 @@ share/calibre/recipes/munchner_merkur_sud.recipe
 share/calibre/recipes/munchner_merkur_wurmtal.recipe
 share/calibre/recipes/murnauer_tagblatt.recipe
 share/calibre/recipes/mwjournal.recipe
+share/calibre/recipes/my_dealz_de.recipe
 share/calibre/recipes/myapple_pl.recipe
 share/calibre/recipes/nachdenkseiten.recipe
 share/calibre/recipes/nacional_cro.recipe
@@ -2783,7 +2809,6 @@ share/calibre/recipes/novinite_bg.recipe
 share/calibre/recipes/novinky.cz.recipe
 share/calibre/recipes/novinky.recipe
 share/calibre/recipes/novosti.recipe
-share/calibre/recipes/now_toronto.recipe
 share/calibre/recipes/nowiny_rybnik.recipe
 share/calibre/recipes/nowy_obywatel.recipe
 share/calibre/recipes/noz.recipe
@@ -2800,10 +2825,10 @@ share/calibre/recipes/ntv_spor.recipe
 share/calibre/recipes/ntv_tr.recipe
 share/calibre/recipes/nu.recipe
 share/calibre/recipes/nursingtimes.recipe
-share/calibre/recipes/nuus24.recipe
 share/calibre/recipes/nymag.recipe
 share/calibre/recipes/nypost.recipe
 share/calibre/recipes/nytimes.recipe
+share/calibre/recipes/nytimes_cooking.recipe
 share/calibre/recipes/nytimes_sports.recipe
 share/calibre/recipes/nytimes_sub.recipe
 share/calibre/recipes/nytimes_tech.recipe
@@ -2828,6 +2853,7 @@ share/calibre/recipes/omgubuntu.recipe
 share/calibre/recipes/onda_rock.recipe
 share/calibre/recipes/onemagazine.recipe
 share/calibre/recipes/onionavclub.recipe
+share/calibre/recipes/opindia.recipe
 share/calibre/recipes/opinion_bo.recipe
 share/calibre/recipes/optyczne_pl.recipe
 share/calibre/recipes/oregonian.recipe
@@ -2856,7 +2882,6 @@ share/calibre/recipes/patente_de_corso.recipe
 share/calibre/recipes/pc_advisor.recipe
 share/calibre/recipes/pc_foster.recipe
 share/calibre/recipes/pc_lab.recipe
-share/calibre/recipes/pc_mag.recipe
 share/calibre/recipes/pc_world.recipe
 share/calibre/recipes/pcworld_hu.recipe
 share/calibre/recipes/pcworldro.recipe
@@ -2903,12 +2928,14 @@ share/calibre/recipes/post_today.recipe
 share/calibre/recipes/poughkeepsie_journal.recipe
 share/calibre/recipes/ppe_pl.recipe
 share/calibre/recipes/praguemonitor.recipe
+share/calibre/recipes/pragyata.recipe
 share/calibre/recipes/pravda.recipe
 share/calibre/recipes/pravda_it.recipe
 share/calibre/recipes/pravda_por.recipe
 share/calibre/recipes/pravda_rs.recipe
 share/calibre/recipes/pravda_ru.recipe
 share/calibre/recipes/pravo.recipe
+share/calibre/recipes/prekshaa.recipe
 share/calibre/recipes/presse_portal.recipe
 share/calibre/recipes/pressonline.recipe
 share/calibre/recipes/pressthink.recipe
@@ -3012,6 +3039,7 @@ share/calibre/recipes/satmagazine.recipe
 share/calibre/recipes/sb_nation.recipe
 share/calibre/recipes/schattenblick.recipe
 share/calibre/recipes/schongauer_nachrichten.recipe
+share/calibre/recipes/schwarzerpfeil.recipe
 share/calibre/recipes/science_advances.recipe
 share/calibre/recipes/science_based_medicine.recipe
 share/calibre/recipes/science_news.recipe
@@ -3089,16 +3117,19 @@ share/calibre/recipes/straitstimes.recipe
 share/calibre/recipes/strange_horizons.recipe
 share/calibre/recipes/strategic_culture.recipe
 share/calibre/recipes/strategy-business.recipe
+share/calibre/recipes/substack.recipe
 share/calibre/recipes/sueddeutsche.recipe
 share/calibre/recipes/sueddeutsche_mobil.recipe
 share/calibre/recipes/sueddeutschezeitung.recipe
 share/calibre/recipes/sunday_times_magazine.recipe
 share/calibre/recipes/superbebe.recipe
 share/calibre/recipes/superesportes.recipe
+share/calibre/recipes/svt_nyheter.recipe
 share/calibre/recipes/swiat_obrazu.recipe
 share/calibre/recipes/swiatkindle.recipe
 share/calibre/recipes/syddjurslokalavisen_dk.recipe
 share/calibre/recipes/t3n_de.recipe
+share/calibre/recipes/t_online.recipe
 share/calibre/recipes/tablety_pl.recipe
 share/calibre/recipes/tabu.recipe
 share/calibre/recipes/tagesan.recipe
@@ -3149,9 +3180,11 @@ share/calibre/recipes/the_oz.recipe
 share/calibre/recipes/the_philippine_daily_inquirer.recipe
 share/calibre/recipes/the_philippine_star.recipe
 share/calibre/recipes/the_register.recipe
+share/calibre/recipes/the_saturday_paper.recipe
 share/calibre/recipes/the_scotsman.recipe
 share/calibre/recipes/the_sun.recipe
 share/calibre/recipes/the_verge.recipe
+share/calibre/recipes/the_week.recipe
 share/calibre/recipes/the_week_magazine_free.recipe
 share/calibre/recipes/the_workingham_times.recipe
 share/calibre/recipes/thecodelesscode.recipe
@@ -3315,6 +3348,7 @@ share/calibre/recipes/yenisafak_gazetesi.recipe
 share/calibre/recipes/ynet.recipe
 share/calibre/recipes/yomiuri.recipe
 share/calibre/recipes/yomiuri_world.recipe
+share/calibre/recipes/zackzack.recipe
 share/calibre/recipes/zadolba_li.recipe
 share/calibre/recipes/zaman.recipe
 share/calibre/recipes/zaobao.recipe
@@ -3351,10 +3385,11 @@ share/calibre/user-manual-translation-stats.json
 share/calibre/viewer.html
 share/calibre/viewer.js
 share/doc/calibre/COPYRIGHT
-share/doc/calibre/Changelog.old.yaml
-share/doc/calibre/Changelog.yaml
+share/doc/calibre/Changelog.old.txt
+share/doc/calibre/Changelog.txt
 share/doc/calibre/INSTALL.rst
 share/doc/calibre/LICENSE.rtf
 share/doc/calibre/README.md
 @pkgdir share/icons
 @pkgdir share/applications
+@pkgdir lib/python${PYVERSSUFFIX}/site-packages
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index f4990cb8eeb..5714ab17b65 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.111 2022/01/09 16:31:09 rhialto Exp $
+$NetBSD: distinfo,v 1.112 2022/01/20 19:03:07 rhialto Exp $
 
-BLAKE2s (calibre-4.23.0.tar.xz) = c08912bcca9886e5608b5a99144645047c53e2583079db139a7eedddcc54be6c
-SHA512 (calibre-4.23.0.tar.xz) = 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
-Size (calibre-4.23.0.tar.xz) = 36908740 bytes
-SHA1 (patch-setup_build.py) = 6eeedbce76a627900c55f59d31ba76dc79fc7d27
-SHA1 (patch-setup_extensions.json) = 90f61a7c776220bfa16439eeb599eb2132e410b1
+BLAKE2s (calibre-5.34.0.tar.xz) = 62505402dee81ebd41063e80dc9611e9517c27b3a69e8cb88d99755ccbd3bca5
+SHA512 (calibre-5.34.0.tar.xz) = fe60f43493e8830a02a08db017efa8d8bdf873618c75efd73ed9a5a6e13a5afc41daa79489645f15fbeeadc6f99b16a70ebc8e6979b0c113f73a170e20f4c95f
+Size (calibre-5.34.0.tar.xz) = 37077184 bytes
+SHA1 (patch-setup_build.py) = 32cd46adf8a1c516639b4920191fa1527e86c2cc
+SHA1 (patch-setup_extensions.json) = a15bf58d20bd9a7566f14ebae20116f646c834e7
 SHA1 (patch-setup_install.py) = 758dc31959a6a850602abfcd5d58b19f6b9c6939
-SHA1 (patch-src_calibre_constants.py) = a72594b5a68fa42e7133d8be42dd30e73c8db205
-SHA1 (patch-src_calibre_ebooks_BeautifulSoup.py) = 5be182dde2085bbd2893a966aeb0f4fd4fc0c707
+SHA1 (patch-src_calibre_constants.py) = e35f904d075ddb2cf2256895b564a55490fb5897
 SHA1 (patch-src_calibre_linux.py) = 382191b8c8c6c893c4f2385613c599fcfc3bff09
 SHA1 (patch-src_calibre_utils_icu.c) = 219257d68925b5c4a0df897d89324457f2ff7289
-SHA1 (patch-src_calibre_utils_matcher.c) = a774e353c224ef5dfba115a89ee5831edaef02ae
diff --git a/misc/calibre/options.mk b/misc/calibre/options.mk
new file mode 100644
index 00000000000..50abf708f7d
--- /dev/null
+++ b/misc/calibre/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.1 2022/01/20 19:03:07 rhialto Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.calibre
+PKG_SUPPORTED_OPTIONS=	rar
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mrar)
+DEPENDS+=	${PYPKGPREFIX}-unrardll-[0-9]*:../../archivers/py-unrardll
+.endif
diff --git a/misc/calibre/patches/patch-setup_build.py b/misc/calibre/patches/patch-setup_build.py
index a879a215232..052db1564f7 100644
--- a/misc/calibre/patches/patch-setup_build.py
+++ b/misc/calibre/patches/patch-setup_build.py
@@ -1,29 +1,35 @@
-$NetBSD: patch-setup_build.py,v 1.4 2022/01/09 15:43:51 rhialto Exp $
+$NetBSD: patch-setup_build.py,v 1.5 2022/01/20 19:03:07 rhialto Exp $
 
 - Fix linking against native X.
 - Include netbsd in various conditional building criteria.
+- Patch in the directory /usr/pkg/share/sip3.9/PyQt5 for
+  QtWidgets/QtWidgetsmod.sip etc.
+- Define the %Platform value WS_X11, so that Q_PID gets defined in
+  PyQt5/QtCore/qprocess.sip.
+- Autodetection of the sip API version of PyQt5.so fails because sip 4
+  does not write the QtCore.toml file with that information.
 
---- setup/build.py.orig	2020-02-21 03:27:12.000000000 +0000
+--- setup/build.py.orig	2021-12-17 00:40:19.000000000 +0000
 +++ setup/build.py
-@@ -10,7 +10,7 @@ __docformat__ = 'restructuredtext en'
- import textwrap, os, shlex, subprocess, glob, shutil, re, sys, json
+@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
+ import textwrap, os, shlex, subprocess, glob, shutil, sys, json, errno, sysconfig
  from collections import namedtuple
  
--from setup import Command, islinux, isbsd, isfreebsd, isosx, ishaiku, SRC, iswindows, __version__, ispy3
-+from setup import Command, islinux, isbsd, isfreebsd, isnetbsd, isosx, ishaiku, SRC, iswindows, __version__, ispy3
- isunix = islinux or isosx or isbsd or ishaiku
+-from setup import Command, islinux, isbsd, isfreebsd, ismacos, ishaiku, SRC, iswindows
++from setup import Command, islinux, isbsd, isfreebsd, ismacos, ishaiku, SRC, iswindows, isnetbsd
+ isunix = islinux or ismacos or isbsd or ishaiku
  
  py_lib = os.path.join(sys.prefix, 'libs', 'python%d%d.lib' % sys.version_info[:2])
-@@ -103,7 +103,7 @@ def is_ext_allowed(ext):
+@@ -116,7 +116,7 @@ def is_ext_allowed(ext):
      only = ext.get('only', '')
      if only:
          only = set(only.split())
--        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "osx", "windows"]))
-+        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "osx", "windows", "netbsd"]))
+-        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "macos", "windows"]))
++        q = set(filter(lambda x: globals()["is" + x], ["bsd", "freebsd", "haiku", "linux", "macos", "windows", "netbsd"]))
          return len(q.intersection(only)) > 0
      return True
  
-@@ -124,6 +124,8 @@ def parse_extension(ext):
+@@ -137,6 +137,8 @@ def parse_extension(ext):
              ans = ext.pop('bsd_' + k, ans)
          elif isfreebsd:
              ans = ext.pop('freebsd_' + k, ans)
@@ -32,7 +38,7 @@ $NetBSD: patch-setup_build.py,v 1.4 2022/01/09 15:43:51 rhialto Exp $
          elif ishaiku:
              ans = ext.pop('haiku_' + k, ans)
          else:
-@@ -412,6 +414,7 @@ class Build(Command):
+@@ -496,6 +498,7 @@ class Build(Command):
              INCLUDEPATH += {freetype}
              DESTDIR = {destdir}
              CONFIG -= create_cmake  # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
@@ -40,11 +46,31 @@ $NetBSD: patch-setup_build.py,v 1.4 2022/01/09 15:43:51 rhialto Exp $
              ''').format(
                  headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
                      target), freetype=' '.join(ft_inc_dirs))
-@@ -472,6 +475,7 @@ class Build(Command):
-         SOURCES = {sources}
-         INCLUDEPATH += {sipinc} {pyinc}
-         VERSION = {ver}
-+        QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
-         win32 {{
-             LIBS += {py_lib}
-             TARGET_EXT = .dll
+@@ -521,8 +524,11 @@ class Build(Command):
+         abi_version = ''
+         if pyqt_sip_abi_version():
+             abi_version = f'abi-version = "{pyqt_sip_abi_version()}"'
++        else:
++            abi_version = f'abi-version = "12.7"'   # 12.7 sip-4.19.25
+         sipf = ext.sip_files[0]
+         needs_exceptions = 'true' if ext.needs_exceptions else 'false'
++        sip_include_dirs = [os.getenv('SIP_DIR')]
+         with open(os.path.join(src_dir, 'pyproject.toml'), 'w') as f:
+             f.write(f'''
+ [build-system]
+@@ -538,6 +544,7 @@ project-factory = "pyqtbuild:PyQtProject
+ 
+ [tool.sip.project]
+ sip-files-dir = "."
++sip-include-dirs = {sip_include_dirs}
+ {abi_version}
+ 
+ [tool.sip.bindings.pictureflow]
+@@ -547,6 +554,7 @@ exceptions = {needs_exceptions}
+ include-dirs = {ext.inc_dirs}
+ qmake-QT = ["widgets"]
+ sip-file = "{os.path.basename(sipf)}"
++tags = ["WS_X11"]
+ ''')
+         shutil.copy2(sipf, src_dir)
+ 
diff --git a/misc/calibre/patches/patch-setup_extensions.json b/misc/calibre/patches/patch-setup_extensions.json
index b33353a79f6..84260c3df15 100644
--- a/misc/calibre/patches/patch-setup_extensions.json
+++ b/misc/calibre/patches/patch-setup_extensions.json
@@ -1,10 +1,10 @@
-$NetBSD: patch-setup_extensions.json,v 1.3 2022/01/09 15:43:51 rhialto Exp $
+$NetBSD: patch-setup_extensions.json,v 1.4 2022/01/20 19:03:07 rhialto Exp $
 
 Include libusb and libmtp for netbsd.
 
---- setup/extensions.json.orig	2020-02-21 03:27:12.000000000 +0000
+--- setup/extensions.json.orig	2021-12-17 00:40:19.000000000 +0000
 +++ setup/extensions.json
-@@ -207,13 +207,13 @@
+@@ -204,13 +204,13 @@
      },
      {
          "name": "libusb",
@@ -15,8 +15,8 @@ Include libusb and libmtp for netbsd.
      },
      {
          "name": "libmtp",
--        "only": "freebsd osx linux haiku",
-+        "only": "freebsd osx linux haiku netbsd",
+-        "only": "freebsd macos linux haiku",
++        "only": "freebsd macos linux haiku netbsd",
          "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
          "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
          "libraries": "mtp"
diff --git a/misc/calibre/patches/patch-src_calibre_constants.py b/misc/calibre/patches/patch-src_calibre_constants.py
index 18ce00a2fc2..15b0e072b96 100644
--- a/misc/calibre/patches/patch-src_calibre_constants.py
+++ b/misc/calibre/patches/patch-src_calibre_constants.py
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_calibre_constants.py,v 1.5 2022/01/09 15:43:51 rhialto Exp $
+$NetBSD: patch-src_calibre_constants.py,v 1.6 2022/01/20 19:03:07 rhialto Exp $
 
 Include netbsd conditional.
 
---- src/calibre/constants.py.orig	2022-01-08 12:14:13.953868037 +0000
+--- src/calibre/constants.py.orig	2021-12-17 00:40:19.000000000 +0000
 +++ src/calibre/constants.py
-@@ -197,7 +197,7 @@ class Plugins(collections.Mapping):
-         if isosx:
-             plugins.append('usbobserver')
-             plugins.append('cocoa')
--        if isfreebsd or ishaiku or islinux or isosx:
-+        if isfreebsd or ishaiku or islinux or isosx or isnetbsd:
-             plugins.append('libusb')
-             plugins.append('libmtp')
-         self.plugins = frozenset(plugins)
+@@ -256,7 +256,7 @@ class ExtensionsImporter:
+             extra = ('winutil', 'wpd', 'winfonts', 'winsapi')
+         elif ismacos:
+             extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')
+-        elif isfreebsd or ishaiku or islinux:
++        elif isfreebsd or ishaiku or islinux or isnetbsd:
+             extra = ('libusb', 'libmtp')
+         else:
+             extra = ()
diff --git a/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py b/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py
deleted file mode 100644
index 9bf75479bae..00000000000
--- a/misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-src_calibre_ebooks_BeautifulSoup.py,v 1.1 2022/01/09 15:43:51 rhialto Exp $
-
-/usr/pkg/lib/calibre/calibre/ebooks/BeautifulSoup.py imports bs4,
-which imports this:
-
-  File "/usr/pkg/lib/python2.7/site-packages/bs4/dammit.py", line 13, in <module>
-    from html.entities import codepoint2name
-ImportError: No module named html.entities
-
-According to https://stackoverflow.com/questions/27372347/beautifulsoup-importerror-no-module-named-html-entities this module only exists for Python 3.
-There is the package /www/py-beautifulsoup, py27-beautifulsoup-3.2.2 for Python2, 
-
---- src/calibre/ebooks/BeautifulSoup.py.orig	2020-02-21 03:27:12.000000000 +0000
-+++ src/calibre/ebooks/BeautifulSoup.py
-@@ -4,8 +4,8 @@
- 
- from __future__ import absolute_import, division, print_function, unicode_literals
- 
--import bs4
--from bs4 import (  # noqa
-+import BeautifulSoup
-+from BeautifulSoup import (  # noqa
-     CData, Comment, Declaration, NavigableString, ProcessingInstruction,
-     SoupStrainer, Tag, __version__
- )
diff --git a/misc/calibre/patches/patch-src_calibre_utils_matcher.c b/misc/calibre/patches/patch-src_calibre_utils_matcher.c
deleted file mode 100644
index bf84afe58f7..00000000000
--- a/misc/calibre/patches/patch-src_calibre_utils_matcher.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_calibre_utils_matcher.c,v 1.2 2022/01/09 15:43:51 rhialto Exp $
-
-Fix build with ICU 68.
-
---- src/calibre/utils/matcher.c.orig	2020-02-21 03:27:12.000000000 +0000
-+++ src/calibre/utils/matcher.c
-@@ -15,7 +15,7 @@
- #define inline
- #endif
- 
--typedef unsigned char bool;
-+//typedef unsigned char bool;
- #define TRUE 1
- #define FALSE 0
- #define MAX(x, y) ((x > y) ? x : y)