misc/calibre: update to 5.35.0

Also switched the libusb extension to use libusb-1.0, like the libmtp
extension. Added "netbsd" tags to lots of "supported_platforms" of
plugins, to give them a chance to work (if something would find the
device).
Added dependency on zeroconf to give "smart_device_app" a chance.

4 files changed, 34 insertions, 18 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index ba563946f1c..59c2953496d 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.263 2022/01/23 15:16:44 wiz Exp $
+# $NetBSD: Makefile,v 1.264 2022/01/23 16:17:13 rhialto Exp $
 
-DISTNAME=	calibre-5.34.0
+DISTNAME=	calibre-5.35.0
 CATEGORIES=	misc
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
@@ -34,6 +34,7 @@ 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
+DEPENDS+=	${PYPKGPREFIX}-zeroconf-[0-9]*:../../net/py-zeroconf
 
 # for installation
 BUILD_DEPENDS+=	${PYPKGPREFIX}-qt-builder>=1:../../x11/py-qt-builder
@@ -78,6 +79,18 @@ SUBST_MESSAGE.path=	Fixing path to python.
 SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	${FIX_PYTHON_FILES}
 
+SUBST_CLASSES+=		plat
+SUBST_SED.plat+=	-e "/supported_platforms =/s/'linux'/'linux', 'netbsd'/"
+SUBST_MESSAGE.plat=	Fixing supported platforms
+SUBST_STAGE.plat=	pre-configure
+SUBST_FILES.plat=	src/calibre/devices/misc.py
+SUBST_FILES.plat+=	src/calibre/devices/*/*driver.py
+SUBST_FILES.plat+=	src/calibre/library/catalogs/*.py
+SUBST_FILES.plat+=	src/calibre/ebooks/metadata/sources/base.py
+SUBST_FILES.plat+=	src/calibre/ebooks/metadata/archive.py
+SUBST_FILES.plat+=	src/calibre/ebooks/html/to_zip.py
+SUBST_FILES.plat+=	src/calibre/customize/*.py
+
 REPLACE_BASH+=		resources/calibre-portable.sh
 
 # These ones are for replacing python[0-9*] with PYTHONBIN
@@ -119,8 +132,7 @@ BUILDLINK_API_DEPENDS.chmlib+=	chmlib>=0.40
 BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=1.1.5
 .include "../../devel/libmtp/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12
-.include "../../mk/libusb.buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 193b7b23ef0..7d77a005683 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.95 2022/01/20 19:03:07 rhialto Exp $
+@comment $NetBSD: PLIST,v 1.96 2022/01/23 16:17:13 rhialto Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -19,7 +19,6 @@ bin/lrfviewer
 bin/lrs2lrf
 bin/markdown-calibre
 bin/web2disk
-lib/${PYVERSSUFFIX}/site-packages/init_calibre.py
 lib/calibre/calibre/__init__.py
 lib/calibre/calibre/build_forms.py
 lib/calibre/calibre/constants.py
@@ -1455,6 +1454,7 @@ 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
@@ -1527,6 +1527,7 @@ share/calibre/fonts/liberation/version.txt
 share/calibre/hyphenation/dictionaries.tar.xz
 share/calibre/hyphenation/locales.json
 share/calibre/hyphenation/sha1sum
+share/calibre/icons.rcc
 share/calibre/images.qrc
 share/calibre/images/add_book.png
 share/calibre/images/apple-touch-icon.png
@@ -2163,6 +2164,7 @@ 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/dw_de.recipe
 share/calibre/recipes/dwutygodnik.recipe
 share/calibre/recipes/dzieje_pl.recipe
 share/calibre/recipes/dziennik_baltycki.recipe
@@ -2241,6 +2243,7 @@ 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/equestria_daily.recipe
 share/calibre/recipes/erdinger_anzeiger.recipe
 share/calibre/recipes/erhvervs_avisen_dk.recipe
 share/calibre/recipes/esbjerglokalavisen_dk.recipe
@@ -3392,4 +3395,3 @@ 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 5714ab17b65..38e2de27ab8 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.112 2022/01/20 19:03:07 rhialto Exp $
+$NetBSD: distinfo,v 1.113 2022/01/23 16:17:13 rhialto Exp $
 
-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
+BLAKE2s (calibre-5.35.0.tar.xz) = 03fd2a3c2c526b3a998d2e1617e738173723c13fb7bd24b4d80a4edc2e289a7b
+SHA512 (calibre-5.35.0.tar.xz) = b99a5c86a48d29bcc6f6188f9e4a20fe8ac1c4115147a964596e2bc3635d20c2556ae0be90c7deac95d4ef430b6ce6c7b712510358f71a22817c9360203b1f11
+Size (calibre-5.35.0.tar.xz) = 37801424 bytes
 SHA1 (patch-setup_build.py) = 32cd46adf8a1c516639b4920191fa1527e86c2cc
-SHA1 (patch-setup_extensions.json) = a15bf58d20bd9a7566f14ebae20116f646c834e7
+SHA1 (patch-setup_extensions.json) = 6ac0a6a7e80dc4a01cb18a61c733ee375085ad06
 SHA1 (patch-setup_install.py) = 758dc31959a6a850602abfcd5d58b19f6b9c6939
 SHA1 (patch-src_calibre_constants.py) = e35f904d075ddb2cf2256895b564a55490fb5897
 SHA1 (patch-src_calibre_linux.py) = 382191b8c8c6c893c4f2385613c599fcfc3bff09
diff --git a/misc/calibre/patches/patch-setup_extensions.json b/misc/calibre/patches/patch-setup_extensions.json
index 84260c3df15..f4db8dd28c3 100644
--- a/misc/calibre/patches/patch-setup_extensions.json
+++ b/misc/calibre/patches/patch-setup_extensions.json
@@ -1,17 +1,19 @@
-$NetBSD: patch-setup_extensions.json,v 1.4 2022/01/20 19:03:07 rhialto Exp $
+$NetBSD: patch-setup_extensions.json,v 1.5 2022/01/23 16:17:13 rhialto Exp $
 
 Include libusb and libmtp for netbsd.
 
---- setup/extensions.json.orig	2021-12-17 00:40:19.000000000 +0000
+--- setup/extensions.json.orig	2022-01-21 02:22:17.000000000 +0000
 +++ setup/extensions.json
-@@ -204,13 +204,13 @@
+@@ -198,7 +198,7 @@
      },
      {
          "name": "libusb",
--        "only": "freebsd",
-+        "only": "freebsd netbsd",
+-        "only": "macos linux haiku",
++        "only": "macos linux netbsd haiku",
          "sources": "calibre/devices/libusb/libusb.c",
-         "libraries": "usb"
+         "libraries": "usb-1.0"
+     },
+@@ -210,7 +210,7 @@
      },
      {
          "name": "libmtp",