Python cleanup:

- USE_PYTHON* = 2.X -> USE_PYTHON* = 2
- USE_PYTHON* = 2.X+ -> USE_PYTHON* = yes
Reviewed by:	python (mva, rm)
Approved by:	portmgr-lurkers (mat)

14 files changed, 14 insertions, 14 deletions

diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 8e50a771b6c8..c68c39ca095d 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -21,7 +21,7 @@ USES=		gmake pathfix
 USE_BZIP2=	yes
 USE_DOS2UNIX=	src/plugins/plugins_i18n.py
 USE_GNOME=	pygtk2
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_XORG=	x11 xext xscrnsaver
 MAN1=		gajim.1 gajim-remote.1 gajim-history-manager.1
 
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 832e3f4537f1..e43adb61e610 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl
 		${PYTHON_SITELIBDIR}/farsight.so:${PORTSDIR}/net-im/farsight2
 
 USE_GNOME=	pygobject
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 NO_STAGE=	yes
diff --git a/net-im/pwytter/Makefile b/net-im/pwytter/Makefile
index 035ce4f912b7..5bc1360be96e 100644
--- a/net-im/pwytter/Makefile
+++ b/net-im/pwytter/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_ZIP=	yes
 USES=		gettext
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=	easy_install
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index 12952e3f0a73..e86c853d5a7d 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:${PORTSDIR}/net-im/py-xmpppy
 
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=	yes
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/jabberbot.py  \
diff --git a/net-im/py-skype4py/Makefile b/net-im/py-skype4py/Makefile
index 43d4b33f7251..cc2cf62bb531 100644
--- a/net-im/py-skype4py/Makefile
+++ b/net-im/py-skype4py/Makefile
@@ -16,7 +16,7 @@ LICENSE=	BSD
 PYDISTUTILS_AUTOPLIST=	yes
 
 USE_PYDISTUTILS=	easy_install
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/py-twistedWords/Makefile b/net-im/py-twistedWords/Makefile
index 8a4718fd3279..8f2fb41619cf 100644
--- a/net-im/py-twistedWords/Makefile
+++ b/net-im/py-twistedWords/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twistedCore>=${PORTVERSION}:${PORTSDIR}/de
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=	${PORTNAME:S/twisted/Twisted_/}
 
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 39b7558dfe92..7d20fab14ab8 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -15,7 +15,7 @@ COMMENT=	An xmpp to irc transport
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
 		${PYTHON_PKGNAMEPREFIX}irc>0:${PORTSDIR}/irc/py-irc
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 NO_BUILD=	yes
 FILES=		irc.py jep0106.py jep0133.py test_jep0106.py
 PFILES=		${FILES:S.^.%%PYTHON_SITELIBDIR%%/xmpp/irc/.}
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
index 24a8c5ebc0f5..9653b8abd91b 100644
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ b/net-im/py-xmpppy-yahoo/Makefile
@@ -19,7 +19,7 @@ EJABBERD_DESC=	transport with ejabberd
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:${PORTSDIR}/net-im/py-xmpppy \
 		${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 NO_BUILD=	yes
 FILES=		adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \
 		yahoo_helpers.py avatar.py htmlutils.py migratespool.py toolbox.py \
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index d3bdf4f23de2..436408f1efe0 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	A Python library that provides easy scripting with Jabber
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:${PORTSDIR}/dns/py-dnspython
 
-USE_PYTHON=	2.6+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 NO_STAGE=	yes
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index 91493ac77f3f..074045c99227 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyo
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyon \
     		${PYTHON_SITELIBDIR}/telepathy/__init__.py:${PORTSDIR}/net-im/telepathy-python
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}
 USE_GMAKE=	yes
diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile
index 0ff922a6ef0c..ed158d3d1d64 100644
--- a/net-im/telepathy-logger-qt4/Makefile
+++ b/net-im/telepathy-logger-qt4/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER=	qt4
 USE_KDE4=	# empty
-USE_PYTHON_BUILD=	2.5+
+USE_PYTHON_BUILD=	yes
 USE_QT4=	corelib dbus moc_build qmake_build rcc_build uic_build
 USES=		bison:build cmake pkgconfig
 USE_BZIP2=	yes
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index aae4e7dd329c..2450ef5632dd 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
-USE_PYTHON=		2.5+
+USE_PYTHON=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index c1031a162d04..318b0fa3f8f3 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libtelepathy-farsight.so:${PORTSDIR}/net-im/telepathy-farsight \
 
 USE_GNOME=	libxslt:build
 USE_GSTREAMER=	yes
-USE_PYTHON_BUILD=	2.5+
+USE_PYTHON_BUILD=	yes
 USE_QT4=	corelib dbus gui network qtestlib_build xml \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake pkgconfig
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index dd32b117c17f..d4704034b95e 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:${PORTSDIR}/devel/py-notify \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:${PORTSDIR}/devel/py-setproctitle \
 		${PYTHON_PKGNAMEPREFIX}xdg>=0.19:${PORTSDIR}/devel/py-xdg
 
-USE_PYTHON=	-2.7
+USE_PYTHON=	2
 USE_GNOME=	pygobject pygtk2
 USE_GSTREAMER=	python