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

42 files changed, 143 insertions, 186 deletions

diff --git a/audio/Makefile b/audio/Makefile
index fb4ec891d8e8..7b3c6b67f7bc 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -685,8 +685,6 @@
     SUBDIR += py-tagpy
     SUBDIR += py-vorbis
     SUBDIR += py-xmms2
-    SUBDIR += py3-mutagen
-    SUBDIR += py3-pylast
     SUBDIR += pytone
     SUBDIR += qjackctl
     SUBDIR += qmidiarp
diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index b5b80f72473e..9f39bba8516f 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB=	dual
 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
 
diff --git a/audio/beets/Makefile b/audio/beets/Makefile
index 575f1e2c3cf3..9c56f8bdb193 100644
--- a/audio/beets/Makefile
+++ b/audio/beets/Makefile
@@ -13,18 +13,18 @@ COMMENT=	Media library management system for obsessive-compulsive music geeks
 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 @@ THUMBNAILS_DESC=	Thumbnails for freedesktop.org-compliant file managers
 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/
diff --git a/audio/carla/Makefile b/audio/carla/Makefile
index e9956114a863..123261d8559f 100644
--- a/audio/carla/Makefile
+++ b/audio/carla/Makefile
@@ -13,10 +13,10 @@ LICENSE_FILE=	${WRKSRC}/doc/GPL.txt
 
 LIB_DEPENDS=	liblo.so:audio/liblo \
 		libsndfile.so:audio/libsndfile
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyliblo>0:audio/py-pyliblo@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib desktop-file-utils gmake localbase \
-		pkgconfig pyqt:5 python:3 shared-mime-info tar:bz2
+		pkgconfig pyqt:5 python:3.4+ shared-mime-info tar:bz2
 USE_GITHUB=	yes
 GH_ACCOUNT=	falkTX
 USE_PYQT=	core_run gui_run svg_run widgets_run sip_build xml_build
diff --git a/audio/exaile-devel/Makefile b/audio/exaile-devel/Makefile
index 194e94d3b137..c1a27e70cd3b 100644
--- a/audio/exaile-devel/Makefile
+++ b/audio/exaile-devel/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Full featured python-based music player for GTK+
 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 @@ OPTIONS_SUB=	yes
 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} \
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index b49dfb729ec1..5ed5d53655ef 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Full featured python-based music player for GTK+
 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_DEFAULT=	BAD CDDB DBUS HAL NOTIFY SEXY
 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
diff --git a/audio/gnome-music/Makefile b/audio/gnome-music/Makefile
index bfa2023527f6..8af2b69e087c 100644
--- a/audio/gnome-music/Makefile
+++ b/audio/gnome-music/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libgrilo-0.2.so:net/grilo2 \
 
 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
diff --git a/audio/idjc/Makefile b/audio/idjc/Makefile
index 8407fcfb96e9..12109fd4ea1b 100644
--- a/audio/idjc/Makefile
+++ b/audio/idjc/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		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
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index 74ec50bcec70..21b87c881531 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Multi-track non-linear audio editing
 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 @@ NO_ARCH=	yes
 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
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 9c51879d6240..28c0d74c3351 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -39,10 +39,10 @@ MONO_USE=		GNOME=gtksharp20
 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
 
diff --git a/audio/lollypop/Makefile b/audio/lollypop/Makefile
index cd4255cec761..6d1ac720fd9a 100644
--- a/audio/lollypop/Makefile
+++ b/audio/lollypop/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Play and organize your music collection
 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 @@ PULSEAUDIO_USE=	gstreamer1=pulse
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.pre.mk>
-
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index 137b8342a1fd..490c3fa6f0b0 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Program intended to help with organizing your music files
 
 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
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 31c963540bef..64e68c75c1d9 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GTK+ client for the Music Player Daemon (MPD)
 
 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
diff --git a/audio/mps/Makefile b/audio/mps/Makefile
index 2452bb770cae..cd7b133d4a3c 100644
--- a/audio/mps/Makefile
+++ b/audio/mps/Makefile
@@ -22,7 +22,7 @@ MPV_DESC=	Mpv media player support
 # 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
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index 01b8e99fd399..aa12a25274b3 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Next generation MusicBrainz Tagger
 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
diff --git a/audio/pithos/Makefile b/audio/pithos/Makefile
index e26d74d1336a..36122de1e1b5 100644
--- a/audio/pithos/Makefile
+++ b/audio/pithos/Makefile
@@ -13,15 +13,15 @@ LICENSE=	GPLv3
 
 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:
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 2109a0b0a719..01bc336aa543 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -13,10 +13,10 @@ LICENSE=	GPLv3
 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
diff --git a/audio/py-aubio/Makefile b/audio/py-aubio/Makefile
index 4e3d12b168b7..c81c1e625e93 100644
--- a/audio/py-aubio/Makefile
+++ b/audio/py-aubio/Makefile
@@ -11,7 +11,7 @@ LIB_DEPENDS=	libaubio.so:audio/aubio
 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
diff --git a/audio/py-discogs-client/Makefile b/audio/py-discogs-client/Makefile
index 70acc2fa88db..5461288aa1ef 100644
--- a/audio/py-discogs-client/Makefile
+++ b/audio/py-discogs-client/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Python interface to Discogs website
 
 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
diff --git a/audio/py-gmusicapi/Makefile b/audio/py-gmusicapi/Makefile
index b459f0273859..d5518affe0ec 100644
--- a/audio/py-gmusicapi/Makefile
+++ b/audio/py-gmusicapi/Makefile
@@ -12,21 +12,21 @@ COMMENT=	Unofficial Python API for Google Play Music
 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
diff --git a/audio/py-gmusicproxy/Makefile b/audio/py-gmusicproxy/Makefile
index d8c222320cc0..063908f9389a 100644
--- a/audio/py-gmusicproxy/Makefile
+++ b/audio/py-gmusicproxy/Makefile
@@ -13,14 +13,14 @@ COMMENT=	Proxy for streaming Google Play Music using any media-player
 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
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 33de373f5f1e..1728e4acf80a 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -39,7 +39,7 @@ PLIST_FILES=	${BIN_SCRIPTS:S,^,bin/,} \
 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 \
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index acb384268bcf..2450aac4fd93 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_ARCH=	yes
-USES?=		python shebangfix
+USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 SHEBANG_FILES=	tools/*
 
diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile
index 6d14978495b4..1b786f1e17d5 100644
--- a/audio/py-openal/Makefile
+++ b/audio/py-openal/Makefile
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 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
diff --git a/audio/py-py-jack/Makefile b/audio/py-py-jack/Makefile
index 171fdf9e389f..3c3e21bf7457 100644
--- a/audio/py-py-jack/Makefile
+++ b/audio/py-py-jack/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python bindings for the Jack Audio Server
 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
diff --git a/audio/py-pylast/Makefile b/audio/py-pylast/Makefile
index 45e29669904b..cdd8155ffad8 100644
--- a/audio/py-pylast/Makefile
+++ b/audio/py-pylast/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Python interface to Last.fm and Libre.fm
 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
diff --git a/audio/py-pyliblo/Makefile b/audio/py-pyliblo/Makefile
index 22fbd1a45f7f..e31bc17f43fd 100644
--- a/audio/py-pyliblo/Makefile
+++ b/audio/py-pyliblo/Makefile
@@ -14,12 +14,11 @@ COMMENT=	Python wrapper for the Liblo OSC Library
 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:
diff --git a/audio/py-pysndfile/Makefile b/audio/py-pysndfile/Makefile
index 86811de18ae9..4d111ef6ac8f 100644
--- a/audio/py-pysndfile/Makefile
+++ b/audio/py-pysndfile/Makefile
@@ -11,13 +11,12 @@ COMMENT=	Cython wrapper class for reading/writing soundfiles using libsndfile
 
 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
diff --git a/audio/py-soundcloud/Makefile b/audio/py-soundcloud/Makefile
index 51a2f4bdab75..62578f868c8f 100644
--- a/audio/py-soundcloud/Makefile
+++ b/audio/py-soundcloud/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A friendly wrapper library for the Soundcloud API
 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
diff --git a/audio/py-soundscrape/Makefile b/audio/py-soundscrape/Makefile
index a4e3abf977e7..8a90113917f4 100644
--- a/audio/py-soundscrape/Makefile
+++ b/audio/py-soundscrape/Makefile
@@ -13,16 +13,16 @@ COMMENT=	SoundCloud downloader in python
 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
diff --git a/audio/py-speechrecognition/Makefile b/audio/py-speechrecognition/Makefile
index 67bc2fd1d028..3a4cdbb5c527 100644
--- a/audio/py-speechrecognition/Makefile
+++ b/audio/py-speechrecognition/Makefile
@@ -16,7 +16,7 @@ GH_ACCOUNT=	Uberi
 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 @@ post-extract:
 .include <bsd.port.pre.mk>
 
 .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 <bsd.port.post.mk>
diff --git a/audio/py-speex/Makefile b/audio/py-speex/Makefile
index 2fa617c33ce1..52442775f11a 100644
--- a/audio/py-speex/Makefile
+++ b/audio/py-speex/Makefile
@@ -13,10 +13,10 @@ DIST_SUBDIR=	python
 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:
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 52479dc7ff1f..aa599215b80e 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Object-oriented Python bindings for the vorbis library
 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
diff --git a/audio/py-xmms2/Makefile b/audio/py-xmms2/Makefile
index 1c68249902c2..a344910b504b 100644
--- a/audio/py-xmms2/Makefile
+++ b/audio/py-xmms2/Makefile
@@ -9,12 +9,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 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
 
diff --git a/audio/py3-mutagen/Makefile b/audio/py3-mutagen/Makefile
deleted file mode 100644
index bce9cac31558..000000000000
--- a/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"
diff --git a/audio/py3-pylast/Makefile b/audio/py3-pylast/Makefile
deleted file mode 100644
index 0210b6f2cac2..000000000000
--- a/audio/py3-pylast/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Kris Moore <kmoore@FreeBSD.org>
-# $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 <bsd.port.mk>
diff --git a/audio/py3-pylast/distinfo b/audio/py3-pylast/distinfo
deleted file mode 100644
index 23aeb56727db..000000000000
--- a/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
diff --git a/audio/py3-pylast/pkg-descr b/audio/py3-pylast/pkg-descr
deleted file mode 100644
index 4049f029cf7d..000000000000
--- a/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/
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index b30fe4d6a3b3..7bd4a4b53dad 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -15,8 +15,8 @@ COMMENT=	Music jukebox written in Python with a curses GUI
 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 @@ PLIST_FILES=	etc/pytonerc.sample
 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
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index a48413c4b7ac..c554cf217b3f 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -69,10 +69,10 @@ MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp \
 			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
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 176f4f8ffc2f..791bf12f4ced 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Elegant music player for MPD
 
 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 @@ OPTIONS_SUB=	yes
 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},' \
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index 4ab9cf227b54..11b89c0f31bb 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Sound conversion application for the GNOME environment
 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