CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov  1 18:58:33 UTC 2021

Modified Files:
        pkgsrc/devel/py-cpplint: Makefile
        pkgsrc/devel/py-packaging: Makefile
        pkgsrc/devel/undebt: Makefile
        pkgsrc/graphics/py-dot: Makefile
        pkgsrc/textproc/py-docx: Makefile
        pkgsrc/www/py-httplib2: Makefile

Log Message:
*: convert dependencies of py-pyparsing to versioned_dependencies.mk


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-cpplint/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-packaging/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/undebt/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/py-dot/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/py-docx/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/www/py-httplib2/Makefile

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

Modified files:

Index: pkgsrc/devel/py-cpplint/Makefile
diff -u pkgsrc/devel/py-cpplint/Makefile:1.4 pkgsrc/devel/py-cpplint/Makefile:1.5
--- pkgsrc/devel/py-cpplint/Makefile:1.4        Mon May 24 09:25:13 2021
+++ pkgsrc/devel/py-cpplint/Makefile    Mon Nov  1 18:58:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/05/24 09:25:13 adam Exp $
+# $NetBSD: Makefile,v 1.5 2021/11/01 18:58:33 wiz Exp $
 
 DISTNAME=      cpplint-1.5.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,12 +11,11 @@ COMMENT=    Static code checker for C++
 LICENSE=       modified-bsd
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-TEST_DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 #TEST_DEPENDS+=        ${PYPKGPREFIX}-testfixtures-[0-9]*:../../devel/py-testfixtures
 TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test zipp:test
+PYTHON_VERSIONED_DEPENDENCIES= test:test zipp:test pyparsing:test
 
 .include "../../lang/python/pyversion.mk"
 

Index: pkgsrc/devel/py-packaging/Makefile
diff -u pkgsrc/devel/py-packaging/Makefile:1.12 pkgsrc/devel/py-packaging/Makefile:1.13
--- pkgsrc/devel/py-packaging/Makefile:1.12     Wed Feb  3 20:18:44 2021
+++ pkgsrc/devel/py-packaging/Makefile  Mon Nov  1 18:58:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/03 20:18:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2021/11/01 18:58:33 wiz Exp $
 
 DISTNAME=      packaging-20.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,11 +10,10 @@ HOMEPAGE=   https://github.com/pypa/packag
 COMMENT=       Core utilities for Python packages
 LICENSE=       modified-bsd OR apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= test:test pyparsing
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/devel/undebt/Makefile
diff -u pkgsrc/devel/undebt/Makefile:1.3 pkgsrc/devel/undebt/Makefile:1.4
--- pkgsrc/devel/undebt/Makefile:1.3    Fri Dec  4 20:45:14 2020
+++ pkgsrc/devel/undebt/Makefile        Mon Nov  1 18:58:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/12/04 20:45:14 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/11/01 18:58:33 wiz Exp $
 
 DISTNAME=      undebt-0.2.2
 PKGREVISION=   2
@@ -11,9 +11,11 @@ COMMENT=     Fast, reliable tool for perform
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
-DEPENDS+=      ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
+
+PYTHON_VERSIONED_DEPENDENCIES+=        pyparsing
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/py-dot/Makefile
diff -u pkgsrc/graphics/py-dot/Makefile:1.10 pkgsrc/graphics/py-dot/Makefile:1.11
--- pkgsrc/graphics/py-dot/Makefile:1.10        Mon Mar  8 07:07:42 2021
+++ pkgsrc/graphics/py-dot/Makefile     Mon Nov  1 18:58:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/03/08 07:07:42 adam Exp $
+# $NetBSD: Makefile,v 1.11 2021/11/01 18:58:33 wiz Exp $
 
 DISTNAME=      pydot-1.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,9 +11,11 @@ COMMENT=     Python interface to Graphviz's 
 LICENSE=       mit
 
 DEPENDS+=      graphviz-[0-9]*:../../graphics/graphviz
-DEPENDS+=      ${PYPKGPREFIX}-pyparsing>=2.1.4:../../devel/py-pyparsing
+
+PYTHON_VERSIONED_DEPENDENCIES+=        pyparsing
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/py-docx/Makefile
diff -u pkgsrc/textproc/py-docx/Makefile:1.6 pkgsrc/textproc/py-docx/Makefile:1.7
--- pkgsrc/textproc/py-docx/Makefile:1.6        Mon Jun  7 08:36:00 2021
+++ pkgsrc/textproc/py-docx/Makefile    Mon Nov  1 18:58:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/06/07 08:36:00 adam Exp $
+# $NetBSD: Makefile,v 1.7 2021/11/01 18:58:33 wiz Exp $
 
 DISTNAME=      python-docx-0.8.11
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -13,9 +13,8 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-lxml>=2.3.2:../../textproc/py-lxml
 TEST_DEPENDS+= ${PYPKGPREFIX}-behave-[0-9]*:../../devel/py-behave
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-TEST_DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES= test:test pyparsing:test
 
 USE_LANGUAGES= # none
 

Index: pkgsrc/www/py-httplib2/Makefile
diff -u pkgsrc/www/py-httplib2/Makefile:1.28 pkgsrc/www/py-httplib2/Makefile:1.29
--- pkgsrc/www/py-httplib2/Makefile:1.28        Thu Oct  7 19:09:49 2021
+++ pkgsrc/www/py-httplib2/Makefile     Mon Nov  1 18:58:33 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2021/10/07 19:09:49 adam Exp $
+# $NetBSD: Makefile,v 1.29 2021/11/01 18:58:33 wiz Exp $
 
 DISTNAME=      httplib2-0.20.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=     https://github.com/httplib2/ht
 COMMENT=       Comprehensive http client library for Python
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-pyparsing>=2.4.2:../../devel/py-pyparsing
+PYTHON_VERSIONED_DEPENDENCIES+=        pyparsing
 
 USE_LANGUAGES= # none
 
@@ -23,4 +23,5 @@ do-test:
 .endif
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"