[pkgsrc/trunk]: pkgsrc use versioned py-pygemnts

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0be26bc7ae23
branches:  trunk
changeset: 449828:0be26bc7ae23
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 06 14:36:48 2021 +0000

description:
use versioned py-pygemnts

diffstat:

 devel/cppcheck/Makefile    |  8 +++++---
 devel/phabricator/Makefile |  3 +--
 devel/py-ipython5/Makefile |  5 ++---
 devel/py-path.py/Makefile  |  6 ++++--
 math/py-infinity/Makefile  |  7 +++----
 math/py-intervals/Makefile |  5 ++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diffs (151 lines):

diff -r a8c6d5e89a47 -r 0be26bc7ae23 devel/cppcheck/Makefile
--- a/devel/cppcheck/Makefile   Tue Apr 06 14:23:24 2021 +0000
+++ b/devel/cppcheck/Makefile   Tue Apr 06 14:36:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2021/02/07 06:30:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      cppcheck-2.1
 PKGREVISION=   6
@@ -13,7 +13,6 @@
 
 BUILD_DEPENDS+=        libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=        docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
 USE_LANGUAGES=         c c++0x
 USE_TOOLS+=            gmake
@@ -42,6 +41,8 @@
 
 TEST_TARGET=           test
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 .include "options.mk"
 
 .PHONY: man-install
@@ -49,7 +50,8 @@
 man-install:
        ${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../math/z3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a8c6d5e89a47 -r 0be26bc7ae23 devel/phabricator/Makefile
--- a/devel/phabricator/Makefile        Tue Apr 06 14:23:24 2021 +0000
+++ b/devel/phabricator/Makefile        Tue Apr 06 14:36:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/01/01 09:05:07 taca Exp $
+# $NetBSD: Makefile,v 1.17 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=              phabricator-20170609
 PKGREVISION=           1
@@ -31,7 +31,6 @@
 .else
 DEPENDS+=              ${PHP_PKG_PREFIX}-apcu>=5:../../www/php-apcu
 .endif
-#DEPENDS+=             :../../textproc/py-pygments?
 DEPENDS+=              libphutil-[0-9]*:../../devel/libphutil
 DEPENDS+=              arcanist-[0-9]*:../../devel/arcanist
 
diff -r a8c6d5e89a47 -r 0be26bc7ae23 devel/py-ipython5/Makefile
--- a/devel/py-ipython5/Makefile        Tue Apr 06 14:23:24 2021 +0000
+++ b/devel/py-ipython5/Makefile        Tue Apr 06 14:36:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/08/31 23:07:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      ipython-5.8.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -22,12 +22,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 DEPENDS+=      ${PYPKGPREFIX}-pickleshare-[0-9]*:../../databases/py-pickleshare
 DEPENDS+=      ${PYPKGPREFIX}-prompt_toolkit>=1.0.4:../../devel/py-prompt_toolkit
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-simplegeneric>0.8:../../devel/py-simplegeneric
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=      ${PYPKGPREFIX}-traitlets>=4.2:../../devel/py-traitlets
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
+PYTHON_VERSIONED_DEPENDENCIES+=        pygments setuptools
 
 USE_LANGUAGES= # none
 
diff -r a8c6d5e89a47 -r 0be26bc7ae23 devel/py-path.py/Makefile
--- a/devel/py-path.py/Makefile Tue Apr 06 14:23:24 2021 +0000
+++ b/devel/py-path.py/Makefile Tue Apr 06 14:36:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/04/09 08:10:46 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      path.py-11.5.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,15 +13,17 @@
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 TEST_DEPENDS+= ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
 TEST_DEPENDS+= ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.5:../../devel/py-test
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-flake8-[0-9]*:../../devel/py-test-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-sugar-[0-9]*:../../devel/py-test-sugar
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments:test
+
 do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} test_path.py
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a8c6d5e89a47 -r 0be26bc7ae23 math/py-infinity/Makefile
--- a/math/py-infinity/Makefile Tue Apr 06 14:23:24 2021 +0000
+++ b/math/py-infinity/Makefile Tue Apr 06 14:36:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/17 18:57:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      infinity-1.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,15 +12,14 @@
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
 TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.4.1:../../lang/py-six
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pygments:test test:test
 
 USE_LANGUAGES= # none
 
 do-test:
-       cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff -r a8c6d5e89a47 -r 0be26bc7ae23 math/py-intervals/Makefile
--- a/math/py-intervals/Makefile        Tue Apr 06 14:23:24 2021 +0000
+++ b/math/py-intervals/Makefile        Tue Apr 06 14:36:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/05/17 18:57:26 adam Exp $
+# $NetBSD: Makefile,v 1.7 2021/04/06 14:36:48 adam Exp $
 
 DISTNAME=      intervals-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-infinity>=0.1.3:../../math/py-infinity
 TEST_DEPENDS+= ${PYPKGPREFIX}-flake8>=2.4.0:../../devel/py-flake8
 TEST_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.2:../../devel/py-isort
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.2:../../textproc/py-pygments
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pygments:test test:test
 
 USE_LANGUAGES= # none