pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: stop using pyparsing from versioned_dependencies
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Thu Jul 21 00:20:51 2022 +0200
Changeset: 1fe741402f3f3fab5ae2c020d051089a1cc31027
Modified Files:
TODO
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:
*: stop using pyparsing from versioned_dependencies
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1fe741402f3f3fab5ae2c020d051089a1cc31027
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
TODO | 1 +
py-alfanous/Makefile | 3 +--
py-amply/Makefile | 4 +---
py-brian2/Makefile | 4 +---
py-calphad/Makefile | 4 +---
py-chempy/Makefile | 4 +---
py-cliff/Makefile | 4 +---
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 | 4 +---
py-nxpd/Makefile | 4 +---
py-pgmpy/Makefile | 4 +---
py-rdflib340/Makefile | 4 +---
py-sqlalchemy-searchable/Makefile | 4 +---
py-symath/Makefile | 6 ++----
21 files changed, 23 insertions(+), 58 deletions(-)
diffs:
diff --git a/TODO b/TODO
index b891eece42..5a85c81a57 100644
--- a/TODO
+++ b/TODO
@@ -81,6 +81,7 @@ Suggested package updates
o libgtk-java-2.10.2
o libpthread-stubs-0.3
o libressl-2.3.1
+ o lightdm-1.32
o lives-2.8.2
o lucene-4.5.0
o man-1.6f
diff --git a/py-alfanous/Makefile b/py-alfanous/Makefile
index 32cc4fe2c9..ab79d0dfb0 100644
--- a/py-alfanous/Makefile
+++ b/py-alfanous/Makefile
@@ -12,10 +12,9 @@ LICENSE= gnu-agpl-v3
WRKSRC= ${WRKDIR}/alfanous-0.7.28
-PYTHON_VERSIONED_DEPENDENCIES== pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 ff850ac0ae..f0d0394452 100644
--- a/py-amply/Makefile
+++ b/py-amply/Makefile
@@ -12,11 +12,9 @@ LICENSE= eclipse-license
BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-docutils>=0.16:../../textproc/py-docutils
-
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 ca8a2f559a..927098d174 100644
--- a/py-brian2/Makefile
+++ b/py-brian2/Makefile
@@ -13,14 +13,12 @@ COMMENT= Clock-driven simulator for spiking neural networks
DEPENDS+= ${PYPKGPREFIX}-future>=0.18.2:../../devel/py-future
DEPENDS+= ${PYPKGPREFIX}-sympy>=1.5.1:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2
-
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 17327da669..1b8cf64016 100644
--- a/py-calphad/Makefile
+++ b/py-calphad/Makefile
@@ -13,14 +13,12 @@ LICENSE= mit
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
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
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 6afd243235..409140a6ca 100644
--- a/py-chempy/Makefile
+++ b/py-chempy/Makefile
@@ -16,13 +16,11 @@ DEPENDS+= ${PYPKGPREFIX}-sympy>=1.6.2:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-quantities>=0.12.4:../../wip/py-quantities
DEPENDS+= ${PYPKGPREFIX}-sym>=0.3.4:../../wip/py-sym
DEPENDS+= ${PYPKGPREFIX}-jupyter_client>=6.1.7:../../devel/py-jupyter_client
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
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 0106277c2e..23746e42b0 100644
--- a/py-cliff/Makefile
+++ b/py-cliff/Makefile
@@ -14,11 +14,9 @@ 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
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 1126ecba93..57ae970d7d 100644
--- a/py-cmd2/Makefile
+++ b/py-cmd2/Makefile
@@ -10,12 +10,11 @@ HOMEPAGE= https://files.pythonhosted.org/packages/source/c/cmd2/
COMMENT= Extra features for standard library's cmd module
LICENSE= mit
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 5c2b0b5850..88b1d9b96d 100644
--- a/py-cnfgen/Makefile
+++ b/py-cnfgen/Makefile
@@ -11,13 +11,11 @@ COMMENT= CNF formula generator
LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
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 d67229c11d..85e467a0f5 100644
--- a/py-coconut/Makefile
+++ b/py-coconut/Makefile
@@ -26,17 +26,15 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-pygments>=2.3.1:../../textproc/py-pygments
BUILD_DEPENDS+= ${PYPKGPREFIX}-pexpect>=4.8.0:../../devel/py-pexpect
BUILD_DEPENDS+= ${PYPKGPREFIX}-mypy>=0.761:../../lang/py-mypy
BUILD_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.8.2:../../wip/py-pre-commit
+BUILD_DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
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 34dac4a407..f7bfcf3202 100644
--- a/py-corpus/Makefile
+++ b/py-corpus/Makefile
@@ -10,12 +10,11 @@ HOMEPAGE= http://www.alfanous.org/
COMMENT= Arabic Quranic Corpus python API
LICENSE= gnu-gpl-v3
-WRKSRC= ${WRKDIR}/PyCorpus-0.1
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+WRKSRC= ${WRKDIR}/PyCorpus-0.1
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 4f00d956d0..9635082349 100644
--- a/py-dot2tex/Makefile
+++ b/py-dot2tex/Makefile
@@ -10,10 +10,9 @@ HOMEPAGE= https://github.com/kjellmf/dot2tex
COMMENT= Graphviz to LaTeX converter
LICENSE= mit
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 a61e6e260c..7b39b4806b 100644
--- a/py-etesync/Makefile
+++ b/py-etesync/Makefile
@@ -23,11 +23,9 @@ 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+= packaging pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 88a9683218..b8fb189083 100644
--- a/py-fortpy/Makefile
+++ b/py-fortpy/Makefile
@@ -11,10 +11,9 @@ COMMENT= Fortran Parsing, Unit Testing and Intellisense
LICENSE= mit
DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.14.0:../../security/py-paramiko
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
#DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.0:../../time/py-dateutil
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
-
USE_LANGUAGES= # none
REPLACE_PYTHON+= fortpy/scripts/*.py*
@@ -25,5 +24,4 @@ post-extract:
.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-moya/Makefile b/py-moya/Makefile
index 9e3efd3da1..c55b9dd4c7 100644
--- a/py-moya/Makefile
+++ b/py-moya/Makefile
@@ -29,8 +29,7 @@ DEPENDS+= ${PYPKGPREFIX}-postmarkup>=1.2.2:../../wip/py-postmarkup
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
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
USE_LANGUAGES= # none
USE_PKGLOCALEDIR= yes
@@ -39,5 +38,4 @@ 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 155ec656b1..1453557dcf 100644
--- a/py-ngxtop/Makefile
+++ b/py-ngxtop/Makefile
@@ -14,14 +14,12 @@ DEPENDS+= ${PYPKGPREFIX}-docopt>=0.6.2:../../devel/py-docopt
DEPENDS+= ${PYPKGPREFIX}-tabulate>=0.8.3:../../textproc/py-tabulate
DEPENDS+= ${PYPKGPREFIX}-curses>=2.7.16:../../devel/py-curses
DEPENDS+= ${PYPKGPREFIX}-sqlite3>=2.7.16:../../databases/py-sqlite3
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
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 e0c910263a..e70207b021 100644
--- a/py-nxpd/Makefile
+++ b/py-nxpd/Makefile
@@ -11,11 +11,9 @@ COMMENT= NetworkX Pydot Draw
LICENSE= unlicense
DEPENDS+= ${PYPKGPREFIX}-networkx>=2.4:../../math/py-networkx
-
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 6dc48e2289..a23bf52f26 100644
--- a/py-pgmpy/Makefile
+++ b/py-pgmpy/Makefile
@@ -13,12 +13,10 @@ LICENSE= mit
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
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 de67b93fa4..9f376c79ba 100644
--- a/py-rdflib340/Makefile
+++ b/py-rdflib340/Makefile
@@ -18,11 +18,9 @@ LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-html5lib>=0:../../textproc/py-html5lib
DEPENDS+= ${PYPKGPREFIX}-sparqlwrapper:../../www/py-sparqlwrapper
DEPENDS+= ${PYPKGPREFIX}-isodate:../../time/py-isodate
-
-PYTHON_VERSIONED_DEPENDENCIES+= pyparsing
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 4396e1be0a..e6b692b4b5 100644
--- a/py-sqlalchemy-searchable/Makefile
+++ b/py-sqlalchemy-searchable/Makefile
@@ -13,11 +13,9 @@ LICENSE= modified-bsd # TODO: (see mk/license.mk)
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
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-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 18208ee9c1..f37bc86586 100644
--- a/py-symath/Makefile
+++ b/py-symath/Makefile
@@ -10,15 +10,13 @@ HOMEPAGE= https://github.com/bniemczyk/symbolic
COMMENT= symbolic mathematics for python
LICENSE= 2-clause-bsd
-DPENDS+= ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
+DEPENDS+= ${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
+DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
WRKSRC= ${WRKDIR}/symath-0.1.22
-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"
Home |
Main Index |
Thread Index |
Old Index