[pkgsrc/trunk]: pkgsrc/misc/calibre misc/calibre: update major version, to 5....

[rhialto <rhialto%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d753fca5dea1
branches:  trunk
changeset: 372148:d753fca5dea1
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Thu Jan 20 19:03:07 2022 +0000

description:
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.

diffstat:

 misc/calibre/Makefile                                          |   37 +-
 misc/calibre/PLIST                                             |  139 ++++++---
 misc/calibre/distinfo                                          |   16 +-
 misc/calibre/options.mk                                        |   10 +
 misc/calibre/patches/patch-setup_build.py                      |   66 +++-
 misc/calibre/patches/patch-setup_extensions.json               |   10 +-
 misc/calibre/patches/patch-src_calibre_constants.py            |   22 +-
 misc/calibre/patches/patch-src_calibre_ebooks_BeautifulSoup.py |   25 -
 misc/calibre/patches/patch-src_calibre_utils_matcher.c         |   15 -
 9 files changed, 185 insertions(+), 155 deletions(-)

diffs (truncated from 1083 to 300 lines):

diff -r 0b00a910c39a -r d753fca5dea1 misc/calibre/Makefile
--- a/misc/calibre/Makefile     Thu Jan 20 17:34:04 2022 +0000
+++ b/misc/calibre/Makefile     Thu Jan 20 19:03:07 2022 +0000
@@ -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 @@
 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_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 @@
 
 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 @@
 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 @@
 # 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 @@
 .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 -r 0b00a910c39a -r d753fca5dea1 misc/calibre/PLIST
--- a/misc/calibre/PLIST        Thu Jan 20 17:34:04 2022 +0000
+++ b/misc/calibre/PLIST        Thu Jan 20 19:03:07 2022 +0000
@@ -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/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/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/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/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/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/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/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/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/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_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/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/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_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_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/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/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_ui.py