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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce079c357f31
branches:  trunk
changeset: 449837:ce079c357f31
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 06 15:22:38 2021 +0000

description:
use versioned py-pygemnts

diffstat:

 www/py-flask-flatpages/Makefile   |   6 ++++--
 www/py-flask-flatpages/options.mk |   4 ++--
 www/py-landslide/Makefile         |   6 ++++--
 www/qutebrowser/Makefile          |  16 ++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (107 lines):

diff -r df34204b8fe6 -r ce079c357f31 www/py-flask-flatpages/Makefile
--- a/www/py-flask-flatpages/Makefile   Tue Apr 06 15:03:32 2021 +0000
+++ b/www/py-flask-flatpages/Makefile   Tue Apr 06 15:22:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/05/17 09:39:27 kleink Exp $
+# $NetBSD: Makefile,v 1.11 2021/04/06 15:22:38 adam Exp $
 
 DISTNAME=      Flask-FlatPages-0.7.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -17,9 +17,11 @@
 DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.5:../../textproc/py-markdown
 DEPENDS+=      ${PYPKGPREFIX}-yaml>3.12:../../textproc/py-yaml
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES+=        pygments:test
+
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r df34204b8fe6 -r ce079c357f31 www/py-flask-flatpages/options.mk
--- a/www/py-flask-flatpages/options.mk Tue Apr 06 15:03:32 2021 +0000
+++ b/www/py-flask-flatpages/options.mk Tue Apr 06 15:22:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/05/12 10:49:35 kleink Exp $
+# $NetBSD: options.mk,v 1.2 2021/04/06 15:22:38 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.py-flask-flatpages
 PKG_SUPPORTED_OPTIONS= pygments
@@ -7,5 +7,5 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpygments)
-DEPENDS+=              ${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
+PYTHON_VERSIONED_DEPENDENCIES= pygments
 .endif
diff -r df34204b8fe6 -r ce079c357f31 www/py-landslide/Makefile
--- a/www/py-landslide/Makefile Tue Apr 06 15:03:32 2021 +0000
+++ b/www/py-landslide/Makefile Tue Apr 06 15:22:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/12/15 09:07:41 adam Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/06 15:22:38 adam Exp $
 
 DISTNAME=      landslide-1.1.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,11 +13,12 @@
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.14:../../textproc/py-docutils
 DEPENDS+=      ${PYPKGPREFIX}-jinja2>=2.10.1:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-markdown>=2.6.11:../../textproc/py-markdown
-DEPENDS+=      ${PYPKGPREFIX}-pygments>=2.2.0:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONED_DEPENDENCIES= pygments
+
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && \
        ${MV} landslide landslide-${PYVERSSUFFIX} || ${TRUE}
@@ -26,4 +27,5 @@
        cd ${WRKSRC} && ${PYTHONBIN} tests.py
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r df34204b8fe6 -r ce079c357f31 www/qutebrowser/Makefile
--- a/www/qutebrowser/Makefile  Tue Apr 06 15:03:32 2021 +0000
+++ b/www/qutebrowser/Makefile  Tue Apr 06 15:22:38 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/12/04 20:45:49 nia Exp $
+# $NetBSD: Makefile,v 1.8 2021/04/06 15:22:38 adam Exp $
 
 DISTNAME=      qutebrowser-1.13.1
 PKGREVISION=   3
@@ -11,25 +11,21 @@
 COMMENT=       Keyboard-driven, vim-like browser based on PyQt5
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES= # none
-
-DEPENDS+=      ${PYPKGPREFIX}-peg2-[0-9]*:../../textproc/py-peg2
 DEPENDS+=      ${PYPKGPREFIX}-attrs-[0-9]*:../../devel/py-attrs
 DEPENDS+=      ${PYPKGPREFIX}-cssutils-[0-9]*:../../textproc/py-cssutils
 DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+DEPENDS+=      ${PYPKGPREFIX}-peg2-[0-9]*:../../textproc/py-peg2
 DEPENDS+=      ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools:tool
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 
-TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
+.include "../../lang/python/egg.mk"
+.include "../../x11/py-qt5/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
-.include "../../x11/py-qt5/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"