CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 15 Nov 2019 14:22:16 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Nov 15 14:22:16 UTC 2019

Modified Files:
        pkgsrc/archivers/py-zipp: Makefile
        pkgsrc/devel/py-jaraco.functools: Makefile
        pkgsrc/devel/py-test: Makefile
        pkgsrc/www/py-cheroot: Makefile
        pkgsrc/www/py-cherrypy17: Makefile

Log Message:
*: use py-more-itertools via versioned_dependencies.mk


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/archivers/py-zipp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-jaraco.functools/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/devel/py-test/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/py-cheroot/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-cherrypy17/Makefile

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

Modified files:

Index: pkgsrc/archivers/py-zipp/Makefile
diff -u pkgsrc/archivers/py-zipp/Makefile:1.4 pkgsrc/archivers/py-zipp/Makefile:1.5
--- pkgsrc/archivers/py-zipp/Makefile:1.4       Mon Sep  2 08:31:17 2019
+++ pkgsrc/archivers/py-zipp/Makefile   Fri Nov 15 14:22:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/09/02 08:31:17 adam Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/15 14:22:15 wiz Exp $
 
 DISTNAME=      zipp-0.6.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,12 +11,14 @@ COMMENT=    Backport of pathlib-compatible 
 LICENSE=       mit
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
-DEPENDS+=      ${PYPKGPREFIX}-more-itertools-[0-9]*:../../devel/py-more-itertools
 TEST_DEPENDS+= ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
 TEST_DEPENDS+= ${PYPKGPREFIX}-pathlib2-[0-9]*:../../devel/py-pathlib2
 TEST_DEPENDS+= ${PYPKGPREFIX}-unittest2-[0-9]*:../../devel/py-unittest2
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
+
+.include "../../lang/python/versioned_dependencies.mk.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-jaraco.functools/Makefile
diff -u pkgsrc/devel/py-jaraco.functools/Makefile:1.2 pkgsrc/devel/py-jaraco.functools/Makefile:1.3
--- pkgsrc/devel/py-jaraco.functools/Makefile:1.2       Wed Nov 13 21:30:14 2019
+++ pkgsrc/devel/py-jaraco.functools/Makefile   Fri Nov 15 14:22:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/11/13 21:30:14 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/15 14:22:15 wiz Exp $
 
 DISTNAME=      jaraco.functools-2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=     https://github.com/jaraco/jara
 COMMENT=       Additional functools in the spirit of stdlib's functools
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-more-itertools-[0-9]*:../../devel/py-more-itertools
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 
 .include "../../lang/python/pyversion.mk"
@@ -20,5 +19,8 @@ DEPENDS+=     ${PYPKGPREFIX}-backports.funct
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
+
+.include "../../lang/python/versioned_dependencies.mk.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-test/Makefile
diff -u pkgsrc/devel/py-test/Makefile:1.86 pkgsrc/devel/py-test/Makefile:1.87
--- pkgsrc/devel/py-test/Makefile:1.86  Tue Oct 22 13:21:49 2019
+++ pkgsrc/devel/py-test/Makefile       Fri Nov 15 14:22:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2019/10/22 13:21:49 adam Exp $
+# $NetBSD: Makefile,v 1.87 2019/11/15 14:22:15 wiz Exp $
 
 DISTNAME=      pytest-4.6.6
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -13,7 +13,6 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-atomicwrites>=1.0:../../devel/py-atomicwrites
 DEPENDS+=      ${PYPKGPREFIX}-attrs>=17.4.0:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS+=      ${PYPKGPREFIX}-more-itertools>=4.0.0:../../devel/py-more-itertools
 DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-pluggy>=0.12:../../devel/py-pluggy
 DEPENDS+=      ${PYPKGPREFIX}-py>=1.5.0:../../devel/py-py
@@ -35,6 +34,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=0.12:../../devel/py-importlib-metadata
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
+
 USE_LANGUAGES= # none
 USE_TOOLS+=    bash:build
 
@@ -46,5 +47,6 @@ post-install:
 do-test:
        cd ${WRKSRC}/testing && pytest-${PYVERSSUFFIX}
 
+.include "../../lang/python/versioned_dependencies.mk.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-cheroot/Makefile
diff -u pkgsrc/www/py-cheroot/Makefile:1.25 pkgsrc/www/py-cheroot/Makefile:1.26
--- pkgsrc/www/py-cheroot/Makefile:1.25 Wed Sep 18 20:23:12 2019
+++ pkgsrc/www/py-cheroot/Makefile      Fri Nov 15 14:22:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/09/18 20:23:12 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/11/15 14:22:15 wiz Exp $
 
 DISTNAME=      cheroot-6.5.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@ HOMEPAGE=     http://www.cherrypy.org/
 COMMENT=       High-performance, pure-Python HTTP server used by CherryPy
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-more-itertools>=2.6:../../devel/py-more-itertools
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm_git_archive>=1.0:../../devel/py-setuptools_scm_git_archive
@@ -42,5 +41,8 @@ post-install:
 do-test:
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 
+PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
+
+.include "../../lang/python/versioned_dependencies.mk.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-cherrypy17/Makefile
diff -u pkgsrc/www/py-cherrypy17/Makefile:1.2 pkgsrc/www/py-cherrypy17/Makefile:1.3
--- pkgsrc/www/py-cherrypy17/Makefile:1.2       Tue Oct  2 11:22:03 2018
+++ pkgsrc/www/py-cherrypy17/Makefile   Fri Nov 15 14:22:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 11:22:03 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/11/15 14:22:15 wiz Exp $
 
 DISTNAME=      CherryPy-17.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,7 +12,6 @@ LICENSE=      modified-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-cheroot>=6.2.4:../../www/py-cheroot
 DEPENDS+=      ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
-DEPENDS+=      ${PYPKGPREFIX}-more-itertools-[0-9]*:../../devel/py-more-itertools
 DEPENDS+=      ${PYPKGPREFIX}-portend>=2.1.1:../../net/py-portend
 DEPENDS+=      ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
@@ -33,5 +32,8 @@ post-install:
 do-test:
        cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
 
+PYTHON_VERSIONED_DEPENDENCIES+=        more-itertools
+
+.include "../../lang/python/versioned_dependencies.mk.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc/textproc/py-colored
Next by Date: CVS commit: pkgsrc/devel/py-more-itertools
Previous by Thread: CVS commit: pkgsrc/textproc/py-colored
Next by Thread: CVS commit: pkgsrc/devel/py-more-itertools
Indexes:

Home | Main Index | Thread Index | Old Index