pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: convert dependencies of py-pyparsing to versioned_dependencies.mk



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Nov 1 19:57:01 2021 +0100
Changeset:	55dfe75e7a44b098b29848607c89dbdfa4f7a68d

Modified Files:
	py-alfanous/Makefile
	py-amply/Makefile
	py-brian2/Makefile
	py-calphad/Makefile
	py-chempy/Makefile
	py-cliff/Makefile
	py-cmd2/Makefile
	py-cnfgen/Makefile
	py-coconut/Makefile
	py-corpus/Makefile
	py-dot2tex/Makefile
	py-etesync/Makefile
	py-fortpy/Makefile
	py-moya/Makefile
	py-ngxtop/Makefile
	py-nxpd/Makefile
	py-pgmpy/Makefile
	py-rdflib340/Makefile
	py-sqlalchemy-searchable/Makefile
	py-symath/Makefile

Log Message:
*: convert dependencies of py-pyparsing to 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=55dfe75e7a44b098b29848607c89dbdfa4f7a68d

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

diffstat:
 py-alfanous/Makefile              | 5 +++--
 py-amply/Makefile                 | 4 +++-
 py-brian2/Makefile                | 4 +++-
 py-calphad/Makefile               | 3 ++-
 py-chempy/Makefile                | 5 +++--
 py-cliff/Makefile                 | 5 +++--
 py-cmd2/Makefile                  | 3 ++-
 py-cnfgen/Makefile                | 4 +++-
 py-coconut/Makefile               | 4 +++-
 py-corpus/Makefile                | 5 +++--
 py-dot2tex/Makefile               | 3 ++-
 py-etesync/Makefile               | 4 +++-
 py-fortpy/Makefile                | 4 +++-
 py-moya/Makefile                  | 4 +++-
 py-ngxtop/Makefile                | 7 ++++---
 py-nxpd/Makefile                  | 4 +++-
 py-pgmpy/Makefile                 | 4 +++-
 py-rdflib340/Makefile             | 4 +++-
 py-sqlalchemy-searchable/Makefile | 9 +++++----
 py-symath/Makefile                | 8 +++++---
 20 files changed, 62 insertions(+), 31 deletions(-)

diffs:
diff --git a/py-alfanous/Makefile b/py-alfanous/Makefile
index f4ba78c5d9..32cc4fe2c9 100644
--- a/py-alfanous/Makefile
+++ b/py-alfanous/Makefile
@@ -10,11 +10,12 @@ HOMEPAGE=	http://www.alfanous.org/
 COMMENT=	Quranic search engine API
 LICENSE=	gnu-agpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
-
 WRKSRC=		${WRKDIR}/alfanous-0.7.28
 
+PYTHON_VERSIONED_DEPENDENCIES==	pyparsing
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-amply/Makefile b/py-amply/Makefile
index d20c129406..ff850ac0ae 100644
--- a/py-amply/Makefile
+++ b/py-amply/Makefile
@@ -12,9 +12,11 @@ LICENSE=	eclipse-license
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.16:../../textproc/py-docutils
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.4.7:../../devel/py-pyparsing
+
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-brian2/Makefile b/py-brian2/Makefile
index 072492930a..ca8a2f559a 100644
--- a/py-brian2/Makefile
+++ b/py-brian2/Makefile
@@ -11,14 +11,16 @@ COMMENT=	Clock-driven simulator for spiking neural networks
 #LICENSE=	# TODO: (see mk/license.mk)
 
 DEPENDS+=       ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
-DEPENDS+=       ${PYPKGPREFIX}-pyparsing>=2.4.7:../../devel/py-pyparsing
 DEPENDS+=       ${PYPKGPREFIX}-sympy>=1.5.1:../../math/py-sympy
 DEPENDS+=       ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=	c c++
 
 .include "../../devel/py-cython/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-numpy+=        ${PYPKGPREFIX}-numpy>=1.0
 .include "../../math/py-numpy/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-calphad/Makefile b/py-calphad/Makefile
index 3bfe1f3734..17327da669 100644
--- a/py-calphad/Makefile
+++ b/py-calphad/Makefile
@@ -10,7 +10,6 @@ HOMEPAGE=	https://github.com/richardotis/pycalphad
 COMMENT=	Thermodynamic models, calculating phase diagrams
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
@@ -19,7 +18,9 @@ WRKSRC=		${WRKDIR}/pycalphad-0.1.1.post1
 
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
 .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-chempy/Makefile b/py-chempy/Makefile
index 47e3db0734..6afd243235 100644
--- a/py-chempy/Makefile
+++ b/py-chempy/Makefile
@@ -14,14 +14,15 @@ LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-matplotlib>=2.2.3:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-sympy>=1.6.2:../../math/py-sympy
 DEPENDS+=	${PYPKGPREFIX}-quantities>=0.12.4:../../wip/py-quantities
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.3:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-sym>=0.3.4:../../wip/py-sym
 DEPENDS+=	${PYPKGPREFIX}-jupyter_client>=6.1.7:../../devel/py-jupyter_client
 
-
 USE_LANGUAGES=	# none
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-numpy+=	${PYPKGPREFIX}-numpy>1.11.3
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cliff/Makefile b/py-cliff/Makefile
index 4350c0f396..0106277c2e 100644
--- a/py-cliff/Makefile
+++ b/py-cliff/Makefile
@@ -10,14 +10,15 @@ HOMEPAGE=	https://launchpad.net/python-cliff
 COMMENT=	Command Line Interface Formulation Framework
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-ptable>=0.6.1:../../textproc/py-ptable
 DEPENDS+=	${PYPKGPREFIX}-cmd2>=0.6:../../wip/py-cmd2
 DEPENDS+=	${PYPKGPREFIX}-stevedore>=0.14.1:../../devel/py-stevedore
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/py-cmd2/Makefile b/py-cmd2/Makefile
index 871dffca4a..1126ecba93 100644
--- a/py-cmd2/Makefile
+++ b/py-cmd2/Makefile
@@ -10,11 +10,12 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/c/cmd2/
 COMMENT=	Extra features for standard library's cmd module
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
 WRKSRC=		${WRKDIR}/cmd2-0.6.7
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cnfgen/Makefile b/py-cnfgen/Makefile
index 6ff5421f6c..5c2b0b5850 100644
--- a/py-cnfgen/Makefile
+++ b/py-cnfgen/Makefile
@@ -10,12 +10,14 @@ HOMEPAGE=	https://massimolauria.github.io/cnfgen
 COMMENT=	CNF formula generator
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1.8:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
 
 WRKSRC=		${WRKDIR}/CNFgen-0.7.1
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-coconut/Makefile b/py-coconut/Makefile
index 9e1ab1b2f6..306c5b118b 100644
--- a/py-coconut/Makefile
+++ b/py-coconut/Makefile
@@ -12,7 +12,6 @@ LICENSE=	apache-2.0
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-ipython>=6.5:../../devel/py-ipython
 BUILD_DEPENDS+=	${PYPKGPREFIX}-jupyter-console>=5.2:../../wip/py-jupyter-console
-BUILD_DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.4.5:../../devel/py-pyparsing
 BUILD_DEPENDS+=	${PYPKGPREFIX}-psutil>=5.7.2:../../sysutils/py-psutil
 BUILD_DEPENDS+=	${PYPKGPREFIX}-vprof>=0.36:../../wip/py-vprof
 BUILD_DEPENDS+=	${PYPKGPREFIX}-requests>=2.24.0:../../devel/py-requests
@@ -31,10 +30,13 @@ DEPENDS+=	${PYPKGPREFIX}-cPyparsing>=2.4.5.0.1.1:../../wip/py-cPyparsing
 DEPENDS+=	${PYPKGPREFIX}-pygments>=2.3.1:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-prompt_toolkit>=3.0.8:../../devel/py-prompt_toolkit
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing:build
+
 USE_LANGUAGES=	# none
 
 BUILDLINK_DEPENDS.${PYPKGPREFIX}-numpy+=	build
 BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-numpy+=	${PYPKGPREFIX}-numpy>=1.0
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-corpus/Makefile b/py-corpus/Makefile
index fee8db1c8b..34dac4a407 100644
--- a/py-corpus/Makefile
+++ b/py-corpus/Makefile
@@ -10,11 +10,12 @@ HOMEPAGE=	http://www.alfanous.org/
 COMMENT=	Arabic Quranic Corpus python API
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
-
 WRKSRC=		${WRKDIR}/PyCorpus-0.1
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dot2tex/Makefile b/py-dot2tex/Makefile
index f53e83acb8..4f00d956d0 100644
--- a/py-dot2tex/Makefile
+++ b/py-dot2tex/Makefile
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/kjellmf/dot2tex
 COMMENT=	Graphviz to LaTeX converter
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.4.7:../../devel/py-pyparsing
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-etesync/Makefile b/py-etesync/Makefile
index 7901c2e3ef..6c57865689 100644
--- a/py-etesync/Makefile
+++ b/py-etesync/Makefile
@@ -20,13 +20,15 @@ DEPENDS+=	${PYPKGPREFIX}-orderedmultidict>=0.7:../../databases/py-orderedmultidi
 DEPENDS+=	${PYPKGPREFIX}-packaging>=16.8:../../devel/py-packaging
 DEPENDS+=	${PYPKGPREFIX}-peewee>=3.7.0:../../databases/py-peewee
 DEPENDS+=	${PYPKGPREFIX}-py>=1.4:../../devel/py-py
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.2:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pytz>=2019.1:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.21:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-vobject>=0.9:../../textproc/py-vobject
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-fortpy/Makefile b/py-fortpy/Makefile
index 58c4dd763b..263f75b799 100644
--- a/py-fortpy/Makefile
+++ b/py-fortpy/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE=	https://github.com/rosenbrockc/fortpy
 COMMENT=	Fortran Parsing, Unit Testing and Intellisense
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-paramiko>=1.14.0:../../security/py-paramiko
 #DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.0:../../time/py-dateutil
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=		# none
 REPLACE_PYTHON+=	fortpy/scripts/*.py*
 
@@ -24,4 +25,5 @@ post-extract:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-moya/Makefile b/py-moya/Makefile
index 006c60f0e0..9e3efd3da1 100644
--- a/py-moya/Makefile
+++ b/py-moya/Makefile
@@ -16,7 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-colorama>=0.3.2:../../comms/py-colorama
 DEPENDS+=	${PYPKGPREFIX}-pymysql>=0.6.6:../../databases/py-pymysql
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=1.0.8:../../databases/py-sqlalchemy
 DEPENDS+=	${PYPKGPREFIX}-babel>=1.3:../../devel/py-babel
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-polib>=1.0.3:../../devel/py-polib
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.7.0:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.9.0:../../graphics/py-Pillow
@@ -31,6 +30,8 @@ DEPENDS+=	${PYPKGPREFIX}-premailer>=0.5.7:../../wip/py-premailer
 DEPENDS+=	${PYPKGPREFIX}-watchdog>=0.7.1:../../sysutils/py-watchdog
 DEPENDS+=	${PYPKGPREFIX}-WebOb>=1.4:../../www/py-WebOb
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=		# none
 USE_PKGLOCALEDIR=	yes
 
@@ -38,4 +39,5 @@ REPLACE_PYTHON+=	moya/command/moya-doc
 
 .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-ngxtop/Makefile b/py-ngxtop/Makefile
index 2457117e62..155ec656b1 100644
--- a/py-ngxtop/Makefile
+++ b/py-ngxtop/Makefile
@@ -10,17 +10,18 @@ HOMEPAGE=	https://github.com/lebinh/
 COMMENT=	real-time metrics for nginx server
 LICENSE=	mit
 
-WRKSRC=         ${WRKDIR}/${DISTNAME}-${GITHUB_TAG}
-
 DEPENDS+=       ${PYPKGPREFIX}-docopt>=0.6.2:../../devel/py-docopt
 DEPENDS+=       ${PYPKGPREFIX}-tabulate>=0.8.3:../../textproc/py-tabulate
-DEPENDS+=       ${PYPKGPREFIX}-pyparsing>=2.3.1:../../devel/py-pyparsing
 DEPENDS+=       ${PYPKGPREFIX}-curses>=2.7.16:../../devel/py-curses
 DEPENDS+=       ${PYPKGPREFIX}-sqlite3>=2.7.16:../../databases/py-sqlite3
 
+WRKSRC=         ${WRKDIR}/${DISTNAME}-${GITHUB_TAG}
+
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
 post-install:
 	${CP} -r ${WRKDIR}/.destdir/usr/pkg/bin/ngxtop ${PREFIX}/bin
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-nxpd/Makefile b/py-nxpd/Makefile
index a151dd0916..e0c910263a 100644
--- a/py-nxpd/Makefile
+++ b/py-nxpd/Makefile
@@ -11,9 +11,11 @@ COMMENT=	NetworkX Pydot Draw
 LICENSE=	unlicense
 
 DEPENDS+=	${PYPKGPREFIX}-networkx>=2.4:../../math/py-networkx
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.4.7:../../devel/py-pyparsing
+
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pgmpy/Makefile b/py-pgmpy/Makefile
index 63a52553af..6dc48e2289 100644
--- a/py-pgmpy/Makefile
+++ b/py-pgmpy/Makefile
@@ -10,13 +10,15 @@ HOMEPAGE=	https://github.com/pgmpy/pgmpy
 COMMENT=	Library for Probabilistic Graphical Models
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.1.8:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-pandas>=0.18.1:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.18.0:../../math/py-scipy
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-rdflib340/Makefile b/py-rdflib340/Makefile
index d905f37dc0..de67b93fa4 100644
--- a/py-rdflib340/Makefile
+++ b/py-rdflib340/Makefile
@@ -15,12 +15,14 @@ MAINTAINER=	bacon%NetBSD.org@localhost
 COMMENT=	Python library for RDF manipulation
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.0.1:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-html5lib>=0:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-sparqlwrapper:../../www/py-sparqlwrapper
 DEPENDS+=	${PYPKGPREFIX}-isodate:../../time/py-isodate
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
 PORTVERSION=	3.4.0
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sqlalchemy-searchable/Makefile b/py-sqlalchemy-searchable/Makefile
index f12a29cedd..4396e1be0a 100644
--- a/py-sqlalchemy-searchable/Makefile
+++ b/py-sqlalchemy-searchable/Makefile
@@ -10,13 +10,14 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/S/SQLAlchemy-Searchable
 COMMENT=	Provides fulltext search capabilities
 LICENSE=	modified-bsd # TODO: (see mk/license.mk)
 
-USE_LANGUAGES=	# none
-EGG_NAME=	${DISTNAME:S/-/_/1}
-
-DEPENDS+=	${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy-[0-9]*:../../databases/py-sqlalchemy
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy-utils-[0-9]*:../../databases/py-sqlalchemy-utils
 DEPENDS+=	${PYPKGPREFIX}-validators-[0-9]*:../../textproc/py-validators
 
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
+
+USE_LANGUAGES=	# none
+
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-symath/Makefile b/py-symath/Makefile
index 511dd9a5f1..18208ee9c1 100644
--- a/py-symath/Makefile
+++ b/py-symath/Makefile
@@ -10,13 +10,15 @@ HOMEPAGE=	https://github.com/bniemczyk/symbolic
 COMMENT=	symbolic mathematics for python
 LICENSE=	2-clause-bsd
 
+DPENDS+=        ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
+
 WRKSRC=		${WRKDIR}/symath-0.1.22
 
-USE_LANGUAGES=	# none
+PYTHON_VERSIONED_DEPENDENCIES+=	pyparsing
 
+USE_LANGUAGES=	# none
 
-DPENDS+=        ${PYPKGPREFIX}-pyparsing>=2.0.2:../../devel/py-pyparsing
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DPENDS+=        ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index