py-tryton*: put python-2.7 restriction only in those packages where it belongs

(and the meta package)

Fix PLIST for py-trytond for all python versions.

16 files changed, 40 insertions, 32 deletions

diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index 5f413f9ae06..892baf9c275 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2020/03/10 22:09:39 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2020/03/13 20:20:48 wiz Exp $
 TRYTON_MODULE_NAME=	tryton
 PKGREVISION= 9
 .include "../../devel/py-trytond/Makefile.common"
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		# none
 
-PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_VERSIONS_ACCEPTED=	27 # py-gtk2
 
 .include "options.mk"
 
diff --git a/devel/py-trytond/Makefile.common b/devel/py-trytond/Makefile.common
index 7baf50a5e1b..2a357356811 100644
--- a/devel/py-trytond/Makefile.common
+++ b/devel/py-trytond/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.17 2019/11/03 10:18:30 rillig Exp $
+# $NetBSD: Makefile.common,v 1.18 2020/03/13 20:20:48 wiz Exp $
 
-# used by databases/py-ldap-authentication/Makefile
+# used by databases/py-trytond-ldap-authentication
 # used by devel/py-proteus/Makefile
 # used by devel/py-tryton/Makefile
 # used by devel/py-trytond/Makefile
@@ -255,7 +255,6 @@ MASTER_SITES=	${TRYTON_SITES}
 
 DIST_SUBDIR=	tryton-${TRYTON_BASEVER}
 
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2 via py-pycha via py-relatorio
 # predefine these so modules don't have to.
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/devel/py-trytond/PLIST b/devel/py-trytond/PLIST
index d653d052c81..9fa0b190ae4 100644
--- a/devel/py-trytond/PLIST
+++ b/devel/py-trytond/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/12/04 21:12:59 rodent Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/03/13 20:20:48 wiz Exp $
 bin/trytond-admin${PYVERSSUFFIX}
 bin/trytond-cron${PYVERSSUFFIX}
 bin/trytond${PYVERSSUFFIX}
@@ -674,6 +674,6 @@ ${PYSITELIB}/trytond/wizard/wizard.pyo
 ${PYSITELIB}/trytond/wsgi.py
 ${PYSITELIB}/trytond/wsgi.pyc
 ${PYSITELIB}/trytond/wsgi.pyo
-share/examples/py27-trytond/logging.conf.example
-share/examples/py27-trytond/trytond.conf.example
-@pkgdir share/py27-trytond
+share/examples/${PYPKGPREFIX}-trytond/logging.conf.example
+share/examples/${PYPKGPREFIX}-trytond/trytond.conf.example
+@pkgdir share/${PYPKGPREFIX}-trytond
diff --git a/finance/py-trytond-account-payment-sepa/Makefile b/finance/py-trytond-account-payment-sepa/Makefile
index c3aeb5e44e6..ccc707ba017 100644
--- a/finance/py-trytond-account-payment-sepa/Makefile
+++ b/finance/py-trytond-account-payment-sepa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/18 23:30:54 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/03/13 20:20:48 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_account_payment_sepa
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	finance python
@@ -18,8 +18,6 @@ DEPENDS+=	${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml
 
 REPLACE_PYTHON+=	tests/test_account_payment_sepa.py
 
-PYTHON_VERSIONS_ACCEPTED=	27 # py-simplesoap via py-stdnum and py-trytond-bank
-
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff --git a/finance/py-trytond-bank/Makefile b/finance/py-trytond-bank/Makefile
index a6ee958d15d..a3e646b288d 100644
--- a/finance/py-trytond-bank/Makefile
+++ b/finance/py-trytond-bank/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/18 23:30:56 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/13 20:20:49 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_bank
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	finance python
@@ -16,7 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=		tests/test_bank.py
-PYTHON_VERSIONS_ACCEPTED=	27 # py-simplesoap via py-stdnum
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/finance/py-vatnumber/Makefile b/finance/py-vatnumber/Makefile
index 55f6bd51e3f..3b38c04937d 100644
--- a/finance/py-vatnumber/Makefile
+++ b/finance/py-vatnumber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/11/02 16:08:48 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2020/03/13 20:20:49 wiz Exp $
 
 DISTNAME=		vatnumber-1.2
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,5 @@ LICENSE=		gnu-gpl-v3
 
 DEPENDS+=		${PYPKGPREFIX}-stdnum-[0-9]*:../../misc/py-stdnum
 
-PYTHON_VERSIONS_ACCEPTED=	27 # py-simplesoap via py-stdnum
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile
index 639755feb32..094072c0a34 100644
--- a/mail/newspipe/Makefile
+++ b/mail/newspipe/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:32:48 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.18 2020/03/13 20:20:49 wiz Exp $
 
 DISTNAME=		newspipe.1.1.9
 PKGNAME=		${DISTNAME:S/./-/}
@@ -14,10 +13,11 @@ COMMENT=		Read RSS/Atom feeds as email messages
 
 DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 DEPENDS+=		${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser
-DEPENDS+=		${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
 
 WRKSRC=			${WRKDIR}
 
+PYTHON_VERSIONED_DEPENDENCIES=	html2text
+
 NO_BUILD=	yes
 REPLACE_PYTHON=	*.py
 
@@ -44,5 +44,6 @@ do-install:
 	${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/examples/newspipe; \
 	done
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/py-tryton-platform/Makefile b/meta-pkgs/py-tryton-platform/Makefile
index 7088c1fe424..1648bff9cfc 100644
--- a/meta-pkgs/py-tryton-platform/Makefile
+++ b/meta-pkgs/py-tryton-platform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/03 19:35:55 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/03/13 20:20:49 wiz Exp $
 #
 DISTNAME=	# empty
 PKGNAME=	${PYPKGPREFIX}-tryton-platform-${TRYTON_BASEVER}
@@ -14,6 +14,8 @@ COMMENT=	Install complete tryton client/server platform
 
 META_PACKAGE=	yes
 
+PYTHON_VERSIONS_ACCEPTED=	27 # some dependencies only for python-2.7 as of 20200313
+
 .include "../../lang/python/pyversion.mk"
 
 DEPENDS+=	${PYPKGPREFIX}-trytond-ldap-authentication>=${TRYTON_BASEVER}:../../databases/py-trytond-ldap-authentication
diff --git a/misc/py-trytond-party-vcarddav/Makefile b/misc/py-trytond-party-vcarddav/Makefile
index cc3db2dde02..a88d492fa54 100644
--- a/misc/py-trytond-party-vcarddav/Makefile
+++ b/misc/py-trytond-party-vcarddav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/18 23:33:05 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/13 20:20:49 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_party_vcarddav
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	misc python
@@ -15,6 +15,8 @@ DEPENDS+=	${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-
 DEPENDS+=	${PYPKGPREFIX}-trytond-webdav>=${TRYTON_BASEVER}:../../www/py-trytond-webdav
 DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
+PYTHON_VERSIONS_ACCEPTED=	27 # py-pywebdav
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/application.mk"
diff --git a/misc/py-trytond-party/options.mk b/misc/py-trytond-party/options.mk
index 836e059cbd1..44377ea7e50 100644
--- a/misc/py-trytond-party/options.mk
+++ b/misc/py-trytond-party/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2019/11/03 17:04:26 rillig Exp $
+# $NetBSD: options.mk,v 1.8 2020/03/13 20:20:49 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-trytond-party
 PKG_SUPPORTED_OPTIONS=	vatnumber
@@ -7,6 +7,5 @@ PKG_SUGGESTED_OPTIONS+=	vatnumber
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mvatnumber)
-PYTHON_VERSIONS_ACCEPTED= 27 # py-simplesoap via py-stdnum and py-vatnumber
 DEPENDS+=	${PYPKGPREFIX}-vatnumber-[0-9]*:../../finance/py-vatnumber
 .endif
diff --git a/time/py-trytond-calendar-classification/Makefile b/time/py-trytond-calendar-classification/Makefile
index 62eec9bdb2e..15f84ab8275 100644
--- a/time/py-trytond-calendar-classification/Makefile
+++ b/time/py-trytond-calendar-classification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/01/18 23:35:38 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/13 20:20:49 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_calendar_classification
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	python time
@@ -14,6 +14,8 @@ DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_ACCEPTED=	27 # py-pywebdav via py-trytond-calendar
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/py-trytond-calendar-scheduling/Makefile b/time/py-trytond-calendar-scheduling/Makefile
index 896f5797cc4..c1ee50583d2 100644
--- a/time/py-trytond-calendar-scheduling/Makefile
+++ b/time/py-trytond-calendar-scheduling/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/18 23:35:38 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/13 20:20:50 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_calendar_scheduling
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	python time
@@ -16,6 +16,8 @@ DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_ACCEPTED=	27 # py-pywebdav
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/py-trytond-calendar-todo/Makefile b/time/py-trytond-calendar-todo/Makefile
index 8dcd89eb77d..8d7dac0c2aa 100644
--- a/time/py-trytond-calendar-todo/Makefile
+++ b/time/py-trytond-calendar-todo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/18 23:35:38 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/13 20:20:50 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_calendar_todo
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	python time
@@ -19,6 +19,8 @@ DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_ACCEPTED=	27 # py-pywebdav
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/py-trytond-calendar/Makefile b/time/py-trytond-calendar/Makefile
index 12cc93b1504..bfb753b3fa5 100644
--- a/time/py-trytond-calendar/Makefile
+++ b/time/py-trytond-calendar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/18 23:35:38 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/13 20:20:49 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_calendar
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	python time
@@ -19,6 +19,8 @@ USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	tests/scenario_calendar.py tests/test_calendar.py
 
+PYTHON_VERSIONS_ACCEPTED=	27 # py-pywebdav
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-trytond-web-user/Makefile b/www/py-trytond-web-user/Makefile
index e1e1f192b71..afe5615e251 100644
--- a/www/py-trytond-web-user/Makefile
+++ b/www/py-trytond-web-user/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/01/18 23:35:45 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/13 20:20:50 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_web_user
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	python www
@@ -11,10 +11,12 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-trytond-party>=${TRYTON_BASEVER}:../../misc/py-trytond-party
 DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 DEPENDS+=	${PYPKGPREFIX}-bcrypt-[0-9]*:../../security/py-bcrypt
-DEPENDS+=	${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text
+
+PYTHON_VERSIONED_DEPENDENCIES=	html2text
 
 USE_LANGUAGES=	# none
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-trytond-webdav/Makefile b/www/py-trytond-webdav/Makefile
index 5894b00a806..fdef191f8bc 100644
--- a/www/py-trytond-webdav/Makefile
+++ b/www/py-trytond-webdav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/18 23:35:45 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/13 20:20:50 wiz Exp $
 TRYTON_MODULE_NAME=	trytond_webdav
 .include "../../devel/py-trytond/Makefile.common"
 CATEGORIES=	python www
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav
 DEPENDS+=	${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
-PYTHON_VERSIONS_ACCEPTED=	27
+PYTHON_VERSIONS_ACCEPTED=	27 # py-pywebdav
 
 REPLACE_PYTHON+=	tests/test_webdav.py