calibre5: cleanup a patch and fix a dependency.

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

Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Tue Jan 18 22:03:12 2022 +0100
Changeset:	e059198917d9c0ec23070bc63ccbae092ca81c7f

Modified Files:
	calibre5/Makefile
	calibre5/patches/patch-setup_build.py

Log Message:
calibre5: cleanup a patch and fix a dependency.

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

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

diffstat:
 calibre5/Makefile                     | 2 +-
 calibre5/patches/patch-setup_build.py | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diffs:
diff --git a/calibre5/Makefile b/calibre5/Makefile
index 7ff2309633..e5eb92f1cf 100644
--- a/calibre5/Makefile
+++ b/calibre5/Makefile
@@ -33,7 +33,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}-unrardll-[0-9]:../../archivers/py-unrardll
+DEPENDS+=	${PYPKGPREFIX}-unrardll-[0-9]*:../../archivers/py-unrardll
 
 # TODO: these are still in pkgsrc/wip:
 DEPENDS+=	${PYPKGPREFIX}-jeepney>=0.6.0:../../wip/py-jeepney
diff --git a/calibre5/patches/patch-setup_build.py b/calibre5/patches/patch-setup_build.py
index 74801c9e98..438cc6a458 100644
--- a/calibre5/patches/patch-setup_build.py
+++ b/calibre5/patches/patch-setup_build.py
@@ -46,7 +46,7 @@ $NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
              ''').format(
                  headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
                      target), freetype=' '.join(ft_inc_dirs))
-@@ -521,12 +524,15 @@ class Build(Command):
+@@ -521,8 +524,11 @@ class Build(Command):
          abi_version = ''
          if pyqt_sip_abi_version():
              abi_version = f'abi-version = "{pyqt_sip_abi_version()}"'
@@ -58,11 +58,6 @@ $NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
          with open(os.path.join(src_dir, 'pyproject.toml'), 'w') as f:
              f.write(f'''
  [build-system]
--requires = ["sip >=5.3", "PyQt-builder >=1"]
-+requires = ["sip >=5.3", "PyQt-builder >=1"]
- build-backend = "sipbuild.api"
- 
- [tool.sip.metadata]
 @@ -538,6 +544,7 @@ project-factory = "pyqtbuild:PyQtProject
  
  [tool.sip.project]