summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz>2014-01-25 10:29:56 +0000
committerwiz <wiz>2014-01-25 10:29:56 +0000
commitf86d461178033174903bd0d6031d959e38e12ac0 (patch)
tree3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /audio
parentf64235a49f032dacf7612c1aa33f6ac70a2eb44d (diff)
downloadpkgsrc-f86d461178033174903bd0d6031d959e38e12ac0.tar.gz
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a dependency isn't. This is annotated by PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z or PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar respectively, please use the same style for other packages, and check during updates. Use versioned_dependencies.mk where applicable. Use REPLACE_PYTHON instead of handcoded alternatives, where applicable. Reorder Makefile sections into standard order, where applicable. Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default with the next commit. Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'audio')
-rw-r--r--audio/aubio/Makefile4
-rw-r--r--audio/csound5/Makefile5
-rw-r--r--audio/exaile/Makefile5
-rw-r--r--audio/moss/Makefile4
-rw-r--r--audio/mutagen-tools/Makefile8
-rw-r--r--audio/picard/Makefile5
-rw-r--r--audio/py-acoustid/Makefile10
-rw-r--r--audio/py-beets/Makefile5
-rw-r--r--audio/py-cddb/Makefile5
-rw-r--r--audio/py-discogs_client/Makefile6
-rw-r--r--audio/py-id3/Makefile4
-rw-r--r--audio/py-id3lib/Makefile5
-rw-r--r--audio/py-karaoke/Makefile5
-rw-r--r--audio/py-last/Makefile4
-rw-r--r--audio/py-mad/Makefile5
-rw-r--r--audio/py-musicbrainz-ngs/Makefile3
-rw-r--r--audio/py-musicbrainz/Makefile9
-rw-r--r--audio/py-musique/Makefile4
-rw-r--r--audio/py-mutagen/Makefile4
-rw-r--r--audio/py-ogg/Makefile5
-rw-r--r--audio/py-vorbis/Makefile6
-rw-r--r--audio/quodlibet2/Makefile4
-rw-r--r--audio/rhythmbox-gtk3/Makefile5
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--audio/solfege/Makefile4
-rw-r--r--audio/sonata/Makefile5
-rw-r--r--audio/streamtuner/options.mk3
-rw-r--r--audio/tunapie/Makefile5
28 files changed, 79 insertions, 63 deletions
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index acda5a09d14..d91d2421b9f 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/02/09 22:11:31 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:56 wiz Exp $
DISTNAME= aubio-0.3.2
PKGREVISION= 2
@@ -20,6 +19,7 @@ PKGCONFIG_OVERRIDE+= aubio.pc.in
# Python related variables:
PY_PATCHPLIST= yes
PYTHON_PATCH_SCRIPTS= python/aubiocut python/aubiopitch
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2
.include "options.mk"
diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile
index 5c8f0bc730c..cb3ed3fc002 100644
--- a/audio/csound5/Makefile
+++ b/audio/csound5/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/01/09 16:55:16 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.29 2014/01/25 10:29:56 wiz Exp $
DISTNAME= Csound${CSOUND_VERSION}_src
PKGNAME= csound5-${CSOUND_VERSION}
@@ -26,6 +25,8 @@ SCONS_ARGS+= useALSA=0 useJack=0 useOSC=0 usePortMIDI=0
SCONS_ARGS+= usePortAudio=0
SCONS_ARGS+= buildInterfaces=0
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 5.01
+
INSTALLATION_DIRS= bin
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 692f46bc5ad..74c42b1ab7a 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/10/10 14:41:58 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:56 wiz Exp $
DISTNAME= exaile_0.2.14
PKGNAME= ${DISTNAME:S/_/-/1}
@@ -18,6 +17,8 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config gmake intltool msgfmt
PYTHON_PATCH_SCRIPTS= exaile.py
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen, py-sqlite2, py-gtk2, py-gstreamer0.10
+
MAKE_ENV+= PYTHONBIN=${PYTHONBIN}
MAKE_FLAGS+= PKGLOCALEDIR=${PKGLOCALEDIR}
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index a620901a6f7..111ec626675 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/02 23:47:58 asau Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/25 10:29:56 wiz Exp $
DISTNAME= moss-0.1.13
PKGREVISION= 6
@@ -12,6 +12,8 @@ COMMENT= MP3/OGG Streaming Server
DEPENDS+= ${PYPKGPREFIX}-ogg>=1.3:../../audio/py-ogg
DEPENDS+= ${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ogg, py-vorbis
+
PYTHON_PATCH_SCRIPTS= ${WRKSRC}/*.py
RCD_SCRIPTS= moss
diff --git a/audio/mutagen-tools/Makefile b/audio/mutagen-tools/Makefile
index a79ef1f6e25..1d69c0e7617 100644
--- a/audio/mutagen-tools/Makefile
+++ b/audio/mutagen-tools/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/12/04 16:48:21 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.3 2014/01/25 10:29:56 wiz Exp $
DISTNAME= mutagen-1.22
PKGNAME= mutagen-tools-1.22
@@ -11,10 +10,11 @@ HOMEPAGE= http://code.google.com/p/mutagen/
COMMENT= Audio metadata handling for Python
LICENSE= gnu-gpl-v2
+DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+
USE_LANGUAGES= # none
PY_NO_EGG= yes
-
-DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.22
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index d14139730cc..2ca34f8d08d 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/08/21 15:39:43 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.19 2014/01/25 10:29:56 wiz Exp $
DISTNAME= picard-1.2
CATEGORIES= audio
@@ -16,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-mutagen>=1.20:../../audio/py-mutagen
USE_LANGUAGES= c c++
USE_TOOLS+= msgfmt pkg-config
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen
+
HAS_CONFIGURE= yes
CONFIG_SHELL= ${PYTHONBIN}
CONFIGURE_SCRIPT= setup.py
diff --git a/audio/py-acoustid/Makefile b/audio/py-acoustid/Makefile
index b38c272b216..e4788fd9c93 100644
--- a/audio/py-acoustid/Makefile
+++ b/audio/py-acoustid/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/04/02 10:44:41 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:56 wiz Exp $
DISTNAME= v1.0.0
PKGNAME= ${PYPKGPREFIX}-acoustid-1.0.0
@@ -12,12 +11,13 @@ HOMEPAGE= https://github.com/sampsyo/pyacoustid
COMMENT= Audio fingerprinting
LICENSE= mit
+DEPENDS+= ${PYPKGPREFIX}-audioread-[0-9]*:../../audio/py-audioread
+DEPENDS+= chromaprint-[0-9]*:../../audio/chromaprint
+
WRKSRC= ${WRKDIR}/pyacoustid-1.0.0
USE_LANGUAGES= # none
EGG_NAME= pyacoustid-1.0.0
-
-DEPENDS+= ${PYPKGPREFIX}-audioread-[0-9]*:../../audio/py-audioread
-DEPENDS+= chromaprint-[0-9]*:../../audio/chromaprint
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.0
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-beets/Makefile b/audio/py-beets/Makefile
index 567a6dd8e43..57a8cec2519 100644
--- a/audio/py-beets/Makefile
+++ b/audio/py-beets/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/01/15 16:17:23 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.9 2014/01/25 10:29:56 wiz Exp $
DISTNAME= v1.3.2
PKGNAME= beets-${DISTNAME:S/v//}
@@ -20,6 +19,8 @@ DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
DEPENDS+= ${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen
+
.include "../../lang/python/pyversion.mk"
.if empty(PYPKGPREFIX:Mpy27)
DEPENDS+= ${PYPKGPREFIX}-ordereddict-[0-9]*:../../devel/py-ordereddict
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index 76dbadf0169..0b1e53bd917 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 23:48:05 asau Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:56 wiz Exp $
DISTNAME= CDDB-1.4
PKGNAME= ${PYPKGPREFIX}-cddb-1.4
@@ -12,5 +11,7 @@ HOMEPAGE= http://cddb-py.sourceforge.net/
COMMENT= Python module to access the CDDB online database
LICENSE= gnu-gpl-v2
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4
+
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-discogs_client/Makefile b/audio/py-discogs_client/Makefile
index 03cf38d793e..0c01dae297b 100644
--- a/audio/py-discogs_client/Makefile
+++ b/audio/py-discogs_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/08/21 15:26:56 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:56 wiz Exp $
DISTNAME= v1.1.1
PKGNAME= ${PYPKGPREFIX}-discogs_client-1.1.1
@@ -11,11 +11,13 @@ HOMEPAGE= https://github.com/discogs/discogs_client/
COMMENT= Python Client for the Discogs API
LICENSE= modified-bsd
+DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+
WRKSRC= ${WRKDIR}/discogs_client-1.1.1
USE_LANGUAGES= # none
EGG_NAME= discogs_client-1.1.1
-DEPENDS+= ${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
+PYTHON_VERSIONS_INCOMPATIBLE= 33
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile
index 259ae9764a5..30ce4687fad 100644
--- a/audio/py-id3/Makefile
+++ b/audio/py-id3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/02 23:48:05 asau Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/25 10:29:56 wiz Exp $
DISTNAME= id3-py_1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py_//}
@@ -16,5 +16,7 @@ USE_LANGUAGES= # empty
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
EGG_NAME= ${DISTNAME:S/py_//:tu}
+PYTHON_VERSIONS_INCOMPATIBLE= 33
+
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-id3lib/Makefile b/audio/py-id3lib/Makefile
index 6171adbdfef..6631580778a 100644
--- a/audio/py-id3lib/Makefile
+++ b/audio/py-id3lib/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/02 23:48:05 asau Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/01/25 10:29:56 wiz Exp $
DISTNAME= pyid3lib-0.5.1
PKGNAME= ${PYPKGPREFIX}-id3lib-0.5.1
@@ -15,6 +14,8 @@ LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= c c++
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5.1
+
.include "../../lang/python/distutils.mk"
.include "../../audio/id3lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 6be7f5ae9e1..defd4a3145b 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/10/24 12:32:38 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.27 2014/01/25 10:29:57 wiz Exp $
DISTNAME= pykaraoke-0.7.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -19,6 +18,8 @@ DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
DEPENDS+= ${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
DEPENDS+= ${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-Numeric, py-wxWidgets, py-mutagen
+
REPLACE_PYTHON+= performer_prompt.py
REPLACE_PYTHON+= pycdg.py
REPLACE_PYTHON+= pykar.py
diff --git a/audio/py-last/Makefile b/audio/py-last/Makefile
index 0ac25f461c6..828bf91661b 100644
--- a/audio/py-last/Makefile
+++ b/audio/py-last/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/03 22:14:00 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:57 wiz Exp $
DISTNAME= pylast-0.5.11
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,7 +11,6 @@ COMMENT= Python interface to Last.fm
LICENSE= apache-2.0
USE_LANGUAGES= # none
-PYTHON_VERSIONS_INCLUDE_3X= yes
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index daad1b18b74..2c0ba3d35d2 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/02 23:48:06 asau Exp $
-#
+# $NetBSD: Makefile,v 1.15 2014/01/25 10:29:57 wiz Exp $
DISTNAME= pymad-0.6
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -17,6 +16,8 @@ CONFIG_SHELL= ${PYTHONBIN}
CONFIGURE_SCRIPT= config_unix.py
CONFIGURE_ARGS+= --prefix ${PREFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6
+
.include "../../audio/libmad/buildlink3.mk"
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-musicbrainz-ngs/Makefile b/audio/py-musicbrainz-ngs/Makefile
index 9f1a9633aa5..29ec8df7943 100644
--- a/audio/py-musicbrainz-ngs/Makefile
+++ b/audio/py-musicbrainz-ngs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/12 20:25:18 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/25 10:29:57 wiz Exp $
DISTNAME= v0.4
PKGNAME= ${PYPKGPREFIX}-musicbrainz-ngs-0.4
@@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
WRKSRC= ${WRKDIR}/python-musicbrainz-ngs-0.4
DIST_SUBDIR= py-musicbrainz-ngs
-PYTHON_VERSIONS_INCLUDE_3X= yes
EGG_NAME= musicbrainzngs-0.4
do-test:
diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile
index eefc0f21bd6..be8fb53b3a5 100644
--- a/audio/py-musicbrainz/Makefile
+++ b/audio/py-musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/04 00:22:00 cheusov Exp $
+# $NetBSD: Makefile,v 1.12 2014/01/25 10:29:57 wiz Exp $
DISTNAME= python-musicbrainz2-0.4.1
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -11,12 +11,11 @@ HOMEPAGE= http://musicbrainz.org/doc/PythonMusicBrainz2
COMMENT= Python interface to the MusicBrainz XML web service
LICENSE= modified-bsd
-PYTHON_SELF_CONFLICT= yes
-
-.include "../../lang/python/pyversion.mk"
-
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+PYTHON_SELF_CONFLICT= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33
+
EGG_NAME= ${DISTNAME:S/-/_/}
.include "../../audio/libdiscid/buildlink3.mk"
diff --git a/audio/py-musique/Makefile b/audio/py-musique/Makefile
index d2b4373d0a2..76f8799b9f9 100644
--- a/audio/py-musique/Makefile
+++ b/audio/py-musique/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2013/10/10 14:42:00 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:57 wiz Exp $
DISTNAME= pymusique-0.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -24,6 +23,7 @@ DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted, py-mcrypt, py-gtk2
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index 5b8091385c3..31329421dee 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/12/04 16:47:32 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $
DISTNAME= mutagen-1.22
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,6 +11,7 @@ COMMENT= Audio metadata handling for Python
LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.22
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index 662b0e503de..f44c9a15f98 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/02 23:48:06 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $
DISTNAME= pyogg-1.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -17,6 +16,8 @@ CONFIG_SHELL= ${PYTHONBIN}
CONFIGURE_SCRIPT= config_unix.py
CONFIGURE_ARGS+= --prefix ${PREFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.3
+
.include "../../lang/python/distutils.mk"
.include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 4c07a0a4feb..1b93f5d4d74 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/02 23:48:06 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2014/01/25 10:29:57 wiz Exp $
DISTNAME= pyvorbis-1.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION= 2
+PKGREVISION= 2
CATEGORIES= audio python
MASTER_SITES= http://vorbis.com/files/1.0.1/unix/py/
@@ -13,6 +12,7 @@ COMMENT= Python bindings for Vorbis library
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ogg, and itself not ported as of 1.3
HAS_CONFIGURE= yes
CONFIG_SHELL= ${PYTHONBIN}
diff --git a/audio/quodlibet2/Makefile b/audio/quodlibet2/Makefile
index e9b1ab52afb..723be196b6a 100644
--- a/audio/quodlibet2/Makefile
+++ b/audio/quodlibet2/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/11/23 13:58:13 drochner Exp $
-#
+# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:57 wiz Exp $
DISTNAME= quodlibet-2.6.3
CATEGORIES= audio
@@ -20,6 +19,7 @@ USE_PKGLOCALEDIR= yes
#BUILD_TARGET= _trayicon.so _mmkeys.so
PYDISTUTILSPKG= yes
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen, py-gtk2, py-gstreamer0.10
PYTHON_PATCH_SCRIPTS= exfalso.py quodlibet.py operon.py
.include "../../devel/py-gobject/buildlink3.mk"
diff --git a/audio/rhythmbox-gtk3/Makefile b/audio/rhythmbox-gtk3/Makefile
index 7a57ba9a521..a24d638e182 100644
--- a/audio/rhythmbox-gtk3/Makefile
+++ b/audio/rhythmbox-gtk3/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/01/01 11:52:09 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:57 wiz Exp $
DISTNAME= rhythmbox-2.99.1
PKGREVISION= 9
@@ -22,6 +21,8 @@ CONFIGURE_ARGS+= --disable-browser-plugin
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --disable-fm-radio
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gstreamer0.10
+
# option?
.include "../../net/grilo/buildlink3.mk"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index dd235977ca5..f2738f878cc 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2014/01/01 11:52:09 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.117 2014/01/25 10:29:57 wiz Exp $
DISTNAME= rhythmbox-0.12.8
PKGREVISION= 35
@@ -24,6 +23,8 @@ CONFIGURE_ARGS+= --disable-fm-radio
GCONF_SCHEMAS= rhythmbox.schemas
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gstreamer0.10
+
.include "../../lang/python/application.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 80c6071ab81..16808c3cc77 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2013/10/10 14:42:00 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.48 2014/01/25 10:29:57 wiz Exp $
DISTNAME= solfege-3.14.1
PKGREVISION= 22
@@ -27,6 +26,7 @@ USE_TOOLS+= gmake gm4 makeinfo pkg-config msgfmt bash:run
REPLACE_BASH= lesson-files/bin/csound-play-harmonic-interval.sh
PYTHON_PATCH_SCRIPTS= *.py *.py.in */*.py */*.py.in
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2
SUBST_CLASSES+= sound
SUBST_STAGE.sound= do-configure
diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index 1118c3bca7a..c5ebeba015b 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2013/10/10 14:42:00 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.39 2014/01/25 10:29:57 wiz Exp $
EGG_NAME= Sonata-1.6.2.1
DISTNAME= ${EGG_NAME:tl}
@@ -16,6 +15,8 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-SOAPpy-[0-9]*:../../net/py-soappy
DEPENDS+= ${PYPKGPREFIX}-mpd-[0-9]*:../../audio/py-mpd
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml via py-soappy, py-gtk2
+
USE_TOOLS+= pkg-config msgfmt
SUBST_CLASSES+= mandir
diff --git a/audio/streamtuner/options.mk b/audio/streamtuner/options.mk
index 5e47d362531..2ba0af1bb8a 100644
--- a/audio/streamtuner/options.mk
+++ b/audio/streamtuner/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/04/12 22:42:58 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2014/01/25 10:29:57 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.streamtuner
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --disable-xiph
.if !empty(PKG_OPTIONS:Mpython)
PLIST.python= yes
CONFIGURE_ARGS+= --enable-python
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2
. include "../../x11/py-gtk2/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-python
diff --git a/audio/tunapie/Makefile b/audio/tunapie/Makefile
index f803808df21..057463463ff 100644
--- a/audio/tunapie/Makefile
+++ b/audio/tunapie/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 23:48:12 asau Exp $
-#
+# $NetBSD: Makefile,v 1.17 2014/01/25 10:29:57 wiz Exp $
DISTNAME= tunapie-2.1.18
PKGREVISION= 1
@@ -13,6 +12,8 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets
+
USE_LANGUAGES= # none
SUBST_CLASSES+= fixpaths