*: fix some dependencies, mark some packages as not-for-python-2.x

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *: fix some dependencies, mark some packages as not-for-python-2.x
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Mon, 31 Aug 2020 19:24:50 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Aug 31 21:24:50 2020 +0200
Changeset:	aa997fa0cbbe0ea3622f5054f6996c9f2a1533da

Modified Files:
	gnuradio-doxygen/Makefile
	py-Kallithea/Makefile
	py-cysignals/Makefile
	py-easydev/Makefile
	py-fipy/Makefile
	py-launchpadlib/Makefile
	py-math-snappy/Makefile
	py-matrix-synapse/Makefile
	py-nibabel/Makefile
	py-pylons/Makefile
	py-pyphant/Makefile
	py-pysaml2/Makefile
	py-repoze.who/Makefile
	py-setupdocs/Makefile
	py-sphinxreport/Makefile
	py-vdirsyncer-git/Makefile
	py-weberror/Makefile
	pyzor/Makefile
	spyder/Makefile
	thawab/Makefile
	translate-toolkit/options.mk
	wla-dx/options.mk

Log Message:
*: fix some dependencies, mark some packages as not-for-python-2.x

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aa997fa0cbbe0ea3622f5054f6996c9f2a1533da

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnuradio-doxygen/Makefile    | 2 ++
 py-Kallithea/Makefile        | 2 +-
 py-cysignals/Makefile        | 2 ++
 py-easydev/Makefile          | 2 ++
 py-fipy/Makefile             | 2 +-
 py-launchpadlib/Makefile     | 2 ++
 py-math-snappy/Makefile      | 2 ++
 py-matrix-synapse/Makefile   | 2 +-
 py-nibabel/Makefile          | 3 ++-
 py-pylons/Makefile           | 2 +-
 py-pyphant/Makefile          | 2 +-
 py-pysaml2/Makefile          | 2 +-
 py-repoze.who/Makefile       | 2 +-
 py-setupdocs/Makefile        | 9 ++++-----
 py-sphinxreport/Makefile     | 2 ++
 py-vdirsyncer-git/Makefile   | 2 ++
 py-weberror/Makefile         | 2 +-
 pyzor/Makefile               | 2 ++
 spyder/Makefile              | 2 ++
 thawab/Makefile              | 2 +-
 translate-toolkit/options.mk | 1 +
 wla-dx/options.mk            | 1 +
 22 files changed, 35 insertions(+), 15 deletions(-)

diffs:
diff --git a/gnuradio-doxygen/Makefile b/gnuradio-doxygen/Makefile
index 833b8729c2..9ea5651502 100644
--- a/gnuradio-doxygen/Makefile
+++ b/gnuradio-doxygen/Makefile
@@ -6,6 +6,8 @@ COMMENT=	Doxygen documentation of GNU Radio
 .include	"../../wip/gnuradio-core/Makefile.common"
 .include	"../../wip/gnuradio-core/Nocore.mk"
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 BUILD_DEPENDS+=	doxygen>=1.8.15:../../devel/doxygen
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
diff --git a/py-Kallithea/Makefile b/py-Kallithea/Makefile
index a7b8d5a4f2..df8807a083 100644
--- a/py-Kallithea/Makefile
+++ b/py-Kallithea/Makefile
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-PasteDeploy-[0-9]*:../../www/py-PasteDeploy
 DEPENDS+=	${PYPKGPREFIX}-PasteScript-[0-9]*:../../www/py-PasteScript
-DEPENDS+=	${PYPKGPREFIX}-Paste-[0-9]*:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-paste-[0-9]*:../../www/py-paste
 
 DEPENDS+=	${PYPKGPREFIX}-waitress>=0.8.8:../../www/py-waitress
 DEPENDS+=	${PYPKGPREFIX}-WebOb>=1.0.8:../../www/py-WebOb
diff --git a/py-cysignals/Makefile b/py-cysignals/Makefile
index 2fcb84b7cf..56f9e99857 100644
--- a/py-cysignals/Makefile
+++ b/py-cysignals/Makefile
@@ -12,6 +12,8 @@ LICENSE=	gnu-lgpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.8.3:../../textproc/py-sphinx
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 GNU_CONFIGURE=	NO
 
 post-extract:
diff --git a/py-easydev/Makefile b/py-easydev/Makefile
index b850a7f39f..0deaf5fc4c 100644
--- a/py-easydev/Makefile
+++ b/py-easydev/Makefile
@@ -12,6 +12,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.1.3:../../textproc/py-sphinx
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
diff --git a/py-fipy/Makefile b/py-fipy/Makefile
index 2a65583edc..28e166f8e4 100644
--- a/py-fipy/Makefile
+++ b/py-fipy/Makefile
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.0.4:../../textproc/py-sphinx
 #DEPENDS+=	${PYPKGPREFIX}-gist>=1.5.28:../../wip/py-gist
 
-PYTHON_VERSIONS_ACCEPTED=	27 # py-gnuplot
+PYTHON_VERSIONS_ACCEPTED=	27 # py-gnuplot, py-sphinx
 
 USE_LANGUAGES=	# none
 
diff --git a/py-launchpadlib/Makefile b/py-launchpadlib/Makefile
index bbff01d9b7..8f5a5827e3 100644
--- a/py-launchpadlib/Makefile
+++ b/py-launchpadlib/Makefile
@@ -19,5 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-wadllib-[0-9]*:../../wip/py-wadllib
 DEPENDS+=	${PYPKGPREFIX}-lazr.uri-[0-9]*:../../wip/py-lazr.uri
 DEPENDS+=	${PYPKGPREFIX}-lazr.restfulclient-[0-9]*:../../wip/py-lazr.restfulclient
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-keyring
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-math-snappy/Makefile b/py-math-snappy/Makefile
index d9747e7e6b..d7319b7444 100644
--- a/py-math-snappy/Makefile
+++ b/py-math-snappy/Makefile
@@ -15,6 +15,8 @@ LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.2:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 USE_LANGUAGES=	c c++
 
 .include "../../devel/py-cython/buildlink3.mk"
diff --git a/py-matrix-synapse/Makefile b/py-matrix-synapse/Makefile
index b8e0b19ef9..9c989926ab 100644
--- a/py-matrix-synapse/Makefile
+++ b/py-matrix-synapse/Makefile
@@ -30,7 +30,7 @@ DEPENDS+=	${PYPKGPREFIX}-Pillow-[0-9]*:../../graphics/py-Pillow
 DEPENDS+=	${PYPKGPREFIX}-frozendict-[0-9]*:../../devel/py-frozendict
 DEPENDS+=	${PYPKGPREFIX}-unpaddedbase64-[0-9]*:../../devel/py-unpaddedbase64
 DEPENDS+=	${PYPKGPREFIX}-canonicaljson-[0-9]*:../../devel/py-canonicaljson
-DEPENDS+=	${PYPKGPREFIX}-pymacaroons-[0-9]*:../../devel/py-macaroons
+DEPENDS+=	${PYPKGPREFIX}-macaroons-[0-9]*:../../devel/py-macaroons
 #DEPENDS+=	${PYPKGPREFIX}-cryptodomex-[0-9]*:../../wip/py-cryptodomex
 DEPENDS+=	${PYPKGPREFIX}-matrix-angular-sdk-[0-9]*:../../wip/py-matrix-angular-sdk
 DEPENDS+=	${PYPKGPREFIX}-pydenticon-[0-9]*:../../wip/py-pydenticon
diff --git a/py-nibabel/Makefile b/py-nibabel/Makefile
index 1948a3baae..aefc8ae94c 100644
--- a/py-nibabel/Makefile
+++ b/py-nibabel/Makefile
@@ -11,7 +11,8 @@ COMMENT=	Access a multitude of neuroimaging data formats
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-nose>=0.11.3:../../devel/py-nose
-DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.0.7:../../textproc/py-sphinx
+# not for python 2.x
+#DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.0.7:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-dicom>=0.9.8:../../wip/py-dicom
 
 USE_LANGUAGES=	c
diff --git a/py-pylons/Makefile b/py-pylons/Makefile
index 2dab59fd6a..c98d130200 100644
--- a/py-pylons/Makefile
+++ b/py-pylons/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-cheetah>=2.0.1:../../devel/py-cheetah
 DEPENDS+=	${PYPKGPREFIX}-nose>=0.11.3:../../devel/py-nose
 DEPENDS+=	${PYPKGPREFIX}-WebOb>=0.9.8:../../www/py-WebOb
-DEPENDS+=	${PYPKGPREFIX}-Paste>=1.7.2:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-paste>=1.7.2:../../www/py-paste
 
 USE_PKGLOCALEDIR=		yes
 USE_TOOLS+=			intltool msgfmt
diff --git a/py-pyphant/Makefile b/py-pyphant/Makefile
index 0e9aa164cb..dd26f328e7 100644
--- a/py-pyphant/Makefile
+++ b/py-pyphant/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Workflow modelling app
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-DEPENDS+=	${PYPKGPREFIX}-Paste>=1.7.4:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-paste>=1.7.4:../../www/py-paste
 
 USE_LANGUAGES=	# none
 
diff --git a/py-pysaml2/Makefile b/py-pysaml2/Makefile
index ce75deb8be..734b43725d 100644
--- a/py-pysaml2/Makefile
+++ b/py-pysaml2/Makefile
@@ -13,7 +13,7 @@ LICENSE=	apache-2.0
 DEPENDS+=	${PYPKGPREFIX}-decorator-[0-9]*:../../devel/py-decorator
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
-DEPENDS+=	${PYPKGPREFIX}-Paste-[0-9]*:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-paste-[0-9]*:../../www/py-paste
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
diff --git a/py-repoze.who/Makefile b/py-repoze.who/Makefile
index 0f3de31f3c..a7c08c4441 100644
--- a/py-repoze.who/Makefile
+++ b/py-repoze.who/Makefile
@@ -18,8 +18,8 @@ DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 DEPENDS+=	${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
 #DEPENDS+=	${PYPKGPREFIX}-repoze.sphinx.autointerface-[0-9]*:../../wip/repoze.sphinx.autointerface
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
 
-WRKSRC=		${WRKDIR}/repoze.who-2.3
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
diff --git a/py-setupdocs/Makefile b/py-setupdocs/Makefile
index 1a9a76236e..ba1713f7f4 100644
--- a/py-setupdocs/Makefile
+++ b/py-setupdocs/Makefile
@@ -1,12 +1,9 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 13:57:30 asau Exp $
-#
 
-DISTNAME=	SetupDocs-1.0.4.tar
-EGG_NAME=	SetupDocs-1.0.4
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/S/s/:S/D/d/:S/.tar//}
+DISTNAME=	SetupDocs-1.0.4
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/S/s/:S/D/d/}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_PYPI:=S/SetupDocs/}
-EXTRACT_SUFX=	.gz#md5=824bcf896b7e4e7c610d65544e28bdd1
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
 HOMEPAGE=	http://pypi.python.org/pypi/setupdocs
@@ -14,6 +11,8 @@ COMMENT=	Setuptools plugin that automates building of docs from reST source
 
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=0.6.6:../../textproc/py-sphinx
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 WRKSRC=		${WRKDIR}/SetupDocs-1.0.4
 USE_LANGUAGES=	# none
 
diff --git a/py-sphinxreport/Makefile b/py-sphinxreport/Makefile
index 3cabffdc56..116ec51d09 100644
--- a/py-sphinxreport/Makefile
+++ b/py-sphinxreport/Makefile
@@ -18,6 +18,8 @@ DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.7:../../databases/py-sqlalchemy
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-vdirsyncer-git/Makefile b/py-vdirsyncer-git/Makefile
index 561d9a721c..b0e59b062e 100644
--- a/py-vdirsyncer-git/Makefile
+++ b/py-vdirsyncer-git/Makefile
@@ -26,6 +26,8 @@ DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.3.0:../../devel/py-requests-toolbe
 # optional, but recommended
 DEPENDS+=	${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-keyring
+
 USE_LANGUAGES=		# none
 INSTALLATION_DIRS=	share/examples/${PKGBASE}
 PLIST_SUBST+=		PKGBASE=${PKGBASE}
diff --git a/py-weberror/Makefile b/py-weberror/Makefile
index ef485d798c..795dc4c693 100644
--- a/py-weberror/Makefile
+++ b/py-weberror/Makefile
@@ -13,7 +13,7 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.1.1:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-pygments>=1.3.1:../../textproc/py-pygments
-DEPENDS+=	${PYPKGPREFIX}-Paste>=1.7.2:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-paste>=1.7.2:../../www/py-paste
 DEPENDS+=	${PYPKGPREFIX}-Tempita>=0.4:../../textproc/py-Tempita
 DEPENDS+=	${PYPKGPREFIX}-WebOb>=0.9.8:../../www/py-WebOb
 
diff --git a/pyzor/Makefile b/pyzor/Makefile
index 4a1044caa7..d01b497bd5 100644
--- a/pyzor/Makefile
+++ b/pyzor/Makefile
@@ -11,6 +11,8 @@ LICENSE=	gnu-gpl-v2
 
 GITHUB_TAG=	release-${PKGVERSION_NOREV:S/./-/g}
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 USE_TOOLS+=	gmake
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
diff --git a/spyder/Makefile b/spyder/Makefile
index 52a52f7fbf..74ce06a160 100644
--- a/spyder/Makefile
+++ b/spyder/Makefile
@@ -13,6 +13,8 @@ LICENSE=	mit
 DEPENDS+=	${PYPKGPREFIX}-rope>=0.9.3:../../devel/py-rope
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.3:../../textproc/py-sphinx
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
+
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		# none
 
diff --git a/thawab/Makefile b/thawab/Makefile
index d73592f2cb..8dc870b386 100644
--- a/thawab/Makefile
+++ b/thawab/Makefile
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-Whoosh>=2.5.7:../../textproc/py-Whoosh
 DEPENDS+=	${PYPKGPREFIX}-othman>=0.2.7:../../wip/py-othman
 DEPENDS+=	${PYPKGPREFIX}-okasha>=0.2.4:../../wip/py-okasha
-DEPENDS+=	${PYPKGPREFIX}-Paste>=1.7.5.1:../../www/py-paste
+DEPENDS+=	${PYPKGPREFIX}-paste>=1.7.5.1:../../www/py-paste
 
 WRKSRC=		${WRKDIR}/thawab-3.0.13
 
diff --git a/translate-toolkit/options.mk b/translate-toolkit/options.mk
index cfcb02f53e..fc5fa8e7f0 100644
--- a/translate-toolkit/options.mk
+++ b/translate-toolkit/options.mk
@@ -47,6 +47,7 @@ PLIST.csv=	yes
 
 #Off till someone updates textproc/py-sphinx to 3.1.1
 .if !empty(PKG_OPTIONS:Mdoc)
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
 BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx>=3.1.1.:../../textproc/py-sphinx
 SUBST_CLASSES+=		sphinx
 SUBST_SED.sphinx+=	-e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
diff --git a/wla-dx/options.mk b/wla-dx/options.mk
index 63e22ad83a..c6afefff0d 100644
--- a/wla-dx/options.mk
+++ b/wla-dx/options.mk
@@ -10,6 +10,7 @@ PLIST_VARS+=	doc
 
 
 .if !empty(PKG_OPTIONS:Mdoc)
+PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx
 BUILD_DEPENDS+=	py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
 PLIST.doc=	yes
 .endif
Prev by Date: py-matrix-synapse: mark as not for python 2.x
Next by Date: gerbera: document what is missing
Previous by Thread: py-matrix-synapse: mark as not for python 2.x
Next by Thread: gerbera: document what is missing
Indexes:
Home | Main Index | Thread Index | Old Index