CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jun 18 21:47:01 UTC 2022

Modified Files:
        pkgsrc/devel/py-isort4: Makefile
        pkgsrc/lang/python: versioned_dependencies.mk

Log Message:
py-isort4: convert lama dependency to versioned_dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-isort4/Makefile
cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/python/versioned_dependencies.mk

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-isort4/Makefile
diff -u pkgsrc/devel/py-isort4/Makefile:1.3 pkgsrc/devel/py-isort4/Makefile:1.4
--- pkgsrc/devel/py-isort4/Makefile:1.3 Wed Jan  5 20:47:35 2022
+++ pkgsrc/devel/py-isort4/Makefile     Sat Jun 18 21:47:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/01/05 20:47:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/06/18 21:47:01 wiz Exp $
 
 DISTNAME=      isort-4.3.21
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,8 @@ HOMEPAGE=     https://github.com/timothycros
 COMMENT=       Python utility / library to sort imports
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-lama-[0-9]*:../../devel/py-lama
-
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        lama
+PYTHON_VERSIONED_DEPENDENCIES+=        test:test
 
 USE_PKG_RESOURCES=     yes
 

Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.70 pkgsrc/lang/python/versioned_dependencies.mk:1.71
--- pkgsrc/lang/python/versioned_dependencies.mk:1.70   Tue Jun  7 10:37:23 2022
+++ pkgsrc/lang/python/versioned_dependencies.mk        Sat Jun 18 21:47:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.70 2022/06/07 10:37:23 wiz Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.71 2022/06/18 21:47:01 wiz Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -9,7 +9,7 @@
 # PYTHON_VERSIONED_DEPENDENCIES
 #       The Python package which should be added as a dependency.
 #
-#       Possible values: Pillow X cairo click cryptography flake8 html2text hypothesis importlib-metadata jinja2 markdown mccabe more-itertools pip packaging pygments pyparsing python-digest rsa 
setuptools setuptools_scm sphinx test twisted zipp
+#       Possible values: Pillow X cairo click cryptography flake8 html2text hypothesis importlib-metadata jinja2 lama markdown mccabe more-itertools pip packaging pygments pyparsing python-digest 
rsa setuptools setuptools_scm sphinx test twisted zipp
 #       Default: (nothing)
 #
 
@@ -28,6 +28,7 @@ _SUPPORTED_PACKAGES+= hypothesis devel/p
 _SUPPORTED_PACKAGES+=  importlib-metadata devel/py-importlib-metadata2 devel/py-importlib-metadata
 _SUPPORTED_PACKAGES+=  isort devel/py-isort4 devel/py-isort
 _SUPPORTED_PACKAGES+=  jinja2 textproc/py27-jinja2 textproc/py-jinja2
+_SUPPORTED_PACKAGES+=  lama devel/py-lama7 devel/py-lama
 _SUPPORTED_PACKAGES+=  markdown textproc/py-markdown3 textproc/py-markdown
 _SUPPORTED_PACKAGES+=  mccabe devel/py-mccabe06 devel/py-mccabe
 _SUPPORTED_PACKAGES+=  more-itertools devel/py-more-itertools2 devel/py-more-itertools