Index: CHANGES =================================================================== --- CHANGES +++ CHANGES @@ -10,6 +10,29 @@ All ports committers are allowed to commit to this file. +20171115: +AUTHOR: mat@FreeBSD.org + + Ports using USE_PYTHON=distutils are now flavored. They will automatically + get flavors (py27, py34, py35, py36) depending on what versions they support. + + There is also a USE_PYTHON=flavors for ports that do not use distutils but + need FLAVORS to be set. A USE_PYTHON=noflavors can be set if using distutils + but flavors are not wanted. + + A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been added + to cope with Python ports that did not have the Python PKGNAMEPREFIX but are + flavored. + + USES=python now also exports a PY_FLAVOR variable that contains the current + python flavor. It can be used in dependency lines when the port itself is + not python flavored. For example, deskutils/calibre. + + By default it will only generate flavors for the versions in PYTHON2_DEFAULT + and PYTHON3_DEFAULT. Define BUILD_ALL_PYTHON_FLAVORS in your make.conf to + generate all possible flavors. A port can set USE_PYTHON=allflavors to have + all the flavors and not simply the default ones. + 20171114: AUTHOR: mat@FreeBSD.org Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -7656,7 +7656,6 @@ graphics/sng||2015-07-21|Has expired: Broken for more than 6 months japanese/netype||2015-07-21|Has expired: Broken for more than 6 months databases/p5-DBD-Pg32|databases/p5-DBD-Pg|2015-07-22|Has expired: Use databases/p5-DBD-Pg instead, compatibility probles are fixed -textproc/py-asciinema|textproc/asciinema|2015-07-23|Has expired: use textproc/asciinema instead devel/libiomp5-devel|devel/llvm-devel|2015-07-24|Merged with devel/llvm-devel devel/p5-Test-Tester|devel/p5-Test-Simple|2015-07-25|Has expired: Part of p5-Test-Simple (use that instead), and included in perl 5.22 devel/p5-Test-use-ok|devel/p5-Test-Simple|2015-07-25|Has expired: Part of devel/p5-Test-Simple (use that instead), and included in perl 5.22 @@ -9099,7 +9098,6 @@ devel/avr-gcc-devel||2017-03-13|Has expired: There's no longer a point to have both, a -devel and a regular port of GCC for the AVR net/py-pysimplesoap|net/py-soap2py|2017-03-13|Rename to match upstream naming games/trigger-data|games/trigger-rally|2017-03-15|Merged into games/trigger-rally -devel/py-setuptools|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports devel/py-setuptools27|devel/py27-setuptools|2017-03-16|Renamed to better match other python ports devel/py-setuptools33|devel/py33-setuptools|2017-03-16|Renamed to better match other python ports devel/py-setuptools34|devel/py34-setuptools|2017-03-16|Renamed to better match other python ports Index: Mk/Uses/gnome.mk =================================================================== --- Mk/Uses/gnome.mk +++ Mk/Uses/gnome.mk @@ -388,14 +388,15 @@ pygobject_RUN_DEPENDS= pygobject-codegen-2.0:devel/py-gobject pygobject_USE_GNOME_IMPL= glib20 +# Have to keep two components because the _DETECT file is not the same. py3gobject3_DETECT= ${LOCALBASE}/share/py3gobject3/.keep -py3gobject3_BUILD_DEPENDS= py3?-gobject3>=0:devel/py3-gobject3 -py3gobject3_RUN_DEPENDS= py3?-gobject3>=0:devel/py3-gobject3 +py3gobject3_BUILD_DEPENDS= py3?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} +py3gobject3_RUN_DEPENDS= py3?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} py3gobject3_USE_GNOME_IMPL= glib20 pygobject3_DETECT= ${LOCALBASE}/share/pygobject3/.keep -pygobject3_BUILD_DEPENDS= py2?-gobject3>=0:devel/py-gobject3 -pygobject3_RUN_DEPENDS= py2?-gobject3>=0:devel/py-gobject3 +pygobject3_BUILD_DEPENDS= py2?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} +pygobject3_RUN_DEPENDS= py2?-gobject3>=0:devel/py-gobject3@${PY_FLAVOR} pygobject3_USE_GNOME_IMPL= glib20 pygtk2_DETECT= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc Index: Mk/Uses/pyqt.mk =================================================================== --- Mk/Uses/pyqt.mk +++ Mk/Uses/pyqt.mk @@ -241,8 +241,8 @@ _USE_PYQT_ALL+= ${_USE_PYQT${_PYQT_VERSION}_ONLY} .for comp in ${_USE_PYQT_ALL:O:u} _USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run -py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT} -py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT} +py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} +py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${py-${comp}_PORT}@${PY_FLAVOR} py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS} py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS} .endfor Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk +++ Mk/Uses/python.mk @@ -71,8 +71,24 @@ # prefix-less original name, e.g. # bin/foo-2.7 --> bin/foo. # +# cython - Depend on lang/cython at build-time. +# +# cython_run - Depend on lang/cython at run-time. +# +# flavors - Force creation of flavors for Python 2 and 3 default +# versions, where applicable. +# +# noflavors - Disable automatic creation of flavors if they would +# otherwise be created and they are not wanted. +# +# allflavors - Generate flavors for all possible versions and not +# simply the default ones. +# +# optsuffix - Set PKGNAMESUFFIX to PYTHON_PKGNAMESUFFIX if not the +# default python version. +# # distutils - Use distutils as do-configure, do-build and -# do-install targets. +# do-install targets. implies flavors. # # autoplist - Automatically generates the packaging list for a # port that uses distutils when defined. @@ -235,9 +251,19 @@ # Make each individual feature available as _PYTHON_FEATURE_ .for var in ${USE_PYTHON} -_PYTHON_FEATURE_${var:tu}= yes +_PYTHON_FEATURE_${var:C/=.*$//:tu}= ${var:C/.*=//:S/,/ /g} .endfor +# distutils automatically generates flavors depending on the supported +# versions. +.if defined(_PYTHON_FEATURE_DISTUTILS) +_PYTHON_FEATURE_FLAVORS= yes +.endif + +.if defined(_PYTHON_FEATURE_NOFLAVORS) +.undef _PYTHON_FEATURE_FLAVORS +.endif + # Make sure that no dependency or some other environment variable # pollutes the build/run dependency detection .undef _PYTHON_BUILD_DEP @@ -307,6 +333,7 @@ PYTHON3_DEFAULT_VERSION?= python${PYTHON3_DEFAULT} .endif +# Keep this before the FLAVOR selection to get the meta port dependency. .if ${_PYTHON_ARGS} == "2" _PYTHON_ARGS= ${PYTHON2_DEFAULT_VERSION:S/^python//} _WANTS_META_PORT= 2 @@ -372,6 +399,60 @@ .endif .endif # defined(_PYTHON_VERSION_NONSUPPORTED) +# Automatically generates FLAVORS if empty +.if empty(FLAVORS) && defined(_PYTHON_FEATURE_FLAVORS) +. undef _VALID_PYTHON_VERSIONS +. for ver in ${PYTHON_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON3_DEFAULT} ${_PYTHON_VERSIONS} +__VER= ${ver} +. if !(!empty(_PYTHON_VERSION_MINIMUM) && ( \ + ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && \ + !(!empty(_PYTHON_VERSION_MAXIMUM) && ( \ + ${__VER} > ${_PYTHON_VERSION_MAXIMUM})) +. if empty(_VALID_PYTHON_VERSIONS:M${ver}) +_VALID_PYTHON_VERSIONS+= ${ver} +. endif +. endif +. endfor +# Get all possible flavors depending on version requirements +. if defined(_VALID_PYTHON_VERSIONS) +_ALL_PYTHON_FLAVORS= ${_VALID_PYTHON_VERSIONS:S/.//:S/^/py/} +. else +_ALL_PYTHON_FLAVORS= ${_PYTHON_VERSIONS:S/.//:S/^/py/} +. endif +# Decide how many flavors we want. By default, only generate the default +# versions. +. if defined(BUILD_ALL_PYTHON_FLAVORS) || defined(_PYTHON_FEATURE_ALLFLAVORS) +FLAVORS= ${_ALL_PYTHON_FLAVORS} +. else +. for _v in ${PYTHON3_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON_DEFAULT} +_f= py${_v:S/.//} +. if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}} +FLAVORS:= ${_f} ${FLAVORS} +. endif +. endfor +. endif +. if !empty(FLAVORS) && empty(FLAVOR) +FLAVOR= ${FLAVORS:[1]} +. endif +.endif + +.if ${FLAVOR:Mpy[23]*} +_PYTHON_VERSION= ${FLAVOR:S/py//:C/(.)/\1./} +.endif + +.if !empty(FLAVOR) && ${_PYTHON_VERSION} != ${PYTHON_DEFAULT} +.if defined(_PYTHON_FEATURE_OPTSUFFIX) +PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} +.endif +.endif + +# To avoid having dependencies with @ and empty flavor: +.if empty(FLAVOR) +PY_FLAVOR= ${PYTHON_VERSION:S/^python/py/:S/.//} +.else +PY_FLAVOR= ${FLAVOR} +.endif + # Pass PYTHON_VERSION down the dependency chain. This ensures that # port A -> B -> C all will use the same python version and do not # try to find a different one, if the passed version fits into @@ -460,6 +541,14 @@ # - it uses USE_PYTHON=distutils # +.if defined(_PYTHON_FEATURE_CYTHON) +BUILD_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} +.endif + +.if defined(_PYTHON_FEATURE_CYTHON_RUN) +RUN_DEPENDS+= cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR} +.endif + .if defined(_PYTHON_FEATURE_CONCURRENT) _USES_POST+= uniquefiles:dirs .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} @@ -483,8 +572,8 @@ _CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} .if defined(_PYTHON_FEATURE_DISTUTILS) && \ ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} .endif # distutils support @@ -565,9 +654,32 @@ CMAKE_ARGS+= -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER} # Python 3rd-party modules -PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game -PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:math/py-numeric -PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy +PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} +PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:math/py-numeric@${PY_FLAVOR} +PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy@${PY_FLAVOR} + +# Common Python modules that can be needed but only for some versions of Python. +.if ${PYTHON_REL} < 3400 +PY_ENUM34= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR} +PY_ENUM_COMPAT= ${PYTHON_PKGNAMEPREFIX}enum-compat>0:devel/py-enum-compat@${PY_FLAVOR} +PY_PATHLIB= ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${PY_FLAVOR} +.else +PY_ENUM34= +PY_ENUM_COMPAT= +PY_PATHLIB= +.endif + +.if ${PYTHON_REL} < 3300 +PY_IPADDRESS= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@${PY_FLAVOR} +.else +PY_IPADDRESS= +.endif + +.if ${PYTHON_REL} < 3200 +PY_FUTURES= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR} +.else +PY_FUTURES= +.endif # dependencies .if defined(_PYTHON_BUILD_DEP) Index: UPDATING =================================================================== --- UPDATING +++ UPDATING @@ -5,6 +5,20 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20171121: + AFFECTS: */py* + AUTHOR: mat@FreeBSD.org + + Ports using Python via USES=python are now flavored. All the py3-* ports + have been removed and folded into their py-* master ports. + + People using Poudriere and binary packages do not have anything to do. + + For other people, to build the Python 3.6 version of, for example, + databases/py-gdbm, you need to run: + + # make FLAVOR=py36 install + 20171126: AFFECTS: users of security/p5-openxpki AUTHOR: dbaio@FreeBSD.org Index: accessibility/Makefile =================================================================== --- accessibility/Makefile +++ accessibility/Makefile @@ -23,8 +23,7 @@ SUBDIR += orca SUBDIR += py-atspi SUBDIR += py-papi - SUBDIR += py3-atspi - SUBDIR += py3-speech-dispatcher + SUBDIR += py-speech-dispatcher SUBDIR += qt4-accessible SUBDIR += redshift SUBDIR += rubygem-atk Index: accessibility/accerciser/Makefile =================================================================== --- accessibility/accerciser/Makefile +++ accessibility/accerciser/Makefile @@ -19,7 +19,7 @@ at-spi2-core>=2.1.5:accessibility/at-spi2-core NO_ARCH= yes -USES= gettext gmake pkgconfig python:3 shebangfix tar:xz +USES= gettext gmake pkgconfig python:3.4+ shebangfix tar:xz USE_GNOME= gtk30 intlhack py3gobject3 INSTALLS_ICONS= yes GNU_CONFIGURE= yes Index: accessibility/caribou/Makefile =================================================================== --- accessibility/caribou/Makefile +++ accessibility/caribou/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libclutter-glx-1.0.so:graphics/clutter \ libgee-0.8.so:devel/libgee \ libxklavier.so:x11/libxklavier -RUN_DEPENDS= py2?-atspi>=2.1.91:accessibility/py-atspi +RUN_DEPENDS= py2?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR} USES= gettext gmake gnome libtool pathfix pkgconfig python:2 \ shebangfix tar:xz Index: accessibility/orca/Makefile =================================================================== --- accessibility/orca/Makefile +++ accessibility/orca/Makefile @@ -10,16 +10,16 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Scriptable screen reader -BUILD_DEPENDS= py3?-dbus>=0:devel/py3-dbus \ - py3?-xdg>=0:devel/py3-xdg \ - py3?-cairo>=0:graphics/py3-cairo \ +BUILD_DEPENDS= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \ + py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} \ itstool:textproc/itstool LIB_DEPENDS= libatspi.so:accessibility/at-spi2-core -RUN_DEPENDS= py3?-dbus>=0:devel/py3-dbus \ - py3?-speech-dispatcher>=0:accessibility/py3-speech-dispatcher \ - py3?-atspi>=0:accessibility/py3-atspi \ - py3?-xdg>=0:devel/py3-xdg \ - py3?-cairo>=0:graphics/py3-cairo +RUN_DEPENDS= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + py3?-speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \ + py3?-atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \ + py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \ + py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} # conflict with py*-json-py because orca uses the json from python itself # and py*-json-py shadows this. @@ -27,7 +27,7 @@ PORTSCOUT= limitw:1,even NO_ARCH= yes -USES= gettext gmake gnome pathfix pkgconfig python:3 tar:xz +USES= gettext gmake gnome pathfix pkgconfig python:3.4+ tar:xz USE_GNOME= gtk30 py3gobject3 intlhack INSTALLS_ICONS= yes GNU_CONFIGURE= yes Index: accessibility/py-atspi/Makefile =================================================================== --- accessibility/py-atspi/Makefile +++ accessibility/py-atspi/Makefile @@ -19,8 +19,16 @@ CONFLICTS= at-spi-1.[0-9]* PORTSCOUT= limitw:1,even -USES= gettext gmake gnome localbase pathfix pkgconfig python:2 tar:xz +USES= gettext gmake gnome localbase pathfix pkgconfig python tar:xz +USE_PYTHON= flavors +.if ${FLAVOR:Upy27:Mpy2*} USE_GNOME= intlhack pygobject3 +.else +USE_GNOME= intlhack py3gobject3 +.endif +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 GNU_CONFIGURE= yes .include Index: accessibility/py3-atspi/Makefile =================================================================== --- accessibility/py3-atspi/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: Maxim Sobolev -# $FreeBSD$ - -PORTNAME= atspi -PORTVERSION= 2.24.0 -CATEGORIES= accessibility x11-toolkits python -MASTER_SITES= GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= pyatspi-${PORTVERSION} -DIST_SUBDIR= gnome3 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python3 API for the D-BUS based SPI framework - -LICENSE= LGPL20 - -RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:accessibility/at-spi2-core - -CONFLICTS= at-spi-1.[0-9]* -PORTSCOUT= limitw:1,even - -NO_ARCH= yes -USES= gettext gmake gnome localbase pathfix pkgconfig python:3 tar:xz -USE_GNOME= intlhack py3gobject3 -GNU_CONFIGURE= yes - -.include Index: accessibility/py3-atspi/distinfo =================================================================== --- accessibility/py3-atspi/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1491080637 -SHA256 (gnome3/pyatspi-2.24.0.tar.xz) = e7ef47a5d387fdc64a01722ef2bcced54c4d6b225fbe34867189e1f88ff0a692 -SIZE (gnome3/pyatspi-2.24.0.tar.xz) = 298228 Index: accessibility/py3-atspi/pkg-descr =================================================================== --- accessibility/py3-atspi/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This is the Gnome Accessibility Project's Assistive Technology -Service Provider Interface. It allows accessibility applications -and assistive technologies to announce their respective existence -to each other. - -This port is the Python API to interface with the D-BUS based SPI framework. - -WWW: http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus Index: accessibility/py3-atspi/pkg-plist =================================================================== --- /dev/null +++ accessibility/py3-atspi/pkg-plist @@ -1,72 +0,0 @@ -%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.py -%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/Accessibility.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/action.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/appevent.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/application.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/atspienum.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/atspienum.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/collection.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/component.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/constants.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/deviceevent.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/document.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/editabletext.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/hypertext.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/image.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/interface.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/registry.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/role.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/selection.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/state.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/tablecell.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/text.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pyatspi/__pycache__/value.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pyatspi/action.py -%%PYTHON_SITELIBDIR%%/pyatspi/appevent.py -%%PYTHON_SITELIBDIR%%/pyatspi/application.py -%%PYTHON_SITELIBDIR%%/pyatspi/atspienum.py -%%PYTHON_SITELIBDIR%%/pyatspi/collection.py -%%PYTHON_SITELIBDIR%%/pyatspi/component.py -%%PYTHON_SITELIBDIR%%/pyatspi/constants.py -%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.py -%%PYTHON_SITELIBDIR%%/pyatspi/document.py -%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.py -%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.py -%%PYTHON_SITELIBDIR%%/pyatspi/image.py -%%PYTHON_SITELIBDIR%%/pyatspi/interface.py -%%PYTHON_SITELIBDIR%%/pyatspi/registry.py -%%PYTHON_SITELIBDIR%%/pyatspi/role.py -%%PYTHON_SITELIBDIR%%/pyatspi/selection.py -%%PYTHON_SITELIBDIR%%/pyatspi/state.py -%%PYTHON_SITELIBDIR%%/pyatspi/table.py -%%PYTHON_SITELIBDIR%%/pyatspi/tablecell.py -%%PYTHON_SITELIBDIR%%/pyatspi/text.py -%%PYTHON_SITELIBDIR%%/pyatspi/utils.py -%%PYTHON_SITELIBDIR%%/pyatspi/value.py Index: accessibility/py3-speech-dispatcher/Makefile =================================================================== --- /dev/null +++ accessibility/py3-speech-dispatcher/Makefile @@ -1,18 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 0 -CATEGORIES= accessibility audio python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -COMMENT= Python bindings for Speech Dispatcher - -SPEECH_SLAVE= yes - -MASTERDIR= ${.CURDIR:H}/speech-dispatcher - -BUILD_WRKSRC= ${WRKSRC}/src/api/python -INSTALL_WRKSRC= ${BUILD_WRKSRC} - -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: accessibility/py3-speech-dispatcher/pkg-plist =================================================================== --- /dev/null +++ accessibility/py3-speech-dispatcher/pkg-plist @@ -1,24 +0,0 @@ -bin/spd-conf -%%PYTHON_SITELIBDIR%%/speechd/__init__.py -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/_test.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd/_test.py -%%PYTHON_SITELIBDIR%%/speechd/client.py -%%PYTHON_SITELIBDIR%%/speechd/paths.py -%%PYTHON_SITELIBDIR%%/speechd_config/__init__.py -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/speechd_config/__pycache__/paths.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/speechd_config/config.py -%%PYTHON_SITELIBDIR%%/speechd_config/paths.py -share/sounds/speech-dispatcher/test.wav -%%DATADIR%%/conf/desktop/speechd.desktop Index: accessibility/redshift/Makefile =================================================================== --- accessibility/redshift/Makefile +++ accessibility/redshift/Makefile @@ -42,10 +42,10 @@ VIDMODE_USE= XORG=xxf86vm VIDMODE_CONFIGURE_ENABLE= vidmode -GUI_USES= python +GUI_USES= python:2.7 GUI_CONFIGURE_ENABLE= gui -GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \ - ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} GNOME_CONFIGURE_ENABLE= gnome-clock GNOME_USE= GNOME=glib20,gconf2 Index: accessibility/speech-dispatcher/Makefile =================================================================== --- accessibility/speech-dispatcher/Makefile +++ accessibility/speech-dispatcher/Makefile @@ -92,8 +92,9 @@ NO_ARCH= yes USES+= python:3.3+ +USE_PYTHON= flavors LIB_DEPENDS+= libspeechd.so:accessibility/speech-dispatcher -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR} .endif Index: archivers/Makefile =================================================================== --- archivers/Makefile +++ archivers/Makefile @@ -188,7 +188,6 @@ SUBDIR += py-rcssmin SUBDIR += py-rjsmin SUBDIR += py-warctools - SUBDIR += py3-libarchive-c SUBDIR += qpress SUBDIR += quazip SUBDIR += quazip-qt5 Index: archivers/py-attic/Makefile =================================================================== --- archivers/py-attic/Makefile +++ archivers/py-attic/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.1.10:devel/py-msgpack-python@${FLAVOR} USES= python:3.3+ ssl USE_PYTHON= autoplist distutils @@ -23,13 +23,6 @@ STRIP_FILES= hashindex.so platform_freebsd.so chunker.so crypto.so PYDISTUTILS_BUILDPATH=${BUILD_WRKSRC}/build/lib.${OPSYS:tl}-${UNAMER}-${ARCH}-${PYTHON_VER} -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - regression-test: build ${SETENV} PYTHONPATH="${PYDISTUTILS_BUILDPATH}:${PYTHONPATH}" \ ${PYTHON_CMD} -m attic.testsuite.run @@ -37,4 +30,4 @@ post-install: ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/attic/,} -.include +.include Index: archivers/py-borgbackup/Makefile =================================================================== --- archivers/py-borgbackup/Makefile +++ archivers/py-borgbackup/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${FLAVOR} LIB_DEPENDS= liblz4.so:archivers/liblz4 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.6:devel/py-msgpack-python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.6:devel/py-msgpack-python@${FLAVOR} OPTIONS_DEFINE= FUSE FUSE_DESC= Support to mount locally borg backup files @@ -26,15 +26,8 @@ USES= python:3.4+ ssl USE_PYTHON= autoplist distutils -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - post-install: @${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/borg/ -name "*.so" \ -exec ${STRIP_CMD} {} \; -.include +.include Index: archivers/py-czipfile/Makefile =================================================================== --- archivers/py-czipfile/Makefile +++ archivers/py-czipfile/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: archivers/py-libarchive-c/Makefile =================================================================== --- archivers/py-libarchive-c/Makefile +++ archivers/py-libarchive-c/Makefile @@ -11,9 +11,9 @@ LICENSE= LGPL20+ -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils Index: archivers/py-librtfcomp/Makefile =================================================================== --- archivers/py-librtfcomp/Makefile +++ archivers/py-librtfcomp/Makefile @@ -14,13 +14,14 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENCE -BUILD_DEPENDS= pyrexc:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} LIB_DEPENDS= librtfcomp.so:archivers/librtfcomp CONFIGURE_ARGS= --enable-python-bindings GNU_CONFIGURE= yes USE_LDCONFIG= yes USES= libtool python:2 +USE_PYTHON= flavors BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python Index: archivers/py-lz4/Makefile =================================================================== --- archivers/py-lz4/Makefile +++ archivers/py-lz4/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} LIB_DEPENDS= liblz4.so:archivers/liblz4 USE_PYTHON= distutils py3kplist Index: archivers/py-python-lzo/Makefile =================================================================== --- archivers/py-python-lzo/Makefile +++ archivers/py-python-lzo/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= liblzo2.so:archivers/lzo2 -USES= python:2 +USES= python USE_PYTHON= autoplist distutils CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/lzo Index: archivers/py3-libarchive-c/Makefile =================================================================== --- archivers/py3-libarchive-c/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-libarchive-c - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: astro/py-RO/Makefile =================================================================== --- astro/py-RO/Makefile +++ astro/py-RO/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= MATPLOTLIB PYFITS PYGAME @@ -25,8 +25,8 @@ USES= python USE_PYTHON= autoplist distutils -MATPLOTLIB_RUN_DEPENDS= ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib -PYFITS_RUN_DEPENDS= ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits -PYGAME_RUN_DEPENDS= ${PKGNAMEPREFIX}game>=1.8.1:devel/py-game +MATPLOTLIB_RUN_DEPENDS= ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} +PYFITS_RUN_DEPENDS= ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits@${FLAVOR} +PYGAME_RUN_DEPENDS= ${PKGNAMEPREFIX}game>=1.8.1:devel/py-game@${FLAVOR} .include Index: astro/py-aipy/Makefile =================================================================== --- astro/py-aipy/Makefile +++ astro/py-aipy/Makefile @@ -11,12 +11,12 @@ COMMENT= Astronomical Interferometry in PYthon BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem \ - ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \ - ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib + ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${FLAVOR} \ + ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits@${FLAVOR} \ + ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: astro/py-astLib/Makefile =================================================================== --- astro/py-astLib/Makefile +++ astro/py-astLib/Makefile @@ -14,15 +14,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ - ${PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy \ - ${PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \ - ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib + ${PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy@${FLAVOR} \ + ${PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits@${FLAVOR} \ + ${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} PORTSCOUT= skipv:0.15,0.17,0.17.1 # incorrect versioning upstream -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: astro/py-horoscopegenerator/Makefile =================================================================== --- astro/py-horoscopegenerator/Makefile +++ astro/py-horoscopegenerator/Makefile @@ -16,6 +16,6 @@ USES= python USE_PYTHON= distutils autoplist -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${FLAVOR} .include Index: astro/py-pyfits/Makefile =================================================================== --- astro/py-pyfits/Makefile +++ astro/py-pyfits/Makefile @@ -14,10 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1 \ - ${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:devel/py-stsci.distutils + ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:devel/py-stsci.distutils@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1 + ${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: astro/pyephem/Makefile =================================================================== --- astro/pyephem/Makefile +++ astro/pyephem/Makefile @@ -6,6 +6,8 @@ PORTEPOCH= 1 CATEGORIES= astro math hamradio MASTER_SITES= CHEESESHOP +# XXX rename the directory too. +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Scientific-grade astronomical computations for Python Index: audio/Makefile =================================================================== --- audio/Makefile +++ audio/Makefile @@ -684,8 +684,6 @@ SUBDIR += py-tagpy SUBDIR += py-vorbis SUBDIR += py-xmms2 - SUBDIR += py3-mutagen - SUBDIR += py3-pylast SUBDIR += pytone SUBDIR += qjackctl SUBDIR += qmidiarp Index: audio/abcde/Makefile =================================================================== --- audio/abcde/Makefile +++ audio/abcde/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= cd-discid:audio/cd-discid \ cdparanoia:audio/cdparanoia \ lame:audio/lame \ - ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:audio/py-eyed3 \ + ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7:audio/py-eyed3@${PY_FLAVOR} \ oggenc:audio/vorbis-tools \ bash:shells/bash Index: audio/beets/Makefile =================================================================== --- audio/beets/Makefile +++ audio/beets/Makefile @@ -13,18 +13,18 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode \ - ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs \ - ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}enum34>=1.0.4:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.33:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}munkres>=0:math/py-munkres@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}jellyfish>=0:devel/py-jellyfish@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix PLIST_FILES= man/man1/beet.1.gz man/man5/beetsconfig.5.gz @@ -57,34 +57,34 @@ WEB_DESC= Web plugin for querying, browsing and playing music WEB_CORS_DESC= Cross-origin resource sharing for the Web plugin -ACOUSTICBRAINZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +ACOUSTICBRAINZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} BADFILES_RUN_DEPENDS= flac:audio/flac \ mp3val:audio/mp3val -BEATPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib -BPD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1 \ - ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject -CHROMA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid -DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:audio/py-discogs-client -EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +BEATPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.6.1:www/py-requests-oauthlib@${FLAVOR} +BPD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>=0:multimedia/py-gstreamer1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject>=0:devel/py-gobject@${FLAVOR} +CHROMA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyacoustid>=0:audio/py-pyacoustid@${FLAVOR} +DISCOGS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discogs-client>=2.1.0:audio/py-discogs-client@${FLAVOR} +EMBYUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +FETCHART_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} FFMPEG_RUN_DEPENDS= ffmpeg>=2:multimedia/ffmpeg IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick IPFS_RUN_DEPENDS= ipfs-go:sysutils/ipfs-go -LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast -LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -LYRICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -LYRICS_GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup -METASYNC_DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus -MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0:audio/py-mpd2 -PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +LASTFM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylast>=0:audio/py-pylast@${FLAVOR} +LASTIMPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +LYRICS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +LYRICS_GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} +METASYNC_DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${FLAVOR} +MPDSTATS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd2>=0:audio/py-mpd2@${FLAVOR} +PLEXUPDATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} REPLAYGAIN_RUN_DEPENDS= mp3gain>=0:audio/mp3gain REPLAYGAIN_RUN_DEPENDS+= aacgain>=0:audio/aacgain -SPOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -THUMBNAILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg -THUMBNAILS_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib -WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask -WEB_CORS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors +SPOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +THUMBNAILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} +THUMBNAILS_RUN_DEPENDS+= ${PY_PATHLIB} +WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} +WEB_CORS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:www/py-flask-cors@${FLAVOR} post-install: ${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/man/man1/ Index: audio/exaile-devel/Makefile =================================================================== --- audio/exaile-devel/Makefile +++ audio/exaile-devel/Makefile @@ -11,10 +11,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}gstreamer1>0:multimedia/py-gstreamer1 \ - ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer1>0:multimedia/py-gstreamer1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} USE_GITHUB= yes GH_TAGNAME= 9ba2cc8 @@ -29,7 +29,7 @@ NLS_USES= gettext NLS_BUILD_DEPENDS= help2man:misc/help2man NLS_INSTALL_TARGET_OFF= install_no_locale -CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>0:audio/py-cddb +CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>0:audio/py-cddb@${PY_FLAVOR} HAL_LIB_DEPENDS= libhal.so:sysutils/hal MAKE_ENV= EPREFIX=${PREFIX} \ Index: audio/exaile/Makefile =================================================================== --- audio/exaile/Makefile +++ audio/exaile/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen@${PY_FLAVOR} MAKE_ENV+= PYTHON2_CMD=${PYTHON_CMD} XDGCONFDIR=${PREFIX}/etc/xdg USES= desktop-file-utils gmake python:2 @@ -24,14 +24,14 @@ OPTIONS_SUB= yes BAD_DESC= Install bad GStreamer plugins BAD_USE= GSTREAMER=bad -CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:devel/py-dbus +CDDB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb@${PY_FLAVOR} +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.1:devel/py-dbus@${PY_FLAVOR} HAL_LIB_DEPENDS= libhal.so:sysutils/hal -NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify +NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} NLS_USES= gettext NLS_INSTALL_TARGET_OFF= install_no_locale SEXY_DESC= UI enchancements -SEXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sexy>=0.1.9:x11-toolkits/py-sexy +SEXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sexy>=0.1.9:x11-toolkits/py-sexy@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/Makefile Index: audio/gnome-music/Makefile =================================================================== --- audio/gnome-music/Makefile +++ audio/gnome-music/Makefile @@ -17,7 +17,7 @@ PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libtool pathfix pkgconfig python:3 tar:xz +USES= gettext gmake gnome libtool pathfix pkgconfig python:3.4+ tar:xz USE_LDCONFIG= yes USE_GNOME= gnomedesktop3 gtk30 intltool introspection:build GNU_CONFIGURE= yes Index: audio/idjc/Makefile =================================================================== --- audio/idjc/Makefile +++ audio/idjc/Makefile @@ -25,8 +25,8 @@ libsamplerate.so:audio/libsamplerate \ libshout-idjc.so:audio/shout-idjc RUN_DEPENDS= oggenc:audio/vorbis-tools \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${PY_FLAVOR} OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= YES Index: audio/jokosher/Makefile =================================================================== --- audio/jokosher/Makefile +++ audio/jokosher/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} USES= desktop-file-utils python:2 shared-mime-info USE_PYTHON= distutils @@ -23,7 +23,7 @@ OPTIONS_DEFINE= DBUS FLAC GCONF GNOME JACK LADSPA LAME MP3 PIDGIN PULSEAUDIO VORBIS OPTIONS_DEFAULT= DBUS FLAC GCONF LADSPA VORBIS -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} FLAC_USE= GSTREAMER=flac GCONF_USE= GSTREAMER=gconf JACK_USE= GSTREAMER=jack Index: audio/libgpod/Makefile =================================================================== --- audio/libgpod/Makefile +++ audio/libgpod/Makefile @@ -39,10 +39,10 @@ MONO_CONFIGURE_WITH= mono PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 \ - ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen -PYTHON_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen + ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen PYTHON_USE= GNOME=pygobject -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig2.0" PYTHON_CONFIGURE_WITH= python Index: audio/lollypop/Makefile =================================================================== --- audio/lollypop/Makefile +++ audio/lollypop/Makefile @@ -13,14 +13,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.8:databases/py-sqlite3@${PY_FLAVOR} \ itstool:textproc/itstool \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py3-dbus \ - ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py3-gstreamer1 + ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer1>=1.4.0:multimedia/py-gstreamer1@${PY_FLAVOR} LIB_DEPENDS= libnotify.so:devel/libnotify \ libtotem-plparser.so:multimedia/totem-pl-parser -USES= shebangfix python:3 pkgconfig gettext gmake sqlite tar:xz +USES= shebangfix python:3.4+ pkgconfig gettext gmake sqlite tar:xz GNU_CONFIGURE= yes USE_GNOME= glib20 gtk30 py3gobject3 introspection:build intltool intlhack USE_GSTREAMER1= yes mpg123 ogg flac opus libav faad good speex @@ -36,11 +36,4 @@ SUB_FILES= pkg-message -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: audio/mbox/Makefile =================================================================== --- audio/mbox/Makefile +++ audio/mbox/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg \ - ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ lame:audio/lame \ oggenc:audio/vorbis-tools \ mplayer:multimedia/mplayer Index: audio/mpdbrowser/Makefile =================================================================== --- audio/mpdbrowser/Makefile +++ audio/mpdbrowser/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${FLAVOR} USES= gettext iconv python:2 tar:tgz USE_GNOME= intltool pygtk2 Index: audio/mps/Makefile =================================================================== --- audio/mps/Makefile +++ audio/mps/Makefile @@ -22,7 +22,7 @@ # This port installs the following files in shared dirs # PLIST_FILES= bin/mps USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer MPV_RUN_DEPENDS= mpv:multimedia/mpv Index: audio/picard/Makefile =================================================================== --- audio/picard/Makefile +++ audio/picard/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=0:audio/py-discid \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}discid>=0:audio/py-discid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${FLAVOR} USES= gettext pyqt:4 python:2 desktop-file-utils USE_PYQT= core_run gui_run network_run xml_run Index: audio/pithos/Makefile =================================================================== --- audio/pithos/Makefile +++ audio/pithos/Makefile @@ -13,15 +13,15 @@ USE_GITHUB= yes -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py3-xdg \ - ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py3-dbus \ - ${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py3-gstreamer1 \ - ${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py3-pylast \ +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/gi/overrides/Gst.py:multimedia/py-gstreamer1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylast>0:audio/py-pylast@${FLAVOR} \ git:devel/git USE_GNOME= gtk30 py3gobject3 -USES= python:3 -USE_PYTHON= distutils autoplist +USES= python:3.4+ +USE_PYTHON= distutils autoplist optsuffix USE_GSTREAMER= core good bad soup post-install: Index: audio/puddletag/Makefile =================================================================== --- audio/puddletag/Makefile +++ audio/puddletag/Makefile @@ -13,10 +13,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= chromaprint>=0.4:audio/chromaprint \ - ${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2 \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}musicbrainz2>=0:audio/py-musicbrainz2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.14:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=4.5.0:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.1:devel/py-pyparsing@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= keithgg Index: audio/py-aubio/Makefile =================================================================== --- audio/py-aubio/Makefile +++ audio/py-aubio/Makefile @@ -11,7 +11,7 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} TEST_DEPENDS= sox:audio/sox \ - ${PYTHON_PKGNAMEPREFIX}nose2>=0.6.5:devel/py-nose2 + ${PYTHON_PKGNAMEPREFIX}nose2>=0.6.5:devel/py-nose2@${FLAVOR} USES+= python USE_PYTHON= autoplist distutils Index: audio/py-discogs-client/Makefile =================================================================== --- audio/py-discogs-client/Makefile +++ audio/py-discogs-client/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>=0:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: audio/py-gmusicapi/Makefile =================================================================== --- audio/py-gmusicapi/Makefile +++ audio/py-gmusicapi/Makefile @@ -12,21 +12,21 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}future>=0.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:security/py-oauth2client \ - ${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:security/py-gpsoauth \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory \ - ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \ - ${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:www/py-MechanicalSoup \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.2:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>=1.18:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.2:security/py-oauth2client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gpsoauth>=0.0:security/py-gpsoauth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}validictory>=0.9.3:devel/py-validictory@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MechanicalSoup>0:www/py-MechanicalSoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: audio/py-gmusicproxy/Makefile =================================================================== --- audio/py-gmusicproxy/Makefile +++ audio/py-gmusicproxy/Makefile @@ -13,14 +13,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}gmusicapi>=10.1.0:audio/py-gmusicapi \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=-0.10.4:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7.8:audio/py-eyed3 \ - ${PYTHON_PKGNAMEPREFIX}daemon>=2.0.5:devel/py-daemon - -USES= python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gmusicapi>=10.1.0:audio/py-gmusicapi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=-0.10.4:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eyed3>=0.7.8:audio/py-eyed3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}daemon>=2.0.5:devel/py-daemon@${FLAVOR} + +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GITHUB= yes Index: audio/py-karaoke/Makefile =================================================================== --- audio/py-karaoke/Makefile +++ audio/py-karaoke/Makefile @@ -39,7 +39,7 @@ OPTIONS_DEFINE= MUTAGEN MUTAGEN_DESC= Mutagen support -MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen +MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} BIN_SCRIPTS= cdg2mpg pycdg pykar pykaraoke pykaraoke_mini pympg DATA_FONTS= DejaVuSans.ttf DejaVuSansCondensed.ttf \ Index: audio/py-mutagen/Makefile =================================================================== --- audio/py-mutagen/Makefile +++ audio/py-mutagen/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USES?= python shebangfix +USES= python shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= tools/* Index: audio/py-openal/Makefile =================================================================== --- audio/py-openal/Makefile +++ audio/py-openal/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= openal:al,alut python +USES= openal:al,alut python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PyOpenAL-${PORTVERSION} EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}openal Index: audio/py-py-jack/Makefile =================================================================== --- audio/py-py-jack/Makefile +++ audio/py-py-jack/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libjack.so:audio/jack -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} USES= python:-2.7 localbase USE_PYTHON= distutils autoplist Index: audio/py-pylast/Makefile =================================================================== --- audio/py-pylast/Makefile +++ audio/py-pylast/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: audio/py-pyliblo/Makefile =================================================================== --- audio/py-pyliblo/Makefile +++ audio/py-pyliblo/Makefile @@ -14,12 +14,11 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cython${PYTHON_VER:M3.*:S/^3/-3/}:lang/cython${PYTHON_MAJOR_VER:M3} LIB_DEPENDS= liblo.so:audio/liblo USES= localbase:ldflags python USES= python -USE_PYTHON= distutils # autoplist fails to add the manpage files +USE_PYTHON= distutils cython MAKE_ENV+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} post-patch: Index: audio/py-pysndfile/Makefile =================================================================== --- audio/py-pysndfile/Makefile +++ audio/py-pysndfile/Makefile @@ -11,13 +11,12 @@ LICENSE= LGPL3 -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libsndfile.so:audio/libsndfile -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +RUN_DEPENDS= ${PYNUMPY} USES= python localbase -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysndfile/_pysndfile.so Index: audio/py-soundcloud/Makefile =================================================================== --- audio/py-soundcloud/Makefile +++ audio/py-soundcloud/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: audio/py-soundscrape/Makefile =================================================================== --- audio/py-soundscrape/Makefile +++ audio/py-soundscrape/Makefile @@ -13,16 +13,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.31.0:audio/py-mutagen \ - ${PYTHON_PKGNAMEPREFIX}soundcloud>=0.4.1:audio/py-soundcloud \ - ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args \ - ${PYTHON_PKGNAMEPREFIX}clint>=0.3.2:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}demjson>=2.2.2:devel/py-demjson \ - ${PYTHON_PKGNAMEPREFIX}fudge>=1.0.3:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=3.3.1:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.9.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=1.31.0:audio/py-mutagen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soundcloud>=0.4.1:audio/py-soundcloud@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}clint>=0.3.2:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}demjson>=2.2.2:devel/py-demjson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>=1.0.3:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=3.3.1:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.9.0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: audio/py-speechrecognition/Makefile =================================================================== --- audio/py-speechrecognition/Makefile +++ audio/py-speechrecognition/Makefile @@ -16,7 +16,7 @@ GH_PROJECT= speech_recognition RUN_DEPENDS= flac:audio/flac \ - ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio + ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${FLAVOR} NO_ARCH= yes USES= python @@ -28,7 +28,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic@${FLAVOR} .endif .include Index: audio/py-speex/Makefile =================================================================== --- audio/py-speex/Makefile +++ audio/py-speex/Makefile @@ -13,10 +13,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python bindings for the Speex compressor/decompressor audio codec -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} LIB_DEPENDS= libspeex.so:audio/speex -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-patch: Index: audio/py-vorbis/Makefile =================================================================== --- audio/py-vorbis/Makefile +++ audio/py-vorbis/Makefile @@ -15,8 +15,8 @@ LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR} LIB_DEPENDS= libvorbis.so:audio/libvorbis USES= python:2 Index: audio/py-xmms2/Makefile =================================================================== --- audio/py-xmms2/Makefile +++ audio/py-xmms2/Makefile @@ -9,12 +9,13 @@ MAINTAINER= madpilot@FreeBSD.org COMMENT= Python Bindings for XMMS2 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/__init__.py:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} LIB_DEPENDS+= libxmmsclient.so:audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 -USES= python +USES= python:2.7 +USE_PYTHON= flavors PLIST= ${.CURDIR}/pkg-plist Index: audio/py3-mutagen/Makefile =================================================================== --- audio/py3-mutagen/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mutagen - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: audio/py3-pylast/Makefile =================================================================== --- audio/py3-pylast/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Kris Moore -# $FreeBSD$ - -PORTNAME= pylast -PORTVERSION= 0.5.11 -PORTREVISION= 1 -CATEGORIES= audio python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= kmoore@FreeBSD.org -COMMENT= Python3 interface to Last.fm - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/COPYING - -USES= python:3 -USE_PYTHON= distutils autoplist - -.include Index: audio/py3-pylast/distinfo =================================================================== --- audio/py3-pylast/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pylast-0.5.11.tar.gz) = bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4 -SIZE (pylast-0.5.11.tar.gz) = 26146 Index: audio/py3-pylast/pkg-descr =================================================================== --- audio/py3-pylast/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A Python interface to Last.fm (and other API compatible social networks) - -WWW: http://code.google.com/p/pylast/ Index: audio/pytone/Makefile =================================================================== --- audio/pytone/Makefile +++ audio/pytone/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv2 LIB_DEPENDS= libao.so:audio/libao -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} USES= ncurses python:2 @@ -31,11 +31,11 @@ OPTIONS_DEFINE= MAD MPG123 MPG321 VORBIS OPTIONS_DEFAULT= MAD VORBIS -MAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mad>0:audio/py-mad +MAD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mad>0:audio/py-mad@${FLAVOR} MPG123_RUN_DEPENDS= mpg123:audio/mpg123 MPG321_DESC= MP3 decoding support via mpg321 MPG321_RUN_DEPENDS= mpg321:audio/mpg321 -VORBIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis +VORBIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} post-patch: .for i in pytone pytonectl Index: audio/rhythmbox/Makefile =================================================================== --- audio/rhythmbox/Makefile +++ audio/rhythmbox/Makefile @@ -69,10 +69,10 @@ libhal.so:sysutils/hal PYTHON_CONFIGURE_ENABLE= python PYTHON_USES= python:3.3+ -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} # context plugin # webkit is for the context plugin, which is broken because -# it needs textproc/py3-mako +# it needs textproc/py-mako@${PY_FLAVOR} #WEBKIT_DESC= HTML view support #WEBKIT_CONFIGURE_WITH= webkit #WEBKIT_LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 Index: audio/sonata/Makefile =================================================================== --- audio/sonata/Makefile +++ audio/sonata/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${FLAVOR} -USES= gettext pkgconfig python +USES= gettext pkgconfig python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils autoplist @@ -30,10 +30,11 @@ MANPAGES_MAKE_ENV_OFF= NO_INSTALL_MANPAGES=yes DOCS_MAKE_ENV= NOPORTDOCS=${NOPORTDOCS} MPD_RUN_DEPENDS+= musicpd:audio/musicpd -MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus -PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras -TAGLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy -ZSI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:net/py-zsi +MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR} +PYGNOMEEXTRAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gnome-extras>=2.25.3_4:x11-toolkits/py-gnome-extras@${FLAVOR} +PYGNOMEEXTRAS_IGNORE= Dependency py-gnome-extras gone. +TAGLIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy@${FLAVOR} +ZSI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zsi>=2.0,1:net/py-zsi@${FLAVOR} post-patch: @${REINPLACE_CMD} -e 's,%%DOCSDIR%%,${DOCSDIR},' \ Index: audio/soundconverter/Makefile =================================================================== --- audio/soundconverter/Makefile +++ audio/soundconverter/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer@${PY_FLAVOR} NO_ARCH= yes USES= desktop-file-utils gmake python:2 shebangfix tar:xz Index: benchmarks/py-naarad/Makefile =================================================================== --- benchmarks/py-naarad/Makefile +++ benchmarks/py-naarad/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2013.8,1:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}luminol>0:math/py-luminol \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=2013.8,1:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}luminol>0:math/py-luminol@${FLAVOR} \ bash:shells/bash \ gawk:lang/gawk Index: benchmarks/py-zopkio/Makefile =================================================================== --- benchmarks/py-zopkio/Makefile +++ benchmarks/py-zopkio/Makefile @@ -12,10 +12,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= naarad:benchmarks/py-naarad \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}kazoo>=1.1:devel/py-kazoo \ - ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kazoo>=1.1:devel/py-kazoo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10.1:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}junit-xml>0:textproc/py-junit-xml@${FLAVOR} \ USES= python USE_PYTHON= autoplist concurrent distutils Index: biology/libsbml/Makefile =================================================================== --- biology/libsbml/Makefile +++ biology/libsbml/Makefile @@ -27,7 +27,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CMAKE_ON= -DWITH_PYTHON:BOOL=ON \ -DPYTHON_INCLUDE_DIR:STRING="${PYTHON_INCLUDEDIR}" \ -DPYTHON_LIBRARY:STRING="${PYTHONBASE}/lib/lib${PYTHON_VERSION}.so" \ Index: biology/py-biom-format/Makefile =================================================================== --- biology/py-biom-format/Makefile +++ biology/py-biom-format/Makefile @@ -13,10 +13,10 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py \ - ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}h5py>=2.6.0:science/py-h5py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.16.1:science/py-scipy@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= biocore @@ -27,7 +27,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqi>=0.2.0:devel/py-pyqi +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyqi>=0.2.0:devel/py-pyqi@${FLAVOR} .endif post-install: Index: biology/py-biopython/Makefile =================================================================== --- biology/py-biopython/Makefile +++ biology/py-biopython/Makefile @@ -20,6 +20,6 @@ OPTIONS_DEFAULT= REPORTLAB REPORTLAB_DESC= PDF support in Bio.Graphics module -REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab1>0:print/py-reportlab1 +REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab1>0:print/py-reportlab1@${FLAVOR} .include Index: biology/py-bx-python/Makefile =================================================================== --- biology/py-bx-python/Makefile +++ biology/py-bx-python/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}python-lzo>0:archivers/py-python-lzo + ${PYTHON_PKGNAMEPREFIX}python-lzo>0:archivers/py-python-lzo@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes Index: biology/py-pysam/Makefile =================================================================== --- biology/py-pysam/Makefile +++ biology/py-pysam/Makefile @@ -12,11 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS= cython:lang/cython - USES= gmake python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pysam/*.so Index: biology/pycogent/Makefile =================================================================== --- biology/pycogent/Makefile +++ biology/pycogent/Makefile @@ -11,13 +11,12 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 + ${LOCALBASE}/bin/sphinx-build:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:-2.7 USE_GITHUB= yes -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython .include Index: biology/pyfasta/Makefile =================================================================== --- biology/pyfasta/Makefile +++ biology/pyfasta/Makefile @@ -6,6 +6,7 @@ PORTREVISION= 1 CATEGORIES= biology python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Fast, memory-efficient, pythonic access to fasta sequence files Index: biology/python-nexus/Makefile =================================================================== --- biology/python-nexus/Makefile +++ biology/python-nexus/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.53 CATEGORIES= biology python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org COMMENT= Generic nexus file format reader for python Index: cad/brickutils/Makefile =================================================================== --- cad/brickutils/Makefile +++ cad/brickutils/Makefile @@ -20,7 +20,7 @@ LICENSE= GPLv3 RUN_DEPENDS= ${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} WRKSRC= ${WRKDIR}/BrickUtils-${PORTVERSION} Index: cad/linuxcnc-devel/Makefile =================================================================== --- cad/linuxcnc-devel/Makefile +++ cad/linuxcnc-devel/Makefile @@ -46,7 +46,7 @@ CXXFLAGS="-I${LOCALBASE}/include" CXX="${CXX}" CC="${CC}" \ --with-locale-dir="${PREFIX}/share/locale" --with-python=${PYTHON_CMD} MAKE_ENV= BUILD_VERBOSE=1 -USES= autoreconf gettext gmake ncurses pkgconfig python readline shebangfix tk +USES= autoreconf gettext gmake ncurses pkgconfig python:2.7 readline shebangfix tk USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 libgnomeprintui pygtksourceview USE_XORG= ice sm x11 xext xft xinerama xmu xrender xscrnsaver xt Index: cad/py-gdspy/Makefile =================================================================== --- cad/py-gdspy/Makefile +++ cad/py-gdspy/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: cad/py-lcapy/Makefile =================================================================== --- cad/py-lcapy/Makefile +++ cad/py-lcapy/Makefile @@ -10,11 +10,11 @@ LICENSE= LGPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy \ - ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= mph- Index: cad/py-pycam/Makefile =================================================================== --- cad/py-pycam/Makefile +++ cad/py-pycam/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 \ - ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR} USES= python:-2.7 USE_PYTHON= distutils autoplist Index: cad/python-gdsii/Makefile =================================================================== --- cad/python-gdsii/Makefile +++ cad/python-gdsii/Makefile @@ -11,7 +11,7 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: cad/pythoncad/Makefile =================================================================== --- cad/pythoncad/Makefile +++ cad/pythoncad/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils PYDISTUTILS_PKGNAME= PythonCAD PYDISTUTILS_PKGVERSION= DS1-R${PORTVERSION} Index: comms/chirp/Makefile =================================================================== --- comms/chirp/Makefile +++ comms/chirp/Makefile @@ -15,11 +15,11 @@ BUILD_DEPENDS= ${CHIRP_DEPENDS} RUN_DEPENDS= ${CHIRP_DEPENDS} -CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 \ - ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \ - ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 +CHIRP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR} -USES= desktop-file-utils gettext python +USES= desktop-file-utils gettext python:2.7 USE_PYTHON= distutils autoplist .include Index: comms/congruity/Makefile =================================================================== --- comms/congruity/Makefile +++ comms/congruity/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libconcord>=0:comms/py-libconcord@${PY_FLAVOR} MAKE_ARGS= MANDIR=${PREFIX}/man USES= desktop-file-utils gmake tar:bzip2 python:2.7+ Index: comms/gnuradio/Makefile =================================================================== --- comms/gnuradio/Makefile +++ comms/gnuradio/Makefile @@ -14,14 +14,14 @@ BUILD_DEPENDS= sdl-config:devel/sdl12 \ swig2.0:devel/swig20 \ - cheetah:devel/py-cheetah \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ + cheetah:devel/py-cheetah@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ xdg-open:devel/xdg-utils \ guile:lang/guile \ aconnect:audio/alsa-utils \ git:devel/git \ ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem + ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} LIB_DEPENDS= libcppunit.so:devel/cppunit \ libcodec2.so:audio/codec2 \ libfftw3.so:math/fftw3 \ @@ -80,7 +80,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - sphinx-apidoc:textproc/py-sphinx \ + sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR} \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf Index: comms/owfs/Makefile =================================================================== --- comms/owfs/Makefile +++ comms/owfs/Makefile @@ -57,7 +57,7 @@ OWPHP_CONFIGURE_ENABLE= owphp OWPYTHON_CONFIGURE_ENABLE= owpython -OWPYTHON_USES= python +OWPYTHON_USES= python:2.7 # Additional CONFIGURE_ARGS is done below OWTCL_CONFIGURE_ENABLE= owtcl Index: comms/py-bulksms/Makefile =================================================================== --- comms/py-bulksms/Makefile +++ comms/py-bulksms/Makefile @@ -10,7 +10,7 @@ MAINTAINER= craig001@lerwick.hopto.org COMMENT= Python client for the BulkSMS.co.uk HTTP API -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= BulkSMS PYDISTUTILS_PKGVERSION= 1.0 Index: comms/py-hidapi/Makefile =================================================================== --- comms/py-hidapi/Makefile +++ comms/py-hidapi/Makefile @@ -13,11 +13,10 @@ LICENSE= GPLv3 -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libhidapi.so:comms/hidapi USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e 's|usb-1.0|usb|g' ${WRKSRC}/setup.py Index: comms/py-libconcord/Makefile =================================================================== --- comms/py-libconcord/Makefile +++ comms/py-libconcord/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libconcord.so:comms/libconcord USE_LDCONFIG= yes -USES= python:2.7+ tar:bzip2 +USES= python:2.7 tar:bzip2 WRKSRC_SUBDIR= libconcord/bindings/python USE_PYTHON= distutils Index: comms/py-libimobiledevice/Makefile =================================================================== --- comms/py-libimobiledevice/Makefile +++ comms/py-libimobiledevice/Makefile @@ -8,13 +8,13 @@ COMMENT= Python bindings for libimobiledevice LIB_DEPENDS= libimobiledevice.so:${MASTER_PORT} -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_SITELIBDIR}/plist.so:devel/py-libplist -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/plist.so:devel/py-libplist +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libplist>0:devel/py-libplist@${FLAVOR} PORTSCOUT= ignore:1 -USES= python +USES= python:2.7 +USE_PYTHON= flavors cython CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/comms/libimobiledevice Index: comms/py-qt5-serialport/Makefile =================================================================== --- comms/py-qt5-serialport/Makefile +++ comms/py-qt5-serialport/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core gui serialport qmake_build OPTIONS_DEFINE= API DEBUG Index: comms/quisk/Makefile =================================================================== --- comms/quisk/Makefile +++ comms/quisk/Makefile @@ -17,7 +17,7 @@ libasound.so:audio/alsa-lib \ libpulse.so:audio/pulseaudio -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python Index: comms/uhd/Makefile =================================================================== --- comms/uhd/Makefile +++ comms/uhd/Makefile @@ -13,10 +13,10 @@ LIB_DEPENDS= libboost_python.so:devel/boost-python-libs BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \ - cheetah-analyze:devel/py-cheetah \ - rst2html:textproc/py-docutils \ + cheetah-analyze:devel/py-cheetah@${PY_FLAVOR} \ + rst2html:textproc/py-docutils@${PY_FLAVOR} \ orcc:devel/orc \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= EttusResearch Index: comms/wsjt/Makefile =================================================================== --- comms/wsjt/Makefile +++ comms/wsjt/Makefile @@ -21,9 +21,9 @@ libsamplerate.so:audio/libsamplerate \ libportaudio.so:audio/portaudio -WSJT_DEPENDS= ${PYTHON_LIBDIR}/lib-dynload/_tkinter.so:x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/scipy:science/py-scipy \ - ${PYTHON_SITELIBDIR}/PIL:graphics/py-pillow \ +WSJT_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ ${PYNUMPY} USE_GCC= yes @@ -103,9 +103,4 @@ ${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - .include Index: comms/wspr/Makefile =================================================================== --- comms/wspr/Makefile +++ comms/wspr/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYTHON_LIBDIR}/tkinter:x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/PIL:graphics/py-pillow \ - ${PYTHON_SITELIBDIR}/scipy:science/py-scipy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} LIB_DEPENDS= libhamlib.so:comms/hamlib \ libfftw3f.so:math/fftw3-float \ libsamplerate.so:audio/libsamplerate \ @@ -63,9 +63,4 @@ .endif .endif -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - .include Index: converters/py-bencode.py/Makefile =================================================================== --- converters/py-bencode.py/Makefile +++ converters/py-bencode.py/Makefile @@ -15,8 +15,8 @@ LICENSE_TEXT= See http://directory.fsf.org/wiki/License:BitTorrentOSL1.1 LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python Index: converters/py-rencode/Makefile =================================================================== --- converters/py-rencode/Makefile +++ converters/py-rencode/Makefile @@ -11,9 +11,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= cython:lang/cython - -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USES= python post-install: Index: converters/py-zfec/Makefile =================================================================== --- converters/py-zfec/Makefile +++ converters/py-zfec/Makefile @@ -18,7 +18,7 @@ unsort:devel/py-pyutil RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} Index: converters/zbase32/Makefile =================================================================== --- converters/zbase32/Makefile +++ converters/zbase32/Makefile @@ -11,10 +11,10 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Base32 Encoder/Decoder -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>=1.2.11:devel/py-setuptools_darcs@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: databases/Makefile =================================================================== --- databases/Makefile +++ databases/Makefile @@ -854,16 +854,6 @@ SUBDIR += py-whisper SUBDIR += py-xapian SUBDIR += py-zodbpickle - SUBDIR += py3-apsw - SUBDIR += py3-bsddb3 - SUBDIR += py3-mysqlclient - SUBDIR += py3-psycopg2 - SUBDIR += py34-gdbm - SUBDIR += py34-sqlite3 - SUBDIR += py35-gdbm - SUBDIR += py35-sqlite3 - SUBDIR += py36-gdbm - SUBDIR += py36-sqlite3 SUBDIR += pydbx SUBDIR += pymongo SUBDIR += pypy-gdbm Index: databases/buzhug/Makefile =================================================================== --- databases/buzhug/Makefile +++ databases/buzhug/Makefile @@ -10,6 +10,6 @@ COMMENT= Pure-Python database engine USES= python zip -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: databases/buzhug/pkg-plist =================================================================== --- databases/buzhug/pkg-plist +++ /dev/null @@ -1,21 +0,0 @@ -%%PYTHON_SITELIBDIR%%/buzhug/__init__.py -%%PYTHON_SITELIBDIR%%/buzhug/__init__.pyc -%%PYTHON_SITELIBDIR%%/buzhug/__init__.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_algos.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_algos.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_algos.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_files.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_files.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_files.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_info.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_info.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_info.pyo -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_test.py -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_test.pyc -%%PYTHON_SITELIBDIR%%/buzhug/buzhug_test.pyo -%%PYTHON_SITELIBDIR%%/buzhug/conversion_float.py -%%PYTHON_SITELIBDIR%%/buzhug/conversion_float.pyc -%%PYTHON_SITELIBDIR%%/buzhug/conversion_float.pyo Index: databases/emma/Makefile =================================================================== --- databases/emma/Makefile +++ databases/emma/Makefile @@ -10,9 +10,9 @@ MAINTAINER= jun-g@daemonfreaks.com COMMENT= Extendable MySQL managing assistant -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} -USES= python +USES= python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils Index: databases/gadfly/Makefile =================================================================== --- databases/gadfly/Makefile +++ databases/gadfly/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SQL database written in Python -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: databases/grass7/Makefile =================================================================== --- databases/grass7/Makefile +++ databases/grass7/Makefile @@ -25,7 +25,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/GPL.TXT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR} LIB_DEPENDS= libgdal.so:graphics/gdal \ libpng.so:graphics/png \ libproj.so:graphics/proj \ @@ -113,7 +113,7 @@ PGSQL_CONFIGURE_ON= --with-postgres SQLITE_USES= sqlite SQLITE_CONFIGURE_ON= --with-sqlite -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .include Index: databases/metakit/Makefile =================================================================== --- databases/metakit/Makefile +++ databases/metakit/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ON= --with-python=${LOCALBASE} PYTHON_CATEGORIES= python Index: databases/monetdb/Makefile =================================================================== --- databases/monetdb/Makefile +++ databases/monetdb/Makefile @@ -177,7 +177,7 @@ .endif .if ${PORT_OPTIONS:MPYTHON2} -USES+= python:2 +USES+= python:2.7 PLIST_SUB+= PYTHON_VER=${PYTHON_VER} CONFIGURE_ARGS+= --with-python2=${PYTHON_CMD} \ --without-python3 @@ -186,7 +186,7 @@ .endif .if ${PORT_OPTIONS:MPYTHON3} -USES+= python:3 +USES+= python:3.4+ USE_PYTHON= py3kplist PLIST_SUB+= PYTHON_VER=${PYTHON_VER} CONFIGURE_ARGS+= --with-python3=${PYTHON_CMD} \ Index: databases/mtools-mongodb/Makefile =================================================================== --- databases/mtools-mongodb/Makefile +++ databases/mtools-mongodb/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} USE_PYTHON= autoplist distutils USES= python:2 Index: databases/mydbf2mysql/Makefile =================================================================== --- databases/mydbf2mysql/Makefile +++ databases/mydbf2mysql/Makefile @@ -11,10 +11,10 @@ MAINTAINER= andrey.polyakov@unix.net COMMENT= Flexible tool for DBF import into MySQL -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -RUN_DEPENDS+= ydbf>=0.0.1:devel/py-ydbf +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +RUN_DEPENDS+= ydbf>=0.0.1:devel/py-ydbf@${FLAVOR} -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}/dist/${DISTNAME}/ Index: databases/openark-kit/Makefile =================================================================== --- databases/openark-kit/Makefile +++ databases/openark-kit/Makefile @@ -11,10 +11,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: databases/pg_activity/Makefile =================================================================== --- databases/pg_activity/Makefile +++ databases/pg_activity/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${FLAVOR} OPTIONS_DEFINE= DOCS @@ -20,7 +20,7 @@ GH_ACCOUNT= julmon USES= python:2.6+ -USE_PYTHON= autoplist distutils noegginfo +USE_PYTHON= autoplist distutils noegginfo concurrent optsuffix PYDISTUTILS_INSTALLARGS= --with-man post-patch: Index: databases/pgbarman/Makefile =================================================================== --- databases/pgbarman/Makefile +++ databases/pgbarman/Makefile @@ -15,10 +15,10 @@ LICENSE= GPLv3 RUN_DEPENDS= rsync:net/rsync \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh \ - ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${FLAVOR} NO_ARCH= yes @@ -27,7 +27,7 @@ USES= pgsql python WANT_PGSQL= client -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix PORTDOCS= tutorial.pdf Index: databases/pgloader/Makefile =================================================================== --- databases/pgloader/Makefile +++ databases/pgloader/Makefile @@ -11,10 +11,10 @@ COMMENT= Import CSV data and Large Object to PostgreSQL NO_BUILD= yes -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= *.py -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2 +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2@${PY_FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES Index: databases/pgworksheet/Makefile =================================================================== --- databases/pgworksheet/Makefile +++ databases/pgworksheet/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL@${FLAVOR} USES= pgsql python:2 tar:bzip2 USE_GNOME= pygtk2 Index: databases/powa-web/Makefile =================================================================== --- databases/powa-web/Makefile +++ databases/powa-web/Makefile @@ -12,9 +12,9 @@ LICENSE= PostgreSQL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-Elixir/Makefile =================================================================== --- databases/py-Elixir/Makefile +++ databases/py-Elixir/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.0:databases/py-sqlalchemy10 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.0:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-Pyrseas/Makefile =================================================================== --- databases/py-Pyrseas/Makefile +++ databases/py-Pyrseas/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-agate-sql/Makefile =================================================================== --- databases/py-agate-sql/Makefile +++ databases/py-agate-sql/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: databases/py-alembic/Makefile =================================================================== --- databases/py-alembic/Makefile +++ databases/py-alembic/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-apsw/Makefile =================================================================== --- databases/py-apsw/Makefile +++ databases/py-apsw/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_PYTHON= autoplist concurrent distutils -USES?= localbase python sqlite:3 +USES= localbase python sqlite:3 GH_ACCOUNT= rogerbinns USE_GITHUB= yes Index: databases/py-bsddb/Makefile =================================================================== --- databases/py-bsddb/Makefile +++ databases/py-bsddb/Makefile @@ -17,7 +17,7 @@ PORTSCOUT= ignore:1 USE_PYTHON= distutils autoplist -USES= bdb python tar:xz +USES= bdb python:2.7 tar:xz DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo @@ -27,12 +27,6 @@ MAKE_ENV= BSDDB_VERSION=${BDB_LIB_NAME} -.include - -.if ${PYTHON_REL} >= 3000 -IGNORE= bsddb package was removed from core standard library since 3.0, use databases/py-bsddb3 instead -.endif - post-extract: @${CP} ${FILESDIR}/setup.py ${WRKSRC} @@ -41,4 +35,4 @@ 's,^\(#include.*\)\(db\.h.*\)$$,\1${BDB_INCLUDE_DIR}/\2,' \ ${WRKSRC}/bsddb.h -.include +.include Index: databases/py-bsddb3/Makefile =================================================================== --- databases/py-bsddb3/Makefile +++ databases/py-bsddb3/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES?= bdb python +USES= bdb python USE_PYTHON= distutils autoplist PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE} Index: databases/py-carbon/Makefile =================================================================== --- databases/py-carbon/Makefile +++ databases/py-carbon/Makefile @@ -12,10 +12,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp \ - ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} NO_ARCH= yes USE_PYTHON= distutils Index: databases/py-couchdb/Makefile =================================================================== --- databases/py-couchdb/Makefile +++ databases/py-couchdb/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} USES= python -USE_PYTHON= distutils pythonprefix +USE_PYTHON= distutils autoplist concurrent pythonprefix .include Index: databases/py-couchdb/pkg-plist =================================================================== --- databases/py-couchdb/pkg-plist +++ /dev/null @@ -1,95 +0,0 @@ -bin/couchdb-dump -bin/couchdb-load -bin/couchdb-load-design-doc -bin/couchdb-replicate -bin/couchpy -%%PYTHON_SITELIBDIR%%/couchdb/__init__.py -%%PYTHON_SITELIBDIR%%/couchdb/__init__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/__init__.pyo -%%PYTHON_SITELIBDIR%%/couchdb/__main__.py -%%PYTHON_SITELIBDIR%%/couchdb/__main__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/__main__.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/client.py -%%PYTHON_SITELIBDIR%%/couchdb/client.pyc -%%PYTHON_SITELIBDIR%%/couchdb/client.pyo -%%PYTHON_SITELIBDIR%%/couchdb/design.py -%%PYTHON_SITELIBDIR%%/couchdb/design.pyc -%%PYTHON_SITELIBDIR%%/couchdb/design.pyo -%%PYTHON_SITELIBDIR%%/couchdb/http.py -%%PYTHON_SITELIBDIR%%/couchdb/http.pyc -%%PYTHON_SITELIBDIR%%/couchdb/http.pyo -%%PYTHON_SITELIBDIR%%/couchdb/json.py -%%PYTHON_SITELIBDIR%%/couchdb/json.pyc -%%PYTHON_SITELIBDIR%%/couchdb/json.pyo -%%PYTHON_SITELIBDIR%%/couchdb/loader.py -%%PYTHON_SITELIBDIR%%/couchdb/loader.pyc -%%PYTHON_SITELIBDIR%%/couchdb/loader.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/mapping.py -%%PYTHON_SITELIBDIR%%/couchdb/mapping.pyc -%%PYTHON_SITELIBDIR%%/couchdb/mapping.pyo -%%PYTHON_SITELIBDIR%%/couchdb/multipart.py -%%PYTHON_SITELIBDIR%%/couchdb/multipart.pyc -%%PYTHON_SITELIBDIR%%/couchdb/multipart.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/__init__.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/__init__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/__init__.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/__main__.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/__main__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/__main__.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/client.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/client.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/client.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/couch_tests.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/couch_tests.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/couch_tests.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/couchhttp.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/couchhttp.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/couchhttp.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/design.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/design.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/design.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/loader.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/loader.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/loader.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/mapping.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/mapping.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/mapping.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/multipart.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/multipart.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/multipart.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/package.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/package.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/package.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/testutil.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/testutil.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/testutil.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tests/tools.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/tools.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/tools.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/util.py -%%PYTHON_SITELIBDIR%%/couchdb/util.pyc -%%PYTHON_SITELIBDIR%%/couchdb/util.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/util2.py -%%PYTHON_SITELIBDIR%%/couchdb/util2.pyc -%%PYTHON_SITELIBDIR%%/couchdb/util2.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/util3.py -%%PYTHON_SITELIBDIR%%/couchdb/util3.pyc -%%PYTHON_SITELIBDIR%%/couchdb/util3.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/couchdb/tests/view.py -%%PYTHON_SITELIBDIR%%/couchdb/tests/view.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tests/view.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/__init__.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/__init__.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/__init__.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/dump.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/dump.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/dump.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/load.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/load.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/load.pyo -%%PYTHON_SITELIBDIR%%/couchdb/tools/replicate.py -%%PYTHON_SITELIBDIR%%/couchdb/tools/replicate.pyc -%%PYTHON_SITELIBDIR%%/couchdb/tools/replicate.pyo -%%PYTHON_SITELIBDIR%%/couchdb/view.py -%%PYTHON_SITELIBDIR%%/couchdb/view.pyc -%%PYTHON_SITELIBDIR%%/couchdb/view.pyo Index: databases/py-cql/Makefile =================================================================== --- databases/py-cql/Makefile +++ databases/py-cql/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/thrift/Thrift.py:devel/py-thrift@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= cql Index: databases/py-django-transaction-hooks/Makefile =================================================================== --- databases/py-django-transaction-hooks/Makefile +++ databases/py-django-transaction-hooks/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.1:www/py-django18@${FLAVOR} NO_ARCH= yes Index: databases/py-fakeredis/Makefile =================================================================== --- databases/py-fakeredis/Makefile +++ databases/py-fakeredis/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-flask-sqlalchemy/Makefile =================================================================== --- databases/py-flask-sqlalchemy/Makefile +++ databases/py-flask-sqlalchemy/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8:databases/py-sqlalchemy10 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.8:databases/py-sqlalchemy10@${FLAVOR} NO_ARCH= yes USES= python Index: databases/py-forgetsql/Makefile =================================================================== --- databases/py-forgetsql/Makefile +++ databases/py-forgetsql/Makefile @@ -23,8 +23,8 @@ OPTIONS_DEFINE= DOCS MYSQL PGSQL -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} .include Index: databases/py-gdbm/Makefile =================================================================== --- databases/py-gdbm/Makefile +++ databases/py-gdbm/Makefile @@ -19,7 +19,7 @@ PORTSCOUT= ignore:1 USES= python tar:xz -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist allflavors PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload Index: databases/py-geoalchemy/Makefile =================================================================== --- databases/py-geoalchemy/Makefile +++ databases/py-geoalchemy/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: databases/py-geoalchemy2/Makefile =================================================================== --- databases/py-geoalchemy2/Makefile +++ databases/py-geoalchemy2/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.8:databases/py-sqlalchemy11 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.8:databases/py-sqlalchemy11@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: databases/py-htsql-mysql/Makefile =================================================================== --- databases/py-htsql-mysql/Makefile +++ databases/py-htsql-mysql/Makefile @@ -14,8 +14,8 @@ LICENSE= AGPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql \ - ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: databases/py-htsql-pgsql/Makefile =================================================================== --- databases/py-htsql-pgsql/Makefile +++ databases/py-htsql-pgsql/Makefile @@ -14,8 +14,8 @@ LICENSE= AGPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: databases/py-htsql/Makefile =================================================================== --- databases/py-htsql/Makefile +++ databases/py-htsql/Makefile @@ -17,7 +17,7 @@ USES= python:2 USE_PYTHON= distutils autoplist -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} .include Index: databases/py-kyotocabinet/Makefile =================================================================== --- databases/py-kyotocabinet/Makefile +++ databases/py-kyotocabinet/Makefile @@ -18,6 +18,6 @@ LIB_DEPENDS= libkyotocabinet.so:databases/kyotocabinet USE_PYTHON= autoplist distutils -USES= python:3 +USES= python:3.4+ .include Index: databases/py-lmdb/Makefile =================================================================== --- databases/py-lmdb/Makefile +++ databases/py-lmdb/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi@${FLAVOR} LIB_DEPENDS= liblmdb.so:databases/lmdb USES= localbase python Index: databases/py-motor/Makefile =================================================================== --- databases/py-motor/Makefile +++ databases/py-motor/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/pymongo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/pymongo@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-mycli/Makefile =================================================================== --- databases/py-mycli/Makefile +++ databases/py-mycli/Makefile @@ -13,14 +13,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers \ - ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.7:databases/py-pymysql \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymysql>=0.6.7:databases/py-pymysql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: databases/py-mysql2pgsql/Makefile =================================================================== --- databases/py-mysql2pgsql/Makefile +++ databases/py-mysql2pgsql/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: databases/py-mysqlclient/Makefile =================================================================== --- databases/py-mysqlclient/Makefile +++ databases/py-mysqlclient/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= iconv mysql python ssl +USES= iconv mysql python ssl USE_PYTHON= distutils autoplist USE_GITHUB= yes GH_ACCOUNT= pymysql Index: databases/py-oursql/Makefile =================================================================== --- databases/py-oursql/Makefile +++ databases/py-oursql/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -USES= mysql python +USES= mysql python:2.7 USE_PYTHON= autoplist distutils post-install: Index: databases/py-peewee/Makefile =================================================================== --- databases/py-peewee/Makefile +++ databases/py-peewee/Makefile @@ -20,8 +20,8 @@ USES= python USE_PYTHON= autoplist distutils -SQLITE_BUILD_DEPENDS= ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3 -MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb -PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2 +SQLITE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +MYSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR} +PGSQL_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${FLAVOR} .include Index: databases/py-pg_pqueue/Makefile =================================================================== --- databases/py-pg_pqueue/Makefile +++ databases/py-pg_pqueue/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS Index: databases/py-pgcli/Makefile =================================================================== --- databases/py-pgcli/Makefile +++ databases/py-pgcli/Makefile @@ -13,16 +13,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers \ - ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize \ - ${PYTHON_PKGNAMEPREFIX}pgspecial>=1.8.0:databases/py-pgspecial \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.4:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cli-helpers>=0.2.3:devel/py-cli-helpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}humanize>=0.5.1:devel/py-humanize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pgspecial>=1.8.0:databases/py-pgspecial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.10:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.4:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.2:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: databases/py-pgspecial/Makefile =================================================================== --- databases/py-pgspecial/Makefile +++ databases/py-pgspecial/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: databases/py-pgxnclient/Makefile =================================================================== --- databases/py-pgxnclient/Makefile +++ databases/py-pgxnclient/Makefile @@ -11,6 +11,6 @@ COMMENT= Command line tool to interact with the PostgreSQL Extension Network USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: databases/py-pickledb/Makefile =================================================================== --- databases/py-pickledb/Makefile +++ databases/py-pickledb/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: databases/py-pickleshare/Makefile =================================================================== --- databases/py-pickleshare/Makefile +++ databases/py-pickleshare/Makefile @@ -20,7 +20,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${FLAVOR} .endif .include Index: databases/py-psycopg2/Makefile =================================================================== --- databases/py-psycopg2/Makefile +++ databases/py-psycopg2/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES USE_PYTHON= autoplist concurrent distutils -USES?= pgsql python +USES= pgsql python PORTDOCS= AUTHORS INSTALL NEWS PKG-INFO README.rst PORTEXAMPLES= * Index: databases/py-psycopg2cffi/Makefile =================================================================== --- databases/py-psycopg2cffi/Makefile +++ databases/py-psycopg2cffi/Makefile @@ -12,8 +12,8 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi -RUN_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} USES= pgsql python USE_PYTHON= autoplist distutils Index: databases/py-pyhs/Makefile =================================================================== --- databases/py-pyhs/Makefile +++ databases/py-pyhs/Makefile @@ -12,7 +12,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= HandlerSocket client for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: databases/py-pymssql/Makefile =================================================================== --- databases/py-pymssql/Makefile +++ databases/py-pymssql/Makefile @@ -12,12 +12,11 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${FLAVOR} LIB_DEPENDS= libsybdb.so:databases/freetds USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-extract: @${RM} ${WRKSRC}/_mssql.c Index: databases/py-pytc/Makefile =================================================================== --- databases/py-pytc/Makefile +++ databases/py-pytc/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libtokyocabinet.so:databases/tokyocabinet -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: databases/py-python-rrdtool/Makefile =================================================================== --- databases/py-python-rrdtool/Makefile +++ databases/py-python-rrdtool/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= librrd.so:databases/rrdtool -USES= groff pkgconfig python +USES= groff pkgconfig python:2.7 USE_GNOME= cairo glib20 libxml2 pango USE_PYTHON= distutils autoplist Index: databases/py-python-swiftclient/Makefile =================================================================== --- databases/py-python-swiftclient/Makefile +++ databases/py-python-swiftclient/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests +RUN_DEPENDS+= ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${FLAVOR} -USES= python:2 +USES= python USE_PYTHON= distutils autoplist post-install: Index: databases/py-qt4-sql/Makefile =================================================================== --- databases/py-qt4-sql/Makefile +++ databases/py-qt4-sql/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui sql \ moc_build qmake_build Index: databases/py-qt5-sql/Makefile =================================================================== --- databases/py-qt5-sql/Makefile +++ databases/py-qt5-sql/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui sql widgets buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: databases/py-queries/Makefile =================================================================== --- databases/py-queries/Makefile +++ databases/py-queries/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1:databases/py-psycopg2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: databases/py-rb/Makefile =================================================================== --- databases/py-rb/Makefile +++ databases/py-rb/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.6:databases/py-redis@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: databases/py-redis/Makefile =================================================================== --- databases/py-redis/Makefile +++ databases/py-redis/Makefile @@ -18,7 +18,7 @@ HIREDIS_DESC= High performance response parser (via hiredis) -HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis +HIREDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis@${FLAVOR} USES= python USE_PYTHON= distutils autoplist concurrent Index: databases/py-riak/Makefile =================================================================== --- databases/py-riak/Makefile +++ databases/py-riak/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}riak_pb>=2.0.0:devel/py-riak_pb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: databases/py-sqlalchemy-migrate/Makefile =================================================================== --- databases/py-sqlalchemy-migrate/Makefile +++ databases/py-sqlalchemy-migrate/Makefile @@ -13,13 +13,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.8:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \ - ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse \ - ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.8:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: databases/py-sqlalchemy10/Makefile =================================================================== --- databases/py-sqlalchemy10/Makefile +++ databases/py-sqlalchemy10/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= distutils autoplist @@ -34,10 +34,10 @@ MSSQL_DESC= MS SQL Server backend SYBASE_DESC= Sybase backend -MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-pymssql -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase +MSSQL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pymssql.py:databases/py-pymssql@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +SYBASE_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Sybase.py:databases/py-sybase@${FLAVOR} PORTDOCS= * PORTEXAMPLES= * @@ -45,11 +45,11 @@ .include .if ${PYTHON_REL} < 3000 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} #.else # At the moment databases/py-pymysql does not build with Python3 # See https://github.com/petehunt/PyMySQL#python-3-0-support -#MYSQL_RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql +#MYSQL_RUN_DEPENDS+= pymysql>=0.5:databases/py-pymysql@${FLAVOR} .endif pre-build: Index: databases/py-sqlalchemy11/Makefile =================================================================== --- databases/py-sqlalchemy11/Makefile +++ databases/py-sqlalchemy11/Makefile @@ -14,9 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${FLAVOR} CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}sqlalchemy0 ${PYTHON_PKGNAMEPREFIX}sqlalchemy10 @@ -31,11 +31,11 @@ PORTDOCS= * PORTEXAMPLES= * -MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>=0:databases/py-pymssql -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 -SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0:databases/py-sybase +MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mssql>=0:databases/py-pymssql@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} +SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0:databases/py-sybase@${FLAVOR} post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so Index: databases/py-sqlite3/Makefile =================================================================== --- databases/py-sqlite3/Makefile +++ databases/py-sqlite3/Makefile @@ -21,7 +21,7 @@ PORTSCOUT= ignore:1 USES= python tar:xz -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils allflavors DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo WRKSRC= ${WRKDIR}/Python-${PORTVERSION}/Modules Index: databases/py-sqlite3dbm/Makefile =================================================================== --- databases/py-sqlite3dbm/Makefile +++ databases/py-sqlite3dbm/Makefile @@ -11,10 +11,10 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Sqlite-backed dictionary -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: databases/py-sqlobject/Makefile =================================================================== --- databases/py-sqlobject/Makefile +++ databases/py-sqlobject/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes @@ -26,11 +26,11 @@ PORTDOCS= * -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 -MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql -SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0.37:databases/py-sybase +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} +MSSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${FLAVOR} +SYBASE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sybase>=0.37:databases/py-sybase@${FLAVOR} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Index: databases/py-swift/Makefile =================================================================== --- databases/py-swift/Makefile +++ databases/py-swift/Makefile @@ -13,22 +13,22 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.5.21:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=0:databases/py-python-swiftclient \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=1.10.0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.8:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=0:databases/py-python-swiftclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.8:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xattr>=0:devel/py-xattr@${FLAVOR} \ memcached>=0:databases/memcached \ rsync>=3.0:net/rsync -USES= python:2 +USES= python:2.7 USE_PYTHON= distutils autoplist USE_RC_SUBR= swift USERS= swift Index: databases/py-sybase/Makefile =================================================================== --- databases/py-sybase/Makefile +++ databases/py-sybase/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libct.so:databases/freetds -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS THREADS EXAMPLES Index: databases/py-unqlite/Makefile =================================================================== --- databases/py-unqlite/Makefile +++ databases/py-unqlite/Makefile @@ -11,9 +11,7 @@ LICENSE= MIT -BUILD_DEPENDS= cython>0:lang/cython - USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython .include Index: databases/py-xapian/Makefile =================================================================== --- databases/py-xapian/Makefile +++ databases/py-xapian/Makefile @@ -17,7 +17,7 @@ BROKEN_aarch64= fails to build: Fatal Python error: swig_pythreadstate set in XapianSWIG_Python_Thread_Allow ctor -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${FLAVOR} \ xapian-core>=${PORTVERSION}:databases/xapian-core LIB_DEPENDS= libxapian.so:databases/xapian-core @@ -34,6 +34,7 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= libtool python tar:xz +USE_PYTHON= flavors PORTDOCS= * Index: databases/py3-apsw/Makefile =================================================================== --- databases/py3-apsw/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -USES= localbase python:3.3+ sqlite:3 - -PORTSCOUT= ignore:1 - -MASTERDIR= ${.CURDIR}/../py-apsw - -.include "${MASTERDIR}/Makefile" Index: databases/py3-bsddb3/Makefile =================================================================== --- databases/py3-bsddb3/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-bsddb3 - -USES= bdb python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: databases/py3-mysqlclient/Makefile =================================================================== --- databases/py3-mysqlclient/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mysqlclient - -USES= python:3.3+ mysql - -.include "${MASTERDIR}/Makefile" Index: databases/py3-psycopg2/Makefile =================================================================== --- databases/py3-psycopg2/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-psycopg2 - -PORTSCOUT= ignore:1 - -USES= pgsql python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: databases/py34-gdbm/Makefile =================================================================== --- databases/py34-gdbm/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-gdbm - -PYTHON_VERSION= python3.4 - -.include "${MASTERDIR}/Makefile" Index: databases/py34-sqlite3/Makefile =================================================================== --- databases/py34-sqlite3/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sqlite3 - -PYTHON_VERSION= python3.4 - -.include "${MASTERDIR}/Makefile" Index: databases/py35-gdbm/Makefile =================================================================== --- databases/py35-gdbm/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-gdbm - -PYTHON_VERSION= python3.5 - -.include "${MASTERDIR}/Makefile" Index: databases/py35-sqlite3/Makefile =================================================================== --- databases/py35-sqlite3/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sqlite3 - -PYTHON_VERSION= python3.5 - -.include "${MASTERDIR}/Makefile" Index: databases/py36-gdbm/Makefile =================================================================== --- databases/py36-gdbm/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-gdbm - -PYTHON_VERSION= python3.6 - -.include "${MASTERDIR}/Makefile" Index: databases/py36-sqlite3/Makefile =================================================================== --- databases/py36-sqlite3/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sqlite3 - -PYTHON_VERSION= python3.6 - -.include "${MASTERDIR}/Makefile" Index: databases/pydbx/Makefile =================================================================== --- databases/pydbx/Makefile +++ databases/pydbx/Makefile @@ -11,7 +11,7 @@ MAINTAINER= david@acz.org COMMENT= Simple SQL database abstraction layer for Python -USES= python -USE_PYTHON= distutils +USES= python:2.7 +USE_PYTHON= distutils autoplist .include Index: databases/pydbx/pkg-plist =================================================================== --- databases/pydbx/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -%%PYTHON_SITELIBDIR%%/dbx/__init__.py -%%PYTHON_SITELIBDIR%%/dbx/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbx/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbx/mysql.py -%%PYTHON_SITELIBDIR%%/dbx/mysql.pyc -%%PYTHON_SITELIBDIR%%/dbx/mysql.pyo -%%PYTHON_SITELIBDIR%%/dbx/sqlite.py -%%PYTHON_SITELIBDIR%%/dbx/sqlite.pyc -%%PYTHON_SITELIBDIR%%/dbx/sqlite.pyo Index: databases/pyspatialite/Makefile =================================================================== --- databases/pyspatialite/Makefile +++ databases/pyspatialite/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS -USES= iconv python +USES= iconv python:2.7 USE_PYTHON= autoplist concurrent distutils .include Index: databases/rrdtool/Makefile =================================================================== --- databases/rrdtool/Makefile +++ databases/rrdtool/Makefile @@ -52,6 +52,7 @@ PERL_USES= perl5 PYTHON_CONFIGURE_ENABLE=python PYTHON_USES= python +PYTHON_USE= python=flavors,optsuffix RUBY_CONFIGURE_ENABLE= ruby RUBY_USE= RUBY=yes Index: databases/rrdtool12/Makefile =================================================================== --- databases/rrdtool12/Makefile +++ databases/rrdtool12/Makefile @@ -29,7 +29,7 @@ .include .if ${PORT_OPTIONS:MPYTHON} -USES+= python +USES+= python:2.7 PLIST_SUB+= WITH_PYTHON="" CONFIGURE_ARGS+= --enable-python .else Index: databases/zodb3/Makefile =================================================================== --- databases/zodb3/Makefile +++ databases/zodb3/Makefile @@ -14,12 +14,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \ - ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: deskutils/calibre/Makefile =================================================================== --- deskutils/calibre/Makefile +++ deskutils/calibre/Makefile @@ -19,32 +19,32 @@ libpodofo.so:graphics/podofo \ libmtp.so:multimedia/libmtp \ libfreetype.so:print/freetype2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \ - ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} RUN_DEPENDS= xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \ - ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \ Index: deskutils/conduit/Makefile =================================================================== --- deskutils/conduit/Makefile +++ deskutils/conduit/Makefile @@ -11,15 +11,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Synchronization application for GNOME -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS= libdbus-1.so:devel/dbus -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ xdg-open:devel/xdg-utils GNU_CONFIGURE= yes Index: deskutils/conkyemail/Makefile =================================================================== --- deskutils/conkyemail/Makefile +++ deskutils/conkyemail/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= conky:sysutils/conky -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_BUILD= yes NO_ARCH= yes Index: deskutils/conkyforecast/Makefile =================================================================== --- deskutils/conkyforecast/Makefile +++ deskutils/conkyforecast/Makefile @@ -18,7 +18,7 @@ pidof:sysutils/pidof USES= gettext python fonts -USE_PYTHON= distutils +USE_PYTHON= distutils concurrent optsuffix SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/src Index: deskutils/dosage/Makefile =================================================================== --- deskutils/dosage/Makefile +++ deskutils/dosage/Makefile @@ -11,10 +11,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix post-patch: @${REINPLACE_CMD} 's|share/man/man1|man/man1|' ${WRKSRC}/setup.py Index: deskutils/everygui/Makefile =================================================================== --- deskutils/everygui/Makefile +++ deskutils/everygui/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= dos2unix python shebangfix +USES= dos2unix python:2.7 shebangfix SHEBANG_FILES= src/*.py DOS2UNIX_GLOB= *.py USE_PYTHON= distutils autoplist Index: deskutils/gbirthday/Makefile =================================================================== --- deskutils/gbirthday/Makefile +++ deskutils/gbirthday/Makefile @@ -18,11 +18,11 @@ OPTIONS_DEFINE= MYSQL NLS NOTIFY THUNDERBIRD OPTIONS_SUB= yes THUNDERBIRD_DESC= Thunderbird/Sunbird support -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR} NLS_USES= gettext NLS_USE= GNOME=intltool -NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify -THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify@${PY_FLAVOR} +THUNDERBIRD_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} NO_ARCH= yes USES= python:2.7,run Index: deskutils/gcalcli/Makefile =================================================================== --- deskutils/gcalcli/Makefile +++ deskutils/gcalcli/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}gdata>=0:devel/py-gdata \ - ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdata>=0:devel/py-gdata@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=0:www/py-google-api-python-client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-gflags>=0:devel/py-python-gflags@${PY_FLAVOR} USES= python:-2.7 shebangfix USE_GITHUB= yes @@ -31,9 +31,9 @@ SIMPLEJSON_DESC= Use simplejson for url shortening FUZZYDATES_DESC= Use parsedatetime for fuzzy date parsing -ICS_VCAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject -SIMPLEJSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson -FUZZYDATES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime +ICS_VCAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:deskutils/py-vobject@${PY_FLAVOR} +SIMPLEJSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR} +FUZZYDATES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}parsedatetime>=0:devel/py-parsedatetime@${PY_FLAVOR} NO_BUILD= yes NO_ARCH= yes Index: deskutils/gnome-sound-recorder/Makefile =================================================================== --- deskutils/gnome-sound-recorder/Makefile +++ deskutils/gnome-sound-recorder/Makefile @@ -14,7 +14,7 @@ PORTSCOUT= limitw:1,even -USES= gettext gmake gnome libtool pathfix pkgconfig python:3 tar:xz +USES= gettext gmake gnome libtool pathfix pkgconfig python:3.4+ tar:xz USE_GNOME= gnomedesktop3 gtk30 intlhack introspection:build USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: deskutils/gourmet/Makefile =================================================================== --- deskutils/gourmet/Makefile +++ deskutils/gourmet/Makefile @@ -12,16 +12,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \ - ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler \ - ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf \ - ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab \ - ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${FLAVOR} OPTIONS_DEFINE= IPYTHON IPYTHON_DESC= Interactive shell support Index: deskutils/griffith/Makefile =================================================================== --- deskutils/griffith/Makefile +++ deskutils/griffith/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.5:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.5:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1@${PY_FLAVOR} USES= gmake gettext python:2 shebangfix tar:xz SHEBANG_FILES= griffith @@ -28,10 +28,10 @@ OPTIONS_DEFAULT= LXML CHARDET_DESC= chardet support -CHARDET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet +CHARDET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} LXML_DESC= lxml support -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} post-patch: .for file in Makefile Index: deskutils/gtg/Makefile =================================================================== --- deskutils/gtg/Makefile +++ deskutils/gtg/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch@${FLAVOR} \ xset:x11/xset USE_GNOME= pygobject pygtk2 @@ -24,7 +24,7 @@ OPTIONS_DEFINE= CHEETAH CHEETAH_DESC= Needed for export plugin to work OPTIONS_EXCLUDE= NLS DOCS -CHEETAH_RUN_DEPENDS= ${LOCALBASE}/bin/cheetah:devel/py-cheetah +CHEETAH_RUN_DEPENDS= ${LOCALBASE}/bin/cheetah:devel/py-cheetah@${FLAVOR} .include Index: deskutils/py-bugwarrior/Makefile =================================================================== --- deskutils/py-bugwarrior/Makefile +++ deskutils/py-bugwarrior/Makefile @@ -13,36 +13,36 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} OPTIONS_DEFINE= BUGZILLA JIRA PHABRICATOR OPTIONS_DEFAULT= BUGZILLA PHABRICATOR BUGZILLA_DESC= Enable Bugzilla support -BUGZILLA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla +BUGZILLA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${FLAVOR} JIRA_DESC= Enabla Atlassian Jira support -JIRA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira +JIRA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira@${FLAVOR} PHABRICATOR_DESC= Enable Phabricator support -PHABRICATOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator +PHABRICATOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${FLAVOR} TRAC_DESC= Enable Trac support -TRAC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac +TRAC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist concurrent distutils Index: deskutils/py-khal/Makefile =================================================================== --- deskutils/py-khal/Makefile +++ deskutils/py-khal/Makefile @@ -13,17 +13,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2014.10,1:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \ - ${PYTHON_PKGNAMEPREFIX}vdirsyncer<0.13:deskutils/py-vdirsyncer \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}icalendar>=3.8.2:devel/py-icalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2014.10,1:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.3:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vdirsyncer<0.13:deskutils/py-vdirsyncer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkginfo>0:sysutils/py-pkginfo@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: deskutils/py-pycarddav/Makefile =================================================================== --- deskutils/py-pycarddav/Makefile +++ deskutils/py-pycarddav/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.2.1:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.0:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: deskutils/py-pystash/Makefile =================================================================== --- deskutils/py-pystash/Makefile +++ deskutils/py-pystash/Makefile @@ -11,10 +11,10 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Save your code snippets in the cloud from the command line -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args \ - ${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: deskutils/py-taskw/Makefile =================================================================== --- deskutils/py-taskw/Makefile +++ deskutils/py-taskw/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: deskutils/py-vdirsyncer/Makefile =================================================================== --- deskutils/py-vdirsyncer/Makefile +++ deskutils/py-vdirsyncer/Makefile @@ -12,15 +12,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites \ - ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log \ - ${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading \ - ${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:devel/py-icalendar \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}icalendar>=3.6:devel/py-icalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: deskutils/py-vobject/Makefile =================================================================== --- deskutils/py-vobject/Makefile +++ deskutils/py-vobject/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: deskutils/pybookreader/Makefile =================================================================== --- deskutils/pybookreader/Makefile +++ deskutils/pybookreader/Makefile @@ -11,9 +11,9 @@ MAINTAINER= ufo@februality.com COMMENT= Program for reading e-books -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= PyBookReader USE_GNOME= pygtk2 Index: deskutils/pypanel/Makefile =================================================================== --- deskutils/pypanel/Makefile +++ deskutils/pypanel/Makefile @@ -16,10 +16,10 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libImlib2.so:graphics/imlib2 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USE_XORG= xft Index: deskutils/rednotebook/Makefile =================================================================== --- deskutils/rednotebook/Makefile +++ deskutils/rednotebook/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR} \ ${LOCALBASE}/bin/xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet + ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} USES= desktop-file-utils gettext python:2 Index: deskutils/syncthing-gtk/Makefile =================================================================== --- deskutils/syncthing-gtk/Makefile +++ deskutils/syncthing-gtk/Makefile @@ -10,8 +10,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= syncthing Index: deskutils/taskcoach/Makefile =================================================================== --- deskutils/taskcoach/Makefile +++ deskutils/taskcoach/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils PYDISTUTILS_EGGINFO=${DISTNAME}-py${PYTHON_VER}.egg-info USE_WX= 3.0+ Index: deskutils/tel/Makefile =================================================================== --- deskutils/tel/Makefile +++ deskutils/tel/Makefile @@ -14,7 +14,7 @@ NO_ARCH= yes -USES= gettext python shebangfix tar:bzip2 +USES= gettext python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= src/tel.py USE_PYTHON= distutils Index: deskutils/virt-manager/Makefile =================================================================== --- deskutils/virt-manager/Makefile +++ deskutils/virt-manager/Makefile @@ -12,13 +12,13 @@ LICENSE= LGPL3 LIB_DEPENDS= libvirt.so:devel/libvirt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2@${FLAVOR} \ vte3>=0:x11-toolkits/vte3 \ - ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr \ - ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber \ - ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ + ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ gtk-vnc>=0.4.4:net/gtk-vnc \ libvirt-glib>=0.1.9:devel/libvirt-glib \ libosinfo>=0:devel/libosinfo \ Index: deskutils/vnc2flv/Makefile =================================================================== --- deskutils/vnc2flv/Makefile +++ deskutils/vnc2flv/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Captures a VNC desktop session and saves as a flv -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= X11 Index: deskutils/wammu/Makefile =================================================================== --- deskutils/wammu/Makefile +++ deskutils/wammu/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libGammu.so:comms/gammu -USES= gettext pkgconfig python tar:bz2 +USES= gettext pkgconfig python:2.7 tar:bz2 USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python:lib Index: deskutils/zim/Makefile =================================================================== --- deskutils/zim/Makefile +++ deskutils/zim/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} \ xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} NO_ARCH= yes USES= desktop-file-utils gettext python:-2.7 shared-mime-info Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -4857,6 +4857,7 @@ SUBDIR += py-semantic_version SUBDIR += py-serpent SUBDIR += py-setproctitle + SUBDIR += py-setuptools SUBDIR += py-setuptools-git SUBDIR += py-setuptools-pkg SUBDIR += py-setuptools_darcs @@ -4915,6 +4916,7 @@ SUBDIR += py-testoob SUBDIR += py-testpath SUBDIR += py-testtools + SUBDIR += py-threema-msgapi SUBDIR += py-thrift SUBDIR += py-thriftpy SUBDIR += py-timelib @@ -5080,85 +5082,6 @@ SUBDIR += py-zope.testing SUBDIR += py-zope.traversing SUBDIR += py-zope.viewlet - SUBDIR += py27-setuptools - SUBDIR += py3-Jinja2 - SUBDIR += py3-apipkg - SUBDIR += py3-asttokens - SUBDIR += py3-babel - SUBDIR += py3-cffi - SUBDIR += py3-click - SUBDIR += py3-click-log - SUBDIR += py3-click-threading - SUBDIR += py3-colorama - SUBDIR += py3-coloredlogs - SUBDIR += py3-dateutil - SUBDIR += py3-dbus - SUBDIR += py3-defusedxml - SUBDIR += py3-docopt - SUBDIR += py3-flake8 - SUBDIR += py3-flake8-builtins - SUBDIR += py3-flake8-docstrings - SUBDIR += py3-flake8-import-order - SUBDIR += py3-flake8-polyfill - SUBDIR += py3-flake8-quotes - SUBDIR += py3-freezegun - SUBDIR += py3-gobject3 - SUBDIR += py3-hgtools - SUBDIR += py3-icalendar - SUBDIR += py3-jedi - SUBDIR += py3-jsonschema - SUBDIR += py3-libpeas - SUBDIR += py3-libzfs - SUBDIR += py3-llfuse - SUBDIR += py3-lxml - SUBDIR += py3-mccabe - SUBDIR += py3-mock - SUBDIR += py3-nose - SUBDIR += py3-pbr - SUBDIR += py3-pip - SUBDIR += py3-pluggy - SUBDIR += py3-ply - SUBDIR += py3-pretend - SUBDIR += py3-prompt_toolkit - SUBDIR += py3-protobuf - SUBDIR += py3-py - SUBDIR += py3-pyasn1 - SUBDIR += py3-pycodestyle - SUBDIR += py3-pycparser - SUBDIR += py3-pydocstyle - SUBDIR += py3-pyflakes - SUBDIR += py3-pygit2 - SUBDIR += py3-pyicu - SUBDIR += py3-pylru-cache - SUBDIR += py3-pytest - SUBDIR += py3-pytest-capturelog - SUBDIR += py3-pytest-runner - SUBDIR += py3-pytest-timeout - SUBDIR += py3-pytest-xdist - SUBDIR += py3-python-magic - SUBDIR += py3-pytz - SUBDIR += py3-rubymarshal - SUBDIR += py3-scripttest - SUBDIR += py3-setproctitle - SUBDIR += py3-setuptools_scm - SUBDIR += py3-simplejson - SUBDIR += py3-six - SUBDIR += py3-tabulate - SUBDIR += py3-threema-msgapi - SUBDIR += py3-toposort - SUBDIR += py3-tox - SUBDIR += py3-tzlocal - SUBDIR += py3-urwid - SUBDIR += py3-vcversioner - SUBDIR += py3-verboselogs - SUBDIR += py3-virtualenv - SUBDIR += py3-voluptuous - SUBDIR += py3-wcwidth - SUBDIR += py3-xdg - SUBDIR += py3-yaml - SUBDIR += py34-setuptools - SUBDIR += py35-setuptools - SUBDIR += py36-setuptools SUBDIR += py_static_check SUBDIR += pybind11 SUBDIR += pybugz Index: devel/ahven/Makefile =================================================================== --- devel/ahven/Makefile +++ devel/ahven/Makefile @@ -23,7 +23,7 @@ TRACE_DESC= Build with GNAT-specific symbolic tracing functionality DOCS_USES= python:build -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-adadomain>0:textproc/py-sphinxcontrib-adadomain TRACE_EXTRA_PATCHES= ${FILESDIR}/extra-src_ahven-framework.adb Index: devel/android-tools-adb/Makefile =================================================================== --- devel/android-tools-adb/Makefile +++ devel/android-tools-adb/Makefile @@ -65,7 +65,7 @@ TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development -TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} TEST_PYTHON_USES= python:2.7,build post-patch: Index: devel/antlr/Makefile =================================================================== --- devel/antlr/Makefile +++ devel/antlr/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= PYTHON DOCS OPTIONS_SUB= yes -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_PORTDOCS= python-runtime.html post-extract: Index: devel/arpc/Makefile =================================================================== --- devel/arpc/Makefile +++ devel/arpc/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py3-pyPEG2 \ - ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py3-toposort +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py-pyPEG2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} LIB_DEPENDS= libargdata.so:devel/argdata -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py3-pyPEG2 \ - ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py3-toposort +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyPEG2>=2.15.2:textproc/py-pyPEG2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}toposort>=1.5:devel/py-toposort@${PY_FLAVOR} -USES= cmake localbase:ldflags python:3 tar:xz +USES= cmake localbase:ldflags python:3.4+ tar:xz USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= NuxiNL Index: devel/awscli/Makefile =================================================================== --- devel/awscli/Makefile +++ devel/awscli/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.12.1 CATEGORIES= devel MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bhughes@FreeBSD.org COMMENT= Universal Command Line Interface for Amazon Web Services @@ -12,15 +13,15 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.8.1:devel/py-botocore \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.8.1:devel/py-botocore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.9:net/py-s3transfer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:security/py-rsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent NO_ARCH= yes .include Index: devel/b2/Makefile =================================================================== --- devel/b2/Makefile +++ devel/b2/Makefile @@ -12,15 +12,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow \ - ${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2:devel/py-logfury \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0:misc/py-tqdm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}arrow>=0.8.0:devel/py-arrow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}logfury>=0.1.2:devel/py-logfury@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.5.0:misc/py-tqdm@${FLAVOR} USES= python:2.7+ -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix USE_GITHUB= yes GH_ACCOUNT= Backblaze Index: devel/bbfreeze/Makefile =================================================================== --- devel/bbfreeze/Makefile +++ devel/bbfreeze/Makefile @@ -12,7 +12,7 @@ LICENSE= ZLIB -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader USES= python:2 zip Index: devel/bicyclerepair/Makefile =================================================================== --- devel/bicyclerepair/Makefile +++ devel/bicyclerepair/Makefile @@ -10,7 +10,7 @@ MAINTAINER= mwm@mired.org COMMENT= Python refactoring tool -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: devel/bpython/Makefile =================================================================== --- devel/bpython/Makefile +++ devel/bpython/Makefile @@ -14,12 +14,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curtsies>=0.1.18:devel/py-curtsies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} OPTIONS_DEFINE= EXAMPLES NLS OPTIONS_SUB= yes Index: devel/bzr-builder/Makefile =================================================================== --- devel/bzr-builder/Makefile +++ devel/bzr-builder/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-colo/Makefile =================================================================== --- devel/bzr-colo/Makefile +++ devel/bzr-colo/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-explorer/Makefile =================================================================== --- devel/bzr-explorer/Makefile +++ devel/bzr-explorer/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 BUILD_DEPENDS= bzr:devel/bzr -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bzrlib/plugins/qbzr/__init__.py:devel/qbzr@${FLAVOR} \ bzr:devel/bzr -USES= gettext python +USES= gettext python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-externals/Makefile =================================================================== --- devel/bzr-externals/Makefile +++ devel/bzr-externals/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/externals -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-fastimport/Makefile =================================================================== --- devel/bzr-fastimport/Makefile +++ devel/bzr-fastimport/Makefile @@ -14,9 +14,9 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr \ - ${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport + ${PYTHON_SITELIBDIR}/fastimport/__init__.py:devel/py-fastimport@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-git/Makefile =================================================================== --- devel/bzr-git/Makefile +++ devel/bzr-git/Makefile @@ -15,10 +15,10 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr \ - ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.0:devel/dulwich@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-gtk/Makefile =================================================================== --- devel/bzr-gtk/Makefile +++ devel/bzr-gtk/Makefile @@ -15,10 +15,10 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr \ - ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo + ${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${FLAVOR} -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 USE_PYTHON= distutils autoplist USE_GNOME= pygtk2 INSTALLS_ICONS= yes Index: devel/bzr-loom/Makefile =================================================================== --- devel/bzr-loom/Makefile +++ devel/bzr-loom/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-pipeline/Makefile =================================================================== --- devel/bzr-pipeline/Makefile +++ devel/bzr-pipeline/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${PORTNAME} Index: devel/bzr-rewrite/Makefile =================================================================== --- devel/bzr-rewrite/Makefile +++ devel/bzr-rewrite/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-scmproj/Makefile =================================================================== --- devel/bzr-scmproj/Makefile +++ devel/bzr-scmproj/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS= bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-stats/Makefile =================================================================== --- devel/bzr-stats/Makefile +++ devel/bzr-stats/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-svn/Makefile =================================================================== --- devel/bzr-svn/Makefile +++ devel/bzr-svn/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 BUILD_DEPENDS+= bzr:devel/bzr -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy \ +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/subvertpy/__init__.py:devel/py-subvertpy@${FLAVOR} \ bzr:devel/bzr -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr-upload/Makefile =================================================================== --- devel/bzr-upload/Makefile +++ devel/bzr-upload/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= bzr:devel/bzr RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/bzr/Makefile =================================================================== --- devel/bzr/Makefile +++ devel/bzr/Makefile @@ -10,18 +10,15 @@ MAINTAINER= fullermd@over-yonder.net COMMENT= Distributed version control system by Canonical -# Often not needed, but it's cheap insurance -BUILD_DEPENDS= cython:lang/cython - OPTIONS_DEFINE= SFTP CA_BUNDLE SFTP_DESC= Paramiko for SFTP support CA_BUNDLE_DESC= Include CA bundle for SSL cert validation OPTIONS_DEFAULT= SFTP CA_BUNDLE -SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko +SFTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${FLAVOR} CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USE_PYTHON= distutils +USE_PYTHON= distutils cython PYDISTUTILS_PKGNAME= bzr USES= gettext python:2 MAKE_ENV= BZR_LOG=/dev/null Index: devel/bzrtools/Makefile =================================================================== --- devel/bzrtools/Makefile +++ devel/bzrtools/Makefile @@ -19,7 +19,7 @@ RSYNC_DESC= rsync for rspush WRKSRC= ${WRKDIR}/bzrtools -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= BzrTools Index: devel/codeville/Makefile =================================================================== --- devel/codeville/Makefile +++ devel/codeville/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE NO_ARCH= yes -USES= python tar:xz +USES= python:2.7 tar:xz USE_PYTHON= distutils autoplist PORTDOCS= LICENSE.txt Index: devel/cppcheck/Makefile =================================================================== --- devel/cppcheck/Makefile +++ devel/cppcheck/Makefile @@ -47,7 +47,7 @@ HTMLREPORT_DESC= Install cppcheck-htmlreport HTMLREPORT_USES= python:2,${PYUSE:C/ /,/W} -HTMLREPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments +HTMLREPORT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} HTMLREPORT_PLIST_FILES= bin/cppcheck-htmlreport HTMLREPORT_VARS= PYUSE+=run Index: devel/cram/Makefile =================================================================== --- devel/cram/Makefile +++ devel/cram/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}check-manifest>=0:devel/py-check-manifest \ - ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}pep8>=0:devel/pep8 \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}check-manifest>=0:devel/py-check-manifest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pep8>=0:devel/pep8@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyflakes>=0:devel/py-pyflakes@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/cvs2svn/Makefile =================================================================== --- devel/cvs2svn/Makefile +++ devel/cvs2svn/Makefile @@ -14,8 +14,8 @@ MAINTAINER= ohauer@FreeBSD.org COMMENT= CVS to Subversion Repository Converter -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \ cvs:devel/cvs # 2.4.0 -> svn r5392 @@ -37,7 +37,7 @@ GIT_DESC= Build with git support BAZAAR_DESC= Build with Bazaar support -SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion +SUBVERSION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${FLAVOR} GIT_RUN_DEPENDS= ${LOCALBASE}/bin/git:devel/git BAZAAR_RUN_DEPENDS= ${LOCALBASE}/bin/bzr:devel/bzr Index: devel/cx_Freeze/Makefile =================================================================== --- devel/cx_Freeze/Makefile +++ devel/cx_Freeze/Makefile @@ -10,7 +10,7 @@ COMMENT= The cx_Freeze is a set of utilities for freezing Python scripts USE_GCC= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: devel/dissy/Makefile =================================================================== --- devel/dissy/Makefile +++ devel/dissy/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR} LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 USES= python:2 Index: devel/ditrack/Makefile =================================================================== --- devel/ditrack/Makefile +++ devel/ditrack/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= svn:devel/subversion -USES= python shebangfix tar:tgz +USES= python:2.7 shebangfix tar:tgz SHEBANG_FILES= upgrade-0.7-db.py USE_PYTHON= distutils PYDISTUTILS_PKGNAME= DITrack Index: devel/drpython/Makefile =================================================================== --- devel/drpython/Makefile +++ devel/drpython/Makefile @@ -17,13 +17,13 @@ # fails to build in presence if installed self CONFLICTS_BUILD= ${PORTNAME}${PYTHON_PKGNAMESUFFIX}-[0-9]* -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} RUN_DEPENDS= xdg-open:devel/xdg-utils NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME} -USES= compiler:c++11-lib python zip +USES= compiler:c++11-lib python:2.7 zip USE_PYTHON= autoplist distutils USE_WX= 3.0+ WX_COMPS= python:lib Index: devel/eblob/Makefile =================================================================== --- devel/eblob/Makefile +++ devel/eblob/Makefile @@ -34,7 +34,7 @@ .if ${PORT_OPTIONS:MPYTHON} LIB_DEPENDS+= libboost_python.so:devel/boost-python-libs -USES+= python +USES+= python:2.7 CMAKE_ARGS+= -DWITH_PYTHON=ON PLIST_SUB+= PYTHON="" PYTHON_VER=${PYTHON_VER} .else Index: devel/epydoc/Makefile =================================================================== --- devel/epydoc/Makefile +++ devel/epydoc/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS UTF8 Index: devel/eric6/Makefile =================================================================== --- devel/eric6/Makefile +++ devel/eric6/Makefile @@ -5,15 +5,15 @@ CATEGORIES= devel python DISTNAME= ${PORTNAME}-${PORTVERSION} -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtGui.so:x11-toolkits/py-qt${PYQTVER}-gui \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/Qsci.so:devel/py-qt${PYQTVER}-qscintilla2 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtGui.so:x11-toolkits/py-qt${PYQTVER}-gui@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/Qsci.so:devel/py-qt${PYQTVER}-qscintilla2@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtNetwork.so:net/py-qt${PYQTVER}-network \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSvg.so:graphics/py-qt${PYQTVER}-svg \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSql.so:databases/py-qt${PYQTVER}-sql \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtWebKit.so:www/py-qt${PYQTVER}-webkit \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtHelp.so:devel/py-qt${PYQTVER}-help \ - ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3 + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtNetwork.so:net/py-qt${PYQTVER}-network@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSvg.so:graphics/py-qt${PYQTVER}-svg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSql.so:databases/py-qt${PYQTVER}-sql@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtWebKit.so:www/py-qt${PYQTVER}-webkit@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtHelp.so:devel/py-qt${PYQTVER}-help@${PY_FLAVOR} \ + ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} USES= desktop-file-utils INSTALL_CMD= install.py -c -f eric6config.freebsd -i ${STAGEDIR} --pyqt=${PYQTVER} @@ -28,7 +28,7 @@ PYQT4_VARS= PYQTVER=4 PYQT5_DESC= Python bindings for Qt5 PYQT5_VARS= PYQTVER=5 -PYQT5_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets +PYQT5_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR} EXTRA_PATCHES= MASTERPORT= Index: devel/eric6/Makefile.inc =================================================================== --- devel/eric6/Makefile.inc +++ devel/eric6/Makefile.inc @@ -22,7 +22,7 @@ INSTALL_CMD?= install-i18n.py -p ${STAGEDIR} MAKE_ENV+= "HOME=${WRKDIR}" -USES+= python +USES+= python:2.7 NO_BUILD= yes PLIST_FILES?= %%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm EXTRA_PATCHES?= ${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py Index: devel/euca2ools/Makefile =================================================================== --- devel/euca2ools/Makefile +++ devel/euca2ools/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requestbuilder>=0.4:www/py-requestbuilder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} USES= python:2.7 USE_GITHUB= yes Index: devel/fb-adb/Makefile =================================================================== --- devel/fb-adb/Makefile +++ devel/fb-adb/Makefile @@ -28,7 +28,7 @@ USE_GITHUB= yes GH_ACCOUNT= facebook -USES= autoreconf gmake ncurses perl5 python:3,build +USES= autoreconf gmake ncurses perl5 python:3.4+,build USE_PERL5= build # pod2man BASH_CMD?= bash # can be zsh GNU_CONFIGURE= yes Index: devel/fnorb/Makefile =================================================================== --- devel/fnorb/Makefile +++ devel/fnorb/Makefile @@ -10,9 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= CORBA 2.0 ORB written in Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils noegginfo SHEBANG_FILES= tests/interop/*.py tests/datatransfer/*.py NO_ARCH= yes Index: devel/gazpacho/Makefile =================================================================== --- devel/gazpacho/Makefile +++ devel/gazpacho/Makefile @@ -13,10 +13,10 @@ LICENSE= LGPL21+ # source mentions LGPL20+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kiwi-gtk>=0:x11-toolkits/py-kiwi-gtk +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kiwi-gtk>=0:x11-toolkits/py-kiwi-gtk@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= desktop-file-utils gettext python +USES= desktop-file-utils gettext python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils NO_BUILD= yes Index: devel/git-cola/Makefile =================================================================== --- devel/git-cola/Makefile +++ devel/git-cola/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \ - ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${PY_FLAVOR} \ USE_GITHUB= yes Index: devel/git-cvs/Makefile =================================================================== --- devel/git-cvs/Makefile +++ devel/git-cvs/Makefile @@ -9,9 +9,9 @@ MAINTAINER= mp39590@gmail.com COMMENT= Tool to incrementally import changesets from CVS into Git -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rcsparse>0:devel/py-rcsparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} LICENSE_FILE= ${WRKSRC}/LICENSE Index: devel/git-review/Makefile =================================================================== --- devel/git-review/Makefile +++ devel/git-review/Makefile @@ -11,12 +11,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} RUN_DEPENDS= git:devel/git \ - ${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests + ${PYTHON_PKGNAMEPREFIX}requests>2.4:www/py-requests@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix NO_ARCH= yes PORTDOCS= README.rst HACKING.rst AUTHORS Index: devel/gitinspector/Makefile =================================================================== --- devel/gitinspector/Makefile +++ devel/gitinspector/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= git:devel/git NO_ARCH= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix USES= python GH_ACCOUNT= ejwa Index: devel/glade/Makefile =================================================================== --- devel/glade/Makefile +++ devel/glade/Makefile @@ -39,7 +39,7 @@ OPTIONS_DEFINE= PYTHON OPTIONS_DEFAULT=PYTHON PYTHON_CONFIGURE_ENABLE= python -PYTHON_USES= python:3 +PYTHON_USES= python:3.4+ PYTHON_USE= GNOME=py3gobject3 .include Index: devel/gnatpython/Makefile =================================================================== --- devel/gnatpython/Makefile +++ devel/gnatpython/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING3 SNAPSHOT= 20140224 -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist .include Index: devel/gnome-builder/Makefile =================================================================== --- devel/gnome-builder/Makefile +++ devel/gnome-builder/Makefile @@ -25,10 +25,11 @@ PORTSCOUT= limitw:1,even PORTDOCS= * -USES= cpe gettext gmake libtool pathfix pkgconfig tar:xz +USES= cpe gettext gmake libtool pathfix python:3.4+ pkgconfig tar:xz USE_GNOME= glib20 gtk30 gtksourceview3 gtk-update-icon-cache py3gobject3 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--disable-debug +CONFIGURE_ARGS+=--disable-debug \ + ac_cv_path_PYTHON3_CONFIG=${PYTHON_CMD}-config USE_LDCONFIG= yes INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include Index: devel/hgview/Makefile =================================================================== --- devel/hgview/Makefile +++ devel/hgview/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 RUN_DEPENDS= hg:devel/mercurial \ - ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base \ - ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils + ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} BUILD_DEPENDS= hg:devel/mercurial \ - pyrcc4:textproc/py-qt4-xml \ + pyrcc4:textproc/py-qt4-xml@${FLAVOR} \ xmlto:textproc/xmlto \ asciidoc:textproc/asciidoc Index: devel/ipython/Makefile =================================================================== --- devel/ipython/Makefile +++ devel/ipython/Makefile @@ -14,14 +14,14 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -34,10 +34,10 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size>=0:devel/py-backports.shutil_get_terminal_size@${FLAVOR} .endif .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib2>=0:devel/py-pathlib2@${FLAVOR} .endif post-install: Index: devel/libftdi/Makefile =================================================================== --- devel/libftdi/Makefile +++ devel/libftdi/Makefile @@ -30,7 +30,7 @@ PYTHON_DESC= Python bindings PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 PYTHON_CMAKE_BOOL= PYTHON_BINDINGS -PYTHON_USES= python +PYTHON_USES= python:2.7 BINARY_ALIAS= swig=swig3.0 Index: devel/libpeas/Makefile =================================================================== --- devel/libpeas/Makefile +++ devel/libpeas/Makefile @@ -36,18 +36,23 @@ CONFIGURE_ARGS+=--disable-glade-catalog PLIST= ${.CURDIR}/pkg-plist -.if ${LIBPEAS_SLAVE} == python2 -USES+= python:-2.7 +.if ${LIBPEAS_SLAVE} == python +USES+= python +USE_PYTHON= flavors +.if ${FLAVOR:Upy27:Mpy2*} USE_GNOME+= pygobject3 +CONFIGURE_ARGS+= --disable-python3 +BUILD_WRKSRC= ${WRKSRC}/loaders/python +INSTALL_WRKSRC= ${WRKSRC}/loaders/python .else -CONFIGURE_ARGS+= --disable-python2 -.endif - -.if ${LIBPEAS_SLAVE} == python3 -USES+= python:3.3+ USE_GNOME+= py3gobject3 +CONFIGURE_ARGS+= --disable-python2 \ + ac_cv_path_PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON_VER}-config +BUILD_WRKSRC= ${WRKSRC}/loaders/python3 +INSTALL_WRKSRC= ${WRKSRC}/loaders/python3 +.endif .else -CONFIGURE_ARGS+= --disable-python3 +CONFIGURE_ARGS+= --disable-python2 --disable-python3 .endif # lua needs lua 5.1 and devel/lua-lgi. The latter is build for lua 5.2 however.. Index: devel/libsigrokdecode/Makefile =================================================================== --- devel/libsigrokdecode/Makefile +++ devel/libsigrokdecode/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 GNU_CONFIGURE= yes -USES= libtool pathfix pkgconfig python:3 +USES= libtool pathfix pkgconfig python:3.4+ USE_GNOME= glib20 MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes Index: devel/meson/Makefile =================================================================== --- devel/meson/Makefile +++ devel/meson/Makefile @@ -15,6 +15,6 @@ RUN_DEPENDS= ninja:devel/ninja USES= python:3.4+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils noflavors .include Index: devel/nuitka/Makefile =================================================================== --- devel/nuitka/Makefile +++ devel/nuitka/Makefile @@ -14,6 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= python tar:bzip2 -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils optsuffix .include Index: devel/osc/Makefile =================================================================== --- devel/osc/Makefile +++ devel/osc/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \ - ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= openSUSE @@ -21,7 +21,7 @@ CPE_VENDOR= suse CPE_PRODUCT= opensuse_osc -USES= cpe python +USES= cpe python:2.7 USE_PYTHON= autoplist distutils PLIST_FILES= bin/osc NO_ARCH= yes Index: devel/phpbt/Makefile =================================================================== --- devel/phpbt/Makefile +++ devel/phpbt/Makefile @@ -32,7 +32,7 @@ OPTIONS_SUB= yes GNATS_DESC= Install script to convert entries from GNATS -GNATS_USES= python:run shebangfix +GNATS_USES= python:2.7,run shebangfix post-extract-GNATS-off: @${RM} ${WRKSRC}/contrib/gnats-to-phpbt.py Index: devel/phpsh/Makefile =================================================================== --- devel/phpsh/Makefile +++ devel/phpsh/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist USE_PHP= pcre posix tokenizer NO_ARCH= yes Index: devel/py-Acquisition/Makefile =================================================================== --- devel/py-Acquisition/Makefile +++ devel/py-Acquisition/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: devel/py-AddOns/Makefile =================================================================== --- devel/py-AddOns/Makefile +++ devel/py-AddOns/Makefile @@ -12,10 +12,10 @@ MAINTAINER= wenheping@gmail.com COMMENT= Dynamically extend other objects with AddOns -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Automat/Makefile =================================================================== --- devel/py-Automat/Makefile +++ devel/py-Automat/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.1.0:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2r>0:textproc/py-m2r@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.1.0:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-Breve/Makefile =================================================================== --- devel/py-Breve/Makefile +++ devel/py-Breve/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Python s-expression style template engine -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-BytecodeAssembler/Makefile =================================================================== --- devel/py-BytecodeAssembler/Makefile +++ devel/py-BytecodeAssembler/Makefile @@ -10,11 +10,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Generate Python code objects by "assembling" bytecode -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools \ - ${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}SymbolType>0:devel/py-SymbolType@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-DateTime/Makefile =================================================================== --- devel/py-DateTime/Makefile +++ devel/py-DateTime/Makefile @@ -14,10 +14,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python:2 zip +USES= python zip USE_PYTHON= distutils autoplist .include Index: devel/py-DocumentTemplate/Makefile =================================================================== --- devel/py-DocumentTemplate/Makefile +++ devel/py-DocumentTemplate/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Jinja2/Makefile =================================================================== --- devel/py-Jinja2/Makefile +++ devel/py-Jinja2/Makefile @@ -14,14 +14,17 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.23:textproc/py-MarkupSafe@${FLAVOR} NO_ARCH= yes USES= python .if empty(PKGNAMESUFFIX) USE_PYTHON= autoplist distutils .endif +.if ${PKGNAMESUFFIX} == -doc +USE_PYTHON= flavors +.endif EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} @@ -29,7 +32,7 @@ OPTIONS_DEFAULT?= BABEL BABEL_DESC= Enable Babel extension -BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel +BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write @@ -37,13 +40,13 @@ .include .if ${PKGNAMESUFFIX} == "-doc" -BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PORTDOCS= * PORT_OPTIONS:= ${PORT_OPTIONS:NEXAMPLES} do-build: - (cd ${WRKSRC}/docs && ${MAKE} html) + (cd ${WRKSRC}/docs && ${MAKE} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: devel/py-Missing/Makefile =================================================================== --- devel/py-Missing/Makefile +++ devel/py-Missing/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-MultiMapping/Makefile =================================================================== --- devel/py-MultiMapping/Makefile +++ devel/py-MultiMapping/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-PEAK-Rules/Makefile =================================================================== --- devel/py-PEAK-Rules/Makefile +++ devel/py-PEAK-Rules/Makefile @@ -12,12 +12,12 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Generic functions and business rules support systems -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes \ - ${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns \ - ${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1.1:devel/py-extremes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}AddOns>=0.6:devel/py-AddOns@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}BytecodeAssembler>0:devel/py-BytecodeAssembler@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-Persistence/Makefile =================================================================== --- devel/py-Persistence/Makefile +++ devel/py-Persistence/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.ATContentTypes/Makefile =================================================================== --- devel/py-Products.ATContentTypes/Makefile +++ devel/py-Products.ATContentTypes/Makefile @@ -12,34 +12,34 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \ - ${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ATReferenceBrowserWidget>=0:devel/py-Products.ATReferenceBrowserWidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= python zope +USES= python:2.7 zope .include Index: devel/py-Products.ATReferenceBrowserWidget/Makefile =================================================================== --- devel/py-Products.ATReferenceBrowserWidget/Makefile +++ devel/py-Products.ATReferenceBrowserWidget/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.Archetypes/Makefile =================================================================== --- devel/py-Products.Archetypes/Makefile +++ devel/py-Products.Archetypes/Makefile @@ -12,45 +12,45 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \ - ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \ - ${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder \ - ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Marshall>=0:devel/py-Products.Marshall@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=2.0.3:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.folder>=0:www/py-plone.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= python zope +USES= python:2.7 zope .include Index: devel/py-Products.BTreeFolder2/Makefile =================================================================== --- devel/py-Products.BTreeFolder2/Makefile +++ devel/py-Products.BTreeFolder2/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=4.1.1:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-Products.CMFActionIcons/Makefile =================================================================== --- devel/py-Products.CMFActionIcons/Makefile +++ devel/py-Products.CMFActionIcons/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-Products.CMFCalendar/Makefile =================================================================== --- devel/py-Products.CMFCalendar/Makefile +++ devel/py-Products.CMFCalendar/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>0:devel/py-zope.app.form +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>0:devel/py-zope.app.form@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-Products.CMFCore/Makefile =================================================================== --- devel/py-Products.CMFCore/Makefile +++ devel/py-Products.CMFCore/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZSQLMethods>0:devel/py-Products.ZSQLMethods@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication@${FLAVOR} NO_ARCH= yes #USES= zope # cyclic dependency Index: devel/py-Products.CMFDefault/Makefile =================================================================== --- devel/py-Products.CMFDefault/Makefile +++ devel/py-Products.CMFDefault/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=1.0.2:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-Products.CMFDiffTool/Makefile =================================================================== --- devel/py-Products.CMFDiffTool/Makefile +++ devel/py-Products.CMFDiffTool/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-Products.CMFDynamicViewFTI/Makefile =================================================================== --- devel/py-Products.CMFDynamicViewFTI/Makefile +++ devel/py-Products.CMFDynamicViewFTI/Makefile @@ -12,15 +12,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-Products.CMFEditions/Makefile =================================================================== --- devel/py-Products.CMFEditions/Makefile +++ devel/py-Products.CMFEditions/Makefile @@ -12,22 +12,22 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4.0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZopeVersionControl>=0:devel/py-Products.ZopeVersionControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes -USES= python zope +USES= python:2.7 zope USE_PYTHON= autoplist distutils .include Index: devel/py-Products.CMFFormController/Makefile =================================================================== --- devel/py-Products.CMFFormController/Makefile +++ devel/py-Products.CMFFormController/Makefile @@ -12,13 +12,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-Products.CMFPlacefulWorkflow/Makefile =================================================================== --- devel/py-Products.CMFPlacefulWorkflow/Makefile +++ devel/py-Products.CMFPlacefulWorkflow/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-Products.CMFQuickInstallerTool/Makefile =================================================================== --- devel/py-Products.CMFQuickInstallerTool/Makefile +++ devel/py-Products.CMFQuickInstallerTool/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: devel/py-Products.CMFTestCase/Makefile =================================================================== --- devel/py-Products.CMFTestCase/Makefile +++ devel/py-Products.CMFTestCase/Makefile @@ -13,18 +13,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python:2 zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.CMFUid/Makefile =================================================================== --- devel/py-Products.CMFUid/Makefile +++ devel/py-Products.CMFUid/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-Products.DCWorkflow/Makefile =================================================================== --- devel/py-Products.DCWorkflow/Makefile +++ devel/py-Products.DCWorkflow/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-Products.ExtendedPathIndex/Makefile =================================================================== --- devel/py-Products.ExtendedPathIndex/Makefile +++ devel/py-Products.ExtendedPathIndex/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${FLAVOR} -USES= python zope zip +USES= python:2.7 zope zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.ExternalMethod/Makefile =================================================================== --- devel/py-Products.ExternalMethod/Makefile +++ devel/py-Products.ExternalMethod/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: devel/py-Products.GenericSetup/Makefile =================================================================== --- devel/py-Products.GenericSetup/Makefile +++ devel/py-Products.GenericSetup/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:devel/py-eggtestinfo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: devel/py-Products.LDAPMultiPlugins/Makefile =================================================================== --- devel/py-Products.LDAPMultiPlugins/Makefile +++ devel/py-Products.LDAPMultiPlugins/Makefile @@ -14,9 +14,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap \ - ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: devel/py-Products.LDAPUserFolder/Makefile =================================================================== --- devel/py-Products.LDAPUserFolder/Makefile +++ devel/py-Products.LDAPUserFolder/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=0.4.2:devel/py-setuptools-git@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${FLAVOR} OPTIONS_DEFINE= POSIXGROUP_PATCH POSIXGROUP_PATCH_DESC= Use posixGroup for group membership Index: devel/py-Products.MIMETools/Makefile =================================================================== --- devel/py-Products.MIMETools/Makefile +++ devel/py-Products.MIMETools/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.Marshall/Makefile =================================================================== --- devel/py-Products.Marshall/Makefile +++ devel/py-Products.Marshall/Makefile @@ -12,16 +12,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} USES= python:2 zip USE_PYTHON= autoplist distutils Index: devel/py-Products.MimetypesRegistry/Makefile =================================================================== --- devel/py-Products.MimetypesRegistry/Makefile +++ devel/py-Products.MimetypesRegistry/Makefile @@ -12,13 +12,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python:2 zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: devel/py-Products.OFSP/Makefile =================================================================== --- devel/py-Products.OFSP/Makefile +++ devel/py-Products.OFSP/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.PasswordResetTool/Makefile =================================================================== --- devel/py-Products.PasswordResetTool/Makefile +++ devel/py-Products.PasswordResetTool/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} NO_ARCH= yes -USES= python zip zope +USES= python:2.7 zip zope USE_PYTHON= autoplist distutils .include Index: devel/py-Products.PlacelessTranslationService/Makefile =================================================================== --- devel/py-Products.PlacelessTranslationService/Makefile +++ devel/py-Products.PlacelessTranslationService/Makefile @@ -13,20 +13,20 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gettext>0:textproc/py-python-gettext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python shebangfix zip +USES= python:2.7 shebangfix zip USE_PYTHON= autoplist distutils SHEBANG_FILES= Products/PlacelessTranslationService/bin/convertToLocales.py Index: devel/py-Products.PloneTestCase/Makefile =================================================================== --- devel/py-Products.PloneTestCase/Makefile +++ devel/py-Products.PloneTestCase/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:devel/py-Products.ATContentTypes \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=0:devel/py-Products.ATContentTypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} USE_PYTHON= autoplist distutils -USES= python:2 zope zip +USES= python:2.7 zope zip .include Index: devel/py-Products.PluginRegistry/Makefile =================================================================== --- devel/py-Products.PluginRegistry/Makefile +++ devel/py-Products.PluginRegistry/Makefile @@ -14,7 +14,7 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-Products.PortalTransforms/Makefile =================================================================== --- devel/py-Products.PortalTransforms/Makefile +++ devel/py-Products.PortalTransforms/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=1.7:textproc/py-markdown@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-Products.PythonScripts/Makefile =================================================================== --- devel/py-Products.PythonScripts/Makefile +++ devel/py-Products.PythonScripts/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.ResourceRegistries/Makefile =================================================================== --- devel/py-Products.ResourceRegistries/Makefile +++ devel/py-Products.ResourceRegistries/Makefile @@ -12,15 +12,15 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>0:www/py-plone.app.registry@${FLAVOR} USES= python:2.7 zip zope USE_PYTHON= autoplist distutils Index: devel/py-Products.StandardCacheManagers/Makefile =================================================================== --- devel/py-Products.StandardCacheManagers/Makefile +++ devel/py-Products.StandardCacheManagers/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-Products.ZCTextIndex/Makefile =================================================================== --- devel/py-Products.ZCTextIndex/Makefile +++ devel/py-Products.ZCTextIndex/Makefile @@ -12,15 +12,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.ZCatalog/Makefile =================================================================== --- devel/py-Products.ZCatalog/Makefile +++ devel/py-Products.ZCatalog/Makefile @@ -12,22 +12,22 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex \ - ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} USES= python:2.7 zip USE_PYTHON= distutils autoplist Index: devel/py-Products.ZSQLMethods/Makefile =================================================================== --- devel/py-Products.ZSQLMethods/Makefile +++ devel/py-Products.ZSQLMethods/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.ZopeVersionControl/Makefile =================================================================== --- devel/py-Products.ZopeVersionControl/Makefile +++ devel/py-Products.ZopeVersionControl/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.statusmessages/Makefile =================================================================== --- devel/py-Products.statusmessages/Makefile +++ devel/py-Products.statusmessages/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-Products.validation/Makefile =================================================================== --- devel/py-Products.validation/Makefile +++ devel/py-Products.validation/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: devel/py-RPyC/Makefile =================================================================== --- devel/py-RPyC/Makefile +++ devel/py-RPyC/Makefile @@ -16,10 +16,10 @@ OPTIONS_DEFINE= PLUMBUM OPTIONS_DEFAULT=PLUMBUM -PLUMBUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum +PLUMBUM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plumbum>0:sysutils/py-plumbum@${FLAVOR} PLUMBUM_DESC= Required for features like rpyc_classic.py and zero deploy -USES= python:-3.3 +USES= python USE_PYTHON= distutils autoplist .include Index: devel/py-Record/Makefile =================================================================== --- devel/py-Record/Makefile +++ devel/py-Record/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-SymbolType/Makefile =================================================================== --- devel/py-SymbolType/Makefile +++ devel/py-SymbolType/Makefile @@ -12,7 +12,7 @@ MAINTAINER= wenheping@gmail.com COMMENT= Simple Symbol Type for Python -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-ToscaWidgets/Makefile =================================================================== --- devel/py-ToscaWidgets/Makefile +++ devel/py-ToscaWidgets/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-XStatic-Angular-Bootstrap/Makefile =================================================================== --- devel/py-XStatic-Angular-Bootstrap/Makefile +++ devel/py-XStatic-Angular-Bootstrap/Makefile @@ -11,11 +11,11 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Bootstrap widgets for Angular (angular-bootstrap) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR} NO_ARCH= yes Index: devel/py-XStatic-Angular-FileUpload/Makefile =================================================================== --- devel/py-XStatic-Angular-FileUpload/Makefile +++ devel/py-XStatic-Angular-FileUpload/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= File Upload module for the AngularJS (angular-file-upload) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Angular-Gettext/Makefile =================================================================== --- devel/py-XStatic-Angular-Gettext/Makefile +++ devel/py-XStatic-Angular-Gettext/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Gettext support for Angular.js (angular-gettext) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Angular-Schema-Form/Makefile =================================================================== --- devel/py-XStatic-Angular-Schema-Form/Makefile +++ devel/py-XStatic-Angular-Schema-Form/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Forms from a JSON schema (angular-schema-form) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Angular-lrdragndrop/Makefile =================================================================== --- devel/py-XStatic-Angular-lrdragndrop/Makefile +++ devel/py-XStatic-Angular-lrdragndrop/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= HTML5 Drag and Drop AngularJS module (angular-dragndrop) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Angular/Makefile =================================================================== --- devel/py-XStatic-Angular/Makefile +++ devel/py-XStatic-Angular/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JavaScript MVW Framework (angular) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Bootstrap-Datepicker/Makefile =================================================================== --- devel/py-XStatic-Bootstrap-Datepicker/Makefile +++ devel/py-XStatic-Bootstrap-Datepicker/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Datepicker for Bootstrap (bootstrap-datepicker) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Bootstrap-SCSS/Makefile =================================================================== --- devel/py-XStatic-Bootstrap-SCSS/Makefile +++ devel/py-XStatic-Bootstrap-SCSS/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Bootstrap SCSS stylesheets (bootstrap-scss) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-D3/Makefile =================================================================== --- devel/py-XStatic-D3/Makefile +++ devel/py-XStatic-D3/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Data-Driven Documents framework (d3) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Font-Awesome/Makefile =================================================================== --- devel/py-XStatic-Font-Awesome/Makefile +++ devel/py-XStatic-Font-Awesome/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Iconic font and CSS framework (font-awesome) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Hogan/Makefile =================================================================== --- devel/py-XStatic-Hogan/Makefile +++ devel/py-XStatic-Hogan/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JavaScript templating framework (hogan.js) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-JQuery-Migrate/Makefile =================================================================== --- devel/py-XStatic-JQuery-Migrate/Makefile +++ devel/py-XStatic-JQuery-Migrate/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery migration kit (jquery-migrate) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-JQuery.TableSorter/Makefile =================================================================== --- devel/py-XStatic-JQuery.TableSorter/Makefile +++ devel/py-XStatic-JQuery.TableSorter/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery plugin for creating sortable tables (jquery-tablesort) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-JQuery.quicksearch/Makefile =================================================================== --- devel/py-XStatic-JQuery.quicksearch/Makefile +++ devel/py-XStatic-JQuery.quicksearch/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery plugin for searching through tables (jquery-quicksearch) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-JSEncrypt/Makefile =================================================================== --- devel/py-XStatic-JSEncrypt/Makefile +++ devel/py-XStatic-JSEncrypt/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Javascript library to perform OpenSSL RSA (jsencrypt) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Jasmine/Makefile =================================================================== --- devel/py-XStatic-Jasmine/Makefile +++ devel/py-XStatic-Jasmine/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= DOM-less simple JavaScript testing framework (jasmine) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Rickshaw/Makefile =================================================================== --- devel/py-XStatic-Rickshaw/Makefile +++ devel/py-XStatic-Rickshaw/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Rickshaw 1.5.0 (xstatic packaging standard) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-Spin/Makefile =================================================================== --- devel/py-XStatic-Spin/Makefile +++ devel/py-XStatic-Spin/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Spinner component (spin) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-bootswatch/Makefile =================================================================== --- devel/py-XStatic-bootswatch/Makefile +++ devel/py-XStatic-bootswatch/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Collection of themes for Bootstrap (bootswatch) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-jQuery/Makefile =================================================================== --- devel/py-XStatic-jQuery/Makefile +++ devel/py-XStatic-jQuery/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JavaScript library for DOM operations (jquery) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-jquery-ui/Makefile =================================================================== --- devel/py-XStatic-jquery-ui/Makefile +++ devel/py-XStatic-jquery-ui/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JQuery library for building user interfaces (jquery-ui) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-mdi/Makefile =================================================================== --- devel/py-XStatic-mdi/Makefile +++ devel/py-XStatic-mdi/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Material Design Webfont (mdi) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-objectpath/Makefile =================================================================== --- devel/py-XStatic-objectpath/Makefile +++ devel/py-XStatic-objectpath/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Parser for js object paths (objectpath) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-roboto-fontface/Makefile =================================================================== --- devel/py-XStatic-roboto-fontface/Makefile +++ devel/py-XStatic-roboto-fontface/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Simple package providing the Roboto fontface (roboto-fontface) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-smart-table/Makefile =================================================================== --- devel/py-XStatic-smart-table/Makefile +++ devel/py-XStatic-smart-table/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Table module for angular js (angular-smart-table) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-term.js/Makefile =================================================================== --- devel/py-XStatic-term.js/Makefile +++ devel/py-XStatic-term.js/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Terminal written in javascript (term.js) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-XStatic-tv4/Makefile =================================================================== --- devel/py-XStatic-tv4/Makefile +++ devel/py-XStatic-tv4/Makefile @@ -11,7 +11,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= JSON Schema validator for JavaScript (tv4) -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XStatic>=0:devel/py-XStatic@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-adb/Makefile =================================================================== --- devel/py-adb/Makefile +++ devel/py-adb/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb115>=1.0.16:devel/py-libusb115 \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libusb115>=1.0.16:devel/py-libusb115@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.21.1:security/py-m2crypto@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= google Index: devel/py-akismet/Makefile =================================================================== --- devel/py-akismet/Makefile +++ devel/py-akismet/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils PYDISTUTILS_PKGNAME= akismet Index: devel/py-aniso8601/Makefile =================================================================== --- devel/py-aniso8601/Makefile +++ devel/py-aniso8601/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: devel/py-anonfunc/Makefile =================================================================== --- devel/py-anonfunc/Makefile +++ devel/py-anonfunc/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: devel/py-apipkg/Makefile =================================================================== --- devel/py-apipkg/Makefile +++ devel/py-apipkg/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: devel/py-apptools/Makefile =================================================================== --- devel/py-apptools/Makefile +++ devel/py-apptools/Makefile @@ -15,8 +15,8 @@ # See ${WRKSRC}/image_LICENSE.txt for information that other # files *LICENSE* are not used -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.:devel/py-configobj +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.:devel/py-configobj@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: devel/py-apscheduler/Makefile =================================================================== --- devel/py-apscheduler/Makefile +++ devel/py-apscheduler/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>=0.7:devel/py-pytest-capturelog +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.2:devel/py-tzlocal@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>=0.7:devel/py-pytest-capturelog@${FLAVOR} NO_ARCH= yes USES= python:2.7+ @@ -28,12 +28,12 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .else -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio \ - ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytest-asyncio>0:devel/py-pytest-asyncio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-tornado>0:devel/py-pytest-tornado@${FLAVOR} .endif post-patch: Index: devel/py-archetypes.querywidget/Makefile =================================================================== --- devel/py-archetypes.querywidget/Makefile +++ devel/py-archetypes.querywidget/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring \ - ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.querystring>=1.0.3:www/py-plone.app.querystring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-archetypes.referencebrowserwidget/Makefile =================================================================== --- devel/py-archetypes.referencebrowserwidget/Makefile +++ devel/py-archetypes.referencebrowserwidget/Makefile @@ -12,11 +12,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=1.1:www/py-plone.app.jquerytools@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-archetypes.schemaextender/Makefile =================================================================== --- devel/py-archetypes.schemaextender/Makefile +++ devel/py-archetypes.schemaextender/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-arrow/Makefile =================================================================== --- devel/py-arrow/Makefile +++ devel/py-arrow/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-aspects/Makefile =================================================================== --- devel/py-aspects/Makefile +++ devel/py-aspects/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist SUB_FILES= pkg-message Index: devel/py-astroid/Makefile =================================================================== --- devel/py-astroid/Makefile +++ devel/py-astroid/Makefile @@ -12,9 +12,9 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy-object-proxy>=0:devel/py-lazy-object-proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>=0:devel/py-wrapt@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils @@ -23,12 +23,12 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${FLAVOR} .endif .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.3:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.3:devel/py-enum34@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR} .endif .include Index: devel/py-asttokens/Makefile =================================================================== --- devel/py-asttokens/Makefile +++ devel/py-asttokens/Makefile @@ -13,17 +13,17 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes .include .if ${PYTHON_REL} < 3000 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}astroid>0:devel/py-astroid@${FLAVOR} # not supported on 3.x due to missing test depends do-test: Index: devel/py-atomiclong/Makefile =================================================================== --- devel/py-atomiclong/Makefile +++ devel/py-atomiclong/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-atpublic/Makefile =================================================================== --- devel/py-atpublic/Makefile +++ devel/py-atpublic/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -USES= python:3 +USES= python:3.3+ USE_PYTHON= autoplist distutils MAKE_ENV= ATPUBLIC_BUILD_EXTENSION=1 Index: devel/py-automaton/Makefile =================================================================== --- devel/py-automaton/Makefile +++ devel/py-automaton/Makefile @@ -12,10 +12,10 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} NO_ARCH= yes Index: devel/py-babel/Makefile =================================================================== --- devel/py-babel/Makefile +++ devel/py-babel/Makefile @@ -1,18 +1,19 @@ -# Created by: Dryice Liu +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= Babel -PORTVERSION= 2.3.4 +PORTVERSION= 2.5.1 CATEGORIES= devel python -MASTER_SITES= https://pypi.io/packages/source/B/${PORTNAME}/ +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= gaod@hychen.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Collection of tools for internationalizing Python applications LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils @@ -22,7 +23,7 @@ OPTIONS_DEFINE= DOCS -post-install-DOCS-on: +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for docfile in ${PORTDOCS} ${CP} -r ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} Index: devel/py-babel/distinfo =================================================================== --- devel/py-babel/distinfo +++ devel/py-babel/distinfo @@ -1,2 +1,3 @@ -SHA256 (Babel-2.3.4.tar.gz) = c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 -SIZE (Babel-2.3.4.tar.gz) = 6866920 +TIMESTAMP = 1505757363 +SHA256 (Babel-2.5.1.tar.gz) = 6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811 +SIZE (Babel-2.5.1.tar.gz) = 6612869 Index: devel/py-backports.functools_lru_cache/Makefile =================================================================== --- devel/py-backports.functools_lru_cache/Makefile +++ devel/py-backports.functools_lru_cache/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: devel/py-backports.weakref/Makefile =================================================================== --- devel/py-backports.weakref/Makefile +++ devel/py-backports.weakref/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-bandit/Makefile =================================================================== --- devel/py-bandit/Makefile +++ devel/py-bandit/Makefile @@ -13,10 +13,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.5.0:devel/py-stevedore@${FLAVOR} MAKE_ENV+= PBR_VERSION=${PORTVERSION} Index: devel/py-bcdoc/Makefile =================================================================== --- devel/py-bcdoc/Makefile +++ devel/py-bcdoc/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-binplist/Makefile =================================================================== --- devel/py-binplist/Makefile +++ devel/py-binplist/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-biplist/Makefile =================================================================== --- devel/py-biplist/Makefile +++ devel/py-biplist/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} USES= python Index: devel/py-bison/Makefile =================================================================== --- devel/py-bison/Makefile +++ devel/py-bison/Makefile @@ -15,11 +15,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES -USES= bison:both python +USES= bison:both python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: devel/py-blinker/Makefile =================================================================== --- devel/py-blinker/Makefile +++ devel/py-blinker/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-bluelet/Makefile =================================================================== --- devel/py-bluelet/Makefile +++ devel/py-bluelet/Makefile @@ -13,10 +13,6 @@ LICENSE= MIT USES= python -USE_PYTHON= distutils - -PLIST_FILES= %%PYTHON_SITELIBDIR%%/bluelet.py \ - %%PYTHON_SITELIBDIR%%/bluelet.pyc \ - %%PYTHON_SITELIBDIR%%/bluelet.pyo +USE_PYTHON= distutils autoplist .include Index: devel/py-botocore/Makefile =================================================================== --- devel/py-botocore/Makefile +++ devel/py-botocore/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-bsd/Makefile =================================================================== --- devel/py-bsd/Makefile +++ devel/py-bsd/Makefile @@ -10,12 +10,11 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= cython>0:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_GITHUB= yes GH_ACCOUNT= freenas @@ -25,7 +24,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .include Index: devel/py-buildbot-console-view/Makefile =================================================================== --- devel/py-buildbot-console-view/Makefile +++ devel/py-buildbot-console-view/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-buildbot-grid-view/Makefile =================================================================== --- devel/py-buildbot-grid-view/Makefile +++ devel/py-buildbot-grid-view/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-buildbot-waterfall-view/Makefile =================================================================== --- devel/py-buildbot-waterfall-view/Makefile +++ devel/py-buildbot-waterfall-view/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-buildbot-worker/Makefile =================================================================== --- devel/py-buildbot-worker/Makefile +++ devel/py-buildbot-worker/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted -TEST_DEPENDS= trial:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${FLAVOR} +TEST_DEPENDS= trial:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-buildbot-www/Makefile =================================================================== --- devel/py-buildbot-www/Makefile +++ devel/py-buildbot-www/Makefile @@ -13,13 +13,13 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot \ - ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg \ - ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view \ - ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view \ - ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0.8.0:devel/py-mock@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-buildbot/Makefile =================================================================== --- devel/py-buildbot/Makefile +++ devel/py-buildbot/Makefile @@ -14,22 +14,22 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4 \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt \ - ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ - ${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker \ - ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www \ - ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.4.0:www/py-pyjwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ramlfications>0:devel/py-ramlfications@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.7:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-worker>=${PORTVERSION}:devel/py-buildbot-worker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}buildbot-www>=${PORTVERSION}:devel/py-buildbot-www@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR} USES= python USE_RC_SUBR= buildbot Index: devel/py-canonicaljson/Makefile =================================================================== --- devel/py-canonicaljson/Makefile +++ devel/py-canonicaljson/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}frozendict>=0.4:devel/py-frozendict@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=3.6.5:devel/py-simplejson@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes Index: devel/py-castellan/Makefile =================================================================== --- devel/py-castellan/Makefile +++ devel/py-castellan/Makefile @@ -11,15 +11,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Generic Key Manager interface for OpenStack -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=0.5.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=0.5.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} NO_ARCH= yes Index: devel/py-cclib/Makefile =================================================================== --- devel/py-cclib/Makefile +++ devel/py-cclib/Makefile @@ -5,6 +5,7 @@ PORTVERSION= 1.5.1 DISTVERSIONPREFIX= v CATEGORIES= devel python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= robak@FreeBSD.org COMMENT= Parsers And Algorithms For Computational Chemistry Index: devel/py-cdg/Makefile =================================================================== --- devel/py-cdg/Makefile +++ devel/py-cdg/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-celery/Makefile =================================================================== --- devel/py-celery/Makefile +++ devel/py-celery/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard \ - ${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.36:net/py-kombu \ - ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}billiard>=3.3.0.21:devel/py-billiard@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=1.5:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.36:net/py-kombu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-cffi/Makefile =================================================================== --- devel/py-cffi/Makefile +++ devel/py-cffi/Makefile @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libffi.so:devel/libffi -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} # Actually 2.6-2.7,3.2-3.5 -USES?= localbase python compiler +USES= localbase python compiler USE_PYTHON= autoplist distutils .include Index: devel/py-check-manifest/Makefile =================================================================== --- devel/py-check-manifest/Makefile +++ devel/py-check-manifest/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= DOCS Index: devel/py-cheetah/Makefile =================================================================== --- devel/py-cheetah/Makefile +++ devel/py-cheetah/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= HTML template engine for Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: devel/py-ciphon/Makefile =================================================================== --- devel/py-ciphon/Makefile +++ devel/py-ciphon/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils post-install: Index: devel/py-circuits/Makefile =================================================================== --- devel/py-circuits/Makefile +++ devel/py-circuits/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-cjson/Makefile =================================================================== --- devel/py-cjson/Makefile +++ devel/py-cjson/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL20 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-install: Index: devel/py-cld/Makefile =================================================================== --- devel/py-cld/Makefile +++ devel/py-cld/Makefile @@ -17,6 +17,7 @@ LIB_DEPENDS= libcld2.so:devel/cld2 USES= python +USE_PYTHON= flavors PLIST_FILES= %%PYTHON_SITELIBDIR%%/chromium_compact_language_detector-2.0-py%%PYTHON_VER%%.egg-info \ %%PYTHON_SITELIBDIR%%/cld2.so \ Index: devel/py-cli-helpers/Makefile =================================================================== --- devel/py-cli-helpers/Makefile +++ devel/py-cli-helpers/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.0:devel/py-tabulate \ - ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.0.0:textproc/py-terminaltables +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tabulate>=0.8.0:devel/py-tabulate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.0.0:textproc/py-terminaltables@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils @@ -25,7 +25,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.csv>=1.0.0:devel/py-backports.csv +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.csv>=1.0.0:devel/py-backports.csv@${FLAVOR} .endif .include Index: devel/py-cliapp/Makefile =================================================================== --- devel/py-cliapp/Makefile +++ devel/py-cliapp/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILES= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python:2 NO_ARCH= yes Index: devel/py-click-log/Makefile =================================================================== --- devel/py-click-log/Makefile +++ devel/py-click-log/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-click-plugins/Makefile =================================================================== --- devel/py-click-plugins/Makefile +++ devel/py-click-plugins/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-click-threading/Makefile =================================================================== --- devel/py-click-threading/Makefile +++ devel/py-click-threading/Makefile @@ -12,21 +12,16 @@ LICENSE= MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PY_FUTURES} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ ${RUN_DEPENDS} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes -.include - -.if ${PYTHON_REL} < 3200 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures -.endif - do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v -.include +.include Index: devel/py-click/Makefile =================================================================== --- devel/py-click/Makefile +++ devel/py-click/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES?= python +USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes Index: devel/py-cliff/Makefile =================================================================== --- devel/py-cliff/Makefile +++ devel/py-cliff/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cmd2>=0.6.7:devel/py-cmd2 \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/py-pyparsing +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cmd2>=0.6.7:devel/py-cmd2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.8.0:devel/py-unicodecsv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.7:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes Index: devel/py-clint/Makefile =================================================================== --- devel/py-clint/Makefile +++ devel/py-clint/Makefile @@ -13,7 +13,7 @@ LICENSE= ISCL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-clonedigger/Makefile =================================================================== --- devel/py-clonedigger/Makefile +++ devel/py-clonedigger/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-cloudpickle/Makefile =================================================================== --- devel/py-cloudpickle/Makefile +++ devel/py-cloudpickle/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-cmdtest/Makefile =================================================================== --- devel/py-cmdtest/Makefile +++ devel/py-cmdtest/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv3 LICENSE_FILES= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp \ - ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp \ - ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: devel/py-codecov/Makefile =================================================================== --- devel/py-codecov/Makefile +++ devel/py-codecov/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7.9:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.7.9:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>0:devel/py-ddt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-collective.z3cform.datetimewidget/Makefile =================================================================== --- devel/py-collective.z3cform.datetimewidget/Makefile +++ devel/py-collective.z3cform.datetimewidget/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: devel/py-colorama/Makefile =================================================================== --- devel/py-colorama/Makefile +++ devel/py-colorama/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: devel/py-coloredlogs/Makefile =================================================================== --- devel/py-coloredlogs/Makefile +++ devel/py-coloredlogs/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=2.1:textproc/py-humanfriendly +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=2.1:textproc/py-humanfriendly@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: devel/py-columnize/Makefile =================================================================== --- devel/py-columnize/Makefile +++ devel/py-columnize/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose +MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.0:devel/py-nose@${FLAVOR} BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} @@ -24,7 +24,7 @@ .if ${PYTHON_MAJOR_VER} == "3" EXTRA_PATCHES= ${FILESDIR}/extra-patch-____pkginfo____.py .else -MY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:devel/py-backports.shutil_get_terminal_size +MY_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.shutil_get_terminal_size=1.0:devel/py-backports.shutil_get_terminal_size@${FLAVOR} .endif .include Index: devel/py-configargparse/Makefile =================================================================== --- devel/py-configargparse/Makefile +++ devel/py-configargparse/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-configobj/Makefile =================================================================== --- devel/py-configobj/Makefile +++ devel/py-configobj/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-construct/Makefile =================================================================== --- devel/py-construct/Makefile +++ devel/py-construct/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-construct28/Makefile =================================================================== --- devel/py-construct28/Makefile +++ devel/py-construct28/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-cov-core/Makefile =================================================================== --- devel/py-cov-core/Makefile +++ devel/py-cov-core/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.6:devel/py-coverage@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-cuisine/Makefile =================================================================== --- devel/py-cuisine/Makefile +++ devel/py-cuisine/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fabric>=1.7,1:devel/py-fabric@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: devel/py-cursive/Makefile =================================================================== --- devel/py-cursive/Makefile +++ devel/py-cursive/Makefile @@ -10,15 +10,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Cursive implements OpenStack-specific validation of digital signatures -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} NO_ARCH= yes Index: devel/py-curtsies/Makefile =================================================================== --- devel/py-curtsies/Makefile +++ devel/py-curtsies/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blessings>=1.5:devel/py-blessings@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.4:devel/py-wcwidth@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-cxx/Makefile =================================================================== --- devel/py-cxx/Makefile +++ devel/py-cxx/Makefile @@ -11,7 +11,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Make it easier to extend Python with C++ -USES= python +USES= python:2.7 USE_PYTHON= distutils pythonprefix PYDISTUTILS_PKGNAME= CXX PYDISTUTILS_PKGVERSION= 5.3 Index: devel/py-cycler/Makefile =================================================================== --- devel/py-cycler/Makefile +++ devel/py-cycler/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-d2to1/Makefile =================================================================== --- devel/py-d2to1/Makefile +++ devel/py-d2to1/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_GITHUB= yes Index: devel/py-daemon/Makefile =================================================================== --- devel/py-daemon/Makefile +++ devel/py-daemon/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.10:devel/py-lockfile@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-darcsver/Makefile =================================================================== --- devel/py-darcsver/Makefile +++ devel/py-darcsver/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Generate a version number from darcs history -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: devel/py-dateutil/Makefile =================================================================== --- devel/py-dateutil/Makefile +++ devel/py-dateutil/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils Index: devel/py-dateutils/Makefile =================================================================== --- devel/py-dateutils/Makefile +++ devel/py-dateutils/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-dbus/Makefile =================================================================== --- devel/py-dbus/Makefile +++ devel/py-dbus/Makefile @@ -11,6 +11,10 @@ SLAVE_PORT= python2 MASTERDIR= ${.CURDIR}/../../devel/pydbus-common +.if ${FLAVOR:U:Mpy3*} +PLIST= ${.CURDIR}/pkg-plist-py3 +.else PLIST= ${.CURDIR}/pkg-plist +.endif .include "${MASTERDIR}/Makefile" Index: devel/py-ddt/Makefile =================================================================== --- devel/py-ddt/Makefile +++ devel/py-ddt/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-debtcollector/Makefile =================================================================== --- devel/py-debtcollector/Makefile +++ devel/py-debtcollector/Makefile @@ -12,10 +12,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} NO_ARCH= yes Index: devel/py-defusedxml/Makefile =================================================================== --- devel/py-defusedxml/Makefile +++ devel/py-defusedxml/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -USES?= python +USES= python USE_PYTHON= distutils autoplist PORTDOCS= * Index: devel/py-delfick_error/Makefile =================================================================== --- devel/py-delfick_error/Makefile +++ devel/py-delfick_error/Makefile @@ -10,19 +10,19 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}total-ordering>0:devel/py-total-ordering@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cloud_sptheme>0:textproc/py-cloud_sptheme@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_GITHUB= yes GH_ACCOUNT= delfick GH_TAGNAME= 6761e6c Index: devel/py-deliciousapi/Makefile =================================================================== --- devel/py-deliciousapi/Makefile +++ devel/py-deliciousapi/Makefile @@ -12,13 +12,13 @@ MAINTAINER= sbz@FreeBSD.org COMMENT= Unofficial Python API for retrieving data from Delicious.com -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=1.7:devel/py-simplejson@${FLAVOR} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-dialog/Makefile =================================================================== --- devel/py-dialog/Makefile +++ devel/py-dialog/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= cdialog:devel/cdialog -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= pythondialog Index: devel/py-diazo/Makefile =================================================================== --- devel/py-diazo/Makefile +++ devel/py-diazo/Makefile @@ -12,12 +12,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \ - ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: devel/py-django-rq-dashboard/Makefile =================================================================== --- devel/py-django-rq-dashboard/Makefile +++ devel/py-django-rq-dashboard/Makefile @@ -8,14 +8,14 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Monitor your RQ queues, jobs and workers from the Django admin -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= brutasse NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-django-rq/Makefile =================================================================== --- devel/py-django-rq/Makefile +++ devel/py-django-rq/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT TEST_DEPENDS= redis-server:databases/redis -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rq>=0.5.5:devel/py-rq@${FLAVOR} NO_ARCH= yes Index: devel/py-django-tastypie-mongoengine/Makefile =================================================================== --- devel/py-django-tastypie-mongoengine/Makefile +++ devel/py-django-tastypie-mongoengine/Makefile @@ -14,9 +14,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie \ - ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine \ - ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}django-tastypie>=0.9.12:www/py-django-tastypie@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mongoengine>=0.8.7:devel/py-mongoengine@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= wlanslovenija Index: devel/py-docker-py/Makefile =================================================================== --- devel/py-docker-py/Makefile +++ devel/py-docker-py/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-dockerpty/Makefile =================================================================== --- devel/py-dockerpty/Makefile +++ devel/py-dockerpty/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-docopt/Makefile =================================================================== --- devel/py-docopt/Makefile +++ devel/py-docopt/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= distutils autoplist concurrent OPTIONS_DEFINE= DOCS EXAMPLES Index: devel/py-dogpile.cache/Makefile =================================================================== --- devel/py-dogpile.cache/Makefile +++ devel/py-dogpile.cache/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-doit/Makefile =================================================================== --- devel/py-doit/Makefile +++ devel/py-doit/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cloudpickle>0:devel/py-cloudpickle@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python:3.3+ USE_PYTHON= distutils autoplist @@ -26,11 +26,4 @@ do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: devel/py-easyprocess/Makefile =================================================================== --- devel/py-easyprocess/Makefile +++ devel/py-easyprocess/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver \ - ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} NO_ARCH= YES USE_PYTHON= autoplist distutils Index: devel/py-efilter/Makefile =================================================================== --- devel/py-efilter/Makefile +++ devel/py-efilter/Makefile @@ -14,10 +14,10 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2011:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-efl/Makefile =================================================================== --- devel/py-efl/Makefile +++ devel/py-efl/Makefile @@ -14,20 +14,12 @@ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${FLAVOR} LIB_DEPENDS= libefl.so:devel/efl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${FLAVOR} DIST_SUBDIR= enlightenment USES= pkgconfig python tar:xz USE_PYTHON= autoplist distutils -.include - -.if ${PYTHON_REL} < 3000 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus -.else -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py3-dbus -.endif - -.include +.include Index: devel/py-entrypoints/Makefile =================================================================== --- devel/py-entrypoints/Makefile +++ devel/py-entrypoints/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -21,7 +21,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=3.5:devel/py-configparser +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>=3.5:devel/py-configparser@${FLAVOR} .endif do-test: Index: devel/py-envisage/Makefile =================================================================== --- devel/py-envisage/Makefile +++ devel/py-envisage/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= multi # See image_LICENSE.txt files for per file license information -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: devel/py-epsilon/Makefile =================================================================== --- devel/py-epsilon/Makefile +++ devel/py-epsilon/Makefile @@ -15,8 +15,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} CONFLICTS_INSTALL= brlcad-[0-9]* # bin/benchmark Index: devel/py-extras/Makefile =================================================================== --- devel/py-extras/Makefile +++ devel/py-extras/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>0:devel/py-testtools@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-ezpyinline/Makefile =================================================================== --- devel/py-ezpyinline/Makefile +++ devel/py-ezpyinline/Makefile @@ -7,11 +7,12 @@ CATEGORIES= devel python MASTER_SITES= CHEESESHOP DIST_SUBDIR= python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lwhsu@FreeBSD.org COMMENT= Easy embedded Inline C for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-fabric/Makefile =================================================================== --- devel/py-fabric/Makefile +++ devel/py-fabric/Makefile @@ -15,10 +15,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.10:security/py-paramiko@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0.6:devel/py-Jinja2@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: devel/py-fasteners/Makefile =================================================================== --- devel/py-fasteners/Makefile +++ devel/py-fasteners/Makefile @@ -10,8 +10,8 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Python package that provides useful locks -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.1:devel/py-monotonic@${FLAVOR} NO_ARCH= yes Index: devel/py-filemagic/Makefile =================================================================== --- devel/py-filemagic/Makefile +++ devel/py-filemagic/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= TESTS Index: devel/py-five.customerize/Makefile =================================================================== --- devel/py-five.customerize/Makefile +++ devel/py-five.customerize/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} USE_PYTHON= distutils autoplist USES= python:2 zope zip Index: devel/py-five.formlib/Makefile =================================================================== --- devel/py-five.formlib/Makefile +++ devel/py-five.formlib/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-five.globalrequest/Makefile =================================================================== --- devel/py-five.globalrequest/Makefile +++ devel/py-five.globalrequest/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-five.localsitemanager/Makefile =================================================================== --- devel/py-five.localsitemanager/Makefile +++ devel/py-five.localsitemanager/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-flake8-builtins/Makefile =================================================================== --- devel/py-flake8-builtins/Makefile +++ devel/py-flake8-builtins/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-flake8-docstrings/Makefile =================================================================== --- devel/py-flake8-docstrings/Makefile +++ devel/py-flake8-docstrings/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 \ - ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill \ - ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-flake8-import-order/Makefile =================================================================== --- devel/py-flake8-import-order/Makefile +++ devel/py-flake8-import-order/Makefile @@ -14,10 +14,10 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}asttokens>=0:devel/py-asttokens +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}asttokens>=0:devel/py-asttokens@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-flake8-polyfill/Makefile =================================================================== --- devel/py-flake8-polyfill/Makefile +++ devel/py-flake8-polyfill/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-flake8-quotes/Makefile =================================================================== --- devel/py-flake8-quotes/Makefile +++ devel/py-flake8-quotes/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-flake8/Makefile =================================================================== --- devel/py-flake8/Makefile +++ devel/py-flake8/Makefile @@ -12,12 +12,12 @@ LICENSE= MIT -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.0:devel/py-mccabe \ - ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.0:devel/py-mccabe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py-pycodestyle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py-pyflakes@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-flask-babel/Makefile =================================================================== --- devel/py-flask-babel/Makefile +++ devel/py-flask-babel/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3:devel/py-babel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3:devel/py-babel@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: devel/py-flufl.i18n/Makefile =================================================================== --- devel/py-flufl.i18n/Makefile +++ devel/py-flufl.i18n/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} -USES= python:3 +USES= python:3.5+ USE_PYTHON= autoplist distutils .include Index: devel/py-flufl.lock/Makefile =================================================================== --- devel/py-flufl.lock/Makefile +++ devel/py-flufl.lock/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} -USES= python:3 +USES= python:3.4+ USE_PYTHON= autoplist distutils .include Index: devel/py-foolscap/Makefile =================================================================== --- devel/py-foolscap/Makefile +++ devel/py-foolscap/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-fortran/Makefile =================================================================== --- devel/py-fortran/Makefile +++ devel/py-fortran/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYNUMERIC} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-freenas.dispatcher/Makefile =================================================================== --- devel/py-freenas.dispatcher/Makefile +++ devel/py-freenas.dispatcher/Makefile @@ -9,15 +9,15 @@ MAINTAINER= wg@FreeBSD.org COMMENT= FreeNAS dispatcher client -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ws4py>0:www/py-ws4py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-freenas.utils/Makefile =================================================================== --- devel/py-freenas.utils/Makefile +++ devel/py-freenas.utils/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-freezegun/Makefile =================================================================== --- devel/py-freezegun/Makefile +++ devel/py-freezegun/Makefile @@ -14,13 +14,13 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-fsm/Makefile =================================================================== --- devel/py-fsm/Makefile +++ devel/py-fsm/Makefile @@ -15,9 +15,9 @@ GH_PROJECT= python-fsm GH_TAGNAME= bf888123 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.0:graphics/py-pygraphviz@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-fusefs/Makefile =================================================================== --- devel/py-fusefs/Makefile +++ devel/py-fusefs/Makefile @@ -19,7 +19,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= fuse pkgconfig python iconv +USES= fuse pkgconfig python:2.7 iconv USE_PYTHON= distutils autoplist PORTDOCS= AUTHORS Changelog FAQ INSTALL README.1st README.historic \ Index: devel/py-futurist/Makefile =================================================================== --- devel/py-futurist/Makefile +++ devel/py-futurist/Makefile @@ -12,12 +12,12 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2 \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} NO_ARCH= yes Index: devel/py-game_sdl2/Makefile =================================================================== --- devel/py-game_sdl2/Makefile +++ devel/py-game_sdl2/Makefile @@ -14,7 +14,6 @@ LICENSE= LGPL21+ ZLIB LICENSE_COMB= multi -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libpng.so:graphics/png # Upstream tends to reroll distfiles before moving under /release/ @@ -22,10 +21,12 @@ USES= jpeg python USE_SDL= image2 mixer2 ttf2 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython EXCLUDE= gen gen3 PKG-INFO '*.egg-info' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} +BINARY_ALIAS= cython=cython-${PYTHON_VER} + post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name \*.so \ -exec ${STRIP_CMD} {} + Index: devel/py-gamin/Makefile =================================================================== --- devel/py-gamin/Makefile +++ devel/py-gamin/Makefile @@ -16,7 +16,8 @@ GAMIN_SLAVE= yes -USES= fam:gamin python +USES= fam:gamin python:2.7 +USE_PYTHON= flavors CONFIGURE_ARGS= --with-python=${PYTHON_CMD} \ --disable-gtk-doc --with-html-dir=${PREFIX}/share/doc Index: devel/py-gdata/Makefile =================================================================== --- devel/py-gdata/Makefile +++ devel/py-gdata/Makefile @@ -24,9 +24,9 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -M2CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto -PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto -GMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy +M2CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.20:security/py-m2crypto@${FLAVOR} +PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} +GMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy@${FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ Index: devel/py-gdbgui/Makefile =================================================================== --- devel/py-gdbgui/Makefile +++ devel/py-gdbgui/Makefile @@ -11,17 +11,17 @@ LICENSE= CC-BY-NC-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12.2:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-SocketIO>=2.9.0:www/py-flask-socketio \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0.21.0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}pygdbmi>=0.7.3.3:devel/py-pygdbmi \ - ${PYTHON_PKGNAMEPREFIX}pypugjs>=4.2.0:devel/py-pypugjs \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}gevent>=1.2.2:devel/py-gevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.12.2:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-SocketIO>=2.9.0:www/py-flask-socketio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0.21.0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygdbmi>=0.7.3.3:devel/py-pygdbmi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pypugjs>=4.2.0:devel/py-pypugjs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=1.2.2:devel/py-gevent@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= cs01 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-gearman/Makefile =================================================================== --- devel/py-gearman/Makefile +++ devel/py-gearman/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Gearman Library for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-geojson/Makefile =================================================================== --- devel/py-geojson/Makefile +++ devel/py-geojson/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.0:devel/py-nose@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>1.9:devel/py-simplejson@${FLAVOR} PORTDOCS= LICENSE.rst CHANGELOG.rst README.rst Index: devel/py-geotypes/Makefile =================================================================== --- devel/py-geotypes/Makefile +++ devel/py-geotypes/Makefile @@ -12,7 +12,7 @@ LICENSE= LGPL21 -USES= python +USES= python:2.7 USE_PYTHON= distutils PYTHON_PKGNAMEPREFIX= yes PYDISTUTILS_EGGINFO= GeoTypes-0.7.0-py${PYTHON_VER}.egg-info Index: devel/py-gevent/Makefile =================================================================== --- devel/py-gevent/Makefile +++ devel/py-gevent/Makefile @@ -15,9 +15,9 @@ LIB_DEPENDS= libcares.so:dns/c-ares \ libev.so:devel/libev -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.4.10:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} DO_MAKE_TEST= ${SETENV} PYTHONPATH=../ ${PYTHON_CMD} MAKE_ENV= CARES_EMBED=0 LIBEV_EMBED=0 Index: devel/py-git-up/Makefile =================================================================== --- devel/py-git-up/Makefile +++ devel/py-git-up/Makefile @@ -11,11 +11,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.1:devel/py-gitpython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.0.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}GitPython>=2.1.1:devel/py-gitpython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR} NO_ARCH= yes USES= dos2unix python zip Index: devel/py-gitdb/Makefile =================================================================== --- devel/py-gitdb/Makefile +++ devel/py-gitdb/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:devel/py-smmap +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:devel/py-smmap@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: devel/py-gitdb2/Makefile =================================================================== --- devel/py-gitdb2/Makefile +++ devel/py-gitdb2/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap2>=2.0.0:devel/py-smmap2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}smmap2>=2.0.0:devel/py-smmap2@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-gitless/Makefile =================================================================== --- devel/py-gitless/Makefile +++ devel/py-gitless/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.3.6:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.23.0:devel/py-pygit2 \ - ${PYTHON_PKGNAMEPREFIX}sh>=1.11:devel/py-sh \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.3.6:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.23.0:devel/py-pygit2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sh>=1.11:devel/py-sh@${FLAVOR} \ git:devel/git USES= python Index: devel/py-gitpython/Makefile =================================================================== --- devel/py-gitpython/Makefile +++ devel/py-gitpython/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt \ - ${PYTHON_PKGNAMEPREFIX}gitdb2>=2.0.0:devel/py-gitdb2 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ddt>=1.1.1:devel/py-ddt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gitdb2>=2.0.0:devel/py-gitdb2@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-glance-store/Makefile =================================================================== --- devel/py-glance-store/Makefile +++ devel/py-glance-store/Makefile @@ -12,20 +12,20 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= OpenStack Image Service Store Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} NO_ARCH= yes Index: devel/py-glob2/Makefile =================================================================== --- devel/py-glob2/Makefile +++ devel/py-glob2/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: devel/py-gobject/Makefile =================================================================== --- devel/py-gobject/Makefile +++ devel/py-gobject/Makefile @@ -24,6 +24,7 @@ USES= gmake libtool pathfix pkgconfig python:2 tar:xz shebangfix USE_GNOME= glib20 introspection:build,run +USE_PYTHON= flavors GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-docs --disable-introspection --with-ffi Index: devel/py-gobject3/Makefile =================================================================== --- devel/py-gobject3/Makefile +++ devel/py-gobject3/Makefile @@ -6,9 +6,12 @@ COMMENT= Python 2 bindings for GObject -SLAVE_PORT= python2 +SLAVE_PORT= python MASTERDIR= ${.CURDIR}/../../devel/pygobject3-common PLIST= ${.CURDIR}/pkg-plist +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 .include "${MASTERDIR}/Makefile" Index: devel/py-google-apputils/Makefile =================================================================== --- devel/py-google-apputils/Makefile +++ devel/py-google-apputils/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gflags>2:devel/py-python-gflags \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gflags>2:devel/py-python-gflags@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python:2 Index: devel/py-googleapis-common-protos/Makefile =================================================================== --- devel/py-googleapis-common-protos/Makefile +++ devel/py-googleapis-common-protos/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-grab/Makefile =================================================================== --- devel/py-grab/Makefile +++ devel/py-grab/Makefile @@ -11,13 +11,13 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib \ - ${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-grpcio-tools/Makefile =================================================================== --- devel/py-grpcio-tools/Makefile +++ devel/py-grpcio-tools/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio>1:devel/py-grpcio +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grpcio>1:devel/py-grpcio@${FLAVOR} LIB_DEPENDS= libcares.so:dns/c-ares USES= localbase:ldflags python Index: devel/py-grpcio/Makefile =================================================================== --- devel/py-grpcio/Makefile +++ devel/py-grpcio/Makefile @@ -13,8 +13,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>1:devel/py-six@${FLAVOR} \ + ${PY_ENUM34} \ + ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=3:devel/py-protobuf@${FLAVOR} LIB_DEPENDS= libcares.so:dns/c-ares BROKEN_powerpc64= fails to compile: cpu-ppc64le.c: 'AT_HWCAP2' undeclared @@ -24,15 +26,8 @@ CFLAGS+= -Ithird_party/boringssl/include LDFLAGS+= -lcares -.include - -.if ${PYTHON_VERSION} == "2.7" -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>1:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}futures>=3:devel/py-futures -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so ${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR}/\(.*\)/grpcio/grpc/_cython/cygrpc.so|${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so|g' ${_PYTHONPKGLIST} -.include +.include Index: devel/py-gtfslib/Makefile =================================================================== --- devel/py-gtfslib/Makefile +++ devel/py-gtfslib/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv3+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}pyqtree>=0.24:devel/py-pyqtree \ - ${PYTHON_PKGNAMEPREFIX}pyshp>=1.2.12:devel/py-pyshp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>=0.6.1:databases/py-sqlalchemy11@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docopt>=0.6:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.18:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyqtree>=0.24:devel/py-pyqtree@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyshp>=1.2.12:devel/py-pyshp@${FLAVOR} NO_ARCH= yes Index: devel/py-hash_ring/Makefile =================================================================== --- devel/py-hash_ring/Makefile +++ devel/py-hash_ring/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Implementation of consistent hashing in Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-hgsubversion/Makefile =================================================================== --- devel/py-hgsubversion/Makefile +++ devel/py-hgsubversion/Makefile @@ -22,9 +22,9 @@ .include .if ${PORT_OPTIONS:MSUBVERTPY} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subvertpy>=0:devel/py-subvertpy@${FLAVOR} .else -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${FLAVOR} .endif .include Index: devel/py-hgtools/Makefile =================================================================== --- devel/py-hgtools/Makefile +++ devel/py-hgtools/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python zip +USES= python zip USE_PYTHON= distutils autoplist NO_ARCH= yes Index: devel/py-http-prompt/Makefile =================================================================== --- devel/py-http-prompt/Makefile +++ devel/py-http-prompt/Makefile @@ -12,12 +12,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parsimonious>=0.6.2:textproc/py-parsimonious@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=0.60:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httpie>=0.9.2:www/py-httpie@${FLAVOR} NO_ARCH= yes SUB_FILES= pkg-message Index: devel/py-hypothesis/Makefile =================================================================== --- devel/py-hypothesis/Makefile +++ devel/py-hypothesis/Makefile @@ -12,7 +12,7 @@ LICENSE= MPL20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-icalendar/Makefile =================================================================== --- devel/py-icalendar/Makefile +++ devel/py-icalendar/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-interface/Makefile =================================================================== --- devel/py-interface/Makefile +++ devel/py-interface/Makefile @@ -14,13 +14,15 @@ LICENSE= LGPL20 USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist PYDISTUTILS_PKGNAME= py_${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/py_${PORTNAME} # EXAMPLESDIR= ${PREFIX}/share/examples/py_${PORTNAME} OPTIONS_DEFINE= DOCS +PORTDOCS= README + post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR} Index: devel/py-interface/pkg-plist =================================================================== --- devel/py-interface/pkg-plist +++ /dev/null @@ -1,28 +0,0 @@ -%%PYTHON_SITELIBDIR%%/py_interface/__init__.py -%%PYTHON_SITELIBDIR%%/py_interface/__init__.pyc -%%PYTHON_SITELIBDIR%%/py_interface/__init__.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_async_conn.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_common.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_common.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_common.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_epmd.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_eventhandler.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_node.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_node.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_node.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_node_conn.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_opts.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/py_interface/erl_term.py -%%PYTHON_SITELIBDIR%%/py_interface/erl_term.pyc -%%PYTHON_SITELIBDIR%%/py_interface/erl_term.%%PYTHON_PYOEXTENSION%% -%%PORTDOCS%%%%DOCSDIR%%/README Index: devel/py-intervaltree/Makefile =================================================================== --- devel/py-intervaltree/Makefile +++ devel/py-intervaltree/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=0:devel/py-sortedcontainers@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-invoke/Makefile =================================================================== --- devel/py-invoke/Makefile +++ devel/py-invoke/Makefile @@ -16,10 +16,10 @@ USES= python USE_PYTHON= autoplist distutils -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twine>0:devel/py-twine -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}twine>0:devel/py-twine@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} NO_ARCH= YES Index: devel/py-ipdb/Makefile =================================================================== --- devel/py-ipdb/Makefile +++ devel/py-ipdb/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10:devel/ipython +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.10:devel/ipython@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: devel/py-ipykernel/Makefile =================================================================== --- devel/py-ipykernel/Makefile +++ devel/py-ipykernel/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-ipyparallel/Makefile =================================================================== --- devel/py-ipyparallel/Makefile +++ devel/py-ipyparallel/Makefile @@ -12,16 +12,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-ipywidgets/Makefile =================================================================== --- devel/py-ipywidgets/Makefile +++ devel/py-ipywidgets/Makefile @@ -9,10 +9,10 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Interactive HTML widgets for Jupyter notebooks and the IPython kernel -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.2.2:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>=1.2:devel/py-widgetsnbextension \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=4.0.0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.2.2:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}widgetsnbextension>=1.2:devel/py-widgetsnbextension@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-iso8601/Makefile =================================================================== --- devel/py-iso8601/Makefile +++ devel/py-iso8601/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-isodate/Makefile =================================================================== --- devel/py-isodate/Makefile +++ devel/py-isodate/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-isort/Makefile =================================================================== --- devel/py-isort/Makefile +++ devel/py-isort/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-jaraco.classes/Makefile =================================================================== --- devel/py-jaraco.classes/Makefile +++ devel/py-jaraco.classes/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-jaraco.functools/Makefile =================================================================== --- devel/py-jaraco.functools/Makefile +++ devel/py-jaraco.functools/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -20,7 +20,7 @@ .include .if ${PYTHON_VER} == "2.7" -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} .endif .include Index: devel/py-jaraco.itertools/Makefile =================================================================== --- devel/py-jaraco.itertools/Makefile +++ devel/py-jaraco.itertools/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \ - ${PYTHON_PKGNAMEPREFIX}inflect>0:devel/py-inflect -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}inflect>0:devel/py-inflect@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-jaraco.logging/Makefile =================================================================== --- devel/py-jaraco.logging/Makefile +++ devel/py-jaraco.logging/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tempora>0:devel/py-tempora@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-jaraco.timing/Makefile =================================================================== --- devel/py-jaraco.timing/Makefile +++ devel/py-jaraco.timing/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-jaraco.util/Makefile =================================================================== --- devel/py-jaraco.util/Makefile +++ devel/py-jaraco.util/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools \ - ${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.timing>0:devel/py-jaraco.timing@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: devel/py-jdcal/Makefile =================================================================== --- devel/py-jdcal/Makefile +++ devel/py-jdcal/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-jedi/Makefile =================================================================== --- devel/py-jedi/Makefile +++ devel/py-jedi/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: devel/py-jenkins-job-builder/Makefile =================================================================== --- devel/py-jenkins-job-builder/Makefile +++ devel/py-jenkins-job-builder/Makefile @@ -13,12 +13,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PKGNAMEPREFIX}pbr>0:devel/py-pbr \ - ${PKGNAMEPREFIX}six>0:devel/py-six \ - ${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \ - ${PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \ + ${PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${FLAVOR} \ + ${PKGNAMEPREFIX}python-jenkins>0:devel/py-python-jenkins@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-jira/Makefile =================================================================== --- devel/py-jira/Makefile +++ devel/py-jira/Makefile @@ -13,16 +13,16 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.3:www/py-requests-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tlslite>=0.4.4:security/py-tlslite@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.9:devel/py-pbr@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} OPTIONS_DEFINE= MAGIC PARALLEL SHELL TESTS OPTIONS_DEFAULT= MAGIC PARALLEL SHELL @@ -32,15 +32,15 @@ SHELL_DESC= Enable interactive shell TESTS_DESC= Install test suite dependencies -MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic -PARALLEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests -SHELL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython +MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}filemagic>=1.6:devel/py-filemagic@${FLAVOR} +PARALLEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grequests>0:www/py-grequests@${FLAVOR} +SHELL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0.13:devel/ipython@${FLAVOR} TESTS_BUILD_DEPENDS= ${TEST_DEPENDS} TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-jsbeautifier/Makefile =================================================================== --- devel/py-jsbeautifier/Makefile +++ devel/py-jsbeautifier/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}editorconfig>=0.12.0:editors/py-editorconfig@${FLAVOR} USES?= python USE_PYTHON= distutils autoplist Index: devel/py-json-sempai/Makefile =================================================================== --- devel/py-json-sempai/Makefile +++ devel/py-json-sempai/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTDOCS= README.rst Index: devel/py-jsonlib/Makefile =================================================================== --- devel/py-jsonlib/Makefile +++ devel/py-jsonlib/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= JSON Serializer/Deserializer for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-jsonlib2/Makefile =================================================================== --- devel/py-jsonlib2/Makefile +++ devel/py-jsonlib2/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= JSON Serializer/Deserializer for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-jsonpatch/Makefile =================================================================== --- devel/py-jsonpatch/Makefile +++ devel/py-jsonpatch/Makefile @@ -9,7 +9,7 @@ MAINTAINER= harm@weites.com COMMENT= Apply JSON-Patches (RFC 6902) -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR} LICENSE= BSD3CLAUSE Index: devel/py-jsonref/Makefile =================================================================== --- devel/py-jsonref/Makefile +++ devel/py-jsonref/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${FLAVOR} USES?= python USE_PYTHON= autoplist distutils Index: devel/py-jsonrpclib-pelix/Makefile =================================================================== --- devel/py-jsonrpclib-pelix/Makefile +++ devel/py-jsonrpclib-pelix/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -USES= python:3 +USES= python:3.4+ USE_PYTHON= distutils autoplist .include Index: devel/py-jsonrpclib/Makefile =================================================================== --- devel/py-jsonrpclib/Makefile +++ devel/py-jsonrpclib/Makefile @@ -21,7 +21,7 @@ .include .if ${PORT_OPTIONS:MCJSON} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cjson>0:devel/py-cjson@${FLAVOR} .endif .include Index: devel/py-jsonschema/Makefile =================================================================== --- devel/py-jsonschema/Makefile +++ devel/py-jsonschema/Makefile @@ -1,26 +1,27 @@ -# Created by: William Grzybowski +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= jsonschema -PORTVERSION= 2.5.1 +PORTVERSION= 2.6.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= wg@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= JSON Schema validation for Python LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py-vcversioner@${FLAVOR} USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes .include .if ${PYTHON_VER} == "2.7" -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} .endif .include Index: devel/py-jsonschema/distinfo =================================================================== --- devel/py-jsonschema/distinfo +++ devel/py-jsonschema/distinfo @@ -1,2 +1,3 @@ -SHA256 (jsonschema-2.5.1.tar.gz) = 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 -SIZE (jsonschema-2.5.1.tar.gz) = 50855 +TIMESTAMP = 1488112296 +SHA256 (jsonschema-2.6.0.tar.gz) = 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 +SIZE (jsonschema-2.6.0.tar.gz) = 53252 Index: devel/py-jupyter_client/Makefile =================================================================== --- devel/py-jupyter_client/Makefile +++ devel/py-jupyter_client/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=13:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-jupyter_console/Makefile =================================================================== --- devel/py-jupyter_console/Makefile +++ devel/py-jupyter_console/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-jupyter_core/Makefile =================================================================== --- devel/py-jupyter_core/Makefile +++ devel/py-jupyter_core/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath + ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-kaptan/Makefile =================================================================== --- devel/py-kaptan/Makefile +++ devel/py-kaptan/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-kayako/Makefile =================================================================== --- devel/py-kayako/Makefile +++ devel/py-kayako/Makefile @@ -9,7 +9,7 @@ MAINTAINER= rm@FreeBSD.org COMMENT= Python API Wrapper for Kayako -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} NO_ARCH= yes USES= python:2 Index: devel/py-kazoo/Makefile =================================================================== --- devel/py-kazoo/Makefile +++ devel/py-kazoo/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${FLAVOR} USES= gmake python USE_PYTHON= distutils autoplist Index: devel/py-keystoneauth1/Makefile =================================================================== --- devel/py-keystoneauth1/Makefile +++ devel/py-keystoneauth1/Makefile @@ -12,12 +12,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} NO_ARCH= yes Index: devel/py-keystonemiddleware/Makefile =================================================================== --- devel/py-keystonemiddleware/Makefile +++ devel/py-keystonemiddleware/Makefile @@ -10,20 +10,20 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Middleware for OpenStack Identity -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf \ - ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1@${FLAVOR} NO_ARCH= yes Index: devel/py-kid/Makefile =================================================================== --- devel/py-kid/Makefile +++ devel/py-kid/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Simple template language for XML based written in Python -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils autoplist SHEBANG_FILES= misc/upgrade-0.6.py Index: devel/py-kjbuckets/Makefile =================================================================== --- devel/py-kjbuckets/Makefile +++ devel/py-kjbuckets/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${DISTNAME}/kjbuckets Index: devel/py-lazr.config/Makefile =================================================================== --- devel/py-lazr.config/Makefile +++ devel/py-lazr.config/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lazr.delegates>=2.0.3:devel/py-lazr.delegates@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-lazr.delegates/Makefile =================================================================== --- devel/py-lazr.delegates/Makefile +++ devel/py-lazr.delegates/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-libpeas/Makefile =================================================================== --- devel/py-libpeas/Makefile +++ devel/py-libpeas/Makefile @@ -1,22 +1,16 @@ # Created by: Koop Mast # $FreeBSD$ -PORTNAME= libpeas PORTREVISION= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -COMMENT= libpeas Python 2 support +COMMENT= libpeas Python support -LIB_DEPENDS+= libpeas-1.0.so:devel/libpeas - -LIBPEAS_SLAVE= python2 - -BUILD_WRKSRC= ${WRKSRC}/loaders/python -INSTALL_WRKSRC= ${WRKSRC}/loaders/python +LIBPEAS_SLAVE= python MASTERDIR= ${.CURDIR}/../../devel/libpeas/ +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 .include "${MASTERDIR}/Makefile" Index: devel/py-libplist/Makefile =================================================================== --- devel/py-libplist/Makefile +++ devel/py-libplist/Makefile @@ -8,11 +8,11 @@ COMMENT= Python bindings for libplist LIB_DEPENDS= libplist.so:${MASTER_PORT} -BUILD_DEPENDS= cython:lang/cython PORTSCOUT= ignore:1 -USES= python +USES= python:2.7 +USE_PYTHON= flavors cython CONFIGURE_ENV= PYTHON_LDFLAGS="`pkg-config --libs python-${PYTHON_VER}`" SLAVE_PORT= yes MASTERDIR= ${.CURDIR:H:H}/devel/libplist Index: devel/py-libtaxii/Makefile =================================================================== --- devel/py-libtaxii/Makefile +++ devel/py-libtaxii/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: devel/py-libzfs/Makefile =================================================================== --- devel/py-libzfs/Makefile +++ devel/py-libzfs/Makefile @@ -18,21 +18,15 @@ GH_PROJECT= py-libzfs GH_TAGNAME= 3e31c3f -USES?= python -USE_PYTHON= autoplist distutils +USES= python +USE_PYTHON= autoplist distutils cython MAKE_ENV= FREEBSD_SRC=${SRC_BASE} .include -.if ${PYTHON_REL} >= 3306 -BUILD_DEPENDS= cython3>0:lang/cython3 -.else -BUILD_DEPENDS= cython>0:lang/cython -.endif - .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .if !exists(${SRC_BASE}/sys/Makefile) Index: devel/py-linecache2/Makefile =================================================================== --- devel/py-linecache2/Makefile +++ devel/py-linecache2/Makefile @@ -12,8 +12,8 @@ LICENSE= PSFL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-llfuse/Makefile =================================================================== --- devel/py-llfuse/Makefile +++ devel/py-llfuse/Makefile @@ -14,7 +14,7 @@ BROKEN_powerpc64= Does not build: error: conversion to mode_t from int may alter its value -USES?= compiler:c++11-lang fuse pkgconfig python tar:bz2 +USES= compiler:c++11-lang fuse pkgconfig python tar:bz2 USE_PYTHON= autoplist distutils post-install: Index: devel/py-llvmlite/Makefile =================================================================== --- devel/py-llvmlite/Makefile +++ devel/py-llvmlite/Makefile @@ -27,7 +27,7 @@ # Python 2.7 requires enum34, unnecessary for Python 3.4+ .if ${PYTHON_REL} < 3400 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif BUILD_DEPENDS+= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER} Index: devel/py-lockfile/Makefile =================================================================== --- devel/py-lockfile/Makefile +++ devel/py-lockfile/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-log4py/Makefile =================================================================== --- devel/py-log4py/Makefile +++ devel/py-log4py/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: devel/py-logan/Makefile =================================================================== --- devel/py-logan/Makefile +++ devel/py-logan/Makefile @@ -11,10 +11,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-logfury/Makefile =================================================================== --- devel/py-logfury/Makefile +++ devel/py-logfury/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${FLAVOR} USES= python:2.7+ USE_PYTHON= autoplist distutils Index: devel/py-logilab-common/Makefile =================================================================== --- devel/py-logilab-common/Makefile +++ devel/py-logilab-common/Makefile @@ -13,8 +13,8 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-louie/Makefile =================================================================== --- devel/py-louie/Makefile +++ devel/py-louie/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.8.3:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.8.3:devel/py-nose@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: devel/py-lxml/Makefile =================================================================== --- devel/py-lxml/Makefile +++ devel/py-lxml/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libxslt.so:textproc/libxslt -USES+= python uniquefiles:dirs +USES= python uniquefiles:dirs USE_PYTHON= autoplist concurrent distutils LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib Index: devel/py-manuel/Makefile =================================================================== --- devel/py-manuel/Makefile +++ devel/py-manuel/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-mccabe/Makefile =================================================================== --- devel/py-mccabe/Makefile +++ devel/py-mccabe/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-mdv/Makefile =================================================================== --- devel/py-mdv/Makefile +++ devel/py-mdv/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: devel/py-meliae/Makefile =================================================================== --- devel/py-meliae/Makefile +++ devel/py-meliae/Makefile @@ -13,10 +13,8 @@ LICENSE= GPLv3 -BUILD_DEPENDS= cython>0:lang/cython - USES= python:2 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython regression-test: extract (cd ${WRKSRC}; ${MAKE} check) Index: devel/py-memory_profiler/Makefile =================================================================== --- devel/py-memory_profiler/Makefile +++ devel/py-memory_profiler/Makefile @@ -16,7 +16,7 @@ OPTIONS_DEFAULT= PSUTIL PSUTIL_DESC= Use psutil for better performance -PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:sysutils/py-psutil +PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>1.0.0:sysutils/py-psutil@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-microversion-parse/Makefile =================================================================== --- devel/py-microversion-parse/Makefile +++ devel/py-microversion-parse/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} NO_ARCH= yes Index: devel/py-minimongo/Makefile =================================================================== --- devel/py-minimongo/Makefile +++ devel/py-minimongo/Makefile @@ -12,7 +12,7 @@ MAINTAINER= mail@derzinn.de COMMENT= Minimal database Model management for MongoDB -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=1.9:databases/pymongo@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-mock/Makefile =================================================================== --- devel/py-mock/Makefile +++ devel/py-mock/Makefile @@ -13,19 +13,19 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -TESTS_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox +TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}funcsigs>=0:devel/py-funcsigs@${FLAVOR} .endif do-test: Index: devel/py-mongoengine/Makefile =================================================================== --- devel/py-mongoengine/Makefile +++ devel/py-mongoengine/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rednose>0:devel/py-rednose@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.7:databases/pymongo@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-mwlib.ext/Makefile =================================================================== --- devel/py-mwlib.ext/Makefile +++ devel/py-mwlib.ext/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Provide Dependencies for mwlib -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-mwlib.rl/Makefile =================================================================== --- devel/py-mwlib.rl/Makefile +++ devel/py-mwlib.rl/Makefile @@ -14,13 +14,13 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/texvc:print/texvc \ ${LOCALBASE}/bin/fribidi:converters/fribidi \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib \ - ${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments + ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mwlib>=0.12.14:devel/py-mwlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mwlib.ext>=0.12.3:devel/py-mwlib.ext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-mwlib/Makefile =================================================================== --- devel/py-mwlib/Makefile +++ devel/py-mwlib/Makefile @@ -13,25 +13,25 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg \ - ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle \ - ${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \ - ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py \ - ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve \ - ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \ - ${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm \ - ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.2:devel/py-apipkg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bottle>=0.10:www/py-bottle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flup>=1.0:www/py-flup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}odfpy>=0.9:devel/py-odfpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.8:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdf>=1.12:print/py-pdf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.0:devel/py-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qserve>=0:devel/py-qserve@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>2.0.8:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3dbm>=0:databases/py-sqlite3dbm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}timelib>=0.2:devel/py-timelib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${FLAVOR} USES= python:2 shebangfix zip SHEBANG_FILES= mwlib/EasyTimeline.pl mwlib/writer/*.py \ Index: devel/py-mx-experimental/Makefile =================================================================== --- devel/py-mx-experimental/Makefile +++ devel/py-mx-experimental/Makefile @@ -13,9 +13,9 @@ COMMENT= The eGenix mx Extensions - EXPERIMENTAL Package BUILD_DEPENDS= ${LOCALBASE}/include/gmp.h:math/gmp -#RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base +#RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:lang/py-mx-base@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= egenix-mx-experimental Index: devel/py-mypy/Makefile =================================================================== --- devel/py-mypy/Makefile +++ devel/py-mypy/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT PSFL LICENSE_COMB= multi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.1.0:devel/py-typed-ast +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}typed-ast>=1.1.0:devel/py-typed-ast@${FLAVOR} NO_ARCH= yes USES= python:3.3+ shebangfix @@ -23,7 +23,7 @@ .include .if ${PYTHON_VER} < 3.5 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=3.5.3:devel/py-typing@${FLAVOR} .endif .include Index: devel/py-nagioscheck/Makefile =================================================================== --- devel/py-nagioscheck/Makefile +++ devel/py-nagioscheck/Makefile @@ -10,7 +10,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= Class library for writing Nagios plugins -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-natsort/Makefile =================================================================== --- devel/py-natsort/Makefile +++ devel/py-natsort/Makefile @@ -12,13 +12,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastnumbers>0:devel/py-fastnumbers \ - ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.8.0:devel/py-hypothesis \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib \ - ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fastnumbers>0:devel/py-fastnumbers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>=3.8.0:devel/py-hypothesis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-nbconvert/Makefile =================================================================== --- devel/py-nbconvert/Makefile +++ devel/py-nbconvert/Makefile @@ -12,17 +12,17 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach \ - ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.2:devel/py-entrypoints \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.2:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune \ - ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat \ - ${PYTHON_PKGNAMEPREFIX}pandocfilters>=1.4.1:textproc/py-pandocfilters \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bleach>=0:www/py-bleach@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}entrypoints>=0.2.2:devel/py-entrypoints@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.2:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mistune>=0:textproc/py-mistune@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandocfilters>=1.4.1:textproc/py-pandocfilters@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-nbformat/Makefile =================================================================== --- devel/py-nbformat/Makefile +++ devel/py-nbformat/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1:devel/py-traitlets -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1:devel/py-traitlets@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}testpath>=0:devel/py-testpath@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-ncurses/Makefile =================================================================== --- devel/py-ncurses/Makefile +++ devel/py-ncurses/Makefile @@ -15,7 +15,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= ncurses python +USES= ncurses python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: devel/py-nose-cov/Makefile =================================================================== --- devel/py-nose-cov/Makefile +++ devel/py-nose-cov/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-nose/Makefile =================================================================== --- devel/py-nose/Makefile +++ devel/py-nose/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/lgpl.txt -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: devel/py-nose2/Makefile =================================================================== --- devel/py-nose2/Makefile +++ devel/py-nose2/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cov-core>=1.12:devel/py-cov-core \ - ${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cov-core>=1.12:devel/py-cov-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.7:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: devel/py-noseofyeti/Makefile =================================================================== --- devel/py-noseofyeti/Makefile +++ devel/py-noseofyeti/Makefile @@ -8,21 +8,21 @@ MAINTAINER= truckman@FreeBSD.org COMMENT= Nose plugin providing BDD dsl for Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${FLAVOR} OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio \ - ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fudge>0:devel/py-fudge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pinocchio>0:devel/py-pinocchio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}should_dsl>0:devel/py-should_dsl@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_GITHUB= yes GH_ACCOUNT= delfick GH_PROJECT= nose-of-yeti Index: devel/py-notifier/Makefile =================================================================== --- devel/py-notifier/Makefile +++ devel/py-notifier/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL20 -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= examples/*.py USE_PYTHON= distutils PYDISTUTILS_PKGNAME= pynotifier Index: devel/py-notify/Makefile =================================================================== --- devel/py-notify/Makefile +++ devel/py-notify/Makefile @@ -17,6 +17,7 @@ USES= gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2 USE_GNOME= pygtk2 +USE_PYTHON= flavors INSTALL_TARGET= install-strip GNU_CONFIGURE= yes Index: devel/py-numba/Makefile =================================================================== --- devel/py-numba/Makefile +++ devel/py-numba/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite@${FLAVOR} # Uses Python 2.7, 3.4+ USES= python fortran @@ -25,9 +25,9 @@ # Requried for Python 2.7 .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} .endif .include Index: devel/py-omnijson/Makefile =================================================================== --- devel/py-omnijson/Makefile +++ devel/py-omnijson/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= kennethreitz Index: devel/py-openstacksdk/Makefile =================================================================== --- devel/py-openstacksdk/Makefile +++ devel/py-openstacksdk/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config@${FLAVOR} USES= python USE_PYTHON= distutils autoplist noegginfo Index: devel/py-option_merge/Makefile =================================================================== --- devel/py-option_merge/Makefile +++ devel/py-option_merge/Makefile @@ -8,14 +8,14 @@ MAINTAINER= truckman@FreeBSD.org COMMENT= Code to deeply merge multiple python dictionaries -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}delfick_error>=1.6:devel/py-delfick_error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}noseofyeti>=1.4.9:devel/py-noseofyeti@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_GITHUB= yes GH_ACCOUNT= delfick GH_TAGNAME= 2940589 Index: devel/py-orbit/Makefile =================================================================== --- devel/py-orbit/Makefile +++ devel/py-orbit/Makefile @@ -16,8 +16,9 @@ CONFLICTS= py*-omniorb-[0-9]* -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 USE_GNOME= orbit2 +USE_PYTHON= flavors GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Index: devel/py-ordered-set/Makefile =================================================================== --- devel/py-ordered-set/Makefile +++ devel/py-ordered-set/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-os-brick/Makefile =================================================================== --- devel/py-os-brick/Makefile +++ devel/py-os-brick/Makefile @@ -12,21 +12,21 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} NO_ARCH= yes Index: devel/py-os-client-config/Makefile =================================================================== --- devel/py-os-client-config/Makefile +++ devel/py-os-client-config/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.1.1:devel/py-requestsexceptions +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requestsexceptions>=1.1.1:devel/py-requestsexceptions@${FLAVOR} USES= python USE_PYTHON= distutils autoplist noegginfo Index: devel/py-os-vif/Makefile =================================================================== --- devel/py-os-vif/Makefile +++ devel/py-os-vif/Makefile @@ -13,16 +13,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} NO_ARCH= yes Index: devel/py-os-win/Makefile =================================================================== --- devel/py-os-win/Makefile +++ devel/py-os-win/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} NO_ARCH= yes Index: devel/py-osc-lib/Makefile =================================================================== --- devel/py-osc-lib/Makefile +++ devel/py-osc-lib/Makefile @@ -12,16 +12,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-client-config>=1.22.0:devel/py-os-client-config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-oslo.cache/Makefile =================================================================== --- devel/py-oslo.cache/Makefile +++ devel/py-oslo.cache/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.concurrency/Makefile =================================================================== --- devel/py-oslo.concurrency/Makefile +++ devel/py-oslo.concurrency/Makefile @@ -12,15 +12,15 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.config/Makefile =================================================================== --- devel/py-oslo.config/Makefile +++ devel/py-oslo.config/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986 \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.3.1:www/py-rfc3986@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.context/Makefile =================================================================== --- devel/py-oslo.context/Makefile +++ devel/py-oslo.context/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}positional>=1.1.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.db/Makefile =================================================================== --- devel/py-oslo.db/Makefile +++ devel/py-oslo.db/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.4:databases/py-alembic \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alembic>=0.8.4:databases/py-alembic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.i18n/Makefile =================================================================== --- devel/py-oslo.i18n/Makefile +++ devel/py-oslo.i18n/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.log/Makefile =================================================================== --- devel/py-oslo.log/Makefile +++ devel/py-oslo.log/Makefile @@ -12,16 +12,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.2:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.messaging/Makefile =================================================================== --- devel/py-oslo.messaging/Makefile +++ devel/py-oslo.messaging/Makefile @@ -12,32 +12,32 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}pika-pool>=0.1.3:devel/py-pika-pool \ - ${PYTHON_PKGNAMEPREFIX}pika>=0.10.0:devel/py-pika \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.25:net/py-kombu \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools \ - ${PYTHON_PKGNAMEPREFIX}amqp>=0:net/py-amqp \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pika-pool>=0.1.3:devel/py-pika-pool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pika>=0.10.0:devel/py-pika@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kombu>=3.0.25:net/py-kombu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}amqp>=0:net/py-amqp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.middleware/Makefile =================================================================== --- devel/py-oslo.middleware/Makefile +++ devel/py-oslo.middleware/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}statsd>=3.2.1:devel/py-statsd@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.policy/Makefile =================================================================== --- devel/py-oslo.policy/Makefile +++ devel/py-oslo.policy/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.privsep/Makefile =================================================================== --- devel/py-oslo.privsep/Makefile +++ devel/py-oslo.privsep/Makefile @@ -12,16 +12,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.reports/Makefile =================================================================== --- devel/py-oslo.reports/Makefile +++ devel/py-oslo.reports/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.rootwrap/Makefile =================================================================== --- devel/py-oslo.rootwrap/Makefile +++ devel/py-oslo.rootwrap/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.serialization/Makefile =================================================================== --- devel/py-oslo.serialization/Makefile +++ devel/py-oslo.serialization/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.service/Makefile =================================================================== --- devel/py-oslo.service/Makefile +++ devel/py-oslo.service/Makefile @@ -12,20 +12,20 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.utils/Makefile =================================================================== --- devel/py-oslo.utils/Makefile +++ devel/py-oslo.utils/Makefile @@ -11,17 +11,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \ - ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.3:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>0:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.versionedobjects/Makefile =================================================================== --- devel/py-oslo.versionedobjects/Makefile +++ devel/py-oslo.versionedobjects/Makefile @@ -12,19 +12,19 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.14.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.18.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.14.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.18.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: devel/py-oslo.vmware/Makefile =================================================================== --- devel/py-oslo.vmware/Makefile +++ devel/py-oslo.vmware/Makefile @@ -12,19 +12,19 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.15.1:net/py-urllib3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}suds-jurko>=0.6:net/py-suds-jurko@${FLAVOR} NO_ARCH= yes Index: devel/py-osprofiler/Makefile =================================================================== --- devel/py-osprofiler/Makefile +++ devel/py-osprofiler/Makefile @@ -10,15 +10,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= OpenStack Profiler Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.13:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.0:www/py-webob@${FLAVOR} NO_ARCH= yes Index: devel/py-palm/Makefile =================================================================== --- devel/py-palm/Makefile +++ devel/py-palm/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: devel/py-pathlib/Makefile =================================================================== --- devel/py-pathlib/Makefile +++ devel/py-pathlib/Makefile @@ -17,7 +17,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} .include Index: devel/py-pathlib2/Makefile =================================================================== --- devel/py-pathlib2/Makefile +++ devel/py-pathlib2/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist @@ -22,7 +22,7 @@ .include .if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}scandir>=0:sysutils/py-scandir@${FLAVOR} .endif do-test: Index: devel/py-pathtools/Makefile =================================================================== --- devel/py-pathtools/Makefile +++ devel/py-pathtools/Makefile @@ -20,11 +20,11 @@ .include .if ${PORT_OPTIONS:MDOCS} -BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +BUILD_DEPENDS+= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} post-build: - @(cd ${WRKSRC}/docs ; ${MAKE} html) + @(cd ${WRKSRC}/docs ; ${MAKE} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) post-install: @(cd ${WRKSRC}/docs/build/html ; ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ Index: devel/py-pbr/Makefile =================================================================== --- devel/py-pbr/Makefile +++ devel/py-pbr/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} NO_ARCH= yes -USES?= python shebangfix +USES= python shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= pbr/tests/testpackage/setup.py Index: devel/py-pefile/Makefile =================================================================== --- devel/py-pefile/Makefile +++ devel/py-pefile/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-pex/Makefile =================================================================== --- devel/py-pex/Makefile +++ devel/py-pex/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.24.0:devel/py-wheel@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-phabricator/Makefile =================================================================== --- devel/py-phabricator/Makefile +++ devel/py-phabricator/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-pid/Makefile =================================================================== --- devel/py-pid/Makefile +++ devel/py-pid/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} NO_ARCH= yes Index: devel/py-pika-pool/Makefile =================================================================== --- devel/py-pika-pool/Makefile +++ devel/py-pika-pool/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Pika connection pooling -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pika>=0.9.0:devel/py-pika +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pika>=0.9.0:devel/py-pika@${FLAVOR} NO_ARCH= yes Index: devel/py-pinocchio/Makefile =================================================================== --- devel/py-pinocchio/Makefile +++ devel/py-pinocchio/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-pip/Makefile =================================================================== --- devel/py-pip/Makefile +++ devel/py-pip/Makefile @@ -13,27 +13,27 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt # Tests also need bzr, git, otherwise they fail -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend \ - ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${FLAVOR} \ git>0:devel/git \ bzr>0:devel/bzr OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS?= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" NO_ARCH= yes -USES?= python shebangfix +USES= python shebangfix USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-plan/Makefile =================================================================== --- devel/py-plan/Makefile +++ devel/py-plan/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=2.1:devel/py-click@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-pluggy/Makefile =================================================================== --- devel/py-pluggy/Makefile +++ devel/py-pluggy/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-ply/Makefile =================================================================== --- devel/py-ply/Makefile +++ devel/py-ply/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -USES?= python +USES= python USES+= shebangfix USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-positional/Makefile =================================================================== --- devel/py-positional/Makefile +++ devel/py-positional/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} NO_ARCH= yes Index: devel/py-pqueue/Makefile =================================================================== --- devel/py-pqueue/Makefile +++ devel/py-pqueue/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/PQueue Index: devel/py-pretend/Makefile =================================================================== --- devel/py-pretend/Makefile +++ devel/py-pretend/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes Index: devel/py-prioritized_methods/Makefile =================================================================== --- devel/py-prioritized_methods/Makefile +++ devel/py-prioritized_methods/Makefile @@ -11,10 +11,10 @@ MAINTAINER= wenheping@gmail.com COMMENT= Extension to PEAK-Rules to prioritize methods -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PEAK-Rules>=0.5:devel/py-PEAK-Rules@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-prompt_toolkit/Makefile =================================================================== --- devel/py-prompt_toolkit/Makefile +++ devel/py-prompt_toolkit/Makefile @@ -13,13 +13,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py-wcwidth@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils -USES?= python +USES= python -SLAVEDIRS= devel/py3-prompt_toolkit +SLAVEDIRS= devel/py-prompt_toolkit .include Index: devel/py-protobuf/Makefile =================================================================== --- devel/py-protobuf/Makefile +++ devel/py-protobuf/Makefile @@ -13,15 +13,15 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/../LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} \ protoc:devel/protobuf -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} DO_MAKE_TEST= ${PYTHON_CMD} ${PYDISTUTILS_SETUP} NO_ARCH= yes TEST_TARGET= test USE_PYTHON= autoplist distutils -USES?= python +USES= python WRKSRC_SUBDIR= python GH_ACCOUNT= google Index: devel/py-protocols-devel/Makefile =================================================================== --- devel/py-protocols-devel/Makefile +++ devel/py-protocols-devel/Makefile @@ -12,9 +12,9 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Protocol Definition, Declaration, and Adaptation for Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DecoratorTools>=1.7:devel/py-decoratortools@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist BROKEN= checksum mismatch Index: devel/py-protocols/Makefile =================================================================== --- devel/py-protocols/Makefile +++ devel/py-protocols/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Python module extending the PEP 246 adapt() function -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: devel/py-ptrace/Makefile =================================================================== --- devel/py-ptrace/Makefile +++ devel/py-ptrace/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distorm>0:devel/py-distorm@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: devel/py-pudb/Makefile =================================================================== --- devel/py-pudb/Makefile +++ devel/py-pudb/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.1.1:devel/py-urwid@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-py/Makefile =================================================================== --- devel/py-py/Makefile +++ devel/py-py/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} NO_ARCH= yes -USES+= python +USES= python USE_PYTHON= autoplist distutils do-test: Index: devel/py-pyasn1-modules/Makefile =================================================================== --- devel/py-pyasn1-modules/Makefile +++ devel/py-pyasn1-modules/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1@${FLAVOR} OPTIONS_DEFINE= DOCS Index: devel/py-pyasn1/Makefile =================================================================== --- devel/py-pyasn1/Makefile +++ devel/py-pyasn1/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.rst NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils do-test: Index: devel/py-pycadf/Makefile =================================================================== --- devel/py-pycadf/Makefile +++ devel/py-pycadf/Makefile @@ -10,12 +10,12 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= CADF Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} NO_ARCH= yes Index: devel/py-pycallgraph/Makefile =================================================================== --- devel/py-pycallgraph/Makefile +++ devel/py-pycallgraph/Makefile @@ -17,10 +17,10 @@ RUN_DEPENDS+= dot:graphics/graphviz USES= python shebangfix -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist concurrent SHEBANG_FILES= examples/*.py -EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= EXAMPLES Index: devel/py-pycallgraph/pkg-plist =================================================================== --- devel/py-pycallgraph/pkg-plist +++ devel/py-pycallgraph/pkg-plist @@ -1,8 +1,4 @@ -bin/pycallgraph man/man1/pycallgraph.1.gz -%%PYTHON_SITELIBDIR%%/pycallgraph.py -%%PYTHON_SITELIBDIR%%/pycallgraph.pyc -%%PYTHON_SITELIBDIR%%/pycallgraph.pyo %%PORTEXAMPLES%%%%EXAMPLESDIR%%/all.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colours.py Index: devel/py-pycmd/Makefile =================================================================== --- devel/py-pycmd/Makefile +++ devel/py-pycmd/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.9:devel/py-py@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-pycodestyle/Makefile =================================================================== --- devel/py-pycodestyle/Makefile +++ devel/py-pycodestyle/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT # mentioned as "Expat" -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-pycparser/Makefile =================================================================== --- devel/py-pycparser/Makefile +++ devel/py-pycparser/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: devel/py-pydenticon/Makefile =================================================================== --- devel/py-pydenticon/Makefile +++ devel/py-pydenticon/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-pydocstyle/Makefile =================================================================== --- devel/py-pydocstyle/Makefile +++ devel/py-pydocstyle/Makefile @@ -14,10 +14,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py-snowballstemmer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES?= python zip +USES= python zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-pydrive/Makefile =================================================================== --- devel/py-pydrive/Makefile +++ devel/py-pydrive/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.2:www/py-google-api-python-client \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.2:www/py-google-api-python-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-pyechonest/Makefile =================================================================== --- devel/py-pyechonest/Makefile +++ devel/py-pyechonest/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: devel/py-pyface/Makefile =================================================================== --- devel/py-pyface/Makefile +++ devel/py-pyface/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE_LGPL3= ${WRKSRC}/image_LICENSE_OOo.txt #See file ${WRKSRC}/image_LICENSE.txt for files with non BSD3CLAUSE licenses -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=4.5.0:devel/py-traits@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: devel/py-pyflakes/Makefile =================================================================== --- devel/py-pyflakes/Makefile +++ devel/py-pyflakes/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-pygdbmi/Makefile =================================================================== --- devel/py-pygdbmi/Makefile +++ devel/py-pygdbmi/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= cs01 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-pygit2/Makefile =================================================================== --- devel/py-pygit2/Makefile +++ devel/py-pygit2/Makefile @@ -13,12 +13,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} LIB_DEPENDS= libgit2.so:devel/libgit2 -RUN_DEPENDS?= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${BUILD_DEPENDS} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils MAKE_ENV= LIBGIT2=${LOCALBASE} PYDISTUTILS_TEST_TARGET?= test Index: devel/py-pyicu/Makefile =================================================================== --- devel/py-pyicu/Makefile +++ devel/py-pyicu/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libicudata.so:devel/icu -USES?= python +USES= python USE_CXXSTD= c++11 USE_PYTHON= distutils autoplist Index: devel/py-pyinotify/Makefile =================================================================== --- devel/py-pyinotify/Makefile +++ devel/py-pyinotify/Makefile @@ -14,6 +14,6 @@ LIB_DEPENDS= libinotify.so:devel/libinotify USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils py3kplist .include Index: devel/py-pyinstaller/Makefile =================================================================== --- devel/py-pyinstaller/Makefile +++ devel/py-pyinstaller/Makefile @@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS EXTRACT_AFTER_ARGS= --exclude doc/source --no-same-owner --no-same-permissions -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} Index: devel/py-pykde4/Makefile =================================================================== --- devel/py-pykde4/Makefile +++ devel/py-pykde4/Makefile @@ -17,6 +17,7 @@ USE_PYQT= declarative designer gui network opengl phonon script sip \ sql svg webkit xml \ dbussupport_run +USE_PYTHON= flavors USE_QT4= corelib dbus designer_build gui network xml \ qmake_build moc_build uic_build rcc_build Index: devel/py-pyke/Makefile =================================================================== --- devel/py-pyke/Makefile +++ devel/py-pyke/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=2.3:devel/py-ply@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: devel/py-pylru-cache/Makefile =================================================================== --- devel/py-pylru-cache/Makefile +++ devel/py-pylru-cache/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE GPLv3 LICENSE_COMB= dual -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: devel/py-pymarc/Makefile =================================================================== --- devel/py-pymarc/Makefile +++ devel/py-pymarc/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-pyopencl/Makefile =================================================================== --- devel/py-pyopencl/Makefile +++ devel/py-pyopencl/Makefile @@ -14,18 +14,18 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/CL/cl.h:devel/opencl \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy + ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR} LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \ libOpenCL.so:devel/ocl-icd -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytools>=2017.2:devel/py-pytools \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0.3.6:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytools>=2017.2:devel/py-pytools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} CONFIGURE_ARGS= BOOST_INC_DIR="${LOCALBASE}/include" \ BOOST_LIB_DIR="${LOCALBASE}/lib" \ Index: devel/py-pyqi/Makefile =================================================================== --- devel/py-pyqi/Makefile +++ devel/py-pyqi/Makefile @@ -14,6 +14,6 @@ NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= pgsql python +USES= pgsql python:2.7 .include Index: devel/py-pyral/Makefile =================================================================== --- devel/py-pyral/Makefile +++ devel/py-pyral/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.12.5:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.12.5:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-pyrfc3339/Makefile =================================================================== --- devel/py-pyrfc3339/Makefile +++ devel/py-pyrfc3339/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-pyro/Makefile =================================================================== --- devel/py-pyro/Makefile +++ devel/py-pyro/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.23:devel/py-serpent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serpent>=1.23:devel/py-serpent@${FLAVOR} NO_ARCH= yes USES= dos2unix python:2.7+ @@ -26,7 +26,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors34>0:devel/py-selectors34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}selectors34>0:devel/py-selectors34@${FLAVOR} .endif post-install: Index: devel/py-pystorm/Makefile =================================================================== --- devel/py-pystorm/Makefile +++ devel/py-pystorm/Makefile @@ -13,12 +13,12 @@ LICENSE= APACHE20 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} NO_ARCH= yes Index: devel/py-pyte/Makefile =================================================================== --- devel/py-pyte/Makefile +++ devel/py-pyte/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wcwidth>0:devel/py-wcwidth@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-pytest-asyncio/Makefile =================================================================== --- devel/py-pytest-asyncio/Makefile +++ devel/py-pytest-asyncio/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py3-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.6:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python:3.5+ Index: devel/py-pytest-cache/Makefile =================================================================== --- devel/py-pytest-cache/Makefile +++ devel/py-pytest-cache/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}execnet>=1.2:sysutils/py-execnet@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-pytest-capturelog/Makefile =================================================================== --- devel/py-pytest-capturelog/Makefile +++ devel/py-pytest-capturelog/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py-py@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: devel/py-pytest-cov/Makefile =================================================================== --- devel/py-pytest-cov/Makefile +++ devel/py-pytest-cov/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=3.7.1:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-pytest-django/Makefile =================================================================== --- devel/py-pytest-django/Makefile +++ devel/py-pytest-django/Makefile @@ -10,14 +10,14 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Django plugin for py.test -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}south>=0:databases/py-south +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-configurations>=0:www/py-django-configurations@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twine>=0:devel/py-twine@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}south>=0:databases/py-south@${FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} USES= python Index: devel/py-pytest-localserver/Makefile =================================================================== --- devel/py-pytest-localserver/Makefile +++ devel/py-pytest-localserver/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.10:www/py-werkzeug@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-pytest-mock/Makefile =================================================================== --- devel/py-pytest-mock/Makefile +++ devel/py-pytest-mock/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py${SLAVE_SUFFIX}-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES+= python Index: devel/py-pytest-runner/Makefile =================================================================== --- devel/py-pytest-runner/Makefile +++ devel/py-pytest-runner/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-pytest-timeout/Makefile =================================================================== --- devel/py-pytest-timeout/Makefile +++ devel/py-pytest-timeout/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${FLAVOR} NO_ARCH= yes -USES?= python:2.7+ +USES= python:2.7+ USE_PYTHON= autoplist distutils TEST_ENV+= PYTHONPATH=${TEST_WRKSRC} Index: devel/py-pytest-tornado/Makefile =================================================================== --- devel/py-pytest-tornado/Makefile +++ devel/py-pytest-tornado/Makefile @@ -11,8 +11,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-pytest-xdist/Makefile =================================================================== --- devel/py-pytest-xdist/Makefile +++ devel/py-pytest-xdist/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect - -USES?= python +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py-py@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} + +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-pytest/Makefile =================================================================== --- devel/py-pytest/Makefile +++ devel/py-pytest/Makefile @@ -12,17 +12,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py${SLAVE_SUFFIX}-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.33:devel/py${SLAVE_SUFFIX}-py -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.4.33:devel/py-py@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=1.13:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES+= python +USES= python USE_PYTHON= autoplist concurrent distutils do-test: Index: devel/py-python-bugzilla/Makefile =================================================================== --- devel/py-python-bugzilla/Makefile +++ devel/py-python-bugzilla/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-python-dtrace/Makefile =================================================================== --- devel/py-python-dtrace/Makefile +++ devel/py-python-dtrace/Makefile @@ -11,10 +11,7 @@ LICENSE= MIT -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS= cython:lang/cython - USES= python zip -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run .include Index: devel/py-python-gist/Makefile =================================================================== --- devel/py-python-gist/Makefile +++ devel/py-python-gist/Makefile @@ -12,12 +12,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${FLAVOR} USES= python USE_GITHUB= yes Index: devel/py-python-jenkins/Makefile =================================================================== --- devel/py-python-jenkins/Makefile +++ devel/py-python-jenkins/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}multi_key_dict>0:devel/py-multi_key_dict +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0.8.2:devel/py-pbr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multi_key_dict>0:devel/py-multi_key_dict@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-python-magic/Makefile =================================================================== --- devel/py-python-magic/Makefile +++ devel/py-python-magic/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist distutils Index: devel/py-pytools/Makefile =================================================================== --- devel/py-pytools/Makefile +++ devel/py-pytools/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.0:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.2.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.0,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-pytz/Makefile =================================================================== --- devel/py-pytz/Makefile +++ devel/py-pytz/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -USES?= python zip +USES= python zip USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-pyutil/Makefile =================================================================== --- devel/py-pyutil/Makefile +++ devel/py-pyutil/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:converters/zbase32 USES= python:2 Index: devel/py-pyvalid/Makefile =================================================================== --- devel/py-pyvalid/Makefile +++ devel/py-pyvalid/Makefile @@ -11,9 +11,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-pyvisa-py/Makefile =================================================================== --- devel/py-pyvisa-py/Makefile +++ devel/py-pyvisa-py/Makefile @@ -23,9 +23,9 @@ OPTIONS_GROUP_DRIVERS= SERIAL USB SERIAL_DESC= Access to devices via RS-232 -SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial +SERIAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} USB_DESC= Access to devices via USB -USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb +USB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}usb>0:devel/py-usb@${FLAVOR} .include Index: devel/py-pyvisa/Makefile =================================================================== --- devel/py-pyvisa/Makefile +++ devel/py-pyvisa/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:devel/py-pyvisa-py +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyvisa-py>0:devel/py-pyvisa-py@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= hgrecco @@ -23,7 +23,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .include Index: devel/py-pyxb/Makefile =================================================================== --- devel/py-pyxb/Makefile +++ devel/py-pyxb/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-pyxml2obj/Makefile =================================================================== --- devel/py-pyxml2obj/Makefile +++ devel/py-pyxml2obj/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-qpid/Makefile =================================================================== --- devel/py-qpid/Makefile +++ devel/py-qpid/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-qserve/Makefile =================================================================== --- devel/py-qserve/Makefile +++ devel/py-qserve/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Job queue server -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-qt4-assistant/Makefile =================================================================== --- devel/py-qt4-assistant/Makefile +++ devel/py-qt4-assistant/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= assistantclient corelib gui network \ moc_build qmake_build Index: devel/py-qt4-core/Makefile =================================================================== --- devel/py-qt4-core/Makefile +++ devel/py-qt4-core/Makefile @@ -13,7 +13,7 @@ PYQT_DIST= yes USES= python pyqt:4 -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors USE_PYQT= sip USE_QT4= corelib qmake_build moc_build Index: devel/py-qt4-dbus/Makefile =================================================================== --- devel/py-qt4-dbus/Makefile +++ devel/py-qt4-dbus/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= corelib dbus moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-dbussupport/Makefile =================================================================== --- devel/py-qt4-dbussupport/Makefile +++ devel/py-qt4-dbussupport/Makefile @@ -7,14 +7,16 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt event loop support for dbus-python -BUILD_DEPENDS= ${PYDBUS} -RUN_DEPENDS= ${PYDBUS} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} + CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes USES= pkgconfig python pyqt:4 USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT4= corelib qmake_build moc_build OPTIONS_DEFINE= DEBUG @@ -25,12 +27,4 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so -.include - -.if ${PYTHON_MAJOR_VER} == 2 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus -.elif ${PYTHON_MAJOR_VER} == 3 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus -.endif - -.include +.include Index: devel/py-qt4-declarative/Makefile =================================================================== --- devel/py-qt4-declarative/Makefile +++ devel/py-qt4-declarative/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run network_run +USE_PYTHON= flavors USE_QT4= corelib declarative gui network script sql svg xmlpatterns \ qmake_build moc_build Index: devel/py-qt4-designer/Makefile =================================================================== --- devel/py-qt4-designer/Makefile +++ devel/py-qt4-designer/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib designer gui moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-designerplugin/Makefile =================================================================== --- devel/py-qt4-designerplugin/Makefile +++ devel/py-qt4-designerplugin/Makefile @@ -17,6 +17,7 @@ USES= python pyqt:4 USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT4= corelib designer gui script xml moc_build qmake_build OPTIONS_DEFINE= DEBUG Index: devel/py-qt4-help/Makefile =================================================================== --- devel/py-qt4-help/Makefile +++ devel/py-qt4-help/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui help network sql moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-qscintilla2/Makefile =================================================================== --- devel/py-qt4-qscintilla2/Makefile +++ devel/py-qt4-qscintilla2/Makefile @@ -22,6 +22,7 @@ USES= python pyqt:4 USE_PYQT= sip core gui +USE_PYTHON= flavors USE_QT4= corelib gui moc_build qmake_build OPTIONS_DEFINE= DEBUG @@ -29,7 +30,8 @@ QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ - --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} + --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} \ + --sip ${LOCALBASE}/bin/sip-${PYTHON_VER} WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty Index: devel/py-qt4-script/Makefile =================================================================== --- devel/py-qt4-script/Makefile +++ devel/py-qt4-script/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= corelib script moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-scripttools/Makefile =================================================================== --- devel/py-qt4-scripttools/Makefile +++ devel/py-qt4-scripttools/Makefile @@ -12,6 +12,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run script_run +USE_PYTHON= flavors USE_QT4= corelib gui script scripttools moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4-test/Makefile =================================================================== --- devel/py-qt4-test/Makefile +++ devel/py-qt4-test/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui qtestlib moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt4/Makefile =================================================================== --- devel/py-qt4/Makefile +++ devel/py-qt4/Makefile @@ -10,6 +10,7 @@ COMMENT= Python bindings for the Qt 4 toolkit (meta port) USES= metaport python pyqt:4 +USE_PYTHON= flavors OPTIONS_DEFINE= assistant core dbus dbussupport declarative \ demo designer designerplugin doc gui help \ Index: devel/py-qt5-core/Makefile =================================================================== --- devel/py-qt5-core/Makefile +++ devel/py-qt5-core/Makefile @@ -10,7 +10,7 @@ PYQT_DIST= yes USES= python pyqt:5 -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors USE_PYQT= sip_build USE_QT5= core qmake_build Index: devel/py-qt5-dbus/Makefile =================================================================== --- devel/py-qt5-dbus/Makefile +++ devel/py-qt5-dbus/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:5 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core dbus qmake_build OPTIONS_DEFINE= API DEBUG Index: devel/py-qt5-dbussupport/Makefile =================================================================== --- devel/py-qt5-dbussupport/Makefile +++ devel/py-qt5-dbussupport/Makefile @@ -6,14 +6,15 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt event loop support for dbus-python -BUILD_DEPENDS= ${PYDBUS} -RUN_DEPENDS= ${PYDBUS} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus@${FLAVOR} CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes USES= pkgconfig python pyqt:5 USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT5= core buildtools_build qmake_build OPTIONS_DEFINE= DEBUG @@ -24,12 +25,4 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/pyqt5.so -.include - -.if ${PYTHON_MAJOR_VER} == 2 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py-dbus -.elif ${PYTHON_MAJOR_VER} == 3 -PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:devel/py3-dbus -.endif - -.include +.include Index: devel/py-qt5-designer/Makefile =================================================================== --- devel/py-qt5-designer/Makefile +++ devel/py-qt5-designer/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= yes USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui designer widgets xml \ buildtools_build qmake_build Index: devel/py-qt5-designerplugin/Makefile =================================================================== --- devel/py-qt5-designerplugin/Makefile +++ devel/py-qt5-designerplugin/Makefile @@ -17,6 +17,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build +USE_PYTHON= flavors USE_QT5= core designer gui xml widgets \ buildtools_build qmake_build Index: devel/py-qt5-help/Makefile =================================================================== --- devel/py-qt5-help/Makefile +++ devel/py-qt5-help/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui widgets help network sql buildtools_build qmake_build xml OPTIONS_DEFINE= API DEBUG Index: devel/py-qt5-qscintilla2/Makefile =================================================================== --- devel/py-qt5-qscintilla2/Makefile +++ devel/py-qt5-qscintilla2/Makefile @@ -22,6 +22,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip core gui printsupport widgets +USE_PYTHON= flavors USE_QT5= core gui printsupport widgets buildtools_build qmake_build OPTIONS_DEFINE= DEBUG Index: devel/py-qt5-test/Makefile =================================================================== --- devel/py-qt5-test/Makefile +++ devel/py-qt5-test/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui testlib widgets \ buildtools_build qmake_build Index: devel/py-qt5/Makefile =================================================================== --- devel/py-qt5/Makefile +++ devel/py-qt5/Makefile @@ -9,6 +9,7 @@ COMMENT= Python bindings for the Qt 5 toolkit (meta port) USES= metaport python pyqt:5 +USE_PYTHON= flavors OPTIONS_DEFINE= core dbus dbussupport demo designer \ designerplugin doc gui multimedia multimediawidgets \ Index: devel/py-qtconsole/Makefile =================================================================== --- devel/py-qtconsole/Makefile +++ devel/py-qtconsole/Makefile @@ -9,11 +9,11 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Qt-based console for Jupyter with support for rich media output -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel@${FLAVOR} USES= pyqt:4 python USE_PYQT= core gui svg Index: devel/py-ramlfications/Makefile =================================================================== --- devel/py-ramlfications/Makefile +++ devel/py-ramlfications/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}jsonref>=0.1:devel/py-jsonref \ - ${PYTHON_PKGNAMEPREFIX}markdown2>=2.3.2:textproc/py-markdown2 \ - ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.10.1:devel/py-xmltodict \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=16.0.0:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonref>=0.1:devel/py-jsonref@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown2>=2.3.2:textproc/py-markdown2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.10.1:devel/py-xmltodict@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES?= python USE_PYTHON= autoplist distutils Index: devel/py-rauth/Makefile =================================================================== --- devel/py-rauth/Makefile +++ devel/py-rauth/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${FLAVOR} USES= python USE_GITHUB= yes Index: devel/py-raven/Makefile =================================================================== --- devel/py-raven/Makefile +++ devel/py-raven/Makefile @@ -21,7 +21,7 @@ .include .if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${FLAVOR} .endif .include Index: devel/py-rebulk/Makefile =================================================================== --- devel/py-rebulk/Makefile +++ devel/py-rebulk/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-rednose/Makefile =================================================================== --- devel/py-rednose/Makefile +++ devel/py-rednose/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termstyle>0:devel/py-termstyle@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-repoze.tm2/Makefile =================================================================== --- devel/py-repoze.tm2/Makefile +++ devel/py-repoze.tm2/Makefile @@ -11,7 +11,7 @@ MAINTAINER= python@FreeBSD.org COMMENT= Zope-like transaction manager via WSGI middleware -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-repoze.what-pylons/Makefile =================================================================== --- devel/py-repoze.what-pylons/Makefile +++ devel/py-repoze.what-pylons/Makefile @@ -11,12 +11,12 @@ MAINTAINER= wen@FreeBSD.org COMMENT= The repoze.what v1 plugin for Pylons/TG2 integration -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons \ - ${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=0.9.7:www/py-pylons@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.what>=0:devel/py-repoze.what@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-repoze.what/Makefile =================================================================== --- devel/py-repoze.what/Makefile +++ devel/py-repoze.what/Makefile @@ -11,11 +11,11 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Authorization for WSGI applications -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who-testutil>=0:devel/py-repoze.who-testutil@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-repoze.who-friendlyform/Makefile =================================================================== --- devel/py-repoze.who-friendlyform/Makefile +++ devel/py-repoze.who-friendlyform/Makefile @@ -10,14 +10,14 @@ MAINTAINER= ychsiao@ychsiao.org COMMENT= Collection of developer-friendly for repoze.who-powered -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-repoze.who-testutil/Makefile =================================================================== --- devel/py-repoze.who-testutil/Makefile +++ devel/py-repoze.who-testutil/Makefile @@ -14,11 +14,11 @@ LICENSE= BSD4CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}repoze.who>=1.0.15:devel/py-repoze.who@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:www/py-pastedeploy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: devel/py-repoze.who/Makefile =================================================================== --- devel/py-repoze.who/Makefile +++ devel/py-repoze.who/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}webob>=0:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: devel/py-repoze.xmliter/Makefile =================================================================== --- devel/py-repoze.xmliter/Makefile +++ devel/py-repoze.xmliter/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: devel/py-requestsexceptions/Makefile =================================================================== --- devel/py-requestsexceptions/Makefile +++ devel/py-requestsexceptions/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Library to find the correct path to exceptions in the requests library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} NO_ARCH= yes Index: devel/py-resourcepackage/Makefile =================================================================== --- devel/py-resourcepackage/Makefile +++ devel/py-resourcepackage/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Automated resource-as-package embedding mechanism -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-responses/Makefile =================================================================== --- devel/py-responses/Makefile +++ devel/py-responses/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}cookies>0:www/py-cookies +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cookies>0:www/py-cookies@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-retrying/Makefile =================================================================== --- devel/py-retrying/Makefile +++ devel/py-retrying/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= General-purpose retrying library, written in Python -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: devel/py-riak_pb/Makefile =================================================================== --- devel/py-riak_pb/Makefile +++ devel/py-riak_pb/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:devel/py-protobuf@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: devel/py-robotframework-databaselibrary/Makefile =================================================================== --- devel/py-robotframework-databaselibrary/Makefile +++ devel/py-robotframework-databaselibrary/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= franz-see Index: devel/py-robotframework-pabot/Makefile =================================================================== --- devel/py-robotframework-pabot/Makefile +++ devel/py-robotframework-pabot/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \ - ${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}robotremoteserver>=1.0.1:devel/py-robotremoteserver@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-robotframework-ride/Makefile =================================================================== --- devel/py-robotframework-ride/Makefile +++ devel/py-robotframework-ride/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \ - ${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}robotframework-selenium2library>=1.1.0:devel/py-robotframework-selenium2library@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} NO_ARCH= yes USES= python:-2.7 Index: devel/py-robotframework-selenium2library/Makefile =================================================================== --- devel/py-robotframework-selenium2library/Makefile +++ devel/py-robotframework-selenium2library/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: devel/py-robotremoteserver/Makefile =================================================================== --- devel/py-robotremoteserver/Makefile +++ devel/py-robotremoteserver/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-rply/Makefile =================================================================== --- devel/py-rply/Makefile +++ devel/py-rply/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>0:devel/py-appdirs@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-rq/Makefile =================================================================== --- devel/py-rq/Makefile +++ devel/py-rq/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis \ - ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=2.7:databases/py-redis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-ruamel.ordereddict/Makefile =================================================================== --- devel/py-ruamel.ordereddict/Makefile +++ devel/py-ruamel.ordereddict/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-rubymarshal/Makefile =================================================================== --- devel/py-rubymarshal/Makefile +++ devel/py-rubymarshal/Makefile @@ -14,7 +14,7 @@ LICENSE= WTFPL LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-ruledispatch/Makefile =================================================================== --- devel/py-ruledispatch/Makefile +++ devel/py-ruledispatch/Makefile @@ -16,10 +16,10 @@ LICENSE= PSFL ZPL21 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:devel/py-extremes \ - ${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:devel/py-protocols-devel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Extremes>=1.1:devel/py-extremes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyProtocols>=1.0.a0.r2302:devel/py-protocols-devel@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist # to have a platform/release indipendent directory (necessary for strip cmd) Index: devel/py-rwt/Makefile =================================================================== --- devel/py-rwt/Makefile +++ devel/py-rwt/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${FLAVOR} NO_ARCH= yes -USE_PYTHON= concurrent distutils +USE_PYTHON= concurrent distutils autoplist USES= python .include Index: devel/py-rwt/pkg-plist =================================================================== --- devel/py-rwt/pkg-plist +++ /dev/null @@ -1,28 +0,0 @@ -bin/rwt -%%PYTHON_SITELIBDIR%%/rwt/__init__.py -%%PYTHON_SITELIBDIR%%/rwt/__init__.pyc -%%PYTHON_SITELIBDIR%%/rwt/__init__.pyo -%%PYTHON_SITELIBDIR%%/rwt/__main__.py -%%PYTHON_SITELIBDIR%%/rwt/__main__.pyc -%%PYTHON_SITELIBDIR%%/rwt/__main__.pyo -%%PYTHON_SITELIBDIR%%/rwt/commands.py -%%PYTHON_SITELIBDIR%%/rwt/commands.pyc -%%PYTHON_SITELIBDIR%%/rwt/commands.pyo -%%PYTHON_SITELIBDIR%%/rwt/deps.py -%%PYTHON_SITELIBDIR%%/rwt/deps.pyc -%%PYTHON_SITELIBDIR%%/rwt/deps.pyo -%%PYTHON_SITELIBDIR%%/rwt/launch.py -%%PYTHON_SITELIBDIR%%/rwt/launch.pyc -%%PYTHON_SITELIBDIR%%/rwt/launch.pyo -%%PYTHON_SITELIBDIR%%/rwt/scripts.py -%%PYTHON_SITELIBDIR%%/rwt/scripts.pyc -%%PYTHON_SITELIBDIR%%/rwt/scripts.pyo -%%PYTHON_SITELIBDIR%%/rwt/tests/test_deps.py -%%PYTHON_SITELIBDIR%%/rwt/tests/test_deps.pyc -%%PYTHON_SITELIBDIR%%/rwt/tests/test_deps.pyo -%%PYTHON_SITELIBDIR%%/rwt/tests/test_launch.py -%%PYTHON_SITELIBDIR%%/rwt/tests/test_launch.pyc -%%PYTHON_SITELIBDIR%%/rwt/tests/test_launch.pyo -%%PYTHON_SITELIBDIR%%/rwt/tests/test_scripts.py -%%PYTHON_SITELIBDIR%%/rwt/tests/test_scripts.pyc -%%PYTHON_SITELIBDIR%%/rwt/tests/test_scripts.pyo Index: devel/py-sanetime/Makefile =================================================================== --- devel/py-sanetime/Makefile +++ devel/py-sanetime/Makefile @@ -14,9 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2010:devel/py-pytz@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: devel/py-scripttest/Makefile =================================================================== --- devel/py-scripttest/Makefile +++ devel/py-scripttest/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils USE_GITHUB= yes Index: devel/py-selection/Makefile =================================================================== --- devel/py-selection/Makefile +++ devel/py-selection/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-selectors34/Makefile =================================================================== --- devel/py-selectors34/Makefile +++ devel/py-selectors34/Makefile @@ -11,7 +11,7 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7-3.3 Index: devel/py-semantic_version/Makefile =================================================================== --- devel/py-semantic_version/Makefile +++ devel/py-semantic_version/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= rbarrois Index: devel/py-setproctitle/Makefile =================================================================== --- devel/py-setproctitle/Makefile +++ devel/py-setproctitle/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES?= python +USES= python USE_PYTHON= autoplist distutils PORTDOCS= HISTORY.rst README.rst Index: devel/py-setuptools-pkg/Makefile =================================================================== --- devel/py-setuptools-pkg/Makefile +++ devel/py-setuptools-pkg/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=18.2:devel/${PYTHON_PKGNAMEPREFIX}setuptools -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=18.2:devel/py-setuptools@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} NO_ARCH= yes Index: devel/py-setuptools/Makefile =================================================================== --- devel/py-setuptools/Makefile +++ devel/py-setuptools/Makefile @@ -13,9 +13,8 @@ LICENSE= PSFL NO_ARCH= yes -USES?= python:2.7 -USES+= zip -USE_PYTHON= autoplist concurrent distutils +USES= python zip +USE_PYTHON= autoplist concurrent distutils allflavors PYDISTUTILS_SETUP= ${PYSETUP} @@ -33,9 +32,9 @@ # These create dependency loops in redports/poudriere, because setuptools # is currently an explicit BUILD & RUN dependency in Uses/python.mk. -#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} #.if ${PYTHON_REL} < 3300 -#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} #.endif post-install: Index: devel/py-setuptools_darcs/Makefile =================================================================== --- devel/py-setuptools_darcs/Makefile +++ devel/py-setuptools_darcs/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= darcsver:devel/py-darcsver -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-setuptools_scm/Makefile =================================================================== --- devel/py-setuptools_scm/Makefile +++ devel/py-setuptools_scm/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-simplejson/Makefile =================================================================== --- devel/py-simplejson/Makefile +++ devel/py-simplejson/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils post-install: Index: devel/py-simpy/Makefile =================================================================== --- devel/py-simpy/Makefile +++ devel/py-simpy/Makefile @@ -21,7 +21,7 @@ PORTDOCS= * -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: devel/py-singledispatch/Makefile =================================================================== --- devel/py-singledispatch/Makefile +++ devel/py-singledispatch/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python:-3.3 USE_PYTHON= distutils concurrent autoplist Index: devel/py-sip/Makefile =================================================================== --- devel/py-sip/Makefile +++ devel/py-sip/Makefile @@ -13,7 +13,7 @@ COMMENT= Python to C and C++ bindings generator USES= python pyqt:sip -USE_PYTHON= concurrent py3kplist +USE_PYTHON= concurrent py3kplist flavors USE_PYQT= # CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ @@ -29,6 +29,8 @@ do-configure: cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} + ${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' \ + ${WRKSRC}/sipconfig.py post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ Index: devel/py-six/Makefile =================================================================== --- devel/py-six/Makefile +++ devel/py-six/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-smmap2/Makefile =================================================================== --- devel/py-smmap2/Makefile +++ devel/py-smmap2/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-sortedcontainers/Makefile =================================================================== --- devel/py-sortedcontainers/Makefile +++ devel/py-sortedcontainers/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-spyder/Makefile =================================================================== --- devel/py-spyder/Makefile +++ devel/py-spyder/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \ - ${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit \ - ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:www/py-qt4-webkit@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${FLAVOR} USES= desktop-file-utils python USE_PYTHON= autoplist distutils @@ -48,22 +48,22 @@ SPHINX_DESC= Rich text help on the Object Inspector SYMPY_DESC= Symbolic mathematics in the IPython Console -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0.6:textproc/py-sphinx@${FLAVOR} IPYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq -JEDI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:devel/py-jedi -MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib + ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.1.11:net/py-pyzmq@${FLAVOR} +JEDI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jedi>=0.8.1:devel/py-jedi@${FLAVOR} +MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.0:math/py-matplotlib@${FLAVOR} NUMPY_RUN_DEPENDS= ${PYNUMPY} -PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas +PANDAS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pandas>=0.13.1:math/py-pandas@${FLAVOR} PEP8_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=0.6:devel/pep8 -PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil -PYFLAKES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes -PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments -PYLINT_RUN_DEPENDS= pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint -ROPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy +PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.3:sysutils/py-psutil@${FLAVOR} +PYFLAKES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${FLAVOR} +PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} +PYLINT_RUN_DEPENDS= pylint${PYTHON_PKGNAMESUFFIX}>=0.25:devel/pylint@${FLAVOR} +ROPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rope>=0.9.2:devel/py-rope@${FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} SPHINX_RUN_DEPENDS= ${DOCS_BUILD_DEPENDS} -SYMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy +SYMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0.7.3:math/py-sympy@${FLAVOR} post-patch: @${REINPLACE_CMD} -e "s|'linux'|'${OPSYS:tl}'|" \ Index: devel/py-sqlcc/Makefile =================================================================== --- devel/py-sqlcc/Makefile +++ devel/py-sqlcc/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pythk>=0:devel/pythk@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: devel/py-stackexchange/Makefile =================================================================== --- devel/py-stackexchange/Makefile +++ devel/py-stackexchange/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-stevedore/Makefile =================================================================== --- devel/py-stevedore/Makefile +++ devel/py-stevedore/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr # <2.0 -RUN_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr \ - ${PKGNAMEPREFIX}six>=1.9.0:devel/py-six +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} # <2.0 +RUN_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} \ + ${PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-streamparse/Makefile =================================================================== --- devel/py-streamparse/Makefile +++ devel/py-streamparse/Makefile @@ -13,18 +13,18 @@ LICENSE= APACHE20 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml \ - ${PYTHON_PKGNAMEPREFIX}fabric3>0:devel/py-fabric3 \ - ${PYTHON_PKGNAMEPREFIX}pystorm>=3.1.0:devel/py-pystorm \ - ${PYTHON_PKGNAMEPREFIX}thriftpy>=0.3.2:devel/py-thriftpy +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fabric3>0:devel/py-fabric3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pystorm>=3.1.0:devel/py-pystorm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}thriftpy>=0.3.2:devel/py-thriftpy@${FLAVOR} NO_ARCH= YES Index: devel/py-structlog/Makefile =================================================================== --- devel/py-structlog/Makefile +++ devel/py-structlog/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.apache2 LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.mit -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-stsci.distutils/Makefile =================================================================== --- devel/py-stsci.distutils/Makefile +++ devel/py-stsci.distutils/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}d2to1>0:devel/py-d2to1@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-subversion/Makefile =================================================================== --- devel/py-subversion/Makefile +++ devel/py-subversion/Makefile @@ -14,6 +14,7 @@ PKGDIR= ${.CURDIR} USES+= python +USE_PYTHON= flavors py3kplist SVN_BUILD_BINDINGS= yes SVN_BUILD_ADDONS= yes Index: devel/py-subvertpy/Makefile =================================================================== --- devel/py-subvertpy/Makefile +++ devel/py-subvertpy/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS+= svn:devel/subversion -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist MAKE_ENV= HOME=/dev/null INSTALL_TARGET= install-strip Index: devel/py-sure/Makefile =================================================================== --- devel/py-sure/Makefile +++ devel/py-sure/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: devel/py-tables/Makefile =================================================================== --- devel/py-tables/Makefile +++ devel/py-tables/Makefile @@ -14,21 +14,20 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr + ${PYTHON_PKGNAMEPREFIX}numexpr>=1.4.1:math/py-numexpr@${FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 \ liblzo2.so:archivers/lzo2 \ libucl.so:archivers/ucl RUN_DEPENDS:= ${BUILD_DEPENDS} USES= fortran python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils cython PORTEXAMPLES= * OPTIONS_DEFINE= PYREX EXAMPLES PYREX_DESC= Use code generated by Pyrex to build -PYREX_BUILD_DEPENDS= pyrex>0:devel/pyrex +PYREX_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} post-patch: @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/setup.py Index: devel/py-tabulate/Makefile =================================================================== --- devel/py-tabulate/Makefile +++ devel/py-tabulate/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-tarantool-queue/Makefile =================================================================== --- devel/py-tarantool-queue/Makefile +++ devel/py-tarantool-queue/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tarantool>=0:databases/py-tarantool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-taskflow/Makefile =================================================================== --- devel/py-taskflow/Makefile +++ devel/py-taskflow/Makefile @@ -12,28 +12,28 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.10:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2 \ - ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools \ - ${PYTHON_PKGNAMEPREFIX}automaton>=0.5.0:devel/py-automaton \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.10:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>=0.4.0:devel/py-contextlib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}automaton>=0.5.0:devel/py-automaton@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-tempora/Makefile =================================================================== --- devel/py-tempora/Makefile +++ devel/py-tempora/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-tempstorage/Makefile =================================================================== --- devel/py-tempstorage/Makefile +++ devel/py-tempstorage/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.9.0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-tenacity/Makefile =================================================================== --- devel/py-tenacity/Makefile +++ devel/py-tenacity/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes Index: devel/py-terminable_thread/Makefile =================================================================== --- devel/py-terminable_thread/Makefile +++ devel/py-terminable_thread/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-testgears/Makefile =================================================================== --- devel/py-testgears/Makefile +++ devel/py-testgears/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Python module to run tests written as simple functions -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-testinfra/Makefile =================================================================== --- devel/py-testinfra/Makefile +++ devel/py-testinfra/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>1.4:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-testoob/Makefile =================================================================== --- devel/py-testoob/Makefile +++ devel/py-testoob/Makefile @@ -22,6 +22,6 @@ USES= python tar:bzip2 USE_PYTHON= autoplist distutils -TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} .include Index: devel/py-testpath/Makefile =================================================================== --- devel/py-testpath/Makefile +++ devel/py-testpath/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= jupyter @@ -23,7 +23,7 @@ .include .if ${PYTHON_REL} < 3400 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pathlib>=0:devel/py-pathlib@${FLAVOR} .endif post-extract: Index: devel/py-testtools/Makefile =================================================================== --- devel/py-testtools/Makefile +++ devel/py-testtools/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:devel/py-extras +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extras>=0.0.3:devel/py-extras@${FLAVOR} USES= python USE_PYTHON= distutils autoplist concurrent Index: devel/py-threema-msgapi/Makefile =================================================================== --- devel/py-threema-msgapi/Makefile +++ devel/py-threema-msgapi/Makefile @@ -19,9 +19,9 @@ GH_ACCOUNT= lgrahl GH_PROJECT= threema-msgapi-sdk-python -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}pylru-cache>0:devel/py3-pylru-cache \ - ${PYTHON_PKGNAMEPREFIX}libnacl>0:security/py3-libnacl \ - ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylru-cache>0:devel/py-pylru-cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libnacl>0:security/py-libnacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR} .include Index: devel/py-tinyarray/Makefile =================================================================== --- devel/py-tinyarray/Makefile +++ devel/py-tinyarray/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-tinyrpc/Makefile =================================================================== --- devel/py-tinyrpc/Makefile +++ devel/py-tinyrpc/Makefile @@ -25,9 +25,9 @@ OPTIONS_DEFAULT=HTTP -HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests -WSGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug -ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq +HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} +WSGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR} +ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>0:net/py-pyzmq@${FLAVOR} .include Index: devel/py-tooz/Makefile =================================================================== --- devel/py-tooz/Makefile +++ devel/py-tooz/Makefile @@ -12,18 +12,18 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>=3.0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous \ - ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PY_FUTURES} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}voluptuous>=0.8.9:devel/py-voluptuous@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tenacity>=3.2.1:devel/py-tenacity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.15.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fasteners>=0.7:devel/py-fasteners@${FLAVOR} NO_ARCH= yes Index: devel/py-toposort/Makefile =================================================================== --- devel/py-toposort/Makefile +++ devel/py-toposort/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-tox/Makefile =================================================================== --- devel/py-tox/Makefile +++ devel/py-tox/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py \ - ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout - -USES?= python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py-pluggy@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} + +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: devel/py-traceback2/Makefile =================================================================== --- devel/py-traceback2/Makefile +++ devel/py-traceback2/Makefile @@ -11,10 +11,10 @@ MAINTAINER= feld@FreeBSD.org COMMENT= New features in traceback backported to Python 2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} LICENSE= PSFL Index: devel/py-traitlets/Makefile =================================================================== --- devel/py-traitlets/Makefile +++ devel/py-traitlets/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -25,11 +25,11 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34@${FLAVOR} .endif .if ${PYTHON_VER} == 2.7 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} .endif do-test: Index: devel/py-transaction/Makefile =================================================================== --- devel/py-transaction/Makefile +++ devel/py-transaction/Makefile @@ -12,7 +12,7 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: devel/py-trollius/Makefile =================================================================== --- devel/py-trollius/Makefile +++ devel/py-trollius/Makefile @@ -20,9 +20,9 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif .endif Index: devel/py-tw.forms/Makefile =================================================================== --- devel/py-tw.forms/Makefile +++ devel/py-tw.forms/Makefile @@ -11,12 +11,12 @@ MAINTAINER= ychsiao@ychsiao.org COMMENT= Web Widgets for building and validating forms -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \ - ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets \ - ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode@${FLAVOR} +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}ToscaWidgets>=0:devel/py-ToscaWidgets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=0:www/py-formencode@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-twext/Makefile =================================================================== --- devel/py-twext/Makefile +++ devel/py-twext/Makefile @@ -10,16 +10,16 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.4.0:devel/py-twisted@${FLAVOR} RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}twisted>=15.4:devel/py-twisted + ${PYTHON_PKGNAMEPREFIX}cffi>=0.6:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=15.4:devel/py-twisted@${FLAVOR} DAL_RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}sqlparse01>=0.1.19:databases/py-sqlparse01 \ + ${PYTHON_PKGNAMEPREFIX}sqlparse01>=0.1.19:databases/py-sqlparse01@${FLAVOR} \ POSTGRES_RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000 + ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.2:databases/py-pg8000@${FLAVOR} OPTIONS_DEFINE= DAL POSTGRES DAL_DESC= Enables use of the Database Abstraction Layer. Index: devel/py-twilio/Makefile =================================================================== --- devel/py-twilio/Makefile +++ devel/py-twilio/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: devel/py-twine/Makefile =================================================================== --- devel/py-twine/Makefile +++ devel/py-twine/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-twisted/Makefile =================================================================== --- devel/py-twisted/Makefile +++ devel/py-twisted/Makefile @@ -14,11 +14,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly \ - ${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink \ - ${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}constantly>=15.1:devel/py-constantly@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hyperlink>=17.1.1:www/py-hyperlink@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}incremental>=16.10.1:devel/py-incremental@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Automat>=0.3.0:devel/py-Automat@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python tar:bzip2 Index: devel/py-txaio/Makefile =================================================================== --- devel/py-txaio/Makefile +++ devel/py-txaio/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -23,9 +23,9 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}trollius>=2.0:devel/py-trollius@${FLAVOR} .elif ${PYTHON_REL} >= 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${FLAVOR} .endif do-test: Index: devel/py-tzlocal/Makefile =================================================================== --- devel/py-tzlocal/Makefile +++ devel/py-tzlocal/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES?= python +USES= python USE_PYTHON= distutils autoplist NO_ARCH= yes Index: devel/py-ua_parser/Makefile =================================================================== --- devel/py-ua_parser/Makefile +++ devel/py-ua_parser/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} RUN_DEPENDS= ${LOCALBASE}/share/ua_parser/regexes.yaml:devel/ua_parser-core \ - ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml + ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-unittest2/Makefile =================================================================== --- devel/py-unittest2/Makefile +++ devel/py-unittest2/Makefile @@ -11,12 +11,12 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}linecache2>0:devel/py-linecache2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traceback2>0:devel/py-traceback2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-unpaddedbase64/Makefile =================================================================== --- devel/py-unpaddedbase64/Makefile +++ devel/py-unpaddedbase64/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes Index: devel/py-update_checker/Makefile =================================================================== --- devel/py-update_checker/Makefile +++ devel/py-update_checker/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-urwid/Makefile =================================================================== --- devel/py-urwid/Makefile +++ devel/py-urwid/Makefile @@ -16,7 +16,7 @@ OPTIONS_DEFINE= EXAMPLES -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils PORTEXAMPLES= * Index: devel/py-urwidtrees/Makefile =================================================================== --- devel/py-urwidtrees/Makefile +++ devel/py-urwidtrees/Makefile @@ -11,8 +11,8 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.0.0:devel/py-urwid@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= pazz Index: devel/py-user_agents/Makefile =================================================================== --- devel/py-user_agents/Makefile +++ devel/py-user_agents/Makefile @@ -11,7 +11,7 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Python library to identify devices using User-Agent string -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ua_parser/__init__.py:devel/py-ua_parser@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-utils/Makefile =================================================================== --- devel/py-utils/Makefile +++ devel/py-utils/Makefile @@ -11,7 +11,7 @@ MAINTAINER= daniel@netwalk.org COMMENT= General utility modules that simplify common programming in Python -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: devel/py-vcrpy/Makefile =================================================================== --- devel/py-vcrpy/Makefile +++ devel/py-vcrpy/Makefile @@ -14,11 +14,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wrapt>0:devel/py-wrapt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-localserver>0:devel/py-pytest-localserver@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -32,8 +32,8 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${FLAVOR} .endif post-patch: Index: devel/py-vcversioner/Makefile =================================================================== --- devel/py-vcversioner/Makefile +++ devel/py-vcversioner/Makefile @@ -1,17 +1,20 @@ +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= vcversioner -PORTVERSION= 2.14.0.0 +PORTVERSION= 2.16.0.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= wg@FreeBSD.org +MAINTAINER= bofh@FreeBSD.org COMMENT= Use version control tags to discover version numbers LICENSE= ISCL USES= python USE_PYTHON= distutils autoplist +NO_ARCH= yes .include Index: devel/py-vcversioner/distinfo =================================================================== --- devel/py-vcversioner/distinfo +++ devel/py-vcversioner/distinfo @@ -1,2 +1,3 @@ -SHA256 (vcversioner-2.14.0.0.tar.gz) = acd43686e92e6c8bbeb4f2eef54408567a7adea9692fa72d591eec5357c03b86 -SIZE (vcversioner-2.14.0.0.tar.gz) = 9015 +TIMESTAMP = 1465721148 +SHA256 (vcversioner-2.16.0.0.tar.gz) = dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b +SIZE (vcversioner-2.16.0.0.tar.gz) = 9024 Index: devel/py-verboselogs/Makefile =================================================================== --- devel/py-verboselogs/Makefile +++ devel/py-verboselogs/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: devel/py-virtualenv/Makefile =================================================================== --- devel/py-virtualenv/Makefile +++ devel/py-virtualenv/Makefile @@ -10,14 +10,14 @@ LICENSE= MIT -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} -USES?= python +USES= python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: devel/py-virtualenvwrapper/Makefile =================================================================== --- devel/py-virtualenvwrapper/Makefile +++ devel/py-virtualenvwrapper/Makefile @@ -13,17 +13,17 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr -RUN_DEPENDS= ${PKGNAMEPREFIX}stevedore>0:devel/py-stevedore \ - ${PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \ - ${PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stevedore>0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv-clone>0:devel/py-virtualenv-clone@${FLAVOR} OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-bitbucket>=1.0:textproc/py-sphinxcontrib-bitbucket@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils DOCS_VARS= DOCSDIR=${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} \ Index: devel/py-voluptuous/Makefile =================================================================== --- devel/py-voluptuous/Makefile +++ devel/py-voluptuous/Makefile @@ -14,7 +14,7 @@ USE_GITHUB= yes GH_ACCOUNT= alecthomas -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/py-warlock/Makefile =================================================================== --- devel/py-warlock/Makefile +++ devel/py-warlock/Makefile @@ -10,9 +10,9 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Python object model built on JSON schema and JSON patch -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=0.7:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.10:devel/py-jsonpatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-watchdog/Makefile =================================================================== --- devel/py-watchdog/Makefile +++ devel/py-watchdog/Makefile @@ -12,12 +12,12 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh \ - ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \ - ${PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml +RUN_DEPENDS= ${PKGNAMEPREFIX}argh>=0.26.1:devel/py-argh@${FLAVOR} \ + ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${FLAVOR} \ + ${PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} -DOCS_BUILD_DEPENDS= ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools \ - ${PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PKGNAMEPREFIX}pathtools>=0.1.2:devel/py-pathtools@${FLAVOR} \ + ${PKGNAMEPREFIX}sphinx>=1.4.4:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GH_ACCOUNT= gorakhargosh @@ -32,7 +32,7 @@ NO_ARCH= yes post-build-DOCS-on: - (cd ${WRKSRC}/docs ; ${MAKE_CMD} html) + (cd ${WRKSRC}/docs ; ${MAKE_CMD} SPHINXBUILD=sphinx-build-${PYTHON_VER} html) post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: devel/py-wcwidth/Makefile =================================================================== --- devel/py-wcwidth/Makefile +++ devel/py-wcwidth/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: devel/py-weblib/Makefile =================================================================== --- devel/py-weblib/Makefile +++ devel/py-weblib/Makefile @@ -11,10 +11,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytils>0:russian/py-pytils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-wheel/Makefile =================================================================== --- devel/py-wheel/Makefile +++ devel/py-wheel/Makefile @@ -19,10 +19,10 @@ PIP_RUN_DEPENDS= pip:devel/py-pip SIGNATURE_DESC= Enable digital signature of wheels -SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec \ - ${PYTHON_PKGNAMEPREFIX}ed25519ll>=0.6_1:security/py-ed25519ll \ - ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg +SIGNATURE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dirspec>=13.05:devel/py-dirspec@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ed25519ll>=0.6_1:security/py-ed25519ll@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.25:devel/py-xdg@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-widgetsnbextension/Makefile =================================================================== --- devel/py-widgetsnbextension/Makefile +++ devel/py-widgetsnbextension/Makefile @@ -10,7 +10,7 @@ COMMENT= IPython HTML widgets for Jupyter BUILD_DEPENDS= npm>=0:www/npm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notebook>=0:www/py-notebook@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-wsme/Makefile =================================================================== --- devel/py-wsme/Makefile +++ devel/py-wsme/Makefile @@ -11,12 +11,12 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Simplify the writing of REST APIs -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.12:net/py-netaddr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplegeneric>=0:devel/py-simplegeneric@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.12:net/py-netaddr@${FLAVOR} NO_ARCH= yes Index: devel/py-xattr/Makefile =================================================================== --- devel/py-xattr/Makefile +++ devel/py-xattr/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.0.0:devel/py-cffi@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-xcaplib/Makefile =================================================================== --- devel/py-xcaplib/Makefile +++ devel/py-xcaplib/Makefile @@ -13,9 +13,9 @@ LICENSE= LGPL20+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.5:devel/py-application@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.2:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-xdg/Makefile =================================================================== --- devel/py-xdg/Makefile +++ devel/py-xdg/Makefile @@ -16,7 +16,7 @@ LICENSE= LGPL20 NO_ARCH= yes -USES= python:2 +USES= python USE_PYTHON= autoplist distutils post-patch: Index: devel/py-xmltodict/Makefile =================================================================== --- devel/py-xmltodict/Makefile +++ devel/py-xmltodict/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-xxhash/Makefile =================================================================== --- devel/py-xxhash/Makefile +++ devel/py-xxhash/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>1:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>1:devel/py-nose@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: devel/py-yaml/Makefile =================================================================== --- devel/py-yaml/Makefile +++ devel/py-yaml/Makefile @@ -18,7 +18,7 @@ OPTIONS_DEFINE= LIBYAML EXAMPLES LIBYAML_DESC= Use textproc/libyaml for faster parsing -USES?= python +USES= python USE_PYTHON= distutils autoplist EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} Index: devel/py-yandex-money-sdk/Makefile =================================================================== --- devel/py-yandex-money-sdk/Makefile +++ devel/py-yandex-money-sdk/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.4.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-ydbf/Makefile =================================================================== --- devel/py-ydbf/Makefile +++ devel/py-ydbf/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-yum-metadata-parser/Makefile =================================================================== --- devel/py-yum-metadata-parser/Makefile +++ devel/py-yum-metadata-parser/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libsqlite3.so:databases/sqlite3 -USES= pkgconfig python +USES= pkgconfig python:2.7 USE_GNOME= glib20 USE_PYTHON= distutils autoplist Index: devel/py-yunomi/Makefile =================================================================== --- devel/py-yunomi/Makefile +++ devel/py-yunomi/Makefile @@ -16,7 +16,7 @@ PORTDOCS= README.rst \ HISTORY.rst -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS Index: devel/py-z3c.autoinclude/Makefile =================================================================== --- devel/py-z3c.autoinclude/Makefile +++ devel/py-z3c.autoinclude/Makefile @@ -12,11 +12,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-z3c.batching/Makefile =================================================================== --- devel/py-z3c.batching/Makefile +++ devel/py-z3c.batching/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-z3c.caching/Makefile =================================================================== --- devel/py-z3c.caching/Makefile +++ devel/py-z3c.caching/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-z3c.form/Makefile =================================================================== --- devel/py-z3c.form/Makefile +++ devel/py-z3c.form/Makefile @@ -13,27 +13,27 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6.0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-z3c.formwidget.query/Makefile =================================================================== --- devel/py-z3c.formwidget.query/Makefile +++ devel/py-z3c.formwidget.query/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-z3c.zcmlhook/Makefile =================================================================== --- devel/py-z3c.zcmlhook/Makefile +++ devel/py-z3c.zcmlhook/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zExceptions/Makefile =================================================================== --- devel/py-zExceptions/Makefile +++ devel/py-zExceptions/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zLOG/Makefile =================================================================== --- devel/py-zLOG/Makefile +++ devel/py-zLOG/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} NO_ARCH= yes USES= python:2 Index: devel/py-zkpython/Makefile =================================================================== --- devel/py-zkpython/Makefile +++ devel/py-zkpython/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libzookeeper_mt.so:devel/libzookeeper -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-zope.annotation/Makefile =================================================================== --- devel/py-zope.annotation/Makefile +++ devel/py-zope.annotation/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.http/Makefile =================================================================== --- devel/py-zope.app.http/Makefile +++ devel/py-zope.app.http/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.applicationcontrol/Makefile =================================================================== --- devel/py-zope.app.applicationcontrol/Makefile +++ devel/py-zope.app.applicationcontrol/Makefile @@ -13,16 +13,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.appsetup/Makefile =================================================================== --- devel/py-zope.app.appsetup/Makefile +++ devel/py-zope.app.appsetup/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=3.6.0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.basicskin/Makefile =================================================================== --- devel/py-zope.app.basicskin/Makefile +++ devel/py-zope.app.basicskin/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.app.broken/Makefile =================================================================== --- devel/py-zope.app.broken/Makefile +++ devel/py-zope.app.broken/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.cache/Makefile =================================================================== --- devel/py-zope.app.cache/Makefile +++ devel/py-zope.app.cache/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.component/Makefile =================================================================== --- devel/py-zope.app.component/Makefile +++ devel/py-zope.app.component/Makefile @@ -13,22 +13,22 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.container/Makefile =================================================================== --- devel/py-zope.app.container/Makefile +++ devel/py-zope.app.container/Makefile @@ -13,26 +13,26 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.content/Makefile =================================================================== --- devel/py-zope.app.content/Makefile +++ devel/py-zope.app.content/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.debug/Makefile =================================================================== --- devel/py-zope.app.debug/Makefile +++ devel/py-zope.app.debug/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.dependable/Makefile =================================================================== --- devel/py-zope.app.dependable/Makefile +++ devel/py-zope.app.dependable/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.error/Makefile =================================================================== --- devel/py-zope.app.error/Makefile +++ devel/py-zope.app.error/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.exception/Makefile =================================================================== --- devel/py-zope.app.exception/Makefile +++ devel/py-zope.app.exception/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.file/Makefile =================================================================== --- devel/py-zope.app.file/Makefile +++ devel/py-zope.app.file/Makefile @@ -12,20 +12,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.event>0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size \ - zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: devel/py-zope.app.folder/Makefile =================================================================== --- devel/py-zope.app.folder/Makefile +++ devel/py-zope.app.folder/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.form/Makefile =================================================================== --- devel/py-zope.app.form/Makefile +++ devel/py-zope.app.form/Makefile @@ -13,23 +13,23 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=3.5.1:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.generations/Makefile =================================================================== --- devel/py-zope.app.generations/Makefile +++ devel/py-zope.app.generations/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer \ - ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol \ - ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.renderer>=0:devel/py-zope.app.renderer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.applicationcontrol>=0:devel/py-zope.applicationcontrol@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.pagetemplate/Makefile =================================================================== --- devel/py-zope.app.pagetemplate/Makefile +++ devel/py-zope.app.pagetemplate/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.12.0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5.0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.publication/Makefile =================================================================== --- devel/py-zope.app.publication/Makefile +++ devel/py-zope.app.publication/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.2:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12.4:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=1.1.0:devel/py-transaction@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.publisher/Makefile =================================================================== --- devel/py-zope.app.publisher/Makefile +++ devel/py-zope.app.publisher/Makefile @@ -13,21 +13,21 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.renderer/Makefile =================================================================== --- devel/py-zope.app.renderer/Makefile +++ devel/py-zope.app.renderer/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.app.rotterdam/Makefile =================================================================== --- devel/py-zope.app.rotterdam/Makefile +++ devel/py-zope.app.rotterdam/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.schema/Makefile =================================================================== --- devel/py-zope.app.schema/Makefile +++ devel/py-zope.app.schema/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.app.testing/Makefile =================================================================== --- devel/py-zope.app.testing/Makefile +++ devel/py-zope.app.testing/Makefile @@ -13,26 +13,26 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug \ - ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.debug>=0:devel/py-zope.app.debug@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.zcmlfiles/Makefile =================================================================== --- devel/py-zope.app.zcmlfiles/Makefile +++ devel/py-zope.app.zcmlfiles/Makefile @@ -13,44 +13,44 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin \ - ${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken \ - ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \ - ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \ - ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content \ - ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable \ - ${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error \ - ${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception \ - ${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations \ - ${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http \ - ${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam \ - ${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \ - ${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi \ - ${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.applicationcontrol>=0:devel/py-zope.app.applicationcontrol@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.basicskin>=0:devel/py-zope.app.basicskin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.broken>=0:devel/py-zope.app.broken@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.content>=0:devel/py-zope.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.dependable>=0:devel/py-zope.app.dependable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.error>=0:devel/py-zope.app.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.exception>=0:devel/py-zope.app.exception@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.folder>=0:devel/py-zope.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.generations>=0:devel/py-zope.app.generations@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.http>=0:devel/py-zope.app.http@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.i18n>=0:textproc/py-zope.app.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.principalannotation>=0:security/py-zope.app.principalannotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.rotterdam>=0:devel/py-zope.app.rotterdam@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.schema>=0:devel/py-zope.app.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.wsgi>=0:www/py-zope.app.wsgi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.zopeappgenerations>=0:devel/py-zope.app.zopeappgenerations@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.app.zopeappgenerations/Makefile =================================================================== --- devel/py-zope.app.zopeappgenerations/Makefile +++ devel/py-zope.app.zopeappgenerations/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component \ - ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=0:security/py-zope.app.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copypastemove>=0:devel/py-zope.copypastemove@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.generations>=0:devel/py-zope.generations@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.applicationcontrol/Makefile =================================================================== --- devel/py-zope.applicationcontrol/Makefile +++ devel/py-zope.applicationcontrol/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7.0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.broken/Makefile =================================================================== --- devel/py-zope.broken/Makefile +++ devel/py-zope.broken/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: devel/py-zope.browser/Makefile =================================================================== --- devel/py-zope.browser/Makefile +++ devel/py-zope.browser/Makefile @@ -12,7 +12,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-zope.browsermenu/Makefile =================================================================== --- devel/py-zope.browsermenu/Makefile +++ devel/py-zope.browsermenu/Makefile @@ -13,18 +13,18 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=3.5:devel/py-zope.pagetemplate@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.browserpage/Makefile =================================================================== --- devel/py-zope.browserpage/Makefile +++ devel/py-zope.browserpage/Makefile @@ -12,19 +12,19 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.7:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=3.8:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.7:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-zope.browserresource/Makefile =================================================================== --- devel/py-zope.browserresource/Makefile +++ devel/py-zope.browserresource/Makefile @@ -14,15 +14,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: devel/py-zope.component/Makefile =================================================================== --- devel/py-zope.component/Makefile +++ devel/py-zope.component/Makefile @@ -14,8 +14,8 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.0:devel/py-zope.interface@${FLAVOR} NO_ARCH= yes USES= python Index: devel/py-zope.componentvocabulary/Makefile =================================================================== --- devel/py-zope.componentvocabulary/Makefile +++ devel/py-zope.componentvocabulary/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.configuration/Makefile =================================================================== --- devel/py-zope.configuration/Makefile +++ devel/py-zope.configuration/Makefile @@ -14,9 +14,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.container/Makefile =================================================================== --- devel/py-zope.container/Makefile +++ devel/py-zope.container/Makefile @@ -13,24 +13,24 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=3.5.4:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=3.5.2:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.broken>=0:devel/py-zope.broken@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.contentprovider/Makefile =================================================================== --- devel/py-zope.contentprovider/Makefile +++ devel/py-zope.contentprovider/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.copy/Makefile =================================================================== --- devel/py-zope.copy/Makefile +++ devel/py-zope.copy/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.copypastemove/Makefile =================================================================== --- devel/py-zope.copypastemove/Makefile +++ devel/py-zope.copypastemove/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.copy>=0:devel/py-zope.copy \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copy>=0:devel/py-zope.copy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.deferredimport/Makefile =================================================================== --- devel/py-zope.deferredimport/Makefile +++ devel/py-zope.deferredimport/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.dublincore/Makefile =================================================================== --- devel/py-zope.dublincore/Makefile +++ devel/py-zope.dublincore/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.error/Makefile =================================================================== --- devel/py-zope.error/Makefile +++ devel/py-zope.error/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.exceptions/Makefile =================================================================== --- devel/py-zope.exceptions/Makefile +++ devel/py-zope.exceptions/Makefile @@ -14,7 +14,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.filerepresentation/Makefile =================================================================== --- devel/py-zope.filerepresentation/Makefile +++ devel/py-zope.filerepresentation/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.formlib/Makefile =================================================================== --- devel/py-zope.formlib/Makefile +++ devel/py-zope.formlib/Makefile @@ -13,23 +13,23 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=1.1:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.11.0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.datetime>=0:devel/py-zope.datetime@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: devel/py-zope.generations/Makefile =================================================================== --- devel/py-zope.generations/Makefile +++ devel/py-zope.generations/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.globalrequest/Makefile =================================================================== --- devel/py-zope.globalrequest/Makefile +++ devel/py-zope.globalrequest/Makefile @@ -12,9 +12,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: devel/py-zope.i18n/Makefile =================================================================== --- devel/py-zope.i18n/Makefile +++ devel/py-zope.i18n/Makefile @@ -12,12 +12,12 @@ MAINTAINER= zope@FreeBSD.org COMMENT= Zope Internationalization Support -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= gettext python USE_PYTHON= autoplist distutils Index: devel/py-zope.lifecycleevent/Makefile =================================================================== --- devel/py-zope.lifecycleevent/Makefile +++ devel/py-zope.lifecycleevent/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.location/Makefile =================================================================== --- devel/py-zope.location/Makefile +++ devel/py-zope.location/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.3:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.6:devel/py-zope.schema@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.minmax/Makefile =================================================================== --- devel/py-zope.minmax/Makefile +++ devel/py-zope.minmax/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.pagetemplate/Makefile =================================================================== --- devel/py-zope.pagetemplate/Makefile +++ devel/py-zope.pagetemplate/Makefile @@ -13,16 +13,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.processlifetime/Makefile =================================================================== --- devel/py-zope.processlifetime/Makefile +++ devel/py-zope.processlifetime/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.ptresource/Makefile =================================================================== --- devel/py-zope.ptresource/Makefile +++ devel/py-zope.ptresource/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.publisher/Makefile =================================================================== --- devel/py-zope.publisher/Makefile +++ devel/py-zope.publisher/Makefile @@ -13,19 +13,19 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=3.5:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} -USES= python:2 zip +USES= python zip USE_PYTHON= autoplist distutils .include Index: devel/py-zope.ramcache/Makefile =================================================================== --- devel/py-zope.ramcache/Makefile +++ devel/py-zope.ramcache/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: devel/py-zope.schema/Makefile =================================================================== --- devel/py-zope.schema/Makefile +++ devel/py-zope.schema/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.site/Makefile =================================================================== --- devel/py-zope.site/Makefile +++ devel/py-zope.site/Makefile @@ -13,16 +13,16 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py-zope.size/Makefile =================================================================== --- devel/py-zope.size/Makefile +++ devel/py-zope.size/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.tales/Makefile =================================================================== --- devel/py-zope.tales/Makefile +++ devel/py-zope.tales/Makefile @@ -13,10 +13,10 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} -USES= python:2 +USES= python USE_PYTHON= distutils autoplist .include Index: devel/py-zope.testbrowser/Makefile =================================================================== --- devel/py-zope.testbrowser/Makefile +++ devel/py-zope.testbrowser/Makefile @@ -12,11 +12,11 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mechanize>=0.2.0:www/py-mechanize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: devel/py-zope.testing/Makefile =================================================================== --- devel/py-zope.testing/Makefile +++ devel/py-zope.testing/Makefile @@ -14,8 +14,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: devel/py-zope.traversing/Makefile =================================================================== --- devel/py-zope.traversing/Makefile +++ devel/py-zope.traversing/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=3.7.0:devel/py-zope.location@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: devel/py-zope.viewlet/Makefile =================================================================== --- devel/py-zope.viewlet/Makefile +++ devel/py-zope.viewlet/Makefile @@ -13,19 +13,19 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=3.10.1:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/py27-setuptools/distinfo =================================================================== --- /dev/null +++ devel/py27-setuptools/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1507100095 -SHA256 (python/setuptools-36.5.0.zip) = ce2007c1cea3359870b80657d634253a0765b0c7dc5a988d77ba803fc86f2c64 -SIZE (python/setuptools-36.5.0.zip) = 721505 Index: devel/py27-setuptools/files/easy-install.pth.dist =================================================================== --- /dev/null +++ devel/py27-setuptools/files/easy-install.pth.dist @@ -1,2 +0,0 @@ -import sys; sys.__plen = len(sys.path) -import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new) Index: devel/py27-setuptools/files/pkg-message.in =================================================================== --- /dev/null +++ devel/py27-setuptools/files/pkg-message.in @@ -1,7 +0,0 @@ - -******************************************************************* - - Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed - since Python %%PYTHON_VER%% is not the default Python version. - -******************************************************************* Index: devel/py27-setuptools/pkg-descr =================================================================== --- /dev/null +++ devel/py27-setuptools/pkg-descr @@ -1,10 +0,0 @@ -Setuptools is a fully-featured, actively-maintained, and stable library -designed to facilitate packaging Python projects, where packaging includes: - - Python package and module definitions - - Distribution package metadata - - Test hooks - - Project installation - - Platform-specific details - - Python 3 support - -WWW: https://pypi.python.org/pypi/setuptools Index: devel/py3-Jinja2/Makefile =================================================================== --- devel/py3-Jinja2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= Jinja2 -PORTVERSION= 2.9.6 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX?= - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Fast and easy to use stand-alone template engine - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.18:textproc/py3-MarkupSafe - -NO_ARCH= yes -USES= python:3.5+ -USE_PYTHON= autoplist concurrent distutils - -OPTIONS_DEFINE= BABEL EXAMPLES -OPTIONS_DEFAULT= BABEL -BABEL_DESC= Enable Babel extension - -BABEL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel - -PY2TO3_CMD= ${LOCALBASE}/bin/2to3-${PYTHON_VER} -PY2TO3_ARGS= --fix=all --no-diffs --nobackups --verbose --write - -PORTEXAMPLES= * - -post-build-EXAMPLES-on: - ${PY2TO3_CMD} ${PY2TO3_ARGS} ${WRKSRC}/examples - ${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \ - ${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples - -do-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) - -check regression-test test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test - -.include Index: devel/py3-Jinja2/distinfo =================================================================== --- devel/py3-Jinja2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1496757802 -SHA256 (Jinja2-2.9.6.tar.gz) = ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff -SIZE (Jinja2-2.9.6.tar.gz) = 437659 Index: devel/py3-Jinja2/pkg-descr =================================================================== --- devel/py3-Jinja2/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Jinja is a sandboxed template engine written in pure Python licensed -under the BSD license. It provides a Django-like non-XML syntax and -compiles templates into executable python code. It's basically a -combination of Django templates and python code. - -WWW: http://jinja.pocoo.org/ Index: devel/py3-apipkg/Makefile =================================================================== --- devel/py3-apipkg/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-apipkg - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-asttokens/Makefile =================================================================== --- devel/py3-asttokens/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-asttokens - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-babel/Makefile =================================================================== --- devel/py3-babel/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= Babel -PORTVERSION= 2.5.1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Collection of tools for internationalizing Python applications - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz - -USES= python:3.3+ -USE_PYTHON= autoplist concurrent distutils -NO_ARCH= yes - -PORTDOCS= docs/* - -OPTIONS_DEFINE= DOCS - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for docfile in ${PORTDOCS} - ${CP} -r ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR} -.endfor - -.include Index: devel/py3-babel/distinfo =================================================================== --- devel/py3-babel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1505757363 -SHA256 (Babel-2.5.1.tar.gz) = 6007daf714d0cd5524bbe436e2d42b3c20e68da66289559341e48d2cd6d25811 -SIZE (Babel-2.5.1.tar.gz) = 6612869 Index: devel/py3-babel/pkg-descr =================================================================== --- devel/py3-babel/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Babel is composed of two major parts: - - * tools to build and work with gettext message catalogs - - * a Python interface to the CLDR (Common Locale Data Repository), - providing access to various locale display names, localized - number and date formatting, etc. - -WWW: http://babel.pocoo.org/ Index: devel/py3-babel/pkg-plist =================================================================== --- devel/py3-babel/pkg-plist +++ /dev/null @@ -1,43 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/Makefile -%%PORTDOCS%%%%DOCSDIR%%/_static/logo.pdf -%%PORTDOCS%%%%DOCSDIR%%/_static/logo.png -%%PORTDOCS%%%%DOCSDIR%%/_static/logo_small.png -%%PORTDOCS%%%%DOCSDIR%%/_templates/sidebar-about.html -%%PORTDOCS%%%%DOCSDIR%%/_templates/sidebar-links.html -%%PORTDOCS%%%%DOCSDIR%%/_templates/sidebar-logo.html -%%PORTDOCS%%%%DOCSDIR%%/_themes/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/_themes/README -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/layout.html -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/relations.html -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/static/babel.css_t -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/static/small_babel.css -%%PORTDOCS%%%%DOCSDIR%%/_themes/babel/theme.conf -%%PORTDOCS%%%%DOCSDIR%%/api/core.rst -%%PORTDOCS%%%%DOCSDIR%%/api/dates.rst -%%PORTDOCS%%%%DOCSDIR%%/api/index.rst -%%PORTDOCS%%%%DOCSDIR%%/api/languages.rst -%%PORTDOCS%%%%DOCSDIR%%/api/lists.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/catalog.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/extract.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/index.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/mofile.rst -%%PORTDOCS%%%%DOCSDIR%%/api/messages/pofile.rst -%%PORTDOCS%%%%DOCSDIR%%/api/numbers.rst -%%PORTDOCS%%%%DOCSDIR%%/api/plural.rst -%%PORTDOCS%%%%DOCSDIR%%/api/support.rst -%%PORTDOCS%%%%DOCSDIR%%/api/units.rst -%%PORTDOCS%%%%DOCSDIR%%/changelog.rst -%%PORTDOCS%%%%DOCSDIR%%/cmdline.rst -%%PORTDOCS%%%%DOCSDIR%%/conf.py -%%PORTDOCS%%%%DOCSDIR%%/dates.rst -%%PORTDOCS%%%%DOCSDIR%%/dev.rst -%%PORTDOCS%%%%DOCSDIR%%/index.rst -%%PORTDOCS%%%%DOCSDIR%%/installation.rst -%%PORTDOCS%%%%DOCSDIR%%/intro.rst -%%PORTDOCS%%%%DOCSDIR%%/license.rst -%%PORTDOCS%%%%DOCSDIR%%/locale.rst -%%PORTDOCS%%%%DOCSDIR%%/make.bat -%%PORTDOCS%%%%DOCSDIR%%/messages.rst -%%PORTDOCS%%%%DOCSDIR%%/numbers.rst -%%PORTDOCS%%%%DOCSDIR%%/setup.rst -%%PORTDOCS%%%%DOCSDIR%%/support.rst Index: devel/py3-cffi/Makefile =================================================================== --- devel/py3-cffi/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ -# -MASTERDIR= ${.CURDIR}/../py-cffi - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py3-pycparser - -USES= localbase python:3.3+ compiler - -.include "${MASTERDIR}/Makefile" Index: devel/py3-click-log/Makefile =================================================================== --- devel/py3-click-log/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-click-log - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-click-threading/Makefile =================================================================== --- devel/py3-click-threading/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-click-threading - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py3-click -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest \ - ${RUN_DEPENDS} - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-click/Makefile =================================================================== --- devel/py3-click/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Philip Paeps -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-click - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-colorama/Makefile =================================================================== --- devel/py3-colorama/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-colorama - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-coloredlogs/Makefile =================================================================== --- devel/py3-coloredlogs/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-coloredlogs - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}humanfriendly>=2.1:textproc/py3-humanfriendly - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-dateutil/Makefile =================================================================== --- devel/py3-dateutil/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-dateutil - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5:devel/py3-six - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-dbus/Makefile =================================================================== --- devel/py3-dbus/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Joe Marcus Clarke -# $FreeBSD$ - -PORTREVISION= 1 - -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= - -COMMENT= Python3 bindings for the D-BUS messaging system - -SLAVE_PORT= python3 - -MASTERDIR= ${.CURDIR}/../../devel/pydbus-common -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: devel/py3-dbus/distinfo =================================================================== --- devel/py3-dbus/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (dbus-python-1.1.1.tar.gz) = 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88 -SIZE (dbus-python-1.1.1.tar.gz) = 596476 Index: devel/py3-dbus/pkg-descr =================================================================== --- devel/py3-dbus/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python bindings for the D-BUS interprocess messaging system. - -WWW: http://dbus.freedesktop.org/doc/dbus-python/ Index: devel/py3-dbus/pkg-plist =================================================================== --- /dev/null +++ devel/py3-dbus/pkg-plist @@ -1,56 +0,0 @@ -%%PYTHON_SITELIBDIR%%/_dbus_bindings.so -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so -%%PYTHON_SITELIBDIR%%/dbus/__init__.py -%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbus/_compat.py -%%PYTHON_SITELIBDIR%%/dbus/_compat.pyc -%%PYTHON_SITELIBDIR%%/dbus/_compat.pyo -%%PYTHON_SITELIBDIR%%/dbus/_dbus.py -%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc -%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo -%%PYTHON_SITELIBDIR%%/dbus/_version.py -%%PYTHON_SITELIBDIR%%/dbus/_version.pyc -%%PYTHON_SITELIBDIR%%/dbus/_version.pyo -%%PYTHON_SITELIBDIR%%/dbus/bus.py -%%PYTHON_SITELIBDIR%%/dbus/bus.pyc -%%PYTHON_SITELIBDIR%%/dbus/bus.pyo -%%PYTHON_SITELIBDIR%%/dbus/connection.py -%%PYTHON_SITELIBDIR%%/dbus/connection.pyc -%%PYTHON_SITELIBDIR%%/dbus/connection.pyo -%%PYTHON_SITELIBDIR%%/dbus/decorators.py -%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc -%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo -%%PYTHON_SITELIBDIR%%/dbus/exceptions.py -%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc -%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo -%%PYTHON_SITELIBDIR%%/dbus/gi_service.py -%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyc -%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyo -%%PYTHON_SITELIBDIR%%/dbus/glib.py -%%PYTHON_SITELIBDIR%%/dbus/glib.pyc -%%PYTHON_SITELIBDIR%%/dbus/glib.pyo -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo -%%PYTHON_SITELIBDIR%%/dbus/proxies.py -%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc -%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo -%%PYTHON_SITELIBDIR%%/dbus/server.py -%%PYTHON_SITELIBDIR%%/dbus/server.pyc -%%PYTHON_SITELIBDIR%%/dbus/server.pyo -%%PYTHON_SITELIBDIR%%/dbus/service.py -%%PYTHON_SITELIBDIR%%/dbus/service.pyc -%%PYTHON_SITELIBDIR%%/dbus/service.pyo -%%PYTHON_SITELIBDIR%%/dbus/types.py -%%PYTHON_SITELIBDIR%%/dbus/types.pyc -%%PYTHON_SITELIBDIR%%/dbus/types.pyo -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo Index: devel/py3-defusedxml/Makefile =================================================================== --- devel/py3-defusedxml/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-defusedxml - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-docopt/Makefile =================================================================== --- devel/py3-docopt/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-docopt - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-flake8-builtins/Makefile =================================================================== --- devel/py3-flake8-builtins/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-builtins - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-flake8-docstrings/Makefile =================================================================== --- devel/py3-flake8-docstrings/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-docstrings - -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 \ - ${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py3-flake8-polyfill \ - ${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py3-pydocstyle - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-flake8-import-order/Makefile =================================================================== --- devel/py3-flake8-import-order/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-import-order - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py3-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}asttokens>=0:devel/py3-asttokens - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-flake8-polyfill/Makefile =================================================================== --- devel/py3-flake8-polyfill/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-polyfill - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-flake8-quotes/Makefile =================================================================== --- devel/py3-flake8-quotes/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8-quotes - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-flake8/Makefile =================================================================== --- devel/py3-flake8/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-flake8 - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py3-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mccabe>=0.5.0:devel/py3-mccabe \ - ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.0.0:devel/py3-pycodestyle \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.8.1:devel/py3-pyflakes - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-freezegun/Makefile =================================================================== --- devel/py3-freezegun/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-freezegun - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py3-dateutil -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py3-nose \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py${PYTHON_SUFFIX}-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-gobject3/Makefile =================================================================== --- devel/py3-gobject3/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Joe Marcus Clarke -# $FreeBSD$ - -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 3 - -COMMENT= Python 3 bindings for GObject - -SLAVE_PORT= python3 - -MASTERDIR= ${.CURDIR}/../../devel/pygobject3-common -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" Index: devel/py3-gobject3/pkg-plist =================================================================== --- /dev/null +++ devel/py3-gobject3/pkg-plist @@ -1,78 +0,0 @@ -%%PYTHON_SITELIBDIR%%/gi/__init__.py -%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_error.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_option.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_propertyhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/_signalhelper.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/importer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/__pycache__/types.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/_constants.py -%%PYTHON_SITELIBDIR%%/gi/_error.py -%%PYTHON_SITELIBDIR%%/gi/_gi.so -%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/_option.py -%%PYTHON_SITELIBDIR%%/gi/_propertyhelper.py -%%PYTHON_SITELIBDIR%%/gi/_signalhelper.py -%%PYTHON_SITELIBDIR%%/gi/docstring.py -%%PYTHON_SITELIBDIR%%/gi/importer.py -%%PYTHON_SITELIBDIR%%/gi/module.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GIMarshallingTests.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GLib.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GObject.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gdk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gio.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gtk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Pango.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/keysyms.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py -%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py -%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/repository/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/types.py -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VER%%-%%OPSYS%%-%%UNAME_R%%-%%UNAME_M%%.egg-info -%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/generictreemodel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__pycache__/pygtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py Index: devel/py3-hgtools/Makefile =================================================================== --- devel/py3-hgtools/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-hgtools - -USES= python:3 zip - -.include "${MASTERDIR}/Makefile" Index: devel/py3-icalendar/Makefile =================================================================== --- devel/py3-icalendar/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-icalendar - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py3-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-jedi/Makefile =================================================================== --- devel/py3-jedi/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-jedi - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-jsonschema/Makefile =================================================================== --- devel/py3-jsonschema/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= jsonschema -PORTVERSION= 2.6.0 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= JSON Schema validation for Python - -LICENSE= MIT - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vcversioner>0:devel/py3-vcversioner - -USES= python:3 -USE_PYTHON= autoplist distutils -NO_ARCH= yes - -.include Index: devel/py3-jsonschema/distinfo =================================================================== --- devel/py3-jsonschema/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1488112296 -SHA256 (jsonschema-2.6.0.tar.gz) = 6ff5f3180870836cae40f06fa10419f557208175f13ad7bc26caa77beb1f6e02 -SIZE (jsonschema-2.6.0.tar.gz) = 53252 Index: devel/py3-jsonschema/pkg-descr =================================================================== --- devel/py3-jsonschema/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -jsonschema is an implementation of JSON Schema for Python - - - Full support for Draft 3 and Draft 4 of the schema. - - Lazy validation that can iteratively report all validation errors. - - Small and extensible - - Programmatic querying of which properties or items failed validation. - -WWW: https://github.com/Julian/jsonschema Index: devel/py3-libpeas/Makefile =================================================================== --- devel/py3-libpeas/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Koop Mast -# $FreeBSD$ - -PORTNAME= libpeas -PORTREVISION= 0 -CATEGORIES= devel gnome -MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -COMMENT= libpeas Python 3 support - -LIB_DEPENDS+= libpeas-1.0.so:devel/libpeas - -LIBPEAS_SLAVE= python3 - -BUILD_WRKSRC= ${WRKSRC}/loaders/python3 -INSTALL_WRKSRC= ${WRKSRC}/loaders/python3 - -MASTERDIR= ${.CURDIR}/../../devel/libpeas/ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-libpeas/pkg-plist =================================================================== --- /dev/null +++ devel/py3-libpeas/pkg-plist @@ -1 +0,0 @@ -lib/libpeas-1.0/loaders/libpython3loader.so Index: devel/py3-libzfs/Makefile =================================================================== --- devel/py3-libzfs/Makefile +++ /dev/null @@ -1,6 +0,0 @@ - -MASTERDIR= ${.CURDIR}/../py-libzfs - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-llfuse/Makefile =================================================================== --- devel/py3-llfuse/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-llfuse - -USES= compiler:c++11-lang fuse pkgconfig python:3.2+ tar:bz2 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-lxml/Makefile =================================================================== --- devel/py3-lxml/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-lxml - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-mccabe/Makefile =================================================================== --- devel/py3-mccabe/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mccabe - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py3-pytest-runner - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-mock/Makefile =================================================================== --- devel/py3-mock/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-mock - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py3-pbr \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py3-six -TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py3-tox - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-nose/Makefile =================================================================== --- devel/py3-nose/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-nose - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pbr/Makefile =================================================================== --- devel/py3-pbr/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pbr - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py3-pip - -USES= python:3.3+ shebangfix - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pip/Makefile =================================================================== --- devel/py3-pip/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pip - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py3-pytest-capturelog \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py3-pytest-timeout \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py3-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py3-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py3-scripttest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock \ - ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py3-pretend \ - ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py3-freezegun \ - git>0:devel/git \ - bzr>0:devel/bzr - -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py3-sphinx - -PORTSCOUT= ignore:1 - -USES= python:3.3+ shebangfix - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pluggy/Makefile =================================================================== --- devel/py3-pluggy/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pluggy - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-ply/Makefile =================================================================== --- devel/py3-ply/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-ply - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pretend/Makefile =================================================================== --- devel/py3-pretend/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pretend - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-prompt_toolkit/Makefile =================================================================== --- devel/py3-prompt_toolkit/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}wcwidth>=0:devel/py3-wcwidth - -USES= python:3.3+ - -PORTSCOUT= ignore:1 - -MASTERDIR= ${.CURDIR}/../py-prompt_toolkit - -.include "${MASTERDIR}/Makefile" Index: devel/py3-protobuf/Makefile =================================================================== --- devel/py3-protobuf/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-protobuf - -PORTSCOUT= ignore:1 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-py/Makefile =================================================================== --- devel/py3-py/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-py - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pyasn1/Makefile =================================================================== --- devel/py3-pyasn1/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Martin Jackson -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyasn1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pycodestyle/Makefile =================================================================== --- devel/py3-pycodestyle/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pycodestyle - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pycparser/Makefile =================================================================== --- devel/py3-pycparser/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pycparser - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pydocstyle/Makefile =================================================================== --- devel/py3-pydocstyle/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pydocstyle - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snowballstemmer>0:textproc/py3-snowballstemmer \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six - -USES= python:3 zip - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pyflakes/Makefile =================================================================== --- devel/py3-pyflakes/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyflakes - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pygit2/Makefile =================================================================== --- devel/py3-pygit2/Makefile +++ /dev/null @@ -1,10 +0,0 @@ - -MASTERDIR= ${.CURDIR}/../py-pygit2 - -USES= python:3.3+ - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py3-cffi -RUN_DEPENDS= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py3-six - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pyicu/Makefile =================================================================== --- devel/py3-pyicu/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyicu - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pylru-cache/Makefile =================================================================== --- devel/py3-pylru-cache/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Philip Paeps -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pylru-cache - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pytest-capturelog/Makefile =================================================================== --- devel/py3-pytest-capturelog/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-capturelog - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py>=1.1.1:devel/py3-py - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pytest-runner/Makefile =================================================================== --- devel/py3-pytest-runner/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-runner - -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py3-setuptools_scm - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pytest-timeout/Makefile =================================================================== --- devel/py3-pytest-timeout/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-timeout - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.4:devel/py3-pytest - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pytest-xdist/Makefile =================================================================== --- devel/py3-pytest-xdist/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest-xdist - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py3-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py3-execnet \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.22:devel/py3-py -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.5.1:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py3-pexpect - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pytest/Makefile =================================================================== --- devel/py3-pytest/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytest - -USES= python:3.3+ - -PORTSCOUT= ignore:1 - -SLAVE_SUFFIX= ${PYTHON_MAJOR_VER} - -.include "${MASTERDIR}/Makefile" Index: devel/py3-python-magic/Makefile =================================================================== --- devel/py3-python-magic/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-python-magic - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-pytz/Makefile =================================================================== --- devel/py3-pytz/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pytz - -USES= python:3.3+ zip - -.include "${MASTERDIR}/Makefile" Index: devel/py3-rubymarshal/Makefile =================================================================== --- devel/py3-rubymarshal/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-rubymarshal - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-scripttest/Makefile =================================================================== --- devel/py3-scripttest/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-scripttest - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-setproctitle/Makefile =================================================================== --- devel/py3-setproctitle/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-setproctitle - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-setuptools_scm/Makefile =================================================================== --- devel/py3-setuptools_scm/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-setuptools_scm - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-simplejson/Makefile =================================================================== --- devel/py3-simplejson/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 - -MASTERDIR= ${.CURDIR}/../py-simplejson - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-six/Makefile =================================================================== --- devel/py3-six/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-six - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-tabulate/Makefile =================================================================== --- devel/py3-tabulate/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tabulate - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-threema-msgapi/distinfo =================================================================== --- /dev/null +++ devel/py3-threema-msgapi/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1481010859 -SHA256 (lgrahl-threema-msgapi-sdk-python-v2.1.8_GH0.tar.gz) = 3ba7cde76d015d23ab026a09c00ee7bd819eed0313fbccd8b9717a1ecb8d4660 -SIZE (lgrahl-threema-msgapi-sdk-python-v2.1.8_GH0.tar.gz) = 24503 Index: devel/py3-threema-msgapi/pkg-descr =================================================================== --- /dev/null +++ devel/py3-threema-msgapi/pkg-descr @@ -1,3 +0,0 @@ -Threema Gateway Message SDK for Python https://gateway.threema.ch/. - -WWW: https://github.com/lgrahl/threema-msgapi-sdk-python/ Index: devel/py3-toposort/Makefile =================================================================== --- devel/py3-toposort/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-toposort - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-tox/Makefile =================================================================== --- devel/py3-tox/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tox - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.11.2:devel/py3-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}py>=1.4.17:devel/py3-py \ - ${PYTHON_PKGNAMEPREFIX}pluggy>0:devel/py3-pluggy -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py3-tox \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.3.5:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py3-pytest-timeout - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-tzlocal/Makefile =================================================================== --- devel/py3-tzlocal/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tzlocal - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py3-pytz - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-urwid/Makefile =================================================================== --- devel/py3-urwid/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -MASTERDIR= ${.CURDIR}/../py-urwid - -.include "${MASTERDIR}/Makefile" Index: devel/py3-vcversioner/Makefile =================================================================== --- devel/py3-vcversioner/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= vcversioner -PORTVERSION= 2.16.0.0 -PORTREVISION= 1 -CATEGORIES= devel python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Use version control tags to discover version numbers - -LICENSE= ISCL - -USES= python:3.3+ -USE_PYTHON= distutils autoplist -NO_ARCH= yes - -.include Index: devel/py3-vcversioner/distinfo =================================================================== --- devel/py3-vcversioner/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1465721148 -SHA256 (vcversioner-2.16.0.0.tar.gz) = dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b -SIZE (vcversioner-2.16.0.0.tar.gz) = 9024 Index: devel/py3-vcversioner/pkg-descr =================================================================== --- devel/py3-vcversioner/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -You can write a setup.py with no version information specified, and -vcversioner will find a recent, properly-formatted VCS tag and extract a -version from it. - -WWW: https://github.com/habnabit/vcversioner Index: devel/py3-verboselogs/Makefile =================================================================== --- devel/py3-verboselogs/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-verboselogs - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-virtualenv/Makefile =================================================================== --- devel/py3-virtualenv/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-virtualenv - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock - -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py3-sphinx - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-voluptuous/Makefile =================================================================== --- devel/py3-voluptuous/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-voluptuous - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: devel/py3-wcwidth/Makefile =================================================================== --- devel/py3-wcwidth/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-wcwidth - -USES= python:3.4+ - -.include "${MASTERDIR}/Makefile" Index: devel/py3-xdg/Makefile =================================================================== --- devel/py3-xdg/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# Created by: michael johnson -# $FreeBSD$ -# $MCom: ports/trunk/devel/py3-xdg/Makefile 19571 2014-04-25 18:12:46Z kwm $ - -PORTNAME= xdg -PORTVERSION= 0.25 -PORTREVISION= 1 -CATEGORIES= devel python -MASTER_SITES= http://people.freedesktop.org/~takluyver/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python 3 library to access freedesktop.org standards - -LICENSE= LGPL20 - -USES= python:3 -USE_PYTHON= distutils autoplist - -post-patch: - @${REINPLACE_CMD} -e \ - 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/xdg/BaseDirectory.py - -.include Index: devel/py3-xdg/distinfo =================================================================== --- devel/py3-xdg/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pyxdg-0.25.tar.gz) = 81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d -SIZE (pyxdg-0.25.tar.gz) = 48935 Index: devel/py3-xdg/files/patch-xdg_BaseDirectory.py =================================================================== --- devel/py3-xdg/files/patch-xdg_BaseDirectory.py +++ /dev/null @@ -1,18 +0,0 @@ ---- xdg/BaseDirectory.py.orig 2012-12-06 22:07:26.000000000 +0100 -+++ xdg/BaseDirectory.py 2014-03-04 17:22:23.000000000 +0100 -@@ -32,13 +32,13 @@ - os.path.join(_home, '.local', 'share') - - xdg_data_dirs = [xdg_data_home] + \ -- (os.environ.get('XDG_DATA_DIRS') or '/usr/local/share:/usr/share').split(':') -+ (os.environ.get('XDG_DATA_DIRS') or '%%LOCALBASE%%/share').split(':') - - xdg_config_home = os.environ.get('XDG_CONFIG_HOME') or \ - os.path.join(_home, '.config') - - xdg_config_dirs = [xdg_config_home] + \ -- (os.environ.get('XDG_CONFIG_DIRS') or '/etc/xdg').split(':') -+ (os.environ.get('XDG_CONFIG_DIRS') or '%%LOCALBASE%%/etc/xdg').split(':') - - xdg_cache_home = os.environ.get('XDG_CACHE_HOME') or \ - os.path.join(_home, '.cache') Index: devel/py3-xdg/pkg-descr =================================================================== --- devel/py3-xdg/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -A python library to access freedesktop.org standards. - -Currently supported are: - o Base Directory Specification - o Menu Specification - o Desktop Entry Specification - o Icon Theme Specification - o Recent File Spec - o Shared-MIME-Database Specification - -WWW: http://freedesktop.org/Software/pyxdg Index: devel/py3-yaml/Makefile =================================================================== --- devel/py3-yaml/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-yaml - -USES= python:3.1+ - -.include "${MASTERDIR}/Makefile" Index: devel/py34-setuptools/Makefile =================================================================== --- devel/py34-setuptools/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py27-setuptools - -PORTSCOUT= ignore:1 - -USES= python:3.4 - -.include "${MASTERDIR}/Makefile" Index: devel/py35-setuptools/Makefile =================================================================== --- devel/py35-setuptools/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py27-setuptools - -PORTSCOUT= ignore:1 - -USES= python:3.5 - -.include "${MASTERDIR}/Makefile" Index: devel/py36-setuptools/Makefile =================================================================== --- devel/py36-setuptools/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py27-setuptools - -PORTSCOUT= ignore:1 - -USES= python:3.6 - -.include "${MASTERDIR}/Makefile" Index: devel/py_static_check/Makefile =================================================================== --- devel/py_static_check/Makefile +++ devel/py_static_check/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.5:devel/py-pyflakes@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: devel/pycanberra/Makefile =================================================================== --- devel/pycanberra/Makefile +++ devel/pycanberra/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USE_GITHUB= yes GH_ACCOUNT= totdb Index: devel/pychecker/Makefile =================================================================== --- devel/pychecker/Makefile +++ devel/pychecker/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: devel/pydbus-common/Makefile =================================================================== --- devel/pydbus-common/Makefile +++ devel/pydbus-common/Makefile @@ -68,12 +68,8 @@ LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS+= pydbus-common>=0:devel/pydbus-common USE_LDCONFIG= yes -.if ${SLAVE_PORT} == python2 -USES+= python:2 -.endif -.if ${SLAVE_PORT} == python3 -USES+= python:3 -.endif +USES+= python +USE_PYTHON= flavors post-install: @${RM} -r ${STAGEDIR}${PREFIX}/include/dbus-1.0 \ Index: devel/pygobject3-common/Makefile =================================================================== --- devel/pygobject3-common/Makefile +++ devel/pygobject3-common/Makefile @@ -55,16 +55,16 @@ LIB_DEPENDS+= libffi.so:devel/libffi RUN_DEPENDS+= pygobject3-common>=0:devel/pygobject3-common -.if ${SLAVE_PORT} == python2 -USES+= python:2 -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo +.if ${SLAVE_PORT} == python +USES+= python +USE_PYTHON= flavors +.if ${FLAVOR:Upy27:Mpy2*} +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FLAVOR} +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FLAVOR} +.else +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR} +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py-cairo@${PY_FLAVOR} .endif - -.if ${SLAVE_PORT} == python3 -USES+= python:3 -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:graphics/py3-cairo .endif post-install: Index: devel/pylint/Makefile =================================================================== --- devel/pylint/Makefile +++ devel/pylint/Makefile @@ -13,12 +13,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=1.5.1:devel/py-astroid \ - ${PYTHON_PKGNAMEPREFIX}editdistance>=0:devel/py-editdistance \ - ${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort \ - ${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +py34_BROKEN= Fails to package +py35_BROKEN= Fails to package +py36_BROKEN= Fails to package + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}astroid>=1.5.1:devel/py-astroid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}editdistance>=0:devel/py-editdistance@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= concurrent distutils @@ -29,12 +33,12 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache \ - ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${FLAVOR} .endif .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR} .endif .include Index: devel/pymacs/Makefile =================================================================== --- devel/pymacs/Makefile +++ devel/pymacs/Makefile @@ -15,7 +15,7 @@ USE_GITHUB= yes GH_ACCOUNT= pinard -USES= python +USES= python:2.7 USE_EMACS= yes USE_PYTHON= distutils Index: devel/pyobfuscate/Makefile =================================================================== --- devel/pyobfuscate/Makefile +++ devel/pyobfuscate/Makefile @@ -16,7 +16,7 @@ GH_TAGNAME= 47cc6e49bf65649c9fc53fbf4ae7d6e23b565550 USES= python shebangfix -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix NO_ARCH= yes SHEBANG_FILES= *.py pyobfuscate pyobfuscate-install Index: devel/pypersrc/Makefile =================================================================== --- devel/pypersrc/Makefile +++ devel/pypersrc/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE_GPL2.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${PORTNAME} Index: devel/pyrex/Makefile =================================================================== --- devel/pyrex/Makefile +++ devel/pyrex/Makefile @@ -5,7 +5,7 @@ PORTVERSION= 0.9.9 CATEGORIES= devel lang python MASTER_SITES= http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/ -PKGNAMEPREFIX= ${PYTHONPKGNAMEPREFIX} +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Pyrex-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org Index: devel/pyside/Makefile =================================================================== --- devel/pyside/Makefile +++ devel/pyside/Makefile @@ -30,6 +30,7 @@ PYTHON_VERSION=${PYTHON_VERSION} USES= cmake python:2 tar:bzip2 +USE_PYTHON= flavors USE_LDCONFIG= yes .include Index: devel/pysvn/Makefile =================================================================== --- devel/pysvn/Makefile +++ devel/pysvn/Makefile @@ -18,16 +18,15 @@ # Python3 ready USES= python -USE_PYTHON= distutils noegginfo +USE_PYTHON= distutils noegginfo concurrent optsuffix PYDISTUTILS_CONFIGURE_TARGET= configure PYDISTUTILS_CONFIGUREARGS= --apr-inc-dir=${LOCALBASE}/include/apr-1 \ --svn-inc-dir=${LOCALBASE}/include/subversion-1 \ --pycxx-dir=${WRKSRC}/../Import/pycxx-6.2.8 \ --pycxx-src-dir=${WRKSRC}/../Import/pycxx-6.2.8/Src -PLIST_SUB= PYTHONVER=${PYTHON_VERSION:S/./_/:S/python//} PLIST_FILES= %%PYTHON_SITELIBDIR%%/${PORTNAME}/__init__.py \ - %%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_%%PYTHONVER%%.so + %%PYTHON_SITELIBDIR%%/${PORTNAME}/_pysvn_${PYTHON_VERSION:S/./_/:S/python//}.so WRKSRC_SUBDIR= Source Index: devel/qbzr/Makefile =================================================================== --- devel/qbzr/Makefile +++ devel/qbzr/Makefile @@ -14,13 +14,13 @@ LICENSE= GPLv2 BUILD_DEPENDS= bzr:devel/bzr \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${FLAVOR} RUN_DEPENDS= bzr:devel/bzr WRKSRC= ${WRKDIR}/${PORTNAME} -USES= gettext pyqt:4 python +USES= gettext pyqt:4 python:2.7 USE_PYQT= core USE_PYTHON= distutils autoplist USE_QT4= # empty Index: devel/qct/Makefile =================================================================== --- devel/qct/Makefile +++ devel/qct/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= pyqt:4 python +USES= pyqt:4 python:2.7 USE_PYQT= gui USE_PYTHON= distutils WRKSRC= ${WRKDIR}/qct Index: devel/rbtools/Makefile =================================================================== --- devel/rbtools/Makefile +++ devel/rbtools/Makefile @@ -11,14 +11,14 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${FLAVOR} ORIGNAME= RBTools NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils .include Index: devel/renpy/Makefile =================================================================== --- devel/renpy/Makefile +++ devel/renpy/Makefile @@ -16,13 +16,12 @@ LICENSE_FILE_DejaVu= ${WRKSRC}/renpy/common/DejaVuSans.txt LICENSE_PERMS_DejaVu= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2 -BUILD_DEPENDS+= cython:lang/cython +BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>0:devel/py-game_sdl2@${FLAVOR} LIB_DEPENDS= libfribidi.so:converters/fribidi \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg \ libfreetype.so:print/freetype2 -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2 +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}game_sdl2>=${PORTVERSION}:devel/py-game_sdl2@${FLAVOR} CONFLICTS_INSTALL?= ${PORTNAME}6-* @@ -31,7 +30,7 @@ USES= python:2.7 shebangfix tar:bz2 USE_GL= glew -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_SDL?= sdl2 EXCLUDE= gen 'module/*.py[co]' 'renpy/*.py[co]' EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude ,} @@ -70,7 +69,7 @@ EXAMPLES_VARS+= PORTDATA+="oldtutorial" .endif TKINTER_DESC= Install Tkinter to allow choosing Projects Directory -TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} . for lic in FREETYPE LIBJPEG LIBPNG MSVCR90 DIST_VARS+= LICENSE+=${lic} Index: devel/runsnakerun/Makefile =================================================================== --- devel/runsnakerun/Makefile +++ devel/runsnakerun/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap \ - ${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: devel/tailor/Makefile =================================================================== --- devel/tailor/Makefile +++ devel/tailor/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: devel/tortoisehg/Makefile =================================================================== --- devel/tortoisehg/Makefile +++ devel/tortoisehg/Makefile @@ -13,8 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt RUN_DEPENDS= hg:devel/mercurial \ - ${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse \ - pygmentize:textproc/py-pygments + ${PYTHON_PKGNAMEPREFIX}iniparse>=0.4:devel/py-iniparse@${FLAVOR} \ + pygmentize:textproc/py-pygments@${FLAVOR} OPTIONS_DEFINE= NAUTILUS NLS NAUTILUS_DESC= Install TortoiseHG Nautilus extension Index: devel/trac-bitten/Makefile =================================================================== --- devel/trac-bitten/Makefile +++ devel/trac-bitten/Makefile @@ -34,7 +34,7 @@ NO_BUILD= yes NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} TOUCH=${TOUCH} CHOWN=${CHOWN} \ RM=${RM:Q} USERS=${USERS} Index: devel/viewvc/Makefile =================================================================== --- devel/viewvc/Makefile +++ devel/viewvc/Makefile @@ -33,8 +33,8 @@ MODPYTHON33_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python33>=3.3:www/mod_python33 MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python35 MODWSGI_RUN_DEPENDS= ${APACHE_PKGNAMEPREFIX}mod_wsgi4>=4.4.13:www/mod_wsgi4 -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR} .include @@ -46,7 +46,7 @@ ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \ CHOWN=${CHOWN} RM=${RM:Q} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} pre-everything:: .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE} Index: dns/Makefile =================================================================== --- dns/Makefile +++ dns/Makefile @@ -187,8 +187,6 @@ SUBDIR += py-pydnstable SUBDIR += py-pywdns SUBDIR += py-tldextract - SUBDIR += py3-dnspython - SUBDIR += py3-idna SUBDIR += radns SUBDIR += rbldnsd SUBDIR += rbllookup Index: dns/bundy/Makefile =================================================================== --- dns/bundy/Makefile +++ dns/bundy/Makefile @@ -19,12 +19,12 @@ BUILD_DEPENDS= ${LOCALBASE}/include/log4cplus/logger.h:devel/log4cplus \ sqlite3>=3.3.9:databases/sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} LIB_DEPENDS= libbotan-1.10.so:security/botan110 \ liblog4cplus.so:devel/log4cplus \ libgmp.so:math/gmp \ libsqlite3.so:databases/sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/${PYTHON_PKGNAMEPREFIX}sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} BROKEN_powerpc64= fails to configure: checking for botan/botan.h... no @@ -32,7 +32,7 @@ GH_ACCOUNT= bundy-dns GH_TAGNAME= e640032 -USES= compiler:c++11-lang pathfix pkgconfig libtool python:3 autoreconf ssl +USES= compiler:c++11-lang pathfix pkgconfig libtool python:3.4+ autoreconf ssl USE_LDCONFIG= yes GNU_CONFIGURE= yes Index: dns/dnsrecon/Makefile =================================================================== --- dns/dnsrecon/Makefile +++ dns/dnsrecon/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= darkoperator Index: dns/dnsviz/Makefile =================================================================== --- dns/dnsviz/Makefile +++ dns/dnsviz/Makefile @@ -10,12 +10,12 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.1:graphics/py-pygraphviz \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.24.0:security/py-m2crypto \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=1.11.0:dns/py-dnspython +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.1:graphics/py-pygraphviz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.24.0:security/py-m2crypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=1.11.0:dns/py-dnspython@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix USE_GITHUB= yes PYDISTUTILS_INSTALLNOSINGLE= yes Index: dns/ldns/Makefile =================================================================== --- dns/ldns/Makefile +++ dns/ldns/Makefile @@ -59,13 +59,14 @@ .if defined(BUILD_PYLDNS) USES+= python +USE_PYTHON= flavors PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} ALL_TARGET= pyldns INSTALL_TARGET= install-pyldns CONFIGURE_ARGS+=--with-pyldns LIB_DEPENDS+= libldns.so:dns/ldns -BUILD_DEPENDS+= ${LOCALBASE}/bin/swig:devel/swig13 +BUILD_DEPENDS+= swig2.0:devel/swig20 CFLAGS+= -I${OPENSSLINC} post-patch: Index: dns/maradns/Makefile =================================================================== --- dns/maradns/Makefile +++ dns/maradns/Makefile @@ -31,7 +31,7 @@ CONV_DESC= Install bind2csv2 tool (needs python) IPV6_CONFIGURE_ON= --ipv6 -CONV_USES= python:run +CONV_USES= python:2.7,run PORTDOCS= * PORTEXAMPLES= * Index: dns/py-dns-lexicon/Makefile =================================================================== --- dns/py-dns-lexicon/Makefile +++ dns/py-dns-lexicon/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}tldextract>=1.7.5:dns/py-tldextract \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.16:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tldextract>=1.7.5:dns/py-tldextract@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: dns/py-dnschain/Makefile =================================================================== --- dns/py-dnschain/Makefile +++ dns/py-dnschain/Makefile @@ -12,7 +12,7 @@ LICENSE= MPL20 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: dns/py-dnspython/Makefile =================================================================== --- dns/py-dnspython/Makefile +++ dns/py-dnspython/Makefile @@ -14,12 +14,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -USES?= python:2.7+ +USES= python:2.7+ USE_PYTHON= autoplist distutils OPTIONS_DEFINE= EXAMPLES PYCRYPTO PYCRYPTO_DESC= Enable pycrypto (part of dnssec needs it) -PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto +PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} PORTEXAMPLES= ddns.py e164.py mx.py name.py reverse.py reverse_name.py \ xfr.py zonediff.py Index: dns/py-easyzone/Makefile =================================================================== --- dns/py-easyzone/Makefile +++ dns/py-easyzone/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: dns/py-idna/Makefile =================================================================== --- dns/py-idna/Makefile +++ dns/py-idna/Makefile @@ -10,7 +10,7 @@ MAINTAINER= koobs@FreeBSD.org COMMENT= Internationalized Domain Names in Applications (IDNA) -USES?= python # Actually, 2.6-2.7,3.3-3.6 +USES= python # Actually, 2.6-2.7,3.3-3.6 USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: dns/py-namebench/Makefile =================================================================== --- dns/py-namebench/Makefile +++ dns/py-namebench/Makefile @@ -15,18 +15,18 @@ LICENSE= APACHE20 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy \ - ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}graphy>=1.0:graphics/py-graphy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:devel/py-simplejson@${FLAVOR} USES= python tar:tgz .include .if ! ${PORT_OPTIONS:MX11} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:x11-toolkits/py-tkinter@${FLAVOR} .endif MAKE_ENV+= NO_THIRD_PARTY=yes Index: dns/py-py3dns/Makefile =================================================================== --- dns/py-py3dns/Makefile +++ dns/py-py3dns/Makefile @@ -16,7 +16,7 @@ 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 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: dns/py-pydnstable/Makefile =================================================================== --- dns/py-pydnstable/Makefile +++ dns/py-pydnstable/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libdnstable.so:dns/dnstable USE_PYTHON= autoplist distutils -USES= pkgconfig python +USES= pkgconfig python:2.7 post-install: ${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/dnstable.so Index: dns/py-pywdns/Makefile =================================================================== --- dns/py-pywdns/Makefile +++ dns/py-pywdns/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libwdns.so:dns/wdns -USES= pkgconfig python +USES= pkgconfig python:2.7 USE_PYTHON= autoplist distutils post-patch: Index: dns/py-tldextract/Makefile =================================================================== --- dns/py-tldextract/Makefile +++ dns/py-tldextract/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: dns/py3-dnspython/Makefile =================================================================== --- dns/py3-dnspython/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-dnspython - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: dns/py3-idna/Makefile =================================================================== --- dns/py3-idna/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Kubilay Kocak -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-idna - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: dns/sshfp/Makefile =================================================================== --- dns/sshfp/Makefile +++ dns/sshfp/Makefile @@ -11,11 +11,12 @@ LICENSE= GPLv2 -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc \ - ${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipcalc>=0.6:net-mgmt/py-ipcalc@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/ldns.py:dns/py-ldns@${FLAVOR} USES= python shebangfix +USE_PYTHON= flavors concurrent optsuffix NO_ARCH= yes NO_BUILD= yes USE_GITHUB= yes Index: editors/fileobj/Makefile =================================================================== --- editors/fileobj/Makefile +++ editors/fileobj/Makefile @@ -16,7 +16,7 @@ USE_GITHUB= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix PLIST_FILES= man/man1/fileobj.1.gz Index: editors/gedit-plugins/Makefile =================================================================== --- editors/gedit-plugins/Makefile +++ editors/gedit-plugins/Makefile @@ -21,7 +21,7 @@ PORTSCOUT= limitw:1,even USES= gettext gmake gnome libtool pathfix pkgconfig \ - python:3 tar:xz + python:3.4+ tar:xz USE_GNOME= gtk30 gtksourceview3 intlhack USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -33,10 +33,10 @@ org.gnome.gedit.plugins.wordcompletion.gschema.xml USES+= python -BUILD_DEPENDS+= py3?-dbus>=0:devel/py3-dbus +BUILD_DEPENDS+= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} LIB_DEPENDS+= libgucharmap_2_90.so:deskutils/gucharmap -RUN_DEPENDS+= py3?-dbus>=0:devel/py3-dbus \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas +RUN_DEPENDS+= py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} USE_GNOME+= vte3 CONFIGURE_ARGS+=--enable-python GLIB_SCHEMAS+= org.gnome.gedit.plugins.terminal.gschema.xml Index: editors/gedit/Makefile =================================================================== --- editors/gedit/Makefile +++ editors/gedit/Makefile @@ -23,7 +23,7 @@ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= iso-codes>=0:misc/iso-codes \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} PORTSCOUT= limitw:1,even Index: editors/gwrite/Makefile =================================================================== --- editors/gwrite/Makefile +++ editors/gwrite/Makefile @@ -14,16 +14,16 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra \ - ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${FLAVOR} RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme \ wvHtml:textproc/wv \ - ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk + ${PYTHON_PKGNAMEPREFIX}jswebkit>=0:www/py-jswebkit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>=0:www/py-webkitgtk@${FLAVOR} NO_ARCH= yes -USES= desktop-file-utils gettext-tools python +USES= desktop-file-utils gettext-tools python:2.7 USE_GNOME= intltool pygtk2 USE_PYTHON= distutils WRKSRC= ${WRKDIR}/gwrite-${PORTVERSION} Index: editors/leo/Makefile =================================================================== --- editors/leo/Makefile +++ editors/leo/Makefile @@ -15,8 +15,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \ silvercity>0:textproc/silvercity USES= pyqt:4 python:2 shebangfix zip @@ -32,7 +32,7 @@ OPTIONS_DEFINE= PYENCHANT PYENCHANT_DESC= Spell checking support via PyEnchant -PYENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant +PYENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${FLAVOR} post-patch: @${LN} -sf leo/dist/leo-install.py ${WRKSRC}/leo-install.py Index: editors/py-room/Makefile =================================================================== --- editors/py-room/Makefile +++ editors/py-room/Makefile @@ -12,9 +12,9 @@ MAINTAINER= arundel@FreeBSD.org COMMENT= PyRoom is a clone of WriteRoom and features "distraction-free writing" -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${FLAVOR} -USES= gettext python +USES= gettext python:2.7 USE_PYTHON= distutils USE_GNOME= pygtk2 PYDISTUTILS_PKGNAME= PyRoom Index: editors/texworks/Makefile =================================================================== --- editors/texworks/Makefile +++ editors/texworks/Makefile @@ -47,7 +47,7 @@ OPTIONS_DEFINE= DOCS LUA PYTHON LUA_USES= lua:51 LUA_PLIST_FILES=lib/texworks/libTWLuaPlugin.so -PYTHON_USES= python:3 +PYTHON_USES= python:3.4+ PYTHON_PLIST_FILES=lib/texworks/libTWPythonPlugin.so post-extract: Index: emulators/dynagen/Makefile =================================================================== --- emulators/dynagen/Makefile +++ emulators/dynagen/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:devel/py-configobj \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.4.0:devel/py-configobj@${FLAVOR} \ dynamips:emulators/dynamips-community PLIST_FILES= bin/dynagen "@sample etc/dynagen.ini.sample" @@ -21,7 +21,7 @@ PORTEXAMPLES= * PORTDATA= * -USES= dos2unix python shebangfix +USES= dos2unix python:2.7 shebangfix SHEBANG_FILES= *.py dynagen USE_PYTHON= distutils autoplist Index: emulators/dynagui/Makefile =================================================================== --- emulators/dynagui/Makefile +++ emulators/dynagui/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= dynagen:emulators/dynagen -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= dynagui.py USE_PYTHON= distutils IMGDIR= ${STAGEDIR}${PREFIX}/share/${PORTNAME}/img Index: emulators/gns3/Makefile =================================================================== --- emulators/gns3/Makefile +++ emulators/gns3/Makefile @@ -14,16 +14,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui \ - ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg \ - ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:graphics/py-qt4-svg@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:net/py-qt4-network@${FLAVOR} \ dynamips:emulators/dynamips-community \ dynagen:emulators/dynagen \ xdotool:x11/xdotool WRKSRC= ${WRKDIR}/${PORTNAME}-legacy-GNS3-${PORTVERSION} -USES= cpe python +USES= cpe python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= GNS3 NO_ARCH= yes Index: emulators/loemu/Makefile =================================================================== --- emulators/loemu/Makefile +++ emulators/loemu/Makefile @@ -16,7 +16,7 @@ ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix USE_PYTHON= distutils NO_BUILD= yes SHEBANG_FILES= setup.py Index: emulators/py-gns3-converter/Makefile =================================================================== --- emulators/py-gns3-converter/Makefile +++ emulators/py-gns3-converter/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv3 -USES= python:3 -USE_PYTHON= distutils autoplist +USES= python:3.4+ +USE_PYTHON= distutils autoplist optsuffix .include Index: emulators/py-nova/Makefile =================================================================== --- emulators/py-nova/Makefile +++ emulators/py-nova/Makefile @@ -13,65 +13,65 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient \ - ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify \ - ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ - ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.2.2:www/py-rfc3986 \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121 \ - ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ - ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \ - ${PYTHON_PKGNAMEPREFIX}os-vif>=1.1.0:devel/py-os-vif \ - ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan \ - ${PYTHON_PKGNAMEPREFIX}microversion-parse>=0.1.2:devel/py-microversion-parse \ - ${PYTHON_PKGNAMEPREFIX}wsgi_intercept>=0.6.1:devel/py-wsgi_intercept \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse \ - ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.4:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websockify>=0.8.0:devel/py-websockify@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rfc3986>=0.2.2:www/py-rfc3986@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil121>=0:sysutils/py-psutil121@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-vif>=1.1.0:devel/py-os-vif@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}microversion-parse>=0.1.2:devel/py-microversion-parse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wsgi_intercept>=0.6.1:devel/py-wsgi_intercept@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${FLAVOR} \ e2fsprogs>=0:sysutils/e2fsprogs \ arping>=0:net/arping Index: emulators/swine/Makefile =================================================================== --- emulators/swine/Makefile +++ emulators/swine/Makefile @@ -23,7 +23,7 @@ GH_ACCOUNT= dswd GH_PROJECT= Swine -USES= gmake python +USES= gmake python:2.7 NO_BUILD= yes USE_QT4= linguist_build ONLY_FOR_ARCHS= i386 amd64 Index: emulators/virtualbox-ose/Makefile =================================================================== --- emulators/virtualbox-ose/Makefile +++ emulators/virtualbox-ose/Makefile @@ -149,7 +149,7 @@ .if ${PORT_OPTIONS:MPYTHON} USES+= python -USE_PYTHON= distutils noegginfo +USE_PYTHON= distutils noegginfo noflavors PYDISTUTILS_PKGNAME= vboxapi PYDISTUTILS_PKGVERSION= 1.0 .else Index: finance/bitcoin-armory/Makefile =================================================================== --- finance/bitcoin-armory/Makefile +++ finance/bitcoin-armory/Makefile @@ -14,10 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:devel/swig30 \ - ${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml \ + ${LOCALBASE}/bin/pyrcc4:textproc/py-qt4-xml@${PY_FLAVOR} \ ${LOCALBASE}/bin/rsync:net/rsync -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.0:devel/py-twisted@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>1.2.1:sysutils/py-psutil@${PY_FLAVOR} \ ${LOCALBASE}/bin/bitcoind:net-p2p/bitcoin-daemon USE_GITHUB= yes Index: finance/electrum/Makefile =================================================================== --- finance/electrum/Makefile +++ finance/electrum/Makefile @@ -14,33 +14,26 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py3-dnspython \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py3-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py3-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix \ - ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py3-pbkdf2 \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py3-protobuf \ - ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py3-pyaes \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py3-pysocks \ - ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py3-qrcode \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py3-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonrpclib-pelix>0:devel/py-jsonrpclib-pelix@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} CONFLICTS_INSTALL= electrum2-* -USES= desktop-file-utils pyqt:5 python:3 +USES= desktop-file-utils pyqt:5 python:3.4+ USE_PYQT= gui_run sip widgets -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix PYDISTUTILS_PKGNAME= Electrum NO_ARCH= yes -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - post-patch: @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/setup.py -.include +.include Index: finance/electrum2/Makefile =================================================================== --- finance/electrum2/Makefile +++ finance/electrum2/Makefile @@ -16,15 +16,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}jsonrpclib>0:devel/py-jsonrpclib \ - ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2 \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonrpclib>0:devel/py-jsonrpclib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.6.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qrcode>=5.1:textproc/py-qrcode@${FLAVOR} CONFLICTS_INSTALL= electrum-3.* Index: finance/gnucash/Makefile =================================================================== --- finance/gnucash/Makefile +++ finance/gnucash/Makefile @@ -53,7 +53,7 @@ DATABASE_CONFIGURE_ON= --with-dbi-dbd-dir=${LOCALBASE}/lib/dbd LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax PYTHON_CONFIGURE_ON= --enable-python -PYTHON_USES= python +PYTHON_USES= python:2.7 GTKMM_USE= GNOME=gtkmm24 GTKMM_CONFIGURE_ON= --enable-gtkmm GTKMM_CONFIGURE_OFF= --disable-gtkmm Index: finance/py-python-obelisk/Makefile =================================================================== --- finance/py-python-obelisk/Makefile +++ finance/py-python-obelisk/Makefile @@ -14,9 +14,9 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=14.5.0:net/py-pyzmq@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: finance/py-stripe/Makefile =================================================================== --- finance/py-stripe/Makefile +++ finance/py-stripe/Makefile @@ -14,10 +14,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.8.8:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: finance/py-vatnumber/Makefile =================================================================== --- finance/py-vatnumber/Makefile +++ finance/py-vatnumber/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:devel/py-stdnum +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=1.1:devel/py-stdnum@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: finance/sabernetdcs-client/Makefile =================================================================== --- finance/sabernetdcs-client/Makefile +++ finance/sabernetdcs-client/Makefile @@ -15,11 +15,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyro>=0:devel/py-pyro@${FLAVOR} USE_GNOME= pygtk2 USE_PYTHON= distutils -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 DOCSDIR= ${PREFIX}/share/doc/sndcs DATADIR= ${PREFIX}/share/sndcs SUB_FILES= pkg-message Index: finance/tryton28/Makefile =================================================================== --- finance/tryton28/Makefile +++ finance/tryton28/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2012:devel/py-pytz@${FLAVOR} CONFLICTS= tryton-2.[46].* Index: finance/trytond28/Makefile =================================================================== --- finance/trytond28/Makefile +++ finance/trytond28/Makefile @@ -14,13 +14,13 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:lang/py-mx-base \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:textproc/py-genshi \ - ${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:print/py-relatorio \ - ${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:devel/py-polib \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:lang/py-mx-base@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Genshi>0.5.1:textproc/py-genshi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}relatorio>=0.6.0:print/py-relatorio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}polib>=0.7.0:devel/py-polib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} CONFLICTS= trytond-2.[46].* @@ -42,7 +42,7 @@ PIDDIR?= /var/run LOGDIR?= /var/log -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-patch: @@ -52,19 +52,19 @@ .include .if ${PORT_OPTIONS:MWEBDAV} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR} .endif .if ${PORT_OPTIONS:MPYOPENSSL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} .endif .if ${PORT_OPTIONS:MPYDOT} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${FLAVOR} .endif .if ${PORT_OPTIONS:MPYTZ} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} .endif post-install: Index: finance/trytond28_account/Makefile =================================================================== --- finance/trytond28_account/Makefile +++ finance/trytond28_account/Makefile @@ -15,11 +15,11 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ trytond28_company>=2.8.0:finance/trytond28_company \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} CONFLICTS= trytond_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_asset/Makefile =================================================================== --- finance/trytond28_account_asset/Makefile +++ finance/trytond28_account_asset/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_be/Makefile =================================================================== --- finance/trytond28_account_be/Makefile +++ finance/trytond28_account_be/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_invoice/Makefile =================================================================== --- finance/trytond28_account_invoice/Makefile +++ finance/trytond28_account_invoice/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_account_invoice-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_invoice_history/Makefile =================================================================== --- finance/trytond28_account_invoice_history/Makefile +++ finance/trytond28_account_invoice_history/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_invoice_history-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_invoice_line_standalone/Makefile =================================================================== --- finance/trytond28_account_invoice_line_standalone/Makefile +++ finance/trytond28_account_invoice_line_standalone/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_invoice_line_standalone-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_product/Makefile =================================================================== --- finance/trytond28_account_product/Makefile +++ finance/trytond28_account_product/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_account_product-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_statement/Makefile =================================================================== --- finance/trytond28_account_statement/Makefile +++ finance/trytond28_account_statement/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_account_statement-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_stock_anglo_saxon/Makefile =================================================================== --- finance/trytond28_account_stock_anglo_saxon/Makefile +++ finance/trytond28_account_stock_anglo_saxon/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_stock_anglo_saxon-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_account_stock_continental/Makefile =================================================================== --- finance/trytond28_account_stock_continental/Makefile +++ finance/trytond28_account_stock_continental/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_account_stock_continental-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_analytic_account/Makefile =================================================================== --- finance/trytond28_analytic_account/Makefile +++ finance/trytond28_analytic_account/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_analytic_account-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_analytic_invoice/Makefile =================================================================== --- finance/trytond28_analytic_invoice/Makefile +++ finance/trytond28_analytic_invoice/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_analytic_invoice-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_analytic_purchase/Makefile =================================================================== --- finance/trytond28_analytic_purchase/Makefile +++ finance/trytond28_analytic_purchase/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_analytic_purchase-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_analytic_sale/Makefile =================================================================== --- finance/trytond28_analytic_sale/Makefile +++ finance/trytond28_analytic_sale/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_analytic_sale-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_calendar/Makefile =================================================================== --- finance/trytond28_calendar/Makefile +++ finance/trytond28_calendar/Makefile @@ -14,14 +14,14 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} CONFLICTS= trytond_calendar-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_calendar_classification/Makefile =================================================================== --- finance/trytond28_calendar_classification/Makefile +++ finance/trytond28_calendar_classification/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_calendar_classification-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_calendar_scheduling/Makefile =================================================================== --- finance/trytond28_calendar_scheduling/Makefile +++ finance/trytond28_calendar_scheduling/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_calendar_scheduling-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_calendar_todo/Makefile =================================================================== --- finance/trytond28_calendar_todo/Makefile +++ finance/trytond28_calendar_todo/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_calendar_todo-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_carrier/Makefile =================================================================== --- finance/trytond28_carrier/Makefile +++ finance/trytond28_carrier/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_carrier-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_carrier_percentage/Makefile =================================================================== --- finance/trytond28_carrier_percentage/Makefile +++ finance/trytond28_carrier_percentage/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_carrier_percentage-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_carrier_weight/Makefile =================================================================== --- finance/trytond28_carrier_weight/Makefile +++ finance/trytond28_carrier_weight/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_carrier_weight-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_company/Makefile =================================================================== --- finance/trytond28_company/Makefile +++ finance/trytond28_company/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_company-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_company_work_time/Makefile =================================================================== --- finance/trytond28_company_work_time/Makefile +++ finance/trytond28_company_work_time/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_company_work_time-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_country/Makefile =================================================================== --- finance/trytond28_country/Makefile +++ finance/trytond28_country/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_country-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_currency/Makefile =================================================================== --- finance/trytond28_currency/Makefile +++ finance/trytond28_currency/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_currency-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_dashboard/Makefile =================================================================== --- finance/trytond28_dashboard/Makefile +++ finance/trytond28_dashboard/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_dashboard-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_ldap_authentication/Makefile =================================================================== --- finance/trytond28_ldap_authentication/Makefile +++ finance/trytond28_ldap_authentication/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_ldap_authentication-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_ldap_connection/Makefile =================================================================== --- finance/trytond28_ldap_connection/Makefile +++ finance/trytond28_ldap_connection/Makefile @@ -15,11 +15,11 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:net/py-ldap + ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.10:net/py-ldap@${FLAVOR} CONFLICTS= trytond_ldap_connection-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_party/Makefile =================================================================== --- finance/trytond28_party/Makefile +++ finance/trytond28_party/Makefile @@ -15,11 +15,11 @@ RUN_DEPENDS= trytond28>=2.8.2:finance/trytond28 \ trytond28_country>=2.8.0:finance/trytond28_country \ - ${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:finance/py-vatnumber + ${PYTHON_PKGNAMEPREFIX}vatnumber>=1.0.0:finance/py-vatnumber@${FLAVOR} CONFLICTS= trytond_party-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_party_siret/Makefile =================================================================== --- finance/trytond28_party_siret/Makefile +++ finance/trytond28_party_siret/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_party_siret-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_party_vcarddav/Makefile =================================================================== --- finance/trytond28_party_vcarddav/Makefile +++ finance/trytond28_party_vcarddav/Makefile @@ -15,12 +15,12 @@ LICENSE= GPLv3 RUN_DEPENDS= trytond28_party>=2.8.0:finance/trytond28_party \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWebDAV>=0:www/py-pywebdav@${FLAVOR} CONFLICTS= trytond_party_vcarddav-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_product/Makefile =================================================================== --- finance/trytond28_product/Makefile +++ finance/trytond28_product/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_product-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_product_attribute/Makefile =================================================================== --- finance/trytond28_product_attribute/Makefile +++ finance/trytond28_product_attribute/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_attribute-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_product_cost_fifo/Makefile =================================================================== --- finance/trytond28_product_cost_fifo/Makefile +++ finance/trytond28_product_cost_fifo/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_cost_fifo-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_product_cost_history/Makefile =================================================================== --- finance/trytond28_product_cost_history/Makefile +++ finance/trytond28_product_cost_history/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_cost_history-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_product_measurements/Makefile =================================================================== --- finance/trytond28_product_measurements/Makefile +++ finance/trytond28_product_measurements/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_product_measurements-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_product_price_list/Makefile =================================================================== --- finance/trytond28_product_price_list/Makefile +++ finance/trytond28_product_price_list/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_product_price_list-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_production/Makefile =================================================================== --- finance/trytond28_production/Makefile +++ finance/trytond28_production/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_production-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_project/Makefile =================================================================== --- finance/trytond28_project/Makefile +++ finance/trytond28_project/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_project-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_project_invoice/Makefile =================================================================== --- finance/trytond28_project_invoice/Makefile +++ finance/trytond28_project_invoice/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_project_invoice-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_project_plan/Makefile =================================================================== --- finance/trytond28_project_plan/Makefile +++ finance/trytond28_project_plan/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_project_plan-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_project_revenue/Makefile =================================================================== --- finance/trytond28_project_revenue/Makefile +++ finance/trytond28_project_revenue/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_project_revenue-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_purchase/Makefile =================================================================== --- finance/trytond28_purchase/Makefile +++ finance/trytond28_purchase/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_purchase-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_purchase_invoice_line_standalone/Makefile =================================================================== --- finance/trytond28_purchase_invoice_line_standalone/Makefile +++ finance/trytond28_purchase_invoice_line_standalone/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_purchase_invoice_line_standalone-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_purchase_shipment_cost/Makefile =================================================================== --- finance/trytond28_purchase_shipment_cost/Makefile +++ finance/trytond28_purchase_shipment_cost/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_purchase_shipment_cost-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_sale/Makefile =================================================================== --- finance/trytond28_sale/Makefile +++ finance/trytond28_sale/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_sale-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_sale_opportunity/Makefile =================================================================== --- finance/trytond28_sale_opportunity/Makefile +++ finance/trytond28_sale_opportunity/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_sale_opportunity-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_sale_price_list/Makefile =================================================================== --- finance/trytond28_sale_price_list/Makefile +++ finance/trytond28_sale_price_list/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_sale_price_list-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_sale_shipment_cost/Makefile =================================================================== --- finance/trytond28_sale_shipment_cost/Makefile +++ finance/trytond28_sale_shipment_cost/Makefile @@ -21,7 +21,7 @@ CONFLICTS= trytond_sale_shipment_cost-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_sale_supply/Makefile =================================================================== --- finance/trytond28_sale_supply/Makefile +++ finance/trytond28_sale_supply/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_sale_supply-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_sale_supply_drop_shipment/Makefile =================================================================== --- finance/trytond28_sale_supply_drop_shipment/Makefile +++ finance/trytond28_sale_supply_drop_shipment/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_sale_supply_drop_shipment-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock/Makefile =================================================================== --- finance/trytond28_stock/Makefile +++ finance/trytond28_stock/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_stock-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_forecast/Makefile =================================================================== --- finance/trytond28_stock_forecast/Makefile +++ finance/trytond28_stock_forecast/Makefile @@ -13,12 +13,12 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ trytond28_stock>=2.8.2:finance/trytond28_stock CONFLICTS= trytond_stock_forecast-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_inventory_location/Makefile =================================================================== --- finance/trytond28_stock_inventory_location/Makefile +++ finance/trytond28_stock_inventory_location/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_stock_inventory_location-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_location_sequence/Makefile =================================================================== --- finance/trytond28_stock_location_sequence/Makefile +++ finance/trytond28_stock_location_sequence/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_stock_location_sequence-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_lot/Makefile =================================================================== --- finance/trytond28_stock_lot/Makefile +++ finance/trytond28_stock_lot/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_lot-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_product_location/Makefile =================================================================== --- finance/trytond28_stock_product_location/Makefile +++ finance/trytond28_stock_product_location/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_product_location-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_split/Makefile =================================================================== --- finance/trytond28_stock_split/Makefile +++ finance/trytond28_stock_split/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_stock_split-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_supply/Makefile =================================================================== --- finance/trytond28_stock_supply/Makefile +++ finance/trytond28_stock_supply/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_supply-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_supply_day/Makefile =================================================================== --- finance/trytond28_stock_supply_day/Makefile +++ finance/trytond28_stock_supply_day/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_stock_supply_day-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_supply_forecast/Makefile =================================================================== --- finance/trytond28_stock_supply_forecast/Makefile +++ finance/trytond28_stock_supply_forecast/Makefile @@ -19,7 +19,7 @@ CONFLICTS= trytond_stock_supply_forecast-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_stock_supply_production/Makefile =================================================================== --- finance/trytond28_stock_supply_production/Makefile +++ finance/trytond28_stock_supply_production/Makefile @@ -20,7 +20,7 @@ CONFLICTS= trytond_stock_supply_production-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: finance/trytond28_timesheet/Makefile =================================================================== --- finance/trytond28_timesheet/Makefile +++ finance/trytond28_timesheet/Makefile @@ -17,7 +17,7 @@ CONFLICTS= trytond_timesheet-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: french/aster/Makefile =================================================================== --- french/aster/Makefile +++ french/aster/Makefile @@ -46,7 +46,7 @@ libmed.so:french/med # libAsterInterface.so:science/mfront # libAsterInterface.so:science/tfel -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot\ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} \ ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur Index: french/trytond28_account_fr/Makefile =================================================================== --- french/trytond28_account_fr/Makefile +++ french/trytond28_account_fr/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_fr-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: ftp/py-ftputil/Makefile =================================================================== --- ftp/py-ftputil/Makefile +++ ftp/py-ftputil/Makefile @@ -11,7 +11,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level FTP client library -USES= python +USES= python:2.7 USE_PYTHON= distutils DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: ftp/py-pyftpdlib/Makefile =================================================================== --- ftp/py-pyftpdlib/Makefile +++ ftp/py-pyftpdlib/Makefile @@ -23,8 +23,8 @@ SENDFILE_DESC= Enable sendfile(2) support OPENSSL_DESC= Enable FTP over SSL/TLS (RFC4217) -SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile -OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl +SENDFILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysendfile>0:net/py-pysendfile@${FLAVOR} +OPENSSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} PORTEXAMPLES= * Index: games/anki/Makefile =================================================================== --- games/anki/Makefile +++ games/anki/Makefile @@ -16,12 +16,12 @@ RUN_DEPENDS= lame:audio/lame \ mplayer:multimedia/mplayer \ - ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash + ${PYTHON_PKGNAMEPREFIX}pyaudio>0:audio/py-pyaudio@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR} USES= desktop-file-utils pyqt:4 python:2 shared-mime-info shebangfix tar:tgz SHEBANG_FILES= tools/build_ui.sh tools/tests.sh Index: games/balazar/Makefile =================================================================== --- games/balazar/Makefile +++ games/balazar/Makefile @@ -15,17 +15,17 @@ LIB_DEPENDS= libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= soya_editor:graphics/py-soya3d \ - ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal \ - ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ - ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu \ - ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= soya_editor:graphics/py-soya3d@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} BROKEN= fails to package: pkg-static: py27-twisted-17.5.0_1 conflicts with py27-twistedCore-15.2.1 (installs files into the same place) NO_ARCH= yes -USES= gettext python tar:bzip2 +USES= gettext python:2.7 tar:bzip2 USE_GL= glew USE_SDL= mixer sdl USE_PYTHON= autoplist distutils Index: games/balazarbrothers/Makefile =================================================================== --- games/balazarbrothers/Makefile +++ games/balazarbrothers/Makefile @@ -18,15 +18,15 @@ LIB_DEPENDS= libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ - ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d \ - ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu \ - ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cerealizer>0:security/py-cerealizer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES= gettext python tar:bzip2 +USES= gettext python:2.7 tar:bzip2 USE_GL= glew USE_PYTHON= autoplist distutils @@ -40,7 +40,7 @@ OPTIONS_DEFINE= OPENAL OPTIONS_DEFAULT= OPENAL -OPENAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal +OPENAL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} post-patch: @${REINPLACE_CMD} -e \ Index: games/bouncy/Makefile =================================================================== --- games/bouncy/Makefile +++ games/bouncy/Makefile @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/GPL.txt RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL + ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME}-post-${DISTVERSION} Index: games/brainworkshop/Makefile =================================================================== --- games/brainworkshop/Makefile +++ games/brainworkshop/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyglet/__init__.py:graphics/py-pyglet -USES= dos2unix python:run zip +USES= dos2unix python:2.7,run zip NO_BUILD= yes DOS2UNIX_FILES= brainworkshop.pyw Index: games/childsplay/Makefile =================================================================== --- games/childsplay/Makefile +++ games/childsplay/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 # only LICENSE_FILE= ${WRKSRC}/gpl-3.0.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${PY_FLAVOR} NO_BUILD= yes Index: games/craft/Makefile =================================================================== --- games/craft/Makefile +++ games/craft/Makefile @@ -26,7 +26,7 @@ USE_XORG= x11 xi xrandr USE_GL= gl glu -SERVER_USES= python +SERVER_USES= python:2.7 SERVER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.2:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 SERVER_CMAKE_ON= -DSERVER:BOOL=ON Index: games/endgame-singularity/Makefile =================================================================== --- games/endgame-singularity/Makefile +++ games/endgame-singularity/Makefile @@ -19,7 +19,7 @@ USE_GITHUB= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USE_SDL= image mixer PORTDOCS= AUTHORS Changelog README.txt TODO Index: games/funnyboat/Makefile =================================================================== --- games/funnyboat/Makefile +++ games/funnyboat/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python:run zip +USES= python:2.7,run zip NO_BUILD= yes NO_ARCH= yes Index: games/gcompris/Makefile =================================================================== --- games/gcompris/Makefile +++ games/gcompris/Makefile @@ -13,12 +13,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= texi2html:textproc/texi2html \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} LIB_DEPENDS= libvorbis.so:audio/libvorbis \ libao.so:audio/libao \ libassetml.so:devel/libassetml \ libdbus-glib-1.so:devel/dbus-glib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ gnucap:cad/gnucap USES= display:configure gettext gmake libtool localbase pathfix \ Index: games/glchess/Makefile =================================================================== --- games/glchess/Makefile +++ games/glchess/Makefile @@ -10,9 +10,9 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 3D OpenGL based chess game -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR} -USES= desktop-file-utils python shared-mime-info +USES= desktop-file-utils python:2.7 shared-mime-info USE_GNOME= gconf2 USE_PYTHON= distutils GCONF_SCHEMAS= glchess.schemas Index: games/hypatia_engine/Makefile =================================================================== --- games/hypatia_engine/Makefile +++ games/hypatia_engine/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 + ${PYTHON_PKGNAMEPREFIX}pyganim>0:graphics/py-pyganim@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PY_ENUM34} -USES= python:2 +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: games/jools/Makefile =================================================================== --- games/jools/Makefile +++ games/jools/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYGAME} -USES= python +USES= python:2.7 USE_PYTHON= distutils PORTDOCS= POINTS manual.html manual.pdf manual.tex Index: games/kye/Makefile =================================================================== --- games/kye/Makefile +++ games/kye/Makefile @@ -23,7 +23,7 @@ RESTRICTED_FILES= kye-data_nuke_levels.20121101.tar.gz USE_GNOME= pygtk2 librsvg2 -USES= python +USES= python:2.7 USE_PYTHON= distutils PORTDOCS= NEWS README Index: games/magicor/Makefile =================================================================== --- games/magicor/Makefile +++ games/magicor/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= *.py NO_BUILD= yes NO_ARCH= yes Index: games/nelly/Makefile =================================================================== --- games/nelly/Makefile +++ games/nelly/Makefile @@ -17,7 +17,7 @@ COMMENT= Nelly's Rooftop Garden, physics-based puzzle game RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL + ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} USES= python:2 Index: games/outerspace/Makefile =================================================================== --- games/outerspace/Makefile +++ games/outerspace/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game -USES= python +USES= python:2.7 NO_BUILD= yes NO_ARCH= yes Index: games/plutocracy/Makefile =================================================================== --- games/plutocracy/Makefile +++ games/plutocracy/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libpng.so:graphics/png -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_SDL= sdl pango USE_GL= gl glu USE_PYTHON= distutils Index: games/poker-engine/Makefile =================================================================== --- games/poker-engine/Makefile +++ games/poker-engine/Makefile @@ -14,15 +14,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync \ - ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval \ - ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt + ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${FLAVOR} RUN_DEPENDS= ${LOCALBASE}/bin/rsync:net/rsync \ - ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval \ - ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt + ${PYTHON_SITELIBDIR}/pokereval.py:games/py-poker-eval@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${FLAVOR} USES= gettext gmake pathfix pkgconfig python:2 +USE_PYTHON= flavors GNU_CONFIGURE= yes test: Index: games/ptkei/Makefile =================================================================== --- games/ptkei/Makefile +++ games/ptkei/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ ${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= empire.py scripts/*.py do-build: Index: games/py-fife/Makefile =================================================================== --- games/py-fife/Makefile +++ games/py-fife/Makefile @@ -61,6 +61,7 @@ PYTHON_CMAKE_BOOL= build-python PYTHON_USES= python:2 +PYTHON_USE= python=flavors PYTHON_BUILD_DEPENDS= ${LOCALBASE}/bin/swig3.0:devel/swig30 LIBRARY_CMAKE_BOOL= build-library Index: games/py-mnemosyne/Makefile =================================================================== --- games/py-mnemosyne/Makefile +++ games/py-mnemosyne/Makefile @@ -15,12 +15,12 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:www/py-cherrypy \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.2.0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2:www/py-cherrypy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${FLAVOR} -USES= fortran pyqt:4 python +USES= fortran pyqt:4 python:2.7 USE_PYQT= gui_run network_run sql_run webkit_run USE_PYTHON= distutils autoplist NO_ARCH= yes Index: games/py-poker-eval/Makefile =================================================================== --- games/py-poker-eval/Makefile +++ games/py-poker-eval/Makefile @@ -18,6 +18,7 @@ LIB_DEPENDS= libpoker-eval.so:games/poker-eval USES= autoreconf libtool pathfix pkgconfig python:2 +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ARGS= PYTHON="" Index: games/py-sgflib/Makefile =================================================================== --- games/py-sgflib/Makefile +++ games/py-sgflib/Makefile @@ -17,6 +17,7 @@ LICENSE_FILE= ${WRKSRC}/lgpl.txt USES= python shebangfix +USE_PYTHON= flavors NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} Index: games/py-sgfsummary/Makefile =================================================================== --- games/py-sgfsummary/Makefile +++ games/py-sgfsummary/Makefile @@ -12,9 +12,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SGF Summarizer -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sgflib.py:games/py-sgflib@${FLAVOR} USES= python shebangfix tar:tgz +USE_PYTHON= flavors SHEBANG_FILES= sgfsummary.py WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} NO_BUILD= yes Index: games/pydance/Makefile =================================================================== --- games/pydance/Makefile +++ games/pydance/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PYGAME} RUN_DEPENDS= ${PYGAME} -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= pydance.py utils/findbpm.py USE_PYTHON= distutils noegginfo SUB_FILES= pkg-message Index: games/pyfa/Makefile =================================================================== --- games/pyfa/Makefile +++ games/pyfa/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.6:databases/py-sqlalchemy10@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= pyfa-org @@ -34,9 +34,9 @@ OPTIONS_DEFINE= DPSGRAPHING DPSGRAPHING_DESC= DPS graphing (requires NumPy and matplotlib) -DPSGRAPHING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools +DPSGRAPHING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} do-build: @${PYTHON_CMD} -m compileall ${WRKSRC} Index: games/pysolfc/Makefile =================================================================== --- games/pysolfc/Makefile +++ games/pysolfc/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 USE_PYTHON= autoplist distutils NO_ARCH= yes SHEBANG_FILES= data/themes/clearlooks/create_imgs.py Index: games/pyspacewar/Makefile =================================================================== --- games/pyspacewar/Makefile +++ games/pyspacewar/Makefile @@ -18,7 +18,7 @@ GH_ACCOUNT= mgedmin GH_TAGNAME= f872564 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTDOCS= *.rst Index: games/pysycache/Makefile =================================================================== --- games/pysycache/Makefile +++ games/pysycache/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game -USES= python shebangfix zip +USES= python:2.7 shebangfix zip NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message Index: games/pythonchess/Makefile =================================================================== --- games/pythonchess/Makefile +++ games/pythonchess/Makefile @@ -17,7 +17,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/gpl.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME:S/p/P/:S/c/C/} Index: games/pythonsudoku/Makefile =================================================================== --- games/pythonsudoku/Makefile +++ games/pythonsudoku/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS+= libcups.so:print/cups RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1 + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR} USES= python:2 tar:bzip2 USE_GNOME= pygtk2 Index: games/retroarch/Makefile =================================================================== --- games/retroarch/Makefile +++ games/retroarch/Makefile @@ -44,7 +44,7 @@ OPENAL_CONFIGURE_ENABLE=al NETPLAY_CONFIGURE_ENABLE= netplay PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python:3 +PYTHON_USES= python:3.4+ V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat V4L_CONFIGURE_ENABLE= v4l2 @@ -80,6 +80,10 @@ /^check_lib OSS_LIB/d' \ ${WRKSRC}/qb/config.libs.sh +post-patch-PYTHON-on: + @${REINPLACE_CMD} -e '/check_pkgconf PYTHON/s/python3/python-${PYTHON_VER}/' \ + ${WRKSRC}/qb/config.libs.sh + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/retroarch @${REINPLACE_CMD} -e 's|# libretro_directory =|libretro_directory = "${PREFIX}/libexec/libretro"|' \ Index: games/slune/Makefile =================================================================== --- games/slune/Makefile +++ games/slune/Makefile @@ -14,12 +14,12 @@ LICENSE= GPLv2 LIB_DEPENDS= libcal3d.so:graphics/cal3d -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal \ - ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis \ - ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d \ - ${PYTHON_PKGNAMEPREFIX}py2play>0:net-p2p/py-py2play +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py2play>0:net-p2p/py-py2play@${FLAVOR} -USES= dos2unix gettext python tar:bzip2 +USES= dos2unix gettext python:2.7 tar:bzip2 DOS2UNIX_GLOB= *.po *.mo USE_GL= glew USE_SDL= sdl mixer Index: games/unknown-horizons/Makefile =================================================================== --- games/unknown-horizons/Makefile +++ games/unknown-horizons/Makefile @@ -13,10 +13,10 @@ BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ ${LOCALBASE}/bin/xsltproc:textproc/libxslt -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/fife/__init__.py:games/py-fife \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/fife/__init__.py:games/py-fife@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} ONLY_FOR_ARCHS= i386 amd64 Index: games/wxlauncher/Makefile =================================================================== --- games/wxlauncher/Makefile +++ games/wxlauncher/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/GPLv2.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= scp-fs2open Index: games/zephulor/Makefile =================================================================== --- games/zephulor/Makefile +++ games/zephulor/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING.txt RUN_DEPENDS= ${PYGAME} \ - ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter + ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} WRKSRC= ${WRKDIR}/zephulor-source Index: german/trytond28_account_de_skr03/Makefile =================================================================== --- german/trytond28_account_de_skr03/Makefile +++ german/trytond28_account_de_skr03/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_account_de_skr03-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -912,10 +912,6 @@ SUBDIR += py-traitsui SUBDIR += py-wand SUBDIR += py-webcolors - SUBDIR += py3-cairo - SUBDIR += py3-imagesize - SUBDIR += py3-pillow - SUBDIR += py3-pygraphviz SUBDIR += pygts SUBDIR += pymorph SUBDIR += pysvg Index: graphics/boxer/Makefile =================================================================== --- graphics/boxer/Makefile +++ graphics/boxer/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= box:graphics/box -USES= python +USES= python:2.7 USE_GNOME= pygtk2 USE_PYTHON= distutils autoplist USE_LDCONFIG= yes Index: graphics/caffe/Makefile =================================================================== --- graphics/caffe/Makefile +++ graphics/caffe/Makefile @@ -14,7 +14,6 @@ CONFLICTS_INSTALL= caffe2-* BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ ${LOCALBASE}/include/cblas.h:math/cblas \ bash:shells/bash LIB_DEPENDS= libsnappy.so:archivers/snappy \ @@ -30,15 +29,16 @@ libopenblas.so:math/openblas \ libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-image>=0.12:graphics/py-scikit-image@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${FLAVOR} USE_LDCONFIG= yes -USES= gmake python fortran compiler:c++11-lib pkgconfig +USES= gmake python:2.7 fortran compiler:c++11-lib pkgconfig +USE_PYTHON= flavors cython CXXFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 LDFLAGS+= -DGTEST_USE_OWN_TR1_TUPLE=1 Index: graphics/cegui/Makefile =================================================================== --- graphics/cegui/Makefile +++ graphics/cegui/Makefile @@ -45,7 +45,7 @@ LUA_CMAKE_ON= -DCEGUI_BUILD_LUA_MODULE=ON -DCEGUI_BUILD_LUA_GENERATOR=ON LUA_CMAKE_OFF= -DCEGUI_BUILD_LUA_MODULE=OFF -DCEGUI_BUILD_LUA_GENERATOR=OFF # this option is not currently used as it doesn't compile (see also CMAKE_ARGS below) -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs PYTHON_CMAKE_ON= -DCEGUI_BUILD_PYTHON_MODULES=ON PYTHON_CMAKE_OFF= -DCEGUI_BUILD_PYTHON_MODULES=OFF Index: graphics/curator/Makefile =================================================================== --- graphics/curator/Makefile +++ graphics/curator/Makefile @@ -11,7 +11,7 @@ COMMENT= Static Image Gallery Generator for web or CD-ROM galleries USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix PLIST_FILES= man/man1/curator.1.gz Index: graphics/driconf/Makefile =================================================================== --- graphics/driconf/Makefile +++ graphics/driconf/Makefile @@ -16,7 +16,7 @@ USE_GL= glut USE_PYTHON= distutils NO_BUILD= yes -USES= gettext python +USES= gettext python:2.7 PYDISTUTILS_EGGINFODIR= ${STAGEDIR}${PREFIX}/lib/driconf pre-patch: Index: graphics/entangle/Makefile =================================================================== --- graphics/entangle/Makefile +++ graphics/entangle/Makefile @@ -20,9 +20,9 @@ libraw_r.so:graphics/libraw \ libpeas-1.0.so:devel/libpeas RUN_DEPENDS:= ${BUILD_DEPENDS:Nitstool*} \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} -USES= gettext-tools gmake libtool pkgconfig python:3 +USES= gettext-tools gmake libtool pkgconfig python:3.4+ GNU_CONFIGURE= yes USE_GNOME= cairo gtk30 intltool introspection USE_GSTREAMER1= core Index: graphics/eog-plugins/Makefile =================================================================== --- graphics/eog-plugins/Makefile +++ graphics/eog-plugins/Makefile @@ -42,8 +42,8 @@ CHAMPLAIN_USE= GL=egl XORG=x11,xcomposite,xdamage,xext,xfixes,xi,xrandr PYTHON_CONFIGURE_ENABLE=python -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas -PYTHON_USES= python:3 +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} +PYTHON_USES= python:3.4+ PYTHON_VARS= GLIB_SCHEMAS+="org.gnome.eog.plugins.export-to-folder.gschema.xml \ org.gnome.eog.plugins.fullscreenbg.gschema.xml \ org.gnome.eog.plugins.pythonconsole.gschema.xml" Index: graphics/facedetect/Makefile =================================================================== --- graphics/facedetect/Makefile +++ graphics/facedetect/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv -USES= python:run shebangfix +USES= python:2.7,run shebangfix USE_GITHUB= yes NO_BUILD= yes NO_ARCH= yes Index: graphics/geos/Makefile =================================================================== --- graphics/geos/Makefile +++ graphics/geos/Makefile @@ -27,7 +27,7 @@ PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python +PYTHON_USES= python:2.7 RUBY_BUILD_DEPENDS= swig3.0:devel/swig30 RUBY_CONFIGURE_ENABLE= ruby RUBY_CONFIGURE_ENV= RUBY="${RUBY}" Index: graphics/gnofract4d/Makefile =================================================================== --- graphics/gnofract4d/Makefile +++ graphics/gnofract4d/Makefile @@ -21,7 +21,7 @@ GH_ACCOUNT= edyoung USES= desktop-file-utils display:build jpeg localbase pathfix \ - pkgconfig python shared-mime-info shebangfix + pkgconfig python:2.7 shared-mime-info shebangfix SHEBANG_FILES= fractutils/get.py USE_GNOME= intlhack libxslt:build pygtk2 USE_PYTHON= distutils autoplist Index: graphics/graphene/Makefile =================================================================== --- graphics/graphene/Makefile +++ graphics/graphene/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -USES= gnome meson pkgconfig python:3 shebangfix tar:xz +USES= gnome meson pkgconfig python:3.4+ shebangfix tar:xz USE_GNOME= glib20 py3gobject3 OPTIONS_SUB= yes Index: graphics/gsculpt/Makefile =================================================================== --- graphics/gsculpt/Makefile +++ graphics/gsculpt/Makefile @@ -15,8 +15,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_python.so:devel/boost-python-libs -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL \ - ${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>0:graphics/py-PyOpenGL@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtkglext>0:x11-toolkits/py-gtkglext@${PY_FLAVOR} BROKEN_powerpc= fails to compile BROKEN_sparc64= fails to compile Index: graphics/hugin/Makefile =================================================================== --- graphics/hugin/Makefile +++ graphics/hugin/Makefile @@ -48,7 +48,7 @@ AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c PYTHON_DESC= Python Scripting Interface -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig2.0:devel/swig20 PYTHON_CMAKE_ON= -DBUILD_HSI=ON PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF Index: graphics/imgtops/Makefile =================================================================== --- graphics/imgtops/Makefile +++ graphics/imgtops/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} -USES= ghostscript:run python +USES= ghostscript:run python:2.7 USE_PYTHON= distutils post-install: Index: graphics/lensfun/Makefile =================================================================== --- graphics/lensfun/Makefile +++ graphics/lensfun/Makefile @@ -28,8 +28,8 @@ SIMD_CMAKE_OFF= -DBUILD_FOR_SSE:BOOL=OFF -DBUILD_FOR_SSE2:BOOL=OFF -PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} +PYHELPERS_CMAKE_ON= -DSTAGEDIR:STRING=${STAGEDIR} -DPYTHON:STRING=${PYTHON_CMD} PYHELPERS_CMAKE_OFF= -DINSTALL_HELPER_SCRIPTS:BOOL=OFF -DPYTHON:STRING=IGNORE -PYHELPERS_USES= python:3 +PYHELPERS_USES= python:3.4+ .include Index: graphics/mapnik/Makefile =================================================================== --- graphics/mapnik/Makefile +++ graphics/mapnik/Makefile @@ -73,7 +73,7 @@ PROJ_MAKE_ARGS_OFF= PROJ=False CAIRO_LIB_DEPENDS= libcairo.so:graphics/cairo -CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo +CAIRO_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.2:graphics/py-cairo@${PY_FLAVOR} CAIRO_MAKE_ARGS_OFF= CAIRO=False .include Index: graphics/mirage/Makefile =================================================================== --- graphics/mirage/Makefile +++ graphics/mirage/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -USES= desktop-file-utils gettext python tar:bzip2 +USES= desktop-file-utils gettext python:2.7 tar:bzip2 USE_GNOME= gtk20 pygtk2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Mirage Index: graphics/opencolorio/Makefile =================================================================== --- graphics/opencolorio/Makefile +++ graphics/opencolorio/Makefile @@ -62,7 +62,7 @@ -DPYTHON:STRING=${PYTHON_CMD} PLIST= ${PKGDIR}/pkg-plist-pyglue .else # master port -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libyaml-cpp03.so:devel/yaml-cpp03 USES+= python:2,build Index: graphics/opencv/Makefile =================================================================== --- graphics/opencv/Makefile +++ graphics/opencv/Makefile @@ -142,6 +142,7 @@ BUILD_DEPENDS+= ${PYNUMPY} RUN_DEPENDS+= ${PYNUMPY} USES+= fortran python:2.7 +USE_PYTHON= flavors CMAKE_ARGS+= -DBUILD_opencv_python:BOOL=On . for module in apps java stitching superres videostab CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off Index: graphics/piglit/Makefile =================================================================== --- graphics/piglit/Makefile +++ graphics/piglit/Makefile @@ -13,16 +13,16 @@ BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libcaca.so:graphics/libcaca \ libdrm.so:graphics/libdrm \ libOpenCL.so:devel/ocl-icd \ libpng.so:graphics/png \ libwaffle-1.so:graphics/waffle RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= dumbbell Index: graphics/py-PyOpenGL-accelerate/Makefile =================================================================== --- graphics/py-PyOpenGL-accelerate/Makefile +++ graphics/py-PyOpenGL-accelerate/Makefile @@ -13,11 +13,10 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= cython:lang/cython \ - ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USES= python .include Index: graphics/py-PyOpenGL/Makefile =================================================================== --- graphics/py-PyOpenGL/Makefile +++ graphics/py-PyOpenGL/Makefile @@ -13,7 +13,7 @@ COMMENT= OpenGL (and related library) interface for Python BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= TKINTER @@ -24,8 +24,8 @@ USE_GL= glut USE_PYTHON= distutils autoplist -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ Index: graphics/py-PyX/Makefile =================================================================== --- graphics/py-PyX/Makefile +++ graphics/py-PyX/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -USES= python:3 +USES= python:3.4+ USE_TEX= latex:build USE_PYTHON= autoplist distutils Index: graphics/py-actdiag/Makefile =================================================================== --- graphics/py-actdiag/Makefile +++ graphics/py-actdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils Index: graphics/py-blockdiag/Makefile =================================================================== --- graphics/py-blockdiag/Makefile +++ graphics/py-blockdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}webcolors>=0:graphics/py-webcolors@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils @@ -33,7 +33,7 @@ OPTIONS_DEFAULT= PDF IPAFONT_RUN_DEPENDS= ${LOCALBASE}/share/font-ipa/ipag.otf:japanese/font-ipa -PDF_RUN_DEPENDS= ${PKGNAMEPREFIX}reportlab>0:print/py-reportlab +PDF_RUN_DEPENDS= ${PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} post-patch: ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/src/blockdiag/utils/bootstrap.py Index: graphics/py-blockdiagcontrib-cisco/Makefile =================================================================== --- graphics/py-blockdiagcontrib-cisco/Makefile +++ graphics/py-blockdiagcontrib-cisco/Makefile @@ -9,7 +9,7 @@ MAINTAINER= kuriyama@FreeBSD.org COMMENT= Networking shapes for blockdiag designed by Cisco -RUN_DEPENDS= ${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: graphics/py-cairo/Makefile =================================================================== --- graphics/py-cairo/Makefile +++ graphics/py-cairo/Makefile @@ -18,9 +18,12 @@ PORTSCOUT= limitw:1,even -USES= gnome pkgconfig python:2 +USES= gnome pkgconfig python USE_PYTHON= distutils USE_GNOME= cairo +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 PLIST_SUB= PORTVER=${PORTVERSION} Index: graphics/py-cairocffi/Makefile =================================================================== --- graphics/py-cairocffi/Makefile +++ graphics/py-cairocffi/Makefile @@ -13,10 +13,14 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi +py34_BROKEN= does not package +py35_BROKEN= does not package +py36_BROKEN= does not package + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} -USES= python:2+ +USES= python USE_PYTHON= autoplist distutils cffi USE_GNOME= cairo Index: graphics/py-django-easy-thumbnails/Makefile =================================================================== --- graphics/py-django-easy-thumbnails/Makefile +++ graphics/py-django-easy-thumbnails/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: graphics/py-djvulibre/Makefile =================================================================== --- graphics/py-djvulibre/Makefile +++ graphics/py-djvulibre/Makefile @@ -12,11 +12,10 @@ LICENSE= GPLv2 -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre USES= python:2 pkgconfig -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e "s|'python'|'${PYTHON_CMD}'|g" ${WRKSRC}/setup.py Index: graphics/py-editobj/Makefile =================================================================== --- graphics/py-editobj/Makefile +++ graphics/py-editobj/Makefile @@ -13,7 +13,7 @@ COMMENT= Create and display a Tkinter dialog box for editing any Python object DIST_SUBDIR= python -USES+= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= EditObj WRKSRC= ${WRKDIR}/EditObj-${PORTVERSION} Index: graphics/py-exiv2/Makefile =================================================================== --- graphics/py-exiv2/Makefile +++ graphics/py-exiv2/Makefile @@ -16,6 +16,7 @@ libboost_python.so:devel/boost-python-libs USES= python:2 scons tar:bzip2 +USE_PYTHON= flavors USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include MAKE_ARGS+= prefix=${PREFIX} use_env=1 Index: graphics/py-gd/Makefile =================================================================== --- graphics/py-gd/Makefile +++ graphics/py-gd/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libgd.so:graphics/gd -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist pythonprefix PYSETUP= setup.py Index: graphics/py-gdal/Makefile =================================================================== --- graphics/py-gdal/Makefile +++ graphics/py-gdal/Makefile @@ -27,8 +27,8 @@ SHEBANG_FILES= scripts/*.py -NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy -NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy +NUMPY_BUILD_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR} +NUMPY_RUN_DEPENDS= ${PKGNAMEPREFIX}numpy>=1.0.0,1:math/py-numpy@${FLAVOR} NUMPY_USES= fortran post-install: Index: graphics/py-gizeh/Makefile =================================================================== --- graphics/py-gizeh/Makefile +++ graphics/py-gizeh/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${FLAVOR} \ ${PYNUMPY} USES= python Index: graphics/py-glewpy/Makefile =================================================================== --- graphics/py-glewpy/Makefile +++ graphics/py-glewpy/Makefile @@ -16,9 +16,9 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Advanced OpenGL extensions to Python -BUILD_DEPENDS= pyrex>=0.9.6.2:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>=0.9.6.2:devel/pyrex@${FLAVOR} -USES= python +USES= python:2.7 USE_GL= glew USE_PYTHON= distutils Index: graphics/py-goocanvas/Makefile =================================================================== --- graphics/py-goocanvas/Makefile +++ graphics/py-goocanvas/Makefile @@ -18,9 +18,10 @@ PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.so \ libdata/pkgconfig/pygoocanvas.pc USE_GNOME= pygtk2 +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docs -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 INSTALL_TARGET= install-strip post-patch: Index: graphics/py-graphviz/Makefile =================================================================== --- graphics/py-graphviz/Makefile +++ graphics/py-graphviz/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dot:graphics/graphviz -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${FLAVOR} NO_ARCH= yes USES= python zip Index: graphics/py-graphy/Makefile =================================================================== --- graphics/py-graphy/Makefile +++ graphics/py-graphy/Makefile @@ -15,6 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python:run tar:bzip2 +USE_PYTHON= flavors PORTDOCS= README PORTEXAMPLES= * Index: graphics/py-imagesize/Makefile =================================================================== --- graphics/py-imagesize/Makefile +++ graphics/py-imagesize/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: graphics/py-imgurpython/Makefile =================================================================== --- graphics/py-imgurpython/Makefile +++ graphics/py-imgurpython/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${FLAVOR} NO_ARCH= yes USES= python Index: graphics/py-leather/Makefile =================================================================== --- graphics/py-leather/Makefile +++ graphics/py-leather/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: graphics/py-mayavi/Makefile =================================================================== --- graphics/py-mayavi/Makefile +++ graphics/py-mayavi/Makefile @@ -26,10 +26,10 @@ py27-sphinx>=1.3.1_2:textproc/py-sphinx RUN_DEPENDS= vtk6>=6.1.0_8:math/vtk6 \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage \ - ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface \ - ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath \ - ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui + ${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${FLAVOR} USES= python:-2.7 shebangfix tar:bzip2 USE_PYTHON= autoplist distutils Index: graphics/py-mcomix/Makefile =================================================================== --- graphics/py-mcomix/Makefile +++ graphics/py-mcomix/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python tar:bzip2 Index: graphics/py-nwdiag/Makefile =================================================================== --- graphics/py-nwdiag/Makefile +++ graphics/py-nwdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils Index: graphics/py-openexr/Makefile =================================================================== --- graphics/py-openexr/Makefile +++ graphics/py-openexr/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-extract: Index: graphics/py-paint/Makefile =================================================================== --- graphics/py-paint/Makefile +++ graphics/py-paint/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= EXAMPLES -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GNOME= libartlgpl2 NO_WRKSUBDIR= yes Index: graphics/py-pillow/Makefile =================================================================== --- graphics/py-pillow/Makefile +++ graphics/py-pillow/Makefile @@ -45,15 +45,15 @@ TIFF_VARS_OFF= PYDISTUTILS_BUILDARGS+=--disable-tiff TKINTER_USES= tk -TKINTER_BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKINTER_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${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 -USES?= cpe python +USES= cpe python USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: graphics/py-plotly/Makefile =================================================================== --- graphics/py-plotly/Makefile +++ graphics/py-plotly/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= python Index: graphics/py-poppler/Makefile =================================================================== --- graphics/py-poppler/Makefile +++ graphics/py-poppler/Makefile @@ -17,7 +17,8 @@ LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib GNU_CONFIGURE= yes -USES= gmake libtool pkgconfig python +USES= gmake libtool pkgconfig python:2.7 USE_GNOME= atk pygtk2 +USE_PYTHON= flavors .include Index: graphics/py-pycha/Makefile =================================================================== --- graphics/py-pycha/Makefile +++ graphics/py-pycha/Makefile @@ -18,6 +18,6 @@ OPTIONS_DEFINE= CAIRO OPTIONS_DEFAULT= CAIRO -CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo +CAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} .include Index: graphics/py-pycollada/Makefile =================================================================== --- graphics/py-pycollada/Makefile +++ graphics/py-pycollada/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.0:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python @@ -21,6 +21,6 @@ OPTIONS_DEFINE= LXML LXML_DESC= Uses lxml for XML loading, construction, and saving. -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} .include Index: graphics/py-pydot/Makefile =================================================================== --- graphics/py-pydot/Makefile +++ graphics/py-pydot/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= dot:graphics/graphviz \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.4:devel/py-pyparsing@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: graphics/py-pyembree/Makefile =================================================================== --- graphics/py-pyembree/Makefile +++ graphics/py-pyembree/Makefile @@ -14,13 +14,12 @@ BROKEN= fails to configure -BUILD_DEPENDS= cython:lang/cython \ - ${PYNUMPY} +BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libembree.so:graphics/embree RUN_DEPENDS= ${PYNUMPY} USES= localbase python:2 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython USE_GITHUB= yes GH_ACCOUNT= scopatz Index: graphics/py-pygal/Makefile =================================================================== --- graphics/py-pygal/Makefile +++ graphics/py-pygal/Makefile @@ -12,7 +12,7 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR} NO_ARCH= yes USES= python Index: graphics/py-pyganim/Makefile =================================================================== --- graphics/py-pyganim/Makefile +++ graphics/py-pyganim/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python zip Index: graphics/py-pygooglechart/Makefile =================================================================== --- graphics/py-pygooglechart/Makefile +++ graphics/py-pygooglechart/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Complete Python wrapper for the Google Chart API -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTEXAMPLES= * Index: graphics/py-pygraphviz/Makefile =================================================================== --- graphics/py-pygraphviz/Makefile +++ graphics/py-pygraphviz/Makefile @@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcgraph.so:graphics/graphviz -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py-nose@${FLAVOR} -USES?= pkgconfig python +USES= pkgconfig python USE_PYTHON= autoplist concurrent distutils PYDISTUTILS_BUILD_TARGET= build build_ext Index: graphics/py-qt4-svg/Makefile =================================================================== --- graphics/py-qt4-svg/Makefile +++ graphics/py-qt4-svg/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui svg moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: graphics/py-qt5-svg/Makefile =================================================================== --- graphics/py-qt5-svg/Makefile +++ graphics/py-qt5-svg/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui svg widgets qmake_build OPTIONS_DEFINE= API DEBUG Index: graphics/py-rabbyt/Makefile =================================================================== --- graphics/py-rabbyt/Makefile +++ graphics/py-rabbyt/Makefile @@ -13,7 +13,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fast sprite library for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GL= gl glu Index: graphics/py-sane/Makefile =================================================================== --- graphics/py-sane/Makefile +++ graphics/py-sane/Makefile @@ -14,10 +14,10 @@ COMMENT= Python bindings for Sane LIB_DEPENDS= libsane.so:graphics/sane-backends -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} DIST_SUBDIR= python -USES= python +USES= python:2.7 USE_PYTHON= distutils WRKSRC= ${WRKDIR}/${DISTNAME}/Sane Index: graphics/py-scikit-image/Makefile =================================================================== --- graphics/py-scikit-image/Makefile +++ graphics/py-scikit-image/Makefile @@ -13,23 +13,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets - -USES= cpe python + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpydoc>=0.6:textproc/py-numpydoc@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.8:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyWavelets>=0.4:math/py-PyWavelets@${FLAVOR} + +USES= cpe python:2.7 USE_GITHUB= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts Index: graphics/py-seqdiag/Makefile =================================================================== --- graphics/py-seqdiag/Makefile +++ graphics/py-seqdiag/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow \ - ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib \ - ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag +RUN_DEPENDS= ${PKGNAMEPREFIX}pillow>=2.2.1:graphics/py-pillow@${FLAVOR} \ + ${PKGNAMEPREFIX}funcparserlib>=0.3.6:devel/py-funcparserlib@${FLAVOR} \ + ${PKGNAMEPREFIX}blockdiag>=1.5.0:graphics/py-blockdiag@${FLAVOR} USES= python:-3.4 USE_PYTHON= autoplist distutils Index: graphics/py-sorl-thumbnail/Makefile =================================================================== --- graphics/py-sorl-thumbnail/Makefile +++ graphics/py-sorl-thumbnail/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} USES= python USE_PYTHON= autoplist distutils -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}@${FLAVOR} OPTIONS_DEFINE= DJANGO PDF WORD DJANGO_DESC= Enable Django @@ -30,7 +30,7 @@ .include .if ${PORT_OPTIONS:MDJANGO} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} .endif .if ${PORT_OPTIONS:MPDF} Index: graphics/py-soya3d/Makefile =================================================================== --- graphics/py-soya3d/Makefile +++ graphics/py-soya3d/Makefile @@ -14,15 +14,15 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Very high level 3D engine for Python -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} LIB_DEPENDS= libode.so:devel/ode \ libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj \ - ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu \ - ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/editobj/editor.py:graphics/py-editobj@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/tofu/client.py:net/py-tofu@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/cerealizer/__init__.py:security/py-cerealizer@${FLAVOR} -USES= gmake openal:al,alut python tar:bzip2 +USES= gmake openal:al,alut python:2.7 tar:bzip2 USE_GL= glew glu USE_PYTHON= autoplist distutils USE_SDL= sdl Index: graphics/py-stltools/Makefile =================================================================== --- graphics/py-stltools/Makefile +++ graphics/py-stltools/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= PYCAIRO DOCS EXAMPLES PYCAIRO_DESC= Use (py)Cairo to enable stl2pdf to function. -PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo +PYCAIRO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>1.8:graphics/py-cairo@${FLAVOR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} Index: graphics/py-toyplot/Makefile =================================================================== --- graphics/py-toyplot/Makefile +++ graphics/py-toyplot/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath \ - ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch \ - ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png \ - ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.8:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colormath>=2.1.1:math/py-colormath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multipledispatch>=0.4.7:devel/py-multipledispatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}png>=0.0.17:graphics/py-png@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab>=3.2.0:print/py-reportlab@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: graphics/py-traitsui/Makefile =================================================================== --- graphics/py-traitsui/Makefile +++ graphics/py-traitsui/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE_EPL= ${WRKSRC}/image_LICENSE_Eclipse.txt # See ${WRKSRC}/image_LICENSE.txt for per file license information -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: graphics/py3-cairo/Makefile =================================================================== --- graphics/py3-cairo/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Created by: Michael Johnson -# $FreeBSD$ - -PORTNAME= cairo -PORTVERSION= 1.14.1 -CATEGORIES= graphics python -MASTER_SITES= https://github.com/pygobject/pycairo/releases/download/v${PORTVERSION}/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python 3 bindings for Cairo - -LICENSE= LGPL21 MPL11 -LICENSE_COMB= multi -LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING-LGPL-2.1 -LICENSE_FILE_MPL11= ${WRKSRC}/COPYING-MPL-1.1 - -PORTSCOUT= limitw:1,even - -USES= gnome pkgconfig python:3 -USE_PYTHON= distutils -USE_GNOME= cairo - -PLIST_SUB= PORTVER=${PORTVERSION} - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cairo/_cairo.so - -.include Index: graphics/py3-cairo/distinfo =================================================================== --- graphics/py3-cairo/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1506344417 -SHA256 (pycairo-1.14.1.tar.gz) = 0d13a0a6eeaf0c357db04392943eb9b25767445608d31dde1307f003f68c5754 -SIZE (pycairo-1.14.1.tar.gz) = 154394 Index: graphics/py3-cairo/pkg-descr =================================================================== --- graphics/py3-cairo/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python 3 bindings for Cairo. - -WWW: https://github.com/pygobject/pycairo Index: graphics/py3-cairo/pkg-plist =================================================================== --- /dev/null +++ graphics/py3-cairo/pkg-plist @@ -1,10 +0,0 @@ -include/pycairo/py3cairo.h -%%PYTHON_SITELIBDIR%%/cairo/__init__.py -%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/cairo/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/cairo/_cairo.so -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%PYTHON_SITELIBDIR%%/pycairo-%%PORTVER%%-py%%PYTHON_VER%%.egg-info/top_level.txt -libdata/pkgconfig/py3cairo.pc Index: graphics/py3-imagesize/Makefile =================================================================== --- graphics/py3-imagesize/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-imagesize - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: graphics/py3-pillow/Makefile =================================================================== --- graphics/py3-pillow/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pillow - -TKINTER_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/${PYTHON_PKGNAMEPREFIX}tkinter -TKINTER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/${PYTHON_PKGNAMEPREFIX}tkinter - -USES= cpe python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: graphics/py3-pygraphviz/Makefile =================================================================== --- graphics/py3-pygraphviz/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pygraphviz - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0.10.1:devel/py3-nose - -PORTSCOUT= ignore:1 - -USES= pkgconfig python:3.4+ - -.include "${MASTERDIR}/Makefile" Index: graphics/qgis/Makefile =================================================================== --- graphics/qgis/Makefile +++ graphics/qgis/Makefile @@ -89,48 +89,48 @@ POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32 \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr \ - ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2 \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdal>=2.0.1:graphics/py-gdal@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=2-0.9.2:www/py-httplib2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=9.0.1:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.3:databases/py-psycopg2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.10:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE Index: graphics/sk1libs/Makefile =================================================================== --- graphics/sk1libs/Makefile +++ graphics/sk1libs/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= liblcms.so:graphics/lcms \ libfreetype.so:print/freetype2 -USES= jpeg python +USES= jpeg python:2.7 USE_PYTHON= distutils PYDISTUTILS_BUILD_TARGET=build_ext PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib \ Index: graphics/tilecache/Makefile =================================================================== --- graphics/tilecache/Makefile +++ graphics/tilecache/Makefile @@ -10,13 +10,13 @@ MAINTAINER= joris.dedieu@gmail.com COMMENT= Python-based WMS-C/TMS server -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR} LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils autoplist SHEBANG_FILES= tilecache.cgi tilecache.fcgi Index: graphics/uniconvertor/Makefile =================================================================== --- graphics/uniconvertor/Makefile +++ graphics/uniconvertor/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/src/GNU_GPL_v2 LICENSE_FILE_LGPL20+ = ${WRKSRC}/src/GNU_LGPL_v2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils post-install: Index: graphics/uniconvw/Makefile =================================================================== --- graphics/uniconvw/Makefile +++ graphics/uniconvw/Makefile @@ -18,9 +18,9 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sk1libs/__init__.py:graphics/sk1libs \ ${PYTHON_SITELIBDIR}/uniconvertor/__init__.py:graphics/uniconvertor \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2 + ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2@${FLAVOR} -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: graphics/variety/Makefile =================================================================== --- graphics/variety/Makefile +++ graphics/variety/Makefile @@ -14,19 +14,19 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.38:devel/py-python-distutils-extra@${FLAVOR} \ intltool-update:textproc/intltool -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo \ - ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2 \ - ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3 \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>=1.10.0:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.5.1:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=1.1.1_1:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}exiv2>=0.3.2_3:graphics/py-exiv2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject3>=3.14.0:devel/py-gobject3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=2.6.0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.4.1_1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} \ ImageMagick>=6.9.0.4,1:graphics/ImageMagick \ bash>=4.3.33:shells/bash \ ca_root_nss>=3.17.4:security/ca_root_nss \ Index: graphics/vips/Makefile =================================================================== --- graphics/vips/Makefile +++ graphics/vips/Makefile @@ -53,7 +53,7 @@ OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= docs -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_WITH= python PYTHON_CONFIGURE_ENABLE= pyvips8 PYTHON_USE= GNOME=pygobject3 Index: irc/bitlbee/Makefile =================================================================== --- irc/bitlbee/Makefile +++ irc/bitlbee/Makefile @@ -83,7 +83,7 @@ libgpg-error.so:security/libgpg-error SKYPE_CONFIGURE_ON= --skype=1 SKYPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Skype4Py>0:net-im/py-skype4py -SKYPE_USES= python +SKYPE_USES= python:2.7 TWITTER_CONFIGURE_OFF= --twitter=0 YAHOO_CONFIGURE_OFF= --yahoo=0 Index: irc/py-fishcrypt/Makefile =================================================================== --- irc/py-fishcrypt/Makefile +++ irc/py-fishcrypt/Makefile @@ -11,8 +11,8 @@ MAINTAINER= nemysis@FreeBSD.org COMMENT= FiSH/Mircryption-compatible encryption for XChat/HexChat -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= fladd @@ -20,6 +20,7 @@ GH_TAGNAME= 43554b1a USES= dos2unix python:run shebangfix +USE_PYTHON= flavors SHEBANG_FILES= fishcrypt.py NO_BUILD= yes Index: irc/py-irc/Makefile =================================================================== --- irc/py-irc/Makefile +++ irc/py-irc/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jaraco.util>0:devel/py-jaraco.util@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} USES= python shebangfix USE_PYTHON= distutils autoplist Index: irc/py-limnoria/Makefile =================================================================== --- irc/py-limnoria/Makefile +++ irc/py-limnoria/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} OPTIONS_DEFINE= ECDSA PROXY OPTIONS_DEFAULT= ECDSA ENCODING RSS TIME @@ -34,17 +34,17 @@ SQLALCHEMY_DESC= SQLAlchemy database support -ECDSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa -PROXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks +ECDSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} +PROXY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=0:net/py-pysocks@${FLAVOR} -ENCODING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet -GPG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg -RSS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser -TIME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +ENCODING_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} +GPG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-gnupg>=0:security/py-python-gnupg@${FLAVOR} +RSS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} +TIME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: irc/py-supybot/Makefile =================================================================== --- irc/py-supybot/Makefile +++ irc/py-supybot/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils PYDISTUTILS_PKGVERSION= 0.83.1+darcs PYDISTUTILS_EGGINFO= supybot-${PORTVERSION}-py${PYTHON_VER}.egg-info Index: irc/znc/Makefile =================================================================== --- irc/znc/Makefile +++ irc/znc/Makefile @@ -54,7 +54,7 @@ PYTHON_BUILD_DEPENDS= swig30>=3.0.0:devel/swig30 PYTHON_CONFIGURE_ON= --enable-python=python-${PYTHON_VER} --enable-swig PYTHON_USE= perl5=build -PYTHON_USES= perl5 python:3 +PYTHON_USES= perl5 python:3.4+ TCL_CONFIGURE_ENABLE= tcl TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR} TCL_USES= tcl Index: japanese/ibus-anthy/Makefile =================================================================== --- japanese/ibus-anthy/Makefile +++ japanese/ibus-anthy/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify GNU_CONFIGURE= yes -USES= libtool gettext gmake pkgconfig python +USES= libtool gettext gmake pkgconfig python:2.7 USE_GNOME= intltool pygtk2 LOCALBASE_REPLACE_FILES= \ Index: japanese/kana-no-quiz/Makefile =================================================================== --- japanese/kana-no-quiz/Makefile +++ japanese/kana-no-quiz/Makefile @@ -19,7 +19,7 @@ NO_ARCH= yes -USES= gettext python tar:bzip2 +USES= gettext python:2.7 tar:bzip2 USE_GNOME= pygtk2:run USE_PYTHON= distutils autoplist Index: japanese/py-mecab/Makefile =================================================================== --- japanese/py-mecab/Makefile +++ japanese/py-mecab/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= swig:devel/swig13 LIB_DEPENDS= libmecab.so:japanese/mecab -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_EGGINFO= ${PORTNAME}_python-${PORTVERSION}.post2-py${PYTHON_VER}.egg-info Index: japanese/py-tegaki-gtk/Makefile =================================================================== --- japanese/py-tegaki-gtk/Makefile +++ japanese/py-tegaki-gtk/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:japanese/zinnia -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:japanese/py-tegaki +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegaki/engine.py:japanese/py-tegaki@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_pygtk Index: japanese/py-tegaki/Makefile =================================================================== --- japanese/py-tegaki/Makefile +++ japanese/py-tegaki/Makefile @@ -14,9 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:japanese/zinnia -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/zinnia.py:japanese/py-zinnia +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/zinnia.py:japanese/py-zinnia@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_python Index: japanese/py-zinnia/Makefile =================================================================== --- japanese/py-zinnia/Makefile +++ japanese/py-zinnia/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= ${PORTNAME}_python PYDISTUTILS_PKGVERSION= 0.0.0 Index: japanese/tegaki-recognize/Makefile =================================================================== --- japanese/tegaki-recognize/Makefile +++ japanese/tegaki-recognize/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libzinnia.so:japanese/zinnia -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:japanese/py-tegaki-gtk +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:japanese/py-tegaki-gtk@${FLAVOR} OPTIONS_DEFINE= DOCS Index: japanese/tomoe/Makefile =================================================================== --- japanese/tomoe/Makefile +++ japanese/tomoe/Makefile @@ -36,7 +36,7 @@ MYSQL_CONFIGURE_WITH= mysql PYTHON_DESC= Enable Python module PYTHON_USE= GNOME=pygtk2 -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_OFF= --with-python=no RUBY_DESC= Enable Ruby module RUBY_BROKEN= Does not build Index: lang/Makefile =================================================================== --- lang/Makefile +++ lang/Makefile @@ -47,7 +47,6 @@ SUBDIR += cparser SUBDIR += csharp-mode.el SUBDIR += cython - SUBDIR += cython3 SUBDIR += diveintopython SUBDIR += dlang-tools SUBDIR += dlv Index: lang/cdent/Makefile =================================================================== --- lang/cdent/Makefile +++ lang/cdent/Makefile @@ -10,9 +10,9 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Portable Module Programming Language -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: lang/cython/Makefile =================================================================== --- lang/cython/Makefile +++ lang/cython/Makefile @@ -6,6 +6,7 @@ CATEGORIES= lang python MASTER_SITES= http://www.cython.org/release/ \ CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= Cython-${PORTVERSION} MAINTAINER= vmagerya@gmail.com @@ -14,8 +15,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python -USE_PYTHON+= autoplist distutils + +USES= python +USE_PYTHON= autoplist distutils concurrent allflavors post-install: ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/Cython \ Index: lang/cython3/Makefile =================================================================== --- lang/cython3/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -MASTERDIR= ${.CURDIR}/../cython - -PKGNAMESUFFIX= 3 - -USES= python:3.3+ -USE_PYTHON= concurrent -UNIQUE_SUFFIX= ${PKGNAMESUFFIX} - -.include "${MASTERDIR}/Makefile" Index: lang/micropython/Makefile =================================================================== --- lang/micropython/Makefile +++ lang/micropython/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS= libffi.so:devel/libffi -USES= gmake pkgconfig python:3,build readline shebangfix +USES= gmake pkgconfig python:3.4+,build readline shebangfix USE_GITHUB= yes Index: lang/py-clojure/Makefile =================================================================== --- lang/py-clojure/Makefile +++ lang/py-clojure/Makefile @@ -13,7 +13,7 @@ LICENSE= EPL -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: lang/py-hy/Makefile =================================================================== --- lang/py-hy/Makefile +++ lang/py-hy/Makefile @@ -13,15 +13,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>0:devel/py-args \ - ${PYTHON_PKGNAMEPREFIX}astor>0:devel/py-astor \ - ${PYTHON_PKGNAMEPREFIX}clint>0:devel/py-clint \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply \ - ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}args>0:devel/py-args@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}astor>0:devel/py-astor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}clint>0:devel/py-clint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rply>0:devel/py-rply@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: lang/py-qt5-qml/Makefile =================================================================== --- lang/py-qt5-qml/Makefile +++ lang/py-qt5-qml/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run network_run +USE_PYTHON= flavors USE_QT5= core gui network qml buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: lang/pypy/Makefile =================================================================== --- lang/pypy/Makefile +++ lang/pypy/Makefile @@ -93,7 +93,7 @@ .endif PYPY_VARS= PYTHON_CMD=${LOCALBASE}/bin/pypy PYPY_MINMEM_VARS= PYTHON_CMD="${SETENV} PYPY_GC_MAX_DELTA=200MB ${LOCALBASE}/bin/pypy --jit loop_longevity=300" -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycparser>=2.10:devel/py-pycparser@${PY_FLAVOR} PYTHON_USES= python:2,build DESCR= ${.CURDIR}/pkg-descr Index: lang/python-tools/Makefile =================================================================== --- lang/python-tools/Makefile +++ lang/python-tools/Makefile @@ -39,10 +39,6 @@ SCRIPT_FILES+= logmerge .endif -.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} -UNIQUE_DEFAULT_LINKS= yes -.endif - do-install: .for fname in ${SCRIPT_FILES} ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/${fname}.py \ Index: lang/python34/files/pkg-message.in =================================================================== --- lang/python34/files/pkg-message.in +++ lang/python34/files/pkg-message.in @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm -py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 -py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%% =========================================================================== Index: lang/python35/files/pkg-message.in =================================================================== --- lang/python35/files/pkg-message.in +++ lang/python35/files/pkg-message.in @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm -py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 -py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%% =========================================================================== Index: lang/python36/files/pkg-message.in =================================================================== --- lang/python36/files/pkg-message.in +++ lang/python36/files/pkg-message.in @@ -3,8 +3,8 @@ Note that some standard Python modules are provided as separate ports as they require additional dependencies. They are available as: -py%%PYTHON_SUFFIX%%-gdbm databases/py%%PYTHON_SUFFIX%%-gdbm -py%%PYTHON_SUFFIX%%-sqlite3 databases/py%%PYTHON_SUFFIX%%-sqlite3 -py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py%%PYTHON_SUFFIX%%-tkinter +py%%PYTHON_SUFFIX%%-gdbm databases/py-gdbm@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-sqlite3 databases/py-sqlite3@py%%PYTHON_SUFFIX%% +py%%PYTHON_SUFFIX%%-tkinter x11-toolkits/py-tkinter@py%%PYTHON_SUFFIX%% =========================================================================== Index: lang/tinypy/Makefile =================================================================== --- lang/tinypy/Makefile +++ lang/tinypy/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= philhassey -USES= python:build +USES= python:2.7,build USE_PYTHON= distutils noegginfo USE_GITHUB= yes Index: mail/courier-pythonfilter/Makefile =================================================================== --- mail/courier-pythonfilter/Makefile +++ mail/courier-pythonfilter/Makefile @@ -11,8 +11,8 @@ BUILD_DEPENDS= courier-config:mail/courier -USES= python -USE_PYTHON= distutils +USES= python:2.7 +USE_PYTHON= distutils concurrent optsuffix NO_ARCH= yes MAILOWN= courier @@ -60,7 +60,7 @@ PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR} -CLAMAV_CLAMD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd +CLAMAV_CLAMD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd@${FLAVOR} post-extract: ${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample Index: mail/isbg/Makefile =================================================================== --- mail/isbg/Makefile +++ mail/isbg/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= spamassassin:mail/spamassassin \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt + ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} USE_GITHUB= yes NO_ARCH= yes NO_BUILD= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: mail/mailman/Makefile =================================================================== --- mail/mailman/Makefile +++ mail/mailman/Makefile @@ -141,8 +141,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Mailman-Cgi-private.py .endif -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} pre-everything:: @${ECHO} "" Index: mail/mailpile/Makefile =================================================================== --- mail/mailpile/Makefile +++ mail/mailpile/Makefile @@ -12,17 +12,17 @@ LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/AGPLv3.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump \ - ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns \ - ${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= mailpile GH_PROJECT= Mailpile -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix python_OLD_CMD= /usr/bin/python2 SHEBANG_FILES= mailpile/contrib/gui/gui-o-matic.py \ mailpile/contrib/gui/gui-test.sh \ Index: mail/mailutils/Makefile =================================================================== --- mail/mailutils/Makefile +++ mail/mailutils/Makefile @@ -62,7 +62,7 @@ PAM_CONFIGURE_ENABLE= pam PYTHON_BUILD_DEPENDS= python-config:lang/python -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENABLE=python BDB_USES= bdb:48 Index: mail/muttils/Makefile =================================================================== --- mail/muttils/Makefile +++ mail/muttils/Makefile @@ -15,7 +15,7 @@ CHANGESET= 8bb26094df06 WRKSRC= ${WRKDIR}/blacktrash-${PORTNAME}-${CHANGESET} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTEXAMPLES= * Index: mail/offlineimap/Makefile =================================================================== --- mail/offlineimap/Makefile +++ mail/offlineimap/Makefile @@ -17,8 +17,8 @@ ## later versions have sqlite3 backend, which is recommended for local storages ## with large amount of emails ## (add additional variable to use in {BUILD|RUN}_DEPENDS per porter's hb 5.8.2) -OIMAP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +OIMAP_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} BUILD_DEPENDS= ${OIMAP_DEPENDS} RUN_DEPENDS= ${OIMAP_DEPENDS} Index: mail/postfix-policyd-spf-python/Makefile =================================================================== --- mail/postfix-policyd-spf-python/Makefile +++ mail/postfix-policyd-spf-python/Makefile @@ -15,9 +15,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \ - ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf \ - ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${FLAVOR} USES= python:2.7+ USE_PYTHON= autoplist distutils Index: mail/py-Products.MailHost/Makefile =================================================================== --- mail/py-Products.MailHost/Makefile +++ mail/py-Products.MailHost/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: mail/py-afew/Makefile =================================================================== --- mail/py-afew/Makefile +++ mail/py-afew/Makefile @@ -11,9 +11,9 @@ LICENSE= ISCL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}notmuch>=0:mail/py-notmuch \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notmuch>=0:mail/py-notmuch@${FLAVOR} \ notmuch:mail/notmuch USES= python @@ -22,13 +22,13 @@ OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT= MANPAGES -MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx +MANPAGES_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR} MANPAGES_PLIST_FILES= man/man1/afew.1.gz NO_ARCH= yes post-build-MANPAGES-on: - ${MAKE} -C ${WRKSRC}/docs man + ${MAKE} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man post-install-MANPAGES-on: ${INSTALL_MAN} ${WRKSRC}/docs/build/man/afew.1 ${STAGEDIR}${PREFIX}/man/man1/ Index: mail/py-apolicy/Makefile =================================================================== --- mail/py-apolicy/Makefile +++ mail/py-apolicy/Makefile @@ -15,9 +15,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.TXT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy \ - ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: mail/py-dkimpy/Makefile =================================================================== --- mail/py-dkimpy/Makefile +++ mail/py-dkimpy/Makefile @@ -12,7 +12,7 @@ LICENSE= ZLIB -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} NO_ARCH= yes Index: mail/py-flufl.bounce/Makefile =================================================================== --- mail/py-flufl.bounce/Makefile +++ mail/py-flufl.bounce/Makefile @@ -11,17 +11,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python:3.4+ USE_PYTHON= autoplist distutils -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: mail/py-fuglu/Makefile =================================================================== --- mail/py-fuglu/Makefile +++ mail/py-fuglu/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 RUN_DEPENDS= postfix:mail/postfix \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} -USES= python:2.4+ +USES= python:2.7 USE_PYTHON= autoplist distutils USE_RC_SUBR= fuglu @@ -36,13 +36,13 @@ SPF_DESC= Use SPF (in FuGlu) SQL_DESC= Use SQL -BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup +BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup@${FLAVOR} CLAMAV_RUN_DEPENDS= clamd:security/clamav -DKIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy -MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic +DKIM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${FLAVOR} +MAGIC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${FLAVOR} SPAMASSASSIN_RUN_DEPENDS= spamassassin>=0:mail/spamassassin -SPF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf -SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10 +SPF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR} +SQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR} post-extract: @${REINPLACE_CMD} -e "s|'/etc|'etc|g" ${WRKSRC}/setup.py Index: mail/py-libgmail/Makefile =================================================================== --- mail/py-libgmail/Makefile +++ mail/py-libgmail/Makefile @@ -13,7 +13,7 @@ BUILD_DEPENDS= py*-mechanize>=0:www/py-mechanize RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: mail/py-ppolicy/Makefile =================================================================== --- mail/py-ppolicy/Makefile +++ mail/py-ppolicy/Makefile @@ -11,10 +11,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= PPolicy is tool for extending Postfix checking capabilities -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes NO_BUILD= yes @@ -27,9 +27,9 @@ OPTIONS_DEFINE= GEOIP LDAP MYSQL DOCS OPTIONS_DEFAULT= GEOIP LDAP -GEOIP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap +GEOIP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR} +LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} post-install: ${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc Index: mail/py-premailer/Makefile =================================================================== --- mail/py-premailer/Makefile +++ mail/py-premailer/Makefile @@ -12,12 +12,12 @@ LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: mail/py-pyspf/Makefile =================================================================== --- mail/py-pyspf/Makefile +++ mail/py-pyspf/Makefile @@ -14,8 +14,8 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils @@ -28,9 +28,9 @@ .include .if ${PYTHON_REL} >= 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns@${FLAVOR} .else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} .endif # Make the tests run as a module Index: mail/py-spambayes/Makefile =================================================================== --- mail/py-spambayes/Makefile +++ mail/py-spambayes/Makefile @@ -12,9 +12,9 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \ - ${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile@${FLAVOR} USES= python:-2.7 USE_PYTHON= distutils autoplist Index: mail/py-zope.sendmail/Makefile =================================================================== --- mail/py-zope.sendmail/Makefile +++ mail/py-zope.sendmail/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: mail/pyzor/Makefile =================================================================== --- mail/pyzor/Makefile +++ mail/pyzor/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: mail/rss2email2/Makefile =================================================================== --- mail/rss2email2/Makefile +++ mail/rss2email2/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${PY_FLAVOR} USES= python:2 shebangfix SHEBANG_FILES= rss2email.py Index: mail/rss2email3/Makefile =================================================================== --- mail/rss2email3/Makefile +++ mail/rss2email3/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= wking @@ -26,18 +26,9 @@ PORTDOCS= AUTHORS CHANGELOG README OPTIONS_DEFINE= DOCS -.include - post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_MAN} ${WRKSRC}/r2e.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: mail/spamdb-curses/Makefile =================================================================== --- mail/spamdb-curses/Makefile +++ mail/spamdb-curses/Makefile @@ -13,7 +13,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/spamdb:mail/spamd -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: mail/svnmailer/Makefile =================================================================== --- mail/svnmailer/Makefile +++ mail/svnmailer/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tool to post subversion repository commit information -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 tar:bzip2 Index: mail/tmda/Makefile =================================================================== --- mail/tmda/Makefile +++ mail/tmda/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python shebangfix tar:tgz +USES= python:2.7 shebangfix tar:tgz SHEBANG_FILES= bin/tmda-* contrib/collectaddys contrib/def2html \ contrib/printcdb contrib/printdbm contrib/smtp-check-sender \ contrib/tofmipd.init Index: math/cadabra2/Makefile =================================================================== --- math/cadabra2/Makefile +++ math/cadabra2/Makefile @@ -19,8 +19,8 @@ libjsoncpp.so:devel/jsoncpp \ libgmp.so:math/gmp \ libuuid.so:misc/e2fsprogs-libuuid -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy \ - ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} OPTIONS_DEFINE= GUI OPTIONS_DEFAULT=GUI Index: math/ceres-solver/Makefile =================================================================== --- math/ceres-solver/Makefile +++ math/ceres-solver/Makefile @@ -42,7 +42,7 @@ CUSTOM_BLAS_CMAKE_BOOL= CUSTOM_BLAS DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -DOCS_USES= python:build +DOCS_USES= python:2.7,build DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES Index: math/convertall/Makefile =================================================================== --- math/convertall/Makefile +++ math/convertall/Makefile @@ -39,11 +39,4 @@ -d ${DATADIR} -f ${DATADIR_REL}) (cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE) -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: math/fityk/Makefile =================================================================== --- math/fityk/Makefile +++ math/fityk/Makefile @@ -46,7 +46,7 @@ OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENABLE= python post-patch: Index: math/gracetmpl/Makefile =================================================================== --- math/gracetmpl/Makefile +++ math/gracetmpl/Makefile @@ -10,13 +10,14 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Provide an easy way to use existing grace-files as a template -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:math/py-numarray@${FLAVOR} LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= gmake python tar:bzip2 +USES= gmake python:2.7 tar:bzip2 +USE_PYTHON= flavors MAKE_ARGS= PREFIX="${PREFIX}" \ BIN_PREFIX="${PREFIX}/bin" \ LIB_PREFIX="${PREFIX}/lib" \ Index: math/lybniz/Makefile =================================================================== --- math/lybniz/Makefile +++ math/lybniz/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GNOME= pygtk2 Index: math/nlopt/Makefile =================================================================== --- math/nlopt/Makefile +++ math/nlopt/Makefile @@ -17,8 +17,8 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libguile-2.0.so:lang/guile2 BUILD_DEPENDS= swig3.0:devel/swig30 \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy + ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.1,1:math/py-numpy@${PY_FLAVOR} GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared Index: math/plplot/Makefile =================================================================== --- math/plplot/Makefile +++ math/plplot/Makefile @@ -58,7 +58,7 @@ LUA_CMAKE_BOOL= ENABLE_lua LUA_CMAKE_ON= -DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}" -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= swig:devel/swig13 \ ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} Index: math/py-PyWavelets/Makefile =================================================================== --- math/py-PyWavelets/Makefile +++ math/py-PyWavelets/Makefile @@ -13,17 +13,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow + ${PYTHON_PKGNAMEPREFIX}pillow>=1.7:graphics/py-pillow@${FLAVOR} USE_GITHUB= yes GH_PROJECT= pywt -USES= cpe python -USE_PYTHON= autoplist distutils +USES= cpe python:2.7 +USE_PYTHON= autoplist distutils cython cython_run PYDISTUTILS_BUILD_TARGET= build build_ext PYDISTUTILS_BUILDARGS+= saveopts Index: math/py-apgl/Makefile =================================================================== --- math/py-apgl/Makefile +++ math/py-apgl/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0.7.0:science/py-scipy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: math/py-basemap/Makefile =================================================================== --- math/py-basemap/Makefile +++ math/py-basemap/Makefile @@ -14,10 +14,10 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} LIB_DEPENDS= libgeos.so:graphics/geos -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DATADIR= ${PREFIX}/share/py-${PORTNAME}-data Index: math/py-bitmath/Makefile =================================================================== --- math/py-bitmath/Makefile +++ math/py-bitmath/Makefile @@ -18,6 +18,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-4 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}progressbar231>0:misc/py-progressbar231@${FLAVOR} .include Index: math/py-bottleneck/Makefile =================================================================== --- math/py-bottleneck/Makefile +++ math/py-bottleneck/Makefile @@ -13,13 +13,12 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython OPTIONS_DEFINE= DOCS DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: math/py-colormath/Makefile =================================================================== --- math/py-colormath/Makefile +++ math/py-colormath/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.1:math/py-networkx@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: math/py-fastcluster/Makefile =================================================================== --- math/py-fastcluster/Makefile +++ math/py-fastcluster/Makefile @@ -14,7 +14,7 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} PORTDOCS= CITATION.txt \ INSTALL.txt \ Index: math/py-fiat/Makefile =================================================================== --- math/py-fiat/Makefile +++ math/py-fiat/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 Index: math/py-gato/Makefile =================================================================== --- math/py-gato/Makefile +++ math/py-gato/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LGPL.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} NO_ARCH= yes PORTEXAMPLES= * Index: math/py-gnuplot/Makefile =================================================================== --- math/py-gnuplot/Makefile +++ math/py-gnuplot/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= gnuplot:math/gnuplot \ ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: math/py-graphillion/Makefile =================================================================== --- math/py-graphillion/Makefile +++ math/py-graphillion/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-install: Index: math/py-keras/Makefile =================================================================== --- math/py-keras/Makefile +++ math/py-keras/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}theano>=0.8.0:math/py-theano@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} USES= python:-3.5 USE_PYTHON= autoplist distutils Index: math/py-luminol/Makefile =================================================================== --- math/py-luminol/Makefile +++ math/py-luminol/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.6.2,1:math/py-numpy@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: math/py-mathdom/Makefile =================================================================== --- math/py-mathdom/Makefile +++ math/py-mathdom/Makefile @@ -14,9 +14,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: math/py-matplotlib/Makefile =================================================================== --- math/py-matplotlib/Makefile +++ math/py-matplotlib/Makefile @@ -19,11 +19,11 @@ libfontconfig.so:x11-fonts/fontconfig \ libtcl86.so:lang/tcl86 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado + ${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} USE_GITHUB= yes @@ -54,8 +54,8 @@ QT5AGGBACKEND_VARS= QT5AGG_BACKEND=True QT5AGGBACKEND_VARS_OFF= QT5AGG_BACKEND=False TKAGGBACKEND_DESC= TKAgg backend support -TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter -TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +TKAGGBACKEND_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} +TKAGGBACKEND_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} TKAGGBACKEND_USES= tk:run TKAGGBACKEND_VARS= TKAGG_BACKEND=True TKAGGBACKEND_VARS_OFF= TKAGG_BACKEND=False Index: math/py-mpmath/Makefile =================================================================== --- math/py-mpmath/Makefile +++ math/py-mpmath/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gmpy.so:math/py-gmpy@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: math/py-munkres/Makefile =================================================================== --- math/py-munkres/Makefile +++ math/py-munkres/Makefile @@ -14,10 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= python -USE_PYTHON= distutils - -PLIST_FILES= %%PYTHON_SITELIBDIR%%/munkres.py \ - %%PYTHON_SITELIBDIR%%/munkres.pyc \ - %%PYTHON_SITELIBDIR%%/munkres.pyo +USE_PYTHON= distutils autoplist .include Index: math/py-networkx/Makefile =================================================================== --- math/py-networkx/Makefile +++ math/py-networkx/Makefile @@ -14,13 +14,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} -# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx \ -# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils +# ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= autoplist concurrent distutils SHEBANG_FILES= examples/graph/atlas.py \ examples/multigraph/chess_masters.py \ @@ -35,20 +35,20 @@ OPTIONS_DEFAULT= NUMPY SCIPY MPL GRAPHVIZ YAML NUMPY_DESC= Matrix representation of graphs -NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy +NUMPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9.2,1:math/py-numpy@${FLAVOR} SCIPY_DESC= Sparse matrix representation of graphs -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.15.1:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scikit-sparse>=0.2:science/py-scikit-sparse@${FLAVOR} MPL_DESC= Flexible graph rendering -MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.4.0:math/py-matplotlib@${FLAVOR} GRAPHVIZ_DESC= Additional graph layout and rendering algorithms -GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz +GRAPHVIZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>=1.2:graphics/py-pygraphviz@${FLAVOR} YAML_DESC= Reading and writing YAML files -YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} .include Index: math/py-numarray/Makefile =================================================================== --- math/py-numarray/Makefile +++ math/py-numarray/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= Examples/convolve/benchmark.py USE_PYTHON= distutils autoplist Index: math/py-numeric/Makefile =================================================================== --- math/py-numeric/Makefile +++ math/py-numeric/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Numeric Extension to Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION} Index: math/py-numexpr/Makefile =================================================================== --- math/py-numexpr/Makefile +++ math/py-numexpr/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.7,1:math/py-numpy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PYTHON= autoplist concurrent distutils Index: math/py-numpy/Makefile =================================================================== --- math/py-numpy/Makefile +++ math/py-numpy/Makefile @@ -22,7 +22,7 @@ PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 USES= fortran python USE_GITHUB= yes -USE_PYTHON= concurrent distutils py3kplist +USE_PYTHON= concurrent distutils py3kplist cython allflavors LDFLAGS+= -shared OPTIONS_DEFINE= DOCS SUITESPARSE TESTS @@ -42,9 +42,7 @@ NETLIB_LIB_DEPENDS= libcblas.so:math/cblas OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse -TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose - -BUILD_DEPENDS+= cython:lang/cython +TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} .include Index: math/py-nzmath/Makefile =================================================================== --- math/py-nzmath/Makefile +++ math/py-nzmath/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Number theory oriented calculation system -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= NZMATH Index: math/py-pandas/Makefile =================================================================== --- math/py-pandas/Makefile +++ math/py-pandas/Makefile @@ -13,27 +13,26 @@ BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} \ nosetests-${PYTHON_VER}:devel/py-nose \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables \ - ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl \ - ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd \ - ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt \ - ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} # Note: we cannot include math/py-statsmodels in TEST_DEPENDS because it # depends upon us for BUILD and RUN. @@ -68,35 +67,35 @@ HTML_DESC= HTML Parsing/Generation Add-ons EXCEL_DESC= MS Excel I/O Add-ons -MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy -BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck -NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr -BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto -TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables +MPL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} +BTLNCK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottleneck>0:math/py-bottleneck@${FLAVOR} +NUMEXPR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numexpr>=2.4.6:math/py-numexpr@${FLAVOR} +BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} +TABLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tables>=3.0.0:devel/py-tables@${FLAVOR} -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml -HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib -JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 -OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl -XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd -XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt -XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} +HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} +JINJA2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} +OPENPYXL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.2.0:textproc/py-openpyxl@${FLAVOR} +XLRD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>0:textproc/py-xlrd@${FLAVOR} +XLWT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlwt>0:textproc/py-xlwt@${FLAVOR} +XLSX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} -ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 -ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11 +ALCHEMY10_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} +ALCHEMY11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${FLAVOR} .include .if ${PORT_OPTIONS:MLXML} || ${PORT_OPTIONS:MHTML5LIB} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>0:www/py-beautifulsoup@${FLAVOR} .endif SUB_FILES= pkg-message # Official support for 2.7, 3.5, and 3.6 USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython # Uncomment the following line to enable regression-test # on a headless (X11-less) host (eg: RedPorts) Index: math/py-patsy/Makefile =================================================================== --- math/py-patsy/Makefile +++ math/py-patsy/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= multi RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: math/py-plastex/Makefile =================================================================== --- math/py-plastex/Makefile +++ math/py-plastex/Makefile @@ -9,7 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= LaTeX Document Processing Framework -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= tiarno Index: math/py-probstat/Makefile =================================================================== --- math/py-probstat/Makefile +++ math/py-probstat/Makefile @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Probability And Statistics Utils for Python -USES= python tar:tgz +USES= python:2.7 tar:tgz USE_PYTHON= distutils autoplist post-install: Index: math/py-pybloom/Makefile =================================================================== --- math/py-pybloom/Makefile +++ math/py-pybloom/Makefile @@ -10,9 +10,9 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Probabilistic data structure -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bitarray>0:devel/py-bitarray@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_GITHUB= yes Index: math/py-pymc/Makefile =================================================================== --- math/py-pymc/Makefile +++ math/py-pymc/Makefile @@ -17,15 +17,15 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} LIB_DEPENDS= liblapack.so:math/lapack \ libblas.so:math/blas RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils LDFLAGS+= -shared Index: math/py-pysparse/Makefile =================================================================== --- math/py-pysparse/Makefile +++ math/py-pysparse/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2,1:math/py-numpy@${FLAVOR} LIB_DEPENDS= liblapack.so:math/lapack \ libblas.so:math/blas \ libopenblas.so:math/openblas \ @@ -26,7 +26,7 @@ LDFLAGS+= -shared # Workaround for an obscure bug in py-numpy, see https://github.com/numpy/numpy/issues/7779 -USES= fortran python # fortran is needed for the correct build flags passed to py-numpy extension build process +USES= fortran python:2.7 # fortran is needed for the correct build flags passed to py-numpy extension build process USE_PYTHON= distutils autoplist .include Index: math/py-scientific/Makefile =================================================================== --- math/py-scientific/Makefile +++ math/py-scientific/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libnetcdf.so:science/netcdf RUN_DEPENDS= ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} Index: math/py-statsmodels/Makefile =================================================================== --- math/py-statsmodels/Makefile +++ math/py-statsmodels/Makefile @@ -12,19 +12,18 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \ - ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${FLAVOR} RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \ - ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}patsy>0:math/py-patsy@${FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES USES= python shebangfix -USE_PYTHON= autoplist distutils concurrent +USE_PYTHON= autoplist distutils concurrent cython USE_GITHUB= yes GH_TAGNAME= 8e812cd SHEBANG_FILES= tools/*.py statsmodels/datasets/*/data.py statsmodels/tools/print_version.py \ Index: math/py-sympy/Makefile =================================================================== --- math/py-sympy/Makefile +++ math/py-sympy/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpmath>=0.19:math/py-mpmath@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -20,7 +20,7 @@ OPTIONS_DEFINE= PYGLET PYGLET_DESC= Enable plotting support -PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet +PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${FLAVOR} post-patch: @${REINPLACE_CMD} -e "s#share/man/man1#man/man1#" ${WRKSRC}/setup.py Index: math/py-theano/Makefile =================================================================== --- math/py-theano/Makefile +++ math/py-theano/Makefile @@ -13,7 +13,7 @@ COMMENT= Optimizing compiler for evaluating math expressions on CPUs and GPUs RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${FLAVOR} USES= compiler:openmp python USE_PYTHON= concurrent distutils autoplist Index: math/py-yt/Makefile =================================================================== --- math/py-yt/Makefile +++ math/py-yt/Makefile @@ -13,19 +13,18 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.txt -BUILD_DEPENDS= cython:lang/cython \ +BUILD_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR} +RUN_DEPENDS= isympy:math/py-sympy@${FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree -RUN_DEPENDS= isympy:math/py-sympy \ - ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib \ + ${PYTHON_PKGNAMEPREFIX}pyembree>0:graphics/py-pyembree@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.5.3:math/py-matplotlib@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=1.0:devel/ipython LIB_DEPENDS= libembree.so:graphics/embree \ libomp.so:devel/openmp -USES= dos2unix localbase python:-3.5 -USE_PYTHON= autoplist distutils +USES= dos2unix localbase python:2.7 +USE_PYTHON= autoplist distutils cython post-patch: @${REINPLACE_CMD} -e "s|check_for_pyembree() is not None|True|; s|check_for_openmp() is True|True|" \ Index: math/qtiplot/Makefile =================================================================== --- math/qtiplot/Makefile +++ math/qtiplot/Makefile @@ -37,9 +37,9 @@ DOCS_USE= QT4=assistant-adp_run PYTHON_DESC= Python scripting support -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui -PYTHON_RUN_DEPENDS:= ${PYTHON_BUILD_DEPENDS} +PYTHON_RUN_DEPENDS= ${PYTHON_BUILD_DEPENDS} PYTHON_CONFIGURE_ENV= PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \ PYTHON_VERSION=${PYTHON_VERSION} Index: math/rpcalc/Makefile =================================================================== --- math/rpcalc/Makefile +++ math/rpcalc/Makefile @@ -34,11 +34,4 @@ -d ${DATADIR} -f ${DATADIR_REL}) (cd ${STAGEDIR}${DOCSDIR} && ${RM} INSTALL LICENSE) -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: math/rpy/Makefile =================================================================== --- math/rpy/Makefile +++ math/rpy/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libR.so:math/R RUN_DEPENDS= ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist LDFLAGS+= -L${LOCALBASE}/lib/R/modules -L${LOCALBASE}/lib/R/lib Index: math/rpy2/Makefile =================================================================== --- math/rpy2/Makefile +++ math/rpy2/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYNUMPY} USES= fortran python readline -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix LDFLAGS+= -Wl,--as-needed pre-configure: Index: math/vtk5/Makefile =================================================================== --- math/vtk5/Makefile +++ math/vtk5/Makefile @@ -138,7 +138,7 @@ Run make config again and enable the SHARED option .endif USES+= python -USE_PYTHON= distutils +USE_PYTHON= distutils noflavors PYDISTUTILS_PKGNAME= VTK # INSTALLS_EGGINFO support has been removed # INSTALLS_EGGINFO= yes Index: math/vtk6/Makefile =================================================================== --- math/vtk6/Makefile +++ math/vtk6/Makefile @@ -178,13 +178,14 @@ .endif .if ${PORT_OPTIONS:MPYTHON} -USES+= python +USES+= python:2.7 +USE_PYTHON= flavors CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=${PYTHONPREFIX_SITELIBDIR} \ -DModule_vtkRenderingMatplotlib:BOOL=ON \ -DModule_vtkPythonInterpreter:BOOL=ON PLIST_SUB+= PYTHON="" -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib +RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${FLAVOR} .else CMAKE_ARGS+= -DVTK_WRAP_PYTHON:BOOL=OFF PLIST_SUB+= PYTHON="@comment " Index: math/z3/Makefile =================================================================== --- math/z3/Makefile +++ math/z3/Makefile @@ -28,8 +28,8 @@ PYTHON_DESC= Enable python bindings PYTHON_CONFIGURE_ON= --python -PYTHON_USES= python -PYTHON_USES_OFF= python:build +PYTHON_USES= python:2.7 +PYTHON_USES_OFF= python:2.7,build STATIC_DESC= Build static z3 library STATIC_CONFIGURE_ON= --staticlib Index: misc/Makefile =================================================================== --- misc/Makefile +++ misc/Makefile @@ -398,8 +398,6 @@ SUBDIR += py-spdx-lookup SUBDIR += py-tqdm SUBDIR += py-yolk - SUBDIR += py3-pexpect - SUBDIR += py3-tqdm SUBDIR += pylize SUBDIR += qbrew SUBDIR += qlas Index: misc/fbless/Makefile =================================================================== --- misc/fbless/Makefile +++ misc/fbless/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GITHUB= yes GH_ACCOUNT= matimatik Index: misc/iso-codes/Makefile =================================================================== --- misc/iso-codes/Makefile +++ misc/iso-codes/Makefile @@ -11,8 +11,10 @@ LICENSE= LGPL21 -USES= gettext gmake pathfix python:3,build tar:xz +USES= gettext gmake pathfix python:3.4+,build tar:xz GNU_CONFIGURE= yes NO_ARCH= yes +BINARY_ALIAS= python3=${PYTHON_VERSION} + .include Index: misc/metalink-editor/Makefile =================================================================== --- misc/metalink-editor/Makefile +++ misc/metalink-editor/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/license.txt -USES= dos2unix python zip +USES= dos2unix python:2.7 zip DOS2UNIX_REGEX= .*\.txt NO_WRKSUBDIR= yes USE_PYTHON= distutils Index: misc/py-YABT/Makefile =================================================================== --- misc/py-YABT/Makefile +++ misc/py-YABT/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= General Purpose Braille Translation System -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: misc/py-cinder/Makefile =================================================================== --- misc/py-cinder/Makefile +++ misc/py-cinder/Makefile @@ -12,72 +12,72 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.7:net/py-ipaddress \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep \ - ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports \ - ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects \ - ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \ - ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient \ - ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \ - ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \ - ${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware \ - ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick \ - ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win \ - ${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz \ - ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR} \ + ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3.2:devel/py-greenlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PY_IPADDRESS} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.reports>=0.6.0:devel/py-oslo.reports@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.rootwrap>=5.0.0:devel/py-oslo.rootwrap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.versionedobjects>=1.13.0:devel/py-oslo.versionedobjects@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>=2.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-barbicanclient>=4.0.0:net/py-python-barbicanclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rtslib-fb>=0:devel/py-rtslib-fb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.vmware>=2.11.0:devel/py-oslo.vmware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-brick>=1.6.1:devel/py-os-brick@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-win>=0.2.3:devel/py-os-win@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tooz>=1.28.0:devel/py-tooz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.4.1:www/py-google-api-python-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${FLAVOR} EXTRA_PATCHES= ${FILESDIR}/01-remotefs.patch:-p1 \ ${FILESDIR}/02-nfs.patch:-p1 NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USE_RC_SUBR= cinder-api \ Index: misc/py-crudini/Makefile =================================================================== --- misc/py-crudini/Makefile +++ misc/py-crudini/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Utility for manipulating ini files -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iniparse>=0.3.2:devel/py-iniparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iniparse>=0.3.2:devel/py-iniparse@${FLAVOR} NO_ARCH= yes Index: misc/py-fuzzy/Makefile =================================================================== --- misc/py-fuzzy/Makefile +++ misc/py-fuzzy/Makefile @@ -13,13 +13,11 @@ LICENSE= MIT ART20 LICENSE_COMB= multi -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm \ - cython:lang/cython -RUN_DEPENDS= cython:lang/cython -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython cython_run do-test: @cd ${WRKSRC} && ${PYTHON_CMD} -m pytest Index: misc/py-glance/Makefile =================================================================== --- misc/py-glance/Makefile +++ misc/py-glance/Makefile @@ -13,54 +13,54 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist \ - ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ - ${PYTHON_PKGNAMEPREFIX}wsme>=0.8:devel/py-wsme \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying \ - ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \ - ${PYTHON_PKGNAMEPREFIX}glance-store>=0.18.0:devel/py-glance-store \ - ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.3.1:devel/py-semantic_version \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}cursive>=0.1.1:devel/py-cursive \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.7.5:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futurist>=0:devel/py-futurist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}taskflow>=1.26.0:devel/py-taskflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wsme>=0.8:devel/py-wsme@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}glance-store>=0.18.0:devel/py-glance-store@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.3.1:devel/py-semantic_version@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cursive>=0.1.1:devel/py-cursive@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}monotonic>=0.6:devel/py-monotonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils noegginfo USE_RC_SUBR= glance-api glance-registry glance-scrubber glance-glare Index: misc/py-osd/Makefile =================================================================== --- misc/py-osd/Makefile +++ misc/py-osd/Makefile @@ -13,7 +13,7 @@ COMMENT= Python wrapper for osd, for displaying text on your X display LIB_DEPENDS= libxosd.so:misc/xosd -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: misc/py-pexpect/Makefile =================================================================== --- misc/py-pexpect/Makefile +++ misc/py-pexpect/Makefile @@ -12,9 +12,9 @@ LICENSE= ISCL -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py-ptyprocess +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py-ptyprocess@${FLAVOR} -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: misc/py-pyprind/Makefile =================================================================== --- misc/py-pyprind/Makefile +++ misc/py-pyprind/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -24,7 +24,7 @@ OPTIONS_DEFINE= PSUTIL PSUTIL_DESC= Support monitoring CPU and memory usage -PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil +PSUTIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${FLAVOR} do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Index: misc/py-qt4-demo/Makefile =================================================================== --- misc/py-qt4-demo/Makefile +++ misc/py-qt4-demo/Makefile @@ -16,7 +16,7 @@ NO_BUILD= yes USES= python pyqt:4 -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors EXAMPLESDIR= ${PREFIX}/share/examples/py-qt4 Index: misc/py-qt4-doc/Makefile =================================================================== --- misc/py-qt4-doc/Makefile +++ misc/py-qt4-doc/Makefile @@ -17,6 +17,7 @@ USES= python pyqt:4 USE_PYQT= # +USE_PYTHON= flavors DOCSDIR= ${PREFIX}/share/doc/py-qt4 Index: misc/py-qt5-demo/Makefile =================================================================== --- misc/py-qt5-demo/Makefile +++ misc/py-qt5-demo/Makefile @@ -22,7 +22,7 @@ sql_run svg_run test_run webkit_run xml_run \ xmlpatterns_run sip_run qscintilla2_run \ printsupport_run serialport_run webkitwidgets_run widgets_run -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors EXAMPLESDIR= ${PREFIX}/share/examples/py-qt5 Index: misc/py-qt5-doc/Makefile =================================================================== --- misc/py-qt5-doc/Makefile +++ misc/py-qt5-doc/Makefile @@ -17,6 +17,7 @@ USES= python pyqt:5 USE_PYQT= # +USE_PYTHON= flavors DOCSDIR= ${PREFIX}/share/doc/py-qt5 Index: misc/py-socli/Makefile =================================================================== --- misc/py-socli/Makefile +++ misc/py-socli/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}stackexchange>=0:devel/py-stackexchange \ - ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stackexchange>=0:devel/py-stackexchange@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils USE_GITHUB= yes Index: misc/py-spdx-lookup/Makefile =================================================================== --- misc/py-spdx-lookup/Makefile +++ misc/py-spdx-lookup/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx@${FLAVOR} USES= python:3.3+ USE_PYTHON= autoplist distutils Index: misc/py-tqdm/Makefile =================================================================== --- misc/py-tqdm/Makefile +++ misc/py-tqdm/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT MPL20 LICENSE_COMB= multi -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: misc/py3-pexpect/Makefile =================================================================== --- misc/py3-pexpect/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pexpect - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>=0:sysutils/py3-ptyprocess - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: misc/py3-tqdm/Makefile =================================================================== --- misc/py3-tqdm/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tqdm - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: misc/pylize/Makefile =================================================================== --- misc/pylize/Makefile +++ misc/pylize/Makefile @@ -13,9 +13,9 @@ COMMENT= Presentation generation tool BUILD_DEPENDS= python:lang/python \ - ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy + ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 tar:bzip2 Index: misc/wotsap/Makefile =================================================================== --- misc/wotsap/Makefile +++ misc/wotsap/Makefile @@ -11,7 +11,7 @@ MAINTAINER= danilo@FreeBSD.org COMMENT= Web of trust statistics and pathfinder -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} USES= python:2,run shebangfix NO_BUILD= yes Index: multimedia/Makefile =================================================================== --- multimedia/Makefile +++ multimedia/Makefile @@ -340,7 +340,6 @@ SUBDIR += py-soco SUBDIR += py-subliminal SUBDIR += py-tvnamer - SUBDIR += py3-gstreamer1 SUBDIR += pyjama SUBDIR += pymp SUBDIR += qmmp Index: multimedia/freevo/Makefile =================================================================== --- multimedia/freevo/Makefile +++ multimedia/freevo/Makefile @@ -16,15 +16,15 @@ mencoder:multimedia/mencoder \ aumix:audio/aumix \ tv_cat:textproc/p5-xmltv \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface \ - ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base \ - ${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2 \ - ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata \ - ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 \ - ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0_1:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/kaa/imlib2/__init__.py:multimedia/py-kaa-imlib2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/kaa/metadata/__init__.py:multimedia/py-kaa-metadata@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:math/py-numeric@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} FREEVO_USER= freevo FREEVO_GROUP= ${FREEVO_USER} @@ -33,7 +33,7 @@ USERS= ${FREEVO_USER} GROUPS= ${FREEVO_GROUP} -SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAULT_VERSION} \ +SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} \ PORTVERSION=${PORTVERSION} \ FREEVO_HOME=${FREEVO_HOME} SUB_FILES= pkg-message pkg-deinstall Index: multimedia/freevo/files/freevo.in =================================================================== --- multimedia/freevo/files/freevo.in +++ multimedia/freevo/files/freevo.in @@ -30,7 +30,7 @@ freevo_dir=`pw usershow ${freevo_user} | awk -F: '{print $9}'` command="%%PREFIX%%/bin/freevo" -command_interpreter="%%PREFIX%%/bin/%%PYTHON_VERSION%%" +command_interpreter="%%PYTHON_CMD%%" # freevo needs PATH set so it can determine python version export PATH=/bin:/usr/bin:%%PREFIX%%/bin:${freevo_dir}/bin Index: multimedia/gaupol/Makefile =================================================================== --- multimedia/gaupol/Makefile +++ multimedia/gaupol/Makefile @@ -20,7 +20,7 @@ USE_GNOME= pygtk2 intltool USE_PYTHON= distutils -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 INSTALLS_ICONS= yes NO_ARCH= yes Index: multimedia/gdvrecv/Makefile =================================================================== --- multimedia/gdvrecv/Makefile +++ multimedia/gdvrecv/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_GNOME= pygtk2 USE_PYTHON= distutils DESKTOP_ENTRIES="Capture Video" \ Index: multimedia/gpodder/Makefile =================================================================== --- multimedia/gpodder/Makefile +++ multimedia/gpodder/Makefile @@ -14,12 +14,12 @@ BUILD_DEPENDS= intltool-extract:textproc/intltool \ help2man:misc/help2man -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib \ - ${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:devel/py-mygpoclient \ - ${PYTHON_PKGNAMEPREFIX}podcastparser>0:devel/py-podcastparser \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:devel/py-mygpoclient@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}podcastparser>0:devel/py-podcastparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3@${PY_FLAVOR} OPTIONS_DEFINE= GTK2 NOTIFY MUTAGEN OGG2MP3 OPTIONS_DEFAULT= GTK2 @@ -27,8 +27,8 @@ MUTAGEN_DESC= Allow metadata manipulation OGG2MP3_DESC= Ogg Vorbis conversion to MP3 support OPTIONS_EXCLUDE= NLS -NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify -MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen +NOTIFY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${PY_FLAVOR} +MUTAGEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} OGG2MP3_RUN_DEPENDS= lame:audio/lame \ oggdec:audio/vorbis-tools Index: multimedia/gstreamer1-plugins-gnonlin/Makefile =================================================================== --- multimedia/gstreamer1-plugins-gnonlin/Makefile +++ multimedia/gstreamer1-plugins-gnonlin/Makefile @@ -10,7 +10,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= GStreamer lib for writing non-linear audio and video -USES= libtool pkgconfig python:3,build tar:xz +USES= libtool pkgconfig python:3.4+,build tar:xz GNU_CONFIGURE= yes USE_GSTREAMER1= good INSTALL_TARGET= install-strip Index: multimedia/kodi/Makefile =================================================================== --- multimedia/kodi/Makefile +++ multimedia/kodi/Makefile @@ -57,7 +57,7 @@ libvorbis.so:audio/libvorbis \ libxslt.so:textproc/libxslt \ libyajl.so:devel/yajl -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 KODI_ARCH_i386= x86 Index: multimedia/libkate/Makefile =================================================================== --- multimedia/libkate/Makefile +++ multimedia/libkate/Makefile @@ -40,7 +40,7 @@ .if ${PORT_OPTIONS:MKATEDJ} RUN_DEPENDS= ${LOCALBASE}/bin/oggz:audio/liboggz -USES+= python shebangfix +USES+= python:2.7 shebangfix SHEBANG_FILES= tools/KateDJ/KateDJ USE_WX= 3.0+ WX_COMPS= wx python:lib Index: multimedia/livestreamer/Makefile =================================================================== --- multimedia/livestreamer/Makefile +++ multimedia/livestreamer/Makefile @@ -15,10 +15,10 @@ LICENSE_COMB= multi RUN_DEPENDS= rtmpdump:multimedia/rtmpdump \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}futures>=0:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PY_FUTURES} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}librtmp>=0:multimedia/py-librtmp@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: multimedia/mimms/Makefile =================================================================== --- multimedia/mimms/Makefile +++ multimedia/mimms/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libmms.so:net/libmms -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils PYDISTUTILS_PKGVERSION= 3.2 NO_ARCH= yes Index: multimedia/miro/Makefile =================================================================== --- multimedia/miro/Makefile +++ multimedia/miro/Makefile @@ -13,29 +13,29 @@ LICENSE= GPLv2 -BUILD_DEPENDS= pyrexc:devel/pyrex \ - ${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/webkit/__init__.py:www/py-webkitgtk@${FLAVOR} \ update-mime-database:misc/shared-mime-info \ ${LOCALBASE}/include/boost/numeric/ublas/matrix.hpp:devel/boost-libs \ ${LOCALBASE}/include/taglib/taglib.h:audio/taglib LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libsqlite3.so:databases/sqlite3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus \ - ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/glib.py:devel/py-dbus@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:devel/py-notify@${FLAVOR} \ ${PYTHON_SITELIBDIR}/libtorrent.so:net-p2p/libtorrent-rasterbar-python \ - ${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk \ - ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2 \ - ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \ - ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen + ${PYTHON_SITELIBDIR}/webkit/webkit.so:www/py-webkitgtk@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/gtk-2.0/gconf.so:x11-toolkits/py-gnome2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/mutagen/__init__.py:audio/py-mutagen@${FLAVOR} BUILD_WRKSRC= ${WRKSRC}/linux INSTALL_WRKSRC= ${WRKSRC}/linux USE_GNOME= gconf2 gtk20 USE_GSTREAMER= python gconf -USES= gettext gmake pkgconfig desktop-file-utils python shared-mime-info shebangfix +USES= gettext gmake pkgconfig desktop-file-utils python:2.7 shared-mime-info shebangfix SHEBANG_FILES= resources/testdata/7digital-replies/generate.py \ resources/testdata/echonest-replies/generate.py USE_PYTHON= distutils Index: multimedia/mmpython/Makefile =================================================================== --- multimedia/mmpython/Makefile +++ multimedia/mmpython/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libdvdread.so:multimedia/libdvdread RUN_DEPENDS= lsdvd:multimedia/lsdvd -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: multimedia/mps-youtube/Makefile =================================================================== --- multimedia/mps-youtube/Makefile +++ multimedia/mps-youtube/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 RUN_DEPENDS= ca_root_nss>=3.17.3:security/ca_root_nss \ - ${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:www/py-pafy + ${PYTHON_PKGNAMEPREFIX}pafy>=0.5.0:www/py-pafy@${FLAVOR} CONVERTER_DESC= Converter to MP3 and other formats @@ -39,16 +39,9 @@ SUB_FILES= ${PORTNAME} USES= python:3.3+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix post-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: multimedia/openshot/Makefile =================================================================== --- multimedia/openshot/Makefile +++ multimedia/openshot/Makefile @@ -14,11 +14,11 @@ RUN_DEPENDS= ffmpeg:multimedia/ffmpeg \ frei0r-plugins>=0:graphics/frei0r-plugins \ - ${PYTHON_PKGNAMEPREFIX}goocanvas>=0:graphics/py-goocanvas \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}mlt>=0:multimedia/py-mlt \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \ + ${PYTHON_PKGNAMEPREFIX}goocanvas>=0:graphics/py-goocanvas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mlt>=0:multimedia/py-mlt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} \ scrollkeeper-install:textproc/rarian \ sox:audio/sox Index: multimedia/photofilmstrip/Makefile =================================================================== --- multimedia/photofilmstrip/Makefile +++ multimedia/photofilmstrip/Makefile @@ -14,11 +14,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} RUN_DEPENDS= mencoder:multimedia/mencoder \ mplayer:multimedia/mplayer -USES= python gettext +USES= python:2.7 gettext USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python:lib Index: multimedia/pitivi/Makefile =================================================================== --- multimedia/pitivi/Makefile +++ multimedia/pitivi/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= py*-zope.interface>=0:devel/py-zope.interface \ ${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas -USES= gettext gmake localbase pkgconfig python shebangfix tar:bzip2 +USES= gettext gmake localbase pkgconfig python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= bin/pitivi.in USE_GNOME= intltool pygtk2 USE_GSTREAMER= gnonlin python good Index: multimedia/plexpy/Makefile =================================================================== --- multimedia/plexpy/Makefile +++ multimedia/plexpy/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USE_RC_SUBR= ${PORTNAME} Index: multimedia/py-cec/Makefile =================================================================== --- multimedia/py-cec/Makefile +++ multimedia/py-cec/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libcec.so:multimedia/libcec -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist CPPFLAGS+= -I${LOCALBASE}/include Index: multimedia/py-gstreamer/Makefile =================================================================== --- multimedia/py-gstreamer/Makefile +++ multimedia/py-gstreamer/Makefile @@ -16,14 +16,15 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR} PORTSCOUT= limit:0\.10\..* USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2 USE_GNOME= pygobject USE_GSTREAMER= yes +USE_PYTHON= flavors GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= VERSION="${GST_VERSION}" Index: multimedia/py-gstreamer1/Makefile =================================================================== --- multimedia/py-gstreamer1/Makefile +++ multimedia/py-gstreamer1/Makefile @@ -10,15 +10,23 @@ DISTNAME= gst-python-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org -COMMENT= GStreamer python 2 bindings +COMMENT= GStreamer python bindings LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= limitw:1,even -USES= gmake libtool localbase pathfix pkgconfig python:2.7 tar:xz +USES= gmake libtool localbase pathfix pkgconfig python tar:xz +.if ${FLAVOR:Upy27:Mpy2*} USE_GNOME= pygobject3 +.else +USE_GNOME= py3gobject3 +.endif +py34_PLIST= ${.CURDIR}/pkg-plist-py3 +py35_PLIST= ${.CURDIR}/pkg-plist-py3 +py36_PLIST= ${.CURDIR}/pkg-plist-py3 +USE_PYTHON= flavors USE_GSTREAMER1= yes GNU_CONFIGURE= yes PLIST_SUB= VERSION="${GST_VERSION}" Index: multimedia/py-guessit/Makefile =================================================================== --- multimedia/py-guessit/Makefile +++ multimedia/py-guessit/Makefile @@ -12,9 +12,9 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.5:devel/py-babelfish \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}rebulk>=0.9.0:devel/py-rebulk +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.5:devel/py-babelfish@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rebulk>=0.9.0:devel/py-rebulk@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: multimedia/py-kaa-base/Makefile =================================================================== --- multimedia/py-kaa-base/Makefile +++ multimedia/py-kaa-base/Makefile @@ -11,11 +11,11 @@ MAINTAINER= fbsd@opal.com COMMENT= Kaa Media Repository -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_GNOME= glib20 USE_PYTHON= distutils autoplist Index: multimedia/py-kaa-imlib2/Makefile =================================================================== --- multimedia/py-kaa-imlib2/Makefile +++ multimedia/py-kaa-imlib2/Makefile @@ -11,11 +11,11 @@ MAINTAINER= fbsd@opal.com COMMENT= Kaa Media Repository - imlib2 wrapper for python -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/kaa/__init__.py:multimedia/py-kaa-base@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libImlib2.so:graphics/imlib2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: multimedia/py-kaa-metadata/Makefile =================================================================== --- multimedia/py-kaa-metadata/Makefile +++ multimedia/py-kaa-metadata/Makefile @@ -12,8 +12,8 @@ COMMENT= Kaa Media Repository - media file metadata parser LIB_DEPENDS= libdvdread.so:multimedia/libdvdread -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base \ - ${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 Index: multimedia/py-librtmp/Makefile =================================================================== --- multimedia/py-librtmp/Makefile +++ multimedia/py-librtmp/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= librtmp.so:multimedia/librtmp -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=0:devel/py-cffi@${FLAVOR} CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -26,7 +26,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=0:devel/py-singledispatch@${FLAVOR} .endif .include Index: multimedia/py-mlt/Makefile =================================================================== --- multimedia/py-mlt/Makefile +++ multimedia/py-mlt/Makefile @@ -8,6 +8,7 @@ BUILD_DEPENDS= python:lang/python USES= python:2 +USE_PYTHON= flavors MASTERDIR= ${.CURDIR:H}/mlt SLAVEPORT= swig Python Index: multimedia/py-moviepy/Makefile =================================================================== --- multimedia/py-moviepy/Makefile +++ multimedia/py-moviepy/Makefile @@ -14,14 +14,14 @@ LICENSE_FILE= ${WRKSRC}/LICENCE.txt RUN_DEPENDS= convert:graphics/ImageMagick \ - ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm \ - ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio \ - ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>0:misc/py-tqdm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}imageio>0:graphics/py-imageio@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: multimedia/py-openlp/Makefile =================================================================== --- multimedia/py-openlp/Makefile +++ multimedia/py-openlp/Makefile @@ -12,20 +12,20 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enchant>0:textproc/py-enchant@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.6.1:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ unoconv:textproc/unoconv -USES= desktop-file-utils pyqt:4 python +USES= desktop-file-utils pyqt:4 python:2.7 USE_PYQT= core gui \ network_run opengl_run phonon_run svg_run test_run webkit_run USE_PYTHON= distutils autoplist Index: multimedia/py-periscope/Makefile =================================================================== --- multimedia/py-periscope/Makefile +++ multimedia/py-periscope/Makefile @@ -17,12 +17,12 @@ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PYTHON= distutils autoplist NO_WRKSUBDIR= yes -USES= desktop-file-utils python +USES= desktop-file-utils python:2.7 OPTIONS_DEFINE= UNRAR OPTIONS_DEFAULT= UNRAR Index: multimedia/py-pretty_midi/Makefile =================================================================== --- multimedia/py-pretty_midi/Makefile +++ multimedia/py-pretty_midi/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}mido>=1.1.16:multimedia/py-mido@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: multimedia/py-qt4-multimedia/Makefile =================================================================== --- multimedia/py-qt4-multimedia/Makefile +++ multimedia/py-qt4-multimedia/Makefile @@ -12,6 +12,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui multimedia moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: multimedia/py-qt4-phonon/Makefile =================================================================== --- multimedia/py-qt4-phonon/Makefile +++ multimedia/py-qt4-phonon/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui phonon moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: multimedia/py-qt5-multimedia/Makefile =================================================================== --- multimedia/py-qt5-multimedia/Makefile +++ multimedia/py-qt5-multimedia/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run network_run +USE_PYTHON= flavors USE_QT5= core gui multimedia network qmake_build OPTIONS_DEFINE= API DEBUG Index: multimedia/py-qt5-multimediawidgets/Makefile =================================================================== --- multimedia/py-qt5-multimediawidgets/Makefile +++ multimedia/py-qt5-multimediawidgets/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run multimedia_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui multimedia network widgets qmake_build OPTIONS_DEFINE= API DEBUG Index: multimedia/py-soco/Makefile =================================================================== --- multimedia/py-soco/Makefile +++ multimedia/py-soco/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= SoCo Index: multimedia/py-subliminal/Makefile =================================================================== --- multimedia/py-subliminal/Makefile +++ multimedia/py-subliminal/Makefile @@ -12,22 +12,22 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme \ - ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt \ - ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.0:devel/py-dogpile.cache \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/py-appdirs \ - ${PYTHON_PKGNAMEPREFIX}rarfile>=2.7:archivers/py-rarfile \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2012c:devel/py-pytz - -USES= python:2.7+ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}enzyme>=0.4.1:multimedia/py-enzyme@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=4.0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.0.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=2.3.0:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysrt>=1.0.1:textproc/py-pysrt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}babelfish>=0.5.2:devel/py-babelfish@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.0:devel/py-dogpile.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}appdirs>=1.3:devel/py-appdirs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rarfile>=2.7:archivers/py-rarfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2012c:devel/py-pytz@${FLAVOR} + +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes @@ -35,7 +35,7 @@ .include .if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} .endif .include Index: multimedia/py-tvnamer/Makefile =================================================================== --- multimedia/py-tvnamer/Makefile +++ multimedia/py-tvnamer/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tvdb_api>=1.5:www/py-tvdb_api@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: multimedia/py3-gstreamer1/Makefile =================================================================== --- multimedia/py3-gstreamer1/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Created by: Koop Mast -# $FreeBSD$ - -PORTNAME= gstreamer -PORTVERSION= 1.12.3 -CATEGORIES= multimedia python -MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-python/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 1 -DISTNAME= gst-python-${PORTVERSION} - -MAINTAINER= multimedia@FreeBSD.org -COMMENT= GStreamer python 3 bindings - -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING - -PORTSCOUT= limitw:1,even - -USES= gmake libtool localbase pathfix pkgconfig python:3.6+ tar:xz -USE_GNOME= py3gobject3 -USE_GSTREAMER1= yes -GNU_CONFIGURE= yes -PLIST_SUB= VERSION="${GST_VERSION}" -INSTALL_TARGET= install-strip - -.include Index: multimedia/py3-gstreamer1/distinfo =================================================================== --- multimedia/py3-gstreamer1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1506168993 -SHA256 (gst-python-1.12.3.tar.xz) = c3f529dec1294633132690806703b80bad5752eff482eaf81f209c2aba012ba7 -SIZE (gst-python-1.12.3.tar.xz) = 388220 Index: multimedia/py3-gstreamer1/pkg-descr =================================================================== --- multimedia/py3-gstreamer1/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -gst-python provides a convenient wrapper for the GStreamer library for -use in Python programs, and takes care of many of the boring details -such as managing memory and type casting. - -WWW: http://gstreamer.freedesktop.org/ Index: multimedia/py3-gstreamer1/pkg-plist =================================================================== --- /dev/null +++ multimedia/py3-gstreamer1/pkg-plist @@ -1,8 +0,0 @@ -lib/gstreamer-1.0/libgstpythonplugin.so -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/Gst.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__pycache__/GstPbutils.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% -%%PYTHON_SITELIBDIR%%/gi/overrides/Gst.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GstPbutils.py -%%PYTHON_SITELIBDIR%%/gi/overrides/_gi_gst.so Index: multimedia/quodlibet/Makefile =================================================================== --- multimedia/quodlibet/Makefile +++ multimedia/quodlibet/Makefile @@ -13,16 +13,16 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs \ - ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}musicbrainzngs>=0.4:audio/py-musicbrainzngs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR} \ ${LOCALBASE}/libexec/notification-daemon:deskutils/notification-daemon LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 USE_PYTHON= distutils autoplist USE_GNOME= gtk30 intltool pygobject3 -USES= desktop-file-utils display gettext python +USES= desktop-file-utils display gettext python:2.7 PYDISTUTILS_INSTALLNOSINGLE= yes USE_GSTREAMER1= good @@ -49,10 +49,10 @@ AAC_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 AAC_USE= GSTREAMER1=faad -DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus +DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR} +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR} -REMOTE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser -REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser +REMOTE_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${FLAVOR} +REMOTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${FLAVOR} .include Index: multimedia/syncplay/Makefile =================================================================== --- multimedia/syncplay/Makefile +++ multimedia/syncplay/Makefile @@ -10,7 +10,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} USES= desktop-file-utils gmake python:2.7 USE_GITHUB= yes Index: multimedia/totem/Makefile =================================================================== --- multimedia/totem/Makefile +++ multimedia/totem/Makefile @@ -25,7 +25,7 @@ libtotem-plparser.so:multimedia/totem-pl-parser RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:misc/gnome-icon-theme \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas \ + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} \ gnome-settings-daemon>=2.91.0:sysutils/gnome-settings-daemon \ gnome-icon-theme-symbolic>=2.91.0:x11-themes/gnome-icon-theme-symbolic \ grilo-plugins2>=0:net/grilo-plugins2 Index: multimedia/tovid/Makefile =================================================================== --- multimedia/tovid/Makefile +++ multimedia/tovid/Makefile @@ -24,10 +24,10 @@ normalize:audio/normalize \ lame:audio/lame \ gnubc>0:math/gnubc \ - ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ + ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \ bash:shells/bash -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USE_GITHUB= yes GH_ACCOUNT= tovid-suite Index: multimedia/vapoursynth/Makefile =================================================================== --- multimedia/vapoursynth/Makefile +++ multimedia/vapoursynth/Makefile @@ -64,8 +64,9 @@ CORE_USES= compiler:c++11-lib CORE_CONFIGURE_ENABLE= core -PYTHON_USES= python:3.3- -PYTHON_BUILD_DEPENDS= cython:lang/cython +PYTHON_USES= python:3.3+ +PYTHON_USE= python=cython +PYTHON_VARS= BINARY_ALIAS=cython=cython-${PYTHON_VER} PYTHON_CONFIGURE_ENABLE= python-module PYTHON_IMPLIES= CORE Index: net-im/cjc/Makefile =================================================================== --- net-im/cjc/Makefile +++ net-im/cjc/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Jajcus Index: net-im/fugu/Makefile =================================================================== --- net-im/fugu/Makefile +++ net-im/fugu/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${FLAVOR} -USES= python ssl +USES= python:2.7 ssl USE_PYTHON= distutils autoplist .include Index: net-im/gajim/Makefile =================================================================== --- net-im/gajim/Makefile +++ net-im/gajim/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp \ - ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR} NO_ARCH= yes USES= cpe dos2unix gmake localbase pathfix python:2.7 tar:bzip2 @@ -36,9 +36,9 @@ GUPNP_DESC= UPnP IGD protocol support SPELL_DESC= Spell checking support -AVAHI_RUN_DEPENDS= avahi-discover:net/py-avahi -CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus +AVAHI_RUN_DEPENDS= avahi-discover:net/py-avahi@${PY_FLAVOR} +CRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus@${PY_FLAVOR} GUPNP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gupnp/__init__.py:net/gupnp-igd NLS_USES= gettext SPELL_LIB_DEPENDS= libgtkspell.so:textproc/gtkspell Index: net-im/hotot/Makefile =================================================================== --- net-im/hotot/Makefile +++ net-im/hotot/Makefile @@ -15,7 +15,7 @@ GH_ACCOUNT= lyricat GH_PROJECT= Hotot -USES= cmake gettext kde:4 python +USES= cmake gettext kde:4 python:2.7 USE_GNOME= intltool INSTALLS_ICONS= yes Index: net-im/libpurple/Makefile =================================================================== --- net-im/libpurple/Makefile +++ net-im/libpurple/Makefile @@ -26,7 +26,7 @@ .if !defined(PIDGIN_SLAVE) # Pidgin slave ports that require the following functionality, must explicitly # set these macros themselves. -USES+= iconv python shebangfix +USES+= iconv python:2.7 shebangfix USE_LDCONFIG= yes SHEBANG_FILES= libpurple/purple-remote \ libpurple/purple-url-handler Index: net-im/papyon/Makefile =================================================================== --- net-im/papyon/Makefile +++ net-im/papyon/Makefile @@ -11,24 +11,19 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of pymsn to support the telepathy MSN connection manager -BUILD_DEPENDS= py*-openssl>0:security/py-openssl \ - ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \ - ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \ +BUILD_DEPENDS= py*-openssl>0:security/py-openssl@${FLAVOR} \ + ${PY_ENUM34} \ + ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \ + ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \ ${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2 -RUN_DEPENDS= py*-openssl>0:security/py-openssl \ - ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \ - ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \ +RUN_DEPENDS= py*-openssl>0:security/py-openssl@${FLAVOR} \ + ${PY_ENUM34} \ + ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \ + ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \ ${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2 USE_GNOME= pygobject -USES= python +USES= python:2.7 USE_PYTHON= distutils -.include - -.if ${PYTHON_REL} < 3400 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 -.endif - -.include +.include Index: net-im/pebrot/Makefile =================================================================== --- net-im/pebrot/Makefile +++ net-im/pebrot/Makefile @@ -10,7 +10,7 @@ MAINTAINER= kevlo@FreeBSD.org COMMENT= Text-based MSN messenger client -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: net-im/poezio/Makefile =================================================================== --- net-im/poezio/Makefile +++ net-im/poezio/Makefile @@ -12,17 +12,10 @@ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \ - ${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp@${FLAVOR} USES= tar:xz python:3.3+ -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist optsuffix -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: net-im/proxy65/Makefile =================================================================== --- net-im/proxy65/Makefile +++ net-im/proxy65/Makefile @@ -10,9 +10,9 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= mmatuska Index: net-im/py-fbmq/Makefile =================================================================== --- net-im/py-fbmq/Makefile +++ net-im/py-fbmq/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} NO_ARCH= yes USES= python Index: net-im/py-jabber/Makefile =================================================================== --- net-im/py-jabber/Makefile +++ net-im/py-jabber/Makefile @@ -11,7 +11,7 @@ MAINTAINER= flz@FreeBSD.org COMMENT= Python Jabber library -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/jabber.pth Index: net-im/py-jabberbot/Makefile =================================================================== --- net-im/py-jabberbot/Makefile +++ net-im/py-jabberbot/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: net-im/py-libturpial/Makefile =================================================================== --- net-im/py-libturpial/Makefile +++ net-im/py-libturpial/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: net-im/py-matrix-synapse/Makefile =================================================================== --- net-im/py-matrix-synapse/Makefile +++ net-im/py-matrix-synapse/Makefile @@ -15,39 +15,39 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict \ - ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64 \ - ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson \ - ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson \ - ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity \ - ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt \ - ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon \ - ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson \ - ${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist \ - ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2 \ - ${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${FLAVOR} # Conditional requirements that aren't so conditional -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} # Dependencies that aren't declared in python_dependencies.py which I have discovered -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${FLAVOR} USES= python USE_GITHUB= yes @@ -76,11 +76,11 @@ OPTIONS_DEFINE= EMAIL LDAP PGSQL SQLITE OPTIONS_DEFAULT= SQLITE EMAIL_DESC= Email notifications for missed messages -EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach -LDAP_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3 -PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +EMAIL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${FLAVOR} +LDAP_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${FLAVOR} +PGSQL_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} .include Index: net-im/py-nbxmpp/Makefile =================================================================== --- net-im/py-nbxmpp/Makefile +++ net-im/py-nbxmpp/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: net-im/py-punjab/Makefile =================================================================== --- net-im/py-punjab/Makefile +++ net-im/py-punjab/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= HTTP XMPP client interface -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USES= python Index: net-im/py-python-telegram-bot/Makefile =================================================================== --- net-im/py-python-telegram-bot/Makefile +++ net-im/py-python-telegram-bot/Makefile @@ -12,8 +12,8 @@ LICENSE= LGPL3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} NO_ARCH= yes USES= python @@ -22,8 +22,8 @@ .include .if ${PYTHON_REL} < 3400 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} .endif .include Index: net-im/py-pyxmpp/Makefile =================================================================== --- net-im/py-pyxmpp/Makefile +++ net-im/py-pyxmpp/Makefile @@ -14,9 +14,9 @@ LICENSE= LGPL21 # only LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto \ - ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} WRKSRC= ${WRKDIR}/${DISTNAME} @@ -24,7 +24,7 @@ USE_GITHUB= yes GH_ACCOUNT= Jajcus -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= auxtools/*.py examples/*.py tests/*.py utils/*.py USE_PYTHON= distutils autoplist Index: net-im/py-slackclient/Makefile =================================================================== --- net-im/py-slackclient/Makefile +++ net-im/py-slackclient/Makefile @@ -11,10 +11,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${FLAVOR} USES= python:-2.7 USE_GITHUB= yes Index: net-im/py-telepot/Makefile =================================================================== --- net-im/py-telepot/Makefile +++ net-im/py-telepot/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR} NO_ARCH= yes USES= python zip Index: net-im/py-unmessage/Makefile =================================================================== --- net-im/py-unmessage/Makefile +++ net-im/py-unmessage/Makefile @@ -14,13 +14,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= tor:security/tor \ - ${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib \ - ${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio \ - ${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo \ - ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \ - ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip \ - ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon + ${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: net-im/py-xmpppy-irc/Makefile =================================================================== --- net-im/py-xmpppy-irc/Makefile +++ net-im/py-xmpppy-irc/Makefile @@ -14,10 +14,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \ - ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${FLAVOR} -USES= python +USES= python:2.7 +USE_PYTHON= flavors NO_BUILD= yes NO_ARCH= yes FILES= irc.py jep0106.py jep0133.py test_jep0106.py Index: net-im/py-xmpppy-yahoo/Makefile =================================================================== --- net-im/py-xmpppy-yahoo/Makefile +++ net-im/py-xmpppy-yahoo/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \ ${PYTHON_SITELIBDIR}/DNS/__init__.py:dns/py-dns -USES= python +USES= python:2.7 NO_BUILD= yes FILES= adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \ yahoo_helpers.py avatar.py htmlutils.py migratespool.py toolbox.py \ Index: net-im/py-xmpppy/Makefile =================================================================== --- net-im/py-xmpppy/Makefile +++ net-im/py-xmpppy/Makefile @@ -12,9 +12,9 @@ MAINTAINER= vg@FreeBSD.org COMMENT= Python library that provides easy scripting with Jabber -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils post-patch: Index: net-im/turpial/Makefile =================================================================== --- net-im/turpial/Makefile +++ net-im/turpial/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \ - ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial@${FLAVOR} USES= pyqt:4 python:2 USE_PYQT= core_run gui_run network_run phonon_run webkit_run Index: net-mgmt/2ping/Makefile =================================================================== --- net-mgmt/2ping/Makefile +++ net-mgmt/2ping/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USES= python:3.4+ .include Index: net-mgmt/Makefile =================================================================== --- net-mgmt/Makefile +++ net-mgmt/Makefile @@ -298,6 +298,7 @@ SUBDIR += prometheus SUBDIR += pushgateway SUBDIR += py-adal + SUBDIR += py-dnsdiag SUBDIR += py-ipcalc SUBDIR += py-ipy SUBDIR += py-msrest @@ -312,7 +313,6 @@ SUBDIR += py-snmp4-mibs SUBDIR += py-snmp_passpersist SUBDIR += py-yapsnmp - SUBDIR += py3-dnsdiag SUBDIR += qkismet SUBDIR += rackmonkey SUBDIR += rancid3 Index: net-mgmt/crmsh/Makefile =================================================================== --- net-mgmt/crmsh/Makefile +++ net-mgmt/crmsh/Makefile @@ -13,15 +13,16 @@ # Set the build/run depends on setuptools instead of adding distutils to USE_PYTHON # because the crmsh build uses autotools which then calls setup.py. -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= ClusterLabs USES= autoreconf gmake python:2 shebangfix +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ocf-root=${PREFIX}/lib/ocf NO_ARCH= yes Index: net-mgmt/flowd/Makefile =================================================================== --- net-mgmt/flowd/Makefile +++ net-mgmt/flowd/Makefile @@ -34,7 +34,7 @@ .endif .if ${PORT_OPTIONS:MPYTHON} -USES+= python +USES+= python:2.7 PLIST_SUB+= PYTHON_VER=${PYTHON_VER} .endif Index: net-mgmt/nagstamon/Makefile =================================================================== --- net-mgmt/nagstamon/Makefile +++ net-mgmt/nagstamon/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 RUN_DEPENDS= sox:audio/sox \ - ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring + ${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${FLAVOR} USES= cpe python:2 CPE_VENDOR= henri_wahl Index: net-mgmt/net-snmp/Makefile =================================================================== --- net-mgmt/net-snmp/Makefile +++ net-mgmt/net-snmp/Makefile @@ -76,8 +76,8 @@ PYDISTUTILS_PKGNAME?= netsnmp-python PYDISTUTILS_PKGVERSION?= 1.0a1 USES+= python -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools CONFIGURE_ARGS+=--with-python-modules CONFIGURE_ENV+= PYTHONPROG="${PYTHON_CMD}" MAKE_ENV+= PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}" Index: net-mgmt/onionlauncher/Makefile =================================================================== --- net-mgmt/onionlauncher/Makefile +++ net-mgmt/onionlauncher/Makefile @@ -11,14 +11,14 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${FLAVOR} \ tor:security/tor USE_GITHUB= yes GH_ACCOUNT= neelchauhan GH_PROJECT= OnionLauncher -USES= pyqt:5 python +USES= pyqt:5 python:2.7 USE_PYTHON= autoplist distutils USE_PYQT= core_run gui_run widgets_run Index: net-mgmt/py-adal/Makefile =================================================================== --- net-mgmt/py-adal/Makefile +++ net-mgmt/py-adal/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net-mgmt/py-dnsdiag/Makefile =================================================================== --- net-mgmt/py-dnsdiag/Makefile +++ net-mgmt/py-dnsdiag/Makefile @@ -12,17 +12,10 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cymruwhois>=1.6:net/py-cymruwhois@${FLAVOR} USES= python:3.3+ USE_PYTHON= autoplist distutils -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: net-mgmt/py-ipcalc/Makefile =================================================================== --- net-mgmt/py-ipcalc/Makefile +++ net-mgmt/py-ipcalc/Makefile @@ -11,7 +11,7 @@ COMMENT= Module to perform IP subnet calculations USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils autoplist NO_ARCH= yes .include Index: net-mgmt/py-ipcalc/pkg-plist =================================================================== --- net-mgmt/py-ipcalc/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -%%PYTHON_SITELIBDIR%%/ipcalc.pyo -%%PYTHON_SITELIBDIR%%/ipcalc.pyc -%%PYTHON_SITELIBDIR%%/ipcalc.py Index: net-mgmt/py-msrest/Makefile =================================================================== --- net-mgmt/py-msrest/Makefile +++ net-mgmt/py-msrest/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi \ - ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -23,7 +23,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .include Index: net-mgmt/py-msrestazure/Makefile =================================================================== --- net-mgmt/py-msrestazure/Makefile +++ net-mgmt/py-msrestazure/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring \ - ${PYTHON_PKGNAMEPREFIX}msrest>0:net-mgmt/py-msrest \ - ${PYTHON_PKGNAMEPREFIX}adal>0:net-mgmt/py-adal +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msrest>0:net-mgmt/py-msrest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}adal>0:net-mgmt/py-adal@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: net-mgmt/py-pynsca/Makefile =================================================================== --- net-mgmt/py-pynsca/Makefile +++ net-mgmt/py-pynsca/Makefile @@ -14,15 +14,15 @@ OPTIONS_DEFINE= AES 3DES AES_DESC= Provide AES encryption -AES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}mcrypt>=0:security/py-mcrypt +AES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}mcrypt>=0:security/py-mcrypt@${FLAVOR} 3DES_DESC= Provide 3DES encryption -3DES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto +3DES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} OPTIONS_DEFAULT=AES 3DES NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils concurrent .include Index: net-mgmt/py-pysmi/Makefile =================================================================== --- net-mgmt/py-pysmi/Makefile +++ net-mgmt/py-pysmi/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${FLAVOR} NO_ARCH= yes USES= python shebangfix Index: net-mgmt/py-pyzabbix/Makefile =================================================================== --- net-mgmt/py-pyzabbix/Makefile +++ net-mgmt/py-pyzabbix/Makefile @@ -12,7 +12,7 @@ LICENSE= LGPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.0:www/py-requests@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils autoplist Index: net-mgmt/py-snmp4-apps/Makefile =================================================================== --- net-mgmt/py-snmp4-apps/Makefile +++ net-mgmt/py-snmp4-apps/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net-mgmt/py-snmp4-mibs/Makefile =================================================================== --- net-mgmt/py-snmp4-mibs/Makefile +++ net-mgmt/py-snmp4-mibs/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net-mgmt/py-snmp4/Makefile =================================================================== --- net-mgmt/py-snmp4/Makefile +++ net-mgmt/py-snmp4/Makefile @@ -15,8 +15,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.2:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.4.1:security/py-pycrypto@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net-mgmt/py3-dnsdiag/distinfo =================================================================== --- /dev/null +++ net-mgmt/py3-dnsdiag/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1493793506 -SHA256 (dnsdiag-1.6.3.tar.gz) = dad8a74643b2d224e1b1ac7b7745e68071164bfa9530d97328d4d45a7f0c5fad -SIZE (dnsdiag-1.6.3.tar.gz) = 11676 Index: net-mgmt/py3-dnsdiag/pkg-descr =================================================================== --- /dev/null +++ net-mgmt/py3-dnsdiag/pkg-descr @@ -1,7 +0,0 @@ -DNSDiag provides a handful of tools to measure and diagnose your DNS -performance and integrity. Using dnsping, dnstraceroute and dnseval -tools you can measure your DNS response quality from delay and loss -perspective as well as tracing the path your DNS query takes to get -to DNS server. - -WWW: https://github.com/farrokhi/dnsdiag Index: net-mgmt/seafile-client/Makefile =================================================================== --- net-mgmt/seafile-client/Makefile +++ net-mgmt/seafile-client/Makefile @@ -21,8 +21,8 @@ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ bash:shells/bash USES= autoreconf iconv libarchive libtool localbase mysql \ Index: net-mgmt/seafile-server/Makefile =================================================================== --- net-mgmt/seafile-server/Makefile +++ net-mgmt/seafile-server/Makefile @@ -22,8 +22,8 @@ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \ bash:shells/bash CONFLICTS= seafile-[0-9]* Index: net-mgmt/tornova/Makefile =================================================================== --- net-mgmt/tornova/Makefile +++ net-mgmt/tornova/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=0.18:security/py-stem@${FLAVOR} \ tor:security/tor USE_GITHUB= yes Index: net-mgmt/wmi-client/Makefile =================================================================== --- net-mgmt/wmi-client/Makefile +++ net-mgmt/wmi-client/Makefile @@ -29,7 +29,7 @@ .include .if ${PORT_OPTIONS:MPYTHON} -USES+= python +USES+= python:2.7 MAKE_ARGS+= PYTHON="${PYTHON_CMD}" PY_LIBDIR="${PYTHONPREFIX_SITELIBDIR}" PLIST_SUB+= PYTHON="" .else Index: net-p2p/bitmessage/Makefile =================================================================== --- net-p2p/bitmessage/Makefile +++ net-p2p/bitmessage/Makefile @@ -12,18 +12,18 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core \ - ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network \ - ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT4_VERSION}:devel/py-qt4-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt4-network>=${PYQT4_VERSION}:net/py-qt4-network@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT4_VERSION}:x11-toolkits/py-qt4-gui@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyopencl>0:devel/py-pyopencl@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Bitmessage GH_PROJECT= PyBitmessage -USES= gmake python pyqt:4 ssl +USES= gmake python:2.7 pyqt:4 ssl USE_PYQT= core_run gui_run network_run USE_PYTHON= distutils autoplist INSTALLS_ICONS= yes Index: net-p2p/couchpotato/Makefile =================================================================== --- net-p2p/couchpotato/Makefile +++ net-p2p/couchpotato/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} USE_RC_SUBR= couchpotato SUB_LIST= PYTHON_CMD=${PYTHON_CMD} USERS=${USERS} Index: net-p2p/deluge-cli/Makefile =================================================================== --- net-p2p/deluge-cli/Makefile +++ net-p2p/deluge-cli/Makefile @@ -14,13 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= intltool-merge:textproc/intltool -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted + ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} USES= gettext python:-2.7 USE_PYTHON= autoplist distutils Index: net-p2p/deluge/Makefile =================================================================== --- net-p2p/deluge/Makefile +++ net-p2p/deluge/Makefile @@ -10,9 +10,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game \ - ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}game>=1.8.1:devel/py-game@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR} \ xdg-utils>=1.0.2:devel/xdg-utils \ deluge:net-p2p/deluge-cli USE_GNOME= librsvg2 pygtk2 Index: net-p2p/libtorrent-rasterbar-python/Makefile =================================================================== --- net-p2p/libtorrent-rasterbar-python/Makefile +++ net-p2p/libtorrent-rasterbar-python/Makefile @@ -15,7 +15,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} SLAVE_PORT= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= python_libtorrent Index: net-p2p/py-py2play/Makefile =================================================================== --- net-p2p/py-py2play/Makefile +++ net-p2p/py-py2play/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 DIST_SUBDIR= python -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Py2Play EXAMPLESDIR= ${PREFIX}/share/examples/py-py2play Index: net-p2p/py-transmissionrpc/Makefile =================================================================== --- net-p2p/py-transmissionrpc/Makefile +++ net-p2p/py-transmissionrpc/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: net-p2p/py-vertex/Makefile =================================================================== --- net-p2p/py-vertex/Makefile +++ net-p2p/py-vertex/Makefile @@ -15,9 +15,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}epsilon>=0:devel/py-epsilon \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}epsilon>=0:devel/py-epsilon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: net-p2p/tribler/Makefile =================================================================== --- net-p2p/tribler/Makefile +++ net-p2p/tribler/Makefile @@ -15,21 +15,21 @@ LICENSE_COMB= multi BUILD_DEPENDS= xpmtoppm:graphics/netpbm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw \ - ${PYTHON_PKGNAMEPREFIX}leveldb>0:databases/py-leveldb \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:net-p2p/libtorrent-rasterbar-python \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}leveldb>0:databases/py-leveldb@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gmpy>0:math/py-gmpy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0.16.4:net-p2p/libtorrent-rasterbar-python@${PY_FLAVOR} \ libsodium>0:security/libsodium \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted + ${PYTHON_PKGNAMEPREFIX}m2crypto>0:security/py-m2crypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} NO_ARCH= yes NO_WRKSUBDIR= yes Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -1089,9 +1089,6 @@ SUBDIR += py-xmlrpc SUBDIR += py-zope.proxy SUBDIR += py-zsi - SUBDIR += py3-netifaces - SUBDIR += py3-pysocks - SUBDIR += py3-urllib3 SUBDIR += pygopherd SUBDIR += pynids SUBDIR += pyrad Index: net/ceph-devel/Makefile =================================================================== --- net/ceph-devel/Makefile +++ net/ceph-devel/Makefile @@ -20,7 +20,6 @@ BUILD_DEPENDS= \ yasm:devel/yasm \ pkgconf:devel/pkgconf \ - cython>=0.25.2:lang/cython \ sphinx-build:textproc/py-sphinx \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \ gperf:devel/gperf @@ -50,6 +49,7 @@ CONFLICTS_INSTALL= ceph USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix +USE_PYTHON= cython USE_GITHUB= yes GH_ACCOUNT= wjwithagen:DEFAULT GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus Index: net/ceph/Makefile =================================================================== --- net/ceph/Makefile +++ net/ceph/Makefile @@ -19,8 +19,7 @@ BUILD_DEPENDS= \ yasm:devel/yasm \ pkgconf:devel/pkgconf \ - cython>=0.25.2:lang/cython \ - sphinx-build:textproc/py-sphinx \ + sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ gperf:devel/gperf \ ${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops LIB_DEPENDS= \ @@ -43,12 +42,13 @@ xml:textproc/xmlstarlet \ jq:textproc/jq \ flock:sysutils/flock \ - virtualenv:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable + virtualenv:devel/py-virtualenv@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} CONFLICTS_INSTALL= ceph-devel USES= gmake cmake:outsource,noninja python:2.7 fuse gettext-runtime shebangfix +USE_PYTHON= cython USE_GITHUB= yes GH_ACCOUNT= ceph:DEFAULT GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus Index: net/cloud-init-azure/Makefile =================================================================== --- net/cloud-init-azure/Makefile +++ net/cloud-init-azure/Makefile @@ -16,18 +16,18 @@ RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \ e2fsprogs>0:sysutils/e2fsprogs \ python>0:lang/python \ - ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah \ - ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \ - ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer + ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR} ETCDIR= ${PREFIX}/etc/cloud Index: net/cloud-init/Makefile =================================================================== --- net/cloud-init/Makefile +++ net/cloud-init/Makefile @@ -15,17 +15,17 @@ RUN_DEPENDS= dmidecode>0:sysutils/dmidecode \ sudo>0:security/sudo \ gpart>0:sysutils/gpart \ - ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth \ - ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch \ - ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer + ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}serial>0:comms/py-serial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth>0:net/py-oauth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${FLAVOR} ETCDIR= ${PREFIX}/etc/cloud Index: net/dpdk/Makefile =================================================================== --- net/dpdk/Makefile +++ net/dpdk/Makefile @@ -29,7 +29,7 @@ DEBUG_MAKE_ENV= EXTRA_CFLAGS='-O0 -g' TOOLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools -TOOLS_USES= python +TOOLS_USES= python:2.7 # build up the list of files in the compiled directory that should be executable EXEC_FILES= app/cmdline_test \ Index: net/dshell/Makefile =================================================================== --- net/dshell/Makefile +++ net/dshell/Makefile @@ -13,11 +13,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt \ - ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy \ - ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap + ${PYTHON_PKGNAMEPREFIX}pygeoip>0:net/py-pygeoip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dpkt>0:net/py-dpkt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes Index: net/freeradius3/Makefile =================================================================== --- net/freeradius3/Makefile +++ net/freeradius3/Makefile @@ -98,7 +98,7 @@ PYTHON_CONFIGURE_WITH= rlm_python PYTHON_CONFIGURE_ON= --with-rlm-python-lib-dir=${PYTHON_LIBDIR} \ --with-rlm-python-include-dir=${PYTHON_INCLUDEDIR} -PYTHON_USES= python gettext-runtime +PYTHON_USES= python:2.7 gettext-runtime PYTHON_VARS= SHEBANG_FILES+=src/modules/rlm_python/*.py REDIS_CONFIGURE_WITH= rlm_redis rlm_rediswho REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis Index: net/googlecl/Makefile =================================================================== --- net/googlecl/Makefile +++ net/googlecl/Makefile @@ -11,9 +11,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/License -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata \ - ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client \ - ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: net/gupnp-igd/Makefile =================================================================== --- net/gupnp-igd/Makefile +++ net/gupnp-igd/Makefile @@ -29,7 +29,7 @@ USES= gmake gnome libtool pathfix pkgconfig tar:xz PYTHON_CONFIGURE_ENABLE=python -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>=2.12.0:devel/py-gobject@${PY_FLAVOR} PYTHON_USES= python:2 post-patch: Index: net/liferea/Makefile =================================================================== --- net/liferea/Makefile +++ net/liferea/Makefile @@ -17,10 +17,10 @@ libpeas-1.0.so:devel/libpeas \ libjson-glib-1.0.so:devel/json-glib RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ - ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py3-libpeas + ${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR} USES= desktop-file-utils gettext gmake gnome libtool localbase \ - pathfix pkgconfig python:3 sqlite tar:bzip2 + pathfix pkgconfig python:3.4+ sqlite tar:bzip2 USE_GNOME= cairo dconf:run gtk30 intltool introspection \ libxslt libxml2 GNU_CONFIGURE= yes Index: net/netatalk3/Makefile =================================================================== --- net/netatalk3/Makefile +++ net/netatalk3/Makefile @@ -66,7 +66,7 @@ DBUS_USE= GNOME=glib20 DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus -DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus +DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_OFF=--with-mysql-config=/nonexistent ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl Index: net/neubot/Makefile =================================================================== --- net/neubot/Makefile +++ net/neubot/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USES= python:2 NO_BUILD= yes Index: net/nsscache/Makefile =================================================================== --- net/nsscache/Makefile +++ net/nsscache/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl \ - ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: net/pdb/Makefile =================================================================== --- net/pdb/Makefile +++ net/pdb/Makefile @@ -10,9 +10,9 @@ MAINTAINER= gnn@FreeBSD.org COMMENT= Packet Debugger -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pcs/__init__.py:net/py-pcs@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils pythonprefix .include Index: net/py-GeoIP2/Makefile =================================================================== --- net/py-GeoIP2/Makefile +++ net/py-GeoIP2/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maxminddb>=1.1.0:net/py-maxminddb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= maxmind Index: net/py-amqp/Makefile =================================================================== --- net/py-amqp/Makefile +++ net/py-amqp/Makefile @@ -12,9 +12,9 @@ LICENSE= LGPL21 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-avahi/Makefile =================================================================== --- net/py-avahi/Makefile +++ net/py-avahi/Makefile @@ -10,11 +10,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface to the Avahi mDNS system -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \ - ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR} LIB_DEPENDS= libavahi-client.so:net/avahi-app -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm \ - ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdbm>0:databases/py-gdbm@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${FLAVOR} MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-python @@ -26,6 +26,7 @@ USE_GNOME= pygtk2 USES= python:2 +USE_PYTHON= flavors MANPAGES= avahi-bookmarks.1 avahi-discover.1 post-patch: Index: net/py-beanstalkc/Makefile =================================================================== --- net/py-beanstalkc/Makefile +++ net/py-beanstalkc/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= YAML OPTIONS_DEFAULT= YAML YAML_DESC= Support parsing YAML responses -YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} regression-test: build @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test Index: net/py-cjdns/Makefile =================================================================== --- net/py-cjdns/Makefile +++ net/py-cjdns/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-cloudflare-scrape/Makefile =================================================================== --- net/py-cloudflare-scrape/Makefile +++ net/py-cloudflare-scrape/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net/py-coherence/Makefile =================================================================== --- net/py-coherence/Makefile +++ net/py-coherence/Makefile @@ -12,16 +12,16 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>8.2:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Louie>0:devel/py-louie@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= coherence-project GH_TAGNAME= 4d5ee5f -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: net/py-ec2-cli-tools/Makefile =================================================================== --- net/py-ec2-cli-tools/Makefile +++ net/py-ec2-cli-tools/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.0:devel/py-boto@${FLAVOR} \ bash:shells/bash USE_PYTHON= distutils autoplist Index: net/py-eventlet/Makefile =================================================================== --- net/py-eventlet/Makefile +++ net/py-eventlet/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet \ - ${PYTHON_PKGNAMEPREFIX}enum-compat>=0.0.2:devel/py-enum-compat \ - ${PYTHON_PKGNAMEPREFIX}enum34>=1.1.6:devel/py-enum34 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}greenlet>=0.3:devel/py-greenlet@${FLAVOR} \ + ${PY_ENUM_COMPAT} \ + ${PY_ENUM34} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net/py-gspread/Makefile =================================================================== --- net/py-gspread/Makefile +++ net/py-gspread/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: net/py-gspreadsheet/Makefile =================================================================== --- net/py-gspreadsheet/Makefile +++ net/py-gspreadsheet/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: net/py-httpstat/Makefile =================================================================== --- net/py-httpstat/Makefile +++ net/py-httpstat/Makefile @@ -18,7 +18,7 @@ GH_ACCOUNT= reorx NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: net/py-impacket/Makefile =================================================================== --- net/py-impacket/Makefile +++ net/py-impacket/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE11 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pcapy>=0:net/py-pcapy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} USES= dos2unix python USE_PYTHON= autoplist distutils Index: net/py-kombu/Makefile =================================================================== --- net/py-kombu/Makefile +++ net/py-kombu/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp \ - ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amqp>=1.4.7:net/py-amqp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson@${FLAVOR} OPTIONS_DEFINE= BEANSTALK BOTO MONGODB REDIS SQLALCHEMY ZMQ @@ -25,12 +25,12 @@ SQLALCHEMY_DESC=Include SQLAlchemy transport support ZMQ_DESC= Include ZMQ transport support -BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc -BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto +BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc@${FLAVOR} +BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto@${FLAVOR} MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo -REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis -SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 -ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq +REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${FLAVOR} +SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} +ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-ldap/Makefile =================================================================== --- net/py-ldap/Makefile +++ net/py-ldap/Makefile @@ -13,8 +13,8 @@ LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:devel/py-pyasn1-modules@${FLAVOR} CONFLICTS_INSTALL= py27-pyldap USES= python:-2.7 Index: net/py-ldap3/Makefile =================================================================== --- net/py-ldap3/Makefile +++ net/py-ldap3/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: net/py-ldaptor/Makefile =================================================================== --- net/py-ldaptor/Makefile +++ net/py-ldaptor/Makefile @@ -15,9 +15,9 @@ LICENSE= MIT LGPL21+ LICENSE_COMB= multi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} GITVERSION= aad8ded658b36337a08aeb7402b6b67eb8771bea Index: net/py-libcloud/Makefile =================================================================== --- net/py-libcloud/Makefile +++ net/py-libcloud/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} NO_ARCH= yes Index: net/py-libdnet/Makefile =================================================================== --- net/py-libdnet/Makefile +++ net/py-libdnet/Makefile @@ -17,7 +17,8 @@ LIBDNET_SLAVE= yes -USES= python +USES= python:2.7 +USE_PYTHON= flavors CONFIGURE_ARGS= --with-python=${PYTHON_CMD} .if defined(MAINTAINER_MODE) Index: net/py-magic-wormhole/Makefile =================================================================== --- net/py-magic-wormhole/Makefile +++ net/py-magic-wormhole/Makefile @@ -9,17 +9,17 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Get things from one computer to another, safely -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn \ - ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf \ - ${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize \ - ${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna \ - ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2 \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm \ - ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}autobahn>=0.14.1:www/py-autobahn@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hkdf>0:security/py-hkdf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}idna>=0.6:dns/py-idna@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spake2>=0.7:security/py-spake2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.13.0:misc/py-tqdm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.3:security/py-txtorcon@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-matrix-synapse-ldap3/Makefile =================================================================== --- net/py-matrix-synapse-ldap3/Makefile +++ net/py-matrix-synapse-ldap3/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap3>=0.9.5:net/py-ldap3@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-maxminddb/Makefile =================================================================== --- net/py-maxminddb/Makefile +++ net/py-maxminddb/Makefile @@ -25,7 +25,7 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${FLAVOR} .endif post-install: Index: net/py-miniupnpc/Makefile =================================================================== --- net/py-miniupnpc/Makefile +++ net/py-miniupnpc/Makefile @@ -12,13 +12,15 @@ USES= python USE_PYTHON= autoplist distutils -WRKDIR= ${WRKDIRPREFIX}${MASTERDIR}/${_WRKDIR} PLIST= ${.CURDIR}/pkg-plist post-patch: ${REINPLACE_CMD} 's/\(version\)="[^"]*"/\1="${PORTVERSION}"/' \ ${WRKSRC}/setup.py +pre-build: + ${CP} $$(make FLAVOR= -C ${MASTERDIR} -V WRKSRC)/libminiupnpc.a ${WRKSRC} + post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/miniupnpc.so Index: net/py-msrplib/Makefile =================================================================== --- net/py-msrplib/Makefile +++ net/py-msrplib/Makefile @@ -16,10 +16,10 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet \ - ${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}application>=1.1.0:devel/py-application@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.15:net/py-eventlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gnutls>=1.1.6:security/py-gnutls@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USES= python Index: net/py-ndg_httpsclient/Makefile =================================================================== --- net/py-ndg_httpsclient/Makefile +++ net/py-ndg_httpsclient/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/ndg/httpsclient/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.4:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: net/py-netaddr/Makefile =================================================================== --- net/py-netaddr/Makefile +++ net/py-netaddr/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.4.2:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: net/py-netif/Makefile =================================================================== --- net/py-netif/Makefile +++ net/py-netif/Makefile @@ -12,8 +12,7 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= cython>0:lang/cython -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= freenas @@ -21,12 +20,12 @@ GH_TAGNAME= a102b4f USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .include Index: net/py-netifaces/Makefile =================================================================== --- net/py-netifaces/Makefile +++ net/py-netifaces/Makefile @@ -1,18 +1,21 @@ -# Created by: Stanislav Svirid +# Created by: Muhammad Moinur Rahman # $FreeBSD$ PORTNAME= netifaces -PORTVERSION= 0.10.5 +PORTVERSION= 0.10.6 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= count@211.ru -COMMENT= Getting network addresses from Python +MAINTAINER= bofh@FreeBSD.org +COMMENT= Getting network addresses from Python 3 LICENSE= MIT USES= python USE_PYTHON= autoplist distutils +post-install: + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so + .include Index: net/py-netifaces/distinfo =================================================================== --- net/py-netifaces/distinfo +++ net/py-netifaces/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1478617707 -SHA256 (netifaces-0.10.5.tar.gz) = 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b -SIZE (netifaces-0.10.5.tar.gz) = 24879 +TIMESTAMP = 1505758293 +SHA256 (netifaces-0.10.6.tar.gz) = 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 +SIZE (netifaces-0.10.6.tar.gz) = 25166 Index: net/py-netlib/Makefile =================================================================== --- net/py-netlib/Makefile +++ net/py-netlib/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: net/py-netstring/Makefile =================================================================== --- net/py-netstring/Makefile +++ net/py-netstring/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python module implementing the netstring protocol -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: net/py-nnpy/Makefile =================================================================== --- net/py-nnpy/Makefile +++ net/py-nnpy/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LIB_DEPENDS= libnanomsg.so:net/nanomsg -BUILD_DEPENDS= ${PYTHONPREFIX_SITELIBDIR}/_cffi_backend.so:devel/py-cffi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: net/py-oauth2/Makefile =================================================================== --- net/py-oauth2/Makefile +++ net/py-oauth2/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR} TEST_DEPENDS:= ${RUN_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock + ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= TESTS TESTS_DESC= Install test suite requirements Index: net/py-pcap/Makefile =================================================================== --- net/py-pcap/Makefile +++ net/py-pcap/Makefile @@ -15,7 +15,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= LIBPCAP Index: net/py-pcs/Makefile =================================================================== --- net/py-pcs/Makefile +++ net/py-pcs/Makefile @@ -14,13 +14,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT -BUILD_DEPENDS= cython>=0.11.2:lang/cython - PORTDOCS= pcs.pdf PORTEXAMPLES= * USES= python:2.7 -USE_PYTHON= distutils pythonprefix +USE_PYTHON= distutils pythonprefix cython OPTIONS_DEFINE= DOCS EXAMPLES Index: net/py-port-for/Makefile =================================================================== --- net/py-port-for/Makefile +++ net/py-port-for/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=0.8:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: net/py-pyldap/Makefile =================================================================== --- net/py-pyldap/Makefile +++ net/py-pyldap/Makefile @@ -11,7 +11,7 @@ LICENSE= PSFL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0:devel/py-pyasn1-modules@${FLAVOR} CONFLICTS_INSTALL= py27-ldap USES= python Index: net/py-pynsq/Makefile =================================================================== --- net/py-pynsq/Makefile +++ net/py-pynsq/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy \ - ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-snappy>0:archivers/py-python-snappy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${FLAVOR} USES= python:-2.7 USE_GITHUB= yes Index: net/py-pypcap/Makefile =================================================================== --- net/py-pypcap/Makefile +++ net/py-pypcap/Makefile @@ -14,12 +14,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= pyrexc:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= dugsong -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: net/py-pyshark/Makefile =================================================================== --- net/py-pyshark/Makefile +++ net/py-pyshark/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT RUN_DEPENDS= tshark>0:net/tshark \ - ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius \ - ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook \ - ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml + ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}py>0:devel/py-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: net/py-pysmb/Makefile =================================================================== --- net/py-pysmb/Makefile +++ net/py-pysmb/Makefile @@ -14,7 +14,7 @@ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} OPTIONS_DEFINE= DOCS Index: net/py-pysocks/Makefile =================================================================== --- net/py-pysocks/Makefile +++ net/py-pysocks/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: net/py-python-barbicanclient/Makefile =================================================================== --- net/py-python-barbicanclient/Makefile +++ net/py-python-barbicanclient/Makefile @@ -12,15 +12,15 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${FLAVOR} NO_ARCH= yes Index: net/py-python-ceilometerclient/Makefile =================================================================== --- net/py-python-ceilometerclient/Makefile +++ net/py-python-ceilometerclient/Makefile @@ -13,17 +13,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.10.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.5.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.1.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} NO_ARCH= yes Index: net/py-python-cinderclient/Makefile =================================================================== --- net/py-python-cinderclient/Makefile +++ net/py-python-cinderclient/Makefile @@ -10,15 +10,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Client for the OpenStack Cinder API -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} USES= python shebangfix SHEBANG_FILES= cinderclient/tests/functional/hooks/post_test_hook.sh Index: net/py-python-designateclient/Makefile =================================================================== --- net/py-python-designateclient/Makefile +++ net/py-python-designateclient/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}stevedore>=1.17.1:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.14.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} NO_ARCH= yes Index: net/py-python-glanceclient/Makefile =================================================================== --- net/py-python-glanceclient/Makefile +++ net/py-python-glanceclient/Makefile @@ -11,15 +11,15 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Client for the OpenStack Glance API -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}warlock>=0:devel/py-warlock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} USES= python shebangfix SHEBANG_FILES= glanceclient/tests/functional/hooks/post_test_hook.sh Index: net/py-python-heatclient/Makefile =================================================================== --- net/py-python-heatclient/Makefile +++ net/py-python-heatclient/Makefile @@ -13,25 +13,25 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=3.2.0:databases/py-python-swiftclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} NO_ARCH= yes -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= heatclient/tests/functional/hooks/post_test_hook.sh Index: net/py-python-keystoneclient/Makefile =================================================================== --- net/py-python-keystoneclient/Makefile +++ net/py-python-keystoneclient/Makefile @@ -12,17 +12,17 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}positional>=1.0.1:devel/py-positional@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} USES= python shebangfix SHEBANG_FILES= keystoneclient/tests/functional/hooks/post_test_hook.sh Index: net/py-python-neutronclient/Makefile =================================================================== --- net/py-python-neutronclient/Makefile +++ net/py-python-neutronclient/Makefile @@ -10,20 +10,20 @@ MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Client for the OpenStack Neutron API -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector \ - ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib \ - ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}debtcollector>=1.2.0:devel/py-debtcollector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.0.2:devel/py-osc-lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=0:devel/py-cliff@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-client-config>=0:devel/py-os-client-config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} USES= python shebangfix SHEBANG_FILES= neutronclient/tests/functional/hooks/post_test_hook.sh Index: net/py-python-novaclient/Makefile =================================================================== --- net/py-python-novaclient/Makefile +++ net/py-python-novaclient/Makefile @@ -10,17 +10,17 @@ MAINTAINER= novel@FreeBSD.org COMMENT= Client for the OpenStack Nova API -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.10.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} USES= python shebangfix SHEBANG_FILES= novaclient/tests/functional/hooks/post_test_hook.sh Index: net/py-python-openstackclient/Makefile =================================================================== --- net/py-python-openstackclient/Makefile +++ net/py-python-openstackclient/Makefile @@ -13,19 +13,19 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk \ - ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.5.0:net/py-python-glanceclient \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \ - ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \ - ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cliff>=2.3.0:devel/py-cliff@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.16.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openstacksdk>=0.9.10:devel/py-openstacksdk@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osc-lib>=1.2.0:devel/py-osc-lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=2.5.0:net/py-python-glanceclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=0:net/py-python-neutronclient@${FLAVOR} USES= python shebangfix USE_PYTHON= distutils autoplist noegginfo Index: net/py-python-twitter/Makefile =================================================================== --- net/py-python-twitter/Makefile +++ net/py-python-twitter/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${FLAVOR} NO_ARCH= yes USES= python Index: net/py-pyvmomi/Makefile =================================================================== --- net/py-pyvmomi/Makefile +++ net/py-pyvmomi/Makefile @@ -11,11 +11,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix post-patch: ${REINPLACE_CMD} -E "/data_files/s|\[\(''|\[\('${DOCSDIR}'|" ${WRKSRC}/setup.py Index: net/py-pyzmq/Makefile =================================================================== --- net/py-pyzmq/Makefile +++ net/py-pyzmq/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL3 LIB_DEPENDS= libzmq.so:net/libzmq4 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist @@ -22,7 +22,7 @@ .include .if ${PYTHON_VER} == 3.3 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${FLAVOR} .endif do-test: Index: net/py-qt4-network/Makefile =================================================================== --- net/py-qt4-network/Makefile +++ net/py-qt4-network/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= moc_build corelib network qmake_build OPTIONS_DEFINE= API DEBUG Index: net/py-qt5-network/Makefile =================================================================== --- net/py-qt5-network/Makefile +++ net/py-qt5-network/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:5 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core network qmake_build OPTIONS_DEFINE= API DEBUG Index: net/py-rabbitpy/Makefile =================================================================== --- net/py-rabbitpy/Makefile +++ net/py-rabbitpy/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pamqp>0:net/py-pamqp@${FLAVOR} NO_ARCH= yes USES= python Index: net/py-rainbowstream/Makefile =================================================================== --- net/py-rainbowstream/Makefile +++ net/py-rainbowstream/Makefile @@ -14,16 +14,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet \ - ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}arrow>0:devel/py-arrow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.5.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyfiglet>0:misc/py-pyfiglet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twitter-tools>0:net/py-twitter-tools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>0:net/py-pysocks@${FLAVOR} # Actually 2.7,3.2- -USES= python:2.7- +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: net/py-ripe.atlas.cousteau/Makefile =================================================================== --- net/py-ripe.atlas.cousteau/Makefile +++ net/py-ripe.atlas.cousteau/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}socketio-client>=0.6.5:net/py-socketio-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client<0.39:www/py-websocket-client@${FLAVOR} NO_ARCH= yes USES= python Index: net/py-ripe.atlas.sagan/Makefile =================================================================== --- net/py-ripe.atlas.sagan/Makefile +++ net/py-ripe.atlas.sagan/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-ripe.atlas.tools/Makefile =================================================================== --- net/py-ripe.atlas.tools/Makefile +++ net/py-ripe.atlas.tools/Makefile @@ -13,13 +13,13 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau \ - ${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ripe.atlas.cousteau>=1.0.4:net/py-ripe.atlas.cousteau@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ripe.atlas.sagan>=1.1.4:net/py-ripe.atlas.sagan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>0:devel/py-tzlocal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-s3cmd/Makefile =================================================================== --- net/py-s3cmd/Makefile +++ net/py-s3cmd/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: net/py-s3transfer/Makefile =================================================================== --- net/py-s3transfer/Makefile +++ net/py-s3transfer/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.3.0:devel/py-botocore@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3.3:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR} #Actually -2.7,3.3-3.5 USES= python @@ -25,7 +25,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.2.0:devel/py-futures@${FLAVOR} .endif # setup.py test runs integration tests which fail Index: net/py-shodan/Makefile =================================================================== --- net/py-shodan/Makefile +++ net/py-shodan/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter \ - ${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins \ - ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}XlsxWriter>0:textproc/py-xlsxwriter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click-plugins>=1.0.3:devel/py-click-plugins@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: net/py-soappy/Makefile =================================================================== --- net/py-soappy/Makefile +++ net/py-soappy/Makefile @@ -13,8 +13,8 @@ # Actual LICENSE is in GH Repo but not in pypi release LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml \ - ${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools@${FLAVOR} USES= python:2 zip USE_PYTHON= autoplist distutils Index: net/py-socketio-client/Makefile =================================================================== --- net/py-socketio-client/Makefile +++ net/py-socketio-client/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net/py-sshuttle/Makefile =================================================================== --- net/py-sshuttle/Makefile +++ net/py-sshuttle/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: net/py-stomp.py/Makefile =================================================================== --- net/py-stomp.py/Makefile +++ net/py-stomp.py/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR} OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen Index: net/py-terminado/Makefile =================================================================== --- net/py-terminado/Makefile +++ net/py-terminado/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess \ - ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ptyprocess>0:sysutils/py-ptyprocess@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: net/py-tofu/Makefile =================================================================== --- net/py-tofu/Makefile +++ net/py-tofu/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} OPTIONS_DEFINE= EXAMPLES Index: net/py-tweepy/Makefile =================================================================== --- net/py-tweepy/Makefile +++ net/py-tweepy/Makefile @@ -12,13 +12,13 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4.1:www/py-requests-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.7.3:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vcrpy>=1.1.2:devel/py-vcrpy@${FLAVOR} USES= python USE_GITHUB= yes @@ -31,7 +31,7 @@ .include .if ${PYTHON_REL} < 3000 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2 +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${FLAVOR} .endif do-test: Index: net/py-twitter-tools/Makefile =================================================================== --- net/py-twitter-tools/Makefile +++ net/py-twitter-tools/Makefile @@ -11,12 +11,12 @@ MAINTAINER= koobs@FreeBSD.org COMMENT= Python API and command-line toolset for Twitter -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python +USES= python:2.7 USE_PYTHON= distutils concurrent autoplist USE_GITHUB= yes Index: net/py-txamqp/Makefile =================================================================== --- net/py-txamqp/Makefile +++ net/py-txamqp/Makefile @@ -13,8 +13,8 @@ MAINTAINER= python@FreeBSD.org COMMENT= Twisted Python library for the AMQP messaging protocol -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>=0:devel/py-thrift \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}thrift>=0:devel/py-thrift@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USES= python:2 Index: net/py-upnp-inspector/Makefile =================================================================== --- net/py-upnp-inspector/Makefile +++ net/py-upnp-inspector/Makefile @@ -13,9 +13,9 @@ LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENCE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Coherence>=0.6.4:net/py-coherence@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: net/py-urllib3/Makefile =================================================================== --- net/py-urllib3/Makefile +++ net/py-urllib3/Makefile @@ -13,16 +13,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest -#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado - -USES?= python +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py-pysocks@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} +#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=0:www/py-tornado@${FLAVOR} + +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes SUB_FILES= pkg-message @@ -30,13 +30,11 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>=0:net/py-ipaddress +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>=0:net/py-ipaddress@${FLAVOR} .endif -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi -.elif ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py3-certifi +.if ${PYTHON_REL} < 3400 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} .endif .include Index: net/py-wmi-query/Makefile =================================================================== --- net/py-wmi-query/Makefile +++ net/py-wmi-query/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${FLAVOR} NO_ARCH= yes USES= python Index: net/py-wolframalpha/Makefile =================================================================== --- net/py-wolframalpha/Makefile +++ net/py-wolframalpha/Makefile @@ -10,9 +10,9 @@ MAINTAINER= skreuzer@FreeBSD.org COMMENT= Python Client for Wolfram Alpha -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} USES= python:2 zip USE_PYTHON= autoplist distutils Index: net/py-xmlrpc/Makefile =================================================================== --- net/py-xmlrpc/Makefile +++ net/py-xmlrpc/Makefile @@ -15,7 +15,7 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= EXAMPLES Index: net/py-zope.proxy/Makefile =================================================================== --- net/py-zope.proxy/Makefile +++ net/py-zope.proxy/Makefile @@ -14,7 +14,7 @@ LICENSE= ZPL21 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.3.0:devel/py-zope.interface@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: net/py3-netifaces/Makefile =================================================================== --- net/py3-netifaces/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= netifaces -PORTVERSION= 0.10.6 -CATEGORIES= net python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Getting network addresses from Python 3 - -LICENSE= MIT - -USES= python:3.3+ -USE_PYTHON= autoplist distutils - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/netifaces.so - -.include Index: net/py3-netifaces/distinfo =================================================================== --- net/py3-netifaces/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1505758293 -SHA256 (netifaces-0.10.6.tar.gz) = 0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0 -SIZE (netifaces-0.10.6.tar.gz) = 25166 Index: net/py3-netifaces/pkg-descr =================================================================== --- net/py3-netifaces/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Getting network addresses from Python - -It's been irritating me for ages that it isn't possible to -straightforwardly get the network address(es) of the machine -you're running on from a Python program. - -WWW: https://pypi.python.org/pypi/netifaces Index: net/py3-pysocks/Makefile =================================================================== --- net/py3-pysocks/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Neil Booth -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pysocks - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: net/py3-urllib3/Makefile =================================================================== --- net/py3-urllib3/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-urllib3 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py3-cryptography \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py3-idna \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py3-openssl \ - ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.7:net/py3-pysocks -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py3-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py3-nose \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py3-pytest - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: net/pygopherd/Makefile =================================================================== --- net/pygopherd/Makefile +++ net/pygopherd/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GITHUB= yes Index: net/pynids/Makefile =================================================================== --- net/pynids/Makefile +++ net/pynids/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libnet.so:net/libnet -USES= pkgconfig python +USES= pkgconfig python:2.7 USE_GNOME= glib20 USE_PYTHON= distutils autoplist pythonprefix Index: net/pythondirector/Makefile =================================================================== --- net/pythondirector/Makefile +++ net/pythondirector/Makefile @@ -13,13 +13,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/doc/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} OPTIONS_DEFINE= DOCS NO_ARCH= yes USE_PYTHON= autoplist distutils -USES= python +USES= python:2.7 PORTDOCS= * Index: net/reposado/Makefile =================================================================== --- net/reposado/Makefile +++ net/reposado/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python +USES= python:2.7 USE_PYTHON= distutils SUB_FILES= pkg-message Index: net/s3ql/Makefile =================================================================== --- net/s3ql/Makefile +++ net/s3ql/Makefile @@ -11,18 +11,18 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py3-apsw \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py3-defusedxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py3-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py3-llfuse \ - ${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apsw>=3.7:databases/py-apsw@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}llfuse>=0:devel/py-llfuse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dugong>=0:net/py-dugong@${FLAVOR} \ psmisc>=0:sysutils/psmisc \ ca_root_nss>=0:security/ca_root_nss RUN_DEPENDS:= ${BUILD_DEPENDS} USES= localbase python:3.3+ sqlite tar:bz2 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/s3ql/deltadump.so Index: net/samba44/Makefile =================================================================== --- net/samba44/Makefile +++ net/samba44/Makefile @@ -88,12 +88,12 @@ BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp PLIST_SUB+= PIDL="" # External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} PLIST_SUB+= PY_DNSPYTHON="@comment " # -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} PLIST_SUB+= PY_ISO8601="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.6:devel/talloc Index: net/samba45/Makefile =================================================================== --- net/samba45/Makefile +++ net/samba45/Makefile @@ -123,12 +123,12 @@ BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp PLIST_SUB+= PIDL="" # External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} PLIST_SUB+= PY_DNSPYTHON="@comment " # -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} PLIST_SUB+= PY_ISO8601="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc Index: net/samba46/Makefile =================================================================== --- net/samba46/Makefile +++ net/samba46/Makefile @@ -122,12 +122,12 @@ # Needed for IDL compiler BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp # External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython@${PY_FLAVOR} PLIST_SUB+= PY_DNSPYTHON="@comment " # -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} PLIST_SUB+= PY_ISO8601="@comment " # talloc BUILD_DEPENDS+= talloc>=2.1.9:devel/talloc Index: net/scapy/Makefile =================================================================== --- net/scapy/Makefile +++ net/scapy/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet \ - ${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dnet.so:net/py-libdnet@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/pcap.py:net/py-pcap@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes @@ -30,9 +30,9 @@ MANUF_DESC= wireshark's MANUF MAC database SOX_DESC= Support for VoIP -PYX_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12 -PYCRYPTO_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto -PYGNUPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot +PYX_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyx/__init__.py:graphics/py-PyX12@${FLAVOR} +PYCRYPTO_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Crypto/__init__.py:security/py-pycrypto@${FLAVOR} +PYGNUPLOT_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot/__init__.py:math/py-gnuplot@${FLAVOR} GRAPH_RUN_DEPENDS= ${LOCALBASE}/bin/MagickCore-config:graphics/ImageMagick \ ${LOCALBASE}/bin/dot:graphics/graphviz P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f Index: net/sippy_b2bua/Makefile =================================================================== --- net/sippy_b2bua/Makefile +++ net/sippy_b2bua/Makefile @@ -11,11 +11,11 @@ MAINTAINER= sobomax@FreeBSD.org COMMENT= SIP Back-to-back user agent (B2BUA) server with Radius support -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes USE_PYTHON= distutils -USES= python +USES= python:2.7 PYDISTUTILS_PKGNAME= sippy DOCSDIR= ${PREFIX}/share/doc/${PYDISTUTILS_PKGNAME} Index: net/splatd/Makefile =================================================================== --- net/splatd/Makefile +++ net/splatd/Makefile @@ -13,13 +13,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap -RUN_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +BUILD_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} +RUN_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= splat USE_RC_SUBR= splatd Index: net/tcpwatch/Makefile =================================================================== --- net/tcpwatch/Makefile +++ net/tcpwatch/Makefile @@ -10,11 +10,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= TCP monitoring and logging tool with support for HTTP 1.1 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: net/tiny-network-utilities/Makefile =================================================================== --- net/tiny-network-utilities/Makefile +++ net/tiny-network-utilities/Makefile @@ -10,8 +10,8 @@ LICENSE= BSD4CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hexdump>0:textproc/py-hexdump@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= yurivict @@ -25,13 +25,6 @@ FILES_LIB= net_checksums tiny_utils PLIST_FILES= ${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py} -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - do-install: .for file_exec in ${FILES_EXEC} ${INSTALL_SCRIPT} ${WRKSRC}/${file_exec}.py \ @@ -43,4 +36,4 @@ ${STAGEDIR}${PYTHON_SITELIBDIR}/${file_lib}.py .endfor -.include +.include Index: net/turses/Makefile =================================================================== --- net/turses/Makefile +++ net/turses/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy \ - ${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.0:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tweepy>=3.1.0:net/py-tweepy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.14.3:devel/py-future@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils @@ -26,7 +26,7 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${FLAVOR} .endif do-test: Index: news/hellanzb/Makefile =================================================================== --- news/hellanzb/Makefile +++ news/hellanzb/Makefile @@ -15,8 +15,8 @@ RUN_DEPENDS= par2:archivers/par2cmdline \ flac:audio/flac \ shorten:audio/shorten \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yenc>=0:news/py-yenc@${FLAVOR} \ mac:audio/mac USE_PYTHON= distutils Index: news/py-pynzb/Makefile =================================================================== --- news/py-pynzb/Makefile +++ news/py-pynzb/Makefile @@ -18,6 +18,6 @@ OPTIONS_DEFINE= LXML LXML_DESC= Add support for py-lxml -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:devel/py-lxml +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.1:devel/py-lxml@${FLAVOR} .include Index: news/py-yenc/Makefile =================================================================== --- news/py-yenc/Makefile +++ news/py-yenc/Makefile @@ -11,7 +11,7 @@ MAINTAINER= jlaffaye@FreeBSD.org COMMENT= yenc decoding module for Python in C -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: news/rawdog/Makefile =================================================================== --- news/rawdog/Makefile +++ news/rawdog/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: news/sabnzbdplus/Makefile =================================================================== --- news/sabnzbdplus/Makefile +++ news/sabnzbdplus/Makefile @@ -10,9 +10,9 @@ LICENSE= BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL LICENSE_COMB= multi -RUN_DEPENDS= cheetah:devel/py-cheetah \ - ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= cheetah:devel/py-cheetah@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= sabnzbd @@ -43,9 +43,9 @@ YENC_DESC= yenc support PAR2CMDLINE_RUN_DEPENDS= par2repair:archivers/par2cmdline-tbb -FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser -YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc>=0:news/py-sabyenc -SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography +FEEDPARSER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR} +YENC_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sabyenc>=0:news/py-sabyenc@${PY_FLAVOR} +SSL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} UNRAR_RUN_DEPENDS= unrar:archivers/unrar 7ZIP_RUN_DEPENDS= 7za:archivers/p7zip Index: news/xpn/Makefile =================================================================== --- news/xpn/Makefile +++ news/xpn/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:x11-toolkits/py-gtk2 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:x11-toolkits/py-gtk2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:databases/py-sqlite3@${PY_FLAVOR} NO_BUILD= yes Index: polish/ekg2/Makefile =================================================================== --- polish/ekg2/Makefile +++ polish/ekg2/Makefile @@ -70,7 +70,7 @@ PERL_USES= perl5 PYTHON_CONFIGURE_WITH= python -PYTHON_USES= python shebangfix +PYTHON_USES= python:2.7 shebangfix SHEBANG_FILES= contrib/python/notify-bubble.py SQLITE_CONFIGURE_WITH= sqlite3 Index: ports-mgmt/portell/Makefile =================================================================== --- ports-mgmt/portell/Makefile +++ ports-mgmt/portell/Makefile @@ -10,7 +10,7 @@ MAINTAINER= mich@FreeBSD.org COMMENT= Quick display of FreeBSD port descriptions -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR} USES= python:-2.7 shebangfix zip SHEBANG_FILES= *.py Index: ports-mgmt/py-pytoport/Makefile =================================================================== --- ports-mgmt/py-pytoport/Makefile +++ ports-mgmt/py-pytoport/Makefile @@ -16,18 +16,11 @@ GH_ACCOUNT= freebsd GH_PROJECT= pytoport -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx-lookup>=0.3.0:misc/py-spdx-lookup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR} USES= python:3.3+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - -.include +.include Index: print/Makefile =================================================================== --- print/Makefile +++ print/Makefile @@ -205,8 +205,6 @@ SUBDIR += py-rtf SUBDIR += py-stapler SUBDIR += py-trml2pdf - SUBDIR += py3-fonttools - SUBDIR += py3-pycups SUBDIR += qpdf SUBDIR += qpdfview SUBDIR += qt5-printsupport Index: print/biblio-py/Makefile =================================================================== --- print/biblio-py/Makefile +++ print/biblio-py/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: print/cloudprint/Makefile =================================================================== --- print/cloudprint/Makefile +++ print/cloudprint/Makefile @@ -10,10 +10,10 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups \ - ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \ - ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}daemon>0:devel/py-daemon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= armooo @@ -21,7 +21,7 @@ NO_ARCH= yes USES= python -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils optsuffix USE_RC_SUBR= ${PORTNAME} USERS= cups Index: print/dot2tex/Makefile =================================================================== --- print/dot2tex/Makefile +++ print/dot2tex/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/py-pyparsing \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.4.8:devel/py-pyparsing@${FLAVOR} \ dot:graphics/graphviz NO_ARCH= yes Index: print/frescobaldi/Makefile =================================================================== --- print/frescobaldi/Makefile +++ print/frescobaldi/Makefile @@ -13,14 +13,14 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4 \ - ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${FLAVOR} -USES= gettext kde:4 python:-3.4 desktop-file-utils +USES= gettext kde:4 python:2.7 desktop-file-utils USE_GITHUB= yes GH_ACCOUNT= wbsoft USE_KDE= kdelibs pykde4_build pykde4_run -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist optsuffix INSTALLS_ICONS= yes NO_ARCH= yes Index: print/pkipplib/Makefile =================================================================== --- print/pkipplib/Makefile +++ print/pkipplib/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: print/pkpgcounter/Makefile =================================================================== --- print/pkpgcounter/Makefile +++ print/pkpgcounter/Makefile @@ -10,13 +10,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Count pages and ink coverage percent -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils PORTDOCS= README COPYING BUGS CREDITS NEWS OPTIONS_DEFINE= DOCS Index: print/py-fonttools/Makefile =================================================================== --- print/py-fonttools/Makefile +++ print/py-fonttools/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python zip +USES= python zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: print/py-pollyreports/Makefile =================================================================== --- print/py-pollyreports/Makefile +++ print/py-pollyreports/Makefile @@ -19,6 +19,6 @@ OPTIONS_DEFINE= REPORTLAB REPORTLAB_DESC= Install Reportlab -REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab +REPORTLAB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=3.0:print/py-reportlab@${FLAVOR} .include Index: print/py-pycups/Makefile =================================================================== --- print/py-pycups/Makefile +++ print/py-pycups/Makefile @@ -17,9 +17,9 @@ LIB_DEPENDS= libcups.so:print/cups USE_PYTHON= autoplist concurrent distutils -USES?= iconv localbase python tar:bzip2 +USES= iconv localbase python tar:bzip2 -SLAVEDIRS= print/py3-pycups +SLAVEDIRS= print/py-pycups@${PY_FLAVOR} .include Index: print/py-pyscript/Makefile =================================================================== --- print/py-pyscript/Makefile +++ print/py-pyscript/Makefile @@ -17,7 +17,7 @@ PYSCRIPT_MANUAL=doc/manual/pyscript.pdf -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_TEX= latex dvipsk Index: print/py-qt5-printsupport/Makefile =================================================================== --- print/py-qt5-printsupport/Makefile +++ print/py-qt5-printsupport/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui printsupport widgets qmake_build OPTIONS_DEFINE= API DEBUG Index: print/py-relatorio/Makefile =================================================================== --- print/py-relatorio/Makefile +++ print/py-relatorio/Makefile @@ -10,12 +10,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Templating library able to output odt and pdf files -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycha>=0.5.0:graphics/py-pycha \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.07:devel/py-yaml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycha>=0.5.0:graphics/py-pycha@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.07:devel/py-yaml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: print/py-reportlab/Makefile =================================================================== --- print/py-reportlab/Makefile +++ print/py-reportlab/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: print/py-reportlab1/Makefile =================================================================== --- print/py-reportlab1/Makefile +++ print/py-reportlab1/Makefile @@ -21,7 +21,7 @@ PORTSCOUT= ignore:1 # Last version of 1.X branch -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/reportlab_${PORTVERSION:S/./_/g}/reportlab Index: print/py-stapler/Makefile =================================================================== --- print/py-stapler/Makefile +++ print/py-stapler/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.2:devel/py-more-itertools \ - ${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.2:devel/py-more-itertools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdf2>=1.24:print/py-pdf2@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: print/py-trml2pdf/Makefile =================================================================== --- print/py-trml2pdf/Makefile +++ print/py-trml2pdf/Makefile @@ -11,13 +11,14 @@ MAINTAINER= ports@caomhin.org COMMENT= Tiny RML2PDF easily creates PDF documents -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR} NO_BUILD= yes NO_ARCH= yes -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 +USE_PYTHON= flavors SHEBANG_FILES= trml2pdf/trml2pdf.py DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} Index: print/py3-fonttools/Makefile =================================================================== --- print/py3-fonttools/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Dmitry Marakasov -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-fonttools - -PORTSCOUT= ignore:1 - -USES= python:3 zip - -.include "${MASTERDIR}/Makefile" Index: print/py3-pycups/Makefile =================================================================== --- print/py3-pycups/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Po-Chuan Hsieh -# $FreeBSD$ - -USES= iconv localbase python:3.3+ tar:bzip2 - -PORTSCOUT= ignore:1 - -MASTERDIR= ${.CURDIR}/../py-pycups - -.include "${MASTERDIR}/Makefile" Index: print/ttfquery/Makefile =================================================================== --- print/ttfquery/Makefile +++ print/ttfquery/Makefile @@ -14,11 +14,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>0:print/py-fonttools@${FLAVOR} \ ${PYNUMPY} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: science/avogadro/Makefile =================================================================== --- science/avogadro/Makefile +++ science/avogadro/Makefile @@ -35,10 +35,10 @@ PYTHON_USES= python:2 PYTHON_BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip + ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR} PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs PYTHON_RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip + ${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR} PYTHON_CMAKE_ON= -DENABLE_PYTHON=ON \ -DPYTHON_INCLUDE_DIR:PATH=${WRKDIR}/include/${PYTHON_VERSION} PYTHON_CMAKE_OFF= -DENABLE_PYTHON=OFF Index: science/brian/Makefile =================================================================== --- science/brian/Makefile +++ science/brian/Makefile @@ -9,12 +9,12 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Clock-driven simulator for spiking neural networks -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.1.0,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: science/gnudatalanguage/Makefile =================================================================== --- science/gnudatalanguage/Makefile +++ science/gnudatalanguage/Makefile @@ -90,7 +90,7 @@ NETCDF_CMAKE_ON= -DNETCDF:BOOL=YES -DHDF:BOOL=NO NETCDF_CMAKE_OFF= -DNETCDF:BOOL=NO -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_BUILD_DEPENDS= ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib Index: science/gramps/Makefile =================================================================== --- science/gramps/Makefile +++ science/gramps/Makefile @@ -13,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py3-bsddb3 \ - ${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:devel/py3-pyicu \ - ${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py3-pygraphviz \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsddb3>0:databases/py-bsddb3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyicu>=1.8:devel/py-pyicu@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygraphviz>=0:graphics/py-pygraphviz@${PY_FLAVOR} \ xdg-open:devel/xdg-utils USE_GITHUB= yes @@ -24,7 +24,7 @@ NO_ARCH= yes USES= desktop-file-utils gettext shared-mime-info python:3.2+ USE_GNOME= cairo gtk30 intltool librsvg2 pango py3gobject3 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix CONFIGURE_ARGS= --disable-mime-install INSTALLS_OMF= yes INSTALLS_ICONS= yes @@ -39,7 +39,7 @@ GEXIV_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2 GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 -PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py3-pillow +PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>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/gwyddion/Makefile =================================================================== --- science/gwyddion/Makefile +++ science/gwyddion/Makefile @@ -40,7 +40,7 @@ PERL_USES= perl5 PERL_CONFIGURE_WITH= perl -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_USE= gnome=pygtksourceview PYTHON_CONFIGURE_ENABLE= pygwy PYTHON_CONFIGURE_WITH= gtksourceview python Index: science/paraview/Makefile =================================================================== --- science/paraview/Makefile +++ science/paraview/Makefile @@ -42,7 +42,7 @@ USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm USE_LDCONFIG= yes USE_GSTREAMER= yes -USES= alias desktop-file-utils cmake:outsource jpeg python shebangfix +USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix INSTALLS_ICONS= yes CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \ Index: science/psychopy/Makefile =================================================================== --- science/psychopy/Makefile +++ science/psychopy/Makefile @@ -11,14 +11,14 @@ LICENSE= GPLv3+ -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=0:graphics/py-pyglet \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=0:graphics/py-pyglet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.6.0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>0:textproc/py-openpyxl@${FLAVOR} \ dejavu>0:x11-fonts/dejavu \ ${PYGAME} \ ${PYNUMPY} @@ -27,7 +27,7 @@ USE_GITHUB= yes -USES= fortran python +USES= fortran python:2.7 USE_PYTHON= autoplist distutils USE_WX= 2.8 WX_COMPS= python @@ -45,7 +45,7 @@ OPTIONS_DEFAULT_i386= PYGLET PYGLET_DESC= Drawing support via Pyglet -PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet +PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${FLAVOR} .include Index: science/py-DendroPy/Makefile =================================================================== --- science/py-DendroPy/Makefile +++ science/py-DendroPy/Makefile @@ -12,6 +12,10 @@ LICENSE= BSD3CLAUSE +py34_BROKEN= does not package +py35_BROKEN= does not package +py36_BROKEN= does not package + USES= python USE_PYTHON= distutils Index: science/py-cdo/Makefile =================================================================== --- science/py-cdo/Makefile +++ science/py-cdo/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 RUN_DEPENDS= cdo:science/cdo \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: science/py-h5py/Makefile =================================================================== --- science/py-h5py/Makefile +++ science/py-h5py/Makefile @@ -13,17 +13,16 @@ LICENSE_FILE= ${WRKSRC}/licenses/license.txt BUILD_DEPENDS= ${PYNUMPY} \ - cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkgconfig>0:devel/py-pkgconfig@${FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USE_GITHUB= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython PORTDOCS= * PORTEXAMPLES= multiprocessing_example.py swmr_multiprocess.py \ Index: science/py-hcluster/Makefile =================================================================== --- science/py-hcluster/Makefile +++ science/py-hcluster/Makefile @@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib + ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-install: Index: science/py-mdp/Makefile =================================================================== --- science/py-mdp/Makefile +++ science/py-mdp/Makefile @@ -26,7 +26,7 @@ LIBSVM_RUN_DEPENDS= libsvm>2.91:science/libsvm \ libsvm-python>2.91:science/libsvm-python -PP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pp>0:devel/py-pp -SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy +PP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pp>0:devel/py-pp@${FLAVOR} +SCIPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.5.2:science/py-scipy@${FLAVOR} .include Index: science/py-mlpy/Makefile =================================================================== --- science/py-mlpy/Makefile +++ science/py-mlpy/Makefile @@ -13,8 +13,7 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYNUMPY} \ - cython>0:lang/cython +BUILD_DEPENDS= ${PYNUMPY} RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libgsl.so:math/gsl @@ -22,6 +21,6 @@ CFLAGS+= -I${LOCALBASE}/include -I${PYTHON_SITELIBDIR}/numpy/core LDFLAGS+= -L${LOCALBASE}/lib USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython .include Index: science/py-netCDF4/Makefile =================================================================== --- science/py-netCDF4/Makefile +++ science/py-netCDF4/Makefile @@ -14,8 +14,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYNUMPY} \ - ${LOCALBASE}/bin/cython:lang/cython +BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -23,7 +22,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} Index: science/py-obspy/Makefile =================================================================== --- science/py-obspy/Makefile +++ science/py-obspy/Makefile @@ -14,17 +14,17 @@ LICENSE= LGPL3 BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy \ - ${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.12.4:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.2:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}suds>=0.4.0:net/py-suds@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= fortran python shebangfix zip +USES= fortran python:2.7 shebangfix zip SHEBANG_FILES= obspy/taup/tests/data/TauP_test_data/gendata.sh USE_LDCONFIG= yes LDFLAGS+= -shared Index: science/py-paida/Makefile =================================================================== --- science/py-paida/Makefile +++ science/py-paida/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-3.2.1_2.10.1 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} MAINTAINER= ports@FreeBSD.org COMMENT= Pure Python scientific analysis package Index: science/py-pysal/Makefile =================================================================== --- science/py-pysal/Makefile +++ science/py-pysal/Makefile @@ -14,10 +14,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.3,1:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.11:science/py-scipy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: science/py-pyteomics.biolccc/Makefile =================================================================== --- science/py-pyteomics.biolccc/Makefile +++ science/py-pyteomics.biolccc/Makefile @@ -9,7 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python bindings for BioLCCC -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: science/py-pyteomics/Makefile =================================================================== --- science/py-pyteomics/Makefile +++ science/py-pyteomics/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${FLAVOR} \ ${PYNUMPY} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: science/py-scikit-fuzzy/Makefile =================================================================== --- science/py-scikit-fuzzy/Makefile +++ science/py-scikit-fuzzy/Makefile @@ -14,11 +14,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}networkx>=1.9.0:math/py-networkx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${FLAVOR} BUILD_DEPENDS= ${RUN_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: science/py-scikit-learn/Makefile =================================================================== --- science/py-scikit-learn/Makefile +++ science/py-scikit-learn/Makefile @@ -12,7 +12,7 @@ COMMENT= Machine learning algorithms for python BUILD_DEPENDS= ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy + ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= fortran python Index: science/py-scikit-sparse/Makefile =================================================================== --- science/py-scikit-sparse/Makefile +++ science/py-scikit-sparse/Makefile @@ -15,13 +15,12 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy -BUILD_DEPENDS= ${RUN_DEPENDS} \ - cython>0:lang/cython + ${PYTHON_SITELIBDIR}/scipy/version.py:science/py-scipy@${FLAVOR} +BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= libumfpack.so:math/suitesparse USES= fortran python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -shared Index: science/py-scimath/Makefile =================================================================== --- science/py-scimath/Makefile +++ science/py-scimath/Makefile @@ -14,11 +14,11 @@ LICENSE= BSD3CLAUSE LGPL3 LICENSE_COMB= dual -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits \ - ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traits>=3.6.0:devel/py-traits@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=0:math/py-numpy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: science/py-scoria/Makefile =================================================================== --- science/py-scoria/Makefile +++ science/py-scoria/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 RUN_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy + ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: science/py-tensorflow/Makefile =================================================================== --- science/py-tensorflow/Makefile +++ science/py-tensorflow/Makefile @@ -14,21 +14,21 @@ BROKEN= fails to build -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${FLAVOR} \ bash:shells/bash -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.8:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=0.9999999:www/py-html5lib \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=3.2.0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}backports.weakref>=0:devel/py-backports.weakref \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.10:www/py-werkzeug - -USES= python shebangfix +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.8:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>=0.9999999:www/py-html5lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=3.2.0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0.29.0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}backports.weakref>=0:devel/py-backports.weakref@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.10:www/py-werkzeug@${FLAVOR} + +USES= python:2.7 shebangfix USE_GITHUB= yes GH_TUPLE= amutu:tensorflow_third_party:v${PORTVERSION}:tf/tensorflow_third_party Index: science/pybrain/Makefile =================================================================== --- science/pybrain/Makefile +++ science/pybrain/Makefile @@ -10,11 +10,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0.7.1:science/py-scipy@${FLAVOR} USE_GITHUB= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix .include Index: science/pycdf/Makefile =================================================================== --- science/pycdf/Makefile +++ science/pycdf/Makefile @@ -17,7 +17,7 @@ LDFLAGS+= "-L${LOCALBASE}/lib" -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-install: Index: science/sigrok-firmware-utils/Makefile =================================================================== --- science/sigrok-firmware-utils/Makefile +++ science/sigrok-firmware-utils/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 -USES= python:3 +USES= python:3.4+ NO_BUILD= yes PORTDOCS= README.parsepe Index: science/tfel/Makefile =================================================================== --- science/tfel/Makefile +++ science/tfel/Makefile @@ -22,10 +22,9 @@ GNUPLOT_RUN_DEPENDS= gnuplot:math/gnuplot PYTHON_LIB_DEPENDS= libboost_python.so:devel/boost-python-libs -PYTHON_USES= localbase python +PYTHON_USES= localbase python:2.7 PYTHON_CONFIGURE_ARGS= --enable-python-bindings PYTHON_CONFIGURE_WITH= boost=${LOCALBASE} -PYTHON_USES= localbase python USES= libtool tar:bzip2 GNU_CONFIGURE= yes Index: science/veusz/Makefile =================================================================== --- science/veusz/Makefile +++ science/veusz/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYNUMPY} BUILD_DEPENDS:= ${RUN_DEPENDS} -USES= pyqt:4 python +USES= pyqt:4 python:2.7 USE_PYQT= gui svg USE_PYTHON= distutils autoplist Index: security/Makefile =================================================================== --- security/Makefile +++ security/Makefile @@ -1002,14 +1002,6 @@ SUBDIR += py-zope.securitypolicy SUBDIR += py-zope.session SUBDIR += py-zxcvbn-python - SUBDIR += py3-certifi - SUBDIR += py3-cryptography - SUBDIR += py3-ecdsa - SUBDIR += py3-libnacl - SUBDIR += py3-openssl - SUBDIR += py3-pbkdf2 - SUBDIR += py3-pyaes - SUBDIR += py3-pycrypto SUBDIR += qtkeychain-qt4 SUBDIR += qtkeychain-qt5 SUBDIR += quantis Index: security/arm/Makefile =================================================================== --- security/arm/Makefile +++ security/arm/Makefile @@ -16,7 +16,7 @@ LICENSE= GPLv3 USE_PYTHON= distutils -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= src/resources/torrcOverride/override.py WRKSRC= ${WRKDIR}/${PORTNAME} Index: security/binwalk/Makefile =================================================================== --- security/binwalk/Makefile +++ security/binwalk/Makefile @@ -13,7 +13,7 @@ USES= python USE_GITHUB= yes GH_ACCOUNT= devttys0 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix concurrent RUN_DEPENDS= 7z:archivers/p7zip \ cabextract:archivers/cabextract Index: security/blindelephant/Makefile =================================================================== --- security/blindelephant/Makefile +++ security/blindelephant/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL3 -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils NO_ARCH= yes Index: security/broccoli/Makefile =================================================================== --- security/broccoli/Makefile +++ security/broccoli/Makefile @@ -43,7 +43,7 @@ RUBY_DESC= Build ruby bindings for broccoli DEBUG_CMAKE_ON= -D ENABLE_DEBUG:BOOL=true -PYTHON_USES= python +PYTHON_USES= python:2.7 PYTHON_CMAKE_ON= -D PY_MOD_INSTALL_DIR:PATH=${PYTHON_SITELIBDIR} PYTHON_CMAKE_OFF= -D DISABLE_PYTHON_BINDINGS:BOOL=true RUBY_USE= ruby=yes Index: security/gpgme/Makefile =================================================================== --- security/gpgme/Makefile +++ security/gpgme/Makefile @@ -76,10 +76,10 @@ . if ${SLAVEPORT} == "python" BUILD_DEPENDS+= swig3.0:devel/swig30 \ - ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools + ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} USES+= python -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0 PLIST_SUB+= VERSION=${PORTVERSION} . endif Index: security/kedpm/Makefile =================================================================== --- security/kedpm/Makefile +++ security/kedpm/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_GNOME= pygtk2 USE_PYTHON= autoplist distutils Index: security/lasso/Makefile =================================================================== --- security/lasso/Makefile +++ security/lasso/Makefile @@ -51,9 +51,9 @@ .if ${PORT_OPTIONS:MPYTHON} CONFIGURE_ARGS+= --enable-python PLIST_SUB+= PYTHON="" -USES+= python +USES+= python:2.7 .else -USES+= python:build +USES+= python:2.7,build CONFIGURE_ARGS+= --disable-python PLIST_SUB+= PYTHON="@comment " .endif Index: security/libpwquality/pkg-plist =================================================================== --- security/libpwquality/pkg-plist +++ security/libpwquality/pkg-plist @@ -7,7 +7,7 @@ lib/libpwquality.so.1 lib/libpwquality.so.1.0.2 %%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality-1.2.4-py2.7.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/pwquality-1.2.4-py%%PYTHON_VER%%.egg-info libdata/pkgconfig/pwquality.pc man/man1/pwmake.1.gz man/man1/pwscore.1.gz Index: security/morphis/Makefile =================================================================== --- security/morphis/Makefile +++ security/morphis/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy11>0:databases/py-sqlalchemy11@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= yurivict @@ -27,13 +27,6 @@ USES= python:3.4+ NO_ARCH= yes -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - USER= nobody GROUP= nobody @@ -52,4 +45,4 @@ ${INSTALL_SCRIPT} ${WRKDIR}/morphis-cmd ${STAGEDIR}${PREFIX}/bin/morphis ${INSTALL_SCRIPT} ${WRKDIR}/morphis-service ${STAGEDIR}${PREFIX}/etc/rc.d/morphis -.include +.include Index: security/nyx/Makefile =================================================================== --- security/nyx/Makefile +++ security/nyx/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.6.0:security/py-stem \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.6.0:security/py-stem@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} USES= python:2.6+ USE_PYTHON= distutils autoplist Index: security/obfsproxy/Makefile =================================================================== --- security/obfsproxy/Makefile +++ security/obfsproxy/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils SUB_FILES= pkg-message PYDISTUTILS_PKGNAME=obfsproxy Index: security/pssh/Makefile =================================================================== --- security/pssh/Makefile +++ security/pssh/Makefile @@ -15,6 +15,6 @@ NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix .include Index: security/pwman3/Makefile =================================================================== --- security/pwman3/Makefile +++ security/pwman3/Makefile @@ -12,10 +12,10 @@ MAINTAINER= yarodin@gmail.com COMMENT= Console password management application with sql storage -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: security/py-AccessControl/Makefile =================================================================== --- security/py-AccessControl/Makefile +++ security/py-AccessControl/Makefile @@ -13,23 +13,23 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: security/py-Products.PlonePAS/Makefile =================================================================== --- security/py-Products.PlonePAS/Makefile +++ security/py-Products.PlonePAS/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \ - ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>0:devel/py-zope.deprecation@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip zope Index: security/py-Products.PluggableAuthService/Makefile =================================================================== --- security/py-Products.PluggableAuthService/Makefile +++ security/py-Products.PluggableAuthService/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: security/py-RestrictedPython/Makefile =================================================================== --- security/py-RestrictedPython/Makefile +++ security/py-RestrictedPython/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 -USES= python:2 zip +USES= python zip USE_PYTHON= distutils autoplist .include Index: security/py-SecretStorage/Makefile =================================================================== --- security/py-SecretStorage/Makefile +++ security/py-SecretStorage/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} NO_ARCH= yes USES= python @@ -22,9 +22,9 @@ .include .if ${PYTHON_REL} > 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py3-dbus +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} .else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${FLAVOR} .endif .include Index: security/py-YubiOTP/Makefile =================================================================== --- security/py-YubiOTP/Makefile +++ security/py-YubiOTP/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: security/py-acme/Makefile =================================================================== --- security/py-acme/Makefile +++ security/py-acme/Makefile @@ -14,15 +14,15 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: security/py-artifacts/Makefile =================================================================== --- security/py-artifacts/Makefile +++ security/py-artifacts/Makefile @@ -14,8 +14,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yapf>=0:textproc/py-yapf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yapf>=0:textproc/py-yapf@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-bcrypt/Makefile =================================================================== --- security/py-bcrypt/Makefile +++ security/py-bcrypt/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: security/py-borg.localrole/Makefile =================================================================== --- security/py-borg.localrole/Makefile +++ security/py-borg.localrole/Makefile @@ -13,18 +13,18 @@ LICENSE= LGPL20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: security/py-btchip-python/Makefile =================================================================== --- security/py-btchip-python/Makefile +++ security/py-btchip-python/Makefile @@ -13,10 +13,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic \ - ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${FLAVOR} USES= python USE_GITHUB= yes Index: security/py-certbot/Makefile =================================================================== --- security/py-certbot/Makefile +++ security/py-certbot/Makefile @@ -14,19 +14,19 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${PORTVERSION}:security/py-acme \ - ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \ - ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${PORTVERSION}:security/py-acme@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} # Actually 2.7,3.3+ USES= python Index: security/py-certifi/Makefile =================================================================== --- security/py-certifi/Makefile +++ security/py-certifi/Makefile @@ -13,7 +13,7 @@ LICENSE= MPL20 NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: security/py-cryptkit/Makefile =================================================================== --- security/py-cryptkit/Makefile +++ security/py-cryptkit/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Cryptographic Toolkit for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-install: Index: security/py-cryptography/Makefile =================================================================== --- security/py-cryptography/Makefile +++ security/py-cryptography/Makefile @@ -15,35 +15,26 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9.0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cffi>=1.7:devel/py-cffi@${FLAVOR} \ + ${PY_ENUM34} ${PY_IPADDRESS} \ + ${PYTHON_PKGNAMEPREFIX}idna>=2.1:dns/py-idna@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.9.0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR} # Python 2.7, 3.4-3.6 -USES?= python ssl +USES= python ssl USE_PYTHON= autoplist concurrent distutils CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -.include - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress -.endif - -.if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 -.endif - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test -.include +.include Index: security/py-cybox/Makefile =================================================================== --- security/py-cybox/Makefile +++ security/py-cybox/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= CybOXProject Index: security/py-dfdatetime/Makefile =================================================================== --- security/py-dfdatetime/Makefile +++ security/py-dfdatetime/Makefile @@ -14,7 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-dfvfs/Makefile =================================================================== --- security/py-dfvfs/Makefile +++ security/py-dfvfs/Makefile @@ -27,12 +27,12 @@ libvmdk>=e:devel/libvmdk \ libvshadow>=0:devel/libvshadow \ libvslvm>=e:devel/libvslvm \ - ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \ - ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock + ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES= python:2.7 @@ -42,7 +42,7 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma@${FLAVOR} TEST_ENV= ${MAKE_ENV} PYTHONHTTPSVERIFY=0 .else TEST_DEPENDS+= ca_root_nss>=0:security/ca_root_nss Index: security/py-dfwinreg/Makefile =================================================================== --- security/py-dfwinreg/Makefile +++ security/py-dfwinreg/Makefile @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= libregf>=a:devel/libregf \ - ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \ - ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock + ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-docker-pycreds/Makefile =================================================================== --- security/py-docker-pycreds/Makefile +++ security/py-docker-pycreds/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: security/py-ecdsa/Makefile =================================================================== --- security/py-ecdsa/Makefile +++ security/py-ecdsa/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -USES?= python +USES= python USE_PYTHON= distutils autoplist regression-test: build Index: security/py-fail2ban/Makefile =================================================================== --- security/py-fail2ban/Makefile +++ security/py-fail2ban/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} OPTIONS_DEFINE= DOCS Index: security/py-fchksum/Makefile =================================================================== --- security/py-fchksum/Makefile +++ security/py-fchksum/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 PLIST_FILES= %%PYTHON_SITELIBDIR%%/fchksum.so -USES= python +USES= python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= python-fchksum Index: security/py-first-server/Makefile =================================================================== --- security/py-first-server/Makefile +++ security/py-first-server/Makefile @@ -12,19 +12,20 @@ LICENSE= GPLv2 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.3:www/py-google-api-python-client -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.8:databases/py-mysqlclient@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}django>=1.11.4:www/py-django@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.11:www/py-werkzeug@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}oauth2client>=3.0.0:security/py-oauth2client@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.3:www/py-google-api-python-client@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= vrtadmin GH_PROJECT= FIRST-server USES= python +USE_PYTHON= flavors NO_BUILD= yes Index: security/py-flask-httpauth/Makefile =================================================================== --- security/py-flask-httpauth/Makefile +++ security/py-flask-httpauth/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: security/py-gixy/Makefile =================================================================== --- security/py-gixy/Makefile +++ security/py-gixy/Makefile @@ -13,12 +13,12 @@ LICENSE= APACHE20 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configargparse>=0.11.0:devel/py-configargparse -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>=1.4.0:devel/py-argparse +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}configargparse>=0.11.0:devel/py-configargparse@${FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}argparse>=1.4.0:devel/py-argparse@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-gnupg/Makefile =================================================================== --- security/py-gnupg/Makefile +++ security/py-gnupg/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=0.5.1:sysutils/py-psutil@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: security/py-google-auth/Makefile =================================================================== --- security/py-google-auth/Makefile +++ security/py-google-auth/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \ - ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cachetools>=2.0.0:devel/py-cachetools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: security/py-gpsoauth/Makefile =================================================================== --- security/py-gpsoauth/Makefile +++ security/py-gpsoauth/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \ - ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4:security/py-pycryptodome@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= simon-weber Index: security/py-halberd/Makefile =================================================================== --- security/py-halberd/Makefile +++ security/py-halberd/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: security/py-itsdangerous/Makefile =================================================================== --- security/py-itsdangerous/Makefile +++ security/py-itsdangerous/Makefile @@ -17,6 +17,6 @@ OPTIONS_DEFINE= JSON -JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson +JSON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson@${FLAVOR} .include Index: security/py-keyczar/Makefile =================================================================== --- security/py-keyczar/Makefile +++ security/py-keyczar/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} NO_ARCH= yes USES= python:2 Index: security/py-keyring/Makefile =================================================================== --- security/py-keyring/Makefile +++ security/py-keyring/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.1:devel/py-setuptools_scm@${FLAVOR} NO_ARCH= yes USES= python @@ -24,8 +24,8 @@ KEYRINGS_ALT_DESC= Install Alternate Python keyring implementations backend SECRET_SERVICE_DESC= Install SecretStorage to support the SecretService backend -DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus -KEYRINGS_ALT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt -SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage +DBUS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${FLAVOR} +KEYRINGS_ALT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyrings.alt>0:security/py-keyrings.alt@${FLAVOR} +SECRET_SERVICE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}SecretStorage>=1.0.0:security/py-SecretStorage@${FLAVOR} .include Index: security/py-keyrings.alt/Makefile =================================================================== --- security/py-keyrings.alt/Makefile +++ security/py-keyrings.alt/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python @@ -26,9 +26,9 @@ KEYCZAR_DESC= Install keyczar to support keyring encryption PYFS_DESC= Install pyfilesystem to support the pyfs backend -ENCRYPTED_FILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto +ENCRYPTED_FILE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${FLAVOR} GNOME_KEYRING_USE= GNOME=pygobject3 -KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar -PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs +KEYCZAR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keyczar>=0.71c:security/py-keyczar@${FLAVOR} +PYFS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fs>=0.5:devel/py-fs@${FLAVOR} .include Index: security/py-keystone/Makefile =================================================================== --- security/py-keystone/Makefile +++ security/py-keystone/Makefile @@ -13,42 +13,42 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore \ - ${PYTHON_PKGNAMEPREFIX}passlib>=1.6:security/py-passlib \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware \ - ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context \ - ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging \ - ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log \ - ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}pysaml2>=0:security/py-pysaml2 \ - ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse \ - ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.3:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=0:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.9.6:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stevedore>=1.16.0:devel/py-stevedore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}passlib>=1.6:security/py-passlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystonemiddleware>=0:devel/py-keystonemiddleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.cache>=1.5.0:devel/py-oslo.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.context>=2.9.0:devel/py-oslo.context@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.messaging>=5.2.0:devel/py-oslo.messaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.db>=0:devel/py-oslo.db@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=1.14.0:devel/py-oslo.log@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.middleware>=3.0.0:devel/py-oslo.middleware@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysaml2>=0:security/py-pysaml2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.6.2:devel/py-dogpile.cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycadf>=0:devel/py-pycadf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}osprofiler>=1.4.0:devel/py-osprofiler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${FLAVOR} NO_ARCH= yes Index: security/py-libnacl/Makefile =================================================================== --- security/py-libnacl/Makefile +++ security/py-libnacl/Makefile @@ -16,7 +16,7 @@ LIB_DEPENDS= libsodium.so:security/libsodium -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: security/py-m2crypto/Makefile =================================================================== --- security/py-m2crypto/Makefile +++ security/py-m2crypto/Makefile @@ -29,7 +29,7 @@ .include .if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing>=0:devel/py-typing@${FLAVOR} .endif .include Index: security/py-maec/Makefile =================================================================== --- security/py-maec/Makefile +++ security/py-maec/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox \ - ${PYTHON_PKGNAMEPREFIX}mixbox>=0.0.13:security/py-mixbox -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mixbox>=0.0.13:security/py-mixbox@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-mcrypt/Makefile =================================================================== --- security/py-mcrypt/Makefile +++ security/py-mcrypt/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libmcrypt.so:security/libmcrypt -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PYDISTUTILS_BUILDARGS= -L${LOCALBASE}/lib PYDISTUTILS_BUILD_TARGET= build_ext Index: security/py-mhash/Makefile =================================================================== --- security/py-mhash/Makefile +++ security/py-mhash/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libmhash.so:security/mhash -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist CFLAGS+= -I${LOCALBASE}/include Index: security/py-mixbox/Makefile =================================================================== --- security/py-mixbox/Makefile +++ security/py-mixbox/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}ordered-set>=0:devel/py-ordered-set +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ordered-set>=0:devel/py-ordered-set@${FLAVOR} NO_ARCH= yes USES= python @@ -23,7 +23,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}weakrefmethod>=1.0.3:devel/py-weakrefmethod +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}weakrefmethod>=1.0.3:devel/py-weakrefmethod@${FLAVOR} .endif .include Index: security/py-mnemonic/Makefile =================================================================== --- security/py-mnemonic/Makefile +++ security/py-mnemonic/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbkdf2>=1.3:security/py-pbkdf2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: security/py-oauth2client/Makefile =================================================================== --- security/py-oauth2client/Makefile +++ security/py-oauth2client/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules \ - ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa \ - ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.7:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.5:devel/py-pyasn1-modules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.4:security/py-rsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: security/py-oauthlib/Makefile =================================================================== --- security/py-oauthlib/Makefile +++ security/py-oauthlib/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt \ - ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR} OPTIONS_DEFINE= RSA SIGNALS SIGNEDTOKEN OPTIONS_DEFAULT= RSA SIGNALS SIGNEDTOKEN @@ -25,10 +25,10 @@ SIGNALS_DESC= Enable signal support SIGNEDTOKEN_DESC= Support for Signed Token -RSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography -SIGNALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker -SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt +RSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} +SIGNALS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR} +SIGNEDTOKEN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -38,7 +38,7 @@ .include .if ${PYTHON_REL} < 3000 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif do-test: Index: security/py-openssl/Makefile =================================================================== --- security/py-openssl/Makefile +++ security/py-openssl/Makefile @@ -14,12 +14,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cryptography>1.9:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>1.9:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} OPTIONS_DEFINE= EXAMPLES -USES?= cpe python +USES= cpe python USE_PYTHON= autoplist concurrent distutils pythonprefix CPE_VENDOR= jean-paul_calderone Index: security/py-paramiko/Makefile =================================================================== --- security/py-paramiko/Makefile +++ security/py-paramiko/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${FLAVOR} USES?= python USE_PYTHON= autoplist concurrent distutils Index: security/py-paramiko1/Makefile =================================================================== --- security/py-paramiko1/Makefile +++ security/py-paramiko1/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: security/py-passlib/Makefile =================================================================== --- security/py-passlib/Makefile +++ security/py-passlib/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.1:devel/py-nose@${FLAVOR} # Python 2.6,3.3-3.6 USES= python Index: security/py-pbkdf2/Makefile =================================================================== --- security/py-pbkdf2/Makefile +++ security/py-pbkdf2/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: security/py-plaso/Makefile =================================================================== --- security/py-plaso/Makefile +++ security/py-plaso/Makefile @@ -27,28 +27,27 @@ libolecf>=a:devel/libolecf \ libregf>=a:devel/libregf \ libscca>=a:devel/libscca \ - ${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts \ - ${PYTHON_PKGNAMEPREFIX}bencode.py>=0:converters/py-bencode.py \ - ${PYTHON_PKGNAMEPREFIX}binplist>=0:devel/py-binplist \ - ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}dfdatetime>=0:security/py-dfdatetime \ - ${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs \ - ${PYTHON_PKGNAMEPREFIX}dfwinreg>=0:security/py-dfwinreg \ - ${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt \ - ${PYTHON_PKGNAMEPREFIX}efilter>=0:devel/py-efilter \ - ${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile \ - ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter \ - ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock + ${PYTHON_PKGNAMEPREFIX}artifacts>=0:security/py-artifacts@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bencode.py>=0:converters/py-bencode.py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}binplist>=0:devel/py-binplist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}construct>=0:devel/py-construct@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dfvfs>=0:security/py-dfvfs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dfwinreg>=0:security/py-dfwinreg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dpkt>=0:net/py-dpkt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}efilter>=0:devel/py-efilter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pefile>=0:devel/py-pefile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytsk>=0:sysutils/py-pytsk@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES= python:2.7 @@ -59,7 +58,7 @@ .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyliblzma>=0:archivers/py-pyliblzma@${FLAVOR} .endif do-test: Index: security/py-plone.app.openid/Makefile =================================================================== --- security/py-plone.app.openid/Makefile +++ security/py-plone.app.openid/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:security/py-plone.openid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=2.0.10:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: security/py-plone.keyring/Makefile =================================================================== --- security/py-plone.keyring/Makefile +++ security/py-plone.keyring/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: security/py-plone.openid/Makefile =================================================================== --- security/py-plone.openid/Makefile +++ security/py-plone.openid/Makefile @@ -13,14 +13,14 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-openid>=0:security/py-python-openid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: security/py-plone.protect/Makefile =================================================================== --- security/py-plone.protect/Makefile +++ security/py-plone.protect/Makefile @@ -12,12 +12,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.keyring>1.0:security/py-plone.keyring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: security/py-plone.session/Makefile =================================================================== --- security/py-plone.session/Makefile +++ security/py-plone.session/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: security/py-potr/Makefile =================================================================== --- security/py-potr/Makefile +++ security/py-potr/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Index: security/py-pow/Makefile =================================================================== --- security/py-pow/Makefile +++ security/py-pow/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -USES= python ssl +USES= python:2.7 ssl USE_PYTHON= distutils PYDISTUTILS_PKGNAME= POW Index: security/py-pyaes/Makefile =================================================================== --- security/py-pyaes/Makefile +++ security/py-pyaes/Makefile @@ -14,7 +14,7 @@ NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist distutils .include Index: security/py-pyaff4/Makefile =================================================================== --- security/py-pyaff4/Makefile +++ security/py-pyaff4/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \ - ${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:archivers/py-python-snappy \ - ${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:textproc/py-rdflib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-snappy>=0.5:archivers/py-python-snappy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rdflib>=4.2.1:textproc/py-rdflib@${FLAVOR} NO_ARCH= yes USES= python zip Index: security/py-pyaxo/Makefile =================================================================== --- security/py-pyaxo/Makefile +++ security/py-pyaxo/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib \ - ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.1:security/py-passlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: security/py-pycrypto/Makefile =================================================================== --- security/py-pycrypto/Makefile +++ security/py-pycrypto/Makefile @@ -11,7 +11,7 @@ MAINTAINER= koobs@FreeBSD.org COMMENT= Python Cryptography Toolkit -USES?= python +USES= python USE_PYTHON= distutils autoplist GNU_CONFIGURE= yes Index: security/py-pycryptopp/Makefile =================================================================== --- security/py-pycryptopp/Makefile +++ security/py-pycryptopp/Makefile @@ -10,11 +10,11 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python Wrappers for the Crypto++ Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver \ - ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}darcsver>0:devel/py-darcsver@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_darcs>0:devel/py-setuptools_darcs@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-pyelliptic/Makefile =================================================================== --- security/py-pyelliptic/Makefile +++ security/py-pyelliptic/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= yann2192 Index: security/py-pymacaroons-pynacl/Makefile =================================================================== --- security/py-pymacaroons-pynacl/Makefile +++ security/py-pymacaroons-pynacl/Makefile @@ -14,11 +14,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \ - ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_GITHUB= yes Index: security/py-pynacl/Makefile =================================================================== --- security/py-pynacl/Makefile +++ security/py-pynacl/Makefile @@ -14,11 +14,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py-cffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.2.1:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${FLAVOR} USES= python localbase USE_PYTHON= autoplist distutils Index: security/py-pysaml2/Makefile =================================================================== --- security/py-pysaml2/Makefile +++ security/py-pysaml2/Makefile @@ -13,20 +13,20 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>1.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>0:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.who>0:devel/py-repoze.who@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>2.5:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ xmlsec1:security/xmlsec1 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}responses>0:devel/py-responses@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: security/py-python-registry/Makefile =================================================================== --- security/py-python-registry/Makefile +++ security/py-python-registry/Makefile @@ -30,7 +30,7 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>=0:devel/py-enum34@${FLAVOR} .endif post-install-DOCS-on: Index: security/py-python-social-auth/Makefile =================================================================== --- security/py-python-social-auth/Makefile +++ security/py-python-social-auth/Makefile @@ -12,12 +12,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2:security/py-python-openid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.5.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.3.8:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.3.1:www/py-requests-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=1.0.0:www/py-pyjwt@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-rekall-core/Makefile =================================================================== --- security/py-rekall-core/Makefile +++ security/py-rekall-core/Makefile @@ -13,24 +13,24 @@ LICENSE= GPLv2 RUN_DEPENDS= cabextract:archivers/cabextract \ - ${PYTHON_PKGNAMEPREFIX}artifacts>=20160114:security/py-artifacts \ - ${PYTHON_PKGNAMEPREFIX}pyaff4>=0.24.p1:security/py-pyaff4 \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}acora>=2.0:textproc/py-acora \ - ${PYTHON_PKGNAMEPREFIX}arrow>=0.7.0:devel/py-arrow \ - ${PYTHON_PKGNAMEPREFIX}efilter>=1.3,1:devel/py-efilter \ - ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.4,1:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil \ - ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone \ - ${PYTHON_PKGNAMEPREFIX}yara>=3.4.0:security/py-yara \ - ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers \ - ${PYTHON_PKGNAMEPREFIX}pytsk>=20160721:sysutils/py-pytsk \ - ${PYTHON_PKGNAMEPREFIX}ipaddr>=2.1.11:devel/py-ipaddr \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil + ${PYTHON_PKGNAMEPREFIX}artifacts>=20160114:security/py-artifacts@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyaff4>=0.24.p1:security/py-pyaff4@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}acora>=2.0:textproc/py-acora@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}arrow>=0.7.0:devel/py-arrow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}efilter>=1.3,1:devel/py-efilter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}intervaltree>=2.1.0:devel/py-intervaltree@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.4,1:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=4.0:sysutils/py-psutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}capstone>=3.0.4:devel/py-capstone@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yara>=3.4.0:security/py-yara@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.4.4:devel/py-sortedcontainers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytsk>=20160721:sysutils/py-pytsk@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddr>=2.1.11:devel/py-ipaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: security/py-rekall/Makefile =================================================================== --- security/py-rekall/Makefile +++ security/py-rekall/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ipython>=5.0.0:devel/ipython NO_ARCH= yes Index: security/py-rekall_gui/Makefile =================================================================== --- security/py-rekall_gui/Makefile +++ security/py-rekall_gui/Makefile @@ -16,12 +16,12 @@ DEPRECATED= PoC that is no longer supported EXPIRATION_DATE= 2017-11-29 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core \ - ${PYTHON_PKGNAMEPREFIX}codegen>=1.0:devel/py-codegen \ - ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:www/py-flask-sockets \ - ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:www/py-gevent-websocket +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}rekall-core>=1.5.0.p:security/py-rekall-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}codegen>=1.0:devel/py-codegen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Sockets>=0:www/py-flask-sockets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0.9.3:www/py-gevent-websocket@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: security/py-requests-kerberos/Makefile =================================================================== --- security/py-requests-kerberos/Makefile +++ security/py-requests-kerberos/Makefile @@ -13,8 +13,8 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: security/py-rsa/Makefile =================================================================== --- security/py-rsa/Makefile +++ security/py-rsa/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent NO_ARCH= yes Index: security/py-service_identity/Makefile =================================================================== --- security/py-service_identity/Makefile +++ security/py-service_identity/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules \ - ${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=15.2:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.15:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>=0.0.8:devel/py-pyasn1-modules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}characteristic>=14.1:devel/py-characteristic@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-signedjson/Makefile =================================================================== --- security/py-signedjson/Makefile +++ security/py-signedjson/Makefile @@ -14,10 +14,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl \ - ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64 \ - ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pynacl>=0.3.0:security/py-pynacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.0.1:devel/py-unpaddedbase64@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes Index: security/py-ssh/Makefile =================================================================== --- security/py-ssh/Makefile +++ security/py-ssh/Makefile @@ -11,7 +11,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Python SSH2 protocol library -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: security/py-sslstrip/Makefile =================================================================== --- security/py-sslstrip/Makefile +++ security/py-sslstrip/Makefile @@ -11,11 +11,11 @@ MAINTAINER= kitchetech@gmail.com COMMENT= Python program for SSL stripping -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-stem/Makefile =================================================================== --- security/py-stem/Makefile +++ security/py-stem/Makefile @@ -13,10 +13,10 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes \ - ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyflakes>0:devel/py-pyflakes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycodestyle>0:devel/py-pycodestyle@${FLAVOR} USES= python:2.6+ USE_PYTHON= distutils autoplist Index: security/py-stix/Makefile =================================================================== --- security/py-stix/Makefile +++ security/py-stix/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox \ - ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}maec>=4.1.0.13:security/py-maec +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.3:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cybox>=2.1.0.13:security/py-cybox@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mixbox>=1.0.2:security/py-mixbox@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}maec>=4.1.0.13:security/py-maec@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= STIXProject Index: security/py-trezor/Makefile =================================================================== --- security/py-trezor/Makefile +++ security/py-trezor/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic \ - ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi \ - ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa \ - ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${FLAVOR} USES= python USE_GITHUB= yes Index: security/py-tuf/Makefile =================================================================== --- security/py-tuf/Makefile +++ security/py-tuf/Makefile @@ -10,11 +10,11 @@ MAINTAINER= koobs@FreeBSD.org COMMENT= Framework for securing software update systems -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynacl>0:security/py-pynacl@${FLAVOR} # Actually 2.6-3.5 USES= python Index: security/py-txtorcon/Makefile =================================================================== --- security/py-txtorcon/Makefile +++ security/py-txtorcon/Makefile @@ -13,13 +13,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental \ - ${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${FLAVOR} \ + ${PY_IPADDRESS} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6.1:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}incremental>0:devel/py-incremental@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Automat>0:devel/py-Automat@${FLAVOR} -USES= python:2.7 shebangfix +USES= python shebangfix USE_PYTHON= distutils autoplist NO_ARCH= yes SHEBANG_FILES= examples/*.py Index: security/py-volatility/Makefile =================================================================== --- security/py-volatility/Makefile +++ security/py-volatility/Makefile @@ -14,12 +14,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara \ - ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}distorm>=0:devel/py-distorm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yara>=0:security/py-yara@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${FLAVOR} NO_ARCH= yes USES= python:2.7 shebangfix zip Index: security/py-vulndb/Makefile =================================================================== --- security/py-vulndb/Makefile +++ security/py-vulndb/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=1.1:devel/py-setuptools-git +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-git>=1.1:devel/py-setuptools-git@${FLAVOR} NO_ARCH= yes USES= python Index: security/py-yubioath-desktop/Makefile =================================================================== --- security/py-yubioath-desktop/Makefile +++ security/py-yubioath-desktop/Makefile @@ -11,14 +11,14 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - pyside${PYTHON_PKGNAMESUFFIX}>0:devel/pyside \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyscard>0:security/py-pyscard@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + pyside${PYTHON_PKGNAMESUFFIX}>0:devel/pyside@${FLAVOR} \ pcsc-spy:devel/pcsc-lite \ ${LOCALBASE}/lib/pcsc/drivers/ifd-ccid.bundle/Contents/${OPSYS}/libccid.so:devel/libccid -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: security/py-zope.app.authentication/Makefile =================================================================== --- security/py-zope.app.authentication/Makefile +++ security/py-zope.app.authentication/Makefile @@ -13,27 +13,27 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0.2:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \ - ${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container \ - ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=0:devel/py-zope.dublincore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0.2:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pluggableauth>=1.1:security/py-zope.pluggableauth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.container>=0:devel/py-zope.app.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.component>=0:devel/py-zope.app.component@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.app.localpermission/Makefile =================================================================== --- security/py-zope.app.localpermission/Makefile +++ security/py-zope.app.localpermission/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.app.principalannotation/Makefile =================================================================== --- security/py-zope.app.principalannotation/Makefile +++ security/py-zope.app.principalannotation/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.principalannotation>=0:security/py-zope.principalannotation +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.11.0:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.principalannotation>=0:security/py-zope.principalannotation@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.app.security/Makefile =================================================================== --- security/py-zope.app.security/Makefile +++ security/py-zope.app.security/Makefile @@ -13,20 +13,20 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission \ - ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.principalregistry>=0:security/py-zope.principalregistry \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy \ - ${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.app.localpermission>=0:security/py-zope.app.localpermission@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.pagetemplate>=0:devel/py-zope.app.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.principalregistry>=0:security/py-zope.principalregistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.login>=0:security/py-zope.login@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.app.securitypolicy/Makefile =================================================================== --- security/py-zope.app.securitypolicy/Makefile +++ security/py-zope.app.securitypolicy/Makefile @@ -13,23 +13,23 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form \ - ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.authentication>=3.8:security/py-zope.app.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.form>=0:devel/py-zope.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.security>=0:security/py-zope.app.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=3.4.2:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.securitypolicy>=0:security/py-zope.securitypolicy@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.authentication/Makefile =================================================================== --- security/py-zope.authentication/Makefile +++ security/py-zope.authentication/Makefile @@ -13,14 +13,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: security/py-zope.login/Makefile =================================================================== --- security/py-zope.login/Makefile +++ security/py-zope.login/Makefile @@ -13,12 +13,12 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: security/py-zope.password/Makefile =================================================================== --- security/py-zope.password/Makefile +++ security/py-zope.password/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: security/py-zope.pluggableauth/Makefile =================================================================== --- security/py-zope.pluggableauth/Makefile +++ security/py-zope.pluggableauth/Makefile @@ -13,22 +13,22 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.password>=3.5.1:security/py-zope.password@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.12:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.principalannotation/Makefile =================================================================== --- security/py-zope.principalannotation/Makefile +++ security/py-zope.principalannotation/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.principalregistry/Makefile =================================================================== --- security/py-zope.principalregistry/Makefile +++ security/py-zope.principalregistry/Makefile @@ -13,13 +13,13 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.password>=0:security/py-zope.password@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.security/Makefile =================================================================== --- security/py-zope.security/Makefile +++ security/py-zope.security/Makefile @@ -14,17 +14,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>3.4.2:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.securitypolicy/Makefile =================================================================== --- security/py-zope.securitypolicy/Makefile +++ security/py-zope.securitypolicy/Makefile @@ -13,19 +13,19 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.authentication>=0:security/py-zope.authentication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dublincore>=3.7:devel/py-zope.dublincore@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py-zope.session/Makefile =================================================================== --- security/py-zope.session/Makefile +++ security/py-zope.session/Makefile @@ -13,15 +13,15 @@ LICENSE= ZPL21 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.minmax>=0:devel/py-zope.minmax@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: security/py3-certifi/Makefile =================================================================== --- security/py3-certifi/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Olivier Duchateau -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-certifi - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: security/py3-cryptography/Makefile =================================================================== --- security/py3-cryptography/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-cryptography - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.4.1:devel/py3-cffi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py3-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py3-cffi \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py3-idna - -USES= python:3.3+ ssl - -.include "${MASTERDIR}/Makefile" Index: security/py3-ecdsa/Makefile =================================================================== --- security/py3-ecdsa/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-ecdsa - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: security/py3-libnacl/Makefile =================================================================== --- security/py3-libnacl/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Philip Paeps -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-libnacl - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: security/py3-openssl/Makefile =================================================================== --- security/py3-openssl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-openssl - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0.2.1:security/py3-cryptography \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py3-six - -USES= cpe python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: security/py3-pbkdf2/Makefile =================================================================== --- security/py3-pbkdf2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pbkdf2 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: security/py3-pyaes/Makefile =================================================================== --- security/py3-pyaes/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyaes - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: security/py3-pycrypto/Makefile =================================================================== --- security/py3-pycrypto/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pycrypto - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: security/suricata/Makefile =================================================================== --- security/suricata/Makefile +++ security/suricata/Makefile @@ -109,7 +109,7 @@ --with-libhiredis-includes=${LOCALBASE}/include \ --with-libhiredis-libraries=${LOCALBASE}/lib -SC_USES= python +SC_USES= python:2.7 SC_CONFIGURE_ENABLE= python TESTS_CONFIGURE_ENABLE= unittests Index: security/switzerland/Makefile =================================================================== --- security/switzerland/Makefile +++ security/switzerland/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3 -USES= python tar:tgz +USES= python:2.7 tar:tgz USE_PYTHON= distutils PORTDOCS= * Index: security/umit/Makefile =================================================================== --- security/umit/Makefile +++ security/umit/Makefile @@ -14,12 +14,12 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ ${LOCALBASE}/bin/nmap:security/nmap NO_ARCH= yes -USES= python shebangfix tar:bzip2 +USES= python:2.7 shebangfix tar:bzip2 USE_GNOME= pygtk2 USE_PYTHON= distutils INSTALLS_ICONS= yes @@ -34,7 +34,7 @@ OPTIONS_DEFINE= DOCS -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} post-patch: @${REINPLACE_CMD} -e \ Index: security/vinetto/Makefile =================================================================== --- security/vinetto/Makefile +++ security/vinetto/Makefile @@ -14,10 +14,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix PYDISTUTILS_PKGVERSION= 0.06alpha NO_ARCH= yes Index: security/w3af/Makefile =================================================================== --- security/w3af/Makefile +++ security/w3af/Makefile @@ -12,56 +12,57 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/GPL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst \ - ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}soappy>=0:net/py-soappy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fpconst>0:math/py-fpconst@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nltk>0:textproc/py-nltk@${FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf \ + ${PYTHON_PKGNAMEPREFIX}pdf>0:print/py-pdf@${FLAVOR} \ scapy>0:net/scapy \ - ${PYTHON_PKGNAMEPREFIX}wordnet>0:textproc/py-wordnet \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pyClamd>=0.2.2:security/py-pyclamd \ - ${PYTHON_PKGNAMEPREFIX}pygithub>=1.21:devel/py-pygithub \ - ${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.2:devel/py-gitpython \ - ${PYTHON_PKGNAMEPREFIX}pybloomfiltermmap>=0.3.11:devel/py-pybloomfiltermmap \ - ${PYTHON_PKGNAMEPREFIX}esmre>=0.3.1:textproc/py-esmre \ - ${PYTHON_PKGNAMEPREFIX}phply>=0.9.1:devel/py-phply \ - ${PYTHON_PKGNAMEPREFIX}stopit>=1.1.0:devel/py-stopit \ - ${PYTHON_PKGNAMEPREFIX}chardet>=2.1.1:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}tblib>=0.2.0:devel/py-tblib \ - ${PYTHON_PKGNAMEPREFIX}pdfminer=20140328:textproc/py-pdfminer \ - ${PYTHON_PKGNAMEPREFIX}futures>=2.1.5:devel/py-futures \ - ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.3:net/py-ndg_httpsclient \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0.3.2:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}guess-language>=0.2:textproc/py-guess-language \ - ${PYTHON_PKGNAMEPREFIX}cluster>=1.1.1b3:devel/py-cluster \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.4:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}python-ntlm>=1.0.1:net/py-python-ntlm \ - ${PYTHON_PKGNAMEPREFIX}halberd>=0.2.4:security/py-halberd \ - ${PYTHON_PKGNAMEPREFIX}darts.util.lru>=0.5:devel/py-darts.util.lru \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}vulndb>=0.0.17:security/py-vulndb \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.1:textproc/py-markdown + ${PYTHON_PKGNAMEPREFIX}wordnet>0:textproc/py-wordnet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyClamd>=0.2.2:security/py-pyclamd@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygithub>=1.21:devel/py-pygithub@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}GitPython>=0.3.2:devel/py-gitpython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pybloomfiltermmap>=0.3.11:devel/py-pybloomfiltermmap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}esmre>=0.3.1:textproc/py-esmre@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}phply>=0.9.1:devel/py-phply@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stopit>=1.1.0:devel/py-stopit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=2.1.1:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tblib>=0.2.0:devel/py-tblib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdfminer=20140328:textproc/py-pdfminer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futures>=2.1.5:devel/py-futures@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.3:net/py-ndg_httpsclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0.3.2:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}guess-language>=0.2:textproc/py-guess-language@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cluster>=1.1.1b3:devel/py-cluster@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.4:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-ntlm>=1.0.1:net/py-python-ntlm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}halberd>=0.2.4:security/py-halberd@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}darts.util.lru>=0.5:devel/py-darts.util.lru@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vulndb>=0.0.17:security/py-vulndb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.1:textproc/py-markdown@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= andresriancho -USES= gettext python shebangfix +USES= gettext python:2.7 shebangfix +USE_PYTHON= flavors SHEBANG_FILES= tools/* w3af_console w3af_gui NO_BUILD= yes OPTIONS_DEFINE= GUI DOCS OPTIONS_SUB= yes -GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>0:graphics/py-pygraphviz \ - ${PYTHON_PKGNAMEPREFIX}gtksourceview>=2.10.1:x11-toolkits/py-gtksourceview \ - ${PYTHON_PKGNAMEPREFIX}xdot>=0.7:x11/py-xdot \ - ${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:www/py-webkitgtk +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygraphviz>0:graphics/py-pygraphviz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtksourceview>=2.10.1:x11-toolkits/py-gtksourceview@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdot>=0.7:x11/py-xdot@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webkitgtk>=1.1.8:www/py-webkitgtk@${FLAVOR} GUI_USE= GNOME=pygtk2 Index: security/wapiti/Makefile =================================================================== --- security/wapiti/Makefile +++ security/wapiti/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: security/yubikey-piv-manager/Makefile =================================================================== --- security/yubikey-piv-manager/Makefile +++ security/yubikey-piv-manager/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside \ +RUN_DEPENDS= pyside${PYTHON_PKGNAMESUFFIX}>=1.0.9:devel/pyside@${FLAVOR} \ yubico-piv-tool:security/yubico-piv-tool NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils PLIST_FILES+= man/man1/pivman.1.gz \ Index: security/zenmap/Makefile =================================================================== --- security/zenmap/Makefile +++ security/zenmap/Makefile @@ -7,7 +7,7 @@ COMMENT= GUI frontend for the Nmap scanning utility RUN_DEPENDS= nmap:security/nmap \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} MASTERDIR= ${.CURDIR}/../nmap PATCHDIR= ${.CURDIR}/files @@ -16,7 +16,7 @@ PKGDIR= ${.CURDIR} WRKSRC_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} -USES= dos2unix python tar:bzip2 +USES= dos2unix python:2.7 tar:bzip2 DOS2UNIX_GLOB= *.xml USE_GNOME= pygtk2 USE_PYTHON= autoplist distutils Index: security/zeronet/Makefile =================================================================== --- security/zeronet/Makefile +++ security/zeronet/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem@${PY_FLAVOR} SUB_FILES= zeronet-service zeronet-cmd pkg-message SUB_LIST= LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP} @@ -30,7 +30,7 @@ OPTIONS_DEFINE= DEBUG -DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug +DEBUG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${PY_FLAVOR} .include Index: shells/fish/Makefile =================================================================== --- shells/fish/Makefile +++ shells/fish/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS+= libpcre2-32.so:devel/pcre2 -USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3 \ +USES= autoreconf cpe gmake libtool ncurses pkgconfig pathfix python:3.4+ \ localbase compiler:c++11-lang shebangfix SHEBANG_FILES= share/tools/*.py share/tools/web_config/webconfig.py Index: shells/lshell/Makefile =================================================================== --- shells/lshell/Makefile +++ shells/lshell/Makefile @@ -15,7 +15,7 @@ GH_TAGNAME= 279d7ab NO_ARCH= yes -USES= python +USES= python:2.7 USE_GITHUB= yes USE_PYTHON= distutils Index: shells/xonsh/Makefile =================================================================== --- shells/xonsh/Makefile +++ shells/xonsh/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${FLAVOR} NO_ARCH= yes Index: sysutils/Makefile =================================================================== --- sysutils/Makefile +++ sysutils/Makefile @@ -930,9 +930,6 @@ SUBDIR += py-uptime SUBDIR += py-zdaemon SUBDIR += py-zfs - SUBDIR += py3-execnet - SUBDIR += py3-pkginfo - SUBDIR += py3-ptyprocess SUBDIR += pydf SUBDIR += qchroot SUBDIR += qjail Index: sysutils/ansible/Makefile =================================================================== --- sysutils/ansible/Makefile +++ sysutils/ansible/Makefile @@ -13,18 +13,18 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} EXTRA_PATCHES?= # NO_ARCH= yes USES?= cpe python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix CPE_VENDOR= ansibleworks SUB_FILES= pkg-message Index: sysutils/ansible1/Makefile =================================================================== --- sysutils/ansible1/Makefile +++ sysutils/ansible1/Makefile @@ -10,10 +10,10 @@ MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} USES= cpe python:2 shebangfix Index: sysutils/azure-agent/Makefile =================================================================== --- sysutils/azure-agent/Makefile +++ sysutils/azure-agent/Makefile @@ -16,7 +16,7 @@ bash:shells/bash \ base64:converters/base64 \ dmidecode:sysutils/dmidecode \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss NO_BUILD= yes Index: sysutils/backupchecker/Makefile =================================================================== --- sysutils/backupchecker/Makefile +++ sysutils/backupchecker/Makefile @@ -14,7 +14,7 @@ NO_ARCH= yes USES= python:3.3+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix PORTDOCS= README.md Index: sysutils/bamf/Makefile =================================================================== --- sysutils/bamf/Makefile +++ sysutils/bamf/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING.LGPL BUILD_DEPENDS= vapigen:lang/vala \ - ${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2 \ - ${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt + ${PYTHON_PKGNAMEPREFIX}libxml2>=2.8.0:textproc/py-libxml2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libxslt>=1.1.28:textproc/py-libxslt@${PY_FLAVOR} LIB_DEPENDS= libgtop-2.0.so:devel/libgtop \ libdbus-glib-1.so:devel/dbus-glib \ libstartup-notification-1.so:x11/startup-notification Index: sysutils/battray/Makefile =================================================================== --- sysutils/battray/Makefile +++ sysutils/battray/Makefile @@ -14,7 +14,7 @@ USES= python:3.3+ USE_GNOME= py3gobject3 -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USE_GITHUB= yes GH_ACCOUNT= Carpetsmoker Index: sysutils/bsdploy/Makefile =================================================================== --- sysutils/bsdploy/Makefile +++ sysutils/bsdploy/Makefile @@ -9,20 +9,20 @@ MAINTAINER= koobs@FreeBSD.org COMMENT= Container Management for FreeBSD Jails -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible \ - ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail \ - ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy_ezjail>=1.2.0:sysutils/py-ploy_ezjail@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy_fabric>=1.1.0:sysutils/py-ploy_fabric@${FLAVOR} OPTIONS_DEFINE= EC2 OPTIONS_DEFAULT= EC2 EC2_DESC= Support Amazon Web Services EC2 hosts -EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2 +EC2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy_ec2>0:sysutils/py-ploy_ec2@${FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils Index: sysutils/catfish/Makefile =================================================================== --- sysutils/catfish/Makefile +++ sysutils/catfish/Makefile @@ -12,13 +12,13 @@ LICENSE= GPLv3 RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra \ - ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect \ - ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3 \ + ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} \ gksu:sysutils/gksu BUILD_DEPENDS= ${RUN_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_GNOME= gtk30 intltool Index: sysutils/createrepo/Makefile =================================================================== --- sysutils/createrepo/Makefile +++ sysutils/createrepo/Makefile @@ -11,13 +11,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \ - ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber \ - ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum \ - ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm - -USES= gmake python shebangfix +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/urlgrabber/__init__.py:www/py-urlgrabber@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/yum/__init__.py:sysutils/yum@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/deltarpm.py:sysutils/deltarpm@${FLAVOR} + +USES= gmake python:2.7 shebangfix +USE_PYTHON= flavors SHEBANG_FILES= *.py */*.py Makefile BUILD_DEPENDS+= ginstall:sysutils/coreutils Index: sysutils/deltarpm/Makefile =================================================================== --- sysutils/deltarpm/Makefile +++ sysutils/deltarpm/Makefile @@ -14,6 +14,7 @@ LIB_DEPENDS= librpm.so:archivers/rpm4 USES= gmake python shebangfix tar:bz2 +USE_PYTHON= flavors optsuffix SHEBANG_FILES= drpmsync ALL_TARGET= all Index: sysutils/docker-compose/Makefile =================================================================== --- sysutils/docker-compose/Makefile +++ sysutils/docker-compose/Makefile @@ -11,34 +11,35 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama \ - ${PYTHON_PKGNAMEPREFIX}docker>=2.2.1:sysutils/py-docker \ - ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty \ - ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client - -USES= python -USE_PYTHON= distutils autoplist +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cached-property>=1.2.0:devel/py-cached-property@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.7:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docker>=2.2.1:sysutils/py-docker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dockerpty>=0.4.1:devel/py-dockerpty@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}texttable>=0.9.0:textproc/py-texttable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>=0.32.0:www/py-websocket-client@${FLAVOR} + +USES= python:-3.3 +USE_PYTHON= distutils autoplist concurrent optsuffix .include .if ${PYTHON_SUFFIX} < 35 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR} .endif .if ${PYTHON_SUFFIX} < 34 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif .if ${PYTHON_SUFFIX} < 32 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}functools32>0:devel/py-functools32@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.16:net/py-ipaddress@${FLAVOR} .endif .include Index: sysutils/duplicity/Makefile =================================================================== --- sysutils/duplicity/Makefile +++ sysutils/duplicity/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librsync.so:net/librsync2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils @@ -41,15 +41,15 @@ FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3 FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp -GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata -GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject \ +GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} +GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject@${FLAVOR} \ dbus>0:devel/dbus GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg NLS_USES= gettext -PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko -PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect -S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto +PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko@${FLAVOR} +PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${FLAVOR} +S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${FLAVOR} post-patch: .for f in cfbackend _cf_cloudfiles _cf_pyrax Index: sysutils/dvdvideo/Makefile =================================================================== --- sysutils/dvdvideo/Makefile +++ sysutils/dvdvideo/Makefile @@ -15,8 +15,8 @@ LICENSE= GPLv3 NO_ARCH= yes -USES= python:3 tar:tgz -USE_PYTHON= autoplist distutils +USES= python:3.4+ tar:tgz +USE_PYTHON= autoplist distutils optsuffix OPTIONS_DEFINE= DVDCSS .if !defined(PACKAGE_BUILDING) Index: sysutils/farbot/Makefile =================================================================== --- sysutils/farbot/Makefile +++ sysutils/farbot/Makefile @@ -19,7 +19,7 @@ GH_PROJECT= farbot GH_TAGNAME= c824009 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PYDISTUTILS_PKGNAME= farb PYDISTUTILS_PKGVERSION= 0.1 Index: sysutils/feather/Makefile =================================================================== --- sysutils/feather/Makefile +++ sysutils/feather/Makefile @@ -9,7 +9,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python script for managing tarsnap backups -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \ tarsnap>=0:sysutils/tarsnap USES= python:2,run Index: sysutils/fusefs-gitfs/Makefile =================================================================== --- sysutils/fusefs-gitfs/Makefile +++ sysutils/fusefs-gitfs/Makefile @@ -10,19 +10,19 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong \ - ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2 \ - ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomiclong>0:devel/py-atomiclong@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fusepy>=2.0.2:devel/py-fusepy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}raven>=5.27.0:devel/py-raven@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.6.1:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= PressLabs NO_ARCH= yes USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix post-patch: @${REINPLACE_CMD} -e 's/==/>=/' ${WRKSRC}/*requirements.txt @@ -34,7 +34,7 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} .else post-patch: patch-py3k-mock patch-py3k-mock: Index: sysutils/fusefs-wikipediafs/Makefile =================================================================== --- sysutils/fusefs-wikipediafs/Makefile +++ sysutils/fusefs-wikipediafs/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= py*-fusefs>=0.2:devel/py-fusefs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR} -USES= fuse python +USES= fuse python:2.7 USE_PYTHON= autoplist distutils PORTDOCS= AUTHORS ChangeLog HACKING NEWS README TODO NO_ARCH= yes Index: sysutils/hachoir-urwid/Makefile =================================================================== --- sysutils/hachoir-urwid/Makefile +++ sysutils/hachoir-urwid/Makefile @@ -10,7 +10,7 @@ COMMENT= Binary file explorer RUN_DEPENDS= ${PYTHON_SITELIBDIR}/hachoir_parser/__init__.py:devel/hachoir-parser \ - ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid + ${PYTHON_SITELIBDIR}/urwid/__init__.py:devel/py-urwid@${FLAVOR} USES= python:2.7 USE_PYTHON= distutils Index: sysutils/iocage/Makefile =================================================================== --- sysutils/iocage/Makefile +++ sysutils/iocage/Makefile @@ -11,17 +11,17 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py3-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py3-tqdm \ - ${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py3-coloredlogs \ - ${PYTHON_PKGNAMEPREFIX}verboselogs>0:devel/py3-verboselogs \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.7:devel/py-click@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.10.0:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coloredlogs>0:devel/py-coloredlogs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}verboselogs>0:devel/py-verboselogs@${PY_FLAVOR} \ ca_root_nss>0:security/ca_root_nss \ - ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py3-texttable \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py3-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py3-libzfs \ - ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py3-pygit2 + ${PYTHON_PKGNAMEPREFIX}texttable>=0.8.7:textproc/py-texttable@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libzfs>=1.0.2:devel/py-libzfs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygit2>=0.24.1:devel/py-pygit2@${PY_FLAVOR} USE_GITHUB= yes Index: sysutils/jadm/Makefile =================================================================== --- sysutils/jadm/Makefile +++ sysutils/jadm/Makefile @@ -12,14 +12,14 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate \ - ${PYTHON_PKGNAMEPREFIX}ipaddress>=1.0.6:net/py-ipaddress +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${FLAVOR} \ + ${PY_IPADDRESS} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.14.0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10.3:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tabulate>=0.7.2:devel/py-tabulate@${FLAVOR} \ + ${PY_IPADDRESS} USES= python USE_PYTHON= distutils autoplist Index: sysutils/lfm/Makefile =================================================================== --- sysutils/lfm/Makefile +++ sysutils/lfm/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING NO_ARCH= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils optsuffix USES= python:3.4+ PLIST_FILES= man/man1/lfm.1.gz Index: sysutils/mog/Makefile =================================================================== --- sysutils/mog/Makefile +++ sysutils/mog/Makefile @@ -11,13 +11,13 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - mdv:devel/py-mdv +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ + mdv:devel/py-mdv@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python USE_GITHUB= yes -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix NO_ARCH= yes GH_ACCOUNT= witchard Index: sysutils/ohmu/Makefile =================================================================== --- sysutils/ohmu/Makefile +++ sysutils/ohmu/Makefile @@ -11,14 +11,14 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= paul-nechifor USES= python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils concurrent optsuffix NO_ARCH= yes pre-configure: Index: sysutils/py-bcfg2/Makefile =================================================================== --- sysutils/py-bcfg2/Makefile +++ sysutils/py-bcfg2/Makefile @@ -12,24 +12,24 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon \ - ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gamin>=0:devel/py-gamin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} OPTIONS_DEFINE= CHEETAH GENSHI CHEETAH_DESC= Support Cheetah Templates GENSHI_DESC= Support Genshi Templates -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_RC_SUBR= bcfg2 SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PORTDOCS= COPYRIGHT README -CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah -GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi +CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=0:devel/py-cheetah@${FLAVOR} +GENSHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0:textproc/py-genshi@${FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py Index: sysutils/py-cdmi/Makefile =================================================================== --- sysutils/py-cdmi/Makefile +++ sysutils/py-cdmi/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift \ - ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}swift>0:databases/py-swift@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>0:www/py-webob@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= osaddon GH_TAGNAME= f0e3ad9 -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: sysutils/py-consul/Makefile =================================================================== --- sysutils/py-consul/Makefile +++ sysutils/py-consul/Makefile @@ -4,16 +4,17 @@ PORTVERSION= 0.7.2 DISTVERSIONPREFIX= v CATEGORIES= sysutils +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhixson@gmail.com COMMENT= Python client for consul LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} USES= python:3.3+ Index: sysutils/py-croniter/Makefile =================================================================== --- sysutils/py-croniter/Makefile +++ sysutils/py-croniter/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: sysutils/py-crontab/Makefile =================================================================== --- sysutils/py-crontab/Makefile +++ sysutils/py-crontab/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: sysutils/py-diffoscope/Makefile =================================================================== --- sysutils/py-diffoscope/Makefile +++ sysutils/py-diffoscope/Makefile @@ -13,15 +13,15 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py3-libarchive-c \ - ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py3-python-magic \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libarchive-c>=0:archivers/py-libarchive-c@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-magic>=0:devel/py-python-magic@${FLAVOR} \ gdiff:textproc/diffutils -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ zipinfo:archivers/unzip \ isoinfo:sysutils/cdrkit \ rpm2cpio:archivers/rpm2cpio -USES= python:3.4+ +USES= python:3.5+ USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: sysutils/py-dlipower/Makefile =================================================================== --- sysutils/py-dlipower/Makefile +++ sysutils/py-dlipower/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${FLAVOR} USES= python shebangfix SHEBANG_FILES= scripts/fence_dli Index: sysutils/py-docker/Makefile =================================================================== --- sysutils/py-docker/Makefile +++ sysutils/py-docker/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \ - ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docker-pycreds>0:security/py-docker-pycreds@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -24,11 +24,11 @@ .include .if ${PYTHON_SUFFIX} < 35 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports.ssl_match_hostname>0:security/py-backports.ssl_match_hostname@${FLAVOR} .endif .if ${PYTHON_SUFFIX} < 33 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@${FLAVOR} .endif .include Index: sysutils/py-execnet/Makefile =================================================================== --- sysutils/py-execnet/Makefile +++ sysutils/py-execnet/Makefile @@ -13,11 +13,11 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py-apipkg@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: sysutils/py-ezjailremote/Makefile =================================================================== --- sysutils/py-ezjailremote/Makefile +++ sysutils/py-ezjailremote/Makefile @@ -13,13 +13,13 @@ LICENSE= BSD2CLAUSE RUN_DEPENDS= ezjail-admin:sysutils/ezjail \ - ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric + ${PYTHON_PKGNAMEPREFIX}fabric>0:devel/py-fabric@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= tomster GH_PROJECT= ezjail-remote -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: sysutils/py-filelike/Makefile =================================================================== --- sysutils/py-filelike/Makefile +++ sysutils/py-filelike/Makefile @@ -6,11 +6,12 @@ PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= dikshie@sfc.wide.ad.jp COMMENT= Python module for building and manipulating file-like object USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent .include Index: sysutils/py-freenas.cli/Makefile =================================================================== --- sysutils/py-freenas.cli/Makefile +++ sysutils/py-freenas.cli/Makefile @@ -10,18 +10,18 @@ MAINTAINER= wg@FreeBSD.org COMMENT= FreeNAS Command Line Interface -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize \ - ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu \ - ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural \ - ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ - ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor \ - ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils \ - ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}columnize>0:devel/py-columnize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyicu>0:devel/py-pyicu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}natural>0:devel/py-natural@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}texttable>0:textproc/py-texttable@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freenas.utils>0:devel/py-freenas.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}freenas.dispatcher>0:devel/py-freenas.dispatcher@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: sysutils/py-glances/Makefile =================================================================== --- sysutils/py-glances/Makefile +++ sysutils/py-glances/Makefile @@ -13,7 +13,7 @@ LICENSE= LGPL3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=2.1.1:sysutils/py-psutil@${FLAVOR} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes Index: sysutils/py-gmailfs-fuse/Makefile =================================================================== --- sysutils/py-gmailfs-fuse/Makefile +++ sysutils/py-gmailfs-fuse/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fusefs>=0.2:devel/py-fusefs@${FLAVOR} USES= fuse python:2.7 USE_PYTHON= autoplist distutils Index: sysutils/py-google-compute-engine/Makefile =================================================================== --- sysutils/py-google-compute-engine/Makefile +++ sysutils/py-google-compute-engine/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \ sudo:security/sudo USES= python Index: sysutils/py-halite/Makefile =================================================================== --- sysutils/py-halite/Makefile +++ sysutils/py-halite/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: sysutils/py-honcho/Makefile =================================================================== --- sysutils/py-honcho/Makefile +++ sysutils/py-honcho/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= nickstenning Index: sysutils/py-nomad/Makefile =================================================================== --- sysutils/py-nomad/Makefile +++ sysutils/py-nomad/Makefile @@ -3,14 +3,15 @@ PORTNAME= py-nomad PORTVERSION= 0.5.0 CATEGORIES= sysutils +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= jhixson@gmail.com COMMENT= Python client for nomad LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py3-requests -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py3-requests +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} USES= python:3.3+ Index: sysutils/py-pkginfo/Makefile =================================================================== --- sysutils/py-pkginfo/Makefile +++ sysutils/py-pkginfo/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include Index: sysutils/py-ploy/Makefile =================================================================== --- sysutils/py-ploy/Makefile +++ sysutils/py-ploy/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ - ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: sysutils/py-ploy_ansible/Makefile =================================================================== --- sysutils/py-ploy_ansible/Makefile +++ sysutils/py-ploy_ansible/Makefile @@ -13,13 +13,13 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet@${FLAVOR} \ ansible1<2.0:sysutils/ansible1 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: sysutils/py-ploy_ec2/Makefile =================================================================== --- sysutils/py-ploy_ec2/Makefile +++ sysutils/py-ploy_ec2/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: sysutils/py-ploy_ezjail/Makefile =================================================================== --- sysutils/py-ploy_ezjail/Makefile +++ sysutils/py-ploy_ezjail/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \ - ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: sysutils/py-ploy_fabric/Makefile =================================================================== --- sysutils/py-ploy_fabric/Makefile +++ sysutils/py-ploy_fabric/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \ - ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fabric>=1.4.0,1:devel/py-fabric@${FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils Index: sysutils/py-plumbum/Makefile =================================================================== --- sysutils/py-plumbum/Makefile +++ sysutils/py-plumbum/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_GITHUB= yes Index: sysutils/py-psutil/Makefile =================================================================== --- sysutils/py-psutil/Makefile +++ sysutils/py-psutil/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unittest2>=0:devel/py-unittest2@${FLAVOR} USE_PYTHON= autoplist concurrent distutils USES= python Index: sysutils/py-ptyprocess/Makefile =================================================================== --- sysutils/py-ptyprocess/Makefile +++ sysutils/py-ptyprocess/Makefile @@ -11,7 +11,7 @@ LICENSE= ISCL -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: sysutils/py-salt/Makefile =================================================================== --- sysutils/py-salt/Makefile +++ sysutils/py-salt/Makefile @@ -13,19 +13,24 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3\ - ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto \ - ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore \ - ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \ - ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml - -USES= cpe python:2.7+ +py34_BROKEN= fails to package +py35_BROKEN= fails to package +py36_BROKEN= fails to package + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.2.1:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} + +USES= cpe python + CPE_VENDOR= saltstack CPE_PRODUCT= salt USE_PYTHON= autoplist distutils @@ -63,26 +68,26 @@ TCP_DESC= Install dependencies required for TCP transport ZEROMQ_DESC= Install dependencies required for ZeroMQ transport -RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl \ - ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo \ - ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet +RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ioflo>=1.1.7:devel/py-ioflo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}raet>=0.6.0:net/py-raet@${FLAVOR} -TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto +TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} -ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq -ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto +ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} +ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} .include # Python 2.7-3.3 require enum34, unnecessary for Python 3.4+ .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${FLAVOR} .endif # Python 3+ comes with futures built-in .if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>=2.0:devel/py-futures@${FLAVOR} .endif post-patch: Index: sysutils/py-shutilwhich/Makefile =================================================================== --- sysutils/py-shutilwhich/Makefile +++ sysutils/py-shutilwhich/Makefile @@ -11,7 +11,7 @@ LICENSE= PSFL -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python:-3.3 USE_GITHUB= yes Index: sysutils/py-stdiff/Makefile =================================================================== --- sysutils/py-stdiff/Makefile +++ sysutils/py-stdiff/Makefile @@ -4,11 +4,12 @@ PORTVERSION= 0.2.1 CATEGORIES= sysutils python MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= araujo@FreeBSD.org COMMENT= Spot The Difference is a file integrity checker -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: sysutils/py-superlance/Makefile =================================================================== --- sysutils/py-superlance/Makefile +++ sysutils/py-superlance/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD4CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}supervisor>0:sysutils/py-supervisor@${FLAVOR} NO_ARCH= yes Index: sysutils/py-supervisor/Makefile =================================================================== --- sysutils/py-supervisor/Makefile +++ sysutils/py-supervisor/Makefile @@ -11,8 +11,8 @@ MAINTAINER= hizel@vyborg.ru COMMENT= System for controlling process state under UNIX -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meld3>=0.6.5:www/py-meld3@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0.5.0:devel/py-mock@${FLAVOR} PORTDOCS= *.txt *.rst Index: sysutils/py-tmuxp/Makefile =================================================================== --- sysutils/py-tmuxp/Makefile +++ sysutils/py-tmuxp/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete \ - ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}argcomplete>=0:devel/py-argcomplete@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kaptan>=0.5.7:devel/py-kaptan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3:devel/py-colorama@${FLAVOR} \ tmux:sysutils/tmux NO_ARCH= yes Index: sysutils/py-zdaemon/Makefile =================================================================== --- sysutils/py-zdaemon/Makefile +++ sysutils/py-zdaemon/Makefile @@ -13,7 +13,7 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR} NO_ARCH= yes USES= python zip Index: sysutils/py3-execnet/Makefile =================================================================== --- sysutils/py3-execnet/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-execnet - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py3-setuptools_scm -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}apipkg>=1.4:devel/py3-apipkg - -USES= python:3.2+ - -.include "${MASTERDIR}/Makefile" Index: sysutils/py3-pkginfo/Makefile =================================================================== --- sysutils/py3-pkginfo/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: rs.os -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pkginfo - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: sysutils/py3-ptyprocess/Makefile =================================================================== --- sysutils/py3-ptyprocess/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-ptyprocess - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: sysutils/qzeitgeist/Makefile =================================================================== --- sysutils/qzeitgeist/Makefile +++ sysutils/qzeitgeist/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= rapper:textproc/raptor2 \ ${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib -USES= cmake kde:4 python:build tar:bzip2 +USES= cmake kde:4 python:2.7,build tar:bzip2 USE_KDE= automoc4 USE_QT4= corelib dbus declarative qtestlib \ moc_build qmake_build rcc_build uic_build Index: sysutils/rdiff-backup-devel/Makefile =================================================================== --- sysutils/rdiff-backup-devel/Makefile +++ sysutils/rdiff-backup-devel/Makefile @@ -19,7 +19,7 @@ CONFLICTS= rdiff-backup-[0-9]* -USES= python +USES= python:2.7 USE_PYTHON= distutils MAN1S= rdiff-backup.1 rdiff-backup-statistics.1 Index: sysutils/sample/Makefile =================================================================== --- sysutils/sample/Makefile +++ sysutils/sample/Makefile @@ -13,7 +13,6 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libbfd.a:devel/libbfd \ ${LOCALBASE}/lib/libiberty.a:devel/gnulibiberty \ ${LOCALBASE}/lib/libxo.a:devel/libxo \ - ${LOCALBASE}/bin/cython:lang/cython \ ${LOCALBASE}/bin/python:lang/python BROKEN_i386= does not build: don't know how to make sample_support_i386.c @@ -25,6 +24,7 @@ GH_TAGNAME= 45e2b86 USES= python:build kmod +USE_PYTHON= cython MAKE_ENV= SYSDIR=${SRC_BASE}/sys Index: sysutils/solaar/Makefile =================================================================== --- sysutils/solaar/Makefile +++ sysutils/solaar/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libhidapi.so:comms/hidapi USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix USE_GITHUB= yes GH_ACCOUNT= pwr @@ -29,7 +29,7 @@ NO_ARCH= yes OPTIONS_DEFINE= GUI -GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py${PYTHON_MAJOR_VER:S/2//}-gobject3 +GUI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${FLAVOR} post-patch: @${CP} ${FILESDIR}/hidapi.py ${WRKSRC}/lib/hidapi/udev.py Index: sysutils/tentakel/Makefile =================================================================== --- sysutils/tentakel/Makefile +++ sysutils/tentakel/Makefile @@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/py -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS Index: sysutils/xen-guest-tools/Makefile =================================================================== --- sysutils/xen-guest-tools/Makefile +++ sysutils/xen-guest-tools/Makefile @@ -19,7 +19,7 @@ ONLY_FOR_ARCHS_REASON= not yet ported to anything other than amd64 or i386 CONFLICTS= xen-tools-[0-9]* -USES= gmake python:2.7:configure perl5 gettext-runtime:build gettext-tools:build pkgconfig +USES= gmake python:2.7,configure perl5 gettext-runtime:build gettext-tools:build pkgconfig USE_PERL5= build GNU_CONFIGURE= yes CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} PYTHON_PATH=${PYTHON_CMD} Index: sysutils/yum/Makefile =================================================================== --- sysutils/yum/Makefile +++ sysutils/yum/Makefile @@ -17,15 +17,16 @@ intltool-update:textproc/intltool RUN_DEPENDS= bash:shells/bash \ ${PYTHON_SITELIBDIR}/rpm/__init__.py:archivers/rpm4 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \ - ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse \ - ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber@${FLAVOR} ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 ONLY_FOR_ARCHS_REASON= linux is not available for ${ARCH} -USES= cpe gettext gmake python shebangfix +USES= cpe gettext gmake python:2.7 shebangfix +USE_PYTHON= flavors SHEBANG_FILES= etc/yum-updatesd.init CPE_VENDOR= baseurl Index: sysutils/zeitgeist/Makefile =================================================================== --- sysutils/zeitgeist/Makefile +++ sysutils/zeitgeist/Makefile @@ -16,9 +16,9 @@ BUILD_DEPENDS= valac:lang/vala \ dee-tool:devel/dee \ rapper:textproc/raptor2 \ - ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg \ - ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:textproc/py-rdflib@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR} USE_GNOME= intlhack glib20 introspection:build GNU_CONFIGURE= yes Index: textproc/Makefile =================================================================== --- textproc/Makefile +++ textproc/Makefile @@ -1266,6 +1266,7 @@ SUBDIR += py-agate-dbf SUBDIR += py-agate-excel SUBDIR += py-alabaster + SUBDIR += py-asciinema SUBDIR += py-asv SUBDIR += py-autopep8 SUBDIR += py-awesome-slugify @@ -1314,6 +1315,7 @@ SUBDIR += py-nltk SUBDIR += py-numpydoc SUBDIR += py-openpyxl + SUBDIR += py-pager SUBDIR += py-pandocfilters SUBDIR += py-paragrep SUBDIR += py-parsel @@ -1397,25 +1399,6 @@ SUBDIR += py-zope.tal SUBDIR += py-zpt SUBDIR += py2html - SUBDIR += py3-MarkupSafe - SUBDIR += py3-alabaster - SUBDIR += py3-asciinema - SUBDIR += py3-chardet - SUBDIR += py3-docutils - SUBDIR += py3-feedparser - SUBDIR += py3-humanfriendly - SUBDIR += py3-hunspell - SUBDIR += py3-libxml2 - SUBDIR += py3-numpydoc - SUBDIR += py3-pager - SUBDIR += py3-pyPEG2 - SUBDIR += py3-pygments - SUBDIR += py3-pystemmer - SUBDIR += py3-qrcode - SUBDIR += py3-snowballstemmer - SUBDIR += py3-sphinx - SUBDIR += py3-sphinx_rtd_theme - SUBDIR += py3-texttable SUBDIR += pychm SUBDIR += qprint SUBDIR += qrcodegen Index: textproc/archmage/Makefile =================================================================== --- textproc/archmage/Makefile +++ textproc/archmage/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_SITELIBDIR}/chm/chm.py:textproc/pychm \ - ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32 + ${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR} NO_BUILD= yes USES= cpe python:2 tar:bzip2 Index: textproc/cdiff/Makefile =================================================================== --- textproc/cdiff/Makefile +++ textproc/cdiff/Makefile @@ -18,7 +18,7 @@ GH_ACCOUNT= ymattw USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix NO_ARCH= yes OPTIONS_DEFINE= DOCS Index: textproc/cmark/Makefile =================================================================== --- textproc/cmark/Makefile +++ textproc/cmark/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:outsource python:3,test +USES= cmake:outsource python:3.4+,test USE_GITHUB= yes GH_ACCOUNT= commonmark USE_LDCONFIG= yes Index: textproc/coccigrep/Makefile =================================================================== --- textproc/coccigrep/Makefile +++ textproc/coccigrep/Makefile @@ -17,7 +17,7 @@ GH_ACCOUNT= regit USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix PLIST_FILES= man/man1/coccigrep.1.gz \ ${DATADIR_REL}/cocci-grep.el \ Index: textproc/codespell/Makefile =================================================================== --- textproc/codespell/Makefile +++ textproc/codespell/Makefile @@ -10,7 +10,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= python:3 +USES= python:3.4+ USE_GITHUB= yes GH_ACCOUNT= lucasdemarchi Index: textproc/ibus-el/Makefile =================================================================== --- textproc/ibus-el/Makefile +++ textproc/ibus-el/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= ibus-daemon:textproc/ibus \ ${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib -USES= python:run +USES= python:2.7,run USE_EMACS= yes LICENSE= GPLv3 Index: textproc/ibus-typing-booster/Makefile =================================================================== --- textproc/ibus-typing-booster/Makefile +++ textproc/ibus-typing-booster/Makefile @@ -11,18 +11,18 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg \ - ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3 \ - ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/${PYTHON_PKGNAMEPREFIX}sqlite3 +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR} \ + ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} LIB_DEPENDS= libibus-1.0.so:textproc/ibus \ libm17n.so:devel/m17n-lib -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg \ - ${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py3-dbus \ - ${PYTHON_SITELIBDIR}/hunspell.so:textproc/py3-hunspell \ - ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3 \ +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py-xdg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/hunspell.so:textproc/py-hunspell@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py-gobject3@${PY_FLAVOR} \ ${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD \ ${LOCALBASE}/share/unicode/cldr/readme.html:textproc/CLDR\ - ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/${PYTHON_PKGNAMEPREFIX}sqlite3 + ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} TEST_DEPENDS= ${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell \ ${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell \ ${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell Index: textproc/ibus/Makefile =================================================================== --- textproc/ibus/Makefile +++ textproc/ibus/Makefile @@ -16,10 +16,10 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus \ - ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:devel/py-notify@${PY_FLAVOR} \ ${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \ setxkbmap:x11/setxkbmap LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib Index: textproc/icdiff/Makefile =================================================================== --- textproc/icdiff/Makefile +++ textproc/icdiff/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix NO_ARCH= yes .include Index: textproc/loook/Makefile =================================================================== --- textproc/loook/Makefile +++ textproc/loook/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} WRKSRC= ${WRKDIR} Index: textproc/plover/Makefile =================================================================== --- textproc/plover/Makefile +++ textproc/plover/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib \ - ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}serial>=0:comms/py-serial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_WX= 3.0+ WX_COMPS= wx Index: textproc/pootle/Makefile =================================================================== --- textproc/pootle/Makefile +++ textproc/pootle/Makefile @@ -15,21 +15,21 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= translate-toolkit>=1.11.0:textproc/translate-toolkit \ - ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south\ - ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit \ - ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets \ - ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south \ - ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse \ - ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch + ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssmin>=0.1.4:www/py-cssmin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.1.4:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-taggit>0.10:www/py-django-taggit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-assets>=0.8:www/py-django-assets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}south>=0.7.6:databases/py-south@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-voting>=0.1:www/py-django-voting@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}argparse>=0:devel/py-argparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}diff-match-patch>=0:textproc/py-diff-match-patch@${FLAVOR} # actually diff-match-patch is a dependency of translate-toolkit, # but only this port uses it. NO_ARCH= yes -USES= gettext python tar:bzip2 shebangfix +USES= gettext python:2.7 tar:bzip2 shebangfix USE_PYTHON= autoplist distutils SHEBANG_FILES= pootle/assets/admin/js/compress.py @@ -49,14 +49,14 @@ MEMCACHED_DESC= Use memcached to improve performance -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2 +LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap2>0:devel/py-ldap2@${FLAVOR} MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached -MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached +MEMCACHED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=1.45:databases/py-python-memcached@${FLAVOR} -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR} -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} SUBVERSION_RUN_DEPENDS= svn:devel/subversion Index: textproc/py-agate-dbf/Makefile =================================================================== --- textproc/py-agate-dbf/Makefile +++ textproc/py-agate-dbf/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \ - ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbfread>=2.0.5:textproc/py-dbfread@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-agate-excel/Makefile =================================================================== --- textproc/py-agate-excel/Makefile +++ textproc/py-agate-excel/Makefile @@ -11,9 +11,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate \ - ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd \ - ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlrd>=0.9.4:textproc/py-xlrd@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>=2.3.0:textproc/py-openpyxl@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-agate/Makefile =================================================================== --- textproc/py-agate/Makefile +++ textproc/py-agate/Makefile @@ -11,13 +11,13 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime \ - ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate \ - ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify \ - ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytimeparse>=1.1.5:devel/py-pytimeparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.0:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.1:devel/py-parsedatetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-slugify>=1.2.1:textproc/py-python-slugify@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}leather>=0.3.2:graphics/py-leather@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-alabaster/Makefile =================================================================== --- textproc/py-alabaster/Makefile +++ textproc/py-alabaster/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: textproc/py-asciinema/Makefile =================================================================== --- textproc/py-asciinema/Makefile +++ textproc/py-asciinema/Makefile @@ -11,7 +11,7 @@ LICENSE= GPLv3+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py3-requests \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \ ca_root_nss>=0:security/ca_root_nss USES= python:3.3+ Index: textproc/py-autopep8/Makefile =================================================================== --- textproc/py-autopep8/Makefile +++ textproc/py-autopep8/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycodestyle>=2.3:devel/py-pycodestyle@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: textproc/py-awesome-slugify/Makefile =================================================================== --- textproc/py-awesome-slugify/Makefile +++ textproc/py-awesome-slugify/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.14:converters/py-unidecode@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-chardet/Makefile =================================================================== --- textproc/py-chardet/Makefile +++ textproc/py-chardet/Makefile @@ -13,12 +13,12 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${FLAVOR} NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils do-test: Index: textproc/py-cloud_sptheme/Makefile =================================================================== --- textproc/py-cloud_sptheme/Makefile +++ textproc/py-cloud_sptheme/Makefile @@ -14,10 +14,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-fulltoc>=1.1:textproc/py-sphinxcontrib-fulltoc@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-creole/Makefile =================================================================== --- textproc/py-creole/Makefile +++ textproc/py-creole/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:textproc/py-docutils@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-csvkit/Makefile =================================================================== --- textproc/py-csvkit/Makefile +++ textproc/py-csvkit/Makefile @@ -11,11 +11,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate \ - ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel \ - ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf \ - ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql \ - ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}agate>=1.5.4:textproc/py-agate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}agate-excel>=0.2.0:textproc/py-agate-excel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}agate-dbf>=0.2.0:textproc/py-agate-dbf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}agate-sql>=0.5.0:databases/py-agate-sql@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-docutils/Makefile =================================================================== --- textproc/py-docutils/Makefile +++ textproc/py-docutils/Makefile @@ -13,15 +13,15 @@ LICENSE= BSD2CLAUSE GPLv3+ PD PSFL LICENSE_COMB= multi -PORTSCOUT?= limit:^[0-9\.]*$$ +PORTSCOUT= limit:^[0-9\.]*$$ NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils -USES?= python +USES= python OPTIONS_DEFINE= PYGMENTS PYGMENTS_DESC= Syntax highlighting -PYGMENTS_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments +PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} SCRIPTS= rst2html rst2latex rst2man rst2odt rst2odt_prepstyles \ rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html Index: textproc/py-elasticsearch-curator-py/Makefile =================================================================== --- textproc/py-elasticsearch-curator-py/Makefile +++ textproc/py-elasticsearch-curator-py/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py \ - ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.3:net/py-urllib3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.8.0:textproc/py-elasticsearch-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= elastic Index: textproc/py-elasticsearch-dsl-py/Makefile =================================================================== --- textproc/py-elasticsearch-dsl-py/Makefile +++ textproc/py-elasticsearch-dsl-py/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= elastic Index: textproc/py-elasticsearch-py/Makefile =================================================================== --- textproc/py-elasticsearch-py/Makefile +++ textproc/py-elasticsearch-py/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8.2:net/py-urllib3@${FLAVOR} NO_ARCH= yes USE_GITHUB= yes Index: textproc/py-elasticsearch2-dsl-py/Makefile =================================================================== --- textproc/py-elasticsearch2-dsl-py/Makefile +++ textproc/py-elasticsearch2-dsl-py/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= elastic Index: textproc/py-elib.intl/Makefile =================================================================== --- textproc/py-elib.intl/Makefile +++ textproc/py-elib.intl/Makefile @@ -18,7 +18,7 @@ PORTSCOUT= ignore:1 NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: textproc/py-enchant/Makefile =================================================================== --- textproc/py-enchant/Makefile +++ textproc/py-enchant/Makefile @@ -21,7 +21,7 @@ WX_DESC= Provide a wxSpellCheckerDialog OPTIONS_SUB= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils WX_USE= WX=3.0+ Index: textproc/py-errorhandler/Makefile =================================================================== --- textproc/py-errorhandler/Makefile +++ textproc/py-errorhandler/Makefile @@ -11,7 +11,7 @@ MAINTAINER= dikshie@sfc.wide.ad.jp COMMENT= Logging framework handler that tracks when messages above a certain level have been logged -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: textproc/py-feedparser/Makefile =================================================================== --- textproc/py-feedparser/Makefile +++ textproc/py-feedparser/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES?= python tar:bzip2 +USES= python tar:bzip2 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: textproc/py-genshi/Makefile =================================================================== --- textproc/py-genshi/Makefile +++ textproc/py-genshi/Makefile @@ -23,7 +23,7 @@ .include .if ${PORT_OPTIONS:MBABEL} -RUN_DEPENDS+= ${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel +RUN_DEPENDS+= ${PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR} .endif .include Index: textproc/py-humanfriendly/Makefile =================================================================== --- textproc/py-humanfriendly/Makefile +++ textproc/py-humanfriendly/Makefile @@ -13,13 +13,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils .include .if ${PYTHON_REL} < 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}monotonic>0:devel/py-monotonic@${FLAVOR} .endif .include Index: textproc/py-hunspell/Makefile =================================================================== --- textproc/py-hunspell/Makefile +++ textproc/py-hunspell/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libhunspell-${HSPLVER}.so:textproc/hunspell -USES?= python +USES= python USES+= localbase USE_PYTHON= distutils Index: textproc/py-hyperestraier-python/Makefile =================================================================== --- textproc/py-hyperestraier-python/Makefile +++ textproc/py-hyperestraier-python/Makefile @@ -13,7 +13,7 @@ COMMENT= Pure Python HyperEstraier library WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python +USES= python:2.7 USE_PYTHON= distutils PORTEXAMPLES= example.py asyn_example.py Index: textproc/py-hypua2jamo/Makefile =================================================================== --- textproc/py-hypua2jamo/Makefile +++ textproc/py-hypua2jamo/Makefile @@ -10,7 +10,7 @@ MAINTAINER= zi@FreeBSD.org COMMENT= Convert Hanyang-PUA code to unicode Hangul Jamo -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: textproc/py-libtre/Makefile =================================================================== --- textproc/py-libtre/Makefile +++ textproc/py-libtre/Makefile @@ -17,7 +17,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= distutils autoplist BUILD_WRKSRC= ${WRKSRC}/python Index: textproc/py-libxml2/Makefile =================================================================== --- textproc/py-libxml2/Makefile +++ textproc/py-libxml2/Makefile @@ -14,8 +14,8 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USE_GNOME+= libxml2 -USES+= python:2 gettext-runtime +USE_GNOME= libxml2 +USES= python gettext-runtime USE_PYTHON= autoplist distutils CPPFLAGS+= `${PYTHON_CMD}-config --cflags` Index: textproc/py-libxslt/Makefile =================================================================== --- textproc/py-libxslt/Makefile +++ textproc/py-libxslt/Makefile @@ -7,6 +7,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Python interface for XSLT C library for GNOME +py34_BROKEN= does not package +py35_BROKEN= does not package +py36_BROKEN= does not package + MASTERDIR= ${.CURDIR}/../libxslt BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${BUILD_WRKSRC} @@ -15,6 +19,7 @@ USE_GNOME= libxslt USES+= python +USE_PYTHON= flavors CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-python=${PYTHON_CMD} Index: textproc/py-ltxml/Makefile =================================================================== --- textproc/py-ltxml/Makefile +++ textproc/py-ltxml/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml RUN_DEPENDS= ${LOCALBASE}/include/ltxml12/lt-safe.h:textproc/ltxml -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_LDCONFIG= yes Index: textproc/py-m2r/Makefile =================================================================== --- textproc/py-m2r/Makefile +++ textproc/py-m2r/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune \ - ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mistune>0:textproc/py-mistune@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} # Actually 2.7,3.4+ USES= python @@ -27,7 +27,7 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif do-test: Index: textproc/py-mako/Makefile =================================================================== --- textproc/py-mako/Makefile +++ textproc/py-mako/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beaker>=1.1:www/py-beaker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.9.2:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-markdown/Makefile =================================================================== --- textproc/py-markdown/Makefile +++ textproc/py-markdown/Makefile @@ -14,11 +14,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: textproc/py-mistune/Makefile =================================================================== --- textproc/py-mistune/Makefile +++ textproc/py-mistune/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-nltk/Makefile =================================================================== --- textproc/py-nltk/Makefile +++ textproc/py-nltk/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.09:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-numpydoc/Makefile =================================================================== --- textproc/py-numpydoc/Makefile +++ textproc/py-numpydoc/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py-sphinx@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: textproc/py-openpyxl/Makefile =================================================================== --- textproc/py-openpyxl/Makefile +++ textproc/py-openpyxl/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.rst -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal \ - ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jdcal>=0:devel/py-jdcal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}et_xmlfile>=0:textproc/py-et_xmlfile@${FLAVOR} NO_ARCH= yes USES= python Index: textproc/py-paragrep/Makefile =================================================================== --- textproc/py-paragrep/Makefile +++ textproc/py-paragrep/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}grizzled>=0.8.1:devel/py-grizzled@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: textproc/py-parsel/Makefile =================================================================== --- textproc/py-parsel/Makefile +++ textproc/py-parsel/Makefile @@ -11,11 +11,11 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.0.0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}w3lib>=1.8.0:www/py-w3lib@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-parsimonious/Makefile =================================================================== --- textproc/py-parsimonious/Makefile +++ textproc/py-parsimonious/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: textproc/py-pyPEG2/Makefile =================================================================== --- textproc/py-pyPEG2/Makefile +++ textproc/py-pyPEG2/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES?= python +USES= python USE_PYTHON= autoplist distutils NO_ARCH= yes Index: textproc/py-pyelasticsearch/Makefile =================================================================== --- textproc/py-pyelasticsearch/Makefile +++ textproc/py-pyelasticsearch/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi \ - ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}elasticsearch-py>=1.3.0:textproc/py-elasticsearch-py@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=3.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.8:net/py-urllib3@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-pyes/Makefile =================================================================== --- textproc/py-pyes/Makefile +++ textproc/py-pyes/Makefile @@ -11,8 +11,8 @@ MAINTAINER= dvl@FreeBSD.org COMMENT= Python connector for ElasticSearch - the pythonic way to use ElasticSearch -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: textproc/py-pygments/Makefile =================================================================== --- textproc/py-pygments/Makefile +++ textproc/py-pygments/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -USES?= python +USES= python USE_PYTHON= distutils concurrent autoplist NO_ARCH= yes Index: textproc/py-pyhwp/Makefile =================================================================== --- textproc/py-pyhwp/Makefile +++ textproc/py-pyhwp/Makefile @@ -11,14 +11,14 @@ MAINTAINER= zi@FreeBSD.org COMMENT= HWP Document Format v5 parser & processor -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel \ - ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile \ - ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo \ - ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}olefile>=0.40:devel/py-olefile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hypua2jamo>0:textproc/py-hypua2jamo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docopt>0:devel/py-docopt@${FLAVOR} BUILD_DEPENDS:= ${RUN_DEPENDS} -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist .include Index: textproc/py-pyscss/Makefile =================================================================== --- textproc/py-pyscss/Makefile +++ textproc/py-pyscss/Makefile @@ -12,11 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 \ - ${PYTHON_PKGNAMEPREFIX}pathlib>0:devel/py-pathlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PY_ENUM34} ${PY_PATHLIB} LIB_DEPENDS= libpcre.so:devel/pcre -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Kronuz Index: textproc/py-pysrt/Makefile =================================================================== --- textproc/py-pysrt/Makefile +++ textproc/py-pysrt/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-pystemmer/Makefile =================================================================== --- textproc/py-pystemmer/Makefile +++ textproc/py-pystemmer/Makefile @@ -16,7 +16,7 @@ LICENSE= MIT BSD3CLAUSE LICENSE_COMB= dual -USES?= python +USES= python USE_PYTHON= distutils autoplist post-install: Index: textproc/py-python-augeas/Makefile =================================================================== --- textproc/py-python-augeas/Makefile +++ textproc/py-python-augeas/Makefile @@ -12,7 +12,11 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi +py34_BROKEN= does not package +py35_BROKEN= does not package +py36_BROKEN= does not package + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi@${FLAVOR} LIB_DEPENDS= libaugeas.so:textproc/augeas USES= python Index: textproc/py-python-docx/Makefile =================================================================== --- textproc/py-python-docx/Makefile +++ textproc/py-python-docx/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.3.4:devel/py-lxml@${FLAVOR} # Python3 ready USES= python Index: textproc/py-python-slugify/Makefile =================================================================== --- textproc/py-python-slugify/Makefile +++ textproc/py-python-slugify/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.16:converters/py-unidecode@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-qrcode/Makefile =================================================================== --- textproc/py-qrcode/Makefile +++ textproc/py-qrcode/Makefile @@ -13,18 +13,10 @@ LICENSE= BSD3CLAUSE -USES?= python -USE_PYTHON= autoplist distutils - -.include +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${FLAVOR} -.if ${PYTHON_REL} > 3000 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py3-pillow -.else -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.8:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow -.endif - -.include +USES= python +USE_PYTHON= autoplist distutils +.include Index: textproc/py-qt4-xml/Makefile =================================================================== --- textproc/py-qt4-xml/Makefile +++ textproc/py-qt4-xml/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= corelib xml moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: textproc/py-qt4-xmlpatterns/Makefile =================================================================== --- textproc/py-qt4-xmlpatterns/Makefile +++ textproc/py-qt4-xmlpatterns/Makefile @@ -12,6 +12,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run network_run +USE_PYTHON= flavors USE_QT4= corelib network xmlpatterns moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: textproc/py-qt5-xml/Makefile =================================================================== --- textproc/py-qt5-xml/Makefile +++ textproc/py-qt5-xml/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:5 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core xml buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG Index: textproc/py-qt5-xmlpatterns/Makefile =================================================================== --- textproc/py-qt5-xmlpatterns/Makefile +++ textproc/py-qt5-xmlpatterns/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:5 USE_PYQT= sip_build core_run network_run +USE_PYTHON= flavors USE_QT5= core network xmlpatterns qmake_build OPTIONS_DEFINE= API DEBUG Index: textproc/py-rdflib/Makefile =================================================================== --- textproc/py-rdflib/Makefile +++ textproc/py-rdflib/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}isodate>=0:devel/py-isodate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.1:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sparqlwrapper>=1.5.2:textproc/py-sparqlwrapper@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-rst2html5/Makefile =================================================================== --- textproc/py-rst2html5/Makefile +++ textproc/py-rst2html5/Makefile @@ -12,11 +12,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.12:textproc/py-docutils@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: textproc/py-rstyoutube/Makefile =================================================================== --- textproc/py-rstyoutube/Makefile +++ textproc/py-rstyoutube/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: textproc/py-rxp/Makefile =================================================================== --- textproc/py-rxp/Makefile +++ textproc/py-rxp/Makefile @@ -15,7 +15,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES NO_WRKSUBDIR= yes -USES= python tar:tgz +USES= python:2.7 tar:tgz USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/py-rxp Index: textproc/py-scour/Makefile =================================================================== --- textproc/py-scour/Makefile +++ textproc/py-scour/Makefile @@ -12,7 +12,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-snowballstemmer/Makefile =================================================================== --- textproc/py-snowballstemmer/Makefile +++ textproc/py-snowballstemmer/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE -USES?= python +USES= python USE_PYTHON= distutils autoplist OPTIONS_DEFINE= PYSTEMMER OPTIONS_DEFAULT=PYSTEMMER PYSTEMMER_DESC= Use PyStemmer to accelerate -PYSTEMMER_RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer +PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py-pystemmer@${FLAVOR} .include Index: textproc/py-sphinx-hieroglyph/Makefile =================================================================== --- textproc/py-sphinx-hieroglyph/Makefile +++ textproc/py-sphinx-hieroglyph/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.4:textproc/py-sphinx@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= nyergler Index: textproc/py-sphinx-intl/Makefile =================================================================== --- textproc/py-sphinx-intl/Makefile +++ textproc/py-sphinx-intl/Makefile @@ -14,9 +14,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx \ - ${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib \ - ${PKGNAMEPREFIX}six>=1.8.0:devel/py-six +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} \ + ${PKGNAMEPREFIX}polib>=1.0.6:devel/py-polib@${FLAVOR} \ + ${PKGNAMEPREFIX}six>=1.8.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-sphinx/Makefile =================================================================== --- textproc/py-sphinx/Makefile +++ textproc/py-sphinx/Makefile @@ -17,23 +17,22 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel\ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme \ - ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster \ - ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py-sphinx_rtd_theme@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py-alabaster@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py-snowballstemmer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py-imagesize@${FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -USES?= python -USE_PYTHON= autoplist distutils +USES= python +USE_PYTHON= autoplist distutils concurrent NO_ARCH= yes .include Index: textproc/py-sphinx_numfig/Makefile =================================================================== --- textproc/py-sphinx_numfig/Makefile +++ textproc/py-sphinx_numfig/Makefile @@ -12,9 +12,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR} -USES= python tar:tgz +USES= python:2.7 tar:tgz +USE_PYTHON= flavors NO_BUILD= yes SPHINXDIR= ${PYTHON_LIBDIR}/site-packages/sphinx PLIST_FILES= ${SPHINXDIR}/ext/numfig.py ${SPHINXDIR}/ext/numfig.pyc Index: textproc/py-sphinx_rtd_theme/Makefile =================================================================== --- textproc/py-sphinx_rtd_theme/Makefile +++ textproc/py-sphinx_rtd_theme/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE NO_ARCH= yes -USES?= python +USES= python USE_PYTHON= distutils autoplist .include Index: textproc/py-sphinx_wikipedia/Makefile =================================================================== --- textproc/py-sphinx_wikipedia/Makefile +++ textproc/py-sphinx_wikipedia/Makefile @@ -11,9 +11,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.3.1:textproc/py-sphinx@${FLAVOR} USES= python +USE_PYTHON= flavors NO_BUILD= yes USE_GITHUB= yes GH_ACCOUNT= quiver Index: textproc/py-sphinxcontrib-adadomain/Makefile =================================================================== --- textproc/py-sphinxcontrib-adadomain/Makefile +++ textproc/py-sphinxcontrib-adadomain/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-sphinxcontrib-bitbucket/Makefile =================================================================== --- textproc/py-sphinxcontrib-bitbucket/Makefile +++ textproc/py-sphinxcontrib-bitbucket/Makefile @@ -11,7 +11,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Sphinx/BitBucket integration -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-sphinxcontrib-fulltoc/Makefile =================================================================== --- textproc/py-sphinxcontrib-fulltoc/Makefile +++ textproc/py-sphinxcontrib-fulltoc/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +BUILD_DEPENDS= ${PKGNAMEPREFIX}pbr>=1.8.1:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-sphinxcontrib-httpdomain/Makefile =================================================================== --- textproc/py-sphinxcontrib-httpdomain/Makefile +++ textproc/py-sphinxcontrib-httpdomain/Makefile @@ -10,7 +10,7 @@ MAINTAINER= wg@FreeBSD.org COMMENT= Sphinx domain for HTTP APIs -RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx +RUN_DEPENDS= ${PKGNAMEPREFIX}sphinx>=1.1.3:textproc/py-sphinx@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-sphinxcontrib-programoutput/Makefile =================================================================== --- textproc/py-sphinxcontrib-programoutput/Makefile +++ textproc/py-sphinxcontrib-programoutput/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.3.5:textproc/py-sphinx@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: textproc/py-syck/Makefile =================================================================== --- textproc/py-syck/Makefile +++ textproc/py-syck/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libsyck.a:textproc/syck -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-patch: Index: textproc/py-texttable/Makefile =================================================================== --- textproc/py-texttable/Makefile +++ textproc/py-texttable/Makefile @@ -13,10 +13,10 @@ LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes Index: textproc/py-toronado/Makefile =================================================================== --- textproc/py-toronado/Makefile +++ textproc/py-toronado/Makefile @@ -10,9 +10,9 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Fast lxml-based CSS stylesheet inliner -RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +RUN_DEPENDS:= ${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: textproc/py-trans/Makefile =================================================================== --- textproc/py-trans/Makefile +++ textproc/py-trans/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 USE_PYTHON= autoplist distutils .include Index: textproc/py-transifex-client/Makefile =================================================================== --- textproc/py-transifex-client/Makefile +++ textproc/py-transifex-client/Makefile @@ -13,8 +13,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils Index: textproc/py-wicked/Makefile =================================================================== --- textproc/py-wicked/Makefile +++ textproc/py-wicked/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: textproc/py-wstools/Makefile =================================================================== --- textproc/py-wstools/Makefile +++ textproc/py-wstools/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes -USES= python:2.7+ +USES= python USE_PYTHON= autoplist distutils .include Index: textproc/py-wtforms/Makefile =================================================================== --- textproc/py-wtforms/Makefile +++ textproc/py-wtforms/Makefile @@ -15,11 +15,11 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} OPTIONS_DEFINE= DOCS Index: textproc/py-xlutils/Makefile =================================================================== --- textproc/py-xlutils/Makefile +++ textproc/py-xlutils/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd \ - ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python:2 Index: textproc/py-xlwriter/Makefile =================================================================== --- textproc/py-xlwriter/Makefile +++ textproc/py-xlwriter/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python library for generating Excel-compatible spreadsheets -USES= python zip +USES= python:2.7 zip USE_PYTHON= distutils autoplist PORTEXAMPLES= * Index: textproc/py-xlwt/Makefile =================================================================== --- textproc/py-xlwt/Makefile +++ textproc/py-xlwt/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD4CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= autoplist concurrent distutils .include Index: textproc/py-zope.app.i18n/Makefile =================================================================== --- textproc/py-zope.app.i18n/Makefile +++ textproc/py-zope.app.i18n/Makefile @@ -13,17 +13,17 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.9:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: textproc/py-zope.app.locales/Makefile =================================================================== --- textproc/py-zope.app.locales/Makefile +++ textproc/py-zope.app.locales/Makefile @@ -13,11 +13,11 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} NO_ARCH= yes USES= python:-2.7 Index: textproc/py-zope.tal/Makefile =================================================================== --- textproc/py-zope.tal/Makefile +++ textproc/py-zope.tal/Makefile @@ -13,8 +13,8 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} USES= python zip USE_PYTHON= distutils autoplist Index: textproc/py3-MarkupSafe/Makefile =================================================================== --- textproc/py3-MarkupSafe/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -PORTNAME= MarkupSafe -PORTVERSION= 1.0 -CATEGORIES= textproc python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Implements XML/HTML/XHTML Markup safe string for Python - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= python:3.3+ -USE_PYTHON= autoplist concurrent distutils - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/markupsafe/_speedups.so - -.include Index: textproc/py3-MarkupSafe/distinfo =================================================================== --- textproc/py3-MarkupSafe/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1489176826 -SHA256 (MarkupSafe-1.0.tar.gz) = a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 -SIZE (MarkupSafe-1.0.tar.gz) = 14356 Index: textproc/py3-MarkupSafe/pkg-descr =================================================================== --- textproc/py3-MarkupSafe/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -py-MarkupSafe is a python module that implements a XML/HTML/XHTML Markup -safe string. - -WWW: https://pypi.python.org/pypi/MarkupSafe/ Index: textproc/py3-alabaster/Makefile =================================================================== --- textproc/py3-alabaster/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-alabaster - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-asciinema/distinfo =================================================================== --- /dev/null +++ textproc/py3-asciinema/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1492048411 -SHA256 (asciinema-1.4.0.tar.gz) = fb31457e7a4689340b872f625658dbaea33bcf6863fb5d696cf3857010432ecb -SIZE (asciinema-1.4.0.tar.gz) = 9980 Index: textproc/py3-asciinema/pkg-descr =================================================================== --- /dev/null +++ textproc/py3-asciinema/pkg-descr @@ -1,3 +0,0 @@ -Record and share your terminal sesions, the right way. - -WWW: https://asciinema.org/ Index: textproc/py3-chardet/Makefile =================================================================== --- textproc/py3-chardet/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Muhammad Moinur Rahman -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-chardet - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py3-pytest-runner - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-docutils/Makefile =================================================================== --- textproc/py3-docutils/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-docutils - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py3-pygments - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-feedparser/Makefile =================================================================== --- textproc/py3-feedparser/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-feedparser - -USES= python:3.3+ tar:bzip2 - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-humanfriendly/Makefile =================================================================== --- textproc/py3-humanfriendly/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-humanfriendly - -PORTSCOUT= ignore:1 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-hunspell/Makefile =================================================================== --- textproc/py3-hunspell/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-hunspell - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-libxml2/Makefile =================================================================== --- textproc/py3-libxml2/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Created by: Alexander Nedotsukov -# $FreeBSD$ - -PORTREVISION= 0 -CATEGORIES= textproc gnome python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python interface for XML parser library for GNOME - -MASTERDIR= ${.CURDIR}/../libxml2 -BUILD_WRKSRC= ${WRKSRC}/python -INSTALL_WRKSRC= ${BUILD_WRKSRC} -DESCR= ${.CURDIR}/pkg-descr -PLIST= ${.CURDIR}/pkg-plist - -USE_GNOME+= libxml2 -USES= python:3 gettext-runtime -USE_PYTHON= autoplist distutils - -CPPFLAGS+= `${PYTHON_CMD}-config --cflags` -LDFLAGS+= -L${LOCALBASE}/lib `${PYTHON_CMD}-config --libs` -CONFIGURE_ARGS= --with-iconv=${ICONV_PREFIX} \ - --with-html-dir=${PREFIX}/share/doc \ - --with-html-subdir=${PORTNAME} \ - --with-python=${PYTHON_CMD} - -DOCSDIR= ${PREFIX}/share/doc/py-libxml2 -EXAMPLESDIR= ${PREFIX}/share/examples/py-libxml2 - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/libxml2mod.so - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-libxml2/pkg-descr =================================================================== --- textproc/py3-libxml2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python interface for XML parser library for GNOME - -WWW: http://xmlsoft.org/ Index: textproc/py3-numpydoc/Makefile =================================================================== --- textproc/py3-numpydoc/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-numpydoc - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=1.2.3:textproc/py3-sphinx -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py3-nose - -USES= python:3.4+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-pager/Makefile =================================================================== --- /dev/null +++ textproc/py3-pager/Makefile @@ -1,19 +0,0 @@ -# Created by: Babak Farrokhi -# $FreeBSD$ - -PORTNAME= pager -PORTVERSION= 3.3 -PORTREVISION= 1 -CATEGORIES= textproc python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= farrokhi@FreeBSD.org -COMMENT= Terminal/console pager module - -LICENSE= BSD3CLAUSE - -USES= python:3.3+ -USE_PYTHON= autoplist concurrent distutils - -.include Index: textproc/py3-pager/distinfo =================================================================== --- /dev/null +++ textproc/py3-pager/distinfo @@ -1,3 +0,0 @@ -TIMESTAMP = 1468917575 -SHA256 (pager-3.3.tar.gz) = 18aa45ec877dca732e599531c7b3b0b22ed6a4445febdf1bdf7da2761cca340d -SIZE (pager-3.3.tar.gz) = 10803 Index: textproc/py3-pager/pkg-descr =================================================================== --- /dev/null +++ textproc/py3-pager/pkg-descr @@ -1,4 +0,0 @@ -Python module that pages output to the screen, reads keys and console -dimensions without executing external utils. - -WWW: https://pypi.python.org/pypi/pager/ Index: textproc/py3-pyPEG2/Makefile =================================================================== --- textproc/py3-pyPEG2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pyPEG2 - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-pygments/Makefile =================================================================== --- textproc/py3-pygments/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pygments - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-pystemmer/Makefile =================================================================== --- textproc/py3-pystemmer/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-pystemmer - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-qrcode/Makefile =================================================================== --- textproc/py3-qrcode/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-qrcode - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-snowballstemmer/Makefile =================================================================== --- textproc/py3-snowballstemmer/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-snowballstemmer - -USES= python:3.3+ - -PYSTEMMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystemmer>0:textproc/py3-pystemmer - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-sphinx/Makefile =================================================================== --- textproc/py3-sphinx/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sphinx - -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py3-docutils \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel\ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:devel/py3-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py3-docutils \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py3-pygments \ - ${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py3-babel \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:textproc/py3-sphinx_rtd_theme \ - ${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:textproc/py3-alabaster \ - ${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:textproc/py3-snowballstemmer \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py3-six \ - ${PYTHON_PKGNAMEPREFIX}imagesize>=0.7.1:graphics/py3-imagesize \ - ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-sphinx_rtd_theme/Makefile =================================================================== --- textproc/py3-sphinx_rtd_theme/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Danilo G. Baio -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-sphinx_rtd_theme - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/py3-texttable/Makefile =================================================================== --- textproc/py3-texttable/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-texttable - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: textproc/sigil/Makefile =================================================================== --- textproc/sigil/Makefile +++ textproc/sigil/Makefile @@ -14,14 +14,14 @@ LIB_DEPENDS= libminizip.so:archivers/minizip \ libpcre.so:devel/pcre \ libhunspell-1.6.so:textproc/hunspell -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= Sigil-Ebook GH_PROJECT= Sigil USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - pkgconfig python:3 shebangfix + pkgconfig python:3.4+ shebangfix SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \ src/Resource_Files/python3lib/*.py USE_QT5= concurrent core gui network printsupport svg webkit \ Index: textproc/silvercity/Makefile =================================================================== --- textproc/silvercity/Makefile +++ textproc/silvercity/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Lexing package for over 20 programming and markup languages -USES= dos2unix python +USES= dos2unix python:2.7 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= SilverCity Index: textproc/translate-toolkit/Makefile =================================================================== --- textproc/translate-toolkit/Makefile +++ textproc/translate-toolkit/Makefile @@ -11,21 +11,21 @@ LICENSE= GPLv2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0:deskutils/py-vobject@${FLAVOR} \ msghack:devel/gettext-msghack \ - ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse \ - ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ + ${PYTHON_PKGNAMEPREFIX}iniparse>=0:devel/py-iniparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}levenshtein>=0:devel/py-levenshtein@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ iso-codes>=1.3:misc/iso-codes \ bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib + ${PYTHON_PKGNAMEPREFIX}utidylib>=0:www/py-utidylib@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} # Can use psyco (on i386) NO_ARCH= yes -USES= gettext python:2.7+ +USES= gettext python:2.7 USE_PYTHON= autoplist distutils # list of manual pages to generate Index: textproc/xml2rfc/Makefile =================================================================== --- textproc/xml2rfc/Makefile +++ textproc/xml2rfc/Makefile @@ -11,10 +11,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.8:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.5.0:www/py-requests@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include Index: textproc/xsv/Makefile =================================================================== --- textproc/xsv/Makefile +++ textproc/xsv/Makefile @@ -13,9 +13,9 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ltxml>0:textproc/py-ltxml@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: textproc/yould/Makefile =================================================================== --- textproc/yould/Makefile +++ textproc/yould/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -1884,9 +1884,6 @@ SUBDIR += py-wsgidav SUBDIR += py-yarl SUBDIR += py-zope.app.wsgi - SUBDIR += py3-cssutils - SUBDIR += py3-httplib2 - SUBDIR += py3-requests SUBDIR += pyblosxom SUBDIR += pycarddav SUBDIR += pydio Index: www/butterfly/Makefile =================================================================== --- www/butterfly/Makefile +++ www/butterfly/Makefile @@ -11,12 +11,13 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}libsass>0:www/py-libsass@${FLAVOR} USES= python -USE_PYTHON= autoplist distutils +# Can't use concurrent here, it changes ETCDIR, and breaks post-install. +USE_PYTHON= autoplist distutils optsuffix NO_ARCH= yes USE_RC_SUBR= butterfly SUB_FILES= pkg-message Index: www/calendarserver/Makefile =================================================================== --- www/calendarserver/Makefile +++ www/calendarserver/Makefile @@ -12,21 +12,21 @@ LICENSE= APACHE20 RUN_DEPENDS= memcached:databases/memcached \ - ${PYTHON_PKGNAMEPREFIX}calendar>=2.1:devel/py-calendar \ - ${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000 \ - ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2016.7:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \ - ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}twext>=0.20160817:devel/py-twext \ - ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface + ${PYTHON_PKGNAMEPREFIX}calendar>=2.1:devel/py-calendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyGreSQL>=5.0:databases/py-PyGreSQL@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6.1:security/py-pycrypto@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pg8000>=1.10.6:databases/py-pg8000@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2016.7:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.10:devel/py-setproctitle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twext>=0.20160817:devel/py-twext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.1:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xattr>=0.7.8:devel/py-xattr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.3:devel/py-zope.interface@${FLAVOR} PORTDOCS= * PORTEXAMPLES= * Index: www/chromium/Makefile =================================================================== --- www/chromium/Makefile +++ www/chromium/Makefile @@ -16,8 +16,8 @@ BUILD_DEPENDS= python:lang/python \ bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ .if !defined(GN_ONLY) BUILD_DEPENDS+= gperf:devel/gperf \ @@ -28,7 +28,7 @@ node:www/node \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} .endif .if !defined(GN_ONLY) Index: www/feedjack/Makefile =================================================================== --- www/feedjack/Makefile +++ www/feedjack/Makefile @@ -10,11 +10,11 @@ MAINTAINER= flz@FreeBSD.org COMMENT= Feed aggregator written in Python using the Django framework -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser \ - django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR} \ + django-admin.py:www/py-django18@${FLAVOR} DIST_SUBDIR= python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/geeknote/Makefile =================================================================== --- www/geeknote/Makefile +++ www/geeknote/Makefile @@ -11,12 +11,12 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote \ - ${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2 \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}evernote>=1.17:www/py-evernote@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html2text>0:textproc/py-html2text@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown2>0:textproc/py-markdown2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${FLAVOR} USES= python:-2.7 USE_GITHUB= yes Index: www/google-appengine/Makefile =================================================================== --- www/google-appengine/Makefile +++ www/google-appengine/Makefile @@ -14,9 +14,9 @@ LICENSE= APACHE20 BSD3CLAUSE GPLv2 LGPL21 MIT MPL11 PSFL LICENSE_COMB= multi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=${PYTHON_VER}:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=2.6:security/py-pycrypto@${PY_FLAVOR} NO_BUILD= yes @@ -40,7 +40,7 @@ gen_protorpc.py php_cli.py remote_api_shell.py \ run_tests.py wrapper_util.py -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR} PHP_USE= mysql=server PHP_VARS= gaedatadir+=php want_mysql_ver=55 Index: www/iridium/Makefile =================================================================== --- www/iridium/Makefile +++ www/iridium/Makefile @@ -25,9 +25,9 @@ node:www/node \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ - ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ Index: www/jtoolkit/Makefile =================================================================== --- www/jtoolkit/Makefile +++ www/jtoolkit/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Webapp framework with modpython-based and stand-alone modes -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid@${FLAVOR} # Has optional dependencies on database engines # Can optionally use py-lucene (on i386) Index: www/linkchecker/Makefile =================================================================== --- www/linkchecker/Makefile +++ www/linkchecker/Makefile @@ -14,8 +14,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \ - ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2:www/py-requests@${FLAVOR} WRKSRC= ${WRKDIR}/${DISTNAME} @@ -31,7 +31,7 @@ CLAMAV_DESC= Clam Antivirus CLAMAV_RUN_DEPENDS= clamscan:security/clamav -GEOIP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GeoIP>0:net/py-GeoIP +GEOIP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}GeoIP>0:net/py-GeoIP@${FLAVOR} GTK2_USE= gnome=pygtk2 LOGIN_DESC= Login form submission LOGIN_RUN_DEPENDS= twill>=0:www/twill @@ -39,11 +39,11 @@ QT4_EXTRA_PATCHES_OFF= ${PATCHDIR}/extra-patch-noqt-setup.py QT4_USES= pyqt:4 QT4_USE= PYQT=core_run,gui_run,help_run,qscintilla2_run,sql_run -SQLITE3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +SQLITE3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} SYNTAX_DESC= HTML/CSS syntax check SYNTAX_RUN_DEPENDS=\ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}utidylib>=0.2:www/py-utidylib + ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.5:www/py-cssutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}utidylib>=0.2:www/py-utidylib@${FLAVOR} .include Index: www/mitmproxy/Makefile =================================================================== --- www/mitmproxy/Makefile +++ www/mitmproxy/Makefile @@ -12,34 +12,32 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.2:devel/py3-click \ - ${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker \ - ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi \ - ${PYTHON_PKGNAMEPREFIX}construct28>=2.8:devel/py-construct28 \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1:www/py-cssutils \ - ${PYTHON_PKGNAMEPREFIX}html2text>=2016.1.8:textproc/py-html2text \ - ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib \ - ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \ - ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.3:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.13.2:devel/py-ruamel.yaml \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.1:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.3:devel/py-watchdog \ - ${PYTHON_PKGNAMEPREFIX}brotli>=0.5.1:archivers/py-brotli \ - ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.4:devel/py-sortedcontainers \ - ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.22:devel/py-pyperclip \ - ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe \ - ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=0.6:devel/py-kaitaistruct \ - ${PYTHON_PKGNAMEPREFIX}jsbeautifier>=1.6.3:devel/py-jsbeautifier \ - ${PYTHON_PKGNAMEPREFIX}h2>=3.0.0:www/py-h2 - -BROKEN= fails in dependency check: mitmproxy-2.0.1 depends on package: py36-blinker>=1.4 - not found +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=6.2:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}blinker>=1.4:devel/py-blinker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}construct28>=2.8:devel/py-construct28@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1:www/py-cssutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html2text>=2016.1.8:textproc/py-html2text@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.3:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.9.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.13.2:devel/py-ruamel.yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>=1.3.1:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.3:devel/py-watchdog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}brotli>=0.5.1:archivers/py-brotli@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.4:devel/py-sortedcontainers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.22:devel/py-pyperclip@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kaitaistruct>=0.6:devel/py-kaitaistruct@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsbeautifier>=1.6.3:devel/py-jsbeautifier@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}h2>=3.0.0:www/py-h2@${FLAVOR} USES= python:3.5+ -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist optsuffix NO_ARCH= yes USE_GITHUB= yes Index: www/moinmoin/Makefile =================================================================== --- www/moinmoin/Makefile +++ www/moinmoin/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/docs/licenses/COPYING -USES= cpe python shebangfix +USES= cpe python:2.7 shebangfix CPE_VENDOR= moinmo USE_PYTHON= distutils PYDISTUTILS_PKGNAME= moin Index: www/planet/Makefile =================================================================== --- www/planet/Makefile +++ www/planet/Makefile @@ -12,7 +12,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:devel/py-mx-experimental \ ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb -USES= python tar:bzip2 +USES= python:2.7 tar:bzip2 NO_BUILD= yes NO_ARCH= yes SUB_FILES= pkg-message Index: www/plone/Makefile =================================================================== --- www/plone/Makefile +++ www/plone/Makefile @@ -12,20 +12,20 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:www/py-Products.CMFPlone \ - ${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:www/py-plone.app.caching \ - ${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:www/py-plone.app.dexterity \ - ${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:www/py-plone.app.iterate \ - ${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:security/py-plone.app.openid \ - ${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:www/py-plone.app.theming \ - ${PYTHON_PKGNAMEPREFIX}wicked>=0:textproc/py-wicked +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFPlone>=0:www/py-Products.CMFPlone@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.caching>=0:www/py-plone.app.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.dexterity>0:www/py-plone.app.dexterity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.iterate>=0:www/py-plone.app.iterate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.openid>=0:security/py-plone.app.openid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.theming>0:www/py-plone.app.theming@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wicked>=0:textproc/py-wicked@${FLAVOR} OPTIONS_DEFINE= LDAP -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap +LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.ldap>=1.2.6:www/py-plone.app.ldap@${FLAVOR} NO_ARCH= yes -USES= cpe python +USES= cpe python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-HTMLgen/Makefile =================================================================== --- www/py-HTMLgen/Makefile +++ www/py-HTMLgen/Makefile @@ -15,6 +15,7 @@ COMMENT= Python library for the generation of HTML documents USES= python:2 shebangfix +USE_PYTHON= flavors NO_BUILD= yes NO_ARCH= yes SHEBANG_FILES= HTMLutil.py barchart.py Index: www/py-MechanicalSoup/Makefile =================================================================== --- www/py-MechanicalSoup/Makefile +++ www/py-MechanicalSoup/Makefile @@ -13,15 +13,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock \ - ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock@${FLAVOR} USE_GITHUB= yes Index: www/py-Products.CMFPlone/Makefile =================================================================== --- www/py-Products.CMFPlone/Makefile +++ www/py-Products.CMFPlone/Makefile @@ -12,108 +12,108 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:devel/py-Products.ATContentTypes \ - ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:devel/py-Products.CMFActionIcons \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \ - ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:devel/py-Products.ExtendedPathIndex \ - ${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:devel/py-Products.ExternalEditor \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.8.0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:devel/py-Products.PasswordResetTool \ - ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService \ - ${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:devel/py-Products.PloneLanguageTool \ - ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \ - ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries \ - ${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:www/py-Products.TinyMCE \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:devel/py-archetypes.querywidget \ - ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget \ - ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole \ - ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \ - ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:www/py-plone.app.blob \ - ${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:www/py-plone.app.collection \ - ${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:www/py-plone.app.content \ - ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:www/py-plone.app.contentlisting \ - ${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:www/py-plone.app.contentmenu \ - ${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:www/py-plone.app.contentrules \ - ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:www/py-plone.app.controlpanel \ - ${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:www/py-plone.app.customerize \ - ${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:www/py-plone.app.discussion \ - ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:www/py-plone.app.jquery \ - ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:www/py-plone.app.linkintegrity \ - ${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:www/py-plone.app.locales \ - ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:www/py-plone.app.redirector \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.app.search>0:www/py-plone.app.search \ - ${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:www/py-plone.app.upgrade \ - ${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:www/py-plone.app.users \ - ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:www/py-plone.app.viewletmanager \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow \ - ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \ - ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:www/py-plone.browserlayer \ - ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules \ - ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \ - ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext \ - ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:www/py-plone.portlet.collection \ - ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \ - ${PYTHON_PKGNAMEPREFIX}plone.theme>=0:www/py-plone.theme \ - ${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:www/py-plonetheme.classic \ - ${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:www/py-plonetheme.sunburst \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:devel/py-z3c.autoinclude \ - ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ATContentTypes>=2.1.3:devel/py-Products.ATContentTypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFActionIcons>=0:devel/py-Products.CMFActionIcons@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCalendar>=0:devel/py-Products.CMFCalendar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ExtendedPathIndex>=0:devel/py-Products.ExtendedPathIndex@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ExternalEditor>=0:devel/py-Products.ExternalEditor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.8.0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PasswordResetTool>=0:devel/py-Products.PasswordResetTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlacelessTranslationService>=0:devel/py-Products.PlacelessTranslationService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PloneLanguageTool>=0:devel/py-Products.PloneLanguageTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:devel/py-Products.PluginRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.TinyMCE>=0:www/py-Products.TinyMCE@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>0:devel/py-archetypes.querywidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}archetypes.referencebrowserwidget>=0:devel/py-archetypes.referencebrowserwidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.blob>=0:www/py-plone.app.blob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.collection>0:www/py-plone.app.collection@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.content>=0:www/py-plone.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>0:www/py-plone.app.contentlisting@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.contentmenu>=1.1.6:www/py-plone.app.contentmenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.contentrules>=0:www/py-plone.app.contentrules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=0:www/py-plone.app.controlpanel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.customerize>=0:www/py-plone.app.customerize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.discussion>=0:www/py-plone.app.discussion@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.jquery>0:www/py-plone.app.jquery@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.jquerytools>=0:www/py-plone.app.jquerytools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.1.7:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.linkintegrity>=1.0.3:www/py-plone.app.linkintegrity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.locales>=0:www/py-plone.app.locales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.redirector>=0:www/py-plone.app.redirector@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.search>0:www/py-plone.app.search@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.upgrade>=0:www/py-plone.app.upgrade@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.users>=0:www/py-plone.app.users@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=0:www/py-plone.app.viewletmanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=1.0rc4:www/py-plone.browserlayer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.intelligenttext>=0:www/py-plone.intelligenttext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>=0:www/py-plone.portlet.collection@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.protect>1.0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.theme>=0:www/py-plone.theme@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plonetheme.classic>=0:www/py-plonetheme.classic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plonetheme.sunburst>=0:www/py-plonetheme.sunburst@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.autoinclude>=0:devel/py-z3c.autoinclude@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.locales>=3.6.0:textproc/py-zope.app.locales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-Products.PloneLDAP/Makefile =================================================================== --- www/py-Products.PloneLDAP/Makefile +++ www/py-Products.PloneLDAP/Makefile @@ -13,9 +13,9 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins \ - ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.LDAPMultiPlugins>=1.10:devel/py-Products.LDAPMultiPlugins@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: www/py-Products.TinyMCE/Makefile =================================================================== --- www/py-Products.TinyMCE/Makefile +++ www/py-Products.TinyMCE/Makefile @@ -12,14 +12,14 @@ LICENSE= LGPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:www/py-plone.app.imaging \ - ${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:www/py-plone.outputfilters \ - ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}plone.caching>0:www/py-plone.caching \ - ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:devel/py-Products.ResourceRegistries \ - ${PYTHON_PKGNAMEPREFIX}zope.app.content>0:devel/py-zope.app.content \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>=1.0.2:www/py-plone.app.imaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.outputfilters>=0:www/py-plone.outputfilters@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.caching>0:www/py-plone.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>0:devel/py-Products.ResourceRegistries@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.content>0:devel/py-zope.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: www/py-WebError/Makefile =================================================================== --- www/py-WebError/Makefile +++ www/py-WebError/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:textproc/py-Tempita \ - ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.7:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Tempita>=0.3:textproc/py-Tempita@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:www/py-webob@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-WebTest/Makefile =================================================================== --- www/py-WebTest/Makefile +++ www/py-WebTest/Makefile @@ -11,14 +11,14 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${FLAVOR} USE_GITHUB= yes Index: www/py-aiohttp-wsgi/Makefile =================================================================== --- www/py-aiohttp-wsgi/Makefile +++ www/py-aiohttp-wsgi/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR} USES= python:3.4+ USE_PYTHON= autoplist distutils Index: www/py-aiohttp/Makefile =================================================================== --- www/py-aiohttp/Makefile +++ www/py-aiohttp/Makefile @@ -13,17 +13,16 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py3-chardet \ - ${PYTHON_PKGNAMEPREFIX}multidict>0:www/py-multidict \ - ${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl \ - ${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout \ - ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}multidict>0:www/py-multidict@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yarl>0:www/py-yarl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gunicorn>0:www/py-gunicorn@${FLAVOR} USES= python:3.4+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/aiohttp/*.so Index: www/py-autobahn/Makefile =================================================================== --- www/py-autobahn/Makefile +++ www/py-autobahn/Makefile @@ -13,11 +13,11 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius # Not really a depends, but the test doesnt skip +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}txaio>=2.2.0:devel/py-txaio@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.7.2:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}trollius>0:devel/py-trollius@${FLAVOR} # Not really a depends, but the test doesnt skip USES= python USE_GITHUB= yes @@ -29,37 +29,25 @@ GH_PROJECT= autobahn-python OPTIONS_DEFINE= ACCELERATE SERIALIZATION -OPTIONS_MULTI= BACKENDS -OPTIONS_MULTI_BACKENDS= ASYNCIO TWISTED -OPTIONS_DEFAULT= ACCELERATE SERIALIZATION TWISTED +OPTIONS_DEFAULT= ACCELERATE SERIALIZATION BACKENDS_DESC= Networking Backends ACCELERATE_DESC= WebSocket and JSON Acceleration -ASYNCIO_DESC= asyncio (PEP-3156) Backend (Python 3.x ONLY) SERIALIZATION_DESC= WAMPv2 Binary Serialization -TWISTED_DESC= Twisted Backend (Python 2.x ONLY) -ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel \ - ${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson +ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wsaccel>=0.6.2:www/py-wsaccel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ujson>=1.33:devel/py-ujson@${FLAVOR} -SERIALIZATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python - -TWISTED_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}twisted>=12.1:devel/py-twisted +SERIALIZATION_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.4.0:devel/py-msgpack-python@${FLAVOR} .include -.if ${PORT_OPTIONS:MTWISTED} && ${PYTHON_REL} >= 3000 -BROKEN= Twisted currently only supports Python 2.x. Disable the TWISTED option and use ASYNCIO instead -.endif - -.if ${PORT_OPTIONS:MASYNCIO} -.if ${PYTHON_REL} <= 3000 -BROKEN= ASYNCIO requires Python 3.x. Disable the ASYNCIO option and use TWISTED instead -.elif ${PYTHON_REL} <= 3300 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio -.endif +.if ${FLAVOR} == python2 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.6:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=12.1:devel/py-twisted@${FLAVOR} +.elif ${FLAVOR} == python3 && ${PYTHON_REL} <= 3300 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>=3.4.3:devel/py-asyncio@${FLAVOR} .endif do-test: Index: www/py-aws-requests-auth/Makefile =================================================================== --- www/py-aws-requests-auth/Makefile +++ www/py-aws-requests-auth/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.14.0:www/py-requests +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.14.0:www/py-requests@${FLAVOR} USES= python:2.7 USE_PYTHON= autoplist distutils Index: www/py-beaker/Makefile =================================================================== --- www/py-beaker/Makefile +++ www/py-beaker/Makefile @@ -20,7 +20,7 @@ .include .if ${PYTHON_REL} <= 3200 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}funcsigs>=1.0.2:devel/py-funcsigs@${FLAVOR} .endif .include Index: www/py-bleach/Makefile =================================================================== --- www/py-bleach/Makefile +++ www/py-bleach/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>=0.999:www/py-html5lib@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.3:devel/py-nose@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-blogofile/Makefile =================================================================== --- www/py-blogofile/Makefile +++ www/py-blogofile/Makefile @@ -13,17 +13,17 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: www/py-bokeh/Makefile =================================================================== --- www/py-bokeh/Makefile +++ www/py-bokeh/Makefile @@ -13,13 +13,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} \ ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado + ${PYTHON_PKGNAMEPREFIX}tornado>=4.3:www/py-tornado@${FLAVOR} USES= python USE_PYTHON= autoplist distutils concurrent @@ -29,7 +29,7 @@ .include .if ${PYTHON_REL} == 2700 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>3.0.3:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>3.0.3:devel/py-futures@${FLAVOR} .endif .include Index: www/py-boto3/Makefile =================================================================== --- www/py-boto3/Makefile +++ www/py-boto3/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.4.1:devel/py-botocore \ - ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath \ - ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.0:net/py-s3transfer -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.4.1:devel/py-botocore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1:devel/py-jmespath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.0:net/py-s3transfer@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} # Actually -2.7,3.3-3.5 USES= python Index: www/py-bottle-cork/Makefile =================================================================== --- www/py-bottle-cork/Makefile +++ www/py-bottle-cork/Makefile @@ -11,8 +11,8 @@ LICENSE= LGPL3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle \ - ${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beaker>0:www/py-beaker@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= FedericoCeratto @@ -26,9 +26,9 @@ .include -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo -SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10 +SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} .if ${PORT_OPTIONS:MEXAMPLES} post-install: Index: www/py-buku/Makefile =================================================================== --- www/py-buku/Makefile +++ www/py-buku/Makefile @@ -12,13 +12,13 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py3-cryptography \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py3-requests \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py3-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py${PYTHON_SUFFIX}-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.0:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} -USES= python:3 +USES= python:3.4+ USE_GITHUB= yes USE_PYTHON= autoplist distutils NO_ARCH= yes @@ -28,14 +28,7 @@ PLIST_FILES= man/man1/buku.1.gz -.include - -.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \ - ${PYTHON_VER} != ${PYTHON_DEFAULT} -IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} -.endif - post-install: ${INSTALL_MAN} ${WRKSRC}/buku.1 ${STAGEDIR}${MANPREFIX}/man/man1 -.include +.include Index: www/py-cachecontrol/Makefile =================================================================== --- www/py-cachecontrol/Makefile +++ www/py-cachecontrol/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lockfile>=0.9:devel/py-lockfile@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-caldav/Makefile =================================================================== --- www/py-caldav/Makefile +++ www/py-caldav/Makefile @@ -16,9 +16,9 @@ USES= python USE_PYTHON= distutils autoplist -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.8.1:deskutils/py-vobject@${FLAVOR} .include Index: www/py-cherrypy/Makefile =================================================================== --- www/py-cherrypy/Makefile +++ www/py-cherrypy/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE -EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah \ - ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject +EXAMPLES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.4.4:devel/py-cheetah@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlobject>=1.5.1:databases/py-sqlobject@${FLAVOR} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= EXAMPLES Index: www/py-collective.easytemplate/Makefile =================================================================== --- www/py-collective.easytemplate/Makefile +++ www/py-collective.easytemplate/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static \ - ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.3:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlet.static>=0:www/py-plone.portlet.static@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines@${FLAVOR} USES= python:2 zip USE_PYTHON= autoplist distutils Index: www/py-collective.templateengines/Makefile =================================================================== --- www/py-collective.templateengines/Makefile +++ www/py-collective.templateengines/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR} USES= python:2 zip USE_PYTHON= distutils autoplist Index: www/py-cookies/Makefile =================================================================== --- www/py-cookies/Makefile +++ www/py-cookies/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-cssutils/Makefile =================================================================== --- www/py-cssutils/Makefile +++ www/py-cssutils/Makefile @@ -20,12 +20,10 @@ NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils -USES?= python +USES= python PORTEXAMPLES= * -SLAVEDIRS= www/py3-cssutils - post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ ${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/ Index: www/py-django-allauth/Makefile =================================================================== --- www/py-django-allauth/Makefile +++ www/py-django-allauth/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-annotations/Makefile =================================================================== --- www/py-django-annotations/Makefile +++ www/py-django-annotations/Makefile @@ -9,13 +9,13 @@ MAINTAINER= swills@FreeBSD.org COMMENT= Django implementation of annotatorjs Storage -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=1.1.0:www/py-django-cors-headers \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.3.2:www/py-djangorestframework \ - ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq \ - ${PYTHON_PKGNAMEPREFIX}django-rq-dashboard>0:devel/py-django-rq-dashboard \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-cors-headers>=1.1.0:www/py-django-cors-headers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.3.2:www/py-djangorestframework@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-rq>0:devel/py-django-rq@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-rq-dashboard>0:devel/py-django-rq-dashboard@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} -USES= python +USES= python:2.7 USE_GITHUB= yes USE_PYTHON= autoplist concurrent distutils Index: www/py-django-annoying/Makefile =================================================================== --- www/py-django-annoying/Makefile +++ www/py-django-annoying/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} USE_GITHUB= yes Index: www/py-django-appconf/Makefile =================================================================== --- www/py-django-appconf/Makefile +++ www/py-django-appconf/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-django-appmedia/Makefile =================================================================== --- www/py-django-appmedia/Makefile +++ www/py-django-appmedia/Makefile @@ -11,7 +11,7 @@ MAINTAINER= kurt.lidl@cello.com COMMENT= Serve static content from within django app directories -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: www/py-django-assets/Makefile =================================================================== --- www/py-django-assets/Makefile +++ www/py-django-assets/Makefile @@ -11,8 +11,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webassets>0:www/py-webassets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-auth-ldap/Makefile =================================================================== --- www/py-django-auth-ldap/Makefile +++ www/py-django-auth-ldap/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python @@ -22,9 +22,9 @@ .include .if ${PYTHON_REL} < 3000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR} .else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyldap>0:net/py-pyldap +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pyldap>0:net/py-pyldap@${FLAVOR} .endif .include Index: www/py-django-babel/Makefile =================================================================== --- www/py-django-babel/Makefile +++ www/py-django-babel/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=0:devel/py-babel@${FLAVOR} NO_ARCH= yes Index: www/py-django-bitfield/Makefile =================================================================== --- www/py-django-bitfield/Makefile +++ www/py-django-bitfield/Makefile @@ -12,8 +12,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-django-bootstrap-form/Makefile =================================================================== --- www/py-django-bootstrap-form/Makefile +++ www/py-django-bootstrap-form/Makefile @@ -16,6 +16,6 @@ USES= python USE_PYTHON= distutils autoplist -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR} .include Index: www/py-django-bulk-update/Makefile =================================================================== --- www/py-django-bulk-update/Makefile +++ www/py-django-bulk-update/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>0:www/py-django110 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>0:www/py-django110@${FLAVOR} NO_ARCH= yes USES= python:2.7-3.4 Index: www/py-django-caching-app-plugins/Makefile =================================================================== --- www/py-django-caching-app-plugins/Makefile +++ www/py-django-caching-app-plugins/Makefile @@ -14,8 +14,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.rst -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-classy-tags/Makefile =================================================================== --- www/py-django-classy-tags/Makefile +++ www/py-django-classy-tags/Makefile @@ -10,7 +10,7 @@ MAINTAINER= cs@FreeBSD.org COMMENT= Class based template tags for Django -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-cms/Makefile =================================================================== --- www/py-django-cms/Makefile +++ www/py-django-cms/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:www/py-django-classy-tags \ - ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:www/py-django-mptt \ - ${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:www/py-html5lib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.4.1:www/py-django-classy-tags@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.5.2:www/py-django-mptt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:www/py-html5lib@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils @@ -27,8 +27,8 @@ OPTIONS_DEFAULT=SQLITE OPTIONS_MULTI_DATABASE=MYSQL PGSQL SQLITE -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -SQLIE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +SQLIE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} .include Index: www/py-django-configurations/Makefile =================================================================== --- www/py-django-configurations/Makefile +++ www/py-django-configurations/Makefile @@ -10,7 +10,7 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Django project configuration using the composability of Python classes -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-constance/Makefile =================================================================== --- www/py-django-constance/Makefile +++ www/py-django-constance/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis \ - ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>=0:databases/py-redis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-picklefield>=0:www/py-django-picklefield@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-contact-form/Makefile =================================================================== --- www/py-django-contact-form/Makefile +++ www/py-django-contact-form/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} NO_ARCH= yes Index: www/py-django-contrib-comments/Makefile =================================================================== --- www/py-django-contrib-comments/Makefile +++ www/py-django-contrib-comments/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-cors-headers/Makefile =================================================================== --- www/py-django-cors-headers/Makefile +++ www/py-django-cors-headers/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-crispy-forms/Makefile =================================================================== --- www/py-django-crispy-forms/Makefile +++ www/py-django-crispy-forms/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist concurrent Index: www/py-django-datetime-widget/Makefile =================================================================== --- www/py-django-datetime-widget/Makefile +++ www/py-django-datetime-widget/Makefile @@ -10,7 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple and clean widget for DateTimeField -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt Index: www/py-django-debug-toolbar/Makefile =================================================================== --- www/py-django-debug-toolbar/Makefile +++ www/py-django-debug-toolbar/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4.2:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4.2:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-devel/Makefile =================================================================== --- www/py-django-devel/Makefile +++ www/py-django-devel/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} SNAPSHOTDATE= 20150709 @@ -40,11 +40,11 @@ PLIST_FILES= man/man1/django-admin.1.gz -HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} .include Index: www/py-django-dpaste/Makefile =================================================================== --- www/py-django-dpaste/Makefile +++ www/py-django-dpaste/Makefile @@ -13,16 +13,16 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.8.3:www/py-django-mptt \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-mptt>=0.8.3:www/py-django-mptt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} OPTIONS_DEFINE= MIGRATIONS MIGRATIONS_DESC= Schema and data migration support (via south) -MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south +MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}south>=0.8.2:databases/py-south@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-evolution/Makefile =================================================================== --- www/py-django-evolution/Makefile +++ www/py-django-evolution/Makefile @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= beanbaginc -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-extract: Index: www/py-django-extensions/Makefile =================================================================== --- www/py-django-extensions/Makefile +++ www/py-django-extensions/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2 Index: www/py-django-filer/Makefile =================================================================== --- www/py-django-filer/Makefile +++ www/py-django-filer/Makefile @@ -11,9 +11,9 @@ MAINTAINER= xenophon+fbsdports@irtnog.org COMMENT= File and Image Management Application for django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:graphics/py-django-easy-thumbnails \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-easy-thumbnails>=0:graphics/py-django-easy-thumbnails@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-guardian/Makefile =================================================================== --- www/py-django-guardian/Makefile +++ www/py-django-guardian/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-django-happenings/Makefile =================================================================== --- www/py-django-happenings/Makefile +++ www/py-django-happenings/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} CONFLICTS_INSTALL= py*-django-mptt Index: www/py-django-haystack/Makefile =================================================================== --- www/py-django-haystack/Makefile +++ www/py-django-haystack/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-django-hijack/Makefile =================================================================== --- www/py-django-hijack/Makefile +++ www/py-django-hijack/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-htmlmin/Makefile =================================================================== --- www/py-django-htmlmin/Makefile +++ www/py-django-htmlmin/Makefile @@ -10,8 +10,8 @@ MAINTAINER= demon@FreeBSD.org COMMENT= HTML minifier for Python -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup \ - ${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bs4/element.py:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/html5lib/html5parser.py:www/py-html5lib@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-json-rpc/Makefile =================================================================== --- www/py-django-json-rpc/Makefile +++ www/py-django-json-rpc/Makefile @@ -11,7 +11,7 @@ MAINTAINER= jhixson@gmail.com COMMENT= Simple JSON-RPC implementation for Django -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} LICENSE= MIT Index: www/py-django-jsonfield/Makefile =================================================================== --- www/py-django-jsonfield/Makefile +++ www/py-django-jsonfield/Makefile @@ -10,7 +10,7 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Reusable JSONField model for Django to store ad-hoc data -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-keyedcache/Makefile =================================================================== --- www/py-django-keyedcache/Makefile +++ www/py-django-keyedcache/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-ldapdb/Makefile =================================================================== --- www/py-django-ldapdb/Makefile +++ www/py-django-ldapdb/Makefile @@ -13,10 +13,10 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6.0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>=2.0:net/py-ldap@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-django-livesettings/Makefile =================================================================== --- www/py-django-livesettings/Makefile +++ www/py-django-livesettings/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: www/py-django-markdownx/Makefile =================================================================== --- www/py-django-markdownx/Makefile +++ www/py-django-markdownx/Makefile @@ -12,8 +12,8 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} USE_GITHUB= yes Index: www/py-django-mezzanine/Makefile =================================================================== --- www/py-django-mezzanine/Makefile +++ www/py-django-mezzanine/Makefile @@ -14,20 +14,20 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments \ - ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser \ - ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \ - ${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8 \ - ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes + ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${FLAVOR} USES= gettext python USE_PYTHON= autoplist concurrent distutils Index: www/py-django-mptt/Makefile =================================================================== --- www/py-django-mptt/Makefile +++ www/py-django-mptt/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8 CONFLICTS_INSTALL= py*-django-happenings Index: www/py-django-openid-auth/Makefile =================================================================== --- www/py-django-openid-auth/Makefile +++ www/py-django-openid-auth/Makefile @@ -14,10 +14,10 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3.1:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-openid>=2.2.5:security/py-python-openid@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils NO_WRKSUBDIR= yes Index: www/py-django-otp-yubikey/Makefile =================================================================== --- www/py-django-otp-yubikey/Makefile +++ www/py-django-otp-yubikey/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}YubiOTP>=0.2.1:security/py-YubiOTP \ - ${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}YubiOTP>=0.2.1:security/py-YubiOTP@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-otp>0.4.0:www/py-django-otp@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-overextends/Makefile =================================================================== --- www/py-django-overextends/Makefile +++ www/py-django-overextends/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx-me>=0.1.2:textproc/py-sphinx-me@${FLAVOR} NO_ARCH= yes Index: www/py-django-paging/Makefile =================================================================== --- www/py-django-paging/Makefile +++ www/py-django-paging/Makefile @@ -11,7 +11,7 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Paging module for Django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-photologue/Makefile =================================================================== --- www/py-django-photologue/Makefile +++ www/py-django-photologue/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:www/py-django-sortedm2m \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-sortedm2m>0:www/py-django-sortedm2m@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-picklefield/Makefile =================================================================== --- www/py-django-picklefield/Makefile +++ www/py-django-picklefield/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-pipeline/Makefile =================================================================== --- www/py-django-pipeline/Makefile +++ www/py-django-pipeline/Makefile @@ -20,7 +20,7 @@ .include .if ${PYTHON_REL} < 3200 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} .endif .include Index: www/py-django-post_office/Makefile =================================================================== --- www/py-django-post_office/Makefile +++ www/py-django-post_office/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-jsonfield>=0:www/py-django-jsonfield@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-profiles/Makefile =================================================================== --- www/py-django-profiles/Makefile +++ www/py-django-profiles/Makefile @@ -15,14 +15,16 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} WRKSRC= ${WRKDIR}/${PORTNAME} USES= python -USE_PYTHON= distutils -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +USE_PYTHON= distutils autoplist +DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= DOCS +PORTDOCS= * + .include post-install: Index: www/py-django-profiles/pkg-plist =================================================================== --- www/py-django-profiles/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -%%PYTHON_SITELIBDIR%%/profiles/__init__.py -%%PYTHON_SITELIBDIR%%/profiles/__init__.pyc -%%PYTHON_SITELIBDIR%%/profiles/__init__.pyo -%%PYTHON_SITELIBDIR%%/profiles/urls.py -%%PYTHON_SITELIBDIR%%/profiles/urls.pyc -%%PYTHON_SITELIBDIR%%/profiles/urls.pyo -%%PYTHON_SITELIBDIR%%/profiles/utils.py -%%PYTHON_SITELIBDIR%%/profiles/utils.pyc -%%PYTHON_SITELIBDIR%%/profiles/utils.pyo -%%PYTHON_SITELIBDIR%%/profiles/views.py -%%PYTHON_SITELIBDIR%%/profiles/views.pyc -%%PYTHON_SITELIBDIR%%/profiles/views.pyo -%%PORTDOCS%%%%DOCSDIR%%/overview.txt -%%PORTDOCS%%%%DOCSDIR%%/views.txt Index: www/py-django-pyscss/Makefile =================================================================== --- www/py-django-pyscss/Makefile +++ www/py-django-pyscss/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${FLAVOR} NO_ARCH= yes Index: www/py-django-recaptcha/Makefile =================================================================== --- www/py-django-recaptcha/Makefile +++ www/py-django-recaptcha/Makefile @@ -11,7 +11,7 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Django reCAPTCHA form field/widget integration app -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-redis/Makefile =================================================================== --- www/py-django-redis/Makefile +++ www/py-django-redis/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}redis>=2.10.0:databases/py-redis@${FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis \ - ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}msgpack-python>=0:devel/py-msgpack-python@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-registration-defaults/Makefile =================================================================== --- www/py-django-registration-defaults/Makefile +++ www/py-django-registration-defaults/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-registration>=0:www/py-django-registration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-registration>=0:www/py-django-registration@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-registration-redux/Makefile =================================================================== --- www/py-django-registration-redux/Makefile +++ www/py-django-registration-redux/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-registration/Makefile =================================================================== --- www/py-django-registration/Makefile +++ www/py-django-registration/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-reversion/Makefile =================================================================== --- www/py-django-reversion/Makefile +++ www/py-django-reversion/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils .include Index: www/py-django-sekizai/Makefile =================================================================== --- www/py-django-sekizai/Makefile +++ www/py-django-sekizai/Makefile @@ -11,8 +11,8 @@ MAINTAINER= xenophon+fbsdports@irtnog.org COMMENT= Block templating system for Django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: www/py-django-signals-ahoy/Makefile =================================================================== --- www/py-django-signals-ahoy/Makefile +++ www/py-django-signals-ahoy/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-simple-captcha/Makefile =================================================================== --- www/py-django-simple-captcha/Makefile +++ www/py-django-simple-captcha/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=2.0.0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.2.0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-simple-history/Makefile =================================================================== --- www/py-django-simple-history/Makefile +++ www/py-django-simple-history/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 # >= 1.8 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} # >= 1.8 USE_GITHUB= yes Index: www/py-django-social-auth/Makefile =================================================================== --- www/py-django-social-auth/Makefile +++ www/py-django-social-auth/Makefile @@ -11,8 +11,8 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Setup social authentication/authorization mechanism for Django -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-social-auth>=0:security/py-python-social-auth@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-sortedm2m/Makefile =================================================================== --- www/py-django-sortedm2m/Makefile +++ www/py-django-sortedm2m/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-star-ratings/Makefile =================================================================== --- www/py-django-star-ratings/Makefile +++ www/py-django-star-ratings/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-statici18n/Makefile =================================================================== --- www/py-django-statici18n/Makefile +++ www/py-django-statici18n/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.6:www/py-django-appconf@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: www/py-django-subdomains/Makefile =================================================================== --- www/py-django-subdomains/Makefile +++ www/py-django-subdomains/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-sudo/Makefile =================================================================== --- www/py-django-sudo/Makefile +++ www/py-django-sudo/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-tables2/Makefile =================================================================== --- www/py-django-tables2/Makefile +++ www/py-django-tables2/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: www/py-django-tagging/Makefile =================================================================== --- www/py-django-tagging/Makefile +++ www/py-django-tagging/Makefile @@ -14,7 +14,7 @@ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-django-taggit/Makefile =================================================================== --- www/py-django-taggit/Makefile +++ www/py-django-taggit/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-django-tastypie/Makefile =================================================================== --- www/py-django-tastypie/Makefile +++ www/py-django-tastypie/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE -MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil +MY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} BUILD_DEPENDS= ${MY_DEPENDS} RUN_DEPENDS?= ${MY_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18 + ${PYTHON_PKGNAMEPREFIX}django18>=1.5:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-templatetag-sugar/Makefile =================================================================== --- www/py-django-templatetag-sugar/Makefile +++ www/py-django-templatetag-sugar/Makefile @@ -11,7 +11,7 @@ MAINTAINER= tj@FreeBSD.org COMMENT= Library to make writing templatetags in Django sweet -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-django-threaded-multihost/Makefile =================================================================== --- www/py-django-threaded-multihost/Makefile +++ www/py-django-threaded-multihost/Makefile @@ -11,13 +11,13 @@ MAINTAINER= ports@caomhin.org COMMENT= Multi-host utilities to Django -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR} LICENSE= BSD3CLAUSE WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-django-tinymce/Makefile =================================================================== --- www/py-django-tinymce/Makefile +++ www/py-django-tinymce/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} NO_ARCH= yes Index: www/py-django/Makefile =================================================================== --- www/py-django/Makefile +++ www/py-django/Makefile @@ -21,11 +21,12 @@ PORTSCOUT= ignore:1 USES= cpe metaport python:run +USE_PYTHON= flavors CPE_VENDOR= djangoproject -DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 -DJANGO110_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110 -DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111 +DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} +DJANGO110_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110@${FLAVOR} +DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111@${FLAVOR} .include Index: www/py-django110/Makefile =================================================================== --- www/py-django110/Makefile +++ www/py-django110/Makefile @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= cpe python shebangfix @@ -40,11 +40,11 @@ PLIST_FILES= man/man1/django-admin.1.gz -HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} .include Index: www/py-django111/Makefile =================================================================== --- www/py-django111/Makefile +++ www/py-django111/Makefile @@ -19,7 +19,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= cpe python shebangfix @@ -42,11 +42,11 @@ PLIST_FILES= man/man1/django-admin.1.gz -HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} .include Index: www/py-django18/Makefile =================================================================== --- www/py-django18/Makefile +++ www/py-django18/Makefile @@ -18,7 +18,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= cpe python shebangfix @@ -41,11 +41,11 @@ PLIST_FILES= man/man1/django-admin.1.gz -HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup +HTMLDOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:databases/py-MySQLdb@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +FASTCGI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} .include Index: www/py-django_compressor/Makefile =================================================================== --- www/py-django_compressor/Makefile +++ www/py-django_compressor/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:devel/py-versiontools -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:www/py-django-appconf \ - ${PYTHON_PKGNAMEPREFIX}rcssmin>=0:archivers/py-rcssmin \ - ${PYTHON_PKGNAMEPREFIX}rjsmin>=0:archivers/py-rjsmin +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}versiontools>=1.8.2:devel/py-versiontools@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-appconf>=0.4:www/py-django-appconf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rcssmin>=0:archivers/py-rcssmin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rjsmin>=0:archivers/py-rjsmin@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -28,9 +28,9 @@ HTML5LIB_DESC= Enable Html5LibParser SLIMIT_DESC= Enable SlimIt JavaScript filter -BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml -HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib -SLIMIT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:www/py-slimit +BEAUTIFULSOUP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} +HTML5LIB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${FLAVOR} +SLIMIT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}slimit>=0.8.1:www/py-slimit@${FLAVOR} .include Index: www/py-django_openstack_auth/Makefile =================================================================== --- www/py-django_openstack_auth/Makefile +++ www/py-django_openstack_auth/Makefile @@ -12,14 +12,14 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1 \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}keystoneauth1>=2.17.0:devel/py-keystoneauth1@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=3.8.0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.17.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} NO_ARCH= yes Index: www/py-django_polymorphic/Makefile =================================================================== --- www/py-django_polymorphic/Makefile +++ www/py-django_polymorphic/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-djangotoolbox/Makefile =================================================================== --- www/py-djangotoolbox/Makefile +++ www/py-djangotoolbox/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-dojango/Makefile =================================================================== --- www/py-dojango/Makefile +++ www/py-dojango/Makefile @@ -14,7 +14,7 @@ USES= python USE_PYTHON= distutils autoplist -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.6:www/py-django18@${FLAVOR} OPTIONS_DEFINE= JAVA Index: www/py-evernote/Makefile =================================================================== --- www/py-evernote/Makefile +++ www/py-evernote/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2 \ - ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2>0:net/py-oauth2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: www/py-falcon/Makefile =================================================================== --- www/py-falcon/Makefile +++ www/py-falcon/Makefile @@ -12,12 +12,11 @@ LICENSE= APACHE20 -BUILD_DEPENDS= cython>=0.11.2:lang/cython -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools \ - ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}testtools>=0:devel/py-testtools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mimeparse>=0.1.4:devel/py-mimeparse@${FLAVOR} USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython .include Index: www/py-fedex/Makefile =================================================================== --- www/py-fedex/Makefile +++ www/py-fedex/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}suds>=0:net/py-suds@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-feedgenerator/Makefile =================================================================== --- www/py-feedgenerator/Makefile +++ www/py-feedgenerator/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-flask-admin/Makefile =================================================================== --- www/py-flask-admin/Makefile +++ www/py-flask-admin/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-api/Makefile =================================================================== --- www/py-flask-api/Makefile +++ www/py-flask-api/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.10.1:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0.10.1:www/py-flask@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-flask-assets/Makefile =================================================================== --- www/py-flask-assets/Makefile +++ www/py-flask-assets/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}webassets>=0:www/py-webassets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webassets>=0:www/py-webassets@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-bootstrap/Makefile =================================================================== --- www/py-flask-bootstrap/Makefile +++ www/py-flask-bootstrap/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-cache/Makefile =================================================================== --- www/py-flask-cache/Makefile +++ www/py-flask-cache/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-compress/Makefile =================================================================== --- www/py-flask-compress/Makefile +++ www/py-flask-compress/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11:www/py-flask -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11:www/py-flask@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-cors/Makefile =================================================================== --- www/py-flask-cors/Makefile +++ www/py-flask-cors/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-flatpages/Makefile =================================================================== --- www/py-flask-flatpages/Makefile +++ www/py-flask-flatpages/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-login/Makefile =================================================================== --- www/py-flask-login/Makefile +++ www/py-flask-login/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.9:www/py-flask@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-oauthlib/Makefile =================================================================== --- www/py-flask-oauthlib/Makefile +++ www/py-flask-oauthlib/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>0:www/py-requests-oauthlib@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-flask-principal/Makefile =================================================================== --- www/py-flask-principal/Makefile +++ www/py-flask-principal/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-flask-restful/Makefile =================================================================== --- www/py-flask-restful/Makefile +++ www/py-flask-restful/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601 \ - ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aniso8601>0:devel/py-aniso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-flask-restplus/Makefile =================================================================== --- www/py-flask-restplus/Makefile +++ www/py-flask-restplus/Makefile @@ -11,14 +11,14 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.8:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.3.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}aniso8601>=0.82:devel/py-aniso8601@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}flask-restplus08 @@ -32,7 +32,7 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif do-test: Index: www/py-flask-socketio/Makefile =================================================================== --- www/py-flask-socketio/Makefile +++ www/py-flask-socketio/Makefile @@ -11,10 +11,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket \ - ${PYTHON_PKGNAMEPREFIX}python-engineio>=1.0.0:devel/py-python-engineio \ - ${PYTHON_PKGNAMEPREFIX}python-socketio>=1.5.0:devel/py-python-socketio +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-engineio>=1.0.0:devel/py-python-engineio@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-socketio>=1.5.0:devel/py-python-socketio@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-flask-sockets/Makefile =================================================================== --- www/py-flask-sockets/Makefile +++ www/py-flask-sockets/Makefile @@ -12,9 +12,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gevent-websocket>=0:www/py-gevent-websocket@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-flask-uploads/Makefile =================================================================== --- www/py-flask-uploads/Makefile +++ www/py-flask-uploads/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-flask-wtf/Makefile =================================================================== --- www/py-flask-wtf/Makefile +++ www/py-flask-wtf/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wtforms>0:textproc/py-wtforms@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel@${FLAVOR} OPTIONS_DEFINE= TESTS TESTS_DESC= Install test suite dependencies Index: www/py-flask/Makefile =================================================================== --- www/py-flask/Makefile +++ www/py-flask/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11:www/py-werkzeug \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.24:security/py-itsdangerous \ - ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11:www/py-werkzeug@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}itsdangerous>=0.24:security/py-itsdangerous@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: www/py-flexget/Makefile =================================================================== --- www/py-flexget/Makefile +++ www/py-flexget/Makefile @@ -13,40 +13,40 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC \ - ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema \ - ${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py \ - ${PYTHON_PKGNAMEPREFIX}pathlib>=1.0:devel/py-pathlib \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar \ - ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit \ - ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb \ - ${PYTHON_PKGNAMEPREFIX}zxcvbn-python>0:security/py-zxcvbn-python \ - ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum \ - ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass \ - ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen \ - ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy \ - ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress \ - ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors \ - ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login \ - ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful \ - ${PYTHON_PKGNAMEPREFIX}flask-restplus>=0.10.1:www/py-flask-restplus \ - ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog \ - ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3 \ - ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.13:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rpyc>0:devel/py-RPyC@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}apscheduler>=3.2.0:devel/py-apscheduler@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.3:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.0:devel/py-jsonschema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}path.py>=8.1.1:devel/py-path.py@${FLAVOR} \ + ${PY_PATHLIB} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.3:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}guessit>=2.1.0:multimedia/py-guessit@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pynzb>0:news/py-pynzb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zxcvbn-python>0:security/py-zxcvbn-python@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plumbum>=1.2:sysutils/py-plumbum@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorclass>=2.2.0:textproc/py-colorclass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rss2gen>0:textproc/py-rss2gen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}terminaltables>=3.1.0:textproc/py-terminaltables@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.7.0:www/py-cherrypy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>=0.7:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Compress>=1.2.1:www/py-flask-compress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=2.1.2:www/py-flask-cors@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.4.0:www/py-flask-login@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-RESTful>=0.3.3:www/py-flask-restful@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flask-restplus>=0.10.1:www/py-flask-restplus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}html5lib>=0.11:www/py-html5lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.8.0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${FLAVOR} USE_GITHUB= yes GH_PROJECT= Flexget @@ -65,7 +65,7 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif .include Index: www/py-flup/Makefile =================================================================== --- www/py-flup/Makefile +++ www/py-flup/Makefile @@ -12,7 +12,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Random assortment of WSGI servers, middleware -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-formalchemy/Makefile =================================================================== --- www/py-formalchemy/Makefile +++ www/py-formalchemy/Makefile @@ -13,14 +13,14 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.5:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita \ - ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.6.3:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.5:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.6.3:www/py-webob@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/py-frappe-bench/Makefile =================================================================== --- www/py-frappe-bench/Makefile +++ www/py-frappe-bench/Makefile @@ -13,21 +13,21 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}honcho>0:sysutils/py-honcho \ - ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version \ - ${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:devel/py-gitpython \ - ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}honcho>0:sysutils/py-honcho@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}semantic_version>0:devel/py-semantic_version@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}GitPython>=1.0.1:devel/py-gitpython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${FLAVOR} \ git:devel/git USE_GITHUB= yes GH_ACCOUNT= frappe GH_PROJECT= bench -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils concurrent .include Index: www/py-frozen-flask/Makefile =================================================================== --- www/py-frozen-flask/Makefile +++ www/py-frozen-flask/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:www/py-flask@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-funkload/Makefile =================================================================== --- www/py-funkload/Makefile +++ www/py-funkload/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \ ${LOCALBASE}/bin/gnuplot:math/gnuplot \ - ${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit \ + ${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit@${FLAVOR} \ tcpwatch.py:net/tcpwatch USES= python:2 Index: www/py-gandi.cli/Makefile =================================================================== --- www/py-gandi.cli/Makefile +++ www/py-gandi.cli/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=3.1:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipy>0:net-mgmt/py-ipy@${FLAVOR} # Actually 2.6-3.6(+) USES= python @@ -27,7 +27,7 @@ .include .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif do-test: Index: www/py-gevent-websocket/Makefile =================================================================== --- www/py-gevent-websocket/Makefile +++ www/py-gevent-websocket/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0:devel/py-gevent@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-goobook/Makefile =================================================================== --- www/py-goobook/Makefile +++ www/py-goobook/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:security/py-oauth2client \ - ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:devel/py-gdata \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.4.12:security/py-oauth2client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gdata>=2.0.18:devel/py-gdata@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.0:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.1:www/py-httplib2@${FLAVOR} NO_ARCH= yes USES= python:-2.7 Index: www/py-google-api-python-client/Makefile =================================================================== --- www/py-google-api-python-client/Makefile +++ www/py-google-api-python-client/Makefile @@ -12,13 +12,13 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client \ - ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>=0.9.2:www/py-httplib2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oauth2client>=1.5.0:security/py-oauth2client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.6.1:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}uritemplate>=3.0.0:net/py-uritemplate@${FLAVOR} DJANGO_DESC= Use the library with Django -DJANGO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18 +DJANGO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.3:www/py-django18@${FLAVOR} GAE_DESC= Use the library with Google App Engine GAE_RUN_DEPENDS= google-appengine>=1.4.3:www/google-appengine @@ -30,7 +30,7 @@ USE_PYTHON= autoplist distutils WEBTEST_DESC= Use WebTest helper to test WSGI apps -WEBTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.3:www/py-WebTest \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl +WEBTEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.3:www/py-WebTest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl@${FLAVOR} .include Index: www/py-google-cloud-core/Makefile =================================================================== --- www/py-google-cloud-core/Makefile +++ www/py-google-cloud-core/Makefile @@ -11,11 +11,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos \ - ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth \ - ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}googleapis-common-protos>0:devel/py-googleapis-common-protos@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: www/py-google-cloud-storage/Makefile =================================================================== --- www/py-google-cloud-storage/Makefile +++ www/py-google-cloud-storage/Makefile @@ -11,10 +11,10 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-cloud-core>0:www/py-google-cloud-core \ - ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth \ - ${PYTHON_PKGNAMEPREFIX}google-resumable-media>0:www/py-google-resumable-media \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google-cloud-core>0:www/py-google-cloud-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-auth>0:security/py-google-auth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}google-resumable-media>0:www/py-google-resumable-media@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: www/py-google-resumable-media/Makefile =================================================================== --- www/py-google-resumable-media/Makefile +++ www/py-google-resumable-media/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist Index: www/py-google/Makefile =================================================================== --- www/py-google/Makefile +++ www/py-google/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4:www/py-beautifulsoup@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-graphite-api/Makefile =================================================================== --- www/py-graphite-api/Makefile +++ www/py-graphite-api/Makefile @@ -13,15 +13,15 @@ LICENSE= APACHE20 RUN_DEPENDS= \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache \ - ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal \ - ${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog \ - ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing \ - ${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi \ - ${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Cache>=0.13.1:www/py-flask-cache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.1.1:devel/py-tzlocal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}structlog>=16.0.0:devel/py-structlog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.0:devel/py-pyparsing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>3.1:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairocffi>=0.7.2:graphics/py-cairocffi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gunicorn>=19.4.1:www/py-gunicorn@${FLAVOR} \ xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype NO_ARCH= yes Index: www/py-graphite-web/Makefile =================================================================== --- www/py-graphite-web/Makefile +++ www/py-graphite-web/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo \ - ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon \ - ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}carbon>=${PORTVERSION}:databases/py-carbon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=1.4:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-tagging>=0.3.1:www/py-django-tagging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype FETCH_ARGS= -o ${DISTNAME}${EXTRACT_SUFX} Index: www/py-grequests/Makefile =================================================================== --- www/py-grequests/Makefile +++ www/py-grequests/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= kennethreitz Index: www/py-gunicorn/Makefile =================================================================== --- www/py-gunicorn/Makefile +++ www/py-gunicorn/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} OPTIONS_DEFINE= PROCTITLE OPTIONS_DEFAULT= PROCTITLE @@ -25,11 +25,11 @@ PROCTITLE_DESC= Custom process titles with setproctitle(3) TORNADO_DESC= Tornado async worker -EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet -GAIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp -GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent -PROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle -TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado +EVENTLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}eventlet>=0.9.7:net/py-eventlet@${FLAVOR} +GAIOHTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${FLAVOR} +GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.12.2:devel/py-gevent@${FLAVOR} +PROCTITLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${FLAVOR} +TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=2.2:www/py-tornado@${FLAVOR} USES= python USE_GITHUB= yes @@ -46,7 +46,7 @@ BROKEN= GAIOHTTP requires Python 3.3+ but this port is building with Python ${PYTHON_VER}. \ Disable the GAIOHTTP option or change the version of Python to build with, using DEFAULT_VERSIONS .endif -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} .endif .if ${PYTHON_REL} > 3000 && ${PORT_OPTIONS:MGEVENT} Index: www/py-h2/Makefile =================================================================== --- www/py-h2/Makefile +++ www/py-h2/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe \ - ${PYTHON_PKGNAMEPREFIX}hpack>=2.3:www/py-hpack +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hyperframe>=5.0.0:www/py-hyperframe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}hpack>=2.3:www/py-hpack@${FLAVOR} USES?= python USE_PYTHON= distutils autoplist Index: www/py-horizon/Makefile =================================================================== --- www/py-horizon/Makefile +++ www/py-horizon/Makefile @@ -13,70 +13,70 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.6:devel/py-pbr@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint \ - ${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel \ - ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor \ - ${PYTHON_PKGNAMEPREFIX}django_openstack_auth>=2.4.0:www/py-django_openstack_auth \ - ${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss \ - ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency \ - ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n \ - ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils \ - ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss \ - ${PYTHON_PKGNAMEPREFIX}python-ceilometerclient>=2.5.0:net/py-python-ceilometerclient \ - ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient \ - ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient \ - ${PYTHON_PKGNAMEPREFIX}python-heatclient>=1.4.0:net/py-python-heatclient \ - ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient \ - ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient \ - ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient \ - ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.3.7:devel/py-XStatic-Angular \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=0.11.0.2:devel/py-XStatic-Angular-Bootstrap \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-FileUpload>=12.0.4.0:devel/py-XStatic-Angular-FileUpload \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Gettext>=2.1.0.2:devel/py-XStatic-Angular-Gettext \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-lrdragndrop>=1.0.2.2:devel/py-XStatic-Angular-lrdragndrop \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Schema-Form>=0.8.13.0:devel/py-XStatic-Angular-Schema-Form \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-Datepicker>=1.3.1.0:devel/py-XStatic-Bootstrap-Datepicker \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-SCSS>=3:devel/py-XStatic-Bootstrap-SCSS \ - ${PYTHON_PKGNAMEPREFIX}XStatic-bootswatch>=3.3.5.3:devel/py-XStatic-bootswatch \ - ${PYTHON_PKGNAMEPREFIX}XStatic-D3>=3.1.6.2:devel/py-XStatic-D3 \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Hogan>=2.0.0.2:devel/py-XStatic-Hogan \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Font-Awesome>=4.3.0:devel/py-XStatic-Font-Awesome \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Jasmine>=2.1.2.0:devel/py-XStatic-Jasmine \ - ${PYTHON_PKGNAMEPREFIX}XStatic-jQuery>=1.7.2:devel/py-XStatic-jQuery \ - ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery-Migrate>=1.2.1.1:devel/py-XStatic-JQuery-Migrate \ - ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.quicksearch>=2.0.3.1:devel/py-XStatic-JQuery.quicksearch \ - ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.TableSorter>=2.14.5.1:devel/py-XStatic-JQuery.TableSorter \ - ${PYTHON_PKGNAMEPREFIX}XStatic-jquery-ui>=1.10.1:devel/py-XStatic-jquery-ui \ - ${PYTHON_PKGNAMEPREFIX}XStatic-JSEncrypt>=2.0.0.2:devel/py-XStatic-JSEncrypt \ - ${PYTHON_PKGNAMEPREFIX}XStatic-mdi>=1.4.57.0:devel/py-XStatic-mdi \ - ${PYTHON_PKGNAMEPREFIX}XStatic-objectpath>=1.2.1.0:devel/py-XStatic-objectpath \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Rickshaw>=1.5.0:devel/py-XStatic-Rickshaw \ - ${PYTHON_PKGNAMEPREFIX}XStatic-roboto-fontface>=0.4.3.2:devel/py-XStatic-roboto-fontface \ - ${PYTHON_PKGNAMEPREFIX}XStatic-smart-table>=0:devel/py-XStatic-smart-table \ - ${PYTHON_PKGNAMEPREFIX}XStatic-Spin>=1.2.5.2:devel/py-XStatic-Spin \ - ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js \ - ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Pint>=0.5:devel/py-Pint@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-babel>=0.5.1:www/py-django-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django_compressor>=2.0:www/py-django_compressor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django_openstack_auth>=2.4.0:www/py-django_openstack_auth@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-pyscss>=2.0.2:www/py-django-pyscss@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.config>=3.14.0:devel/py-oslo.config@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.policy>=1.9.0:devel/py-oslo.policy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.16.0:devel/py-oslo.utils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyscss>=1.3.4:textproc/py-pyscss@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-ceilometerclient>=2.5.0:net/py-python-ceilometerclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-cinderclient>=0:net/py-python-cinderclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-glanceclient>=0:net/py-python-glanceclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-heatclient>=1.4.0:net/py-python-heatclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-keystoneclient>=0:net/py-python-keystoneclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-neutronclient>=5.1.0:net/py-python-neutronclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-novaclient>=0:net/py-python-novaclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}python-swiftclient>=2.2.0:databases/py-python-swiftclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=2013.6:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.1.0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic>=1.0.0:devel/py-XStatic@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Angular>=1.3.7:devel/py-XStatic-Angular@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Bootstrap>=0.11.0.2:devel/py-XStatic-Angular-Bootstrap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-FileUpload>=12.0.4.0:devel/py-XStatic-Angular-FileUpload@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Gettext>=2.1.0.2:devel/py-XStatic-Angular-Gettext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-lrdragndrop>=1.0.2.2:devel/py-XStatic-Angular-lrdragndrop@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Angular-Schema-Form>=0.8.13.0:devel/py-XStatic-Angular-Schema-Form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-Datepicker>=1.3.1.0:devel/py-XStatic-Bootstrap-Datepicker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Bootstrap-SCSS>=3:devel/py-XStatic-Bootstrap-SCSS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-bootswatch>=3.3.5.3:devel/py-XStatic-bootswatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-D3>=3.1.6.2:devel/py-XStatic-D3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Hogan>=2.0.0.2:devel/py-XStatic-Hogan@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Font-Awesome>=4.3.0:devel/py-XStatic-Font-Awesome@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Jasmine>=2.1.2.0:devel/py-XStatic-Jasmine@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-jQuery>=1.7.2:devel/py-XStatic-jQuery@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery-Migrate>=1.2.1.1:devel/py-XStatic-JQuery-Migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.quicksearch>=2.0.3.1:devel/py-XStatic-JQuery.quicksearch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-JQuery.TableSorter>=2.14.5.1:devel/py-XStatic-JQuery.TableSorter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-jquery-ui>=1.10.1:devel/py-XStatic-jquery-ui@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-JSEncrypt>=2.0.0.2:devel/py-XStatic-JSEncrypt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-mdi>=1.4.57.0:devel/py-XStatic-mdi@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-objectpath>=1.2.1.0:devel/py-XStatic-objectpath@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Rickshaw>=1.5.0:devel/py-XStatic-Rickshaw@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-roboto-fontface>=0.4.3.2:devel/py-XStatic-roboto-fontface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-smart-table>=0:devel/py-XStatic-smart-table@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-Spin>=1.2.5.2:devel/py-XStatic-Spin@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-term.js>=0.0.4:devel/py-XStatic-term.js@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}XStatic-tv4>=1.2.7.0:devel/py-XStatic-tv4@${FLAVOR} EXTRA_PATCHES= ${FILESDIR}/01-django.patch:-p1 \ ${FILESDIR}/02-fix-floating-ips.patch:-p1 NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils USERS= horizon Index: www/py-html/Makefile =================================================================== --- www/py-html/Makefile +++ www/py-html/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils NO_ARCH= yes Index: www/py-html5-parser/Makefile =================================================================== --- www/py-html5-parser/Makefile +++ www/py-html5-parser/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.8.0:devel/py-lxml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=3.8.0:devel/py-lxml@${FLAVOR} USES= pkgconfig python USE_PYTHON= autoplist distutils Index: www/py-html5lib/Makefile =================================================================== --- www/py-html5lib/Makefile +++ www/py-html5lib/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-httpie/Makefile =================================================================== --- www/py-httpie/Makefile +++ www/py-httpie/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.11.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= jakubroztocil Index: www/py-httplib2/Makefile =================================================================== --- www/py-httplib2/Makefile +++ www/py-httplib2/Makefile @@ -14,6 +14,6 @@ NO_ARCH= yes USE_PYTHON= autoplist distutils -USES?= python +USES= python .include Index: www/py-hyper/Makefile =================================================================== --- www/py-hyper/Makefile +++ www/py-hyper/Makefile @@ -13,9 +13,9 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -25,7 +25,7 @@ .include .if ${PYTHON_REL} == 3300 || (${PYTHON_VER} == 2.7 && ${PYTHON_REL} < 2709) -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl \ +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=0.14:security/py-openssl@${FLAVOR} \ ${PYTHON_PGNAMEPREFIX}service_identity>=14.0.0:security/py-service_identity .endif Index: www/py-imdbpy/Makefile =================================================================== --- www/py-imdbpy/Makefile +++ www/py-imdbpy/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} OPTIONS_DEFINE= DOCS SQLALCHEMY OPTIONS_DEFAULT=SQLALCHEMY @@ -29,8 +29,8 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.10.0:databases/py-sqlalchemy-migrate \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10 +SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.10.0:databases/py-sqlalchemy-migrate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ Index: www/py-jsonfield/Makefile =================================================================== --- www/py-jsonfield/Makefile +++ www/py-jsonfield/Makefile @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110@${FLAVOR} CONFLICTS_INSTALL=py*-django-jsonfield Index: www/py-jswebkit/Makefile =================================================================== --- www/py-jswebkit/Makefile +++ www/py-jswebkit/Makefile @@ -12,12 +12,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= WebKit/JavaScriptCore Python bindings -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS:= ${BUILD_DEPENDS} LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 USES= pkgconfig python:2 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist cython cython_run WRKSRC= ${WRKDIR}/python-${PORTNAME}-${PORTVERSION} post-install: Index: www/py-kallithea/Makefile =================================================================== --- www/py-kallithea/Makefile +++ www/py-kallithea/Makefile @@ -15,28 +15,28 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest \ - ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons \ - ${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker \ - ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers \ - ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh \ - ${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery \ - ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject \ - ${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.8:www/py-waitress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}WebTest>=1.4.3:www/py-WebTest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beaker>=1.6.4:www/py-beaker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0.9.0:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}celery>=2.2.5:devel/py-celery@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urlobject>=2.3.4:www/py-urlobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}routes>=1.13:www/py-routes@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.9.9:devel/dulwich \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.3.0:security/py-bcrypt@${FLAVOR} \ mercurial>=2.9:devel/mercurial USES= python:2.7 @@ -51,6 +51,6 @@ GIT_DESC= Git repositories support GIT_RUN_DEPENDS= git:devel/git -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap +LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap:net/py-ldap@${FLAVOR} .include Index: www/py-libsass/Makefile =================================================================== --- www/py-libsass/Makefile +++ www/py-libsass/Makefile @@ -15,7 +15,7 @@ BROKEN_powerpc64= fails to compile: cc1plus: error: unrecognized command line option -std=c++0x -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-multidict/Makefile =================================================================== --- www/py-multidict/Makefile +++ www/py-multidict/Makefile @@ -12,9 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= cython:lang/cython - USES= python:3.4+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython .include Index: www/py-nevow/Makefile =================================================================== --- www/py-nevow/Makefile +++ www/py-nevow/Makefile @@ -15,7 +15,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} USE_PYTHON= autoplist distutils USES= gettext python Index: www/py-notebook/Makefile =================================================================== --- www/py-notebook/Makefile +++ www/py-notebook/Makefile @@ -12,16 +12,16 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel \ - ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils \ - ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client \ - ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core \ - ${PYTHON_PKGNAMEPREFIX}nbconvert>=0:devel/py-nbconvert \ - ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat \ - ${PYTHON_PKGNAMEPREFIX}terminado>=0.3.3:net/py-terminado \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython_genutils>=0:devel/py-ipython_genutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbconvert>=0:devel/py-nbconvert@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbformat>=0:devel/py-nbformat@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}terminado>=0.3.3:net/py-terminado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2.1:devel/py-traitlets@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-octoprint/Makefile =================================================================== --- www/py-octoprint/Makefile +++ www/py-octoprint/Makefile @@ -12,35 +12,35 @@ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.1:www/py-werkzeug \ - ${PYTHON_PKGNAMEPREFIX}tornado>=4.4.2:www/py-tornado \ - ${PYTHON_PKGNAMEPREFIX}sockjs-tornado>=1.0.2:www/py-sockjs-tornado \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.3.2:www/py-flask-login \ - ${PYTHON_PKGNAMEPREFIX}Flask-Principal>=0.4:www/py-flask-principal \ - ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel \ - ${PYTHON_PKGNAMEPREFIX}Flask-Assets>=0.12:www/py-flask-assets \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.4:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}serial>=3.2:comms/py-serial \ - ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.17:net/py-netaddr \ - ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.2:devel/py-watchdog \ - ${PYTHON_PKGNAMEPREFIX}sarge>=0.1.4:devel/py-sarge \ - ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10:net/py-netifaces \ - ${PYTHON_PKGNAMEPREFIX}pylru>=1.0.9:devel/py-pylru \ - ${PYTHON_PKGNAMEPREFIX}rsa>=3.3:security/py-rsa \ - ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.2.1:sysutils/py-pkginfo \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.4.2:devel/py-semantic_version \ - ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil \ - ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}awesome-slugify>=1.6.5:textproc/py-awesome-slugify \ - ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser \ - ${PYTHON_PKGNAMEPREFIX}chainmap>=1.0.2:devel/py-chainmap \ - ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=0.11.1:www/py-werkzeug@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.4.2:www/py-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sockjs-tornado>=1.0.2:www/py-sockjs-tornado@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Login>=0.3.2:www/py-flask-login@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Principal>=0.4:www/py-flask-principal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Assets>=0.12:www/py-flask-assets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.6.4:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}serial>=3.2:comms/py-serial@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0.7.17:net/py-netaddr@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8.2:devel/py-watchdog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sarge>=0.1.4:devel/py-sarge@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>=0.10:net/py-netifaces@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pylru>=1.0.9:devel/py-pylru@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rsa>=3.3:security/py-rsa@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pkginfo>=1.2.1:sysutils/py-pkginfo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}semantic_version>=2.4.2:devel/py-semantic_version@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=4.3.0:sysutils/py-psutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}click>=6.6:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}awesome-slugify>=1.6.5:textproc/py-awesome-slugify@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}feedparser>=5.2.1:textproc/py-feedparser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chainmap>=1.0.2:devel/py-chainmap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scandir>=1.3:sysutils/py-scandir@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils BROKEN= checksum mismatch Index: www/py-paste/Makefile =================================================================== --- www/py-paste/Makefile +++ www/py-paste/Makefile @@ -11,7 +11,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Tools for using a Web Server Gateway Interface stack -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-pastedeploy/Makefile =================================================================== --- www/py-pastedeploy/Makefile +++ www/py-pastedeploy/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.6:www/py-paste +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Paste>=1.6:www/py-paste@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: www/py-pastescript/Makefile =================================================================== --- www/py-pastescript/Makefile +++ www/py-pastescript/Makefile @@ -12,15 +12,15 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:devel/py-cheetah \ - ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}wsgiutils>0:devel/py-wsgiutils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:devel/py-cheetah@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flup>0:www/py-flup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.2:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wsgiutils>0:devel/py-wsgiutils@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils post-extract: Index: www/py-pelican/Makefile =================================================================== --- www/py-pelican/Makefile +++ www/py-pelican/Makefile @@ -13,15 +13,15 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:www/py-feedgenerator \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker \ - ${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode \ - ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}feedgenerator>=1.6:www/py-feedgenerator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} NO_ARCH= yes USES= python shebangfix @@ -36,10 +36,10 @@ OPTIONS_DEFAULT= MARKDOWN SYNTAX MARKDOWN_DESC= Markdown markup language format support -MARKDOWN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown +MARKDOWN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} SYNTAX_DESC= Syntax Highlighting (via pygments) -SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments +SYNTAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=1.4:textproc/py-pygments@${FLAVOR} do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Index: www/py-planet/Makefile =================================================================== --- www/py-planet/Makefile +++ www/py-planet/Makefile @@ -12,9 +12,9 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-futures>=0:www/py-requests-futures@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: www/py-plone.alterego/Makefile =================================================================== --- www/py-plone.alterego/Makefile +++ www/py-plone.alterego/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL20 NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.blob/Makefile =================================================================== --- www/py-plone.app.blob/Makefile +++ www/py-plone.app.blob/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:devel/py-archetypes.schemaextender \ - ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:www/py-plone.app.imaging \ - ${PYTHON_PKGNAMEPREFIX}plone.scale>=0:www/py-plone.scale +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=3.4:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}archetypes.schemaextender>=1.6:devel/py-archetypes.schemaextender@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.imaging>1.0:www/py-plone.app.imaging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.scale>=0:www/py-plone.scale@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.app.caching/Makefile =================================================================== --- www/py-plone.app.caching/Makefile +++ www/py-plone.app.caching/Makefile @@ -12,29 +12,29 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching \ - ${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:www/py-plone.cachepurging \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry \ - ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.cachepurging>=0:www/py-plone.cachepurging@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserresource>0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook@${FLAVOR} NO_ARCH= yes -USES= python zope +USES= python:2.7 zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.collection/Makefile =================================================================== --- www/py-plone.app.collection/Makefile +++ www/py-plone.app.collection/Makefile @@ -12,27 +12,27 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:devel/py-archetypes.querywidget \ - ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:www/py-plone.portlet.collection \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \ - ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}archetypes.querywidget>=1.0.2:devel/py-archetypes.querywidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlet.collection>0:www/py-plone.portlet.collection@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.validation>=0:devel/py-Products.validation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes -USES= python zope +USES= python:2.7 zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.content/Makefile =================================================================== --- www/py-plone.app.content/Makefile +++ www/py-plone.app.content/Makefile @@ -12,22 +12,22 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.2.0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope zip Index: www/py-plone.app.contentlisting/Makefile =================================================================== --- www/py-plone.app.contentlisting/Makefile +++ www/py-plone.app.contentlisting/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.contentmenu/Makefile =================================================================== --- www/py-plone.app.contentmenu/Makefile +++ www/py-plone.app.contentmenu/Makefile @@ -12,23 +12,23 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:www/py-plone.app.content \ - ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.content>=2.0:www/py-plone.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publisher>=0:devel/py-zope.app.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} NO_ARCH= yes -USES= python zope +USES= python:2.7 zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.contentrules/Makefile =================================================================== --- www/py-plone.app.contentrules/Makefile +++ www/py-plone.app.contentrules/Makefile @@ -12,32 +12,32 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:www/py-plone.stringinterp \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.11.0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.contentrules>=0:www/py-plone.contentrules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.stringinterp>=0:www/py-plone.stringinterp@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.11.0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.controlpanel/Makefile =================================================================== --- www/py-plone.app.controlpanel/Makefile +++ www/py-plone.app.controlpanel/Makefile @@ -12,32 +12,32 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow \ - ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:devel/py-zope.cachedescriptors \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.workflow>=0:www/py-plone.app.workflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.fieldsets>=0:www/py-plone.fieldsets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.cachedescriptors>=0:devel/py-zope.cachedescriptors@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip zope Index: www/py-plone.app.customerize/Makefile =================================================================== --- www/py-plone.app.customerize/Makefile +++ www/py-plone.app.customerize/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \ - ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:www/py-plone.browserlayer \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.browserlayer>=0:www/py-plone.browserlayer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils #USES= zope Index: www/py-plone.app.dexterity/Makefile =================================================================== --- www/py-plone.app.dexterity/Makefile +++ www/py-plone.app.dexterity/Makefile @@ -12,32 +12,32 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:devel/py-collective.z3cform.datetimewidget \ - ${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:www/py-plone.app.textfield \ - ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior \ - ${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:www/py-plone.dexterity \ - ${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:www/py-plone.formwidget.namedfile \ - ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \ - ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \ - ${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:www/py-plone.schemaeditor \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:www/py-plone.app.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:www/py-plone.app.z3cform \ - ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform \ - ${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:www/py-plone.contentrules \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>0:devel/py-collective.z3cform.datetimewidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.textfield>0:www/py-plone.app.textfield@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.dexterity>0:www/py-plone.dexterity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.formwidget.namedfile>0:www/py-plone.formwidget.namedfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.schemaeditor>0:www/py-plone.schemaeditor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>0:www/py-plone.app.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>0:www/py-plone.app.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.contentrules>0:www/py-plone.contentrules@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.discussion/Makefile =================================================================== --- www/py-plone.app.discussion/Makefile +++ www/py-plone.app.discussion/Makefile @@ -12,23 +12,23 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:devel/py-collective.monkeypatcher \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \ - ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:devel/py-z3c.form +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.monkeypatcher>=0:devel/py-collective.monkeypatcher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=0:www/py-plone.app.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.uuid>=0:www/py-plone.app.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>=2.3.3:devel/py-z3c.form@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.app.folder/Makefile =================================================================== --- www/py-plone.app.folder/Makefile +++ www/py-plone.app.folder/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>0:www/py-plone.app.layout@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.form/Makefile =================================================================== --- www/py-plone.app.form/Makefile +++ www/py-plone.app.form/Makefile @@ -12,23 +12,23 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=4.0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.i18n/Makefile =================================================================== --- www/py-plone.app.i18n/Makefile +++ www/py-plone.app.i18n/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.imaging/Makefile =================================================================== --- www/py-plone.app.imaging/Makefile +++ www/py-plone.app.imaging/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.scale>0:www/py-plone.scale \ - ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching \ - ${PYTHON_PKGNAMEPREFIX}five.globalrequest>0:devel/py-five.globalrequest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.scale>0:www/py-plone.scale@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.globalrequest>0:devel/py-five.globalrequest@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.iterate/Makefile =================================================================== --- www/py-plone.app.iterate/Makefile +++ www/py-plone.app.iterate/Makefile @@ -12,25 +12,25 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.locking>=0:www/py-plone.locking@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFPlacefulWorkflow>=0:devel/py-Products.CMFPlacefulWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.jquery/Makefile =================================================================== --- www/py-plone.app.jquery/Makefile +++ www/py-plone.app.jquery/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.jquerytools/Makefile =================================================================== --- www/py-plone.app.jquerytools/Makefile +++ www/py-plone.app.jquerytools/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.layout/Makefile =================================================================== --- www/py-plone.app.layout/Makefile +++ www/py-plone.app.layout/Makefile @@ -12,26 +12,26 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:www/py-plone.app.viewletmanager \ - ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:devel/py-Products.CMFEditions +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.viewletmanager>=1.2:www/py-plone.app.viewletmanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.content>0:www/py-plone.app.content@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>=0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=1.2.2:devel/py-Products.CMFEditions@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.ldap/Makefile =================================================================== --- www/py-plone.app.ldap/Makefile +++ www/py-plone.app.ldap/Makefile @@ -13,16 +13,16 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:www/py-Products.PloneLDAP \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PloneLDAP>=1.0:www/py-Products.PloneLDAP@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: www/py-plone.app.linkintegrity/Makefile =================================================================== --- www/py-plone.app.linkintegrity/Makefile +++ www/py-plone.app.linkintegrity/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.portlets/Makefile =================================================================== --- www/py-plone.app.portlets/Makefile +++ www/py-plone.app.portlets/Makefile @@ -12,39 +12,39 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.customerize>=0:devel/py-five.customerize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=1.1:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.i18n>=0:www/py-plone.app.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=1.2:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>=0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.querystring/Makefile =================================================================== --- www/py-plone.app.querystring/Makefile +++ www/py-plone.app.querystring/Makefile @@ -12,25 +12,25 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:www/py-plone.app.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:devel/py-zope.globalrequest \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.1:www/py-plone.app.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>0:devel/py-zope.globalrequest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.redirector/Makefile =================================================================== --- www/py-plone.app.redirector/Makefile +++ www/py-plone.app.redirector/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.registry/Makefile =================================================================== --- www/py-plone.app.registry/Makefile +++ www/py-plone.app.registry/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel \ - ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform \ - ${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:www/py-plone.autoform \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.z3cform>=0:www/py-plone.app.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.autoform>=1.0:www/py-plone.autoform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.search/Makefile =================================================================== --- www/py-plone.app.search/Makefile +++ www/py-plone.app.search/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.app.contentlisting>=0:www/py-plone.app.contentlisting@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.testing/Makefile =================================================================== --- www/py-plone.app.testing/Makefile +++ www/py-plone.app.testing/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.testing>=0:www/py-plone.testing \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.testing>=0:www/py-plone.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} NO_ARCH= yes -USES= python zip zope +USES= python:2.7 zip zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.textfield/Makefile =================================================================== --- www/py-plone.app.textfield/Makefile +++ www/py-plone.app.textfield/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=3.8.1:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: www/py-plone.app.theming/Makefile =================================================================== --- www/py-plone.app.theming/Makefile +++ www/py-plone.app.theming/Makefile @@ -13,21 +13,21 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diazo>=0:devel/py-diazo \ - ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}roman>0:math/py-roman \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry \ - ${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:www/py-plone.subrequest \ - ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain \ - ${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0,1:www/py-plone.resource \ - ${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:www/py-plone.resourceeditor \ - ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter \ - ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}diazo>=0:devel/py-diazo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}roman>0:math/py-roman@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.2.4:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.registry>=1.0:www/py-plone.app.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.subrequest>=0:www/py-plone.subrequest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.resource>=1.0,1:www/py-plone.resource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.resourceeditor>0:www/py-plone.resourceeditor@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.xmliter>=0.3:devel/py-repoze.xmliter@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.upgrade/Makefile =================================================================== --- www/py-plone.app.upgrade/Makefile +++ www/py-plone.app.upgrade/Makefile @@ -12,36 +12,36 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole \ - ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session \ - ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder \ - ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes \ - ${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:devel/py-Products.contentmigration \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid \ - ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms \ - ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries \ - ${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:mail/py-Products.SecureMailHost \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:devel/py-Products.ZCatalog +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}borg.localrole>=0:security/py-borg.localrole@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:devel/py-five.localsitemanager@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.session>=0:security/py-plone.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.folder>=0:www/py-plone.app.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.Archetypes>=0:devel/py-Products.Archetypes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.contentmigration>=0:devel/py-Products.contentmigration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDiffTool>=0:devel/py-Products.CMFDiffTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFEditions>=0:devel/py-Products.CMFEditions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFFormController>=0:devel/py-Products.CMFFormController@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFQuickInstallerTool>=0:devel/py-Products.CMFQuickInstallerTool@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFUid>=0:devel/py-Products.CMFUid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>=0:devel/py-Products.DCWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>=0:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=0:security/py-Products.PluggableAuthService@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ResourceRegistries>=0:devel/py-Products.ResourceRegistries@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.SecureMailHost>=0:mail/py-Products.SecureMailHost@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=2.13.4:devel/py-Products.ZCatalog@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.app.users/Makefile =================================================================== --- www/py-plone.app.users/Makefile +++ www/py-plone.app.users/Makefile @@ -12,20 +12,20 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:www/py-plone.app.controlpanel \ - ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.protect>=0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.controlpanel>=2.1:www/py-plone.app.controlpanel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.layout>=0:www/py-plone.app.layout@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PlonePAS>0:security/py-Products.PlonePAS@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>=0:devel/py-Products.statusmessages@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.app.uuid/Makefile =================================================================== --- www/py-plone.app.uuid/Makefile +++ www/py-plone.app.uuid/Makefile @@ -12,13 +12,13 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.uuid>=0:www/py-plone.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.indexer>=0:www/py-plone.indexer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.viewletmanager/Makefile =================================================================== --- www/py-plone.app.viewletmanager/Makefile +++ www/py-plone.app.viewletmanager/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:www/py-plone.app.vocabularies +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>0:www/py-plone.app.vocabularies@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils #USES= zope Index: www/py-plone.app.vocabularies/Makefile =================================================================== --- www/py-plone.app.vocabularies/Makefile +++ www/py-plone.app.vocabularies/Makefile @@ -12,20 +12,20 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} NO_ARCH= yes -USES= python zope +USES= python:2.7 zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.workflow/Makefile =================================================================== --- www/py-plone.app.workflow/Makefile +++ www/py-plone.app.workflow/Makefile @@ -12,26 +12,26 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>0:devel/py-Products.DCWorkflow \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.DCWorkflow>0:devel/py-Products.DCWorkflow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages@${FLAVOR} NO_ARCH= yes -USES= python zip zope +USES= python:2.7 zip zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.app.z3cform/Makefile =================================================================== --- www/py-plone.app.z3cform/Makefile +++ www/py-plone.app.z3cform/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:devel/py-collective.z3cform.datetimewidget \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:www/py-plone.z3cform \ - ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:devel/py-z3c.formwidget.query \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}collective.z3cform.datetimewidget>=0.1:devel/py-collective.z3cform.datetimewidget@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0.5.11:www/py-plone.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.protect>0:security/py-plone.protect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.formwidget.query>0:devel/py-z3c.formwidget.query@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR} NO_ARCH= yes -USES= python zip zope +USES= python:2.7 zip zope USE_PYTHON= autoplist distutils .include Index: www/py-plone.autoform/Makefile =================================================================== --- www/py-plone.autoform/Makefile +++ www/py-plone.autoform/Makefile @@ -12,13 +12,13 @@ LICENSE= LGPL20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.supermodel>=1.1:www/py-plone.supermodel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>=0:www/py-plone.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.behavior/Makefile =================================================================== --- www/py-plone.behavior/Makefile +++ www/py-plone.behavior/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>0:devel/py-zope.configuration +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>0:devel/py-zope.configuration@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.browserlayer/Makefile =================================================================== --- www/py-plone.browserlayer/Makefile +++ www/py-plone.browserlayer/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:devel/py-Products.GenericSetup \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=1.4:devel/py-Products.GenericSetup@${FLAVOR} \ NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils #USES= zope Index: www/py-plone.cachepurging/Makefile =================================================================== --- www/py-plone.cachepurging/Makefile +++ www/py-plone.cachepurging/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.caching>0:devel/py-z3c.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>0:devel/py-zope.testing@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.caching/Makefile =================================================================== --- www/py-plone.caching/Makefile +++ www/py-plone.caching/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching \ - ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain \ - ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.registry>=0:www/py-plone.registry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.transformchain>=0:www/py-plone.transformchain@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils #USES= zope Index: www/py-plone.contentrules/Makefile =================================================================== --- www/py-plone.contentrules/Makefile +++ www/py-plone.contentrules/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.componentvocabulary>=0:devel/py-zope.componentvocabulary@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.dexterity/Makefile =================================================================== --- www/py-plone.dexterity/Makefile +++ www/py-plone.dexterity/Makefile @@ -12,34 +12,34 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.alterego>0:www/py-plone.alterego \ - ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform \ - ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior \ - ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \ - ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel \ - ${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:www/py-plone.synchronize \ - ${PYTHON_PKGNAMEPREFIX}plone.uuid>0:www/py-plone.uuid \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:devel/py-Products.CMFDynamicViewFTI \ - ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation \ - ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size \ - zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.alterego>0:www/py-plone.alterego@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.behavior>0:www/py-plone.behavior@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.folder>0:www/py-plone.folder@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.supermodel>0:www/py-plone.supermodel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.synchronize>0:www/py-plone.synchronize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.uuid>0:www/py-plone.uuid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDefault>0:devel/py-Products.CMFDefault@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFDynamicViewFTI>0:devel/py-Products.CMFDynamicViewFTI@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.statusmessages>0:devel/py-Products.statusmessages@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>0:devel/py-zope.filerepresentation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>0:devel/py-zope.size@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.fieldsets/Makefile =================================================================== --- www/py-plone.fieldsets/Makefile +++ www/py-plone.fieldsets/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.formlib>=0:devel/py-five.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.folder/Makefile =================================================================== --- www/py-plone.folder/Makefile +++ www/py-plone.folder/Makefile @@ -12,17 +12,17 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:devel/py-Products.BTreeFolder2 \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>0:devel/py-Products.BTreeFolder2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.formwidget.namedfile/Makefile =================================================================== --- www/py-plone.formwidget.namedfile/Makefile +++ www/py-plone.formwidget.namedfile/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.namedfile>0:www/py-plone.namedfile@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.i18n/Makefile =================================================================== --- www/py-plone.i18n/Makefile +++ www/py-plone.i18n/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.indexer/Makefile =================================================================== --- www/py-plone.indexer/Makefile +++ www/py-plone.indexer/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>0:devel/py-Products.ZCatalog@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.intelligenttext/Makefile =================================================================== --- www/py-plone.intelligenttext/Makefile +++ www/py-plone.intelligenttext/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.locking/Makefile =================================================================== --- www/py-plone.locking/Makefile +++ www/py-plone.locking/Makefile @@ -12,16 +12,16 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.memoize/Makefile =================================================================== --- www/py-plone.memoize/Makefile +++ www/py-plone.memoize/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ramcache>=0:devel/py-zope.ramcache@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.namedfile/Makefile =================================================================== --- www/py-plone.namedfile/Makefile +++ www/py-plone.namedfile/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy \ - ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822 \ - ${PYTHON_PKGNAMEPREFIX}zope.app.file>0:devel/py-zope.app.file +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.copy>0:devel/py-zope.copy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.rfc822>0:www/py-plone.rfc822@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.file>0:devel/py-zope.app.file@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.outputfilters/Makefile =================================================================== --- www/py-plone.outputfilters/Makefile +++ www/py-plone.outputfilters/Makefile @@ -12,10 +12,10 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup \ - ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry \ - ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:devel/py-Products.GenericSetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MimetypesRegistry>=0:devel/py-Products.MimetypesRegistry@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PortalTransforms>=0:devel/py-Products.PortalTransforms@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.portlet.collection/Makefile =================================================================== --- www/py-plone.portlet.collection/Makefile +++ www/py-plone.portlet.collection/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.vocabularies>=0:www/py-plone.app.vocabularies@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.portlet.static/Makefile =================================================================== --- www/py-plone.portlet.static/Makefile +++ www/py-plone.portlet.static/Makefile @@ -12,18 +12,18 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets \ - ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form \ - ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.portlets>=0:www/py-plone.app.portlets@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.app.form>=0:www/py-plone.app.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.i18n>=0:www/py-plone.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.formlib>=0:devel/py-zope.formlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils #USES= zope Index: www/py-plone.portlets/Makefile =================================================================== --- www/py-plone.portlets/Makefile +++ www/py-plone.portlets/Makefile @@ -12,16 +12,16 @@ LICENSE= GPLv2 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize \ - ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.memoize>=0:www/py-plone.memoize@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.registry/Makefile =================================================================== --- www/py-plone.registry/Makefile +++ www/py-plone.registry/Makefile @@ -12,12 +12,12 @@ LICENSE= GPLv2 -RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event +RUN_DEPENDS= zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.resource/Makefile =================================================================== --- www/py-plone.resource/Makefile +++ www/py-plone.resource/Makefile @@ -13,16 +13,16 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation \ - ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.filerepresentation>=0:devel/py-zope.filerepresentation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.caching>=0:devel/py-z3c.caching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.caching>=0:www/py-plone.caching@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.resourceeditor/Makefile =================================================================== --- www/py-plone.resourceeditor/Makefile +++ www/py-plone.resourceeditor/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}plone.resource>0:www/py-plone.resource +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.resource>0:www/py-plone.resource@${FLAVOR} NO_ARCH= yes USES= python:2.7 zip Index: www/py-plone.rfc822/Makefile =================================================================== --- www/py-plone.rfc822/Makefile +++ www/py-plone.rfc822/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.scale/Makefile =================================================================== --- www/py-plone.scale/Makefile +++ www/py-plone.scale/Makefile @@ -12,10 +12,10 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.annotation>=0:devel/py-zope.annotation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.schemaeditor/Makefile =================================================================== --- www/py-plone.schemaeditor/Makefile +++ www/py-plone.schemaeditor/Makefile @@ -12,18 +12,18 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform \ - ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.z3cform>0:www/py-plone.z3cform@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}plone.autoform>0:www/py-plone.autoform@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.stringinterp/Makefile =================================================================== --- www/py-plone.stringinterp/Makefile +++ www/py-plone.stringinterp/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.subrequest/Makefile =================================================================== --- www/py-plone.subrequest/Makefile +++ www/py-plone.subrequest/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest \ - ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.globalrequest>=0:devel/py-five.globalrequest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:devel/py-zope.globalrequest@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils .include Index: www/py-plone.supermodel/Makefile =================================================================== --- www/py-plone.supermodel/Makefile +++ www/py-plone.supermodel/Makefile @@ -12,14 +12,14 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname \ - ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.zcmlhook>=0:devel/py-z3c.zcmlhook@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.synchronize/Makefile =================================================================== --- www/py-plone.synchronize/Makefile +++ www/py-plone.synchronize/Makefile @@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.testing/Makefile =================================================================== --- www/py-plone.testing/Makefile +++ www/py-plone.testing/Makefile @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-plone.theme/Makefile =================================================================== --- www/py-plone.theme/Makefile +++ www/py-plone.theme/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=3.9.0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:devel/py-Products.CMFCore@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils #USES= zope Index: www/py-plone.transformchain/Makefile =================================================================== --- www/py-plone.transformchain/Makefile +++ www/py-plone.transformchain/Makefile @@ -12,9 +12,9 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} NO_ARCH= yes USES= python:2.7 zope Index: www/py-plone.uuid/Makefile =================================================================== --- www/py-plone.uuid/Makefile +++ www/py-plone.uuid/Makefile @@ -13,13 +13,13 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plone.z3cform/Makefile =================================================================== --- www/py-plone.z3cform/Makefile +++ www/py-plone.z3cform/Makefile @@ -12,14 +12,14 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching \ - ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.batching>0:www/py-plone.batching@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}z3c.form>=0:devel/py-z3c.form@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=3.4:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} NO_ARCH= yes -USES= python zip zope +USES= python:2.7 zip zope USE_PYTHON= autoplist distutils .include Index: www/py-plonetheme.classic/Makefile =================================================================== --- www/py-plonetheme.classic/Makefile +++ www/py-plonetheme.classic/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-plonetheme.sunburst/Makefile =================================================================== --- www/py-plonetheme.sunburst/Makefile +++ www/py-plonetheme.sunburst/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 NO_ARCH= yes -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils .include Index: www/py-poster/Makefile =================================================================== --- www/py-poster/Makefile +++ www/py-poster/Makefile @@ -12,7 +12,7 @@ MAINTAINER= nivit@FreeBSD.org COMMENT= Streaming HTTP uploads and multipart/form-data encoding -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist post-extract: Index: www/py-praw/Makefile =================================================================== --- www/py-praw/Makefile +++ www/py-praw/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.9:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}update_checker>=0.11:devel/py-update_checker@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${FLAVOR} # TEST_DEPENDS to be ported # betamax >=0.5.1 Index: www/py-puppetboard/Makefile =================================================================== --- www/py-puppetboard/Makefile +++ www/py-puppetboard/Makefile @@ -12,11 +12,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.1.1:databases/py-pypuppetdb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${FLAVOR} CONFLICTS_INSTALL=puppetboard02-* USE_GITHUB= yes Index: www/py-puppetboard02/Makefile =================================================================== --- www/py-puppetboard02/Makefile +++ www/py-puppetboard02/Makefile @@ -13,11 +13,11 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.2.0:databases/py-pypuppetdb03 \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0.10.1:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.9.4:www/py-flask-wtf@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.19:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pypuppetdb03>=0.2.0:databases/py-pypuppetdb03@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.2.1:www/py-requests@${FLAVOR} CONFLICTS_INSTALL=puppetboard-* USE_GITHUB= yes Index: www/py-py-restclient/Makefile =================================================================== --- www/py-py-restclient/Makefile +++ www/py-py-restclient/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= Python REST Client -RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 +RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-pySmartDL/Makefile =================================================================== --- www/py-pySmartDL/Makefile +++ www/py-pySmartDL/Makefile @@ -18,7 +18,7 @@ .include .if ${PYTHON_VER} == "2.7" -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} .endif .include Index: www/py-pyjwt/Makefile =================================================================== --- www/py-pyjwt/Makefile +++ www/py-pyjwt/Makefile @@ -15,9 +15,9 @@ # Some tests are skipped without pycrypto, but its not # referenced as a requirement anymore. -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${FLAVOR} USES= python USE_PYTHON= distutils concurrent autoplist @@ -25,7 +25,7 @@ OPTIONS_DEFINE= RSASSA RSASSA_DESC= RSASSA-PKCS1 v1.5 signature support -RSASSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography +RSASSA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${FLAVOR} NO_ARCH= yes Index: www/py-pylons/Makefile =================================================================== --- www/py-pylons/Makefile +++ www/py-pylons/Makefile @@ -14,24 +14,24 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.12.3:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers \ - ${PYTHON_PKGNAMEPREFIX}beaker>=1.5.4:www/py-beaker \ - ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.5.1:www/py-paste \ - ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.4.2:www/py-pastescript \ - ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.1:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}decorator>=3.3.2:devel/py-decorator \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.5.0:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}WebError>=0.10.3:www/py-WebError \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.1:www/py-WebTest \ - ${PYTHON_PKGNAMEPREFIX}Tempita>=0.5.1:textproc/py-Tempita \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.15:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.1.1:www/py-webob +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.12.3:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:www/py-webhelpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beaker>=1.5.4:www/py-beaker@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Paste>=1.7.5.1:www/py-paste@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.4.2:www/py-pastescript@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.2.1:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=3.3.2:devel/py-decorator@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.1.2:devel/py-nose@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0.5.0:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}WebError>=0.10.3:www/py-WebError@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}WebTest>=1.3.1:www/py-WebTest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Tempita>=0.5.1:textproc/py-Tempita@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.15:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.1.1:www/py-webob@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-pyocclient/Makefile =================================================================== --- www/py-pyocclient/Makefile +++ www/py-pyocclient/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.1:www/py-requests@${FLAVOR} NO_ARCH= yes USES= python:2.7 Index: www/py-pyquery/Makefile =================================================================== --- www/py-pyquery/Makefile +++ www/py-pyquery/Makefile @@ -12,18 +12,18 @@ LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssselect>=0.6.1:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2.2:www/py-webob@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= DOCS -USES= python zip +USES= python:2.7 zip USE_PYTHON= autoplist distutils NO_ARCH= yes Index: www/py-pyramid/Makefile =================================================================== --- www/py-pyramid/Makefile +++ www/py-pyramid/Makefile @@ -15,17 +15,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy \ - ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:devel/py-repoze.lru \ - ${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:textproc/py-translationstring \ - ${PYTHON_PKGNAMEPREFIX}venusian>=1.0,1:devel/py-venusian \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:devel/py-zope.deprecation \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.5.0:www/py-pastedeploy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.4:devel/py-repoze.lru@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}translationstring>=0.4:textproc/py-translationstring@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}venusian>=1.0,1:devel/py-venusian@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.3.1:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deprecation>=3.5.0:devel/py-zope.deprecation@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=3.8.0:devel/py-zope.interface@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest \ -# ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component +#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:www/py-WebTest@${FLAVOR} \ +# ${PYTHON_PKGNAMEPREFIX}zope.component>=3.6.0:devel/py-zope.component@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-pyramid_rpc/Makefile =================================================================== --- www/py-pyramid_rpc/Makefile +++ www/py-pyramid_rpc/Makefile @@ -10,7 +10,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= RPC support for the Pyramid web framework -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyramid>=0:www/py-pyramid@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python Index: www/py-pysearch/Makefile =================================================================== --- www/py-pysearch/Makefile +++ www/py-pysearch/Makefile @@ -12,7 +12,7 @@ MAINTAINER= lwhsu@FreeBSD.org COMMENT= Yahoo Search Web Services SDK for Python -USES= python shebangfix +USES= python:2.7 shebangfix SHEBANG_FILES= examples/profile.py \ examples/websearch.py USE_PYTHON= distutils Index: www/py-python-digitalocean/Makefile =================================================================== --- www/py-python-digitalocean/Makefile +++ www/py-python-digitalocean/Makefile @@ -12,7 +12,7 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-pywebdav/Makefile =================================================================== --- www/py-pywebdav/Makefile +++ www/py-pywebdav/Makefile @@ -11,7 +11,7 @@ MAINTAINER= wen@FreeBSD.org COMMENT= WebDAV Library and Server for Python -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-pywikibot/Makefile =================================================================== --- www/py-pywikibot/Makefile +++ www/py-pywikibot/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 +RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} USES= python USE_PYTHON= autoplist distutils @@ -26,11 +26,11 @@ MWPARSE_DESC= Support for MediaWiki parser PILLOW_DESC= Support for image processing via pillow module -ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=0:devel/py-stdnum -PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oursql>=0:databases/py-oursql -GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>=0:www/py-google -MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>=0:textproc/py-mwparserfromhell -PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +ISBN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stdnum>=0:devel/py-stdnum@${FLAVOR} +PYDOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oursql>=0:databases/py-oursql@${FLAVOR} +GOOGLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}google>=0:www/py-google@${FLAVOR} +MWPARSE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mwparserfromhell>=0:textproc/py-mwparserfromhell@${FLAVOR} +PILLOW_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} .include Index: www/py-qp/Makefile =================================================================== --- www/py-qp/Makefile +++ www/py-qp/Makefile @@ -12,8 +12,8 @@ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Python web framework to use qpy and durus together -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:devel/py-durus \ - ${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}durus>=0:devel/py-durus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qpy>=1.7:www/py-qpy@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= DOCS EXAMPLES Index: www/py-qt4-webkit/Makefile =================================================================== --- www/py-qt4-webkit/Makefile +++ www/py-qt4-webkit/Makefile @@ -12,6 +12,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run gui_run network_run +USE_PYTHON= flavors USE_QT4= corelib gui network webkit \ moc_build qmake_build Index: www/py-qt5-webkit/Makefile =================================================================== --- www/py-qt5-webkit/Makefile +++ www/py-qt5-webkit/Makefile @@ -7,8 +7,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt5 toolkit, QtWebKit module -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip -RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:devel/py-sip@${FLAVOR} +RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT5_VERSION}:x11-toolkits/py-qt5-gui@${FLAVOR} CONFIGURE_ARGS= --enable QtWebKit PYQT_DIST= yes @@ -16,6 +16,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run network_run +USE_PYTHON= flavors USE_QT5= core gui network webkit qmake_build OPTIONS_DEFINE= API DEBUG Index: www/py-qt5-webkitwidgets/Makefile =================================================================== --- www/py-qt5-webkitwidgets/Makefile +++ www/py-qt5-webkitwidgets/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run printsupport_run webkit_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui network printsupport webkit widgets \ qmake_build Index: www/py-rackspace-monitoring/Makefile =================================================================== --- www/py-rackspace-monitoring/Makefile +++ www/py-rackspace-monitoring/Makefile @@ -13,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:net/py-libcloud +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14:net/py-libcloud@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-requestbuilder/Makefile =================================================================== --- www/py-requestbuilder/Makefile +++ www/py-requestbuilder/Makefile @@ -13,8 +13,8 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.4:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python:-2.7 USE_PYTHON= distutils autoplist Index: www/py-requests-cache/Makefile =================================================================== --- www/py-requests-cache/Makefile +++ www/py-requests-cache/Makefile @@ -13,9 +13,9 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} # Python 2.6-3.5(+) 20171026 USES= python Index: www/py-requests-file/Makefile =================================================================== --- www/py-requests-file/Makefile +++ www/py-requests-file/Makefile @@ -11,8 +11,8 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes Index: www/py-requests-futures/Makefile =================================================================== --- www/py-requests-futures/Makefile +++ www/py-requests-futures/Makefile @@ -15,14 +15,14 @@ USES= python USE_PYTHON= autoplist distutils -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} NO_ARCH= yes .include .if ${PYTHON_VER} == "2.7" -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${FLAVOR} .endif .include Index: www/py-requests-mock/Makefile =================================================================== --- www/py-requests-mock/Makefile +++ www/py-requests-mock/Makefile @@ -13,9 +13,9 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=0:devel/py-pbr@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils Index: www/py-requests-oauthlib/Makefile =================================================================== --- www/py-requests-oauthlib/Makefile +++ www/py-requests-oauthlib/Makefile @@ -12,9 +12,9 @@ LICENSE= ISCL -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}oauthlib>=0.6.2:security/py-oauthlib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-requests-toolbelt/Makefile =================================================================== --- www/py-requests-toolbelt/Makefile +++ www/py-requests-toolbelt/Makefile @@ -11,7 +11,7 @@ LICENSE= APACHE20 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.1:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>2.0.1:www/py-requests@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-requests/Makefile =================================================================== --- www/py-requests/Makefile +++ www/py-requests/Makefile @@ -14,17 +14,17 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py-execnet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} # Actually 2.6-2.7,3.3+ -USES?= python +USES= python USE_PYTHON= autoplist concurrent distutils CONFLICTS_INSTALL= py*-requests1-* Index: www/py-restclient/Makefile =================================================================== --- www/py-restclient/Makefile +++ www/py-restclient/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2 +RUN_DEPENDS= ${PKGNAMEPREFIX}httplib2>=0:www/py-httplib2@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-rhodecode/Makefile =================================================================== --- www/py-rhodecode/Makefile +++ www/py-rhodecode/Makefile @@ -14,28 +14,28 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons \ - ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:www/py-waitress \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode \ - ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers \ - ${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako \ - ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10 \ - ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh \ - ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}waitress>=0.8.4:www/py-waitress@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.0.8:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}formencode>=1.2.4:www/py-formencode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webhelpers>=1.3:www/py-webhelpers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mako>=0.7.3:textproc/py-mako@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.7.10:databases/py-sqlalchemy10@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.5:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}whoosh>=2.4.0:textproc/py-whoosh@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=0.9.6:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.8.7:devel/dulwich \ - ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock \ - ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:security/py-bcrypt \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:devel/py-simplejson \ - ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru \ - ${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery \ + ${PYTHON_PKGNAMEPREFIX}markdown>=2.2.1:textproc/py-markdown@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.8.1:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}bcrypt>=0.2:security/py-bcrypt@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.5.2:devel/py-simplejson@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PasteScript>=1.6.3:www/py-pastescript@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery@${FLAVOR} \ mercurial>=2.6:devel/mercurial USES= python:2 @@ -52,7 +52,7 @@ .include .if ${PORT_OPTIONS:MLDAP} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.6:net/py-ldap@${FLAVOR} .endif .if ${PORT_OPTIONS:MGIT} Index: www/py-rollbar/Makefile =================================================================== --- www/py-rollbar/Makefile +++ www/py-rollbar/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.5.7:devel/py-six@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-routes/Makefile =================================================================== --- www/py-routes/Makefile +++ www/py-routes/Makefile @@ -13,8 +13,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0.3:devel/py-repoze.lru@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-scgi/Makefile =================================================================== --- www/py-scgi/Makefile +++ www/py-scgi/Makefile @@ -14,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-scrapy/Makefile =================================================================== --- www/py-scrapy/Makefile +++ www/py-scrapy/Makefile @@ -13,15 +13,15 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}w3lib>=1.14.2:www/py-w3lib \ - ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:sysutils/py-queuelib \ - ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher \ - ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity \ - ${PYTHON_PKGNAMEPREFIX}parsel>=1.1:textproc/py-parsel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=15.5.0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.2.4:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}w3lib>=1.14.2:www/py-w3lib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssselect>=0.9:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}queuelib>=1.2.2:sysutils/py-queuelib@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydispatcher>=2.0.5:devel/py-pydispatcher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>0:security/py-service_identity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}parsel>=1.1:textproc/py-parsel@${FLAVOR} USES= python USE_PYTHON= distutils autoplist @@ -32,7 +32,7 @@ .include .if ${PORT_OPTIONS:MSSL} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} .endif .include Index: www/py-seafdav/Makefile =================================================================== --- www/py-seafdav/Makefile +++ www/py-seafdav/Makefile @@ -16,6 +16,7 @@ USES= python:-2.7 shebangfix USE_GITHUB= yes GH_ACCOUNT= haiwen +USE_PYTHON= flavors SHEBANG_FILES= *.sh *.template wsgidav/addons/seafile/*.py NO_ARCH= yes Index: www/py-seafobj/Makefile =================================================================== --- www/py-seafobj/Makefile +++ www/py-seafobj/Makefile @@ -16,6 +16,7 @@ USES= python:-2.7 shebangfix USE_GITHUB= yes GH_ACCOUNT= haiwen +USE_PYTHON= flavors SHEBANG_FILES= *.sh *.py NO_ARCH= yes Index: www/py-searx/Makefile =================================================================== --- www/py-searx/Makefile +++ www/py-searx/Makefile @@ -12,17 +12,17 @@ LICENSE= AGPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.1:net/py-ndg_httpsclient \ - ${PYTHON_PKGNAMEPREFIX}openssl>=0.15.1:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug \ - ${PYTHON_PKGNAMEPREFIX}certifi>=2016.2.28:security/py-certifi +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.5.0:devel/py-dateutil@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask-Babel>=0.11.1:devel/py-flask-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.6.0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.4.1:net/py-ndg_httpsclient@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openssl>=0.15.1:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.1.3:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Flask>=0.11.1:www/py-flask@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}certifi>=2016.2.28:security/py-certifi@${FLAVOR} USE_RC_SUBR= searx Index: www/py-selector/Makefile =================================================================== --- www/py-selector/Makefile +++ www/py-selector/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:devel/py-resolver +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}resolver>=0.2.1:devel/py-resolver@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-slimit/Makefile =================================================================== --- www/py-slimit/Makefile +++ www/py-slimit/Makefile @@ -11,8 +11,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR} USES= python:2 zip USE_PYTHON= distutils autoplist @@ -22,7 +22,7 @@ .include .if ${PYTHON_REL} >= 3000 -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} pre-build: @cd ${WRKSRC} && 2to3-${PYTHON_VER} -w src .endif Index: www/py-slimmer/Makefile =================================================================== --- www/py-slimmer/Makefile +++ www/py-slimmer/Makefile @@ -11,7 +11,7 @@ MAINTAINER= corsmith@gmail.com COMMENT= Whitespace optimizer for CSS, HTML and XHTML output -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-slumber/Makefile =================================================================== --- www/py-slumber/Makefile +++ www/py-slumber/Makefile @@ -12,13 +12,13 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} OPTIONS_DEFINE= YAML YAML_DESC= YAML serializer support -YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml +YAML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} USES= python USE_GITHUB= yes Index: www/py-sockjs-tornado/Makefile =================================================================== --- www/py-sockjs-tornado/Makefile +++ www/py-sockjs-tornado/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-splinter/Makefile =================================================================== --- www/py-splinter/Makefile +++ www/py-splinter/Makefile @@ -12,11 +12,11 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}selenium>=2.47:www/py-selenium \ - ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}selenium>=2.47:www/py-selenium@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.4:devel/py-zope.testbrowser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-spyne/Makefile =================================================================== --- www/py-spyne/Makefile +++ www/py-spyne/Makefile @@ -12,10 +12,10 @@ LICENSE= LGPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist concurrent distutils -USES= python +USES= python:2.7 .include Index: www/py-textile/Makefile =================================================================== --- www/py-textile/Makefile +++ www/py-textile/Makefile @@ -12,8 +12,8 @@ LICENSE= BSD2CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner \ - ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=2.8:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-tornado/Makefile =================================================================== --- www/py-tornado/Makefile +++ www/py-tornado/Makefile @@ -18,12 +18,12 @@ .include .if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch \ - ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR} .endif .if ${PYTHON_REL} < 3500 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}backports_abc>=0.4:devel/py-backports_abc@${FLAVOR} .endif post-build: Index: www/py-trello/Makefile =================================================================== --- www/py-trello/Makefile +++ www/py-trello/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/PKG-INFO LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=0.9.1:www/py-requests@${FLAVOR} USES= python:-2.7 zip USE_PYTHON= autoplist distutils Index: www/py-treq/Makefile =================================================================== --- www/py-treq/Makefile +++ www/py-treq/Makefile @@ -12,18 +12,18 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}incremental>=0:devel/py-incremental -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}incremental>=0:devel/py-incremental@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=16.4.0:devel/py-twisted@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests@${FLAVOR} # Depend directly on twisted[tls] dependencies # As Twisted port may not (optionally) install them -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \ - ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}idna>=2.4:dns/py-idna@${FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${FLAVOR} USES= python:2.7+ # Actually 2.7+,3.3+ USE_PYTHON= autoplist distutils Index: www/py-turbogears2/Makefile =================================================================== --- www/py-turbogears2/Makefile +++ www/py-turbogears2/Makefile @@ -12,10 +12,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}crank>=0:devel/py-crank \ - ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}crank>=0:devel/py-crank@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}webob>=1.2:www/py-webob@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}repoze.lru>=0:devel/py-repoze.lru@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-tvdb_api/Makefile =================================================================== --- www/py-tvdb_api/Makefile +++ www/py-tvdb_api/Makefile @@ -14,9 +14,9 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-cache>0:www/py-requests-cache@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} USES= python USE_PYTHON= autoplist distutils Index: www/py-txrequests/Makefile =================================================================== --- www/py-txrequests/Makefile +++ www/py-txrequests/Makefile @@ -13,8 +13,8 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=9.0.0:devel/py-twisted@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: www/py-urlgrabber/Makefile =================================================================== --- www/py-urlgrabber/Makefile +++ www/py-urlgrabber/Makefile @@ -14,7 +14,7 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycurl>=7.19.0_1:ftp/py-pycurl@${FLAVOR} DOCS_MAKE_ENV= INSTALL_DOCS=yes DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} Index: www/py-user_agent/Makefile =================================================================== --- www/py-user_agent/Makefile +++ www/py-user_agent/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-w3lib/Makefile =================================================================== --- www/py-w3lib/Makefile +++ www/py-w3lib/Makefile @@ -11,7 +11,7 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} NO_ARCH= yes USES= python:2.7+ Index: www/py-webhelpers/Makefile =================================================================== --- www/py-webhelpers/Makefile +++ www/py-webhelpers/Makefile @@ -13,8 +13,8 @@ LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: www/py-webkitgtk/Makefile =================================================================== --- www/py-webkitgtk/Makefile +++ www/py-webkitgtk/Makefile @@ -21,5 +21,6 @@ INSTALL_TARGET= install-strip USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2 USE_GNOME= glib20 libxslt pygtk2 +USE_PYTHON= flavors .include Index: www/py-webob/Makefile =================================================================== --- www/py-webob/Makefile +++ www/py-webob/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} DOCSDIR= ${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME} OPTIONS_DEFINE= DOCS TESTS Index: www/py-werkzeug/Makefile =================================================================== --- www/py-werkzeug/Makefile +++ www/py-werkzeug/Makefile @@ -14,12 +14,12 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>=16.0:security/py-openssl@${FLAVOR} OPTIONS_DEFINE= EXAMPLES WATCHDOG WATCHDOG_DESC= Monitor filesystem events -WATCHDOG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8:devel/py-watchdog \ - ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor +WATCHDOG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}watchdog>=0.8:devel/py-watchdog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${FLAVOR} NO_ARCH= yes USES= python Index: www/py-wikipedia/Makefile =================================================================== --- www/py-wikipedia/Makefile +++ www/py-wikipedia/Makefile @@ -12,8 +12,8 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.7:www/py-requests@${FLAVOR} USES= python USE_PYTHON= distutils autoplist Index: www/py-ws4py/Makefile =================================================================== --- www/py-ws4py/Makefile +++ www/py-ws4py/Makefile @@ -23,9 +23,9 @@ GEVENT_DESC= gevent-based client/server support TORNADO_DESC= Tornado client support -CHERRYPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:www/py-cherrypy -GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent -TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=3.1:www/py-tornado +CHERRYPY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:www/py-cherrypy@${FLAVOR} +GEVENT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:devel/py-gevent@${FLAVOR} +TORNADO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tornado>=3.1:www/py-tornado@${FLAVOR} # Do not install files which will not work post-patch-CHERRYPY-off: Index: www/py-wsgiauth/Makefile =================================================================== --- www/py-wsgiauth/Makefile +++ www/py-wsgiauth/Makefile @@ -11,7 +11,7 @@ MAINTAINER= bamby@sippysoft.com COMMENT= WSGI authentication middleware -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py-wsgidav/Makefile =================================================================== --- www/py-wsgidav/Makefile +++ www/py-wsgidav/Makefile @@ -11,13 +11,13 @@ LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy \ - ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}cov-core>=0:devel/py-cov-core \ - ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cov-core>=0:devel/py-cov-core@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}defusedxml>=0:devel/py-defusedxml@${FLAVOR} NO_ARCH= yes USES= python zip Index: www/py-yarl/Makefile =================================================================== --- www/py-yarl/Makefile +++ www/py-yarl/Makefile @@ -12,13 +12,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= cython:lang/cython -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>=2.0:www/py-multidict -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}multidict>=2.0:www/py-multidict@${FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR} USES= python:3.4+ -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist distutils cython do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Index: www/py-zope.app.wsgi/Makefile =================================================================== --- www/py-zope.app.wsgi/Makefile +++ www/py-zope.app.wsgi/Makefile @@ -13,28 +13,28 @@ LICENSE= ZPL21 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest \ - ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:devel/py-zope.app.appsetup \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}WebTest>=0:www/py-WebTest@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.appsetup>=3.14:devel/py-zope.app.appsetup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.app.publication>=0:devel/py-zope.app.publication@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.error>=0:devel/py-zope.error@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.session>=0:security/py-zope.session@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=4.0.0:devel/py-zope.testbrowser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/py3-cssutils/Makefile =================================================================== --- www/py3-cssutils/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Created by: Sunpoet Po-Chuan Hsieh -# $FreeBSD$ - -USES= python:3.3+ - -PORTSCOUT= ignore:1 - -MASTERDIR= ${.CURDIR}/../py-cssutils - -.include "${MASTERDIR}/Makefile" Index: www/py3-httplib2/Makefile =================================================================== --- www/py3-httplib2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-httplib2 - -USES= python:3 - -.include "${MASTERDIR}/Makefile" Index: www/py3-requests/Makefile =================================================================== --- www/py3-requests/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-requests - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py3-chardet \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py3-idna \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py3-urllib3 \ - ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py3-certifi -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.1:devel/py3-pytest \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py3-pytest-xdist \ - ${PYTHON_PKGNAMEPREFIX}execnet>=1.1:sysutils/py3-execnet \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py3-mock - -USES= python:3.3+ - -.include "${MASTERDIR}/Makefile" Index: www/pycarddav/Makefile =================================================================== --- www/pycarddav/Makefile +++ www/pycarddav/Makefile @@ -13,12 +13,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject \ - ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid \ - ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urwid>0:devel/py-urwid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} USES= python:2 USE_PYTHON= autoplist distutils Index: www/pyjamas/Makefile =================================================================== --- www/pyjamas/Makefile +++ www/pyjamas/Makefile @@ -12,7 +12,7 @@ COMMENT= Port of Google Web Toolkit to Python # install/require some libraries in sys.prefix -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist pythonprefix REINPLACE_ARGS= -i '' -e 's,../../bin,${PREFIX}/bin,' Index: www/qutebrowser/Makefile =================================================================== --- www/qutebrowser/Makefile +++ www/qutebrowser/Makefile @@ -11,21 +11,21 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py3-colorama \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py3-cssutils \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \ - ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py3-MarkupSafe \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}pyPEG2>=0:textproc/py3-pyPEG2 \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=0:devel/py-attrs@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0:textproc/py-MarkupSafe@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyPEG2>=0:textproc/py-pyPEG2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sip>=0:devel/py-sip@${FLAVOR} NO_ARCH= yes USES= python:3.5+ pyqt:5 USE_PYQT= core opengl printsupport sql webkit webkitwidgets widgets qml USE_QT5= sql-sqlite3 -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist optsuffix USE_GITHUB= yes .include Index: www/radicale/Makefile =================================================================== --- www/radicale/Makefile +++ www/radicale/Makefile @@ -35,11 +35,11 @@ .endif .if ${PORT_OPTIONS:MHTTP} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${FLAVOR} .endif .if ${PORT_OPTIONS:MLDAP} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${FLAVOR} .endif post-patch: Index: www/roundup/Makefile =================================================================== --- www/roundup/Makefile +++ www/roundup/Makefile @@ -12,7 +12,7 @@ LICENSE= PSFL LICENSE_FILE= ${WRKSRC}/COPYING.txt -USES= cpe gettext python +USES= cpe gettext python:2.7 CPE_VENDOR= roundup-tracker USE_PYTHON= distutils NO_ARCH= yes @@ -21,9 +21,9 @@ OPTIONS_DEFAULT=SQLITE OPTIONS_SUB= yes -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR} SCRIPTS= roundup-admin roundup-demo roundup-gettext roundup-mailgw \ roundup-server roundup-xmlrpc-server Index: www/rtv/Makefile =================================================================== --- www/rtv/Makefile +++ www/rtv/Makefile @@ -11,23 +11,23 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup \ - ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}kitchen>=1.2.4:devel/py-kitchen@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.5.1:www/py-beautifulsoup@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}decorator>=4.0.10:devel/py-decorator@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= michael-lazar NO_ARCH= yes USES= python -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist concurrent optsuffix .include .if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mailcap_fix>=0.1.3:devel/py-mailcap-fix@${FLAVOR} .endif .include Index: www/seahub/Makefile =================================================================== --- www/seahub/Makefile +++ www/seahub/Makefile @@ -14,25 +14,25 @@ RUN_DEPENDS= bash:shells/bash \ ${LOCALBASE}/www/haiwen/seafile-server/seafile/bin/seaf-server:net-mgmt/seafile-server \ - ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n \ - ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework \ - ${PYTHON_PKGNAMEPREFIX}django_compressor>=0:www/py-django_compressor \ - ${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools \ - ${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office \ - ${PYTHON_PKGNAMEPREFIX}django-constance>=0:www/py-django-constance \ - ${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn \ - ${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup \ - ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \ - ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \ - ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl \ - ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb \ - ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode \ - ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures + ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-statici18n>=0:www/py-django-statici18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}djangorestframework>=0:www/py-djangorestframework@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django_compressor>=0:www/py-django_compressor@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-formtools>=0:www/py-django-formtools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-post_office>=0:www/py-django-post_office@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}django-constance>=0:www/py-django-constance@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gunicorn>=0:www/py-gunicorn@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flup>=0:www/py-flup@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:textproc/py-openpyxl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR} USES= python:-2.7 shebangfix USE_GITHUB= yes @@ -50,10 +50,10 @@ SEAFDAV_DESC= Enable Seafile WsgiDav-based support SEAFOBJ_CONFIGURE_WITH= seafobj -SEAFOBJ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafobj>0:www/py-seafobj +SEAFOBJ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafobj>0:www/py-seafobj@${PY_FLAVOR} SEAFDAV_CONFIGURE_WITH= seafdav -SEAFDAV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafdav>0:www/py-seafdav +SEAFDAV_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}seafdav>0:www/py-seafdav@${PY_FLAVOR} NLS_USES= gettext iconv NLS_CONFIGURE_OFF= --disable-nls Index: www/trac-OhlohWidgetsMacro/Makefile =================================================================== --- www/trac-OhlohWidgetsMacro/Makefile +++ www/trac-OhlohWidgetsMacro/Makefile @@ -13,10 +13,10 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycerberus>=0.3:devel/py-pycerberus@${FLAVOR} \ tracd:www/trac -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-TracGoogleAnalytics/Makefile =================================================================== --- www/trac-TracGoogleAnalytics/Makefile +++ www/trac-TracGoogleAnalytics/Makefile @@ -15,10 +15,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= tracd:www/trac \ - ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi + ${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-advancedticketworkflow/Makefile =================================================================== --- www/trac-advancedticketworkflow/Makefile +++ www/trac-advancedticketworkflow/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-iniadmin/Makefile =================================================================== --- www/trac-iniadmin/Makefile +++ www/trac-iniadmin/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-ldapauthstore/Makefile =================================================================== --- www/trac-ldapauthstore/Makefile +++ www/trac-ldapauthstore/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= tracd:www/trac \ trac-accountmanager>0:www/trac-accountmanager \ trac-ldap>0:www/trac-ldap \ - ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap + ${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR} NO_ARCH= yes PORTSCOUT= ignore:1 Index: www/trac-permredirect/Makefile =================================================================== --- www/trac-permredirect/Makefile +++ www/trac-permredirect/Makefile @@ -17,7 +17,7 @@ FETCH_BEFORE_ARGS= -o ${DISTFILES} REV= 13353 -USES= python zip:infozip +USES= python:2.7 zip:infozip USE_PYTHON= distutils autoplist WRKSRC= ${WRKDIR}/${PORTNAME}plugin/tags/${PORTVERSION} NO_ARCH= yes Index: www/trac-privatetickets/Makefile =================================================================== --- www/trac-privatetickets/Makefile +++ www/trac-privatetickets/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= tracd:www/trac -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-ticketimport/Makefile =================================================================== --- www/trac-ticketimport/Makefile +++ www/trac-ticketimport/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE # "same license as trac" RUN_DEPENDS= tracd:www/trac \ - ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd + ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd@${FLAVOR} USES= python:2 USE_PYTHON= distutils autoplist Index: www/trac-tocmacro/Makefile =================================================================== --- www/trac-tocmacro/Makefile +++ www/trac-tocmacro/Makefile @@ -14,7 +14,7 @@ RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-tweakui/Makefile =================================================================== --- www/trac-tweakui/Makefile +++ www/trac-tweakui/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= tracd:www/trac -USES= dos2unix python zip +USES= dos2unix python:2.7 zip DOS2UNIX_REGEX= .*\.(css|html|js|py|txt)$ USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-wikigoodies/Makefile =================================================================== --- www/trac-wikigoodies/Makefile +++ www/trac-wikigoodies/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}plugin/0.11 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-wikinotification/Makefile =================================================================== --- www/trac-wikinotification/Makefile +++ www/trac-wikinotification/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= tracd:www/trac WRKSRC= ${WRKDIR}/${PORTNAME} -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac-wikitemplates/Makefile =================================================================== --- www/trac-wikitemplates/Makefile +++ www/trac-wikitemplates/Makefile @@ -20,7 +20,7 @@ # ${PYTHON_SITELIBDIR}/TracCtxtnavAdd-2.0-py${PYTHON_VER}.egg:www/trac-ctxtnavadd WRKSRC= ${WRKDIR}/${PORTNAME}plugin -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: www/trac/Makefile =================================================================== --- www/trac/Makefile +++ www/trac/Makefile @@ -14,10 +14,10 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel \ - ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Genshi>=0.7:textproc/py-genshi@${FLAVOR} USES= python:-2.7 shebangfix SHEBANG_FILES= trac/tests/functional/better_twill.py trac/tests/functional/tester.py \ @@ -41,12 +41,12 @@ PYGMENTS_DESC= Use generic syntax highlighter TZ_DESC= Process Time Zones -DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils -PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments -TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz -PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2 -SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 -SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion +DOCUTILS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${FLAVOR} +PYGMENTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${FLAVOR} +TZ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} +PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR} +SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} +SVN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${FLAVOR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins Index: www/trytond28_google_maps/Makefile =================================================================== --- www/trytond28_google_maps/Makefile +++ www/trytond28_google_maps/Makefile @@ -18,7 +18,7 @@ CONFLICTS= trytond_google_maps-2.[46].* -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist .include Index: www/twill/Makefile =================================================================== --- www/twill/Makefile +++ www/twill/Makefile @@ -10,7 +10,7 @@ MAINTAINER= jun-g@daemonfreaks.com COMMENT= Simple scripting language for Web browsing -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist OPTIONS_DEFINE= DOCS EXAMPLES Index: www/uwsgi/Makefile =================================================================== --- www/uwsgi/Makefile +++ www/uwsgi/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= pkgconfig python ssl -USE_PYTHON= distutils +USE_PYTHON= distutils concurrent optsuffix USE_RC_SUBR= uwsgi CFLAGS+= -I${OPENSSLINC} Index: www/uwsgitop/Makefile =================================================================== --- www/uwsgitop/Makefile +++ www/uwsgitop/Makefile @@ -10,7 +10,7 @@ COMMENT= uWSGI top-like app USES= python -USE_PYTHON= distutils +USE_PYTHON= distutils concurrent optsuffix PLIST_FILES= bin/uwsgitop %%DOCSDIR%%/README.rst Index: www/uzbl/Makefile =================================================================== --- www/uzbl/Makefile +++ www/uzbl/Makefile @@ -13,14 +13,14 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= socat:net/socat \ dmenu:x11/dmenu \ - ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser + ${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR} USES= gmake pkgconfig python:2 desktop-file-utils gettext-runtime shebangfix USE_XORG= x11 Index: www/wadcomblog/Makefile =================================================================== --- www/wadcomblog/Makefile +++ www/wadcomblog/Makefile @@ -10,7 +10,7 @@ MAINTAINER= jlaffaye@FreeBSD.org COMMENT= Simple open-source static blog engine written in Python -USES= python +USES= python:2.7 USE_PYTHON= distutils OPTIONS_DEFINE= DOCS EXAMPLES Index: www/web2ldap/Makefile =================================================================== --- www/web2ldap/Makefile +++ www/web2ldap/Makefile @@ -12,9 +12,9 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap \ - ${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/py-pyweblib \ - ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/pyweblib/__init__.py:www/py-pyweblib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${PY_FLAVOR} \ ${LOCALBASE}/etc/mime.types:misc/mime-support OPTIONS_DEFINE= DOCS Index: www/webpy/Makefile =================================================================== --- www/webpy/Makefile +++ www/webpy/Makefile @@ -13,7 +13,7 @@ LICENSE= PD -USES= python +USES= python:2.7 USE_PYTHON= autoplist distutils PYDISTUTILS_PKGNAME= web.py Index: www/xist/Makefile =================================================================== --- www/xist/Makefile +++ www/xist/Makefile @@ -14,11 +14,11 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py3-cssutils \ - ${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py3-lxml \ - ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py3-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0,1:www/py-cssutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=3.4:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=2.6:graphics/py-pillow@${PY_FLAVOR} -USES= python:3 tar:bzip2 +USES= python:3.6+ tar:bzip2 USE_PYTHON= autoplist distutils post-install: Index: www/you-get/Makefile =================================================================== --- www/you-get/Makefile +++ www/you-get/Makefile @@ -17,8 +17,8 @@ OPTIONS_DEFINE= RTMPDUMP NO_ARCH= yes -USE_PYTHON= autoplist distutils -USES= python:3 +USE_PYTHON= autoplist distutils optsuffix +USES= python:3.4+ RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump Index: www/zope213/Makefile =================================================================== --- www/zope213/Makefile +++ www/zope213/Makefile @@ -14,72 +14,72 @@ LICENSE= ZPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:security/py-AccessControl \ - ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition \ - ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime \ - ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate \ - ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass \ - ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing \ - ${PYTHON_PKGNAMEPREFIX}MultiMapping>=0:devel/py-MultiMapping \ - ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence \ - ${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:devel/py-Products.OFSP \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:devel/py-Products.ZCatalog \ - ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex \ - ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record \ - ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython \ - ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig \ - zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3 \ - ${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:devel/py-ZopeUndo \ - ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils \ - ${PYTHON_PKGNAMEPREFIX}initgroups>=0:devel/py-initgroups \ - ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz \ - ${PYTHON_PKGNAMEPREFIX}tempstorage>=0:devel/py-tempstorage \ - ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \ - ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon \ - ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions \ - ${PYTHON_PKGNAMEPREFIX}zLOG>=0:devel/py-zLOG \ - ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser \ - ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu \ - ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage \ - ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource \ - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component \ - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \ - ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container \ - ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider \ - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype \ - ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport \ - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event \ - ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions \ - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n \ - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \ - ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent \ - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location \ - ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate \ - ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime \ - ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy \ - ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource \ - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher \ - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \ - ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security \ - ${PYTHON_PKGNAMEPREFIX}zope.sendmail>=0:mail/py-zope.sendmail \ - ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort \ - ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site \ - ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size \ - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext \ - ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal \ - ${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:devel/py-zope.tales \ - ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:devel/py-zope.testbrowser \ - ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing \ - ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing \ - ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet \ - ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>=0:devel/py-Products.BTreeFolder2 \ - ${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:devel/py-Products.ExternalMethod \ - ${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:mail/py-Products.MailHost \ - ${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:devel/py-Products.MIMETools \ - ${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:devel/py-Products.PythonScripts \ - ${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:devel/py-Products.StandardCacheManagers \ - ${PYTHON_PKGNAMEPREFIX}manuel>=0:devel/py-manuel +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}AccessControl>=2.13.2:security/py-AccessControl@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}DocumentTemplate>=0:devel/py-DocumentTemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Missing>=0:devel/py-Missing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}MultiMapping>=0:devel/py-MultiMapping@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Persistence>=0:devel/py-Persistence@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.OFSP>=2.13.2:devel/py-Products.OFSP@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCatalog>=0:devel/py-Products.ZCatalog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ZCTextIndex>=0:devel/py-Products.ZCTextIndex@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Record>=0:devel/py-Record@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}RestrictedPython>=0:security/py-RestrictedPython@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \ + zodb${PYTHON_PKGNAMESUFFIX}>=0:databases/zodb3@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ZopeUndo>=0:devel/py-ZopeUndo@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}initgroups>=0:devel/py-initgroups@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tempstorage>=0:devel/py-tempstorage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zdaemon>=0:sysutils/py-zdaemon@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zExceptions>=0:devel/py-zExceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zLOG>=0:devel/py-zLOG@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:devel/py-zope.browser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browsermenu>=0:devel/py-zope.browsermenu@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserpage>=0:devel/py-zope.browserpage@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.browserresource>=0:devel/py-zope.browserresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.container>=0:devel/py-zope.container@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contentprovider>=0:devel/py-zope.contentprovider@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.deferredimport>=0:devel/py-zope.deferredimport@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.exceptions>=0:devel/py-zope.exceptions@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.lifecycleevent>=0:devel/py-zope.lifecycleevent@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.pagetemplate>=0:devel/py-zope.pagetemplate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.processlifetime>=0:devel/py-zope.processlifetime@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.proxy>=0:net/py-zope.proxy@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.ptresource>=0:devel/py-zope.ptresource@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.sendmail>=0:mail/py-zope.sendmail@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.sequencesort>=0:devel/py-zope.sequencesort@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.site>=0:devel/py-zope.site@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.size>=0:devel/py-zope.size@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tal>=0:textproc/py-zope.tal@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.tales>=3.5.0:devel/py-zope.tales@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testbrowser>=0:devel/py-zope.testbrowser@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.testing>=0:devel/py-zope.testing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.traversing>=0:devel/py-zope.traversing@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.viewlet>=0:devel/py-zope.viewlet@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.BTreeFolder2>=0:devel/py-Products.BTreeFolder2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.ExternalMethod>=0:devel/py-Products.ExternalMethod@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MailHost>=0:mail/py-Products.MailHost@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.MIMETools>=0:devel/py-Products.MIMETools@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.PythonScripts>=0:devel/py-Products.PythonScripts@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Products.StandardCacheManagers>=0:devel/py-Products.StandardCacheManagers@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}manuel>=0:devel/py-manuel@${FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils Index: x11-fm/sunflower/Makefile =================================================================== --- x11-fm/sunflower/Makefile +++ x11-fm/sunflower/Makefile @@ -11,11 +11,11 @@ LICENSE= GPLv3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet \ - ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ - ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1:devel/py-setproctitle \ - ${PYTHON_PKGNAMEPREFIX}dbus>=1.2.0:devel/py-dbus +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notify>0:devel/py-notify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1:devel/py-setproctitle@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>=1.2.0:devel/py-dbus@${PY_FLAVOR} WRKSRC= ${WRKDIR}/Sunflower @@ -29,7 +29,7 @@ OPTIONS_DEFAULT=VTE VTE_DESC= Use VTE terminal widget -VTE_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}vte>0:x11-toolkits/py-vte +VTE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}vte>0:x11-toolkits/py-vte@${PY_FLAVOR} post-patch: ${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/Sunflower.py Index: x11-fonts/font-manager/Makefile =================================================================== --- x11-fonts/font-manager/Makefile +++ x11-fonts/font-manager/Makefile @@ -15,8 +15,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libsqlite3.so:databases/sqlite3 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= FontManager Index: x11-toolkits/Makefile =================================================================== --- x11-toolkits/Makefile +++ x11-toolkits/Makefile @@ -219,9 +219,6 @@ SUBDIR += py-wxPython28-common SUBDIR += py-wxPython30 SUBDIR += py-xlib - SUBDIR += py34-tkinter - SUBDIR += py35-tkinter - SUBDIR += py36-tkinter SUBDIR += pypy-tkinter SUBDIR += qt4-declarative SUBDIR += qt4-gui Index: x11-toolkits/py-Pmw/Makefile =================================================================== --- x11-toolkits/py-Pmw/Makefile +++ x11-toolkits/py-Pmw/Makefile @@ -13,10 +13,10 @@ COMMENT= High-level compound graphics widgets for Python OPTIONS_DEFINE= DOCS EXAMPLES -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} LIB_DEPENDS= libBLT25.so:x11-toolkits/blt -USES= python shebangfix +USES= python:2.7 shebangfix USE_PYTHON= distutils SHEBANG_FILES= Pmw/Pmw_1_3/bin/bundlepmw.py Index: x11-toolkits/py-SquareMap/Makefile =================================================================== --- x11-toolkits/py-SquareMap/Makefile +++ x11-toolkits/py-SquareMap/Makefile @@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_WX= 3.0+ WX_COMPS= python Index: x11-toolkits/py-gnome2/Makefile =================================================================== --- x11-toolkits/py-gnome2/Makefile +++ x11-toolkits/py-gnome2/Makefile @@ -18,12 +18,13 @@ OPTIONS_SUB= yes -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR} USES= gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2 USE_LDCONFIG= yes USE_GNOME= libgnomeui pygtk2 +USE_PYTHON= flavors GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_LIBS="-lpthread" CPPFLAGS+= -I${LOCALBASE}/include Index: x11-toolkits/py-gtk2/Makefile =================================================================== --- x11-toolkits/py-gtk2/Makefile +++ x11-toolkits/py-gtk2/Makefile @@ -15,11 +15,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Set of Python bindings for GTK+ -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR} +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR} USES= gettext gmake libtool pathfix pkgconfig python:2 tar:bzip2 USE_GNOME= libglade2 pygobject +USE_PYTHON= flavors GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: x11-toolkits/py-gtkglext/Makefile =================================================================== --- x11-toolkits/py-gtkglext/Makefile +++ x11-toolkits/py-gtkglext/Makefile @@ -12,12 +12,13 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Python binding for GtkGLExt -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR} LIB_DEPENDS= libgtkglext-x11-1.0.so:x11-toolkits/gtkglext -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL +RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:graphics/py-PyOpenGL@${FLAVOR} -USES= gmake libtool pathfix pkgconfig python tar:bzip2 +USES= gmake libtool pathfix pkgconfig python:2.7 tar:bzip2 USE_GNOME= pygtk2 +USE_PYTHON= flavors GNU_CONFIGURE= yes post-install: Index: x11-toolkits/py-gui/Makefile =================================================================== --- x11-toolkits/py-gui/Makefile +++ x11-toolkits/py-gui/Makefile @@ -12,19 +12,19 @@ MAINTAINER= python@FreeBSD.org COMMENT= Cross-platform pythonic GUI API -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:devel/pyrex +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} OPTIONS_DEFINE= DOCS EXAMPLES OPENGL USE_GNOME= pygtk2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME} WRKSRC= ${WRKDIR}/PyGUI-${PORTVERSION} -OPENGL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext +OPENGL_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gdkgl/__init__.py:x11-toolkits/py-gtkglext@${FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|"GUI.Cocoa",||g' ${WRKSRC}/setup.py Index: x11-toolkits/py-kivy/Makefile =================================================================== --- x11-toolkits/py-kivy/Makefile +++ x11-toolkits/py-kivy/Makefile @@ -16,17 +16,16 @@ BROKEN= fails to build -BUILD_DEPENDS= cython:lang/cython LIB_DEPENDS= libmtdev.so:devel/libmtdev -TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose +TEST_DEPENDS= nosetests-${PYTHON_VER}:devel/py-nose@${FLAVOR} MAKE_ENV= KIVY_NO_CONFIG=yes KIVY_NO_FILELOG=yes USE_OPENGL_ES2=1 \ PYTHONPATH=${WRKSRC} USE_GITHUB= yes -USES= display:test python uniquefiles:dirs +USES= display:test python:2.7 uniquefiles:dirs USE_GL= egl gl glesv2 -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent distutils cython PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS= --inplace @@ -53,20 +52,20 @@ TEXT_DESC= Text rendering support (compulsory) WINDOW_DESC= Window support (compulsory) -DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${FLAVOR} ENCHANT_DESC= Spell checking support via Enchant -ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant +ENCHANT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${FLAVOR} GSTREAMER_MAKE_ENV= USE_GSTREAMER=1 GSTREAMER_MAKE_ENV_OFF= USE_GSTREAMER=0 GSTREAMER_LIB_DEPENDS= libgstreamer-1.0.so:multimedia/gstreamer1 -GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer +GSTREAMER_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygst.py:multimedia/py-gstreamer@${FLAVOR} GSTREAMER_USES= pkgconfig -OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv +OPENCV_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cv.py:graphics/py-opencv@${FLAVOR} PIL_DESC= Text and window rendering support via Pillow -PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +PIL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} PYGAME_DESC= Window, text and image rendering support via PyGame -PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game -PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet +PYGAME_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game@${FLAVOR} +PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${FLAVOR} SDL2_DESC= Simple Direct Media Layer v2.0 support SDL2_MAKE_ENV= USE_SDL2=1 SDL2_MAKE_ENV_OFF= USE_SDL2=0 Index: x11-toolkits/py-kiwi-gtk/Makefile =================================================================== --- x11-toolkits/py-kiwi-gtk/Makefile +++ x11-toolkits/py-kiwi-gtk/Makefile @@ -17,7 +17,7 @@ NO_ARCH= yes USE_GNOME= libglade2 pygtk2 USE_PYTHON= autoplist distutils -USES= gettext python uniquefiles:dirs +USES= gettext python:2.7 uniquefiles:dirs PORTDOCS= * PORTEXAMPLES= * Index: x11-toolkits/py-qt4-gui/Makefile =================================================================== --- x11-toolkits/py-qt4-gui/Makefile +++ x11-toolkits/py-qt4-gui/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:4 USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT4= corelib gui imageformats_run inputmethods_run iconengines_run \ moc_build qmake_build Index: x11-toolkits/py-qt5-gui/Makefile =================================================================== --- x11-toolkits/py-qt5-gui/Makefile +++ x11-toolkits/py-qt5-gui/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run +USE_PYTHON= flavors USE_QT5= core gui qmake_build imageformats_run OPTIONS_DEFINE= API DEBUG Index: x11-toolkits/py-qt5-quick/Makefile =================================================================== --- x11-toolkits/py-qt5-quick/Makefile +++ x11-toolkits/py-qt5-quick/Makefile @@ -11,6 +11,7 @@ USES= python pyqt:5 USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT5= core quick qmake_build OPTIONS_DEFINE= API DEBUG Index: x11-toolkits/py-qt5-widgets/Makefile =================================================================== --- x11-toolkits/py-qt5-widgets/Makefile +++ x11-toolkits/py-qt5-widgets/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT5= core gui widgets qmake_build OPTIONS_DEFINE= API DEBUG Index: x11-toolkits/py-sexy/Makefile =================================================================== --- x11-toolkits/py-sexy/Makefile +++ x11-toolkits/py-sexy/Makefile @@ -16,8 +16,9 @@ LIB_DEPENDS= libsexy.so:x11-toolkits/libsexy -USES= libtool pkgconfig python +USES= libtool pkgconfig python:2.7 USE_GNOME= pygtk2 +USE_PYTHON= flavors GNU_CONFIGURE= yes .include Index: x11-toolkits/py-tkinter/Makefile =================================================================== --- x11-toolkits/py-tkinter/Makefile +++ x11-toolkits/py-tkinter/Makefile @@ -16,8 +16,8 @@ PORTSCOUT= ignore:1 -USE_PYTHON= distutils autoplist USES= python tar:xz tk +USE_PYTHON= distutils autoplist allflavors DIST_SUBDIR= python DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo Index: x11-toolkits/py-tktreectrl/Makefile =================================================================== --- x11-toolkits/py-tktreectrl/Makefile +++ x11-toolkits/py-tktreectrl/Makefile @@ -12,10 +12,10 @@ COMMENT= TkTreectrl Python bindings LIB_DEPENDS= libtreectrl.so.1:x11-toolkits/tktreectrl -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ - ${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/Pmw/__init__.py:x11-toolkits/py-Pmw@${FLAVOR} -USES= python tk:run zip +USES= python:2.7 tk:run zip USE_PYTHON= distutils PYDISTUTILS_PKGNAME= TkinterTreectrl PYDISTUTILS_PKGVERSION= ${PORTVERSION:R} Index: x11-toolkits/py-vte/Makefile =================================================================== --- x11-toolkits/py-vte/Makefile +++ x11-toolkits/py-vte/Makefile @@ -15,8 +15,9 @@ DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -USES= python +USES= python:2.7 USE_GNOME= intltool pygtk2 vte +USE_PYTHON= flavors CONFIGURE_ARGS= --enable-python \ --disable-Bsymbolic \ --disable-freetypetest Index: x11-toolkits/py-wxPython28/Makefile =================================================================== --- x11-toolkits/py-wxPython28/Makefile +++ x11-toolkits/py-wxPython28/Makefile @@ -13,13 +13,13 @@ MAINTAINER= python@FreeBSD.org COMMENT= Python bindings for the wxWidgets/GTK GUI toolkit -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${FLAVOR} WRKSRC_SUBDIR= wxPython DIST_SUBDIR= python USE_PYTHON= distutils -USES= gettext gmake pkgconfig python shebangfix tar:bzip2 +USES= gettext gmake pkgconfig python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= wx/tools/Editra/Editra.pyw PYDISTUTILS_BUILDARGS= \ @@ -76,8 +76,8 @@ INSTALL_MULTIVERSION=1 .else ## These are shared -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:x11-toolkits/py-wxPython28-common \ - ${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}wxPython28-common>0:x11-toolkits/py-wxPython28-common@${FLAVOR} \ + ${PYTHON_SITELIBDIR}/wxversion.py:x11-toolkits/py-wxPython-common@${FLAVOR} PYDISTUTILS_BUILDARGS+= \ NO_HEADERS=1 \ Index: x11-toolkits/py-wxPython30/Makefile =================================================================== --- x11-toolkits/py-wxPython30/Makefile +++ x11-toolkits/py-wxPython30/Makefile @@ -16,14 +16,14 @@ WRKSRC_SUBDIR= wxPython -USES= compiler:c++11-lib python shebangfix tar:bzip2 +USES= compiler:c++11-lib python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= wx/tools/Editra/Editra.pyw .if defined(WITH_WXVERSION_ONLY) PKGNAMESUFFIX= -common -USE_PYTHON= py3kplist +USE_PYTHON= py3kplist flavors do-build: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d ${PYTHON_SITELIBDIR} -f ${WRKSRC}/wxversion @@ -39,7 +39,7 @@ WXPORT= gtk2 WX_PYTHON_DIR= wx-${WX_VERSION}-${WXPORT} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wxPython-common>0:x11-toolkits/py-wxPython-common@${FLAVOR} USES+= gettext pkgconfig USE_WX= 3.0 Index: x11-toolkits/py-xlib/Makefile =================================================================== --- x11-toolkits/py-xlib/Makefile +++ x11-toolkits/py-xlib/Makefile @@ -11,9 +11,9 @@ LICENSE= GPLv2+ -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.7:devel/py-setuptools_scm@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${FLAVOR} GH_ACCOUNT= python-xlib GH_PROJECT= python-xlib Index: x11-toolkits/py34-tkinter/Makefile =================================================================== --- x11-toolkits/py34-tkinter/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tkinter - -PYTHON_VERSION= python3.4 - -.include "${MASTERDIR}/Makefile" Index: x11-toolkits/py35-tkinter/Makefile =================================================================== --- x11-toolkits/py35-tkinter/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tkinter - -PYTHON_VERSION= python3.5 - -.include "${MASTERDIR}/Makefile" Index: x11-toolkits/py36-tkinter/Makefile =================================================================== --- x11-toolkits/py36-tkinter/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -MASTERDIR= ${.CURDIR}/../py-tkinter - -PYTHON_VERSION= python3.6 - -.include "${MASTERDIR}/Makefile" Index: x11-wm/compizconfig-python/Makefile =================================================================== --- x11-wm/compizconfig-python/Makefile +++ x11-wm/compizconfig-python/Makefile @@ -13,12 +13,13 @@ BUILD_DEPENDS= \ ${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz \ ${LOCALBASE}/libdata/pkgconfig/libcompizconfig.pc:x11-wm/libcompizconfig \ - ${PYTHON_SITELIBDIR}/Pyrex/Distutils/__init__.py:devel/pyrex + ${PYTHON_PKGNAMEPREFIX}pyrex>0:devel/pyrex@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} GNU_CONFIGURE= yes USES= gmake libtool pathfix pkgconfig python:2 tar:bzip2 USE_GNOME= glib20 +USE_PYTHON= flavors post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/compizconfig.so Index: x11-wm/obapps/Makefile =================================================================== --- x11-wm/obapps/Makefile +++ x11-wm/obapps/Makefile @@ -16,9 +16,9 @@ LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>=0:x11-toolkits/py-xlib@${FLAVOR} -USES= python +USES= python:2.7 USE_PYTHON= distutils USE_WX= 3.0+ WX_COMPS= python:run Index: x11-wm/obkey/Makefile =================================================================== --- x11-wm/obkey/Makefile +++ x11-wm/obkey/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= py27-gtk2>=2.14:x11-toolkits/py-gtk2 -USES= desktop-file-utils gettext python +USES= desktop-file-utils gettext python:2.7 USE_PYTHON= distutils NO_ARCH= yes Index: x11-wm/obmenu/Makefile =================================================================== --- x11-wm/obmenu/Makefile +++ x11-wm/obmenu/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= python shebangfix +USES= python:2.7 shebangfix USE_GNOME= pygtk2 USE_PYTHON= distutils PYDISTUTILS_PKGNAME= obMenu Index: x11-wm/plwm/Makefile =================================================================== --- x11-wm/plwm/Makefile +++ x11-wm/plwm/Makefile @@ -13,12 +13,12 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:x11-toolkits/py-xlib@${FLAVOR} NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist PORTDOCS= * Index: x11-wm/qtile/Makefile =================================================================== --- x11-wm/qtile/Makefile +++ x11-wm/qtile/Makefile @@ -13,15 +13,15 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb \ - ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xpyb>0:x11/xpyb@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} USE_GITHUB= yes GH_ACCOUNT= qtile USE_GNOME= pygobject pygtk2 -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist NO_ARCH= yes Index: x11/arandr/Makefile =================================================================== --- x11/arandr/Makefile +++ x11/arandr/Makefile @@ -12,14 +12,14 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0.6:textproc/py-docutils@${FLAVOR} RUN_DEPENDS= xrandr>0:x11/xrandr \ - ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2 + ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR} OPTIONS_DEFINE= DOCS USE_PYTHON= distutils -USES+= gettext desktop-file-utils python +USES+= gettext desktop-file-utils python:2.7 PORTDOCS= ChangeLog NEWS README TODO Index: x11/gnome-desktop/Makefile =================================================================== --- x11/gnome-desktop/Makefile +++ x11/gnome-desktop/Makefile @@ -31,7 +31,7 @@ xkeyboard-config>=0:x11/xkeyboard-config \ libxkbfile>=0:x11/libxkbfile -USES+= bison gettext gmake gnome libtool localbase pathfix pkgconfig python:3 +USES+= bison gettext gmake gnome libtool localbase pathfix pkgconfig python:3.4+ USE_GNOME= gtk30 intlhack introspection:build referencehack USE_XORG= x11 xrandr xext USE_LDCONFIG= yes Index: x11/gnome-shell/Makefile =================================================================== --- x11/gnome-shell/Makefile +++ x11/gnome-shell/Makefile @@ -41,7 +41,7 @@ libcogl.so:graphics/cogl \ libclutter-1.0.so:graphics/clutter \ libgjs.so:lang/gjs -RUN_DEPENDS= py*-dbus>=0:devel/py-dbus \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ nss>=0:security/nss \ gnome-control-center:sysutils/gnome-control-center \ ca_root_nss>=0:security/ca_root_nss \ @@ -50,7 +50,7 @@ PORTSCOUT= limitw:1,even USES= compiler:c11 cpe gettext gmake gnome libtool localbase \ - pathfix pkgconfig sqlite tar:xz webplugin:native + pathfix pkgconfig python:3.4+ sqlite tar:xz webplugin:native USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 gtk30 intltool \ introspection libxml2 USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr Index: x11/guake/Makefile =================================================================== --- x11/guake/Makefile +++ x11/guake/Makefile @@ -12,15 +12,15 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gnome-common>=3.14.0:devel/gnome-common \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify \ - ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg + ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg@${PY_FLAVOR} RUN_DEPENDS= keybinder>=0.3.0:x11/keybinder \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify \ - ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte \ - ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg + ${PYTHON_PKGNAMEPREFIX}dbus>=0.84.0:devel/py-dbus@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}notify>=0.1.1_9:devel/py-notify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2_1:x11-toolkits/py-vte@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xdg>=0.19:devel/py-xdg@${PY_FLAVOR} CPPFLAGS+= -I${LOCALBASE}/include Index: x11/ooxcb/Makefile =================================================================== --- x11/ooxcb/Makefile +++ x11/ooxcb/Makefile @@ -13,7 +13,7 @@ NO_ARCH= yes -USES= python +USES= python:2.7 USE_PYTHON= distutils autoplist USE_XORG= xcb Index: x11/py-pyvirtualdisplay/Makefile =================================================================== --- x11/py-pyvirtualdisplay/Makefile +++ x11/py-pyvirtualdisplay/Makefile @@ -15,11 +15,11 @@ RUN_DEPENDS= xorg-vfbserver>0:x11-servers/xorg-vfbserver \ xauth>0:x11/xauth \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver \ - ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog \ - ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}paver>0:devel/py-paver@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cog>=2.3:devel/py-cog@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}easyprocess>0:devel/py-easyprocess@${FLAVOR} NO_ARCH= yes USE_PYTHON= autoplist distutils Index: x11/py-qt4-opengl/Makefile =================================================================== --- x11/py-qt4-opengl/Makefile +++ x11/py-qt4-opengl/Makefile @@ -15,6 +15,7 @@ USES= python pyqt:4 USE_GL= gl USE_PYQT= sip_build core_run gui_run +USE_PYTHON= flavors USE_QT4= corelib gui opengl moc_build qmake_build OPTIONS_DEFINE= API DEBUG Index: x11/py-qt5-opengl/Makefile =================================================================== --- x11/py-qt5-opengl/Makefile +++ x11/py-qt5-opengl/Makefile @@ -13,6 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run gui_run widgets_run +USE_PYTHON= flavors USE_QT5= core gui opengl widgets qmake_build OPTIONS_DEFINE= API DEBUG Index: x11/terminator/Makefile =================================================================== --- x11/terminator/Makefile +++ x11/terminator/Makefile @@ -12,11 +12,11 @@ LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}notify>=0:devel/py-notify@${FLAVOR} \ ${PYTHON_SITELIBDIR}/keybinder/_keybinder.so:x11/keybinder \ - ${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte + ${PYTHON_PKGNAMEPREFIX}vte>=0:x11-toolkits/py-vte@${FLAVOR} -USES= python +USES= python:2.7 USE_GNOME= pygtk2 intltool USE_PYTHON= distutils PYDISTUTILS_PKGNAME= Terminator Index: x11/workrave/Makefile =================================================================== --- x11/workrave/Makefile +++ x11/workrave/Makefile @@ -42,7 +42,7 @@ DISTRIBUTION_DESC= Build with networking support -DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah +DBUS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR} DBUS_CONFIGURE_ENABLE= dbus DBUS_USES= python:2.7 Index: x11/xpra/Makefile =================================================================== --- x11/xpra/Makefile +++ x11/xpra/Makefile @@ -12,35 +12,34 @@ LICENSE= GPLv2 -BUILD_DEPENDS= cython:lang/cython \ - ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${FLAVOR} \ ${PYNUMPY} LIB_DEPENDS= libturbojpeg.so:graphics/libjpeg-turbo \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4 \ - ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode \ - ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus \ - ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify \ - ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash \ - ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL \ - ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate \ - ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rencode>1:converters/py-rencode@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>1:devel/py-dbus@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}xxhash>0:devel/py-xxhash@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>=3.0:graphics/py-pillow@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=3.1.0:graphics/py-PyOpenGL@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}PyOpenGL-accelerate>=3.1.0:graphics/py-PyOpenGL-accelerate@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \ ssh-askpass:security/openssh-askpass \ - ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography \ + ${PYTHON_PKGNAMEPREFIX}cryptography>1:security/py-cryptography@${FLAVOR} \ setxkbmap:x11/setxkbmap \ xauth:x11/xauth \ xkbcomp:x11/xkbcomp \ ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ Xvfb:x11-servers/xorg-vfbserver \ - ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2 \ - ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext \ + ${PYTHON_PKGNAMEPREFIX}gtk2>2:x11-toolkits/py-gtk2@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${FLAVOR} \ ${PYNUMPY} USES= desktop-file-utils fortran gettext-runtime pkgconfig python:2 shared-mime-info shebangfix tar:xz USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango -USE_PYTHON= distutils +USE_PYTHON= distutils cython USE_XORG= x11 xcomposite xdamage xext xfixes xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER} SHEBANG_FILES= cups/xpraforwarder @@ -61,14 +60,14 @@ X264_DESC= Enable X264 encoder X265_DESC= Enable X265 encoder (slow) -AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi +AVAHI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}avahi>0:net/py-avahi@${FLAVOR} AVAHI_VARS= XPRA_OPTIONS+=mdns AVCODEC_VARS= XPRA_OPTIONS+=dec_avcodec2 -CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups +CUPS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycups>1:print/py-pycups@${FLAVOR} CUPS_VARS= XPRA_OPTIONS+=printing FFMPEG_VARS= XPRA_OPTIONS+=enc_ffmpeg -GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 -GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1 +GSTREAMER_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${FLAVOR} +GSTREAMER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gstreamer1>1:multimedia/py-gstreamer1@${FLAVOR} GSTREAMER_USE= GSTREAMER1=flac,lame,mpg123,ogg,opus,vorbis,wavpack GSTREAMER_VARS= XPRA_OPTIONS+=sound HTML5_VARS= XPRA_OPTIONS+=html5 @@ -78,7 +77,7 @@ SWSCALE_VARS= XPRA_OPTIONS+=csc_swscale VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_VARS= XPRA_OPTIONS+=vpx -WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv +WEBCAM_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opencv>2:graphics/py-opencv@${FLAVOR} WEBCAM_VARS= XPRA_OPTIONS+=webcam X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_VARS= XPRA_OPTIONS+=enc_x264 Index: x11/xpyb/Makefile =================================================================== --- x11/xpyb/Makefile +++ x11/xpyb/Makefile @@ -14,7 +14,8 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-proto.pc:x11/xcb-proto \ xcb-proto>=1.7.1:x11/xcb-proto -USES= libtool pathfix pkgconfig python tar:bzip2 +USES= libtool pathfix pkgconfig python:2.7 tar:bzip2 +USE_PYTHON= flavors USE_XORG= xcb PORTDOCS= README COPYING INSTALL NEWS XcbPythonBinding.txt