Convert Python ports to FLAVORS.

  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, all the flavors are generated.  To only generate flavors
  for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define
  BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf.

  In all the ports with Python dependencies, the *_DEPENDS entries MUST
  end with the flavor so that the framework knows which to build/use.
  This is done by appending '@${PY_FLAVOR}' after the origin (or
  @${FLAVOR} if in a Python module with Python flavors, as the content
  will be the same).  For example:

    RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}

PR:		223071
Reviewed by:	portmgr, python
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D12464

90 files changed, 181 insertions, 396 deletions

diff --git a/databases/Makefile b/databases/Makefile
index fc3d86929ffd..2195d4216160 100644
--- a/databases/Makefile
+++ b/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
diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index aca5b76bb22a..0d6c10cd42ff 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -10,6 +10,6 @@ MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Pure-Python database engine
 
 USES=		python zip
-USE_PYTHON=	distutils
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/databases/buzhug/pkg-plist b/databases/buzhug/pkg-plist
deleted file mode 100644
index e1025225a1f8..000000000000
--- a/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
diff --git a/databases/emma/Makefile b/databases/emma/Makefile
index 3c8e2c3562c4..2fdae192f7b1 100644
--- a/databases/emma/Makefile
+++ b/databases/emma/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES=	http://www.fastflo.de/files/emma/downloads/python_src/
 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
 
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index e3b0ea07c6d5..a0cb37985ef5 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 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
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 775ae951d3d6..1389f77593b7 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -25,7 +25,7 @@ COMMENT=	Open source Geographical Information System (GIS)
 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_USES=		pgsql
 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 <bsd.port.options.mk>
 
diff --git a/databases/metakit/Makefile b/databases/metakit/Makefile
index 29d2f58c3f36..660301301275 100644
--- a/databases/metakit/Makefile
+++ b/databases/metakit/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	PYTHON TCL DOCS
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=	yes
 
-PYTHON_USES=		python
+PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_ON=	--with-python=${LOCALBASE}
 PYTHON_CATEGORIES=	python
 
diff --git a/databases/monetdb/Makefile b/databases/monetdb/Makefile
index 170b43d1d9c1..b1f5d27dfdbd 100644
--- a/databases/monetdb/Makefile
+++ b/databases/monetdb/Makefile
@@ -177,7 +177,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .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 @@ CONFIGURE_ARGS+=	--without-python2
 .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} \
diff --git a/databases/mtools-mongodb/Makefile b/databases/mtools-mongodb/Makefile
index 6e692c7f98fb..5935e7900f9b 100644
--- a/databases/mtools-mongodb/Makefile
+++ b/databases/mtools-mongodb/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Setup test environments; parse, filter and visualize MongoDB log files
 
 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
diff --git a/databases/mydbf2mysql/Makefile b/databases/mydbf2mysql/Makefile
index 372211b3140e..736e7cedd800 100644
--- a/databases/mydbf2mysql/Makefile
+++ b/databases/mydbf2mysql/Makefile
@@ -11,10 +11,10 @@ DISTNAME=	MyDBF2MySQL-${PORTVERSION}
 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}/
diff --git a/databases/openark-kit/Makefile b/databases/openark-kit/Makefile
index c0746f1380f8..c399ab295ed8 100644
--- a/databases/openark-kit/Makefile
+++ b/databases/openark-kit/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Common utilities for MySQL
 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 <bsd.port.mk>
diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile
index cbfe506de07a..7c1aa6b8f437 100644
--- a/databases/pg_activity/Makefile
+++ b/databases/pg_activity/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Htop like application for PostgreSQL server activity monitoring
 
 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 @@ USE_GITHUB=	yes
 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:
diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index d4db9ee88881..89173c0e6c6b 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Backup and recovery manager for PostgreSQL
 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 @@ GROUPS=		barman
 
 USES=		pgsql python
 WANT_PGSQL=	client
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist distutils concurrent optsuffix
 
 PORTDOCS=	tutorial.pdf
 
diff --git a/databases/pgloader/Makefile b/databases/pgloader/Makefile
index 26fc37f7bf6c..477fea6b9e66 100644
--- a/databases/pgloader/Makefile
+++ b/databases/pgloader/Makefile
@@ -11,10 +11,10 @@ MAINTAINER=	pea@raveland.org
 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
 
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index f60d023d10ad..cfdb48e27a1f 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple PostreSQL GUI front end
 
 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
diff --git a/databases/powa-web/Makefile b/databases/powa-web/Makefile
index 54860210a645..51a73f131c15 100644
--- a/databases/powa-web/Makefile
+++ b/databases/powa-web/Makefile
@@ -12,9 +12,9 @@ COMMENT=	PostgreSQL Workload Analyzer is a performance tool for PostgreSQL
 
 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
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index c66959dd1492..7611e44af44c 100644
--- a/databases/py-Elixir/Makefile
+++ b/databases/py-Elixir/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Declarative Mapper for SQLAlchemy
 
 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
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index 68e967d2c6b5..3bb94738df10 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Framework and utilities to upgrade and maintain a relational database
 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
diff --git a/databases/py-agate-sql/Makefile b/databases/py-agate-sql/Makefile
index 8382b886f5f2..05548cfd2014 100644
--- a/databases/py-agate-sql/Makefile
+++ b/databases/py-agate-sql/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Add SQL read/write support to agate
 
 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
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index 6ce8a82b6ea7..01a0f0fdd717 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Database migration tool for SQLAlchemy
 
 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
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index cde444ebd889..c866b2086834 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ZLIB
 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
diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile
index b7e69165c0ee..4dcd08594e16 100644
--- a/databases/py-bsddb/Makefile
+++ b/databases/py-bsddb/Makefile
@@ -17,7 +17,7 @@ LICENSE=	PSFL
 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 @@ PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
 
 MAKE_ENV=	BSDDB_VERSION=${BDB_LIB_NAME}
 
-.include <bsd.port.pre.mk>
-
-.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 @@ post-patch:
 		's,^\(#include.*\)\(db\.h.*\)$$,\1${BDB_INCLUDE_DIR}/\2,' \
 		${WRKSRC}/bsddb.h
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index d416ef88faea..8770ae3e6e63 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python extension module for BerkeleyDB 3 and 4
 
 LICENSE=	BSD3CLAUSE
 
-USES?=		bdb python
+USES=		bdb python
 USE_PYTHON=	distutils autoplist
 
 PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index c551932e2e97..880f62bb07e6 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Backend storage application for graphite
 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
diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index 4f51393f2cc4..cf7e60bd878e 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Simple Library to Allow Python Applications to Use CouchDB
 
 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 <bsd.port.mk>
diff --git a/databases/py-couchdb/pkg-plist b/databases/py-couchdb/pkg-plist
deleted file mode 100644
index 82c1a60d98ce..000000000000
--- a/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
diff --git a/databases/py-cql/Makefile b/databases/py-cql/Makefile
index cf0bf4d5f8d3..68c22f5a931c 100644
--- a/databases/py-cql/Makefile
+++ b/databases/py-cql/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Python DB-API 2.0 client interface for Cassandra
 
 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
 
diff --git a/databases/py-django-transaction-hooks/Makefile b/databases/py-django-transaction-hooks/Makefile
index 8056e965cbff..6748f7e330b3 100644
--- a/databases/py-django-transaction-hooks/Makefile
+++ b/databases/py-django-transaction-hooks/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Django database backends to register transaction-commit hooks
 
 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
 
diff --git a/databases/py-fakeredis/Makefile b/databases/py-fakeredis/Makefile
index af1823cc50f1..e57ef3fe93ff 100644
--- a/databases/py-fakeredis/Makefile
+++ b/databases/py-fakeredis/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Fake version of databases/py-redis for unit testing
 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
diff --git a/databases/py-flask-sqlalchemy/Makefile b/databases/py-flask-sqlalchemy/Makefile
index e0c7c50b47aa..64fbd15bcd62 100644
--- a/databases/py-flask-sqlalchemy/Makefile
+++ b/databases/py-flask-sqlalchemy/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Adds SQLAlchemy support to Flask
 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
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index 873c5114cbcd..a70c7d5f3350 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -23,8 +23,8 @@ PORTDOCS=	BUGS README TODO
 
 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 <bsd.port.options.mk>
 
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index ae56c622ad06..bb71606b8f0e 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgdbm.so:databases/gdbm
 PORTSCOUT=	ignore:1
 
 USES=		python tar:xz
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist allflavors
 
 PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload
 
diff --git a/databases/py-geoalchemy/Makefile b/databases/py-geoalchemy/Makefile
index 14b663b45018..3c900e8adf50 100644
--- a/databases/py-geoalchemy/Makefile
+++ b/databases/py-geoalchemy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Using SQLAlchemy with Spatial Databases
 
 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
diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index 55a621a5b190..76d70ec9ce62 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Using SQLAlchemy with Spatial Databases
 
 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
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index f505105cef74..0cf5a3875a27 100644
--- a/databases/py-htsql-mysql/Makefile
+++ b/databases/py-htsql-mysql/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Database Query Language (MySQL Backend for HTSQL)
 
 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
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index 6fae021d9d7f..a00a7a854fcf 100644
--- a/databases/py-htsql-pgsql/Makefile
+++ b/databases/py-htsql-pgsql/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Database Query Language (PostgreSQL Backend for HTSQL)
 
 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
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index 3845c27aaf82..6984eaeab009 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -17,7 +17,7 @@ LICENSE=	AGPLv3
 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 <bsd.port.mk>
diff --git a/databases/py-kyotocabinet/Makefile b/databases/py-kyotocabinet/Makefile
index e1ac258458ea..3263398f4806 100644
--- a/databases/py-kyotocabinet/Makefile
+++ b/databases/py-kyotocabinet/Makefile
@@ -18,6 +18,6 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
 USE_PYTHON=	autoplist distutils
-USES=		python:3
+USES=		python:3.4+
 
 .include <bsd.port.mk>
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
index 98a040237e6b..0d0e694ce778 100644
--- a/databases/py-lmdb/Makefile
+++ b/databases/py-lmdb/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	OpenLDAP Public LIcense
 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
diff --git a/databases/py-motor/Makefile b/databases/py-motor/Makefile
index c60a23984d59..0eaf58f2a91e 100644
--- a/databases/py-motor/Makefile
+++ b/databases/py-motor/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Non-blocking MongoDB driver for Tornado or asyncio
 
 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
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile
index 8cbb04203682..5f34c522e7f8 100644
--- a/databases/py-mycli/Makefile
+++ b/databases/py-mycli/Makefile
@@ -13,14 +13,14 @@ COMMENT=	CLI for MySQL Database with auto-completion and syntax highlighting
 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
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index d8c94ec2c92b..d18e7af9ba32 100644
--- a/databases/py-mysql2pgsql/Makefile
+++ b/databases/py-mysql2pgsql/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Tool for migrating/converting from MySQL to PostgreSQL
 
 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
diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile
index 8dfd6d1b12be..de64a67d3f80 100644
--- a/databases/py-mysqlclient/Makefile
+++ b/databases/py-mysqlclient/Makefile
@@ -11,7 +11,7 @@ COMMENT=	MySQL database connector for Python
 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
diff --git a/databases/py-oursql/Makefile b/databases/py-oursql/Makefile
index a3df6f632896..dc88fff6e9b9 100644
--- a/databases/py-oursql/Makefile
+++ b/databases/py-oursql/Makefile
@@ -12,7 +12,7 @@ COMMENT=	MySQL bindings for python
 
 LICENSE=	BSD2CLAUSE
 
-USES=		mysql python
+USES=		mysql python:2.7
 USE_PYTHON=	autoplist distutils
 
 post-install:
diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile
index 727ad8887d9e..f807fa649632 100644
--- a/databases/py-peewee/Makefile
+++ b/databases/py-peewee/Makefile
@@ -20,8 +20,8 @@ NO_ARCH=	yes
 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 <bsd.port.mk>
diff --git a/databases/py-pg_pqueue/Makefile b/databases/py-pg_pqueue/Makefile
index 2dbb27db5177..0c07251aa165 100644
--- a/databases/py-pg_pqueue/Makefile
+++ b/databases/py-pg_pqueue/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PostgreSQL PQ Protocol Modules
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	DOCS
diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index 280627165eb4..b8f06e6f1e86 100644
--- a/databases/py-pgcli/Makefile
+++ b/databases/py-pgcli/Makefile
@@ -13,16 +13,16 @@ COMMENT=	CLI for Postgres Database with auto-completion and syntax highlighting
 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
diff --git a/databases/py-pgspecial/Makefile b/databases/py-pgspecial/Makefile
index 6975d5b7dad9..48ff8788547a 100644
--- a/databases/py-pgspecial/Makefile
+++ b/databases/py-pgspecial/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Meta-commands handler for Postgres Database
 
 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
diff --git a/databases/py-pgxnclient/Makefile b/databases/py-pgxnclient/Makefile
index 74d0e332f2d4..2bc7ed84527d 100644
--- a/databases/py-pgxnclient/Makefile
+++ b/databases/py-pgxnclient/Makefile
@@ -11,6 +11,6 @@ MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Command line tool to interact with the PostgreSQL Extension Network
 
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index 5db420fbad12..328cfd6f95ea 100644
--- a/databases/py-pickledb/Makefile
+++ b/databases/py-pickledb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight, fast, and simple key-value store
 
 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
diff --git a/databases/py-pickleshare/Makefile b/databases/py-pickleshare/Makefile
index ac81051b32c8..fab0faaead7a 100644
--- a/databases/py-pickleshare/Makefile
+++ b/databases/py-pickleshare/Makefile
@@ -20,7 +20,7 @@ NO_ARCH=	yes
 .include <bsd.port.pre.mk>
 
 .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 <bsd.port.post.mk>
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index 34a60609c899..e2b60a96e47a 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/doc/COPYING.LESSER
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_PYTHON=	autoplist concurrent distutils
-USES?=		pgsql python
+USES=		pgsql python
 
 PORTDOCS=	AUTHORS INSTALL NEWS PKG-INFO README.rst
 PORTEXAMPLES=	*
diff --git a/databases/py-psycopg2cffi/Makefile b/databases/py-psycopg2cffi/Makefile
index 57df92c8e8a7..05758accdacb 100644
--- a/databases/py-psycopg2cffi/Makefile
+++ b/databases/py-psycopg2cffi/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Implementation of the psycopg2 module using cffi
 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
diff --git a/databases/py-pyhs/Makefile b/databases/py-pyhs/Makefile
index 783b5f457770..e490a2fb9b0b 100644
--- a/databases/py-pyhs/Makefile
+++ b/databases/py-pyhs/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	python-handler-socket-${PORTVERSION}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	HandlerSocket client for Python
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index fcd36456c50d..1424b3350d48 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -12,12 +12,11 @@ COMMENT=	Python database interface for MS-SQL. Version 2
 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
diff --git a/databases/py-pytc/Makefile b/databases/py-pytc/Makefile
index 62abed9ca02c..a718fe52a88a 100644
--- a/databases/py-pytc/Makefile
+++ b/databases/py-pytc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Tokyo Cabinet Python bindings
 
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
diff --git a/databases/py-python-rrdtool/Makefile b/databases/py-python-rrdtool/Makefile
index 705f69020a87..14108225dda9 100644
--- a/databases/py-python-rrdtool/Makefile
+++ b/databases/py-python-rrdtool/Makefile
@@ -14,7 +14,7 @@ LICENSE=	LGPL3
 
 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
 
diff --git a/databases/py-python-swiftclient/Makefile b/databases/py-python-swiftclient/Makefile
index 412aa90a75d4..d72cc4bb55fc 100644
--- a/databases/py-python-swiftclient/Makefile
+++ b/databases/py-python-swiftclient/Makefile
@@ -12,14 +12,14 @@ COMMENT=	Python client library for OpenStack Object Storage (Swift)
 
 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:
diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile
index 032ef33f63d5..62f12f40d634 100644
--- a/databases/py-qt4-sql/Makefile
+++ b/databases/py-qt4-sql/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST=	yes
 
 USES=		python pyqt:4
 USE_PYQT=	sip_build core_run gui_run
+USE_PYTHON=	flavors
 USE_QT4=	corelib gui sql \
 		moc_build qmake_build
 
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index 61227f13d89c..8eb60c7e7f80 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -13,6 +13,7 @@ PYQT_DIST=	yes
 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
diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index f9bc2f64540e..d5819b8b0751 100644
--- a/databases/py-queries/Makefile
+++ b/databases/py-queries/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simplified PostgreSQL client built upon Psycopg2
 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
diff --git a/databases/py-rb/Makefile b/databases/py-rb/Makefile
index 0834824f269d..5c5641049eab 100644
--- a/databases/py-rb/Makefile
+++ b/databases/py-rb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Rb - the redis blaster
 
 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
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index 7f4eaca2112c..254dc4349fa7 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	HIREDIS
 
 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
diff --git a/databases/py-riak/Makefile b/databases/py-riak/Makefile
index 9bce28c94ed1..675eb6ea0fe9 100644
--- a/databases/py-riak/Makefile
+++ b/databases/py-riak/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Python client for Riak
 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
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index 750d07eee671..3f9c02767810 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Database schema migrations for SQLAlchemy
 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
diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile
index 250739a5b934..1a43d12d0883 100644
--- a/databases/py-sqlalchemy10/Makefile
+++ b/databases/py-sqlalchemy10/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Python SQL toolkit and Object Relational Mapper 1.0.x
 
 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 @@ OPTIONS_DEFAULT=	SQLITE
 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 @@ PORTEXAMPLES=		*
 .include <bsd.port.pre.mk>
 
 .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:
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index cb978b4a3eec..e280e75eb947 100644
--- a/databases/py-sqlalchemy11/Makefile
+++ b/databases/py-sqlalchemy11/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Python SQL toolkit and Object Relational Mapper 1.1.x
 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 @@ USES=		python
 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
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index 23cf3fea9931..20b7a674d007 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 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
diff --git a/databases/py-sqlite3dbm/Makefile b/databases/py-sqlite3dbm/Makefile
index a26a2d5a2887..d78897d3afa4 100644
--- a/databases/py-sqlite3dbm/Makefile
+++ b/databases/py-sqlite3dbm/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 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 <bsd.port.mk>
diff --git a/databases/py-sqlobject/Makefile b/databases/py-sqlobject/Makefile
index cd4292e85bff..19708f4a7f83 100644
--- a/databases/py-sqlobject/Makefile
+++ b/databases/py-sqlobject/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python object for manipulation with SQL table row
 
 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 @@ SYBASE_DESC=	sybase support
 
 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}
diff --git a/databases/py-swift/Makefile b/databases/py-swift/Makefile
index cd53b119737e..044ef37af155 100644
--- a/databases/py-swift/Makefile
+++ b/databases/py-swift/Makefile
@@ -13,22 +13,22 @@ COMMENT=	Highly available, distributed, eventually consistent object/blob store
 
 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
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index 290c567c4bd7..b347e812f341 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libct.so:databases/freetds
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	DOCS THREADS EXAMPLES
diff --git a/databases/py-unqlite/Makefile b/databases/py-unqlite/Makefile
index 5b0112e6c5ec..dcffb65383b2 100644
--- a/databases/py-unqlite/Makefile
+++ b/databases/py-unqlite/Makefile
@@ -11,9 +11,7 @@ COMMENT=	Fast Python bindings for the UnQLite embedded NoSQL database
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	cython>0:lang/cython
-
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist cython
 
 .include <bsd.port.mk>
diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile
index cf97ce71202d..ed4220660053 100644
--- a/databases/py-xapian/Makefile
+++ b/databases/py-xapian/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 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 @@ CONFIGURE_ARGS=	--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool python tar:xz
+USE_PYTHON=	flavors
 
 PORTDOCS=	*
 
diff --git a/databases/py3-apsw/Makefile b/databases/py3-apsw/Makefile
deleted file mode 100644
index cee12aa69a44..000000000000
--- a/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"
diff --git a/databases/py3-bsddb3/Makefile b/databases/py3-bsddb3/Makefile
deleted file mode 100644
index f49bbedd1766..000000000000
--- a/databases/py3-bsddb3/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Ben Woods <woodsb02@FreeBSD.org>
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-bsddb3
-
-USES=		bdb python:3.2+
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py3-mysqlclient/Makefile b/databases/py3-mysqlclient/Makefile
deleted file mode 100644
index 0bc5e5f2d68d..000000000000
--- a/databases/py3-mysqlclient/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-mysqlclient
-
-USES=		python:3.3+ mysql
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py3-psycopg2/Makefile b/databases/py3-psycopg2/Makefile
deleted file mode 100644
index b443cc8ed1d6..000000000000
--- a/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"
diff --git a/databases/py34-gdbm/Makefile b/databases/py34-gdbm/Makefile
deleted file mode 100644
index 22f120f834cf..000000000000
--- a/databases/py34-gdbm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-gdbm
-
-PYTHON_VERSION=	python3.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py34-sqlite3/Makefile b/databases/py34-sqlite3/Makefile
deleted file mode 100644
index b755b044d8fa..000000000000
--- a/databases/py34-sqlite3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-sqlite3
-
-PYTHON_VERSION=	python3.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py35-gdbm/Makefile b/databases/py35-gdbm/Makefile
deleted file mode 100644
index 9013fe6859bb..000000000000
--- a/databases/py35-gdbm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-gdbm
-
-PYTHON_VERSION=	python3.5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py35-sqlite3/Makefile b/databases/py35-sqlite3/Makefile
deleted file mode 100644
index 024e9246feb0..000000000000
--- a/databases/py35-sqlite3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-sqlite3
-
-PYTHON_VERSION=	python3.5
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py36-gdbm/Makefile b/databases/py36-gdbm/Makefile
deleted file mode 100644
index e35968d1d0e8..000000000000
--- a/databases/py36-gdbm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-gdbm
-
-PYTHON_VERSION=	python3.6
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/py36-sqlite3/Makefile b/databases/py36-sqlite3/Makefile
deleted file mode 100644
index 81958275eb42..000000000000
--- a/databases/py36-sqlite3/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-MASTERDIR=	${.CURDIR}/../py-sqlite3
-
-PYTHON_VERSION=	python3.6
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/pydbx/Makefile b/databases/pydbx/Makefile
index 9628b927bf6a..2b508ed7daab 100644
--- a/databases/pydbx/Makefile
+++ b/databases/pydbx/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 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 <bsd.port.mk>
diff --git a/databases/pydbx/pkg-plist b/databases/pydbx/pkg-plist
deleted file mode 100644
index 11b1253df199..000000000000
--- a/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
diff --git a/databases/pyspatialite/Makefile b/databases/pyspatialite/Makefile
index 0f05c6e8c304..d6596455526a 100644
--- a/databases/pyspatialite/Makefile
+++ b/databases/pyspatialite/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libspatialite.so:databases/spatialite \
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		iconv python
+USES=		iconv python:2.7
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.pre.mk>
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index e4ae45de6cac..b2277bc8f8ed 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -52,6 +52,7 @@ PERL_CONFIGURE_ON=	--enable-perl --enable-perl-site-install
 PERL_USES=		perl5
 PYTHON_CONFIGURE_ENABLE=python
 PYTHON_USES=		python
+PYTHON_USE=		python=flavors,optsuffix
 RUBY_CONFIGURE_ENABLE=	ruby
 RUBY_USE=		RUBY=yes
 
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 185f65cb7b86..3d32014552a8 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -29,7 +29,7 @@ OPTIONS_DEFAULT=	PERL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USES+=		python
+USES+=		python:2.7
 PLIST_SUB+=	WITH_PYTHON=""
 CONFIGURE_ARGS+=	--enable-python
 .else
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index 90958a9bf694..3a9d72cfbfd0 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Z - Object Database for python
 
 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