From 68ee05468834865fbe8e6ad21b9419de595a2750 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Sun, 3 Jan 2021 09:11:52 +0000 Subject: [PATCH] Remove python 2.7 support from a few ports --- devel/boost-python-libs/Makefile | 2 +- devel/mercurial/Makefile | 2 +- devel/py-backports/Makefile | 2 +- devel/py-capstone/Makefile | 2 +- devel/py-cycler/Makefile | 2 +- devel/py-dateutil/Makefile | 2 +- devel/py-lxml/Makefile | 2 +- devel/py-olefile/Makefile | 2 +- devel/py-polib/Makefile | 2 +- devel/py-prettytable0/Makefile | 2 +- devel/py-pyasn1-modules/Makefile | 2 +- devel/py-pyasn1/Makefile | 2 +- devel/py-pycerberus/Makefile | 2 +- devel/py-wheel/Makefile | 2 +- devel/pydbus-common/Makefile | 2 +- devel/pygobject3-common/Makefile | 2 +- graphics/py-cairo/Makefile | 2 +- math/py-kiwisolver/Makefile | 2 +- math/py-numpy/Makefile | 2 +- net/py-ldap/Makefile | 2 +- security/py-bcrypt/Makefile | 2 +- security/py-paramiko/Makefile | 2 +- security/py-pynacl/Makefile | 2 +- textproc/py-genshi/Makefile | 11 ++--------- textproc/py-markdown/Makefile | 2 +- textproc/py-sphinxcontrib-adadomain/Makefile | 2 +- textproc/py-xlrd/Makefile | 2 +- 27 files changed, 28 insertions(+), 35 deletions(-) diff --git a/devel/boost-python-libs/Makefile b/devel/boost-python-libs/Makefile index a03f88fdeba8..eb58864f41f3 100644 --- a/devel/boost-python-libs/Makefile +++ b/devel/boost-python-libs/Makefile @@ -11,7 +11,7 @@ BUILD_DEPENDS= bjam:devel/boost-jam \ ${PYNUMPY} LIB_DEPENDS= libboost_thread.so:devel/boost-libs -USES= python +USES= python:3.6+ USE_PYTHON= flavors OPTIONS_DEFINE= DEBUG OPTIMIZED_CFLAGS diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 93527ff4fa21..947973502e92 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -13,7 +13,7 @@ COMMENT= Fast, lightweight source control management system LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe python shebangfix +USES= cpe python:3.6+ shebangfix SHEBANG_FILES= contrib/hgweb.fcgi hgweb.cgi USE_PYTHON= autoplist distutils diff --git a/devel/py-backports/Makefile b/devel/py-backports/Makefile index dcb3a8c4b02f..996d9cbfc554 100644 --- a/devel/py-backports/Makefile +++ b/devel/py-backports/Makefile @@ -11,7 +11,7 @@ COMMENT= Shared namespace shim for py-backports.* ports LICENSE= MIT -USES= python +USES= python:3.6+ USE_PYTHON= flavors py3kplist NO_ARCH= yes diff --git a/devel/py-capstone/Makefile b/devel/py-capstone/Makefile index 439c7ab7e803..5a30b82e3f7b 100644 --- a/devel/py-capstone/Makefile +++ b/devel/py-capstone/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LIB_DEPENDS= libcapstone.so:devel/capstone4 -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils MAKE_ENV+= LIBCAPSTONE_PATH= # Prevent bundled libcapstone from being built diff --git a/devel/py-cycler/Makefile b/devel/py-cycler/Makefile index 433012ab05f0..dcd5c95662b9 100644 --- a/devel/py-cycler/Makefile +++ b/devel/py-cycler/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD2CLAUSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-dateutil/Makefile b/devel/py-dateutil/Makefile index 4f66ca7c2438..538229a86d37 100644 --- a/devel/py-dateutil/Makefile +++ b/devel/py-dateutil/Makefile @@ -20,7 +20,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.30:devel/py-hypothesis@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_LOCALE= en_US.UTF-8 USE_PYTHON= autoplist distutils diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile index 8ba66a92bc15..402f499d9e7b 100644 --- a/devel/py-lxml/Makefile +++ b/devel/py-lxml/Makefile @@ -13,7 +13,7 @@ COMMENT= Pythonic binding for the libxml2 and libxslt libraries LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/doc/licenses/BSD.txt -USES= compiler gnome python uniquefiles:dirs +USES= compiler gnome python:3.6+ uniquefiles:dirs USE_GNOME= libxml2 libxslt USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-olefile/Makefile b/devel/py-olefile/Makefile index c3697e74101a..c93db527ec1b 100644 --- a/devel/py-olefile/Makefile +++ b/devel/py-olefile/Makefile @@ -15,7 +15,7 @@ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES= python zip +USES= python:3.6+ zip USE_PYTHON= distutils autoplist TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} diff --git a/devel/py-polib/Makefile b/devel/py-polib/Makefile index 29aca59e1f36..69f08a46193e 100644 --- a/devel/py-polib/Makefile +++ b/devel/py-polib/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wg@FreeBSD.org COMMENT= Python library to parse and manage gettext catalogs -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include diff --git a/devel/py-prettytable0/Makefile b/devel/py-prettytable0/Makefile index 7d826e983aff..15627d326be0 100644 --- a/devel/py-prettytable0/Makefile +++ b/devel/py-prettytable0/Makefile @@ -14,7 +14,7 @@ COMMENT= Library for displaying tabular data in an ASCII table format LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/py-pyasn1-modules/Makefile b/devel/py-pyasn1-modules/Makefile index d11b6d75708a..187258f8d299 100644 --- a/devel/py-pyasn1-modules/Makefile +++ b/devel/py-pyasn1-modules/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.4.1:devel/py-pyasn1@${PY_FLAVOR} OPTIONS_DEFINE= DOCS -USES= python shebangfix +USES= python:3.6+ shebangfix SHEBANG_FILES= tools/*.py USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-pyasn1/Makefile b/devel/py-pyasn1/Makefile index 1a22b070a013..7112ae0b9344 100644 --- a/devel/py-pyasn1/Makefile +++ b/devel/py-pyasn1/Makefile @@ -13,7 +13,7 @@ COMMENT= ASN.1 toolkit for Python LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils NO_ARCH= yes diff --git a/devel/py-pycerberus/Makefile b/devel/py-pycerberus/Makefile index f52fa752ab55..c622dc418858 100644 --- a/devel/py-pycerberus/Makefile +++ b/devel/py-pycerberus/Makefile @@ -13,7 +13,7 @@ COMMENT= Highly flexible, no magic input validation library LICENSE= MIT NO_ARCH= yes -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils .include diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index 359030055bc9..1792c782fbc3 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -24,7 +24,7 @@ SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec@${ ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist .include diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile index 8518f3b971c4..f3247cf9c96f 100644 --- a/devel/pydbus-common/Makefile +++ b/devel/pydbus-common/Makefile @@ -65,7 +65,7 @@ do-install-HTMLDOCS-on: LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS+= pydbus-common>=0:devel/pydbus-common USE_LDCONFIG= yes -USES+= python +USES+= python:3.6+ USE_PYTHON= flavors py3kplist post-install: diff --git a/devel/pygobject3-common/Makefile b/devel/pygobject3-common/Makefile index 9af1825f3c59..8ebf5ef30d52 100644 --- a/devel/pygobject3-common/Makefile +++ b/devel/pygobject3-common/Makefile @@ -56,7 +56,7 @@ LIB_DEPENDS+= libffi.so:devel/libffi RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common .if ${SLAVE_PORT} == python -USES+= python +USES+= python:3.6+ USE_PYTHON= flavors py3kplist BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index 0f48811dce3f..a400f42577fd 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -20,7 +20,7 @@ LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 PORTSCOUT= limitw:1,even -USES= compiler:c11 gnome pkgconfig python +USES= compiler:c11 gnome pkgconfig python:3.6+ USE_PYTHON= distutils py3kplist USE_GNOME= cairo diff --git a/math/py-kiwisolver/Makefile b/math/py-kiwisolver/Makefile index 35defc375f00..f5a50a736e6c 100644 --- a/math/py-kiwisolver/Makefile +++ b/math/py-kiwisolver/Makefile @@ -12,7 +12,7 @@ COMMENT= Fast implementation of the Cassowary constraint solver LICENSE= BSD3CLAUSE -USES= compiler:c++11-lang python +USES= compiler:c++11-lang python:3.6+ USE_PYTHON= autoplist concurrent distutils .include diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index e06ff0931d52..707fa4673d8b 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} -USES= compiler:c11 fortran python zip +USES= compiler:c11 fortran python:3.6+ zip USE_PYTHON= allflavors autoplist concurrent cython distutils GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so// diff --git a/net/py-ldap/Makefile b/net/py-ldap/Makefile index cdc4698de6a6..b289bc053288 100644 --- a/net/py-ldap/Makefile +++ b/net/py-ldap/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${PY_FLAVOR} CONFLICTS_INSTALL= py27-pyldap -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils USE_OPENLDAP= yes WANT_OPENLDAP_VER= 24 diff --git a/security/py-bcrypt/Makefile b/security/py-bcrypt/Makefile index 176045b5c9ee..14bdc631c659 100644 --- a/security/py-bcrypt/Makefile +++ b/security/py-bcrypt/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils do-test: diff --git a/security/py-paramiko/Makefile b/security/py-paramiko/Makefile index c6114eca4f44..a3ec598334d6 100644 --- a/security/py-paramiko/Makefile +++ b/security/py-paramiko/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.3:security/py-bcrypt@${PY_FLAVOR TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}paramiko1 diff --git a/security/py-pynacl/Makefile b/security/py-pynacl/Makefile index df3c02603374..be5dbd11b951 100644 --- a/security/py-pynacl/Makefile +++ b/security/py-pynacl/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.27.0:devel/py-hypothesis@${PY_FLAVOR} -USES= python localbase +USES= python:3.6+ localbase USE_PYTHON= autoplist distutils OPTIONS_DEFINE= BUNDLED_NACL diff --git a/textproc/py-genshi/Makefile b/textproc/py-genshi/Makefile index c6552e551ba1..baf7d484e5cc 100644 --- a/textproc/py-genshi/Makefile +++ b/textproc/py-genshi/Makefile @@ -13,7 +13,7 @@ COMMENT= Toolkit for generation of output for the web LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= BABEL @@ -24,13 +24,6 @@ BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=0.8:devel/py-babel@${PY_FLAVOR} do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include - -.if ${PYTHON_VER} < 3.3 -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/genshi/*.so -.else NO_ARCH= yes -.endif -.include +.include diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index 26e7a5acc2d9..e8346c1c6784 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -21,7 +21,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes diff --git a/textproc/py-sphinxcontrib-adadomain/Makefile b/textproc/py-sphinxcontrib-adadomain/Makefile index 7a6b8e1a9ac1..72f282a2390b 100644 --- a/textproc/py-sphinxcontrib-adadomain/Makefile +++ b/textproc/py-sphinxcontrib-adadomain/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= ${PY_SPHINX} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/textproc/py-xlrd/Makefile b/textproc/py-xlrd/Makefile index bda716067f8a..bd58d4427c07 100644 --- a/textproc/py-xlrd/Makefile +++ b/textproc/py-xlrd/Makefile @@ -13,7 +13,7 @@ COMMENT= Reading data and formatting information from Excel files LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python +USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes