[pkgsrc/trunk]: pkgsrc py-tryton*: put python-2.7 restriction only in those p...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b5e66efabea
branches:  trunk
changeset: 412955:8b5e66efabea
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Mar 13 20:20:48 2020 +0000

description:
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.

diffstat:

 devel/py-tryton/Makefile                         |  4 ++--
 devel/py-trytond/Makefile.common                 |  5 ++---
 devel/py-trytond/PLIST                           |  8 ++++----
 finance/py-trytond-account-payment-sepa/Makefile |  4 +---
 finance/py-trytond-bank/Makefile                 |  3 +--
 finance/py-vatnumber/Makefile                    |  4 +---
 mail/newspipe/Makefile                           |  7 ++++---
 meta-pkgs/py-tryton-platform/Makefile            |  4 +++-
 misc/py-trytond-party-vcarddav/Makefile          |  4 +++-
 misc/py-trytond-party/options.mk                 |  3 +--
 time/py-trytond-calendar-classification/Makefile |  4 +++-
 time/py-trytond-calendar-scheduling/Makefile     |  4 +++-
 time/py-trytond-calendar-todo/Makefile           |  4 +++-
 time/py-trytond-calendar/Makefile                |  4 +++-
 www/py-trytond-web-user/Makefile                 |  6 ++++--
 www/py-trytond-webdav/Makefile                   |  4 ++--
 16 files changed, 40 insertions(+), 32 deletions(-)

diffs (truncated from 304 to 300 lines):

diff -r 97eb280821a5 -r 8b5e66efabea devel/py-tryton/Makefile
--- a/devel/py-tryton/Makefile  Fri Mar 13 19:21:16 2020 +0000
+++ b/devel/py-tryton/Makefile  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 USE_LANGUAGES=         # none
 
-PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_VERSIONS_ACCEPTED=      27 # py-gtk2
 
 .include "options.mk"
 
diff -r 97eb280821a5 -r 8b5e66efabea devel/py-trytond/Makefile.common
--- a/devel/py-trytond/Makefile.common  Fri Mar 13 19:21:16 2020 +0000
+++ b/devel/py-trytond/Makefile.common  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea devel/py-trytond/PLIST
--- a/devel/py-trytond/PLIST    Fri Mar 13 19:21:16 2020 +0000
+++ b/devel/py-trytond/PLIST    Fri Mar 13 20:20:48 2020 +0000
@@ -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/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 -r 97eb280821a5 -r 8b5e66efabea finance/py-trytond-account-payment-sepa/Makefile
--- a/finance/py-trytond-account-payment-sepa/Makefile  Fri Mar 13 19:21:16 2020 +0000
+++ b/finance/py-trytond-account-payment-sepa/Makefile  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea finance/py-trytond-bank/Makefile
--- a/finance/py-trytond-bank/Makefile  Fri Mar 13 19:21:16 2020 +0000
+++ b/finance/py-trytond-bank/Makefile  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 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 -r 97eb280821a5 -r 8b5e66efabea finance/py-vatnumber/Makefile
--- a/finance/py-vatnumber/Makefile     Fri Mar 13 19:21:16 2020 +0000
+++ b/finance/py-vatnumber/Makefile     Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea mail/newspipe/Makefile
--- a/mail/newspipe/Makefile    Fri Mar 13 19:21:16 2020 +0000
+++ b/mail/newspipe/Makefile    Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 97eb280821a5 -r 8b5e66efabea meta-pkgs/py-tryton-platform/Makefile
--- a/meta-pkgs/py-tryton-platform/Makefile     Fri Mar 13 19:21:16 2020 +0000
+++ b/meta-pkgs/py-tryton-platform/Makefile     Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea misc/py-trytond-party-vcarddav/Makefile
--- a/misc/py-trytond-party-vcarddav/Makefile   Fri Mar 13 19:21:16 2020 +0000
+++ b/misc/py-trytond-party-vcarddav/Makefile   Fri Mar 13 20:20:48 2020 +0000
@@ -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-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 -r 97eb280821a5 -r 8b5e66efabea misc/py-trytond-party/options.mk
--- a/misc/py-trytond-party/options.mk  Fri Mar 13 19:21:16 2020 +0000
+++ b/misc/py-trytond-party/options.mk  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 .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 -r 97eb280821a5 -r 8b5e66efabea time/py-trytond-calendar-classification/Makefile
--- a/time/py-trytond-calendar-classification/Makefile  Fri Mar 13 19:21:16 2020 +0000
+++ b/time/py-trytond-calendar-classification/Makefile  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea time/py-trytond-calendar-scheduling/Makefile
--- a/time/py-trytond-calendar-scheduling/Makefile      Fri Mar 13 19:21:16 2020 +0000
+++ b/time/py-trytond-calendar-scheduling/Makefile      Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea time/py-trytond-calendar-todo/Makefile
--- a/time/py-trytond-calendar-todo/Makefile    Fri Mar 13 19:21:16 2020 +0000
+++ b/time/py-trytond-calendar-todo/Makefile    Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea time/py-trytond-calendar/Makefile
--- a/time/py-trytond-calendar/Makefile Fri Mar 13 19:21:16 2020 +0000
+++ b/time/py-trytond-calendar/Makefile Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 
 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 -r 97eb280821a5 -r 8b5e66efabea www/py-trytond-web-user/Makefile
--- a/www/py-trytond-web-user/Makefile  Fri Mar 13 19:21:16 2020 +0000
+++ b/www/py-trytond-web-user/Makefile  Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 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 -r 97eb280821a5 -r 8b5e66efabea www/py-trytond-webdav/Makefile
--- a/www/py-trytond-webdav/Makefile    Fri Mar 13 19:21:16 2020 +0000
+++ b/www/py-trytond-webdav/Makefile    Fri Mar 13 20:20:48 2020 +0000
@@ -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 @@
 DEPENDS+=      ${PYPKGPREFIX}-pywebdav-[0-9]*:../../www/py-pywebdav
 DEPENDS+=      ${PYPKGPREFIX}-trytond>=${TRYTON_BASEVER}:../../devel/py-trytond
 
-PYTHON_VERSIONS_ACCEPTED=      27