pkgsrc-WIP-changes archive

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

*: convert packaging to lang/python/versioned_dependencies.mk



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Nov 9 21:34:11 2021 +0100
Changeset:	86eab2dc99420f8ea41458841e9d11ba1c85c1a3

Modified Files:
	py-checkov/Makefile
	py-etesync/Makefile
	py-pwntools/Makefile

Log Message:
*: convert packaging to lang/python/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=86eab2dc99420f8ea41458841e9d11ba1c85c1a3

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

diffstat:
 py-checkov/Makefile  | 4 +++-
 py-etesync/Makefile  | 3 +--
 py-pwntools/Makefile | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs:
diff --git a/py-checkov/Makefile b/py-checkov/Makefile
index a0df98e239..78919b0aae 100644
--- a/py-checkov/Makefile
+++ b/py-checkov/Makefile
@@ -31,10 +31,12 @@ DEPENDS+=	${PYPKGPREFIX}-jmespath>=0.10.0:../../textproc/py-jmespath
 DEPENDS+=	${PYPKGPREFIX}-tqdm>=4.49.0:../../misc/py-tqdm
 DEPENDS+=	${PYPKGPREFIX}-update-checker-[0-9]*:../../wip/py-update-checker
 DEPENDS+=	${PYPKGPREFIX}-semantic_version>=2.8.5:../../devel/py-semantic_version
-DEPENDS+=	${PYPKGPREFIX}-packaging>=19.2:../../devel/py-packaging
+
+PYTHON_VERSIONED_DEPENDENCIES+=	packaging
 
 post-extract:
 	${MV} ${WRKSRC}/bin/checkov ${WRKSRC}/bin/checkov${PYVERSSUFFIX}
 
 .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 6c57865689..a61e6e260c 100644
--- a/py-etesync/Makefile
+++ b/py-etesync/Makefile
@@ -17,7 +17,6 @@ DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.9.2:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-furl>=0.5:../../www/py-furl
 DEPENDS+=	${PYPKGPREFIX}-idna>=2.5:../../www/py-idna
 DEPENDS+=	${PYPKGPREFIX}-orderedmultidict>=0.7:../../databases/py-orderedmultidict
-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}-pytz>=2019.1:../../time/py-pytz
@@ -25,7 +24,7 @@ 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
+PYTHON_VERSIONED_DEPENDENCIES+=	packaging pyparsing
 
 USE_LANGUAGES=	# none
 
diff --git a/py-pwntools/Makefile b/py-pwntools/Makefile
index 8428238328..9014957442 100644
--- a/py-pwntools/Makefile
+++ b/py-pwntools/Makefile
@@ -16,7 +16,6 @@ DEPENDS+=	${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-intervaltree>=3.0:../../devel/py-intervaltree
 DEPENDS+=	${PYPKGPREFIX}-mako>=1.0.0:../../devel/py-mako
-DEPENDS+=	${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=	${PYPKGPREFIX}-paramiko>=1.15.2:../../security/py-paramiko
 DEPENDS+=	${PYPKGPREFIX}-pip>=6.0.8:../../devel/py-pip
 DEPENDS+=	${PYPKGPREFIX}-psutil>=3.3.0:../../sysutils/py-psutil
@@ -30,6 +29,8 @@ DEPENDS+=	${PYPKGPREFIX}-six>=1.12.0:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-sortedcontainers-[0-9]*:../../devel/py-sortedcontainers
 DEPENDS+=	${PYPKGPREFIX}-unicorn>=1.0.2:../../emulators/py-unicorn
 
+PYTHON_VERSIONED_DEPENDENCIES+=	packaging
+
 post-install:
 .for f in asm checksec common constgrep cyclic debug disablenx disasm elfdiff \
     elfpatch errno hex main phd pwnstrip scramble shellcraft template unhex \
@@ -38,6 +39,6 @@ post-install:
 .endfor
 	${MV} ${DESTDIR}${PREFIX}/bin/pwn ${DESTDIR}${PREFIX}/bin/pwn${PYVERSSUFFIX}
 
-
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index