calibre: some cleanups

[Olaf Seibert <rhialto%falu.nl@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sun Jan 9 15:01:33 2022 +0100
Changeset:	8f400580594fc5500ed0cabb6d47d8f15388e365

Modified Files:
	calibre/Makefile
	calibre/PLIST
	calibre/distinfo
	calibre/patches/patch-src_calibre_utils_icu.c
	calibre/patches/patch-src_calibre_utils_matcher.c

Log Message:
calibre: some cleanups

including synchronizing with dependencies from main pkgsrc so we
get Python 2.7 versions of packages.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8f400580594fc5500ed0cabb6d47d8f15388e365

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 calibre/Makefile                                  | 10 ++++------
 calibre/PLIST                                     |  3 ---
 calibre/distinfo                                  |  4 ++--
 calibre/patches/patch-src_calibre_utils_icu.c     |  2 +-
 calibre/patches/patch-src_calibre_utils_matcher.c |  2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diffs:
diff --git a/calibre/Makefile b/calibre/Makefile
index c557bce5de..2a43694d33 100644
--- a/calibre/Makefile
+++ b/calibre/Makefile
@@ -2,7 +2,6 @@
 
 DISTNAME=	calibre-4.11.0
 CATEGORIES=	misc
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -15,7 +14,6 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
 DEPENDS+=	${PYPKGPREFIX}-beautifulsoup-[0-9]*:../../www/py-beautifulsoup
 DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
-#DEPENDS+=	${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
 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
@@ -27,9 +25,10 @@ DEPENDS+=	${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
 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-Pillow
+DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6
 DEPENDS+=	${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
+DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments25
+#DEPENDS+=	${PYPKGPREFIX}-qt5-webengine-[0-9]*:../../x11/py-qt5-webengine
 DEPENDS+=	${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve
@@ -43,7 +42,7 @@ EXTRACT_USING=	bsdtar
 PYTHON_VERSIONS_ACCEPTED=	27 # as of 3.16.0
 PYTHON_VERSIONED_DEPENDENCIES+=	markdown
 
-USE_LANGUAGES=			c c++
+USE_LANGUAGES=			c99 c++
 USE_LIBTOOL=			yes
 USE_TOOLS+=			pkg-config pax
 PYSETUPOPTARGS=			# empty
@@ -148,7 +147,6 @@ BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .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/calibre/PLIST b/calibre/PLIST
index e95078f58c..1c713fa753 100644
--- a/calibre/PLIST
+++ b/calibre/PLIST
@@ -1,7 +1,4 @@
 @comment $NetBSD$
-lib/calibre/calibre/plugins/libmtp.so
-lib/calibre/calibre/plugins/libusb.so
-
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
diff --git a/calibre/distinfo b/calibre/distinfo
index 29a825d786..d302bf87ff 100644
--- a/calibre/distinfo
+++ b/calibre/distinfo
@@ -10,5 +10,5 @@ SHA1 (patch-src_calibre_constants.py) = a72594b5a68fa42e7133d8be42dd30e73c8db205
 SHA1 (patch-src_calibre_ebooks_BeautifulSoup.py) = b0775f55806a67322eaaae340c6f80ed87aa2332
 SHA1 (patch-src_calibre_headless_fontconfig__database.cpp) = 55e7bd7b779ec2ff4a28fdd3ca9d9c10811b6bb1
 SHA1 (patch-src_calibre_linux.py) = 382191b8c8c6c893c4f2385613c599fcfc3bff09
-SHA1 (patch-src_calibre_utils_icu.c) = a9b90dbe7e7e39d2cf971132a9c45c3d8e31a6fb
-SHA1 (patch-src_calibre_utils_matcher.c) = 4f5969ba3ce1fe96e99c17fe46c992d9adf03b99
+SHA1 (patch-src_calibre_utils_icu.c) = bfcb097de7ba30bc03c5357f5ed1b8ce8627dc40
+SHA1 (patch-src_calibre_utils_matcher.c) = 9f5e6b3444189242bf0be331be883793edb65f69
diff --git a/calibre/patches/patch-src_calibre_utils_icu.c b/calibre/patches/patch-src_calibre_utils_icu.c
index 5db000690f..755a24f2a6 100644
--- a/calibre/patches/patch-src_calibre_utils_icu.c
+++ b/calibre/patches/patch-src_calibre_utils_icu.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
-I compiled with gcc8.
+At least for gcc 7.5 and 8.
 
 --- src/calibre/utils/icu.c.orig	2020-02-21 03:27:12.000000000 +0000
 +++ src/calibre/utils/icu.c
diff --git a/calibre/patches/patch-src_calibre_utils_matcher.c b/calibre/patches/patch-src_calibre_utils_matcher.c
index 28826aae2d..ad24137d8f 100644
--- a/calibre/patches/patch-src_calibre_utils_matcher.c
+++ b/calibre/patches/patch-src_calibre_utils_matcher.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
-I compiled with gcc8.
+At least for gcc 7.5 and 8.
 
 --- src/calibre/utils/matcher.c.orig	2020-02-21 03:27:12.000000000 +0000
 +++ src/calibre/utils/matcher.c