pkgsrc-WIP-changes archive

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

*: convert py-markdown users to versioned_dependencies.mk



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Nov 1 22:04:20 2021 +0100
Changeset:	fb22661073b8379d8841af061b0a368abd9aaed8

Modified Files:
	calibre/Makefile
	py-Kallithea/Makefile
	py-dexy/Makefile
	py-grip/Makefile
	py-mkdocs-material/Makefile
	py-pdoc3/Makefile
	py-pixiedust/Makefile
	py-pymdown-extensions/Makefile

Log Message:
*: convert py-markdown users 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=fb22661073b8379d8841af061b0a368abd9aaed8

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

diffstat:
 calibre/Makefile               | 3 ++-
 py-Kallithea/Makefile          | 4 +++-
 py-dexy/Makefile               | 3 ++-
 py-grip/Makefile               | 4 +++-
 py-mkdocs-material/Makefile    | 4 +++-
 py-pdoc3/Makefile              | 5 +++--
 py-pixiedust/Makefile          | 4 +++-
 py-pymdown-extensions/Makefile | 3 ++-
 8 files changed, 21 insertions(+), 9 deletions(-)

diffs:
diff --git a/calibre/Makefile b/calibre/Makefile
index e18c69c55e..018719ff9c 100644
--- a/calibre/Makefile
+++ b/calibre/Makefile
@@ -23,7 +23,6 @@ DEPENDS+=	${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
 DEPENDS+=	${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5
 DEPENDS+=	${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11
 DEPENDS+=	${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
-DEPENDS+=	${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
 DEPENDS+=	${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
 DEPENDS+=	${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
@@ -40,6 +39,7 @@ BUILD_DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 EXTRACT_USING=	bsdtar
 
 PYTHON_VERSIONS_ACCEPTED=	27 # as of 3.16.0
+PYTHON_VERSIONED_DEPENDENCIES+=	markdown
 
 USE_LANGUAGES=			c c++
 USE_LIBTOOL=			yes
@@ -144,4 +144,5 @@ BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/py-qt5/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-Kallithea/Makefile b/py-Kallithea/Makefile
index de5bded0cc..39e96896f4 100644
--- a/py-Kallithea/Makefile
+++ b/py-Kallithea/Makefile
@@ -27,7 +27,6 @@ DEPENDS+=	${PYPKGPREFIX}-Whoosh>=2.4.0:../../textproc/py-Whoosh
 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}-markdown>=2.2.1:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.8.1:../../textproc/py-docutils
 DEPENDS+=	${PYPKGPREFIX}-simplejson>=2.5.2:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -38,6 +37,8 @@ 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
+
 REPLACE_PYTHON+=	kallithea/lib/dbmigrate/migrate/versioning/templates/*.py_tmpl
 REPLACE_PYTHON+=	kallithea/tests/scripts/manual_test_crawler.py
 REPLACE_PYTHON+=	kallithea/lib/dbmigrate/migrate/versioning/templates/*/*.py_tmpl
@@ -46,4 +47,5 @@ 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-dexy/Makefile b/py-dexy/Makefile
index ee6ab70d45..39bc277b22 100644
--- a/py-dexy/Makefile
+++ b/py-dexy/Makefile
@@ -16,7 +16,6 @@ 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}-jinja2-[0-9]*:../../textproc/py-jinja2
-DEPENDS+=	${PYPKGPREFIX}-markdown>=2.2.1:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-dexy_viewer>=0.0.4:../../wip/py-dexy_viewer
@@ -26,6 +25,8 @@ WRKSRC=		${WRKDIR}/dexy-0.9.9.5
 
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_ACCEPTED=	27 # py-docutils
+PYTHON_VERSIONED_DEPENDENCIES+=	markdown
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-grip/Makefile b/py-grip/Makefile
index 88bbc64467..6b5cbea5eb 100644
--- a/py-grip/Makefile
+++ b/py-grip/Makefile
@@ -12,12 +12,14 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-docopt>=0.4.0:../../devel/py-docopt
 DEPENDS+=	${PYPKGPREFIX}-flask>=1.1.2:../../www/py-flask
-DEPENDS+=	${PYPKGPREFIX}-markdown>=2.5.1:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-path-and-address>=2.0.1:../../wip/py-path-and-address
 DEPENDS+=	${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-requests>=2.4.1:../../devel/py-requests
 
+PYTHON_VERSIONED_DEPENDENCIES+=	markdown
+
 USE_LANGUAGES=	# none
 
 .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 78ec1d2a99..7e3e475221 100644
--- a/py-mkdocs-material/Makefile
+++ b/py-mkdocs-material/Makefile
@@ -12,11 +12,13 @@ LICENSE=	mit
 
 #DEPENDS+=	${PYPKGPREFIX}-mkdocs>=1.1:../../textproc/py-mkdocs
 DEPENDS+=	${PYPKGPREFIX}-pygments>=2.5.2:../../textproc/py-pygments
-DEPENDS+=	${PYPKGPREFIX}-markdown>=3.1.1:../../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
+
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pdoc3/Makefile b/py-pdoc3/Makefile
index be2becff3a..188afdc66b 100644
--- a/py-pdoc3/Makefile
+++ b/py-pdoc3/Makefile
@@ -13,10 +13,11 @@ LICENSE=	gnu-agpl-v3
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
 
 DEPENDS+=	${PYPKGPREFIX}-mako>=1.1.3:../../devel/py-mako
-DEPENDS+=	${PYPKGPREFIX}-markdown>=3.1.1:../../textproc/py-markdown
 
-USE_LANGUAGES=	# none
+PYTHON_VERSIONED_DEPENDENCIES+=	markdown
 
+USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pixiedust/Makefile b/py-pixiedust/Makefile
index 383e691a01..a249d7cadd 100644
--- a/py-pixiedust/Makefile
+++ b/py-pixiedust/Makefile
@@ -16,13 +16,15 @@ DEPENDS+=	${PYPKGPREFIX}-nbformat>=5.0.8:../../www/py-nbformat
 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}-markdown>=3.1.1:../../textproc/py-markdown
 DEPENDS+=	${PYPKGPREFIX}-colour>=0.1.5:../../textproc/py-colour
 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
+
 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 f83620d377..e983a48087 100644
--- a/py-pymdown-extensions/Makefile
+++ b/py-pymdown-extensions/Makefile
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/facelessuser/pymdown-extensions
 COMMENT=	Extension pack for Python Markdown
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-markdown>=3.1.1:../../textproc/py-markdown
+PYTHON_VERSIONED_DEPENDENCIES+=	markdown
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index