CVS commit: pkgsrc/net

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 11 17:11:22 UTC 2022

Modified Files:
        pkgsrc/net/py-awscli: Makefile
        pkgsrc/net/py-boto3: Makefile
        pkgsrc/net/py-ec2instanceconnectcli: Makefile
        pkgsrc/net/py-s3transfer: Makefile

Log Message:
*: limit more packages to python 3


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/net/py-awscli/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/py-boto3/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-ec2instanceconnectcli/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/py-s3transfer/Makefile

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

Modified files:

Index: pkgsrc/net/py-awscli/Makefile
diff -u pkgsrc/net/py-awscli/Makefile:1.50 pkgsrc/net/py-awscli/Makefile:1.51
--- pkgsrc/net/py-awscli/Makefile:1.50  Tue Jan  4 20:54:25 2022
+++ pkgsrc/net/py-awscli/Makefile       Sun Sep 11 17:11:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2022/01/04 20:54:25 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2022/09/11 17:11:22 wiz Exp $
 
 DISTNAME=      awscli-1.19.93
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,17 +14,18 @@ LICENSE=    apache-2.0
 DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.20.93:../../net/py-botocore
 DEPENDS+=      ${PYPKGPREFIX}-colorama>=0.3.2:../../comms/py-colorama
 DEPENDS+=      ${PYPKGPREFIX}-docutils>=0.10:../../textproc/py-docutils
+DEPENDS+=      ${PYPKGPREFIX}-rsa>=0:../../security/py-rsa
 DEPENDS+=      ${PYPKGPREFIX}-s3transfer>=0.4.0:../../net/py-s3transfer
 DEPENDS+=      ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 PYTHON_SELF_CONFLICT=  yes
-PYTHON_VERSIONED_DEPENDENCIES+=        rsa
 
 post-extract:
        ${FIND} ${WRKSRC}/awscli/examples -type f -exec ${CHMOD} -R a-x {} +
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-boto3/Makefile
diff -u pkgsrc/net/py-boto3/Makefile:1.39 pkgsrc/net/py-boto3/Makefile:1.40
--- pkgsrc/net/py-boto3/Makefile:1.39   Tue Jan  4 20:54:25 2022
+++ pkgsrc/net/py-boto3/Makefile        Sun Sep 11 17:11:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/01/04 20:54:25 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2022/09/11 17:11:22 wiz Exp $
 
 DISTNAME=      boto3-1.17.93
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,5 +18,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-mock-[0-9]
 
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-ec2instanceconnectcli/Makefile
diff -u pkgsrc/net/py-ec2instanceconnectcli/Makefile:1.3 pkgsrc/net/py-ec2instanceconnectcli/Makefile:1.4
--- pkgsrc/net/py-ec2instanceconnectcli/Makefile:1.3    Thu Apr 21 11:00:00 2022
+++ pkgsrc/net/py-ec2instanceconnectcli/Makefile        Sun Sep 11 17:11:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/04/21 11:00:00 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2022/09/11 17:11:22 wiz Exp $
 
 DISTNAME=      ec2instanceconnectcli-1.0.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,9 @@ COMMENT=      AWS EC2 Instance Connect Client
 LICENSE=       apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.12.179:../../net/py-botocore
+DEPENDS+=      ${PYPKGPREFIX}-cryptography>=0:../../security/py-cryptography
 
-PYTHON_VERSIONED_DEPENDENCIES+=        cryptography
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none
 
@@ -23,6 +24,5 @@ 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/py-s3transfer/Makefile
diff -u pkgsrc/net/py-s3transfer/Makefile:1.12 pkgsrc/net/py-s3transfer/Makefile:1.13
--- pkgsrc/net/py-s3transfer/Makefile:1.12      Tue Jan  4 20:54:32 2022
+++ pkgsrc/net/py-s3transfer/Makefile   Sun Sep 11 17:11:22 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/01/04 20:54:32 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/09/11 17:11:22 wiz Exp $
 
 DISTNAME=      s3transfer-0.4.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -13,10 +13,7 @@ LICENSE=     apache-2.0
 
 DEPENDS+=      ${PYPKGPREFIX}-botocore>=1.12.36:../../net/py-botocore
 
-.include "../../lang/python/pyversion.mk"
-.if ${_PYTHON_VERSION} == 27
-DEPENDS+=      ${PYPKGPREFIX}-futures>=2.2.0:../../devel/py-futures
-.endif
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 USE_LANGUAGES= # none