*: convert to versioned_dependencies for py-cryptography

9 files changed, 32 insertions, 20 deletions

diff --git a/security/ca-certificates/Makefile b/security/ca-certificates/Makefile
index 936063128fd..fb8b0d3a792 100644
--- a/security/ca-certificates/Makefile
+++ b/security/ca-certificates/Makefile
@@ -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"
diff --git a/security/py-OpenSSL/Makefile b/security/py-OpenSSL/Makefile
index 37ff0055a62..fece301fd21 100644
--- a/security/py-OpenSSL/Makefile
+++ b/security/py-OpenSSL/Makefile
@@ -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"
diff --git a/security/py-authlib/Makefile b/security/py-authlib/Makefile
index 5d23edffaa1..d9fde051cea 100644
--- a/security/py-authlib/Makefile
+++ b/security/py-authlib/Makefile
@@ -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"
diff --git a/security/py-fido2/Makefile b/security/py-fido2/Makefile
index b08365d7118..985b92afc9c 100644
--- a/security/py-fido2/Makefile
+++ b/security/py-fido2/Makefile
@@ -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/python-fido2/
 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"
diff --git a/security/py-ntlm-auth/Makefile b/security/py-ntlm-auth/Makefile
index d7d8685342c..2ea54333fb5 100644
--- a/security/py-ntlm-auth/Makefile
+++ b/security/py-ntlm-auth/Makefile
@@ -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/ntlm-auth
 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"
diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile
index 6958595b802..a30bcd44805 100644
--- a/security/py-paramiko/Makefile
+++ b/security/py-paramiko/Makefile
@@ -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
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 190e587a1fc..89fc2602f0e 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -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/requests-kerberos
 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"
diff --git a/security/py-requests-ntlm/Makefile b/security/py-requests-ntlm/Makefile
index 935ee6c36e3..cef233f15c0 100644
--- a/security/py-requests-ntlm/Makefile
+++ b/security/py-requests-ntlm/Makefile
@@ -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/requests-ntlm
 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"
diff --git a/security/py-trustme/Makefile b/security/py-trustme/Makefile
index 20b045bbbd6..809d63ebca3 100644
--- a/security/py-trustme/Makefile
+++ b/security/py-trustme/Makefile
@@ -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/trustme
 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