Mark some stuff not available for python and use versioned_dependencies.mk,

so that pbulk can finish a scan again.

4 files changed, 20 insertions, 21 deletions

diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index 600e142fad6..46973d3e666 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/01/30 03:46:18 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/31 19:32:04 wiz Exp $
 
 DISTNAME=	tryton-3.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,17 +14,12 @@ USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	26 # XXX Needs weakrefset. No package, though.
+PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 
 .include "options.mk"
 
-.include "../../lang/python/pyversion.mk"
-
-.if ${PYPACKAGE} == "python27"
-DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-.else
-DEPENDS+=	${PYPKGPREFIX}-dateutil2-[0-9]*:../../time/py-dateutil2
-.endif
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-tryton/options.mk b/devel/py-tryton/options.mk
index 2cdef0cb4c9..0c761654106 100644
--- a/devel/py-tryton/options.mk
+++ b/devel/py-tryton/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/01/30 03:46:18 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2014/01/31 19:32:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-tryton
 PKG_SUPPORTED_OPTIONS=	cdecimal goocalendar pytz simplejson
@@ -7,10 +7,12 @@ PKG_SUGGESTED_OPTIONS+=	cdecimal pytz simplejson
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-cdecimal not available because obsolete
 DEPENDS+=		${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
 .if !empty(PKG_OPTIONS:Mgoocalendar)
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-goocanvas via py-goocalendar
 DEPENDS+=		${PYPKGPREFIX}-goocalendar-[0-9]*:../../time/py-goocalendar
 .endif
 
diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile
index c72fe3cf056..897fac6d946 100644
--- a/devel/py-trytond/Makefile
+++ b/devel/py-trytond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/01/31 12:30:50 rodent Exp $
+# $NetBSD: Makefile,v 1.2 2014/01/31 19:32:04 wiz Exp $
 
 DISTNAME=	trytond-3.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,6 +10,11 @@ HOMEPAGE=	http://www.tryton.org/
 COMMENT=	Server of the Tryton application platform
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-python-sql>=0.2:../../databases/py-python-sql
+DEPENDS+=	${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
+DEPENDS+=	${PYPKGPREFIX}-relatorio>=0.2.0:../../textproc/py-relatorio
+DEPENDS+=	${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml
+
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	trytond/tests/test_access.py trytond/tests/test_cache.py
@@ -27,18 +32,11 @@ REPLACE_PYTHON+=	trytond/tests/test_transaction.py
 REPLACE_PYTHON+=	trytond/tests/test_trigger.py
 REPLACE_PYTHON+=	trytond/tests/test_tryton.py
 
+PYTHON_VERSIONED_DEPENDENCIES=	dateutil
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-pycha via py-relatorio
+
 .include "options.mk"
 
-DEPENDS+=	${PYPKGPREFIX}-python-sql>=0.2:../../databases/py-python-sql
-DEPENDS+=	${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
-.include "../../lang/python/pyversion.mk"
-.if ${PYPACKAGE} == "python27"
-DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-.else
-DEPENDS+=	${PYPKGPREFIX}-dateutil2-[0-9]*:../../time/py-dateutil2
-.endif
-DEPENDS+=	${PYPKGPREFIX}-relatorio>=0.2.0:../../textproc/py-relatorio
-DEPENDS+=	${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-trytond/options.mk b/devel/py-trytond/options.mk
index 4f2500520e4..db56c2c06e8 100644
--- a/devel/py-trytond/options.mk
+++ b/devel/py-trytond/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/01/31 12:30:50 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2014/01/31 19:32:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-trytond
 PKG_SUPPORTED_OPTIONS=	cdecimal mysql pydot psycopg pytz simplejson sphinx
@@ -11,14 +11,17 @@ PKG_SUGGESTED_OPTIONS+=	cdecimal psycopg pytz simplejson sphinx
 # XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-cdecimal is obsolete for that version and thus not available
 DEPENDS+=		${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.2.3
 DEPENDS+=		${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
 .endif
 
 .if !empty(PKG_OPTIONS:Mpydot)
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.0.28
 DEPENDS+=		${PYPKGPREFIX}-dot-[0-9]*:../../graphics/py-dot
 .endif
 
@@ -39,5 +42,6 @@ DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .endif
 
 .if !empty(PKG_OPTIONS:Mwebdav)
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 0.9.8
 DEPENDS+=		${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav
 .endif