CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Thu, 21 Apr 2022 11:00:02 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 21 11:00:02 UTC 2022

Modified Files:
        pkgsrc/comms/py-esptool: Makefile
        pkgsrc/databases/py-pymysql: Makefile
        pkgsrc/devel/py-requests: Makefile
        pkgsrc/net/py-ec2instanceconnectcli: Makefile
        pkgsrc/net/scapy: options.mk
        pkgsrc/security/ca-certificates: Makefile
        pkgsrc/security/py-OpenSSL: Makefile
        pkgsrc/security/py-authlib: Makefile
        pkgsrc/security/py-fido2: Makefile
        pkgsrc/security/py-ntlm-auth: Makefile
        pkgsrc/security/py-paramiko: Makefile
        pkgsrc/security/py-requests-kerberos: Makefile
        pkgsrc/security/py-requests-ntlm: Makefile
        pkgsrc/security/py-trustme: Makefile
        pkgsrc/sysutils/ansible-base: Makefile
        pkgsrc/www/py-flask-user: Makefile
        pkgsrc/www/py-http_ece: Makefile
        pkgsrc/www/py-urllib3: Makefile

Log Message:
*: convert to versioned_dependencies for py-cryptography


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/comms/py-esptool/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/py-pymysql/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/py-requests/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-ec2instanceconnectcli/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/scapy/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/ca-certificates/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/security/py-OpenSSL/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/py-authlib/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/py-fido2/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/py-ntlm-auth/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/py-paramiko/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/py-requests-kerberos/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/py-requests-ntlm/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/security/py-trustme/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/ansible-base/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/py-flask-user/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-http_ece/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/py-urllib3/Makefile

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

Modified files:

Index: pkgsrc/comms/py-esptool/Makefile
diff -u pkgsrc/comms/py-esptool/Makefile:1.11 pkgsrc/comms/py-esptool/Makefile:1.12
--- pkgsrc/comms/py-esptool/Makefile:1.11       Wed Apr 20 12:22:11 2022
+++ pkgsrc/comms/py-esptool/Makefile    Thu Apr 21 10:59:59 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/04/20 12:22:11 adam Exp $
+# $NetBSD: Makefile,v 1.12 2022/04/21 10:59:59 wiz Exp $
 
 DISTNAME=      esptool-3.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,14 +12,16 @@ LICENSE=    gnu-gpl-v2
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-bitstring>=3.1.6:../../devel/py-bitstring
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-ecdsa>=0.16.0:../../security/py-ecdsa
 DEPENDS+=      ${PYPKGPREFIX}-reedsolo>=1.5.3:../../converters/py-reedsolo
 DEPENDS+=      ${PYPKGPREFIX}-serial>=3.0:../../comms/py-serial
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 USE_LANGUAGES= # none
 
 PYTHON_SELF_CONFLICT=  yes
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/py-pymysql/Makefile
diff -u pkgsrc/databases/py-pymysql/Makefile:1.14 pkgsrc/databases/py-pymysql/Makefile:1.15
--- pkgsrc/databases/py-pymysql/Makefile:1.14   Tue Jan  4 20:52:44 2022
+++ pkgsrc/databases/py-pymysql/Makefile        Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/01/04 20:52:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2022/04/21 11:00:00 wiz Exp $
 
 DISTNAME=      PyMySQL-0.10.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,9 +11,10 @@ HOMEPAGE=    https://github.com/PyMySQL/PyM
 COMMENT=       Pure-Python MySQL driver
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 USE_LANGUAGES= # none
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-requests/Makefile
diff -u pkgsrc/devel/py-requests/Makefile:1.52 pkgsrc/devel/py-requests/Makefile:1.53
--- pkgsrc/devel/py-requests/Makefile:1.52      Fri Jan  7 16:23:16 2022
+++ pkgsrc/devel/py-requests/Makefile   Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/01/07 16:23:16 adam Exp $
+# $NetBSD: Makefile,v 1.53 2022/04/21 11:00:00 wiz Exp $
 
 DISTNAME=      requests-2.27.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT=      HTTP library, written in Python
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-certifi>=2017.4.17:../../security/py-certifi
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.3.4:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
 DEPENDS+=      ${PYPKGPREFIX}-urllib3>=1.21.1:../../www/py-urllib3
 TEST_DEPENDS+= ${PYPKGPREFIX}-Socks>=1.5.8:../../net/py-Socks
@@ -20,7 +19,8 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-test-httpb
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 USE_LANGUAGES=         # none
 REPLACE_PYTHON+=       requests/certs.py

Index: pkgsrc/net/py-ec2instanceconnectcli/Makefile
diff -u pkgsrc/net/py-ec2instanceconnectcli/Makefile:1.2 pkgsrc/net/py-ec2instanceconnectcli/Makefile:1.3
--- pkgsrc/net/py-ec2instanceconnectcli/Makefile:1.2    Tue Jan  4 20:54:26 2022
+++ pkgsrc/net/py-ec2instanceconnectcli/Makefile        Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/04/21 11:00:00 wiz Exp $
 
 DISTNAME=      ec2instanceconnectcli-1.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,8 @@ COMMENT=      AWS EC2 Instance Connect Client
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.12.179:../../net/py-botocore
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.9:../../security/py-cryptography
+
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 USE_LANGUAGES= # none
 
@@ -22,5 +23,6 @@ post-install:
 .endfor
        ${RM} ${DESTDIR}${PREFIX}/bin/*.cmd
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/scapy/options.mk
diff -u pkgsrc/net/scapy/options.mk:1.13 pkgsrc/net/scapy/options.mk:1.14
--- pkgsrc/net/scapy/options.mk:1.13    Tue Jan 25 01:44:22 2022
+++ pkgsrc/net/scapy/options.mk Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2022/01/25 01:44:22 wiz Exp $
+# $NetBSD: options.mk,v 1.14 2022/04/21 11:00:00 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.scapy
 
@@ -20,7 +20,8 @@ PKG_SUGGESTED_OPTIONS=        libpcap
 ### Add in crypto support for WEP operations
 ###
 .if !empty(PKG_OPTIONS:Mscapy-crypto)
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+.include "../../lang/python/versioned_dependencies.mk"
 .endif
 
 ###

Index: pkgsrc/security/ca-certificates/Makefile
diff -u pkgsrc/security/ca-certificates/Makefile:1.5 pkgsrc/security/ca-certificates/Makefile:1.6
--- pkgsrc/security/ca-certificates/Makefile:1.5        Mon Feb 28 06:46:52 2022
+++ pkgsrc/security/ca-certificates/Makefile    Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/02/28 06:46:52 kim Exp $
+# $NetBSD: Makefile,v 1.6 2022/04/21 11:00:00 wiz Exp $
 
 PKGNAME=       ca-certificates-20211016
 PKGREVISION=   1
@@ -15,7 +15,7 @@ LICENSE=      gnu-gpl-v2 AND mpl-2.0
 NO_CONFIGURE=          yes
 PYTHON_FOR_BUILD_ONLY= yes
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography:build
 
 USE_TOOLS=     echo:run find:run ln:run openssl:run rm:run sed:run sort:run wc:run
 
@@ -81,4 +81,5 @@ post-install:
            ${DESTDIR}${EGDIR}/
 
 .include "../../lang/python/tool.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-OpenSSL/Makefile
diff -u pkgsrc/security/py-OpenSSL/Makefile:1.59 pkgsrc/security/py-OpenSSL/Makefile:1.60
--- pkgsrc/security/py-OpenSSL/Makefile:1.59    Tue Jan  4 20:54:37 2022
+++ pkgsrc/security/py-OpenSSL/Makefile Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2022/01/04 20:54:37 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2022/04/21 11:00:00 wiz Exp $
 
 DISTNAME=      pyOpenSSL-21.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,15 +11,17 @@ HOMEPAGE=   https://pyopenssl.org/
 COMMENT=       Python interface to the OpenSSL library
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=3.3:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 TEST_DEPENDS+= ${PYPKGPREFIX}-flaky-[0-9]*:../../devel/py-flaky
 TEST_DEPENDS+= ${PYPKGPREFIX}-pretend-[0-9]*:../../devel/py-pretend
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 # https://github.com/pyca/pyopenssl/issues/656
 PYSETUPTESTTARGET=     pytest
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-authlib/Makefile
diff -u pkgsrc/security/py-authlib/Makefile:1.8 pkgsrc/security/py-authlib/Makefile:1.9
--- pkgsrc/security/py-authlib/Makefile:1.8     Tue Jan  4 20:54:37 2022
+++ pkgsrc/security/py-authlib/Makefile Thu Apr 21 11:00:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:37 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/21 11:00:00 wiz Exp $
 
 DISTNAME=      Authlib-0.15.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -11,10 +11,12 @@ HOMEPAGE=   https://authlib.org/
 COMMENT=       Ultimate Python library in building OAuth and OpenID Connect servers
 LICENSE=       modified-bsd
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-fido2/Makefile
diff -u pkgsrc/security/py-fido2/Makefile:1.3 pkgsrc/security/py-fido2/Makefile:1.4
--- pkgsrc/security/py-fido2/Makefile:1.3       Tue Jan  4 20:54:40 2022
+++ pkgsrc/security/py-fido2/Makefile   Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2022/01/04 20:54:40 wiz Exp $
+#      $NetBSD: Makefile,v 1.4 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      fido2-0.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,10 @@ HOMEPAGE=    https://developers.yubico.com/
 COMMENT=       Yubico FIDO U2F and FIDO 2.0 USB Python library
 LICENSE=       2-clause-bsd AND apache-2.0 AND mpl-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.5:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-six>=0:../../lang/py-six
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-ntlm-auth/Makefile
diff -u pkgsrc/security/py-ntlm-auth/Makefile:1.8 pkgsrc/security/py-ntlm-auth/Makefile:1.9
--- pkgsrc/security/py-ntlm-auth/Makefile:1.8   Tue Jan  4 20:54:43 2022
+++ pkgsrc/security/py-ntlm-auth/Makefile       Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      ntlm-auth-1.5.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,10 @@ HOMEPAGE=    https://github.com/jborean93/n
 COMMENT=       NTLM authentication handler for python-requests
 LICENSE=       mit
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-paramiko/Makefile
diff -u pkgsrc/security/py-paramiko/Makefile:1.43 pkgsrc/security/py-paramiko/Makefile:1.44
--- pkgsrc/security/py-paramiko/Makefile:1.43   Tue Jan  4 20:54:43 2022
+++ pkgsrc/security/py-paramiko/Makefile        Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/01/04 20:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      paramiko-2.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,12 +12,12 @@ COMMENT=    SSH2 protocol library
 LICENSE=       gnu-lgpl-v2.1
 
 DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=3.1.3:../../security/py-bcrypt
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=2.5:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-nacl>=1.0.1:../../security/py-nacl
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-relaxed-[0-9]*:../../devel/py-test-relaxed
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 do-test:
        cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests

Index: pkgsrc/security/py-requests-kerberos/Makefile
diff -u pkgsrc/security/py-requests-kerberos/Makefile:1.5 pkgsrc/security/py-requests-kerberos/Makefile:1.6
--- pkgsrc/security/py-requests-kerberos/Makefile:1.5   Tue Jan  4 20:54:44 2022
+++ pkgsrc/security/py-requests-kerberos/Makefile       Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      requests-kerberos-0.12.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,10 +11,11 @@ HOMEPAGE=   https://github.com/requests/re
 COMMENT=       Kerberos authentication handler for python-requests
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.3:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-kerberos>=1.1.8nb1:../../security/py-kerberos
 DEPENDS+=      ${PYPKGPREFIX}-requests>=1.1.0:../../devel/py-requests
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 USE_LANGUAGES= # none
 
 SUBST_CLASSES+=                requires
@@ -23,4 +24,5 @@ SUBST_FILES.requires= setup.py
 SUBST_SED.requires=    -e 's/pykerberos/kerberos/'
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-requests-ntlm/Makefile
diff -u pkgsrc/security/py-requests-ntlm/Makefile:1.4 pkgsrc/security/py-requests-ntlm/Makefile:1.5
--- pkgsrc/security/py-requests-ntlm/Makefile:1.4       Tue Jan  4 20:54:44 2022
+++ pkgsrc/security/py-requests-ntlm/Makefile   Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/04 20:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      requests_ntlm-1.1.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/_/-/}
@@ -11,11 +11,13 @@ HOMEPAGE=   https://github.com/requests/re
 COMMENT=       NTLM authentication handler for python-requests
 LICENSE=       isc
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.3:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-ntlm-auth>=1.0.2:../../security/py-ntlm-auth
 DEPENDS+=      ${PYPKGPREFIX}-requests>=2.0.0:../../devel/py-requests
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/py-trustme/Makefile
diff -u pkgsrc/security/py-trustme/Makefile:1.11 pkgsrc/security/py-trustme/Makefile:1.12
--- pkgsrc/security/py-trustme/Makefile:1.11    Tue Jan  4 20:54:45 2022
+++ pkgsrc/security/py-trustme/Makefile Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/04 20:54:45 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      trustme-0.9.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -11,11 +11,11 @@ HOMEPAGE=   https://github.com/python-trio
 COMMENT=       Number on quality TLS certs while you wait
 LICENSE=       apache-2.0 OR mit
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-idna-[0-9]*:../../www/py-idna
 TEST_DEPENDS+= ${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 
-PYTHON_VERSIONED_DEPENDENCIES= test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        test:test
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 .include "../../lang/python/pyversion.mk"
 .if ${_PYTHON_VERSION} == 27

Index: pkgsrc/sysutils/ansible-base/Makefile
diff -u pkgsrc/sysutils/ansible-base/Makefile:1.15 pkgsrc/sysutils/ansible-base/Makefile:1.16
--- pkgsrc/sysutils/ansible-base/Makefile:1.15  Tue Feb  8 16:41:06 2022
+++ pkgsrc/sysutils/ansible-base/Makefile       Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/02/08 16:41:06 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      ansible-base-2.10.17
 CATEGORIES=    sysutils python
@@ -11,12 +11,12 @@ LICENSE=    gnu-gpl-v3
 
 CONFLICTS+=    ansible<2.10
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 DEPENDS+=      ${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 DEPENDS+=      ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 
 PYTHON_VERSIONED_DEPENDENCIES+=        packaging
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 USE_PKG_RESOURCES=     yes
 

Index: pkgsrc/www/py-flask-user/Makefile
diff -u pkgsrc/www/py-flask-user/Makefile:1.19 pkgsrc/www/py-flask-user/Makefile:1.20
--- pkgsrc/www/py-flask-user/Makefile:1.19      Tue Jan  4 20:55:28 2022
+++ pkgsrc/www/py-flask-user/Makefile   Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/04 20:55:28 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      Flask-User-1.0.1.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,6 @@ COMMENT=      Customizable user account manag
 LICENSE=       2-clause-bsd
 
 DEPENDS+=      ${PYPKGPREFIX}-bcrypt>=2.0:../../security/py-bcrypt
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.6:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-flask>=0.9:../../www/py-flask
 DEPENDS+=      ${PYPKGPREFIX}-flask-login>=0.2:../../www/py-flask-login
 DEPENDS+=      ${PYPKGPREFIX}-flask-mail>=0.9:../../www/py-flask-mail
@@ -22,8 +21,11 @@ DEPENDS+=    ${PYPKGPREFIX}-passlib>=0.6:..
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-http_ece/Makefile
diff -u pkgsrc/www/py-http_ece/Makefile:1.2 pkgsrc/www/py-http_ece/Makefile:1.3
--- pkgsrc/www/py-http_ece/Makefile:1.2 Tue Jan  4 20:55:29 2022
+++ pkgsrc/www/py-http_ece/Makefile     Thu Apr 21 11:00:01 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2022/01/04 20:55:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/04/21 11:00:01 wiz Exp $
 
 DISTNAME=      http_ece-1.0.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,8 @@ LICENSE=      mit
 
 USE_LANGUAGES= # none
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/py-urllib3/Makefile
diff -u pkgsrc/www/py-urllib3/Makefile:1.35 pkgsrc/www/py-urllib3/Makefile:1.36
--- pkgsrc/www/py-urllib3/Makefile:1.35 Thu Mar 17 07:51:19 2022
+++ pkgsrc/www/py-urllib3/Makefile      Thu Apr 21 11:00:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2022/03/17 07:51:19 adam Exp $
+# $NetBSD: Makefile,v 1.36 2022/04/21 11:00:02 wiz Exp $
 
 DISTNAME=      urllib3-1.26.9
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=      mit
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL>=0.14:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-Socks>=1.6.0:../../net/py-Socks
 DEPENDS+=      ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=1.3.4:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-idna>=2.0.0:../../www/py-idna
 
 .include "../../lang/python/pyversion.mk"
@@ -28,7 +27,10 @@ TEST_DEPENDS+=       ${PYPKGPREFIX}-trustme-[0
 PYSETUPTESTTARGET=     pytest
 .endif
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 USE_LANGUAGES= # none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Prev by Date: CVS commit: pkgsrc/lang/python
Next by Date: CVS commit: pkgsrc/security/py-cryptography
Previous by Thread: CVS commit: pkgsrc/lang/python
Next by Thread: CVS commit: pkgsrc/security/py-cryptography
Indexes:

Home | Main Index | Thread Index | Old Index