pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: stop using versioned_dependencies.mk
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Apr 30 12:23:45 2024 +0200
Changeset: 0b5ec908625780581ff9ab206417508be8094305
Modified Files:
Radicale3/Makefile
exabgp4/Makefile
py-Kallithea/Makefile
py-ZopeSecurity/Makefile
py-beautysh/Makefile
py-buildbot-www/Makefile
py-chemlab/Makefile
py-dexy/Makefile
py-graphite-web/Makefile
py-igraph/Makefile
py-launchpadlib/Makefile
py-lazr.restfulclient/Makefile
py-lazr.uri/Makefile
py-marshmallow/Makefile
py-matrix-angular-sdk/Makefile
py-mkdocs-material/Makefile
py-napalm-base/Makefile
py-pandoc/Makefile
py-pdoc3/Makefile
py-pipdeptree/Makefile
py-pipenv/Makefile
py-pixiedust/Makefile
py-pymdown-extensions/Makefile
py-python-decouple/Makefile
py-repoze.who/Makefile
py-symbolic/Makefile
Log Message:
*: stop using versioned_dependencies.mk
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0b5ec908625780581ff9ab206417508be8094305
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Radicale3/Makefile | 7 +++----
exabgp4/Makefile | 2 --
py-Kallithea/Makefile | 4 ++--
py-ZopeSecurity/Makefile | 4 ++--
py-beautysh/Makefile | 4 ++--
py-buildbot-www/Makefile | 4 +---
py-chemlab/Makefile | 4 ++--
py-dexy/Makefile | 6 +++---
py-graphite-web/Makefile | 4 ++--
py-igraph/Makefile | 3 +--
py-launchpadlib/Makefile | 3 +--
py-lazr.restfulclient/Makefile | 4 ++--
py-lazr.uri/Makefile | 6 +++---
py-marshmallow/Makefile | 6 +++---
py-matrix-angular-sdk/Makefile | 5 +++--
py-mkdocs-material/Makefile | 4 ++--
py-napalm-base/Makefile | 4 ++--
py-pandoc/Makefile | 4 ++--
py-pdoc3/Makefile | 6 +++---
py-pipdeptree/Makefile | 5 +++--
py-pipenv/Makefile | 4 ++--
py-pixiedust/Makefile | 4 ++--
py-pymdown-extensions/Makefile | 5 +++--
py-python-decouple/Makefile | 7 ++++---
py-repoze.who/Makefile | 3 +--
py-symbolic/Makefile | 7 ++++---
26 files changed, 58 insertions(+), 61 deletions(-)
diffs:
diff --git a/Radicale3/Makefile b/Radicale3/Makefile
index e87eec6553..f4c6e52ad0 100644
--- a/Radicale3/Makefile
+++ b/Radicale3/Makefile
@@ -9,6 +9,7 @@ HOMEPAGE= https://radicale.org/
COMMENT= CalDAV (calendar) and CardDAV (contact) server
LICENSE= gnu-gpl-v3
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
DEPENDS+= ${PYPKGPREFIX}-defusedxml-[0-9]*:../../textproc/py-defusedxml
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
@@ -18,6 +19,8 @@ DEPENDS+= ${PYPKGPREFIX}-passlib-[0-9]*:../../security/py-passlib
DEPENDS+= daemonize>=1.7.8:../../sysutils/daemonize
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
BUILD_DEFS+= VARBASE
RADICALE_USER?= radicale
@@ -25,9 +28,6 @@ RADICALE_GROUP?= radicale
PKG_GROUPS= ${RADICALE_GROUP}
PKG_USERS= ${RADICALE_USER}:${RADICALE_GROUP}
-PYTHON_VERSIONS_INCOMPATIBLE= 27
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
-
PKG_SYSCONFSUBDIR= radicale
RCD_SCRIPTS= radicale
@@ -75,5 +75,4 @@ post-install:
.endfor
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/exabgp4/Makefile b/exabgp4/Makefile
index 95bdee7221..b3efe91fda 100644
--- a/exabgp4/Makefile
+++ b/exabgp4/Makefile
@@ -23,7 +23,6 @@ WRKSRC= ${WRKDIR}/exabgp-${VERSION}
# but is not needed to build or to run the software
#USE_TOOLS+= perl:run
-#PYTHON_VERSIONED_DEPENDENCIES+= setuptools
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
REPLACE_PERL+= etc/exabgp/examples/dynamic-1.pl
@@ -86,5 +85,4 @@ post-install:
.include "../../wip/python/distutils.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/pyversion.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-Kallithea/Makefile b/py-Kallithea/Makefile
index 39e96896f4..a7df0ecd35 100644
--- a/py-Kallithea/Makefile
+++ b/py-Kallithea/Makefile
@@ -28,6 +28,7 @@ DEPENDS+= ${PYPKGPREFIX}-celery>=2.2.5:../../net/py-celery
DEPENDS+= ${PYPKGPREFIX}-babel>=0.9.6:../../devel/py-babel
DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.5.0:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-docutils>=0.8.1:../../textproc/py-docutils
+DEPENDS+= ${PYPKGPREFIX}-markdown>=0:../../textproc/py-markdown
DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.5.2:../../converters/py-simplejson
DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
DEPENDS+= ${PYPKGPREFIX}-crypto>=2.6.0:../../security/py-crypto
@@ -37,7 +38,7 @@ DEPENDS+= ${PYPKGPREFIX}-dulwich>=0.9.9:../../devel/py-dulwich
DEPENDS+= ${PYPKGPREFIX}-mercurial>=2.9:../../devel/py-mercurial
DEPENDS+= ${PYPKGPREFIX}-bcrypt>=0.3.0:../../security/py-bcrypt
-PYTHON_VERSIONED_DEPENDENCIES+= markdown
+PYTHON_VERSIONS_INCOMPATIBLE= 27
REPLACE_PYTHON+= kallithea/lib/dbmigrate/migrate/versioning/templates/*.py_tmpl
REPLACE_PYTHON+= kallithea/tests/scripts/manual_test_crawler.py
@@ -47,5 +48,4 @@ USE_LANGUAGES= # none
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-ZopeSecurity/Makefile b/py-ZopeSecurity/Makefile
index 831bbb9c55..cf6d8f2618 100644
--- a/py-ZopeSecurity/Makefile
+++ b/py-ZopeSecurity/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE= https://github.com/zopefoundation/zope.security
COMMENT= Zope Security Framework
LICENSE= zpl-2.1
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-zope.proxy>=4.3.5:../../www/py-zope.proxy
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-beautysh/Makefile b/py-beautysh/Makefile
index c1a7c2f1a8..efac8e2cb8 100644
--- a/py-beautysh/Makefile
+++ b/py-beautysh/Makefile
@@ -12,12 +12,12 @@ HOMEPAGE= https://github.com/bemeurer/beautysh/
COMMENT= Bash beautifier for the masses
LICENSE= mit
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+
PYTHON_VERSIONS_INCOMPATIBLE= 27
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
REPLACE_PYTHON+= beautysh/beautysh.py
.include "../../lang/python/application.mk"
.include "../../wip/python/distutils.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-buildbot-www/Makefile b/py-buildbot-www/Makefile
index fa2f3d3def..17562fe72e 100644
--- a/py-buildbot-www/Makefile
+++ b/py-buildbot-www/Makefile
@@ -8,13 +8,11 @@ COMMENT= Web frontend for the buildbot CI system
DEPENDS+= ${PYPKGPREFIX}-buildbot-[0-9]*:../../wip/py-buildbot
TOOL_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-buildbot-pip
TOOL_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
TOOL_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
USE_LANGUAGES= # none
-PYTHON_VERSIONED_DEPENDENCIES+= pip:build
-
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../wip/py-buildbot/Makefile.common"
diff --git a/py-chemlab/Makefile b/py-chemlab/Makefile
index 8f456ab777..79999e2f30 100644
--- a/py-chemlab/Makefile
+++ b/py-chemlab/Makefile
@@ -10,9 +10,10 @@ HOMEPAGE= https://files.pythonhosted.org/packages/source/c/chemlab/
COMMENT= The python chemistry library you were waiting for
LICENSE= gnu-gpl-v3
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.4:../../devel/py-nose
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools:build
+PYTHON_VERSIONS_INCOMPATIBLE= 27
pre-configure:
# Verify that no fetching is done during build
@@ -21,5 +22,4 @@ pre-configure:
.include "../../devel/py-cython/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../math/py-numpy/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-dexy/Makefile b/py-dexy/Makefile
index 39bc277b22..231e6184f2 100644
--- a/py-dexy/Makefile
+++ b/py-dexy/Makefile
@@ -15,6 +15,7 @@ DEPENDS+= ply>=3.3:../../devel/ply
DEPENDS+= ${PYPKGPREFIX}-pexpect>=2.3:../../devel/py-pexpect
DEPENDS+= ${PYPKGPREFIX}-requests>=1.2.1:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
+DEPENDS+= ${PYPKGPREFIX}-markdown>=0:../../textproc/py-markdown
DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
DEPENDS+= ${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
@@ -24,9 +25,8 @@ DEPENDS+= ${PYPKGPREFIX}-inflection>=0.2.0:../../wip/py-inflection
WRKSRC= ${WRKDIR}/dexy-0.9.9.5
USE_LANGUAGES= # none
-PYTHON_VERSIONS_ACCEPTED= 27 # py-docutils
-PYTHON_VERSIONED_DEPENDENCIES+= markdown
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-graphite-web/Makefile b/py-graphite-web/Makefile
index 9e7f1ee5f2..d22d5154ef 100644
--- a/py-graphite-web/Makefile
+++ b/py-graphite-web/Makefile
@@ -12,11 +12,12 @@ COMMENT= Enterprise scalable realtime graphing platform
LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-carbon>=${PKGREVISION_NOREV}:../../wip/py-carbon
+DEPENDS+= ${PYPKGPREFIX}-cairo>=0:../../graphics/py-cairo
DEPENDS+= ${PYPKGPREFIX}-django>=1.3.1:../../www/py-django3
DEPENDS+= ${PYPKGPREFIX}-django-tagging>=0.3.1:../../www/py-django-tagging
DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-PYTHON_VERSIONED_DEPENDENCIES+= cairo
+PYTHON_VERSIONS_INCOMPATIBLE= 27
EGG_NAME= ${DISTNAME:S/graphite-/graphite_/}
@@ -74,5 +75,4 @@ post-install:
.include "../../wip/py-carbon/Makefile.common"
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-igraph/Makefile b/py-igraph/Makefile
index e0094b2555..06e52ab551 100644
--- a/py-igraph/Makefile
+++ b/py-igraph/Makefile
@@ -10,11 +10,10 @@ HOMEPAGE= https://igraph.org/
COMMENT= Manipulating Undirected and Directed Graphs for Python
LICENSE= gnu-gpl-v2
-PYTHON_VERSIONED_DEPENDENCIES+= cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_TOOLS+= pkg-config
.include "../../lang/python/egg.mk"
.include "../../wip/igraph/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-launchpadlib/Makefile b/py-launchpadlib/Makefile
index e561f1a3bf..c6b713c8a0 100644
--- a/py-launchpadlib/Makefile
+++ b/py-launchpadlib/Makefile
@@ -11,6 +11,7 @@ HOMEPAGE= https://pypi.org/project/launchpadlib/
COMMENT= Script Launchpad through its web services interfaces
LICENSE= gnu-gpl-v3
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
DEPENDS+= ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
# These are in wip/ not in pkgsrc proper:
@@ -18,9 +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_VERSIONED_DEPENDENCIES+= setuptools
PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-keyring
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-lazr.restfulclient/Makefile b/py-lazr.restfulclient/Makefile
index 46e3b3ab6d..0a4c51ce69 100644
--- a/py-lazr.restfulclient/Makefile
+++ b/py-lazr.restfulclient/Makefile
@@ -10,6 +10,7 @@ HOMEPAGE= https://launchpad.net/lazr.restfulclient
COMMENT= Provide added functionality on top of wadllib
LICENSE= gnu-lgpl-v3
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
DEPENDS+= ${PYPKGPREFIX}-wadllib-[0-9]*:../../wip/py-wadllib
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
@@ -17,8 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-oauthlib-[0-9]*:../../security/py-oauthlib
USE_LANGUAGES= # none
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-lazr.uri/Makefile b/py-lazr.uri/Makefile
index 2a510097fb..5f03c858ca 100644
--- a/py-lazr.uri/Makefile
+++ b/py-lazr.uri/Makefile
@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.4 2014/06/01 12:49:43 thomasklausner Exp $
-#
DISTNAME= lazr.uri-1.0.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,10 +10,11 @@ HOMEPAGE= https://launchpad.net/lazr.uri
COMMENT= Library for parsing, manipulating, and generating URIs
LICENSE= gnu-lgpl-v3
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-marshmallow/Makefile b/py-marshmallow/Makefile
index f86dee4a31..b9db493bde 100644
--- a/py-marshmallow/Makefile
+++ b/py-marshmallow/Makefile
@@ -10,14 +10,14 @@ HOMEPAGE= https://github.com/marshmallow-code/marshmallow
COMMENT= Library for converting complex datatypes
LICENSE= mit
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+PYTHON_VERSIONS_INCOMPATIBLE= 27
-.include "../../lang/python/egg.mk"
WRKSRC= ${WRKDIR}/marshmallow-3.0.0b8
USE_LANGUAGES= # none
-.include "../../lang/python/versioned_dependencies.mk"
+.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-matrix-angular-sdk/Makefile b/py-matrix-angular-sdk/Makefile
index 085c6110be..32046225ba 100644
--- a/py-matrix-angular-sdk/Makefile
+++ b/py-matrix-angular-sdk/Makefile
@@ -13,12 +13,13 @@ HOMEPAGE= https://github.com/matrix-org/
COMMENT= AngularJS services for implementing the Client-Server API
LICENSE= apache-2.0
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
USE_LANGUAGES= # none
WRKSRC= ${WRKDIR}/${DISTNAME}
INSTALLATION_DIRS= ${PYSITELIB}
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-mkdocs-material/Makefile b/py-mkdocs-material/Makefile
index 7e3e475221..cfef2bd488 100644
--- a/py-mkdocs-material/Makefile
+++ b/py-mkdocs-material/Makefile
@@ -12,13 +12,13 @@ LICENSE= mit
#DEPENDS+= ${PYPKGPREFIX}-mkdocs>=1.1:../../textproc/py-mkdocs
DEPENDS+= ${PYPKGPREFIX}-pygments>=2.5.2:../../textproc/py-pygments
+DEPENDS+= ${PYPKGPREFIX}-markdown>=0:../../textproc/py-markdown
DEPENDS+= ${PYPKGPREFIX}-pymdown-extensions>=8.0:../../wip/py-pymdown-extensions
DEPENDS+= ${PYPKGPREFIX}-mkdocs-material-extensions>=1.0:../../wip/py-mkdocs-material-extensions
-PYTHON_VERSIONED_DEPENDENCIES+= markdown
+PYTHON_VERSIONS_INCOMPATIBLE= 27
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-napalm-base/Makefile b/py-napalm-base/Makefile
index 1d0eb6cb60..0fdffeceb5 100644
--- a/py-napalm-base/Makefile
+++ b/py-napalm-base/Makefile
@@ -12,16 +12,16 @@ COMMENT= Interact with different router vendors using unified API
LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-jtextfsm-[0-9]*:../../wip/py-jtextfsm
+DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-netaddr-[0-9]*:../../net/py-netaddr
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
-PYTHON_VERSIONED_DEPENDENCIES+= pip
+PYTHON_VERSIONS_INCOMPATIBLE= 27
# Mistakenly installed, prone to name conflicts (e.g. with napalm-iosxr)
post-install:
rm -f ${DESTDIR}/${PREFIX}/${PYSITELIB}/test/__init__.*
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../wip/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pandoc/Makefile b/py-pandoc/Makefile
index 264722221f..e9ce17fcad 100644
--- a/py-pandoc/Makefile
+++ b/py-pandoc/Makefile
@@ -11,11 +11,11 @@ COMMENT= Thin wrapper for pandoc
LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-wheel>=0.25.0:../../devel/py-wheel
+DEPENDS+= ${PYPKGPREFIX}-pip>=0:../../devel/py-pip
USE_LANGUAGES= # none
-PYTHON_VERSIONED_DEPENDENCIES+= pip
+PYTHON_VERSIONS_INCOMPATIBLE= 27
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pdoc3/Makefile b/py-pdoc3/Makefile
index 0b69e61d17..d72454bb2d 100644
--- a/py-pdoc3/Makefile
+++ b/py-pdoc3/Makefile
@@ -13,11 +13,11 @@ LICENSE= gnu-agpl-v3
TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-mako>=1.1.3:../../devel/py-mako
-
-PYTHON_VERSIONED_DEPENDENCIES+= markdown
+DEPENDS+= ${PYPKGPREFIX}-markdown>=0:../../textproc/py-markdown
USE_LANGUAGES= # none
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pipdeptree/Makefile b/py-pipdeptree/Makefile
index 6266ecccb9..ca99d67e04 100644
--- a/py-pipdeptree/Makefile
+++ b/py-pipdeptree/Makefile
@@ -10,13 +10,14 @@ HOMEPAGE= https://github.com/naiquevin/pipdeptree
COMMENT= Displaying the installed python packages in form of a dependency tree
LICENSE= mit
+DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+
USE_LANGUAGES= # none
-PYTHON_VERSIONED_DEPENDENCIES+= pip
+PYTHON_VERSIONS_INCOMPATIBLE= 27
post-install:
cd ${DESTDIR}${PREFIX}/bin && ${MV} pipdeptree pipdeptree-${PYVERSSUFFIX}
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pipenv/Makefile b/py-pipenv/Makefile
index 3f51e893ba..4c23c79bb0 100644
--- a/py-pipenv/Makefile
+++ b/py-pipenv/Makefile
@@ -19,11 +19,11 @@ TOOL_DEPENDS+= ${PYPKGPREFIX}-black>=20.8:../../textproc/py-black
TOOL_DEPENDS+= ${PYPKGPREFIX}-parver>=0.3.1:../../wip/py-parver
TOOL_DEPENDS+= ${PYPKGPREFIX}-invoke>=1.4.1:../../sysutils/py-invoke
DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
+DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
DEPENDS+= ${PYPKGPREFIX}-virtualenv-clone>=0.2.5:../../wip/py-virtualenv-clone
DEPENDS+= ${PYPKGPREFIX}-virtualenv>=0:../../devel/py-virtualenv
-PYTHON_VERSIONED_DEPENDENCIES+= pip
+PYTHON_VERSIONS_INCOMPATIBLE= 27
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pixiedust/Makefile b/py-pixiedust/Makefile
index a249d7cadd..17b4398bfd 100644
--- a/py-pixiedust/Makefile
+++ b/py-pixiedust/Makefile
@@ -17,14 +17,14 @@ DEPENDS+= ${PYPKGPREFIX}-requests>=2.25.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-traitlets>=4.3.3:../../devel/py-traitlets
DEPENDS+= ${PYPKGPREFIX}-geojson>=2.5.0:../../geography/py-geojson
DEPENDS+= ${PYPKGPREFIX}-colour>=0.1.5:../../textproc/py-colour
+DEPENDS+= ${PYPKGPREFIX}-markdown>=0:../../textproc/py-markdown
DEPENDS+= ${PYPKGPREFIX}-lxml>=4.6.2:../../textproc/py-lxml
DEPENDS+= ${PYPKGPREFIX}-astunparse>=1.6.3:../../devel/py-astunparse
DEPENDS+= ${PYPKGPREFIX}-mpld3>=0.5.2:../../category/py-mpld3
-PYTHON_VERSIONED_DEPENDENCIES+= markdown
+PYTHON_VERSIONS_INCOMPATIBLE= 27
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-pymdown-extensions/Makefile b/py-pymdown-extensions/Makefile
index e983a48087..de986e9f4b 100644
--- a/py-pymdown-extensions/Makefile
+++ b/py-pymdown-extensions/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE= https://github.com/facelessuser/pymdown-extensions
COMMENT= Extension pack for Python Markdown
LICENSE= mit
-PYTHON_VERSIONED_DEPENDENCIES+= markdown
+DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-python-decouple/Makefile b/py-python-decouple/Makefile
index 6b0313592a..f6c16ccba8 100644
--- a/py-python-decouple/Makefile
+++ b/py-python-decouple/Makefile
@@ -10,11 +10,12 @@ HOMEPAGE= https://github.com/henriquebastos/python-decouple/
COMMENT= Strict separation of settings from code
LICENSE= mit
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-.include "../../lang/python/egg.mk"
WRKSRC= ${WRKDIR}/python-decouple-3.1
USE_LANGUAGES= # none
-.include "../../lang/python/versioned_dependencies.mk"
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
+.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-repoze.who/Makefile b/py-repoze.who/Makefile
index 4b10ec26e1..4ecd250f93 100644
--- a/py-repoze.who/Makefile
+++ b/py-repoze.who/Makefile
@@ -10,6 +10,7 @@ HOMEPAGE= http://www.repoze.org/
COMMENT= Identification and authentication framework for WSGI
LICENSE= modified-bsd
+DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-zope.interface-[0-9]*:../../devel/py-zope.interface
DEPENDS+= ${PYPKGPREFIX}-WebOb-[0-9]*:../../www/py-WebOb
DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
@@ -17,11 +18,9 @@ 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_VERSIONED_DEPENDENCIES+= setuptools
PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
USE_LANGUAGES= # none
.include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-symbolic/Makefile b/py-symbolic/Makefile
index 9a17ff84a6..528f3cd758 100644
--- a/py-symbolic/Makefile
+++ b/py-symbolic/Makefile
@@ -13,12 +13,14 @@ LICENSE= mit
MAKE_ENV+= RUSTFLAGS="-Clink-arg=${COMPILER_RPATH_FLAG}${PREFIX}/lib"
-PYTHON_VERSIONED_DEPENDENCIES+= setuptools
-
+DEPENDS+= ${PYPKGPREFIX}-setuptools>=0:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-milksnake>=0.1.5:../../wip/py-milksnake
DEPENDS+= ${PYPKGPREFIX}-cffi>=1.11.5:../../devel/py-cffi
DEPENDS+= ${PYPKGPREFIX}-cparser>=2.18:../../devel/py-cparser
TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+
+PYTHON_VERSIONS_INCOMPATIBLE= 27
+
.include "../../mk/bsd.prefs.mk"
#HAS_CONFIGURE= yes
@@ -90,5 +92,4 @@ do-install:
BUILDLINK_API_DEPENDS.rust+= rust>=1.25.0
.include "../../lang/rust/buildlink3.mk"
.include "../../lang/python/tool.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index