Update for python25 removal.

5 files changed, 7 insertions, 15 deletions

diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile
index a84178cd9e3..23bd7e492a6 100644
--- a/x11/py-Xlib/Makefile
+++ b/x11/py-Xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/04/08 19:09:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2012/10/03 22:14:03 wiz Exp $
 
 DISTNAME=	python-xlib-0.14
 PKGNAME=	${PYPKGPREFIX}-Xlib-0.14
@@ -14,8 +14,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYTHON_VERSIONS_INCLUDE_3X=	yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=	25
-
 EGG_NAME=	python_xlib-0.12
 
 .include "../../lang/python/distutils.mk"
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index f4237561cb3..dd40f525a56 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2012/10/02 17:12:18 tron Exp $
+# $NetBSD: Makefile,v 1.68 2012/10/03 22:14:03 wiz Exp $
 #
 
 DISTNAME=	gnome-python-desktop-2.32.0
@@ -23,13 +23,12 @@ USE_TOOLS+=	pkg-config gmake
 
 PKGCONFIG_OVERRIDE+=	gnome-python-desktop-2.0.pc.in
 
-# The "real" value here is: 27 26 25
+# The "real" value here is: 27 26
 # but because of single-version deps of gnome bits this will only
 # ever work for the python version those gnome bits were built with.
-PYTHON_VERSIONS_REALLY_ACCEPTED=27 26 25
+PYTHON_VERSIONS_REALLY_ACCEPTED=27 26
 PYTHON_VERSIONS_ACCEPTED=	${PYTHON_VERSION_DEFAULT:M27}
 PYTHON_VERSIONS_ACCEPTED+=	${PYTHON_VERSION_DEFAULT:M26}
-PYTHON_VERSIONS_ACCEPTED+=	${PYTHON_VERSION_DEFAULT:M25}
 
 .include "options.mk"
 
diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index 185d6f494ea..ed560205eeb 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/02 17:12:18 tron Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/03 22:14:04 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-kde4-${_KDE_VERSION}
 DISTNAME=	pykde4-${_KDE_VERSION}
@@ -12,8 +12,6 @@ COMMENT=	Python bindings for the KDE integrated X11 desktop
 
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	25
-
 PY_PATCHPLIST=			yes
 PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index c9af327797d..37afdc6551e 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/02 17:12:18 tron Exp $
+# $NetBSD: Makefile,v 1.23 2012/10/03 22:14:04 wiz Exp $
 #
 
 DISTNAME=	QScintilla-gpl-2.6.2
@@ -14,8 +14,6 @@ LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_INCOMPATIBLE+=	25
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 
 USE_LIBTOOL=		yes
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index 68e80a0ae32..00a73a026ae 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2012/10/02 17:12:18 tron Exp $
+# $NetBSD: Makefile,v 1.55 2012/10/03 22:14:04 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
 PYQT_VERSION=	4.9.4
@@ -27,7 +27,6 @@ INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
 PY_PATCHPLIST=		yes
 PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-PYTHON_VERSIONS_INCOMPATIBLE=	25
 PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 BUILDLINK_TRANSFORM+=	rm:-Wl,-R${WRKSRC}/qpy/QtCore