Remove python33: adapt all packages that refer to it.

8 files changed, 16 insertions, 18 deletions

diff --git a/multimedia/farsight2/Makefile b/multimedia/farsight2/Makefile
index d418b726f56..ff63f6aa46d 100644
--- a/multimedia/farsight2/Makefile
+++ b/multimedia/farsight2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2016/05/03 11:40:04 prlw1 Exp $
+# $NetBSD: Makefile,v 1.55 2016/07/09 13:03:57 wiz Exp $
 
 DISTNAME=	farsight2-0.0.31
 PKGREVISION=	18
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=	farsight2.pc.in
 # gstreamer-check-0.10 >= 0.10.23 (GStreamer Check unittest Library)
 
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-gtk2, py-gstreamer0.10
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-gtk2, py-gstreamer0.10
 
 .include "../../lang/python/pyversion.mk"
 
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index d8325dbbad9..f3cdf8599d5 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/04/11 19:01:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2016/07/09 13:03:57 wiz Exp $
 
 PKGNAME=	kodi-15.2
 PKGREVISION=	5
@@ -36,7 +36,7 @@ CONFIG_SUB_OVERRIDE=    lib/libmpeg2/.auto/config.sub \
 
 CONFIGURE_ENV+=		ac_cv_path_SWIG_EXE=${PREFIX}/bin/swig2.0
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # insists on < 3.0 as of 15.2
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # insists on < 3.0 as of 15.2
 
 # These need to be ported
 CONFIGURE_ARGS+=	--disable-projectm
diff --git a/multimedia/libkate/options.mk b/multimedia/libkate/options.mk
index 6519c45d198..58591516dae 100644
--- a/multimedia/libkate/options.mk
+++ b/multimedia/libkate/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2015/12/10 11:46:48 markd Exp $
+# $NetBSD: options.mk,v 1.6 2016/07/09 13:03:57 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libkate
 PKG_SUPPORTED_OPTIONS=	debug doc oggz python valgrind vorbis
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--disable-doc
 .if !empty(PKG_OPTIONS:Mpython)
 REPLACE_PYTHON=		tools/KateDJ/KateDJ
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-wxWidgets
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-wxWidgets
 .include "../../x11/py-wxWidgets/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/multimedia/livestreamer/Makefile b/multimedia/livestreamer/Makefile
index ec0fcdf1b1b..6a5222abea4 100644
--- a/multimedia/livestreamer/Makefile
+++ b/multimedia/livestreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/05/12 18:46:33 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/07/09 13:03:57 wiz Exp $
 
 DISTNAME=	livestreamer-1.12.2
 CATEGORIES=	multimedia
@@ -15,12 +15,10 @@ DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 .include "../../lang/python/egg.mk"
 
 .if ${_PYTHON_VERSION} < 30
+DEPENDS+=	${PYPKGPREFIX}-singledispatch-[0-9]*:../../devel/py-singledispatch
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures
 .endif
-.if ${_PYTHON_VERSION} <= 33
-DEPENDS+=	${PYPKGPREFIX}-singledispatch-[0-9]*:../../devel/py-singledispatch
-.endif
 
 EGG_NAME=	${PKGNAME_NOREV}
 
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 670fd4dbe62..a1c83308d12 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2015/12/05 21:25:51 adam Exp $
+# $NetBSD: Makefile,v 1.35 2016/07/09 13:03:57 wiz Exp $
 
 DISTNAME=	pitivi-0.15.2
 PKGREVISION=	7
@@ -17,7 +17,7 @@ USE_TOOLS+=	pkg-config intltool gmake msgfmt
 CONFIGURE_ENV+=	ac_cv_path_PYTHON=${PYTHONBIN}
 REPLACE_PYTHON=	bin/pitivi.in
 PYTHON_VERSIONED_DEPENDENCIES=	cairo
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-gtk2, py-gstreamer0.10
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-gtk2, py-gstreamer0.10
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/multimedia/py-gstreamer0.10/Makefile b/multimedia/py-gstreamer0.10/Makefile
index b75c2bad2ca..6e0be8cae48 100644
--- a/multimedia/py-gstreamer0.10/Makefile
+++ b/multimedia/py-gstreamer0.10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2016/02/25 15:49:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2016/07/09 13:03:57 wiz Exp $
 
 DISTNAME=		gst-python-0.10.22
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer0.10/}
@@ -20,7 +20,7 @@ USE_TOOLS+=		pkg-config gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # not yet ported as of 0.10.22; use py-gobjects
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # not yet ported as of 0.10.22; use py-gobjects
 
 PKGCONFIG_OVERRIDE+=	pkgconfig/gst-python.pc.in
 
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index 6dd3d2c3f3e..9a99a41aab7 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/12/05 21:25:51 adam Exp $
+# $NetBSD: Makefile,v 1.27 2016/07/09 13:03:57 wiz Exp $
 
 .include "../../multimedia/ming/Makefile.common"
 
@@ -15,7 +15,7 @@ PY_PATCHPLIST=		yes
 PYSETUPSUBDIR=		py_ext
 EGG_NAME=		${DISTNAME:S/ming/mingc/}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35
 
 SUBST_CLASSES+=		giflib
 SUBST_STAGE.giflib=	pre-configure
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 240f80b09b4..b6a95282fcc 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.63 2015/12/05 21:25:51 adam Exp $
+# $NetBSD: Makefile.common,v 1.64 2016/07/09 13:03:57 wiz Exp $
 #
 # used by multimedia/totem-browser-plugin/Makefile
 # used by multimedia/totem-nautilus/Makefile
@@ -28,7 +28,7 @@ GCONF_SCHEMAS+=	totem-video-thumbnail.schemas
 
 CONFIGURE_ARGS+=	--enable-vala=no
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # py-gtk2, py-gdata
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-gtk2, py-gdata
 
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"