CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep  1 04:08:43 UTC 2020

Modified Files:
        pkgsrc/devel/py-adb: Makefile
        pkgsrc/net/py-awscli: Makefile
        pkgsrc/security/py-google-auth: Makefile
        pkgsrc/security/py-oauth2client: Makefile

Log Message:
*: switch to versioned_dependencies for py-rsa


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-adb/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/net/py-awscli/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/security/py-google-auth/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/py-oauth2client/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-adb/Makefile
diff -u pkgsrc/devel/py-adb/Makefile:1.1 pkgsrc/devel/py-adb/Makefile:1.2
--- pkgsrc/devel/py-adb/Makefile:1.1    Fri Apr  3 23:06:35 2020
+++ pkgsrc/devel/py-adb/Makefile        Tue Sep  1 04:08:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/04/03 23:06:35 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/09/01 04:08:42 wiz Exp $
 
 DISTNAME=      adb-1.3.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,8 @@ COMMENT=      Pure Python implementation of t
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-libusb1>=1.0.16:../../devel/py-libusb1
-DEPENDS+=      ${PYPKGPREFIX}-rsa-[0-9]*:../../security/py-rsa
+
+PYTHON_VERSIONED_DEPENDENCIES+=        rsa
 
 USE_LANGUAGES= # none
 
@@ -20,4 +21,5 @@ post-install:
        ${MV} ${DESTDIR}${PREFIX}/bin/pyfastboot ${DESTDIR}${PREFIX}/bin/pyfastboot-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-awscli/Makefile
diff -u pkgsrc/net/py-awscli/Makefile:1.38 pkgsrc/net/py-awscli/Makefile:1.39
--- pkgsrc/net/py-awscli/Makefile:1.38  Thu Aug 20 09:52:04 2020
+++ pkgsrc/net/py-awscli/Makefile       Tue Sep  1 04:08:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2020/08/20 09:52:04 adam Exp $
+# $NetBSD: Makefile,v 1.39 2020/09/01 04:08:42 wiz Exp $
 
 DISTNAME=      awscli-1.18.123
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,13 +13,14 @@ LICENSE=    apache-2.0
 DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.17.46:../../net/py-botocore
 DEPENDS+=      ${PYPKGPREFIX}-colorama>=0.3.2:../../comms/py-colorama
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
-DEPENDS+=      ${PYPKGPREFIX}-rsa>=3.4.1:../../security/py-rsa
 DEPENDS+=      ${PYPKGPREFIX}-s3transfer>=0.3.0:../../net/py-s3transfer
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
 USE_LANGUAGES= # none
 
 PYTHON_SELF_CONFLICT=  yes
+PYTHON_VERSIONED_DEPENDENCIES+=        rsa
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-google-auth/Makefile
diff -u pkgsrc/security/py-google-auth/Makefile:1.25 pkgsrc/security/py-google-auth/Makefile:1.26
--- pkgsrc/security/py-google-auth/Makefile:1.25        Mon Aug 31 23:07:06 2020
+++ pkgsrc/security/py-google-auth/Makefile     Tue Sep  1 04:08:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/08/31 23:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2020/09/01 04:08:42 wiz Exp $
 
 DISTNAME=      google-auth-1.21.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,6 +13,7 @@ LICENSE=      apache-2.0
 DEPENDS+=      ${PYPKGPREFIX}-asn1-modules>=0.2.1:../../security/py-asn1-modules
 DEPENDS+=      ${PYPKGPREFIX}-cachetools>=2.0.0:../../devel/py-cachetools
 DEPENDS+=      ${PYPKGPREFIX}-rsa>=3.1.4:../../security/py-rsa
+DEPENDS+=      ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-flask-[0-9]*:../../www/py-flask
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -26,7 +27,6 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-freezegun-
 TEST_DEPENDS+= ${PYPKGPREFIX}-responses-[0-9]*:../../net/py-responses
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 # py-cachetools
-PYTHON_VERSIONED_DEPENDENCIES+=        setuptools
 
 USE_LANGUAGES= # none
 
@@ -34,5 +34,4 @@ do-test:
        cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-oauth2client/Makefile
diff -u pkgsrc/security/py-oauth2client/Makefile:1.9 pkgsrc/security/py-oauth2client/Makefile:1.10
--- pkgsrc/security/py-oauth2client/Makefile:1.9        Mon Sep 24 09:52:24 2018
+++ pkgsrc/security/py-oauth2client/Makefile    Tue Sep  1 04:08:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/09/24 09:52:24 adam Exp $
+# $NetBSD: Makefile,v 1.10 2020/09/01 04:08:42 wiz Exp $
 
 DISTNAME=      oauth2client-4.1.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,12 @@ LICENSE=    apache-2.0
 DEPENDS+=      ${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
 DEPENDS+=      ${PYPKGPREFIX}-asn1-modules-[0-9]*:../../security/py-asn1-modules
 DEPENDS+=      ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
-DEPENDS+=      ${PYPKGPREFIX}-rsa-[0-9]*:../../security/py-rsa
 DEPENDS+=      ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
+PYTHON_VERSIONED_DEPENDENCIES+=        rsa
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"