CVS commit: pkgsrc/devel

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 12 07:35:23 UTC 2020

Modified Files:
        pkgsrc/devel/py-importlib-metadata: Makefile
        pkgsrc/devel/py-importlib-resources: Makefile

Log Message:
*: get py-zipp via versioned_dependencies.mk


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-importlib-metadata/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-importlib-resources/Makefile

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

Modified files:

Index: pkgsrc/devel/py-importlib-metadata/Makefile
diff -u pkgsrc/devel/py-importlib-metadata/Makefile:1.16 pkgsrc/devel/py-importlib-metadata/Makefile:1.17
--- pkgsrc/devel/py-importlib-metadata/Makefile:1.16    Mon Feb 10 18:29:38 2020
+++ pkgsrc/devel/py-importlib-metadata/Makefile Thu Mar 12 07:35:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/02/10 18:29:38 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/12 07:35:22 wiz Exp $
 
 DISTNAME=      importlib_metadata-1.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -11,7 +11,6 @@ COMMENT=      Read metadata from Python packa
 LICENSE=       apache-2.0
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
-DEPENDS+=      ${PYPKGPREFIX}-zipp>=0.5:../../archivers/py-zipp
 TEST_DEPENDS+= ${PYPKGPREFIX}-fakefs-[0-9]*:../../devel/py-fakefs
 TEST_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 .include "../../lang/python/pyversion.mk"
@@ -24,10 +23,13 @@ DEPENDS+=   ${PYPKGPREFIX}-pathlib2-[0-9]*
 TEST_DEPENDS+= ${PYPKGPREFIX}-importlib-resources-[0-9]*:../../devel/py-importlib-resources
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES+=        zipp
+
 USE_LANGUAGES= # none
 
 post-extract:
        ${FIND} ${WRKSRC} -type f -exec ${CHMOD} go-w {} +
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-importlib-resources/Makefile
diff -u pkgsrc/devel/py-importlib-resources/Makefile:1.3 pkgsrc/devel/py-importlib-resources/Makefile:1.4
--- pkgsrc/devel/py-importlib-resources/Makefile:1.3    Tue Mar  3 06:01:00 2020
+++ pkgsrc/devel/py-importlib-resources/Makefile        Thu Mar 12 07:35:23 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/03/03 06:01:00 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/12 07:35:23 wiz Exp $
 
 DISTNAME=      importlib_resources-1.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -19,7 +19,8 @@ DEPENDS+=     ${PYPKGPREFIX}-singledispatch-
 DEPENDS+=      ${PYPKGPREFIX}-typing-[0-9]*:../../devel/py-typing
 .endif
 .if ${_PYTHON_VERSION} < 38
-DEPENDS+=      ${PYPKGPREFIX}-zipp>=0.4:../../archivers/py-zipp
+PYTHON_VERSIONED_DEPENDENCIES+=        zipp
+.include "../../lang/python/versioned_dependencies.mk"
 .endif
 
 USE_LANGUAGES= # none