[pkgsrc/trunk]: pkgsrc Convert several packages to using versioned_depends fo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5c1bce63753b
branches:  trunk
changeset: 388997:5c1bce63753b
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Nov 28 19:07:30 2022 +0000

description:
Convert several packages to using versioned_depends for py-cryptography.

Somehow this has been hanging around in my tree for months.

diffstat:

 devel/py-requests/Makefile      |  6 ++++--
 devel/py-stem/Makefile          |  6 ++++--
 filesystems/tahoe-lafs/Makefile |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (95 lines):

diff -r 800f1521143c -r 5c1bce63753b devel/py-requests/Makefile
--- a/devel/py-requests/Makefile        Mon Nov 28 18:57:46 2022 +0000
+++ b/devel/py-requests/Makefile        Mon Nov 28 19:07:30 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2022/11/20 23:19:20 adam Exp $
+# $NetBSD: Makefile,v 1.57 2022/11/28 19:07:30 nia Exp $
 
 DISTNAME=      requests-2.28.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,6 @@
 COMMENT=       HTTP library, written in Python, for human beings
 LICENSE=       apache-2.0
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-certifi>=2017.4.17:../../security/py-certifi
 # TODO: remove chardet once charset-normalizer>=3 is supported
 DEPENDS+=      ${PYPKGPREFIX}-chardet>=3.0.2:../../converters/py-chardet
@@ -25,6 +24,8 @@
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 TEST_DEPENDS+= ${PYPKGPREFIX}-trustme-[0-9]*:../../security/py-trustme
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES=         # none
@@ -35,4 +36,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 800f1521143c -r 5c1bce63753b devel/py-stem/Makefile
--- a/devel/py-stem/Makefile    Mon Nov 28 18:57:46 2022 +0000
+++ b/devel/py-stem/Makefile    Mon Nov 28 19:07:30 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/10/04 20:21:38 adam Exp $
+# $NetBSD: Makefile,v 1.8 2022/11/28 19:07:30 nia Exp $
 
 DISTNAME=      stem-1.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -15,13 +15,14 @@
 TOOL_DEPENDS+= ${PYPKGPREFIX}-codestyle-[0-9]*:../../devel/py-codestyle
 TOOL_DEPENDS+= ${PYPKGPREFIX}-flakes-[0-9]*:../../devel/py-flakes
 
-DEPENDS+=      ${PYPKGPREFIX}-cryptography-[0-9]*:../../security/py-cryptography
 DEPENDS+=      ${PYPKGPREFIX}-nacl-[0-9]*:../../security/py-nacl
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 TEST_DEPENDS+= ${PYPKGPREFIX}-tox-[0-9]*:../../devel/py-tox
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 REPLACE_PYTHON+=       cache_fallback_directories.py
 REPLACE_PYTHON+=       cache_manual.py
 REPLACE_PYTHON+=       run_tests.py
@@ -35,4 +36,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 800f1521143c -r 5c1bce63753b filesystems/tahoe-lafs/Makefile
--- a/filesystems/tahoe-lafs/Makefile   Mon Nov 28 18:57:46 2022 +0000
+++ b/filesystems/tahoe-lafs/Makefile   Mon Nov 28 19:07:30 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2022/10/03 16:40:21 gdt Exp $
+# $NetBSD: Makefile,v 1.58 2022/11/28 19:07:30 nia Exp $
 
 VERSION_BASE=  1.18.0
 VERSION_RC=
@@ -27,7 +27,6 @@
 DEPENDS+=      ${PYPKGPREFIX}-zfec>=1.1.0:../../converters/py-zfec
 DEPENDS+=      ${PYPKGPREFIX}-ZopeInterface>=3.6.0:../../devel/py-ZopeInterface
 DEPENDS+=      ${PYPKGPREFIX}-foolscap>=21.7.0:../../net/py-foolscap
-DEPENDS+=      ${PYPKGPREFIX}-cryptography>=2.6:../../security/py-cryptography
 # twisted needs tls, conch options.  pkgsrc has tls.
 # TODO: conch??
 DEPENDS+=      ${PYPKGPREFIX}-twisted>=19.10.0:../../net/py-twisted
@@ -47,6 +46,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-distro>=1.4.0:../../devel/py-distro
 DEPENDS+=      ${PYPKGPREFIX}-collections-extended-[0-9]*:../../devel/py-collections-extended
 
+PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+
 # tor_requires
 DEPENDS+=      ${PYPKGPREFIX}-txtorcon>=0.17.0:../../net/py-txtorcon
 # txi2p-requires
@@ -87,4 +88,5 @@
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"