Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk (revision 560030) +++ Mk/Uses/python.mk (working copy) @@ -644,12 +644,10 @@ # Common Python modules that can be needed but only for some versions of Python. .if ${PYTHON_REL} < 3500 -PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow6>=6.0.0:graphics/py-pillow6@${PY_FLAVOR} PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments-25>=2.5.1<3:textproc/py-pygments-25@${PY_FLAVOR} PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx18>=0,1:textproc/py-sphinx18@${PY_FLAVOR} PY_TYPING= ${PYTHON_PKGNAMEPREFIX}typing>=3.7.4.1:devel/py-typing@${PY_FLAVOR} .else -PY_PILLOW= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} PY_PYGMENTS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.1<3:textproc/py-pygments@${PY_FLAVOR} PY_SPHINX= ${PYTHON_PKGNAMEPREFIX}sphinx>=3.0,1:textproc/py-sphinx@${PY_FLAVOR} PY_TYPING= Index: astro/py-astlib/Makefile =================================================================== --- astro/py-astlib/Makefile (revision 560030) +++ astro/py-astlib/Makefile (working copy) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astropy>=1.1:astro/py-astropy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${PY_FLAVOR} PORTSCOUT= skipv:0.15,0.17,0.17.1 # incorrect versioning upstream Index: audio/lollypop/Makefile =================================================================== --- audio/lollypop/Makefile (revision 560030) +++ audio/lollypop/Makefile (working copy) @@ -17,7 +17,7 @@ ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pylast>=1.4.0:audio/py-pylast@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} LIB_DEPENDS= libnotify.so:devel/libnotify \ libappstream-glib.so:devel/appstream-glib \ libtotem-plparser.so:multimedia/totem-pl-parser Index: cad/k40-whisperer/Makefile =================================================================== --- cad/k40-whisperer/Makefile (revision 560030) +++ cad/k40-whisperer/Makefile (working copy) @@ -14,9 +14,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyusb>0:devel/py-pyusb@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} -USES= python:run,-3.7 shebangfix zip +USES= python:run,3.6-3.7 shebangfix zip SHEBANG_FILES= *.py DESKTOP_ENTRIES= "K40 Whisperer" \ Index: comms/apitran/Makefile =================================================================== --- comms/apitran/Makefile (revision 560030) +++ comms/apitran/Makefile (working copy) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ sox:audio/sox \ display:graphics/ImageMagick6 Index: deskutils/calibre/Makefile =================================================================== --- deskutils/calibre/Makefile (revision 560030) +++ deskutils/calibre/Makefile (working copy) @@ -29,7 +29,7 @@ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ @@ -48,7 +48,7 @@ ${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils \ ${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf Index: deskutils/griffith/Makefile =================================================================== --- deskutils/griffith/Makefile (revision 560030) +++ deskutils/griffith/Makefile (working copy) @@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1:databases/py-sqlalchemy12@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.4:print/py-reportlab@${PY_FLAVOR} USES= gettext-runtime gmake gnome python:3.4+ shebangfix Index: devel/py-asciimatics/Makefile =================================================================== --- devel/py-asciimatics/Makefile (revision 560030) +++ devel/py-asciimatics/Makefile (working copy) @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyfiglet>=0.7.2:misc/py-pyfiglet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${PY_FLAVOR} Index: devel/py-factory-boy/Makefile =================================================================== --- devel/py-factory-boy/Makefile (revision 560030) +++ devel/py-factory-boy/Makefile (working copy) @@ -26,7 +26,7 @@ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}text-unidecode>=0:converters/py-text-unidecode@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: devel/py-pydenticon/Makefile =================================================================== --- devel/py-pydenticon/Makefile (revision 560030) +++ devel/py-pydenticon/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} USES= python:3.6+ Index: devel/py-trimesh/Makefile =================================================================== --- devel/py-trimesh/Makefile (revision 560030) +++ devel/py-trimesh/Makefile (working copy) @@ -22,7 +22,7 @@ ${PYTHON_PKGNAMEPREFIX}svg_path>0:graphics/py-svg.path@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>0:devel/py-msgpack@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} \ Index: finance/odoo/Makefile =================================================================== --- finance/odoo/Makefile (revision 560030) +++ finance/odoo/Makefile (working copy) @@ -36,7 +36,7 @@ ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyusb>=0:devel/py-pyusb@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vatnumber>=0:finance/py-vatnumber@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zeep>=0:net/py-zeep@${PY_FLAVOR} \ Index: games/fretsonfire/Makefile =================================================================== --- games/fretsonfire/Makefile (revision 560030) +++ games/fretsonfire/Makefile (working copy) @@ -17,11 +17,11 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYGAME} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${LOCALBASE}/share/${PORTNAME}/default.ttf:games/fretsonfire-data -USES= dos2unix python +USES= dos2unix python:3.6+ DOS2UNIX_FILES= *.txt NO_BUILD= yes NO_ARCH= yes Index: games/hypatia_engine/Makefile =================================================================== --- games/hypatia_engine/Makefile (revision 560030) +++ games/hypatia_engine/Makefile (working copy) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${PY_FLAVOR} \ ${PY_ENUM34} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: games/openage/Makefile =================================================================== --- games/openage/Makefile (revision 560030) +++ games/openage/Makefile (working copy) @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libfontconfig.so:x11-fonts/fontconfig \ @@ -31,7 +31,7 @@ libnyan.so:lang/nyan RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} USES= cmake compiler:c++17-lang gl python:3.4+ qt:5 sdl shebangfix Index: games/py-mnemosyne/Makefile =================================================================== --- games/py-mnemosyne/Makefile (revision 560030) +++ games/py-mnemosyne/Makefile (working copy) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webob>=1.4:www/py-webob@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cheroot>=0:www/py-cheroot@${PY_FLAVOR} \ Index: games/pysolfc/Makefile =================================================================== --- games/pysolfc/Makefile (revision 560030) +++ games/pysolfc/Makefile (working copy) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}random2>=0:math/py-random2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_DISTFILES_GPLv3+ = ${PYSOLFCDIST} @@ -57,7 +57,7 @@ LICENSE_FILE_GPLv2+ = ${WRKDIR}/${CARDSETDIR}/cardset-1567/COPYRIGHT LICENSE_DISTFILES_GPLv2+ = ${CARDSETDIST} -USES= python shebangfix tar:xz +USES= python:3.6+ shebangfix tar:xz USE_PYTHON= distutils noflavors autoplist SHEBANG_FILES= data/themes/clearlooks/convert_imgs.sh NO_ARCH= yes Index: games/unknown-horizons/Makefile =================================================================== --- games/unknown-horizons/Makefile (revision 560030) +++ games/unknown-horizons/Makefile (working copy) @@ -11,7 +11,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/doc/licenses/GPL -BUILD_DEPENDS= ${PY_PILLOW} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fife>0:games/py-fife@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ Index: graphics/impressive/Makefile =================================================================== --- graphics/impressive/Makefile (revision 560030) +++ graphics/impressive/Makefile (working copy) @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYGAME} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ sdl shebangfix USE_SDL= sdl Index: graphics/py-PyOpenGL/Makefile =================================================================== --- graphics/py-PyOpenGL/Makefile (revision 560030) +++ graphics/py-PyOpenGL/Makefile (working copy) @@ -12,9 +12,9 @@ COMMENT= OpenGL (and related library) interface for Python BUILD_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} OPTIONS_DEFINE= TKINTER OPTIONS_DEFAULT= TKINTER Index: graphics/py-blockdiag/Makefile =================================================================== --- graphics/py-blockdiag/Makefile (revision 560030) +++ graphics/py-blockdiag/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${PY_FLAVOR} Index: graphics/py-cairosvg/Makefile =================================================================== --- graphics/py-cairosvg/Makefile (revision 560030) +++ graphics/py-cairosvg/Makefile (working copy) @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>=0:graphics/py-cairocffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect2>=0:textproc/py-cssselect2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tinycss2>=0:textproc/py-tinycss2@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-isort>=0:devel/py-pytest-isort@${PY_FLAVOR} \ Index: graphics/py-cartopy/Makefile =================================================================== --- graphics/py-cartopy/Makefile (revision 560030) +++ graphics/py-cartopy/Makefile (working copy) @@ -37,10 +37,10 @@ EPSG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyepsg>=0:graphics/py-pyepsg@${PY_FLAVOR} OWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.8.11:graphics/py-OWSLib@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} PLOTTING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdal>=1.10.0:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.1:math/py-matplotlib@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.10:science/py-scipy@${PY_FLAVOR} .include Index: graphics/py-django-easy-thumbnails/Makefile =================================================================== --- graphics/py-django-easy-thumbnails/Makefile (revision 560030) +++ graphics/py-django-easy-thumbnails/Makefile (working copy) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils @@ -27,7 +27,7 @@ OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.8:www/py-django22@${PY_FLAVOR} \ ${PY_SPHINX} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} DOCS_VARS= PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E" post-patch-DOCS-on: Index: graphics/py-face_recognition/Makefile =================================================================== --- graphics/py-face_recognition/Makefile (revision 560030) +++ graphics/py-face_recognition/Makefile (working copy) @@ -18,7 +18,7 @@ ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}face_recognition_models>0:graphics/py-face_recognition_models@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dlib>=19.7:science/py-dlib@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: graphics/py-imageio/Makefile =================================================================== --- graphics/py-imageio/Makefile (revision 560030) +++ graphics/py-imageio/Makefile (working copy) @@ -16,7 +16,7 @@ RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ ${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \ ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils Index: graphics/py-img2pdf/Makefile =================================================================== --- graphics/py-img2pdf/Makefile (revision 560030) +++ graphics/py-img2pdf/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfrw>0:textproc/py-pdfrw@${PY_FLAVOR} USES= python:3.5+ Index: graphics/py-photocollage/Makefile =================================================================== --- graphics/py-photocollage/Makefile (revision 560030) +++ graphics/py-photocollage/Makefile (working copy) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= gettext-tools python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: graphics/py-pyinsane2/Makefile =================================================================== --- graphics/py-pyinsane2/Makefile (revision 560030) +++ graphics/py-pyinsane2/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= gmake python:3.6+ USE_PYTHON= distutils autoplist Index: graphics/py-pyocr/Makefile =================================================================== --- graphics/py-pyocr/Makefile (revision 560030) +++ graphics/py-pyocr/Makefile (working copy) @@ -13,7 +13,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= gmake python:3.4+ USE_PYTHON= distutils autoplist Index: graphics/py-pypillowfight/Makefile =================================================================== --- graphics/py-pypillowfight/Makefile (revision 560030) +++ graphics/py-pypillowfight/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${PY_FLAVOR} -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist Index: graphics/py-scikit-image/Makefile =================================================================== --- graphics/py-scikit-image/Makefile (revision 560030) +++ graphics/py-scikit-image/Makefile (working copy) @@ -16,7 +16,7 @@ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${PY_FLAVOR} \ Index: graphics/py-sorl-thumbnail/Makefile =================================================================== --- graphics/py-sorl-thumbnail/Makefile (revision 560030) +++ graphics/py-sorl-thumbnail/Makefile (working copy) @@ -35,7 +35,7 @@ GRAPHICSMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/gm:graphics/GraphicsMagick IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:graphics/ImageMagick6 -PILLOW_RUN_DEPENDS= ${PY_PILLOW} +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR} Index: graphics/py-willow/Makefile =================================================================== --- graphics/py-willow/Makefile (revision 560030) +++ graphics/py-willow/Makefile (working copy) @@ -27,7 +27,7 @@ WAND_DESC= Use Wand as backend OPENCV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>=0:graphics/py-opencv@${PY_FLAVOR} -PILLOW_RUN_DEPENDS= ${PY_PILLOW} +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} WAND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wand>=0:graphics/py-wand@${PY_FLAVOR} .include Index: graphics/qgis/Makefile =================================================================== --- graphics/qgis/Makefile (revision 560030) +++ graphics/qgis/Makefile (working copy) @@ -77,7 +77,7 @@ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ Index: graphics/qgis-ltr/Makefile =================================================================== --- graphics/qgis-ltr/Makefile (revision 560030) +++ graphics/qgis-ltr/Makefile (working copy) @@ -81,7 +81,7 @@ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=19.1.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ Index: graphics/variety/Makefile =================================================================== --- graphics/variety/Makefile (revision 560030) +++ graphics/variety/Makefile (working copy) @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${PY_FLAVOR} LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 \ libnotify.so:devel/libnotify -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \ Index: lang/mono/Makefile =================================================================== --- lang/mono/Makefile (revision 560030) +++ lang/mono/Makefile (working copy) @@ -20,7 +20,7 @@ bash:shells/bash \ cmake>0:devel/cmake LIB_DEPENDS= libinotify.so:devel/libinotify -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* @@ -40,7 +40,7 @@ X11_USES= display:test USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ - pathfix perl5 python shebangfix tar:bzip2 + pathfix perl5 python:3.6+ shebangfix tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: lang/mono5.10/Makefile =================================================================== --- lang/mono5.10/Makefile (revision 560030) +++ lang/mono5.10/Makefile (working copy) @@ -21,7 +21,7 @@ bash:shells/bash \ cmake>0:devel/cmake LIB_DEPENDS= libinotify.so:devel/libinotify -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ca_root_nss>=0:security/ca_root_nss CONFLICTS_INSTALL= czmq-3* mono5.20 mono6.8 @@ -41,7 +41,7 @@ X11_USES= display:test USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ - pathfix perl5 python shebangfix tar:bzip2 + pathfix perl5 python:3.6+ shebangfix tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: lang/mono5.20/Makefile =================================================================== --- lang/mono5.20/Makefile (revision 560030) +++ lang/mono5.20/Makefile (working copy) @@ -42,7 +42,7 @@ X11_USES= display:test USES= autoreconf bison compiler:c11 cpe gmake iconv libtool \ - pathfix perl5 python shebangfix tar:bzip2 + pathfix perl5 python:3.6+ shebangfix tar:bzip2 USE_PERL5= build GNU_CONFIGURE= yes USE_LDCONFIG= yes Index: math/asymptote/Makefile =================================================================== --- math/asymptote/Makefile (revision 560030) +++ math/asymptote/Makefile (working copy) @@ -19,7 +19,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libsigsegv.so:devel/libsigsegv RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cson>=0.8:devel/py-cson@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= compiler:c++14-lang gettext-runtime ghostscript gl gmake gnome ncurses perl5 python:3.6+ \ pyqt:5 shebangfix tar:tgz Index: math/py-nevergrad/Makefile =================================================================== --- math/py-nevergrad/Makefile (revision 560030) +++ math/py-nevergrad/Makefile (working copy) @@ -34,7 +34,7 @@ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.3:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mixsimulator>=0.2.9.5:math/py-mixsimulator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.23.4,1:math/py-pandas@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Pyomo>=5.7:math/py-Pyomo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.6.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ Index: math/py-plastex/Makefile =================================================================== --- math/py-plastex/Makefile (revision 560030) +++ math/py-plastex/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils Index: math/sage/Makefile =================================================================== --- math/sage/Makefile (revision 560030) +++ math/sage/Makefile (working copy) @@ -74,7 +74,7 @@ ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\ @@ -272,7 +272,7 @@ ${PYTHON_PKGNAMEPREFIX}path.py>0:devel/py-path.py@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pickleshare>0:databases/py-pickleshare@${PY_FLAVOR}\ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}pplpy>0:math/py-pplpy@${PY_FLAVOR}\ ${PYTHON_PKGNAMEPREFIX}prometheus-client>0:net-mgmt/py-prometheus-client@${PY_FLAVOR}\ Index: misc/cs/Makefile =================================================================== --- misc/cs/Makefile (revision 560030) +++ misc/cs/Makefile (working copy) @@ -12,11 +12,11 @@ LICENSE= GPLv2+ -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} NO_BUILD= yes -USES= python:run shebangfix tar:tgz +USES= python:3.6+,run shebangfix tar:tgz SHEBANG_FILES= xs.py PLIST_FILES= bin/xs Index: misc/ironscanner/Makefile =================================================================== --- misc/ironscanner/Makefile (revision 560030) +++ misc/ironscanner/Makefile (working copy) @@ -10,7 +10,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinsane2>0:graphics/py-pyinsane2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} Index: misc/mmdnn/Makefile =================================================================== --- misc/mmdnn/Makefile (revision 560030) +++ misc/mmdnn/Makefile (working copy) @@ -11,11 +11,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}protobuf>=3.6.0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} -USES= python +USES= python:3.6+ USE_GITHUB= yes GH_ACCOUNT= microsoft GH_PROJECT= MMdnn Index: misc/py-gluoncv/Makefile =================================================================== --- misc/py-gluoncv/Makefile (revision 560030) +++ misc/py-gluoncv/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PY_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mxnet>0:misc/py-mxnet@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}portalocker>0:devel/py-portalocker@${PY_FLAVOR} \ Index: misc/py-tflearn/Makefile =================================================================== --- misc/py-tflearn/Makefile (revision 560030) +++ misc/py-tflearn/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tensorflow>0:science/py-tensorflow@${PY_FLAVOR} Index: multimedia/photofilmstrip/Makefile =================================================================== --- multimedia/photofilmstrip/Makefile (revision 560030) +++ multimedia/photofilmstrip/Makefile (working copy) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RUN_DEPENDS= mencoder:multimedia/mencoder \ mplayer:multimedia/mplayer Index: net-im/py-matrix-synapse/Makefile =================================================================== --- net-im/py-matrix-synapse/Makefile (revision 560030) +++ net-im/py-matrix-synapse/Makefile (working copy) @@ -29,7 +29,7 @@ ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.7:devel/py-pyasn1-modules@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bcrypt>=3.1.0:security/py-bcrypt@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.2:security/py-pysaml2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymacaroons>=0.13.0:security/py-pymacaroons@${PY_FLAVOR} \ Index: net-mgmt/netbox/Makefile =================================================================== --- net-mgmt/netbox/Makefile (revision 560030) +++ net-mgmt/netbox/Makefile (working copy) @@ -42,7 +42,7 @@ ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.11<3.5:textproc/py-markdown@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.19<1:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.9.8<4:security/py-pycryptodome@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.5<3:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svgwrite>=1.3.1<2:graphics/py-svgwrite@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1<6:devel/py-yaml@${PY_FLAVOR} \ Index: net-p2p/deluge-cli/Makefile =================================================================== --- net-p2p/deluge-cli/Makefile (revision 560030) +++ net-p2p/deluge-cli/Makefile (working copy) @@ -23,7 +23,7 @@ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rencode>0:converters/py-rencode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \ Index: print/hplip/Makefile =================================================================== --- print/hplip/Makefile (revision 560030) +++ print/hplip/Makefile (working copy) @@ -21,7 +21,7 @@ CONFLICTS_INSTALL= hpijs-[0-9]* INSTALL_TARGET= install-strip -USES= dos2unix jpeg libtool pkgconfig python shebangfix +USES= dos2unix jpeg libtool pkgconfig python:3.6+ shebangfix USE_LDCONFIG= yes SHEBANG_GLOB= *.py hpps pstotiff DOS2UNIX_FILES= scan/sane/orblite.c @@ -51,7 +51,7 @@ FAX_CONFIGURE_ENABLE= fax-build SCAN_DESC= Scanning support -SCAN_RUN_DEPENDS= ${PY_PILLOW} +SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends SCAN_CONFIGURE_ENABLE= scan-build Index: print/py-reportlab/Makefile =================================================================== --- print/py-reportlab/Makefile (revision 560030) +++ print/py-reportlab/Makefile (working copy) @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist Index: science/gramps/Makefile =================================================================== --- science/gramps/Makefile (revision 560030) +++ science/gramps/Makefile (working copy) @@ -42,7 +42,7 @@ GEXIV_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 -PIL_RUN_DEPENDS= ${PY_PILLOW} +PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RCS_RUN_DEPENDS= rcsdiff:devel/rcs TTFFREEFONT_RUN_DEPENDS=${LOCALBASE}/share/fonts/freefont-ttf/FreeMono.ttf:x11-fonts/freefont-ttf Index: science/rdkit/Makefile =================================================================== --- science/rdkit/Makefile (revision 560030) +++ science/rdkit/Makefile (working copy) @@ -19,7 +19,7 @@ libfreetype.so:print/freetype2 \ libmaeparser.so:science/maeparser -USES= bison:build cmake compiler:c++11-lang eigen:3 python +USES= bison:build cmake compiler:c++11-lang eigen:3 python:3.6+ USE_GITHUB= yes GH_TUPLE= rareylab:RingDecomposerLib:v1.1.3_rdkit:RingDecomposerLib/External/RingFamilies/RingDecomposerLib USE_LDCONFIG= yes @@ -43,7 +43,7 @@ PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} Index: security/vinetto/Makefile =================================================================== --- security/vinetto/Makefile (revision 560030) +++ security/vinetto/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PY_PILLOW} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist distutils concurrent optsuffix Index: textproc/py-ocrmypdf/Makefile =================================================================== --- textproc/py-ocrmypdf/Makefile (revision 560030) +++ textproc/py-ocrmypdf/Makefile (working copy) @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.9.1:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coloredlogs>=14.0:devel/py-coloredlogs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}img2pdf>=0.3.0<0.5:graphics/py-img2pdf@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tqdm>=4:misc/py-tqdm@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.4,<4:textproc/py-chardet@${PY_FLAVOR} \ Index: textproc/py-pikepdf/Makefile =================================================================== --- textproc/py-pikepdf/Makefile (revision 560030) +++ textproc/py-pikepdf/Makefile (working copy) @@ -17,7 +17,7 @@ ${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} LIB_DEPENDS= libqpdf.so:print/qpdf RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0:devel/py-lxml@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.1.0:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=4.24<6:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=5:sysutils/py-psutil@${PY_FLAVOR} \ @@ -25,7 +25,7 @@ ${PYTHON_PKGNAMEPREFIX}pytest-helpers-namespace>=2019.1.8:devel/py-pytest-helpers-namespace@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=1.3.3:devel/py-pytest-timeout@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.28,<2:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-xmp-toolkit>=2.0.1:textproc/py-python-xmp-toolkit@${PY_FLAVOR} USES= compiler:c++14-lang python:3.5+ Index: textproc/py-qrcode/Makefile =================================================================== --- textproc/py-qrcode/Makefile (revision 560030) +++ textproc/py-qrcode/Makefile (working copy) @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils Index: textproc/py-wordcloud/Makefile =================================================================== --- textproc/py-wordcloud/Makefile (revision 560030) +++ textproc/py-wordcloud/Makefile (working copy) @@ -13,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${PY_FLAVOR} \ Index: textproc/py-xhtml2pdf/Makefile =================================================================== --- textproc/py-xhtml2pdf/Makefile (revision 560030) +++ textproc/py-xhtml2pdf/Makefile (working copy) @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arabic-reshaper>=2.1.0:textproc/py-arabic-reshaper@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=1.0:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pdf2>=0:print/py-pdf2@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-bidi>=0.4.2:textproc/py-python-bidi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>=3.3.0:print/py-reportlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} Index: www/py-bokeh/Makefile =================================================================== --- www/py-bokeh/Makefile (revision 560030) +++ www/py-bokeh/Makefile (working copy) @@ -17,7 +17,7 @@ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}packaging>=16.8:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=5:www/py-tornado@${PY_FLAVOR} \ Index: www/py-django-filer/Makefile =================================================================== --- www/py-django-filer/Makefile (revision 560030) +++ www/py-django-filer/Makefile (working copy) @@ -19,7 +19,7 @@ ${PYTHON_PKGNAMEPREFIX}django-polymorphic>=0.7<2.2:www/py-django-polymorphic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04<1.2:converters/py-unidecode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils Index: www/py-django-markdownx/Makefile =================================================================== --- www/py-django-markdownx/Makefile (revision 560030) +++ www/py-django-markdownx/Makefile (working copy) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>0:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils Index: www/py-django-mezzanine/Makefile =================================================================== --- www/py-django-mezzanine/Makefile (revision 560030) +++ www/py-django-mezzanine/Makefile (working copy) @@ -24,7 +24,7 @@ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${PY_FLAVOR} Index: www/py-django-photologue/Makefile =================================================================== --- www/py-django-photologue/Makefile (revision 560030) +++ www/py-django-photologue/Makefile (working copy) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django22>=1.11:www/py-django22@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>=3.0.0:www/py-django-sortedm2m@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ExifRead>=2.1.2:graphics/py-exifread@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ # Required as www/py-django-sortedm2m needs Python 3.6+ USE_PYTHON= autoplist distutils Index: www/py-django-simple-captcha/Makefile =================================================================== --- www/py-django-simple-captcha/Makefile (revision 560030) +++ www/py-django-simple-captcha/Makefile (working copy) @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=1.7.0:www/py-django111@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}django-ranged-response>=0.2.0:www/py-django-ranged-response@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils Index: www/py-instabot/Makefile =================================================================== --- www/py-instabot/Makefile (revision 560030) +++ www/py-instabot/Makefile (working copy) @@ -20,7 +20,7 @@ ${PYTHON_PKGNAMEPREFIX}idna>=2.8:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=3.0.5:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}moviepy>=1.0.1:multimedia/py-moviepy@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysocks>=1.7.1:net/py-pysocks@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2019.3:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ Index: www/py-pywikibot/Makefile =================================================================== --- www/py-pywikibot/Makefile (revision 560030) +++ www/py-pywikibot/Makefile (working copy) @@ -37,7 +37,7 @@ GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>0:www/py-google@${PY_FLAVOR} IRC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${PY_FLAVOR} MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>0:textproc/py-mwparserfromhell@${PY_FLAVOR} -PILLOW_RUN_DEPENDS= ${PY_PILLOW} +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} MWOAUTH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwoauth>0:www/py-mwoauth@${PY_FLAVOR} HTML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${PY_FLAVOR} Index: www/py-sentinelhub/Makefile =================================================================== --- www/py-sentinelhub/Makefile (revision 560030) +++ www/py-sentinelhub/Makefile (working copy) @@ -19,7 +19,7 @@ ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.2.0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${PY_FLAVOR} \ Index: www/py-wagtail/Makefile =================================================================== --- www/py-wagtail/Makefile (revision 560030) +++ www/py-wagtail/Makefile (working copy) @@ -23,7 +23,7 @@ ${PYTHON_PKGNAMEPREFIX}draftjs-exporter>=2.1.5:www/py-draftjs-exporter@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999<2:www/py-html5lib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}l18n>=2018.5:devel/py-l18n@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14<2.0:converters/py-unidecode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}willow>=1.4<1.5:graphics/py-willow@${PY_FLAVOR} \ Index: www/py-weboob/Makefile =================================================================== --- www/py-weboob/Makefile (revision 560030) +++ www/py-weboob/Makefile (working copy) @@ -18,7 +18,7 @@ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} Index: www/seahub/Makefile =================================================================== --- www/seahub/Makefile (revision 560030) +++ www/seahub/Makefile (working copy) @@ -31,7 +31,7 @@ ${PYTHON_PKGNAMEPREFIX}djangorestframework311>=0:www/py-djangorestframework311@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR} Index: www/twms/Makefile =================================================================== --- www/twms/Makefile (revision 560030) +++ www/twms/Makefile (working copy) @@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyproj>0:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}webpy>0:www/webpy@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \ ${FREESANS}:x11-fonts/freefont-ttf Index: www/xist/Makefile =================================================================== --- www/xist/Makefile (revision 560030) +++ www/xist/Makefile (working copy) @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py-cssutils@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py-lxml@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ tar:bzip2 USE_PYTHON= autoplist distutils Index: x11/cinnamon/Makefile =================================================================== --- x11/cinnamon/Makefile (revision 560030) +++ x11/cinnamon/Makefile (working copy) @@ -28,7 +28,7 @@ cinnamon-control-center:sysutils/cinnamon-control-center \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ Index: x11/py-pyscreenshot/Makefile =================================================================== --- x11/py-pyscreenshot/Makefile (revision 560030) +++ x11/py-pyscreenshot/Makefile (working copy) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${PY_FLAVOR} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ import:graphics/ImageMagick6 USES= python:3.6+ Index: x11/py-pyvirtualdisplay/Makefile =================================================================== --- x11/py-pyvirtualdisplay/Makefile (revision 560030) +++ x11/py-pyvirtualdisplay/Makefile (working copy) @@ -19,7 +19,7 @@ ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyscreenshot>0:x11/py-pyscreenshot@${PY_FLAVOR} \ ${PY_SPHINX} \ - ${PY_PILLOW} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ xauth>0:x11/xauth USES= python:3.6+ Index: x11/xpra/Makefile =================================================================== --- x11/xpra/Makefile (revision 560030) +++ x11/xpra/Makefile (working copy) @@ -13,7 +13,7 @@ BUILD_DEPENDS= brotli:archivers/brotli LIB_DEPENDS= libwebp.so:graphics/webp -RUN_DEPENDS= ${PY_PILLOW} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} \ ${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} \ Index: x11-toolkits/py-easygui/Makefile =================================================================== --- x11-toolkits/py-easygui/Makefile (revision 560030) +++ x11-toolkits/py-easygui/Makefile (working copy) @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ - ${PY_PILLOW} + ${PYTHON_PKGNAMEPREFIX}pillow>=7.0.0:graphics/py-pillow@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist