git: 925f1e8aff95 - main - devel/py-logilab-common: Fix build after py-importlib-metadata 7.0.0 update (659be85740ebc197ff52e1b32f4e48e668b7cb85)

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=925f1e8aff95d6a13ebcc718e24eb93c3cacf69b

commit 925f1e8aff95d6a13ebcc718e24eb93c3cacf69b
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-12-14 05:36:25 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-12-14 05:48:27 +0000

    devel/py-logilab-common: Fix build after py-importlib-metadata 7.0.0 update (659be85740ebc197ff52e1b32f4e48e668b7cb85)
    
    - Bump PORTREVISION for package change
---
 devel/py-logilab-common/Makefile                   |  6 +++---
 devel/py-logilab-common/files/patch-__pkginfo__.py | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index c0d72acf1a6f..f1b59cac688f 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	logilab-common
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,8 +12,7 @@ WWW=		https://logilab-common.readthedocs.io/en/latest/
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6<7:devel/py-importlib-metadata@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0:devel/py-mypy_extensions@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mypy_extensions>=0:devel/py-mypy_extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR}
@@ -25,7 +25,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 31000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6<7:devel/py-importlib-metadata@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6:devel/py-importlib-metadata@${PY_FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-logilab-common/files/patch-__pkginfo__.py b/devel/py-logilab-common/files/patch-__pkginfo__.py
new file mode 100644
index 000000000000..46114ff4cfee
--- /dev/null
+++ b/devel/py-logilab-common/files/patch-__pkginfo__.py
@@ -0,0 +1,11 @@
+--- __pkginfo__.py.orig	2023-10-17 13:25:55 UTC
++++ __pkginfo__.py
+@@ -45,7 +45,7 @@ install_requires = [
+     "setuptools",
+     "mypy-extensions",
+     "typing_extensions",
+-    'importlib_metadata>=6,<7; python_version < "3.10"',
++    'importlib_metadata>=6; python_version < "3.10"',
+ ]
+ tests_require = [
+     "pytz",