CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr  6 15:03:32 UTC 2021

Modified Files:
        pkgsrc/misc/calibre: Makefile
        pkgsrc/print/tex-minted: Makefile
        pkgsrc/textproc/py-alabaster: Makefile
        pkgsrc/textproc/py-m2r: Makefile
        pkgsrc/textproc/py-sphinx1: Makefile

Log Message:
use versioned py-pygemnts


To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/tex-minted/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/py-alabaster/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-m2r/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-sphinx1/Makefile

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

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.247 pkgsrc/misc/calibre/Makefile:1.248
--- pkgsrc/misc/calibre/Makefile:1.247  Wed Mar 10 18:51:51 2021
+++ pkgsrc/misc/calibre/Makefile        Tue Apr  6 15:03:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.247 2021/03/10 18:51:51 adam Exp $
+# $NetBSD: Makefile,v 1.248 2021/04/06 15:03:32 adam Exp $
 
 DISTNAME=      calibre-3.40.1
 PKGREVISION=   23
@@ -30,7 +30,7 @@ DEPENDS+=     ${PYPKGPREFIX}-msgpack-[0-9]*:
 DEPENDS+=      ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
 DEPENDS+=      ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow6
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
+DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments25
 DEPENDS+=      ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=      ${PYPKGPREFIX}-soupsieve-[0-9]*:../../www/py-soupsieve

Index: pkgsrc/print/tex-minted/Makefile
diff -u pkgsrc/print/tex-minted/Makefile:1.10 pkgsrc/print/tex-minted/Makefile:1.11
--- pkgsrc/print/tex-minted/Makefile:1.10       Sat Jan 18 23:34:31 2020
+++ pkgsrc/print/tex-minted/Makefile    Tue Apr  6 15:03:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/18 23:34:31 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/06 15:03:32 adam Exp $
 
 DISTNAME=      minted
 PKGNAME=       tex-${DISTNAME}-2.5
@@ -17,9 +17,12 @@ DEPENDS+=    tex-ifplatform-[0-9]*:../../pr
 DEPENDS+=      tex-lineno-[0-9]*:../../print/tex-lineno
 DEPENDS+=      tex-oberdiek-[0-9]*:../../print/tex-oberdiek
 DEPENDS+=      tex-xstring-[0-9]*:../../print/tex-xstring
-DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
 TEXLIVE_UNVERSIONED=   yes
-.include "../../print/texlive/package.mk"
+
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 .include "../../lang/python/pyversion.mk"
+.include "../../lang/python/versioned_dependencies.mk"
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-alabaster/Makefile
diff -u pkgsrc/textproc/py-alabaster/Makefile:1.5 pkgsrc/textproc/py-alabaster/Makefile:1.6
--- pkgsrc/textproc/py-alabaster/Makefile:1.5   Sun Oct  7 10:20:22 2018
+++ pkgsrc/textproc/py-alabaster/Makefile       Tue Apr  6 15:03:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/10/07 10:20:22 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/06 15:03:32 adam Exp $
 
 DISTNAME=      alabaster-0.7.12
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,10 @@ HOMEPAGE=    https://github.com/bitprophet/
 COMMENT=       Configurable sidebar-enabled Sphinx theme
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=0.8:../../textproc/py-pygments
-
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-m2r/Makefile
diff -u pkgsrc/textproc/py-m2r/Makefile:1.13 pkgsrc/textproc/py-m2r/Makefile:1.14
--- pkgsrc/textproc/py-m2r/Makefile:1.13        Sun Oct 14 12:10:47 2018
+++ pkgsrc/textproc/py-m2r/Makefile     Tue Apr  6 15:03:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/10/14 12:10:47 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/06 15:03:32 adam Exp $
 
 DISTNAME=      m2r-0.2.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,12 +12,14 @@ LICENSE=    mit
 
 DEPENDS+=      ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-mistune-[0-9]*:../../textproc/py-mistune
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments:test
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${MV} m2r m2r-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-sphinx1/Makefile
diff -u pkgsrc/textproc/py-sphinx1/Makefile:1.2 pkgsrc/textproc/py-sphinx1/Makefile:1.3
--- pkgsrc/textproc/py-sphinx1/Makefile:1.2     Sun May 17 21:38:46 2020
+++ pkgsrc/textproc/py-sphinx1/Makefile Tue Apr  6 15:03:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/17 21:38:46 adam Exp $
+# $NetBSD: Makefile,v 1.3 2021/04/06 15:03:32 adam Exp $
 
 DISTNAME=      Sphinx-1.8.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,7 +17,6 @@ DEPENDS+=     ${PYPKGPREFIX}-docutils>=0.11:
 DEPENDS+=      ${PYPKGPREFIX}-imagesize-[0-9]*:../../graphics/py-imagesize
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-packaging>=19.1nb1:../../devel/py-packaging
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=2.0:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.0.0:../../devel/py-requests
 DEPENDS+=      ${PYPKGPREFIX}-snowballstemmer>=1.1:../../textproc/py-snowballstemmer
@@ -33,13 +32,13 @@ TEST_DEPENDS+=      ${PYPKGPREFIX}-html5lib-[
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= pygments test:test
 
-USE_LANGUAGES=         # none
-USE_TOOLS+=            makeinfo
+USE_LANGUAGES= # none
+USE_TOOLS+=    makeinfo
 
 do-test:
-       cd ${WRKSRC} && pytest-${PYVERSSUFFIX}
+       cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \