From 4348c5c61c7386bc577195cea806f204f3d4c60c Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Sat, 2 Jan 2021 22:45:42 +0000 Subject: [PATCH] Remove some more expired ports: devel/py-backports.functools_lru_cache devel/py-backports_abc devel/py-futures devel/py-singledispatch devel/py-typing graphics/py-pillow6 Adjust dependent ports. Tested with 'make index' against r559975 --- MOVED | 6 ++ deskutils/dosage/Makefile | 6 +- devel/Makefile | 5 -- devel/py-arrow/Makefile | 8 +- .../py-backports.functools_lru_cache/Makefile | 29 ------- .../py-backports.functools_lru_cache/distinfo | 3 - .../pkg-descr | 5 -- devel/py-backports_abc/Makefile | 20 ----- devel/py-backports_abc/distinfo | 3 - devel/py-backports_abc/pkg-descr | 3 - devel/py-futures/Makefile | 27 ------- devel/py-futures/distinfo | 3 - devel/py-futures/pkg-descr | 8 -- devel/py-graphene-sqlalchemy/Makefile | 8 +- devel/py-jaraco.functools2/Makefile | 12 +-- devel/py-numba/Makefile | 2 - devel/py-singledispatch/Makefile | 23 ------ devel/py-singledispatch/distinfo | 2 - devel/py-singledispatch/pkg-descr | 10 --- devel/py-typing/Makefile | 23 ------ devel/py-typing/distinfo | 3 - devel/py-typing/pkg-descr | 8 -- graphics/Makefile | 1 - graphics/py-pillow6/Makefile | 80 ------------------- graphics/py-pillow6/distinfo | 3 - graphics/py-pillow6/pkg-descr | 5 -- multimedia/py-librtmp/Makefile | 8 +- print/py-fonttools3/Makefile | 6 -- textproc/py-nltk/Makefile | 2 - textproc/py-sphinx18/Makefile | 2 +- www/py-cheroot/Makefile | 25 +----- www/py-pecan/Makefile | 21 +---- www/py-soupsieve/Makefile | 8 +- www/py-tornado4/Makefile | 13 +-- x11-fonts/py-ufoLib/Makefile | 17 +--- 35 files changed, 24 insertions(+), 384 deletions(-) delete mode 100644 devel/py-backports.functools_lru_cache/Makefile delete mode 100644 devel/py-backports.functools_lru_cache/distinfo delete mode 100644 devel/py-backports.functools_lru_cache/pkg-descr delete mode 100644 devel/py-backports_abc/Makefile delete mode 100644 devel/py-backports_abc/distinfo delete mode 100644 devel/py-backports_abc/pkg-descr delete mode 100644 devel/py-futures/Makefile delete mode 100644 devel/py-futures/distinfo delete mode 100644 devel/py-futures/pkg-descr delete mode 100644 devel/py-singledispatch/Makefile delete mode 100644 devel/py-singledispatch/distinfo delete mode 100644 devel/py-singledispatch/pkg-descr delete mode 100644 devel/py-typing/Makefile delete mode 100644 devel/py-typing/distinfo delete mode 100644 devel/py-typing/pkg-descr delete mode 100644 graphics/py-pillow6/Makefile delete mode 100644 graphics/py-pillow6/distinfo delete mode 100644 graphics/py-pillow6/pkg-descr diff --git a/MOVED b/MOVED index 4587e6bf6408..3b0515e49d7a 100644 --- a/MOVED +++ b/MOVED @@ -16007,3 +16007,9 @@ print/xfce4-print||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support x11/xfce4-quicklauncher-plugin||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support x11/xfce4-wmdock-plugin||2021-01-02|Unmaintained, depends on dropped XFCE GTK2 support x11-toolkits/libxfce4gui||2012-01-02|Unmaintained, depends on dropped XFCE GTK2 support +devel/py-backports.functools_lru_cache||2020-01-02|Uses Python 2.7 which is EOLed upstream +devel/py-backports_abc||2020-01-02|Uses Python 2.7 which is EOLed upstream +devel/py-futures||2020-01-02|Uses Python 2.7 which is EOLed upstream +devel/py-singledispatch||2020-01-02|Uses Python 2.7 which is EOLed upstream +devel/py-typing||2020-01-02|Python 2 only, backport of Python 3 +graphics/py-pillow6|graphics/pillow|2020-01-02|Uses Python 2.7 which is EOLed upstream diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile index bcfe40acd821..2bc565bae3bf 100644 --- a/deskutils/dosage/Makefile +++ b/deskutils/dosage/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= distutils autoplist noflavors NO_ARCH= yes @@ -30,9 +30,5 @@ NO_ARCH= yes RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>0:devel/py-cached-property@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} .endif -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>0:devel/py-backports.shutil_get_terminal_size@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${PY_FLAVOR} -.endif .include diff --git a/devel/Makefile b/devel/Makefile index 32bd6c8c0ee7..bd74c335c637 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4155,8 +4155,6 @@ SUBDIR += py-backcall SUBDIR += py-backports SUBDIR += py-backports.csv - SUBDIR += py-backports.functools_lru_cache - SUBDIR += py-backports_abc SUBDIR += py-banal SUBDIR += py-bandit SUBDIR += py-bcdoc @@ -4402,7 +4400,6 @@ SUBDIR += py-furl SUBDIR += py-fusepy SUBDIR += py-future - SUBDIR += py-futures SUBDIR += py-futurist SUBDIR += py-futurist1 SUBDIR += py-fuzzywuzzy @@ -5041,7 +5038,6 @@ SUBDIR += py-simpleparse SUBDIR += py-simpletal SUBDIR += py-simpy - SUBDIR += py-singledispatch SUBDIR += py-sip SUBDIR += py-six SUBDIR += py-smmap @@ -5128,7 +5124,6 @@ SUBDIR += py-txaio SUBDIR += py-typechecks SUBDIR += py-typed-ast - SUBDIR += py-typing SUBDIR += py-typing-extensions SUBDIR += py-typing-inspect SUBDIR += py-tzlocal diff --git a/devel/py-arrow/Makefile b/devel/py-arrow/Makefile index daec91d29076..102e588aef77 100644 --- a/devel/py-arrow/Makefile +++ b/devel/py-arrow/Makefile @@ -19,10 +19,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.2.1:devel/py-backports.functools_lru_cache@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-backports.functools_lru_cache/Makefile b/devel/py-backports.functools_lru_cache/Makefile deleted file mode 100644 index 9a87b971023a..000000000000 --- a/devel/py-backports.functools_lru_cache/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $FreeBSD$ - -PORTNAME= backports.functools_lru_cache -PORTVERSION= 1.5 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Backport of functools.lru_cache from Python 3.3 - -LICENSE= MIT - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}backports>=0:devel/py-backports@${PY_FLAVOR} - -NO_ARCH= yes -USE_PYTHON= autoplist distutils -USES= python:2.7 - -POST_PLIST= trim-backports-namespace - -post-install: - @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/backports/__init__.py* - -trim-backports-namespace: - @${REINPLACE_CMD} '/backports\/__init__.py*/d' ${TMPPLIST} - -.include diff --git a/devel/py-backports.functools_lru_cache/distinfo b/devel/py-backports.functools_lru_cache/distinfo deleted file mode 100644 index e6cd82841686..000000000000 --- a/devel/py-backports.functools_lru_cache/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1517844657 -SHA256 (backports.functools_lru_cache-1.5.tar.gz) = 9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a -SIZE (backports.functools_lru_cache-1.5.tar.gz) = 7891 diff --git a/devel/py-backports.functools_lru_cache/pkg-descr b/devel/py-backports.functools_lru_cache/pkg-descr deleted file mode 100644 index f086a226dff6..000000000000 --- a/devel/py-backports.functools_lru_cache/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -backports.functools_lru_cache is a backport of functools.lru_cache from Python -3.3 as published at ActiveState. - -WWW: https://pypi.org/project/backports.functools_lru_cache/ -WWW: https://github.com/jaraco/backports.functools_lru_cache diff --git a/devel/py-backports_abc/Makefile b/devel/py-backports_abc/Makefile deleted file mode 100644 index c72a9c997c95..000000000000 --- a/devel/py-backports_abc/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Grzegorz Blach -# $FreeBSD$ - -PORTNAME= backports_abc -PORTVERSION= 0.5 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= sunpoet@FreeBSD.org -COMMENT= Backport of recent additions to the 'collections.abc' module - -LICENSE= PSFL - -USES= python:2.7 -USE_PYTHON= autoplist distutils - -NO_ARCH= yes - -.include diff --git a/devel/py-backports_abc/distinfo b/devel/py-backports_abc/distinfo deleted file mode 100644 index fc86c4466250..000000000000 --- a/devel/py-backports_abc/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1479034599 -SHA256 (backports_abc-0.5.tar.gz) = 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde -SIZE (backports_abc-0.5.tar.gz) = 9807 diff --git a/devel/py-backports_abc/pkg-descr b/devel/py-backports_abc/pkg-descr deleted file mode 100644 index e3554ced923e..000000000000 --- a/devel/py-backports_abc/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A backport of recent additions to the 'collections.abc' module. - -WWW: https://github.com/cython/backports_abc diff --git a/devel/py-futures/Makefile b/devel/py-futures/Makefile deleted file mode 100644 index b612642b2098..000000000000 --- a/devel/py-futures/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -PORTNAME= futures -PORTVERSION= 3.3.0 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= koobs@FreeBSD.org -COMMENT= Backport of the concurrent.futures package from Python 3 - -LICENSE= PSFL -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= python:2.7 -USE_PYTHON= autoplist distutils - -NO_ARCH= yes - -# Some tests require 256 semaphores. Set the following sysctl(8) -# before running tests: sysctl p1003_1b.sem_nsems_max=512 - -do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} test_futures.py - -.include diff --git a/devel/py-futures/distinfo b/devel/py-futures/distinfo deleted file mode 100644 index 0678dcdc3ac7..000000000000 --- a/devel/py-futures/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1583297763 -SHA256 (futures-3.3.0.tar.gz) = 7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794 -SIZE (futures-3.3.0.tar.gz) = 28729 diff --git a/devel/py-futures/pkg-descr b/devel/py-futures/pkg-descr deleted file mode 100644 index 04a54b4b0443..000000000000 --- a/devel/py-futures/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -Backport of the concurrent.futures package from Python 3.2 - -The concurrent.futures module provides a high-level interface for -asynchronously executing callables. - -This is described in PEP-3148 and is included in Python 3.2+ - -WWW: https://github.com/agronholm/pythonfutures diff --git a/devel/py-graphene-sqlalchemy/Makefile b/devel/py-graphene-sqlalchemy/Makefile index 385ecdf96e24..344454ac8390 100644 --- a/devel/py-graphene-sqlalchemy/Makefile +++ b/devel/py-graphene-sqlalchemy/Makefile @@ -23,10 +23,4 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3<4:devel/py-singledispatch@${PY_FLAVOR} -.endif - -.include +.include diff --git a/devel/py-jaraco.functools2/Makefile b/devel/py-jaraco.functools2/Makefile index 861a3e04a8a9..ce358c161c11 100644 --- a/devel/py-jaraco.functools2/Makefile +++ b/devel/py-jaraco.functools2/Makefile @@ -27,17 +27,7 @@ POST_PLIST= trim-jaraco-namespace # jaraco.functools 3.0.0+ requires Python 3.6+ PORTSCOUT= limit:^2\. -.include - -.if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=1.0.3:devel/py-backports.functools_lru_cache@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} >= 3400 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>=2.7:devel/py-more-itertools5@${PY_FLAVOR} -.endif post-install: @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/jaraco/__init__.py* @@ -47,4 +37,4 @@ post-install: trim-jaraco-namespace: @${REINPLACE_CMD} '/jaraco\/__init__\./d; /jaraco\/__pycache__\/__init__\./d' ${TMPPLIST} -.include +.include diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile index 81301dbdb7e2..981298929f17 100644 --- a/devel/py-numba/Makefile +++ b/devel/py-numba/Makefile @@ -17,8 +17,6 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.11,1:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libtbb.so:devel/tbb RUN_DEPENDS= ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.31.0:devel/py-llvmlite@${PY_FLAVOR} -py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${PY_FLAVOR} USES= compiler:c++11-lang python:3.6+ fortran localbase USE_PYTHON= distutils concurrent autoplist diff --git a/devel/py-singledispatch/Makefile b/devel/py-singledispatch/Makefile deleted file mode 100644 index 5e159f65f06a..000000000000 --- a/devel/py-singledispatch/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Juergen Lock -# $FreeBSD$ - -PORTNAME= singledispatch -PORTVERSION= 3.4.0.3 -PORTREVISION= 1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= python@FreeBSD.org -COMMENT= Backport of functools.singledispatch from Python 3.4 - -LICENSE= MIT - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} - -USES= python:2.7 -USE_PYTHON= distutils concurrent autoplist - -NO_ARCH= yes - -.include diff --git a/devel/py-singledispatch/distinfo b/devel/py-singledispatch/distinfo deleted file mode 100644 index a11a008dad49..000000000000 --- a/devel/py-singledispatch/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (singledispatch-3.4.0.3.tar.gz) = 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c -SIZE (singledispatch-3.4.0.3.tar.gz) = 9529 diff --git a/devel/py-singledispatch/pkg-descr b/devel/py-singledispatch/pkg-descr deleted file mode 100644 index 949aaea97e88..000000000000 --- a/devel/py-singledispatch/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -This library brings functools.singledispatch from Python 3.4 to -Python 2.6-3.3. - -PEP 443 proposed to expose a mechanism in the functools standard -library module in Python 3.4 that provides a simple form of generic -programming known as single-dispatch generic functions. - -This library is a backport of this functionality to Python 2.6 - 3.3. - -WWW: https://pypi.org/project/singledispatch/ diff --git a/devel/py-typing/Makefile b/devel/py-typing/Makefile deleted file mode 100644 index 8038990a705d..000000000000 --- a/devel/py-typing/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# $FreeBSD$ - -PORTNAME= typing -PORTVERSION= 3.7.4.1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= rm@FreeBSD.org -COMMENT= Type Hints for Python - -LICENSE= PSFL -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Python 2 only, backport of Python 3 -EXPIRATION_DATE= 2020-12-31 - -USES= python:2.7 -USE_PYTHON= autoplist distutils - -NO_ARCH= yes - -.include diff --git a/devel/py-typing/distinfo b/devel/py-typing/distinfo deleted file mode 100644 index 3c152f961ff8..000000000000 --- a/devel/py-typing/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1582223012 -SHA256 (typing-3.7.4.1.tar.gz) = 91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23 -SIZE (typing-3.7.4.1.tar.gz) = 77982 diff --git a/devel/py-typing/pkg-descr b/devel/py-typing/pkg-descr deleted file mode 100644 index bd205715df0f..000000000000 --- a/devel/py-typing/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This is a backport of the standard library typing module to Python -versions older than 3.5. -Typing defines a standard notation for Python function and variable type -annotations. The notation can be used for documenting code in a concise, -standard format, and it has been designed to also be used by static and -runtime type checkers, static analyzers, IDEs and other tools. - -WWW: https://pypi.org/project/typing/ diff --git a/graphics/Makefile b/graphics/Makefile index c0ac0fe4f5c2..c1535b1593ba 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -855,7 +855,6 @@ SUBDIR += py-photocollage SUBDIR += py-piexif SUBDIR += py-pillow - SUBDIR += py-pillow6 SUBDIR += py-pivy SUBDIR += py-plotly SUBDIR += py-png diff --git a/graphics/py-pillow6/Makefile b/graphics/py-pillow6/Makefile deleted file mode 100644 index af1b8e04cf0f..000000000000 --- a/graphics/py-pillow6/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -PORTNAME= pillow -PORTVERSION= 6.2.2 -CATEGORIES= graphics python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 6 - -MAINTAINER= koobs@FreeBSD.org -COMMENT= Fork of the Python Imaging Library (PIL) - -LICENSE= PIL -LICENSE_NAME= Standard PIL License -LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} - -USES= cpe python:2.7 -USE_GITHUB= yes -USE_PYTHON= autoplist concurrent distutils - -GH_ACCOUNT= python-${PORTNAME} -GH_PROJECT= ${PORTNAME:C/p/P/} - -OPTIONS_DEFINE= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP -OPTIONS_DEFAULT= FREETYPE JPEG JPEG2000 LCMS OLE PNG TIFF TKINTER WEBP - -LCMS_DESC= Little Color Management System -OLE_DESC= Microsoft OLE2 file format support -TKINTER_DESC= Tkinter (Tcl/Tk) BitmapImage & PhotoImage support - -FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 -FREETYPE_VARS= PYDISTUTILS_BUILDARGS+=--enable-freetype -FREETYPE_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-freetype - -JPEG_USES= jpeg -JPEG_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg -JPEG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg - -JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg -JPEG2000_VARS= PYDISTUTILS_BUILDARGS+=--enable-jpeg2000 -JPEG2000_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-jpeg2000 - -LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 -LCMS_VARS= PYDISTUTILS_BUILDARGS+=--enable-lcms -LCMS_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-lcms - -OLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}olefile>0:devel/py-olefile@${PY_FLAVOR} - -PNG_VARS= PYDISTUTILS_BUILDARGS+=--enable-zlib -PNG_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-zlib - -TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff -TIFF_VARS= PYDISTUTILS_BUILDARGS+=--enable-tiff -TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff - -TKINTER_USES= tk -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} -TKINTER_VARS= PYDISTUTILS_BUILDARGS+="--include-dirs=${TCL_INCLUDEDIR}:${TK_INCLUDEDIR}" - -WEBP_LIB_DEPENDS= libwebp.so:graphics/webp -WEBP_VARS= PYDISTUTILS_BUILDARGS+="--enable-webp --enable-webpmux" -WEBP_VARS_OFF= PYDISTUTILS_BUILDARGS+="--disable-webp --disable-webpmux" - -.include - -PYDISTUTILS_BUILD_TARGET= build build_ext -PYDISTUTILS_BUILDARGS+= saveopts - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PIL/*.so - -do-test: - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test - -.include diff --git a/graphics/py-pillow6/distinfo b/graphics/py-pillow6/distinfo deleted file mode 100644 index 22f4c9a333ee..000000000000 --- a/graphics/py-pillow6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1579047758 -SHA256 (python-pillow-Pillow-6.2.2_GH0.tar.gz) = cc4ec754ddcc98b7166a1afe062c6355c841776145f0f23bdd3bea1eaa41e2db -SIZE (python-pillow-Pillow-6.2.2_GH0.tar.gz) = 37538464 diff --git a/graphics/py-pillow6/pkg-descr b/graphics/py-pillow6/pkg-descr deleted file mode 100644 index 0249c5723e14..000000000000 --- a/graphics/py-pillow6/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Pillow is the "friendly" PIL fork. PIL is the Python Imaging Library. Pillow -was started for and is currently maintained by the Plone community. But it is -used by many other folks in the Python web community. - -WWW: https://python-pillow.org/ diff --git a/multimedia/py-librtmp/Makefile b/multimedia/py-librtmp/Makefile index afe7ee535fc8..f6afc4c061d7 100644 --- a/multimedia/py-librtmp/Makefile +++ b/multimedia/py-librtmp/Makefile @@ -24,13 +24,7 @@ LDFLAGS+= -L${LOCALBASE}/lib USES= python:3.6+ USE_PYTHON= autoplist distutils -.include - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${PY_FLAVOR} -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/librtmp/_librtmp*.so -.include +.include diff --git a/print/py-fonttools3/Makefile b/print/py-fonttools3/Makefile index 5ec4ca591119..43e73ffb3139 100644 --- a/print/py-fonttools3/Makefile +++ b/print/py-fonttools3/Makefile @@ -48,12 +48,6 @@ WOFF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_ .include -.if ${PORT_OPTIONS:MLXML} -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3:devel/py-singledispatch@${PY_FLAVOR} -.endif -.endif - .if ${PORT_OPTIONS:MUNICODE} .if ${PYTHON_REL} < 3800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unicodedata2>=12.0.0:devel/py-unicodedata2@${PY_FLAVOR} diff --git a/textproc/py-nltk/Makefile b/textproc/py-nltk/Makefile index f42bac7ebd63..03f1ce5b1ccd 100644 --- a/textproc/py-nltk/Makefile +++ b/textproc/py-nltk/Makefile @@ -17,8 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} -py27_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} - USES= python:3.6+ zip USE_PYTHON= distutils autoplist diff --git a/textproc/py-sphinx18/Makefile b/textproc/py-sphinx18/Makefile index 86ddc6a6d3f3..c5c78a23e3b4 100644 --- a/textproc/py-sphinx18/Makefile +++ b/textproc/py-sphinx18/Makefile @@ -44,7 +44,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>=0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_PYTHON= autoplist distutils concurrent CONFLICTS_INSTALL= py*-sphinx diff --git a/www/py-cheroot/Makefile b/www/py-cheroot/Makefile index 9ecab7bd1661..7f056560b5e6 100644 --- a/www/py-cheroot/Makefile +++ b/www/py-cheroot/Makefile @@ -15,30 +15,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.6:devel/py-more-itertools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=0:devel/py-jaraco.functools@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools5>=2.6:devel/py-more-itertools5@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}selectors2>=0:devel/py-selectors2@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.6:devel/py-more-itertools@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.functools2>=0:devel/py-jaraco.functools2@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}jaraco.functools>=0:devel/py-jaraco.functools@${PY_FLAVOR} -.endif - -.include +.include diff --git a/www/py-pecan/Makefile b/www/py-pecan/Makefile index 7415c4c2b2af..53f95b4741c2 100644 --- a/www/py-pecan/Makefile +++ b/www/py-pecan/Makefile @@ -21,8 +21,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${PY_FLAVOR} \ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} - + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist concurrent @@ -31,19 +31,4 @@ NO_ARCH= yes do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} setup.py test) -.include - -.if ${PYTHON_VER} < 3.4 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${PY_FLAVOR} -.endif - -.if ${PYTHON_VER} < 3.0 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi@${PY_FLAVOR} -# To be ported -# ${PYTHON_PKGNAMEPREFIX}kajiki>0:textproc/py-kajiki@${PY_FLAVOR} -.else -# Genshi added Python3 (< 3.5) support in 0.7 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${PY_FLAVOR} -.endif - -.include +.include diff --git a/www/py-soupsieve/Makefile b/www/py-soupsieve/Makefile index 85e15929296b..c07d4cdc05c6 100644 --- a/www/py-soupsieve/Makefile +++ b/www/py-soupsieve/Makefile @@ -22,13 +22,7 @@ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include - -.if ${PYTHON_VER} < 3 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${PY_FLAVOR} -.endif - do-test: cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -.include +.include diff --git a/www/py-tornado4/Makefile b/www/py-tornado4/Makefile index 6f635fc0a1d4..b271c58b239a 100644 --- a/www/py-tornado4/Makefile +++ b/www/py-tornado4/Makefile @@ -19,21 +19,10 @@ USE_PYTHON= autoplist concurrent distutils CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}tornado \ ${PYTHON_PKGNAMEPREFIX}tornado6 -.include - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${PY_FLAVOR} -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/tornado/speedups*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m tornado.test.runtests -.include +.include diff --git a/x11-fonts/py-ufoLib/Makefile b/x11-fonts/py-ufoLib/Makefile index 700558d27da8..b3ac45d4ea30 100644 --- a/x11-fonts/py-ufoLib/Makefile +++ b/x11-fonts/py-ufoLib/Makefile @@ -13,23 +13,12 @@ COMMENT= Low-level Unified Font Object (UFO) reader and writer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-lxml@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.1.2:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3:devel/py-singledispatch@${PY_FLAVOR} -.endif - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.1.2:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.1.2:print/py-fonttools@${PY_FLAVOR} -.endif - -.include +.include