[pkgsrc/trunk]: pkgsrc/lang/python python: add versioned_dependencies support...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd86c856b06a
branches:  trunk
changeset: 437805:cd86c856b06a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Aug 31 23:05:33 2020 +0000

description:
python: add versioned_dependencies support for py-setuptools

Handle both py-setuptools packages in egg.mk

diffstat:

 lang/python/egg.mk                    |  8 ++++++--
 lang/python/versioned_dependencies.mk |  3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 2e490bdf54cb -r cd86c856b06a lang/python/egg.mk
--- a/lang/python/egg.mk        Mon Aug 31 23:04:47 2020 +0000
+++ b/lang/python/egg.mk        Mon Aug 31 23:05:33 2020 +0000
@@ -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 @@
 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}
diff -r 2e490bdf54cb -r cd86c856b06a lang/python/versioned_dependencies.mk
--- a/lang/python/versioned_dependencies.mk     Mon Aug 31 23:04:47 2020 +0000
+++ b/lang/python/versioned_dependencies.mk     Mon Aug 31 23:05:33 2020 +0000
@@ -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+=  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