CVS commit: pkgsrc/lang/python

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 31 23:05:33 UTC 2020

Modified Files:
        pkgsrc/lang/python: egg.mk versioned_dependencies.mk

Log Message:
python: add versioned_dependencies support for py-setuptools

Handle both py-setuptools packages in egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/python/egg.mk
cvs rdiff -u -r1.41 -r1.42 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/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.28 pkgsrc/lang/python/egg.mk:1.29
--- pkgsrc/lang/python/egg.mk:1.28      Wed Jul 17 18:34:16 2019
+++ pkgsrc/lang/python/egg.mk   Mon Aug 31 23:05:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.28 2019/07/17 18:34:16 rillig Exp $
+# $NetBSD: egg.mk,v 1.29 2020/08/31 23:05:33 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -50,7 +50,11 @@ do-build: ensurepip
 ensurepip:
        ${SETENV} ${MAKE_ENV} ${PYTHONBIN} -m ensurepip --user
 .else
-DEPENDS+=      ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
+.  if ${PYVERSSUFFIX} == "py27"
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools44
+.  else
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+.  endif
 .endif
 
 INSTALLATION_DIRS+=    ${PYSITELIB}

Index: pkgsrc/lang/python/versioned_dependencies.mk
diff -u pkgsrc/lang/python/versioned_dependencies.mk:1.41 pkgsrc/lang/python/versioned_dependencies.mk:1.42
--- pkgsrc/lang/python/versioned_dependencies.mk:1.41   Wed Jul  1 08:54:30 2020
+++ pkgsrc/lang/python/versioned_dependencies.mk        Mon Aug 31 23:05:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: versioned_dependencies.mk,v 1.41 2020/07/01 08:54:30 adam Exp $
+# $NetBSD: versioned_dependencies.mk,v 1.42 2020/08/31 23:05:33 wiz Exp $
 #
 # This file determines which separate distribution of a Python
 # package is used as dependency, depending on the Python version
@@ -27,6 +27,7 @@ _SUPPORTED_PACKAGES+= ipython devel/py-i
 _SUPPORTED_PACKAGES+=  jsonlib textproc/py-jsonlib textproc/py-jsonlib3
 _SUPPORTED_PACKAGES+=  more-itertools devel/py-more-itertools2 devel/py-more-itertools
 _SUPPORTED_PACKAGES+=  python-digest www/py-python-digest www/py-python3-digest
+_SUPPORTED_PACKAGES+=  setuptools devel/py-setuptools44 devel/py-setuptools
 _SUPPORTED_PACKAGES+=  sphinx textproc/py-sphinx1 textproc/py-sphinx
 _SUPPORTED_PACKAGES+=  test devel/py-test4 devel/py-test
 _SUPPORTED_PACKAGES+=  zipp archivers/py-zipp1 archivers/py-zipp