Skip to content

Commit 3754fc5

Browse files
committed
*: Replace USES=pycryptography* with USE_PYTHON=cryptography{,_build,_test}
- Introduce USE_PYTHON=cryptography{,_build,_test} - Switch all 96 ports from USES=pycryptography to with USE_PYTHON=cryptography{,_build,_test} - Remove Mk/Uses/pycryptography.mk PR: 273727 Approved by: tcberner (portmgr) Exp-run by: antoine
1 parent 2a4bb83 commit 3754fc5

File tree

98 files changed

+216
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+216
-231
lines changed

‎Mk/Uses/pycryptography.mk‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎Mk/Uses/python.mk‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,14 @@
8282
# prefix-less original name, e.g.
8383
# bin/foo-2.7 --> bin/foo.
8484
#
85+
# cryptography_build
86+
# - Depend on security/cryptography at build-time.
87+
#
88+
# cryptography - Depend on security/cryptography at run-time.
89+
#
90+
# cryptography_test
91+
# - Depend on security/cryptography at test-time.
92+
#
8593
# cython - Depend on lang/cython at build-time.
8694
#
8795
# cython_run - Depend on lang/cython at run-time.
@@ -317,6 +325,9 @@ _PYTHON_RELPORTDIR= lang/python
317325
_VALID_PYTHON_FEATURES= allflavors \
318326
autoplist \
319327
concurrent \
328+
cryptography_build \
329+
cryptography \
330+
cryptography_test \
320331
cython \
321332
cython_run \
322333
cython_test \
@@ -597,6 +608,25 @@ _PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp
597608
# - it uses USE_PYTHON=distutils
598609
#
599610

611+
# cryptography* support
612+
. if ${PYCRYPTOGRAPHY_DEFAULT} == rust
613+
CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=41.0.3_1,1:security/py-cryptography@${PY_FLAVOR}
614+
. else
615+
CRYPTOGRAPHY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-legacy>=3.4.8_1,1:security/py-cryptography-legacy@${PY_FLAVOR}
616+
. endif
617+
618+
. if defined(_PYTHON_FEATURE_CRYPTOGRAPHY_BUILD)
619+
BUILD_DEPENDS+= ${CRYPTOGRAPHY_DEPENDS}
620+
. endif
621+
622+
. if defined(_PYTHON_FEATURE_CRYPTOGRAPHY)
623+
RUN_DEPENDS+= ${CRYPTOGRAPHY_DEPENDS}
624+
. endif
625+
626+
. if defined(_PYTHON_FEATURE_CRYPTOGRAPHY_TEST)
627+
TEST_DEPENDS+= ${CRYPTOGRAPHY_DEPENDS}
628+
. endif
629+
600630
# cython* support
601631
. if defined(_PYTHON_FEATURE_CYTHON)
602632
BUILD_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}

‎cad/uranium/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
1616
${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
1717
${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR}
1818

19-
USES= cmake gettext python pycryptography:run pyqt:5
19+
USES= cmake gettext python pyqt:5
2020
USE_PYQT= pyqt5
21+
USE_PYTHON= cryptography
2122
USE_GITHUB= yes
2223
GH_ACCOUNT= Ultimaker
2324
STRIP=

‎comms/py-esptool/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR}
1818
${PYTHON_PKGNAMEPREFIX}reedsolo>=1.5.3,<=1.6.0:devel/py-reedsolo@${PY_FLAVOR}
1919
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
2020

21-
USES= python pycryptography:run
21+
USES= python
2222
USE_GITHUB= yes
23-
USE_PYTHON= autoplist concurrent distutils pytest
23+
USE_PYTHON= autoplist concurrent cryptography distutils pytest
2424

2525
GH_ACCOUNT= espressif
2626
NO_ARCH= yes

‎databases/py-mycli/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.2.1:devel/py-cli-helpers@${PY
2323
${PYTHON_PKGNAMEPREFIX}sqlglot>=5.1.3:databases/py-sqlglot@${PY_FLAVOR} \
2424
${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.5.0:databases/py-sqlparse@${PY_FLAVOR}
2525

26-
USES= mysql pycryptography:run python
27-
USE_PYTHON= autoplist concurrent distutils
26+
USES= mysql python
27+
USE_PYTHON= autoplist concurrent cryptography distutils
2828

2929
NO_ARCH= yes
3030

‎databases/py-ormar/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT= SQLITE
3333
DATABASES_DESC= Database Support
3434

3535
CRYPTO_DESC= Support for password encryption
36-
CRYPTO_USES= pycryptography:run
36+
CRYPTO_USE= PYTHON=cryptography
3737
SQLITE_USES= sqlite
3838
SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiosqlite>0:databases/py-aiosqlite@${PY_FLAVOR}
3939
MYSQL_USES= mysql

‎databases/py-sqlalchemy-utils/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ URL_DESC= URL type support
3434
ARROW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.3.4:devel/py-arrow@${PY_FLAVOR}
3535
BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR}
3636
COLOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colour>=0.0.4:graphics/py-colour@${PY_FLAVOR}
37-
ENCRYPTED_USES= pycryptography:run
37+
ENCRYPTED_USE= PYTHON=cryptography
3838
INTERVALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervals>=0.7.1:net/py-intervals@${PY_FLAVOR}
3939
PASSWORD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6<2.0:security/py-passlib@${PY_FLAVOR}
4040
PENDULUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pendulum>=2.0.5:devel/py-pendulum@${PY_FLAVOR}

‎devel/oci-cli/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=1.0.0:devel/py-arrow@${PY_FLAVOR} \
2929
${PYTHON_PKGNAMEPREFIX}six>=1.15.0:devel/py-six@${PY_FLAVOR} \
3030
${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${PY_FLAVOR}
3131

32-
USES= python:3.8-3.11 pycryptography:run
33-
USE_PYTHON= autoplist concurrent distutils
32+
USES= python:3.8-3.11
33+
USE_PYTHON= autoplist concurrent cryptography distutils
3434

3535
NO_ARCH= yes
3636

‎devel/osc/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
1212

1313
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR}
1414

15-
USES= cpe python pycryptography:run
15+
USES= cpe python
1616
USE_GITHUB= yes
1717
GH_ACCOUNT= openSUSE
18-
USE_PYTHON= autoplist distutils noflavors pytest
18+
USE_PYTHON= autoplist cryptography distutils noflavors pytest
1919
NO_ARCH= yes
2020
CPE_VENDOR= suse
2121
CPE_PRODUCT= opensuse_osc

‎devel/py-adb/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ USE_GITHUB= yes
1717
GH_ACCOUNT= google
1818
GH_PROJECT= python-${PORTNAME}
1919

20-
USES= python pycryptography:run
21-
USE_PYTHON= autoplist distutils pytest
20+
USES= python
21+
USE_PYTHON= autoplist cryptography distutils pytest
2222

2323
NO_ARCH= yes
2424

0 commit comments

Comments
 (0)