diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2023-07-22 07:38:27 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2023-07-22 07:46:38 +0000 |
commit | b28a739884e37c25bb57ea5f157252adb63065d3 (patch) | |
tree | 73d4c9e3ccdb6b0fb271ce8084faebb9c2214778 | |
parent | 7bb64b89d0e5ec8d77b28f8341269ffbad279ebf (diff) | |
download | ports-b28a739884e37c25bb57ea5f157252adb63065d3.tar.gz ports-b28a739884e37c25bb57ea5f157252adb63065d3.zip |
framework: convert tree to use USES=pycryptography
A future commit will update to security/py-cryptography will introduce a
rust dependency.
PR: 254853
94 files changed, 141 insertions, 229 deletions
diff --git a/cad/uranium/Makefile b/cad/uranium/Makefile index a875fbc09253..9be37567b1e4 100644 --- a/cad/uranium/Makefile +++ b/cad/uranium/Makefile @@ -13,11 +13,10 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} -USES= cmake gettext python pyqt:5 +USES= cmake gettext python pycryptography:run pyqt:5 USE_PYQT= pyqt5 USE_GITHUB= yes GH_ACCOUNT= Ultimaker diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile index 5daf5ddf86f6..733b7c393c0a 100644 --- a/comms/py-esptool/Makefile +++ b/comms/py-esptool/Makefile @@ -15,11 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ecdsa>=0.16.0:security/py-ecdsa@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}bitstring>=3.1.6,<4:devel/py-bitstring@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reedsolo>=1.5.3,<=1.6.0:devel/py-reedsolo@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils pytest diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile index 41312e89f1b8..255900f20ee2 100644 --- a/databases/py-mycli/Makefile +++ b/databases/py-mycli/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.2.1:devel/py-cli-helpers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.6<4.0.0:devel/py-prompt-toolkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyaes>=1.6.1:security/py-pyaes@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \ @@ -24,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.2.1:devel/py-cli-helpers@${PY ${PYTHON_PKGNAMEPREFIX}sqlglot>=5.1.3:databases/py-sqlglot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.5.0:databases/py-sqlparse@${PY_FLAVOR} -USES= mysql python +USES= mysql python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/databases/py-ormar/Makefile b/databases/py-ormar/Makefile index 214722eedfdd..265a05690c7b 100644 --- a/databases/py-ormar/Makefile +++ b/databases/py-ormar/Makefile @@ -33,8 +33,7 @@ OPTIONS_DEFAULT= SQLITE DATABASES_DESC= Database Support CRYPTO_DESC= Support for password encryption - -CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} +CRYPTO_USES= pycryptography:run SQLITE_USES= sqlite SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiosqlite>0:databases/py-aiosqlite@${PY_FLAVOR} MYSQL_USES= mysql diff --git a/databases/py-sqlalchemy-utils/Makefile b/databases/py-sqlalchemy-utils/Makefile index ed2de8a862b7..29effda0b6d2 100644 --- a/databases/py-sqlalchemy-utils/Makefile +++ b/databases/py-sqlalchemy-utils/Makefile @@ -34,7 +34,7 @@ URL_DESC= URL type support ARROW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.3.4:devel/py-arrow@${PY_FLAVOR} BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR} COLOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colour>=0.0.4:graphics/py-colour@${PY_FLAVOR} -ENCRYPTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.6,1:security/py-cryptography@${PY_FLAVOR} +ENCRYPTED_USES= pycryptography:run INTERVALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervals>=0.7.1:net/py-intervals@${PY_FLAVOR} PASSWORD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6<2.0:security/py-passlib@${PY_FLAVOR} PENDULUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pendulum>=2.0.5:devel/py-pendulum@${PY_FLAVOR} diff --git a/devel/oci-cli/Makefile b/devel/oci-cli/Makefile index 06bb57ff66f2..f4d88921bb6e 100644 --- a/devel/oci-cli/Makefile +++ b/devel/oci-cli/Makefile @@ -19,7 +19,6 @@ LICENSE_PERMS_UPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=8.0.4:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.2.1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>=0.10.0:devel/py-jmespath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oci>=2.104.3:devel/py-oci@${PY_FLAVOR} \ @@ -30,7 +29,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR} -USES= python:3.8-3.11 +USES= python:3.8-3.11 pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/osc/Makefile b/devel/osc/Makefile index 768f1b074c4e..26ba12e6809c 100644 --- a/devel/osc/Makefile +++ b/devel/osc/Makefile @@ -10,10 +10,9 @@ WWW= https://en.opensuse.org/openSUSE:OSC \ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_GITHUB= yes GH_ACCOUNT= openSUSE USE_PYTHON= autoplist distutils noflavors pytest diff --git a/devel/py-adb/Makefile b/devel/py-adb/Makefile index 35b505efb0ed..b317508d25f5 100644 --- a/devel/py-adb/Makefile +++ b/devel/py-adb/Makefile @@ -10,15 +10,14 @@ WWW= https://github.com/google/python-adb LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb1>=1.0.16:devel/py-libusb1@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb1>=1.0.16:devel/py-libusb1@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= google GH_PROJECT= python-${PORTNAME} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils pytest NO_ARCH= yes diff --git a/devel/py-aiortc/Makefile b/devel/py-aiortc/Makefile index 4b7b18e06b3e..67b993ce33de 100644 --- a/devel/py-aiortc/Makefile +++ b/devel/py-aiortc/Makefile @@ -18,13 +18,12 @@ LIB_DEPENDS= libopus.so:audio/opus \ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}aioice>=0.9.0:devel/py-aioice@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}av>=9.0.0:multimedia/py-av@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.2:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-crc32c>=1.1:devel/py-google-crc32c@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=23.1.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyee>=9.0.0:devel/py-pyee@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pylibsrtp>=0.5.6:devel/py-pylibsrtp@${PY_FLAVOR} -USES= localbase python +USES= localbase python pycryptography:run USE_PYTHON= autoplist concurrent distutils post-install: diff --git a/devel/py-azure-identity/Makefile b/devel/py-azure-identity/Makefile index b98a8899d89e..49dfcaef4a88 100644 --- a/devel/py-azure-identity/Makefile +++ b/devel/py-azure-identity/Makefile @@ -11,12 +11,11 @@ WWW= https://pypi.org/project/azure-identity/ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-core>=1.0.0<2.0.0:devel/py-azure-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msal>=1.7.0<2.0.0:devel/py-msal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msal-extensions>=0.3.0:devel/py-msal-extensions@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} -USES= azurepy python zip +USES= azurepy python pycryptography:run zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-azure-keyvault/Makefile b/devel/py-azure-keyvault/Makefile index 633c61ac4677..23f2baccd4db 100644 --- a/devel/py-azure-keyvault/Makefile +++ b/devel/py-azure-keyvault/Makefile @@ -13,10 +13,9 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msrest>=0.5.0:net-mgmt/py-msrest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.4.32:net-mgmt/py-msrestazure@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1:www/py-azure-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} -USES= azurepy python zip +USES= azurepy python pycryptography:run zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-azure-multiapi-storage/Makefile b/devel/py-azure-multiapi-storage/Makefile index e844f6df9700..886f97eb5adb 100644 --- a/devel/py-azure-multiapi-storage/Makefile +++ b/devel/py-azure-multiapi-storage/Makefile @@ -11,13 +11,12 @@ WWW= https://pypi.org/project/azure-multiapi-storage/ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>=0:www/py-azure-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-core>=1.10.0<2.0.0:devel/py-azure-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msrest>=0.6.18:net-mgmt/py-msrest@${PY_FLAVOR} -USES= azurepy python +USES= azurepy python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-azure-storage-common/Makefile b/devel/py-azure-storage-common/Makefile index b33e63bff660..d58d629261ee 100644 --- a/devel/py-azure-storage-common/Makefile +++ b/devel/py-azure-storage-common/Makefile @@ -11,11 +11,10 @@ WWW= https://pypi.org/project/azure-storage-common/ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1.5:www/py-azure-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} -USES= azurepy python +USES= azurepy python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-castellan/Makefile b/devel/py-castellan/Makefile index 7fc6cc502212..0f81e14df1bc 100644 --- a/devel/py-castellan/Makefile +++ b/devel/py-castellan/Makefile @@ -12,8 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.7:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=3.4.0:devel/py-keystoneauth1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.config>=6.4.0:devel/py-oslo.config@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.19.2:devel/py-oslo.context@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ @@ -24,7 +23,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.7:security/py-cryptography@$ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stevedore>=1.20.0:devel/py-stevedore@${PY_FLAVOR} -USES= python shebangfix +USES= python pycryptography:run shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-cursive/Makefile b/devel/py-cursive/Makefile index afbb38c785a1..45a6f4dc54b7 100644 --- a/devel/py-cursive/Makefile +++ b/devel/py-cursive/Makefile @@ -13,14 +13,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-moto/Makefile b/devel/py-moto/Makefile index 5edd8331f46f..06e4661210bf 100644 --- a/devel/py-moto/Makefile +++ b/devel/py-moto/Makefile @@ -15,7 +15,6 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>=1.9.201:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}botocore>=1.12.201:devel/py-botocore@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.5:www/py-requests@${PY_FLAVOR} \ @@ -36,7 +35,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aws-xray-sdk>=0.93:devel/py-aws-xray-sdk@${ ${PYTHON_PKGNAMEPREFIX}sshpubkeys>=3.1.0:security/py-sshpubkeys@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent pep517 pytest NO_ARCH= yes diff --git a/devel/py-msal/Makefile b/devel/py-msal/Makefile index a8e05eebb5e7..dd0f4e7e4a47 100644 --- a/devel/py-msal/Makefile +++ b/devel/py-msal/Makefile @@ -11,10 +11,9 @@ WWW= https://github.com/AzureAD/microsoft-authentication-library-for-python LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0<3:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0<3:www/py-pyjwt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0.6<40,1:security/py-cryptography@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0<3:www/py-pyjwt@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-oci/Makefile b/devel/py-oci/Makefile index 9fe4157ef1b2..245c1880c716 100644 --- a/devel/py-oci/Makefile +++ b/devel/py-oci/Makefile @@ -18,12 +18,11 @@ LICENSE_PERMS_UPL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}circuitbreaker>=1.3.1:devel/py-circuitbreaker@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.2.1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3<3.0.0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=17.5.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} -USES= python:3.8-3.11 +USES= python:3.8-3.11 pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-openstacksdk/Makefile b/devel/py-openstacksdk/Makefile index 6c2fd24eb2d8..e457ab3bec81 100644 --- a/devel/py-openstacksdk/Makefile +++ b/devel/py-openstacksdk/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.7:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=4.4.1:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.5:devel/py-dogpile.cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} \ @@ -27,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.2.0:devel/py-requestsexceptions@${PY_FLAVOR} -USES= python shebangfix +USES= python pycryptography:run shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 15b3a7125387..5325a5bca413 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -17,8 +17,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt # Tests also need bzr, git, otherwise they fail -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \ @@ -33,7 +32,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${ git:devel/git \ svn:devel/subversion -USES= cpe python shebangfix +USES= cpe python pycryptography:test shebangfix CPE_VENDOR= pypa USE_PYTHON= autoplist concurrent distutils pytest diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile index b2c2b03357ff..2b492708a603 100644 --- a/devel/py-twisted/Makefile +++ b/devel/py-twisted/Makefile @@ -36,9 +36,9 @@ OPTIONS_DEFAULT=CONCH HTTP2 SERIAL TLS CONCH_DESC= Conch secure shell SSH SERIAL_DESC= Serial port extension +CONCH_USES= pycryptography:run CONCH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.0.0:security/py-bcrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} HTTP2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h2>=3.0<5.0:www/py-h2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}priority1>=1.1.0<2.0:www/py-priority1@${PY_FLAVOR} diff --git a/dns/letsdns/Makefile b/dns/letsdns/Makefile index f671ff62e8df..a47361730442 100644 --- a/dns/letsdns/Makefile +++ b/dns/letsdns/Makefile @@ -11,11 +11,10 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_GITHUB= yes GH_ACCOUNT= LetsDNS USE_PYTHON= autoplist pep517 diff --git a/dns/py-dns-crawler/Makefile b/dns/py-dns-crawler/Makefile index 78bd7713a3a1..31a613e3f4fb 100644 --- a/dns/py-dns-crawler/Makefile +++ b/dns/py-dns-crawler/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.3.0:devel/py-asn1crypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cert-human>=1.0.7:security/py-cert-human@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.8:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0,1:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ecdsa>=0.15:security/py-ecdsa@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}forcediphttpsadapter>=1.0.1:www/py-forcediphttpsadapter@${PY_FLAVOR} \ @@ -31,7 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.3.0:devel/py-asn1crypto@${PY_F ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.9.1:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rq>=1.2.2:devel/py-rq@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/dns/py-dns-lexicon/Makefile b/dns/py-dns-lexicon/Makefile index 4cf4150b4fe7..5faef179ce61 100644 --- a/dns/py-dns-lexicon/Makefile +++ b/dns/py-dns-lexicon/Makefile @@ -14,13 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4:devel/py-importlib-metadata@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tldextract>=2:dns/py-tldextract@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/dns/py-dnspython/Makefile b/dns/py-dnspython/Makefile index 1b9470cde16e..460dada39958 100644 --- a/dns/py-dnspython/Makefile +++ b/dns/py-dnspython/Makefile @@ -31,7 +31,7 @@ DOQ_DESC= DNS over QUIC Support IDNA_DESC= Internationalizede Domain Names in Application Support TRIO_DESC= TRIO Support -DNSSEC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} +DNSSEC_USES= pycryptography:run DOH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h2>=4.0.0:www/py-h2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httpx>=0.24.1:www/py-httpx@${PY_FLAVOR} DOQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aioquic>0:www/py-aioquic@${PY_FLAVOR} diff --git a/finance/electrum/Makefile b/finance/electrum/Makefile index 196dafd205cd..87bd050f78ce 100644 --- a/finance/electrum/Makefile +++ b/finance/electrum/Makefile @@ -19,7 +19,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=0.3:net/py-aiohttp-socks@${PY ${PYTHON_PKGNAMEPREFIX}attrs>=19.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=2.0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${PY_FLAVOR} \ @@ -31,7 +30,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp-socks>=0.3:net/py-aiohttp-socks@${PY ${PYTHON_PKGNAMEPREFIX}secp256k1>0:math/py-secp256k1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.9:databases/py-sqlite3@${PY_FLAVOR} -USES= cpe python shebangfix +USES= cpe python pycryptography:run shebangfix USE_PYTHON= autoplist concurrent distutils PYDISTUTILS_PKGNAME= Electrum diff --git a/finance/py-ccxt/Makefile b/finance/py-ccxt/Makefile index 08a13a104f56..24c05f0c60dc 100644 --- a/finance/py-ccxt/Makefile +++ b/finance/py-ccxt/Makefile @@ -12,14 +12,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2018.1.18:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6.1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>=3.8:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${PY_FLAVOR} -USES= python +USES= python pycryptography:build,run USE_PYTHON= distutils autoplist pytest # 3 errors during tests, see https://github.com/ccxt/ccxt/issues/16661 NO_ARCH= yes diff --git a/mail/py-flanker/Makefile b/mail/py-flanker/Makefile index 0b421929eb24..c7c2d33c5c72 100644 --- a/mail/py-flanker/Makefile +++ b/mail/py-flanker/Makefile @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1,1:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0.5:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>=3.10:devel/py-ply@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0.1.20110315:textproc/py-regex@${PY_FLAVOR} \ @@ -21,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tld>=0:dns/py-tld@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/misc/py-apache-beam/Makefile b/misc/py-apache-beam/Makefile index cd3b4822731c..f292eb6daab1 100644 --- a/misc/py-apache-beam/Makefile +++ b/misc/py-apache-beam/Makefile @@ -35,8 +35,7 @@ PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudpickle>=2.2.0:devel/py-cloudpickle@${PY_ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \ ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=36.0.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.12:devel/py-freezegun@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>=0.3.12:devel/py-freezegun@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}joblib>=0.3.12:devel/py-joblib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \ @@ -52,7 +51,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=36.0.0:security/py-cryptograp ${PYTHON_PKGNAMEPREFIX}yaml>=3.12:devel/py-yaml@${PY_FLAVOR} # testcontainers[mysql]>=3.0.3 is also required -USES= python zip +USES= python pycryptography:test zip USE_PYTHON= distutils cython concurrent autoplist pytest # 5 tests fail, depending on pyarrow, MySqlContainer, threadpoolctl post-install: diff --git a/misc/py-cinder/Makefile b/misc/py-cinder/Makefile index a6c126a1da29..1d46cd0b71d4 100644 --- a/misc/py-cinder/Makefile +++ b/misc/py-cinder/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}castellan>=0.16.0:devel/py-castellan@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.9:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \ @@ -75,7 +74,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tooz>=1.58.0:devel/py-tooz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=1.7.1:www/py-webob@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptopgraphy:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index c302e8982c3e..d90b38eab66e 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -40,7 +40,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.3:www/py-bleach@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.10.0.1:devel/py-typing-extensions@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.4.7:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ijson>=3.1.4:devel/py-ijson@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matrix-common>=1.3.0<2.0.0:devel/py-matrix-common@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.1:devel/py-packaging@${PY_FLAVOR} \ @@ -55,7 +54,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_F ${PYTHON_PKGNAMEPREFIX}authlib>=0.15.1:security/py-authlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} -USES= python cargo +USES= python pycryptography:run cargo USE_PYTHON= autoplist distutils USE_RC_SUBR= synapse WRKSRC= ${WRKDIR}/${PORTNAME:S/-/_/}-${DISTVERSION} diff --git a/net-mgmt/py-adal/Makefile b/net-mgmt/py-adal/Makefile index 25ea2f1cb2be..ea151a5cdff6 100644 --- a/net-mgmt/py-adal/Makefile +++ b/net-mgmt/py-adal/Makefile @@ -11,12 +11,11 @@ WWW= https://github.com/AzureAD/azure-activedirectory-library-for-python LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.1.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0<3:www/py-pyjwt@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0<3:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1.0<3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0<3:www/py-requests@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/net-p2p/reticulum/Makefile b/net-p2p/reticulum/Makefile index e44a3224c069..5f9305573cb8 100644 --- a/net-p2p/reticulum/Makefile +++ b/net-p2p/reticulum/Makefile @@ -10,11 +10,10 @@ WWW= https://reticulum.network/ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= distutils USE_RC_SUBR= reticulum GROUPS= _reticulum diff --git a/net/onionprobe/Makefile b/net/onionprobe/Makefile index 62fb38367847..3f6e585ae0e2 100644 --- a/net/onionprobe/Makefile +++ b/net/onionprobe/Makefile @@ -13,15 +13,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=0:devel/py-poetry-core@${PY_FLAVOR} \ ${PY_SETUPTOOLS} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prometheus-client>=0:net-mgmt/py-prometheus-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}stem>=0:security/py-stem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ tor:security/tor -USES= python shebangfix +USES= python pycryptography:run shebangfix USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/net/py-cepa/Makefile b/net/py-cepa/Makefile index 1cead5af834f..34cfd1b8b776 100644 --- a/net/py-cepa/Makefile +++ b/net/py-cepa/Makefile @@ -11,8 +11,7 @@ WWW= https://github.com/onionshare/cepa LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR} TEST_DEPENDS= tor:security/tor \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ @@ -21,7 +20,7 @@ TEST_DEPENDS= tor:security/tor \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} -USES= python shebangfix +USES= python pycryptography:run shebangfix USE_PYTHON= distutils autoplist concurrent NO_ARCH= yes diff --git a/net/py-ripe.atlas.sagan/Makefile b/net/py-ripe.atlas.sagan/Makefile index 6e24dafdc890..456eb763acac 100644 --- a/net/py-ripe.atlas.sagan/Makefile +++ b/net/py-ripe.atlas.sagan/Makefile @@ -12,10 +12,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/net/py-smbprotocol/Makefile b/net/py-smbprotocol/Makefile index e924360eea3e..cc9fe8248754 100644 --- a/net/py-smbprotocol/Makefile +++ b/net/py-smbprotocol/Makefile @@ -11,10 +11,9 @@ WWW= https://github.com/jborean93/smbprotocol LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyspnego>=0:security/py-pyspnego@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspnego>=0:security/py-pyspnego@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/net/py-transip/Makefile b/net/py-transip/Makefile index 13b6a26b3028..b18631666770 100644 --- a/net/py-transip/Makefile +++ b/net/py-transip/Makefile @@ -11,11 +11,10 @@ WWW= https://github.com/benkonrath/transip-api LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/net/py-urllib3/Makefile b/net/py-urllib3/Makefile index b5f3d1d2b961..ea9048154226 100644 --- a/net/py-urllib3/Makefile +++ b/net/py-urllib3/Makefile @@ -13,8 +13,7 @@ WWW= https://github.com/urllib3/urllib3 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4,1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}flaky>=3.6.1:devel/py-flaky@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flaky>=3.6.1:devel/py-flaky@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \ @@ -41,8 +40,9 @@ OPTIONS_DEFAULT=SOCKS SSL BROTLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.9:archivers/py-brotli@${PY_FLAVOR} SOCKS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6<2.0:net/py-pysocks@${PY_FLAVOR} SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}idna>=2.0.0:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR} +SSL_USES= pycryptography:build,test,run +SSL_USES_OFF= pycryptography:test .include <bsd.port.mk> diff --git a/net/scapy/Makefile b/net/scapy/Makefile index b261972fe160..90839a4b8b0e 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -13,10 +13,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libdnet>0:net/py-libdnet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/news/sabnzbd/Makefile b/news/sabnzbd/Makefile index e1cc10adb619..b33a4a1d292a 100644 --- a/news/sabnzbd/Makefile +++ b/news/sabnzbd/Makefile @@ -57,7 +57,7 @@ DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} NOTIFY2_IMPLIES= DBUS NOTIFY2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify2>=0:devel/py-notify2@${PY_FLAVOR} PYGOBJECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=3.10.2:devel/py-gobject3@${PY_FLAVOR} -SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} +SSL_USES= pycryptography:run post-patch: @${REINPLACE_CMD} -e "s:%%DATADIR%%:'${DATADIR}':g" \ diff --git a/security/caldera/Makefile b/security/caldera/Makefile index 2899e046379c..12b167ffd851 100644 --- a/security/caldera/Makefile +++ b/security/caldera/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}aiohttp-apispec>0:devel/py-aiohttp-apispec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}websockets>0:devel/py-websockets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${PY_FLAVOR} \ @@ -65,7 +64,7 @@ GH_TUPLE= mitre:access:0e67776:access/plugins/access \ mitre:stockpile:960f9ad:stockpile/plugins/stockpile \ mitre:training:b058b67:training/plugins/training -USES= dos2unix go:run python +USES= dos2unix go:run python pycryptography:run NO_ARCH= yes NO_BUILD= yes diff --git a/security/cowrie/Makefile b/security/cowrie/Makefile index 0b8b125b1f30..b2999fcf3c47 100644 --- a/security/cowrie/Makefile +++ b/security/cowrie/Makefile @@ -17,7 +17,6 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}attrs>0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ @@ -28,7 +27,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}tftpy>0:ftp/py-tftpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${PY_FLAVOR} -USES= python shebangfix +USES= python pycryptography:run shebangfix SHEBANG_FILES= bin/cowrie USE_GITHUB= yes USE_PYTHON= distutils noflavors autoplist diff --git a/security/py-SecretStorage/Makefile b/security/py-SecretStorage/Makefile index 243dfcc9d9e1..f5207dd77520 100644 --- a/security/py-SecretStorage/Makefile +++ b/security/py-SecretStorage/Makefile @@ -11,11 +11,10 @@ WWW= https://pypi.org/project/SecretStorage/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile index 205bc08fe50e..4e58946841df 100644 --- a/security/py-acme/Makefile +++ b/security/py-acme/Makefile @@ -12,14 +12,13 @@ WWW= https://github.com/certbot/certbot/tree/master/acme LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.5.0,1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}josepy>=1.13.0:security/py-josepy@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}josepy>=1.13.0:security/py-josepy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=17.5.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrfc3339>=0:devel/py-pyrfc3339@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.3,1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.20.0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils pytest NO_ARCH= yes diff --git a/security/py-asyncssh/Makefile b/security/py-asyncssh/Makefile index d3687c19adcc..58199d6118c9 100644 --- a/security/py-asyncssh/Makefile +++ b/security/py-asyncssh/Makefile @@ -11,10 +11,9 @@ WWW= https://github.com/ronf/asyncssh LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6:devel/py-typing-extensions@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6:devel/py-typing-extensions@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_PYTHON= autoplist concurrent distutils unittest NO_ARCH= yes diff --git a/security/py-authlib/Makefile b/security/py-authlib/Makefile index b7e2e73910af..13d686a32c3d 100644 --- a/security/py-authlib/Makefile +++ b/security/py-authlib/Makefile @@ -13,9 +13,7 @@ WWW= https://authlib.org/ \ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.2:security/py-cryptography@${PY_FLAVOR} - -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-azure-keyvault-keys/Makefile b/security/py-azure-keyvault-keys/Makefile index 56ab3c1230d7..8f309aa1f7c2 100644 --- a/security/py-azure-keyvault-keys/Makefile +++ b/security/py-azure-keyvault-keys/Makefile @@ -13,11 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>=1.1<2:www/py-azure-common@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-core>=1.24.0<2.0.0:devel/py-azure-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}isodate>=0.6.1:devel/py-isodate@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.0.1:devel/py-typing-extensions@${PY_FLAVOR} -USES= python zip +USES= python pycryptography:run zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-badkeys/Makefile b/security/py-badkeys/Makefile index e6e2430d6306..159729f4ebcc 100644 --- a/security/py-badkeys/Makefile +++ b/security/py-badkeys/Makefile @@ -12,10 +12,9 @@ WWW= https://github.com/badkeys/badkeys LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-cert-human/Makefile b/security/py-cert-human/Makefile index 671f7711364d..cef7076bb0b0 100644 --- a/security/py-cert-human/Makefile +++ b/security/py-cert-human/Makefile @@ -12,12 +12,11 @@ WWW= https://github.com/lifehackjim/cert_human LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.0.0:dns/py-idna@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0.0:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index a4388b27a010..16b901264745 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -15,14 +15,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.5.0,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distro>=1.0.1:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}josepy>=1.13.0:security/py-josepy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrfc3339>=0:devel/py-pyrfc3339@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.3,1:devel/py-pytz@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils pytest NO_ARCH= yes diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile index ec6be99cdbe0..ae3fb085efdb 100644 --- a/security/py-dfvfs/Makefile +++ b/security/py-dfvfs/Makefile @@ -34,7 +34,6 @@ RUN_DEPENDS= libbde>=a:devel/libbde \ libvsgpt>=e:devel/libvsgpt \ libvshadow>=0:devel/libvshadow \ libvslvm>=e:devel/libvslvm \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dtfabric>=0:devel/py-dtfabric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${PY_FLAVOR} \ @@ -42,7 +41,7 @@ RUN_DEPENDS= libbde>=a:devel/libbde \ ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_LOCALE= en_US.UTF-8 USE_PYTHON= distutils autoplist concurrent DO_MAKE_TEST= ${SETENV} ${TEST_ENV} ${PYTHON_CMD} diff --git a/security/py-fido2/Makefile b/security/py-fido2/Makefile index c47d3502b793..c717c0cd7a1b 100644 --- a/security/py-fido2/Makefile +++ b/security/py-fido2/Makefile @@ -16,6 +16,7 @@ xRUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6<40,1:security/py-cryptogr ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} +# assuming xRUN_DEPENDS is a typo, add: pycryptography:run USES= python USE_PYTHON= autoplist pep517 unittest diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile index 6945cd5d1c09..09edce09c505 100644 --- a/security/py-josepy/Makefile +++ b/security/py-josepy/Makefile @@ -11,15 +11,14 @@ WWW= https://josepy.readthedocs.io/en/latest/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.5:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cache>=1.0:devel/py-pytest-cache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-flake8>=0.5:devel/py-pytest-flake8@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils pytest NO_ARCH= yes diff --git a/security/py-msoffcrypto-tool/Makefile b/security/py-msoffcrypto-tool/Makefile index d285d809397c..5f0961303e5c 100644 --- a/security/py-msoffcrypto-tool/Makefile +++ b/security/py-msoffcrypto-tool/Makefile @@ -10,10 +10,9 @@ WWW= https://github.com/nolze/msoffcrypto-tool LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.3:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}olefile>=0.45:devel/py-olefile@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}olefile>=0.45:devel/py-olefile@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= concurrent distutils autoplist NO_ARCH= yes diff --git a/security/py-noiseprotocol/Makefile b/security/py-noiseprotocol/Makefile index df7bb20ace14..7652535f9f34 100644 --- a/security/py-noiseprotocol/Makefile +++ b/security/py-noiseprotocol/Makefile @@ -10,9 +10,7 @@ WWW= https://pypi.org/project/noiseprotocol/ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.8:security/py-cryptography@${PY_FLAVOR} - -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile index 27e7fd99c70a..519a510871f4 100644 --- a/security/py-oauthlib/Makefile +++ b/security/py-oauthlib/Makefile @@ -25,10 +25,10 @@ RSA_DESC= RSA support SIGNALS_DESC= Signal support SIGNEDTOKEN_DESC= Signed token support -RSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.0.0:security/py-cryptography@${PY_FLAVOR} +RSA_USES= pycryptography:run SIGNALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>=1.4.0:devel/py-blinker@${PY_FLAVOR} -SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.0.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0.0<3:www/py-pyjwt@${PY_FLAVOR} +SIGNEDTOKEN_USES= pycryptography:run +SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0.0<3:www/py-pyjwt@${PY_FLAVOR} do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile index e100ead0b305..51636939b53c 100644 --- a/security/py-openssl/Makefile +++ b/security/py-openssl/Makefile @@ -13,14 +13,13 @@ WWW= https://github.com/pyca/pyopenssl LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.8:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.1:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USES= cpe python +USES= cpe python pycryptography:run USE_PYTHON= autoplist concurrent distutils pythonprefix NO_ARCH= yes diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile index 2301bc4ea5a1..d50723de421e 100644 --- a/security/py-paramiko/Makefile +++ b/security/py-paramiko/Makefile @@ -13,7 +13,6 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.3:security/py-bcrypt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.5:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${PY_FLAVOR} @@ -21,7 +20,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-relaxed>=0:devel/py-pytest-relaxed@${PY_FLAVOR} -USES= cpe pytest:4 python +USES= cpe pytest:4 python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-pgpy/Makefile b/security/py-pgpy/Makefile index 858d8f7ca6e9..05dc7059f343 100644 --- a/security/py-pgpy/Makefile +++ b/security/py-pgpy/Makefile @@ -12,11 +12,10 @@ WWW= https://github.com/SecurityInnovation/PGPy LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-plaso/Makefile b/security/py-plaso/Makefile index 373219618794..1dbfdebac506 100644 --- a/security/py-plaso/Makefile +++ b/security/py-plaso/Makefile @@ -25,7 +25,6 @@ RUN_DEPENDS= libesedb>=e:devel/libesedb \ ${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bencode.py>=0:converters/py-bencode.py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${PY_FLAVOR} \ @@ -53,7 +52,7 @@ RUN_DEPENDS= libesedb>=e:devel/libesedb \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_LOCALE= en_US.UTF-8 USE_PYTHON= distutils autoplist concurrent # Upstream archive contains files with UTF-8 names diff --git a/security/py-pyhanko-certvalidator/Makefile b/security/py-pyhanko-certvalidator/Makefile index 8da3344eef5b..09b39a3bc089 100644 --- a/security/py-pyhanko-certvalidator/Makefile +++ b/security/py-pyhanko-certvalidator/Makefile @@ -14,12 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.1:devel/py-asn1crypto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.1,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oscrypto>=1.1.0:security/py-oscrypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.24.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uritools>=3.0.1:net/py-uritools@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/security/py-pyhanko/Makefile b/security/py-pyhanko/Makefile index f06663f8c409..1340caae646b 100644 --- a/security/py-pyhanko/Makefile +++ b/security/py-pyhanko/Makefile @@ -16,14 +16,13 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.1:devel/py-asn1crypto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=7.1.2:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.1,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyhanko-certvalidator>=0.23<0.24:security/py-pyhanko-certvalidator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qrcode>=6.1:textproc/py-qrcode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.24.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tzlocal>=4.3:devel/py-tzlocal@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/security/py-pysaml2/Makefile b/security/py-pysaml2/Makefile index f5f9afbb6dd3..bbac35fd965b 100644 --- a/security/py-pysaml2/Makefile +++ b/security/py-pysaml2/Makefile @@ -12,8 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.1,1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0,1:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR} \ @@ -24,7 +23,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} -USES= cpe python:3.9+ shebangfix +USES= cpe python:3.9+ pycryptography:run shebangfix USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/security/py-pysaml24/Makefile b/security/py-pysaml24/Makefile index 31de27a3171c..b609d2a470e0 100644 --- a/security/py-pysaml24/Makefile +++ b/security/py-pysaml24/Makefile @@ -13,8 +13,7 @@ WWW= https://github.com/rohe/pysaml2 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.4:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ @@ -28,7 +27,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-pysaml26/Makefile b/security/py-pysaml26/Makefile index 30189587a508..fe57cc89a04a 100644 --- a/security/py-pysaml26/Makefile +++ b/security/py-pysaml26/Makefile @@ -12,8 +12,7 @@ WWW= https://github.com/IdentityPython/pysaml2 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.4:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-resources>=0:devel/py-importlib-resources@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${PY_FLAVOR} \ @@ -29,7 +28,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-pyspnego/Makefile b/security/py-pyspnego/Makefile index c7068359095b..b403ea8ca8b9 100644 --- a/security/py-pyspnego/Makefile +++ b/security/py-pyspnego/Makefile @@ -13,9 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0,1:security/py-cryptography@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes diff --git a/security/py-python-axolotl/Makefile b/security/py-python-axolotl/Makefile index 90b7448dd1c6..f4cfa2b184c9 100644 --- a/security/py-python-axolotl/Makefile +++ b/security/py-python-axolotl/Makefile @@ -10,11 +10,10 @@ WWW= https://github.com/tgalal/python-axolotl LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-axolotl-curve25519>=0:security/py-python-axolotl-curve25519@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-axolotl-curve25519>=0:security/py-python-axolotl-curve25519@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.0:devel/py-protobuf@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-requests-credssp/Makefile b/security/py-requests-credssp/Makefile index 2ea9b93e5f4c..64dc016faa75 100644 --- a/security/py-requests-credssp/Makefile +++ b/security/py-requests-credssp/Makefile @@ -11,14 +11,13 @@ WWW= https://github.com/jborean93/requests-credssp LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.3.1:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspnego>0:security/py-pyspnego@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-securesystemslib/Makefile b/security/py-securesystemslib/Makefile index 2bd01feeecde..58073748c3b8 100644 --- a/security/py-securesystemslib/Makefile +++ b/security/py-securesystemslib/Makefile @@ -12,11 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatchling>0:devel/py-hatchling@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.2:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pynacl>1.2.0:security/py-pynacl@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>1.2.0:security/py-pynacl@${PY_FLAVOR} TEST_DEPENDS= ${LOCALBASE}/bin/gpg:security/gnupg -USES= python pytest shebangfix +USES= python pycryptography:run pytest shebangfix USE_PYTHON= autoplist pep517 PYTEST_ARGS= tests diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile index fbc147dcbc08..fa44c36be546 100644 --- a/security/py-service_identity/Makefile +++ b/security/py-service_identity/Makefile @@ -12,11 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/security/py-social-auth-core/Makefile b/security/py-social-auth-core/Makefile index ac1df805e10f..131605229330 100644 --- a/security/py-social-auth-core/Makefile +++ b/security/py-social-auth-core/Makefile @@ -11,8 +11,7 @@ WWW= https://github.com/python-social-auth/social-core LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0.5.0:devel/py-defusedxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python3-openid>=3.0.10:security/py-python3-openid@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0.0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>=1.0.3:security/py-oauthlib@${PY_FLAVOR} \ @@ -22,7 +21,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httpretty>=0.9.6:www/py-httpretty@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.7.1:devel/py-pytest-cov@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils pytest TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} diff --git a/security/py-sshpubkeys/Makefile b/security/py-sshpubkeys/Makefile index 7b34ecd988b2..0c206146df8f 100644 --- a/security/py-sshpubkeys/Makefile +++ b/security/py-sshpubkeys/Makefile @@ -11,10 +11,9 @@ WWW= https://github.com/ojarva/python-sshpubkeys LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>=0.13:security/py-ecdsa@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-sslyze/Makefile b/security/py-sslyze/Makefile index cd5cd82d47eb..a190953993b8 100644 --- a/security/py-sslyze/Makefile +++ b/security/py-sslyze/Makefile @@ -11,13 +11,12 @@ WWW= https://github.com/nabla-c0d3/sslyze LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6,1<40,1:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}nassl>=5<6:security/py-nassl@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nassl>=5<6:security/py-nassl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydantic>=1.7<1.11:devel/py-pydantic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=20,1<24,1:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tls-parser>=2<3:security/py-tls-parser@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/security/py-stem/Makefile b/security/py-stem/Makefile index 586872f918a5..05aa301fb61e 100644 --- a/security/py-stem/Makefile +++ b/security/py-stem/Makefile @@ -11,12 +11,11 @@ WWW= https://stem.torproject.org/ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= distutils autoplist concurrent NO_ARCH= yes diff --git a/security/py-trustme/Makefile b/security/py-trustme/Makefile index 887c0665bc7e..6728324a85c6 100644 --- a/security/py-trustme/Makefile +++ b/security/py-trustme/Makefile @@ -13,13 +13,12 @@ LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE2 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}idna>=0:dns/py-idna@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=0:dns/py-idna@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils pytest NO_ARCH= yes diff --git a/security/py-txtorcon/Makefile b/security/py-txtorcon/Makefile index 1c47679ee150..6496e1099f17 100644 --- a/security/py-txtorcon/Makefile +++ b/security/py-txtorcon/Makefile @@ -12,12 +12,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface@${PY_FLAVOR} -USES= python shebangfix +USES= python pycryptography:run shebangfix USE_PYTHON= distutils autoplist pytest # 1 test fails, see https://github.com/meejah/txtorcon/issues/376 SHEBANG_FILES= examples/*.py diff --git a/security/py-webauthn/Makefile b/security/py-webauthn/Makefile index 7f4cecdcf7c0..b3ac811a8c46 100644 --- a/security/py-webauthn/Makefile +++ b/security/py-webauthn/Makefile @@ -15,10 +15,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.24.0:devel/py-asn1crypto@${PY_ ${PYTHON_PKGNAMEPREFIX}attrs>=21.2.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cattrs>=1.8.0:devel/py-cattrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cbor2>=4.0.1:devel/py-cbor2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.4.7:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=20.0.1,1:security/py-openssl@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils unittest NO_ARCH= yes diff --git a/security/py-yubikey-manager/Makefile b/security/py-yubikey-manager/Makefile index d7d6fbef13c3..1e0c98ae7bda 100644 --- a/security/py-yubikey-manager/Makefile +++ b/security/py-yubikey-manager/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.6<40,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fido2>0:security/py-fido2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${PY_FLAVOR} \ @@ -26,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}makefun>0:devel/py-makefun@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= dos2unix python +USES= dos2unix python pycryptography:run USE_PYTHON= autoplist concurrent distutils unittest DOS2UNIX_GLOB= *.adoc *.py diff --git a/sysutils/datadog-integrations/Makefile b/sysutils/datadog-integrations/Makefile index 2ad2917c0bf2..f2c728dc4f3e 100644 --- a/sysutils/datadog-integrations/Makefile +++ b/sysutils/datadog-integrations/Makefile @@ -13,7 +13,6 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} RUN_DEPENDS= datadog-agent>=7.24.1:sysutils/datadog-agent \ ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ @@ -26,7 +25,7 @@ RUN_DEPENDS= datadog-agent>=7.24.1:sysutils/datadog-agent \ ${PYTHON_PKGNAMEPREFIX}uptime>0:sysutils/py-uptime@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_GITHUB= yes GH_ACCOUNT= DataDog GH_PROJECT= integrations-core @@ -93,8 +92,7 @@ CONFFILES= DIRECTORY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>0:sysutils/py-scandir@${PY_FLAVOR} DISK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} DNS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} NETWORK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} PHP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR} PROCESS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} @@ -102,8 +100,7 @@ REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR SSH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} SYS_CORE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} SYS_SWAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} -TLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR} +TLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${PY_FLAVOR} .include <bsd.port.options.mk> diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile index 457ff16d9892..ec29c4654a47 100644 --- a/sysutils/py-ansible-core/Makefile +++ b/sysutils/py-ansible-core/Makefile @@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}resolvelib>=0.5.3<1.1.0:devel/py-resolvelib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} @@ -30,7 +29,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ git:devel/git -USES= ansible:env cpe python:3.9+ shebangfix +USES= ansible:env cpe python:3.9+ pycryptography:run shebangfix CPE_VENDOR= redhat CPE_PRODUCT= ansible USE_PYTHON= autoplist concurrent pep517 diff --git a/sysutils/py-azure-cli-core/Makefile b/sysutils/py-azure-cli-core/Makefile index 55a028590ea8..482d7bbb161b 100644 --- a/sysutils/py-azure-cli-core/Makefile +++ b/sysutils/py-azure-cli-core/Makefile @@ -26,11 +26,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=2.0:devel/py-argcomplete@${PY_F ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.5.0.1:sysutils/py-pkginfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-mgmt-core>=1.2.0<2.0.0:devel/py-azure-mgmt-core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.9:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msrestazure>=0.6.4:net-mgmt/py-msrestazure@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} -USES= azurepy python +USES= azurepy python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/sysutils/py-azure-cli/Makefile b/sysutils/py-azure-cli/Makefile index ce6dd02800f9..cb6b1960e0cc 100644 --- a/sysutils/py-azure-cli/Makefile +++ b/sysutils/py-azure-cli/Makefile @@ -97,7 +97,6 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}azure-synapse-managedprivateendpoints>=0.4.0:devel/py-azure-synapse-managedprivateendpoints@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}azure-synapse-spark>=0.2.0:devel/py-azure-synapse-spark@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.4.4:devel/py-colorama@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=2.3.1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fabric>=2.4:devel/py-fabric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0.8:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.4:textproc/py-pygments@${PY_FLAVOR} \ @@ -116,7 +115,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}semver>=2.13.0:devel/py-semver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygithub>=1.55:devel/py-pygithub@${PY_FLAVOR} -USES= azurepy python +USES= azurepy python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/textproc/py-pdfminer.six/Makefile b/textproc/py-pdfminer.six/Makefile index 2053e9ae68b5..d9436e07030a 100644 --- a/textproc/py-pdfminer.six/Makefile +++ b/textproc/py-pdfminer.six/Makefile @@ -11,10 +11,9 @@ WWW= https://github.com/pdfminer/pdfminer.six LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= distutils concurrent autoplist CONFLICTS_INSTALL= py??-pdfminer py??-pdfminer3k diff --git a/www/buku/Makefile b/www/buku/Makefile index e1746135666a..4613845ae505 100644 --- a/www/buku/Makefile +++ b/www/buku/Makefile @@ -12,12 +12,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.23,1:net/py-urllib3@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist distutils noflavors NO_ARCH= yes diff --git a/www/mitmproxy/Makefile b/www/mitmproxy/Makefile index f37b08bd1266..e6dcbcd0429b 100644 --- a/www/mitmproxy/Makefile +++ b/www/mitmproxy/Makefile @@ -18,7 +18,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asgiref>=3.2.10<3.5:www/py-asgiref@${PY_FLAV ${PYTHON_PKGNAMEPREFIX}brotli>=1.0<1.1:archivers/py-brotli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certifi>=2019.9.11:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}click>=7.0<8.1:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3<3.5,1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Flask>=1.1.1<2.1:www/py-flask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h11>=0.11<0.13:net/py-h11@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}h2>=4.0<5:www/py-h2@${PY_FLAVOR} \ @@ -48,7 +47,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_GITHUB= yes USE_PYTHON= autoplist distutils noflavors diff --git a/www/py-autobahn/Makefile b/www/py-autobahn/Makefile index 1538cb6c70b3..291c93fdc69c 100644 --- a/www/py-autobahn/Makefile +++ b/www/py-autobahn/Makefile @@ -11,11 +11,10 @@ WWW= https://github.com/crossbario/autobahn-python LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.4.6:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}hyperlink>=21.0.0:www/py-hyperlink@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hyperlink>=21.0.0:www/py-hyperlink@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}txaio>=21.2.1:devel/py-txaio@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run CPE_VENDOR= crossbar USE_GITHUB= yes GH_ACCOUNT= crossbario diff --git a/www/py-azure-storage/Makefile b/www/py-azure-storage/Makefile index c4723f748392..2482de1a4f05 100644 --- a/www/py-azure-storage/Makefile +++ b/www/py-azure-storage/Makefile @@ -11,11 +11,10 @@ WWW= https://pypi.org/project/azure-storage/ LICENSE= APACHE20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}azure-common>0:www/py-azure-common@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/www/py-flask-jwt-extended/Makefile b/www/py-flask-jwt-extended/Makefile index dc6ec0c04e95..2b125d6d3eb4 100644 --- a/www/py-flask-jwt-extended/Makefile +++ b/www/py-flask-jwt-extended/Makefile @@ -17,10 +17,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} -USES= python +USES= python pycryptography:test USE_PYTHON= autoplist concurrent distutils pytest TEST_ENV= PYTHONPATH=${WRKSRC}/src diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile index c7be7e82455a..b09a82b3c709 100644 --- a/www/py-pyjwt/Makefile +++ b/www/py-pyjwt/Makefile @@ -28,6 +28,6 @@ CPE_VENDOR= pyjwt_project OPTIONS_DEFINE= CRYPTO OPTIONS_DEFAULT=CRYPTO -CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=3.4.0,1:security/py-cryptography@${PY_FLAVOR} +CRYPTO_USES= pycryptography:run .include <bsd.port.mk> diff --git a/www/py-pyjwt1/Makefile b/www/py-pyjwt1/Makefile index 0af7e6477923..87da074d0cb3 100644 --- a/www/py-pyjwt1/Makefile +++ b/www/py-pyjwt1/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # Some tests are skipped without pycrypto, but its not # referenced as a requirement anymore. TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} USES= python @@ -26,7 +25,8 @@ CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}-pyjwt OPTIONS_DEFINE= RSASSA RSASSA_DESC= RSASSA-PKCS1 v1.5 signature support -RSASSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} +RSASSA_USES= pycryptography:run,test +RSASSA_USES_OFF= pycryptography:test NO_ARCH= yes diff --git a/www/py-requests_ntlm/Makefile b/www/py-requests_ntlm/Makefile index 3af4b3afcea2..757378d50ff6 100644 --- a/www/py-requests_ntlm/Makefile +++ b/www/py-requests_ntlm/Makefile @@ -11,11 +11,10 @@ WWW= https://github.com/requests/requests-ntlm LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=1.0.2:security/py-ntlm-auth@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ntlm-auth>=1.0.2:security/py-ntlm-auth@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} -USES= python +USES= python pycryptography:run USE_PYTHON= distutils autoplist NO_ARCH= yes diff --git a/www/py-scrapy/Makefile b/www/py-scrapy/Makefile index af77fdcea9de..f8fb1c5bcef9 100644 --- a/www/py-scrapy/Makefile +++ b/www/py-scrapy/Makefile @@ -11,8 +11,7 @@ WWW= https://scrapy.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9.1:www/py-cssselect@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9.1:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}itemloaders>=1.0.1:devel/py-itemloaders@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parsel>=1.5:textproc/py-parsel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=16.2.0:security/py-openssl@${PY_FLAVOR} \ @@ -25,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.0:security/py-cryptography@$ ${PYTHON_PKGNAMEPREFIX}lxml>=3.5.0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${PY_FLAVOR} -USES= cpe python +USES= cpe python pycryptography:run USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile index 2b314488e03a..1fdf6f21709d 100644 --- a/x11/xpra/Makefile +++ b/x11/xpra/Makefile @@ -17,7 +17,6 @@ LIB_DEPENDS= libbrotlidec.so:archivers/brotli \ RUN_DEPENDS= ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}bencode.py>1:converters/py-bencode.py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}brotli>1:archivers/py-brotli@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ @@ -34,7 +33,7 @@ RUN_DEPENDS= ${PY_PILLOW} \ Xvfb:x11-servers/xorg-server@xvfb USES= desktop-file-utils gettext-runtime gnome localbase pkgconfig \ - python shared-mime-info shebangfix tar:xz xorg + python pycryptography:run shared-mime-info shebangfix tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtk30 pygobject3 USE_PYTHON= cython distutils noflavors |