From d4a730a41a9752ca26e48c33633ef6158f1021b1 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Tue, 1 Sep 2020 01:06:23 +0200
Subject: [PATCH] *: switch to versioned_dependencies for py-setuptools

---
 fs-uae-launcher/Makefile       | 4 +++-
 printrun/Makefile              | 4 +++-
 py-beautysh/Makefile           | 4 ++--
 py-chemlab/Makefile            | 4 +++-
 py-launchpadlib/Makefile       | 3 ++-
 py-lazr.restfulclient/Makefile | 4 +++-
 py-lazr.uri/Makefile           | 3 ++-
 py-marshmallow/Makefile        | 4 +++-
 py-matrix-angular-sdk/Makefile | 3 ++-
 py-matrix-synapse/Makefile     | 7 ++++---
 py-python-decouple/Makefile    | 3 ++-
 py-repoze.who/Makefile         | 3 ++-
 py-sydent/Makefile             | 6 ++++--
 py-sydent/distinfo             | 8 ++++----
 py-symbolic/Makefile           | 5 +++--
 15 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/fs-uae-launcher/Makefile b/fs-uae-launcher/Makefile
index 5a8eac10c7..1a65bcf803 100644
--- a/fs-uae-launcher/Makefile
+++ b/fs-uae-launcher/Makefile
@@ -36,10 +36,11 @@ PLIST_SUBST+=	VERSION=${VERSION}
 #DEPENDS+=	${PYPKGPREFIX}-qt4>=4.10.2nb1:../../x11/py-qt4
 # when building with qt5 it should co-exist with calibre and qbzr.
 DEPENDS+=	${PYPKGPREFIX}-qt5>=5.4:../../x11/py-qt5
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=20:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-sqlite3>=1:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-lhafile>=0:../../archivers/py-lhafile
 
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+
 # Use the normal "gmake install" to install; not setup.py via "../../lang/python/extension.mk".
 
 post-install:
@@ -49,4 +50,5 @@ post-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/printrun/Makefile b/printrun/Makefile
index 9548fff31c..0b6ed05bfb 100644
--- a/printrun/Makefile
+++ b/printrun/Makefile
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v3
 #PYTHON_VERSIONS_ACCEPTED=	36 27
 PYTHON_VERSIONS_ACCEPTED=	27
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-readline>=1.0:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-serial>=2.6:../../comms/py-serial
 DEPENDS+=	${PYPKGPREFIX}-numpy>=1.8.2:../../math/py-numpy
@@ -31,6 +30,8 @@ PYSETUP=		setup.py
 #PYSETUPINSTALLARGS=	--prefix=${PREFIX}
 REPLACE_PYTHON+=	*.py
 
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+
 #do-install:
 #	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} setup.py install --root=${DESTDIR} --prefix=${PREFIX}
 
@@ -39,4 +40,5 @@ REPLACE_PYTHON+=	*.py
 #.include "../../lang/python/egg.mk"
 .include "../../lang/python/distutils.mk"
 #.include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-beautysh/Makefile b/py-beautysh/Makefile
index 4a04641e31..94e279fcd7 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 "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-chemlab/Makefile b/py-chemlab/Makefile
index 85747896f8..8f456ab777 100644
--- a/py-chemlab/Makefile
+++ b/py-chemlab/Makefile
@@ -11,7 +11,8 @@ COMMENT=	The python chemistry library you were waiting for
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-nose>=1.3.4:../../devel/py-nose
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools:build
 
 pre-configure:
 	# Verify that no fetching is done during build
@@ -20,4 +21,5 @@ 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-launchpadlib/Makefile b/py-launchpadlib/Makefile
index 8f5a5827e3..e561f1a3bf 100644
--- a/py-launchpadlib/Makefile
+++ b/py-launchpadlib/Makefile
@@ -13,13 +13,14 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 DEPENDS+=	${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 # These are in wip/ not in pkgsrc proper:
 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 21edb289fa..f3093a3046 100644
--- a/py-lazr.restfulclient/Makefile
+++ b/py-lazr.restfulclient/Makefile
@@ -13,11 +13,13 @@ LICENSE=	gnu-lgpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 DEPENDS+=	${PYPKGPREFIX}-wadllib-[0-9]*:../../wip/py-wadllib
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 DEPENDS+=	${PYPKGPREFIX}-oauthlib-[0-9]*:../../security/py-oauthlib
 
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+
 USE_LANGUAGES=	# none
 
 .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 eb4a54a5c0..2a510097fb 100644
--- a/py-lazr.uri/Makefile
+++ b/py-lazr.uri/Makefile
@@ -11,9 +11,10 @@ HOMEPAGE=	https://launchpad.net/lazr.uri
 COMMENT=	Library for parsing, manipulating, and generating URIs
 LICENSE=	gnu-lgpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
 
 USE_LANGUAGES=	# none
 
 .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 1bf0522924..f86dee4a31 100644
--- a/py-marshmallow/Makefile
+++ b/py-marshmallow/Makefile
@@ -10,12 +10,14 @@ HOMEPAGE=	https://github.com/marshmallow-code/marshmallow
 COMMENT=	Library for converting complex datatypes
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-dateutil>=2.6.1:../../time/py-dateutil
 
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/marshmallow-3.0.0b8
 USE_LANGUAGES=	# none
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-matrix-angular-sdk/Makefile b/py-matrix-angular-sdk/Makefile
index 6dec9c359b..085c6110be 100644
--- a/py-matrix-angular-sdk/Makefile
+++ b/py-matrix-angular-sdk/Makefile
@@ -13,11 +13,12 @@ HOMEPAGE=	https://github.com/matrix-org/
 COMMENT=	AngularJS services for implementing the Client-Server API
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
 
 USE_LANGUAGES=		# none
 WRKSRC=			${WRKDIR}/${DISTNAME}
 INSTALLATION_DIRS=	${PYSITELIB}
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-matrix-synapse/Makefile b/py-matrix-synapse/Makefile
index 1768428953..c0afeac3b7 100644
--- a/py-matrix-synapse/Makefile
+++ b/py-matrix-synapse/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	synapse-0.22.1
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-matrix-${DISTNAME}
 CATEGORIES=	chat
 GITHUB_PROJECT=	synapse
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
@@ -13,8 +13,6 @@ HOMEPAGE=	https://github.com/matrix-org/
 COMMENT=	Matrix is an open federated Instant Messaging and VoIP
 LICENSE=	apache-2.0
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-jsonschema-[0-9]*:../../textproc/py-jsonschema
 DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
@@ -49,6 +47,8 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27 # py-sphinx via py-repoze.who
 DEPENDS+=	zip>=3.0:../../archivers/zip
 DEPENDS+=	freetype>=1.5:../../graphics/freetype
 
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
+
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include "../../mk/bsd.prefs.mk"
@@ -90,4 +90,5 @@ OWN_DIRS_PERMS+=	${SYNAPSE_LOGDIR} ${SYNAPSE_USER} ${SYNAPSE_GROUP} 0750
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"
 .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 f7ff090fd9..6b0313592a 100644
--- a/py-python-decouple/Makefile
+++ b/py-python-decouple/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE=	https://github.com/henriquebastos/python-decouple/
 COMMENT=	Strict separation of settings from code
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
 
 .include "../../lang/python/egg.mk"
 WRKSRC=		${WRKDIR}/python-decouple-3.1
 USE_LANGUAGES=	# none
 
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-repoze.who/Makefile b/py-repoze.who/Makefile
index a7c08c4441..95ab6ae19c 100644
--- a/py-repoze.who/Makefile
+++ b/py-repoze.who/Makefile
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.repoze.org/
 COMMENT=	Identification and authentication framework for WSGI
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=18.5:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 DEPENDS+=	${PYPKGPREFIX}-WebOb-[0-9]*:../../www/py-WebOb
 DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
@@ -18,9 +17,11 @@ 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-sydent/Makefile b/py-sydent/Makefile
index e1472385de..7803844d7f 100644
--- a/py-sydent/Makefile
+++ b/py-sydent/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
-DISTNAME=	${PYPKGPREFIX}-sydent-0.1
+DISTNAME=	py-sydent-0.1
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py-//}
 CATEGORIES=	www
 GITHUB_PROJECT=	sydent
 MASTER_SITES=	${MASTER_SITE_GITHUB:=matrix-org/}
@@ -15,7 +16,6 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-daemonize>=2.4.7:../../devel/py-daemonize
 DEPENDS+=	${PYPKGPREFIX}-phonenumbers-[0-9]*:../../textproc/py-phonenumbers
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
 DEPENDS+=	${PYPKGPREFIX}-signedjson-[0-9]*:../../security/py-signedjson
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
@@ -25,10 +25,12 @@ DEPENDS+=	${PYPKGPREFIX}-libnacl-[0-9]*:../../security/py-libnacl
 DEPENDS+=	${PYPKGPREFIX}-nacl-[0-9]*:../../security/py-nacl
 DEPENDS+=	${PYPKGPREFIX}-service_identity-[0-9]*:../../security/py-service_identity
 
+PYTHON_VERSIONED_DEPENDENCIES+=	setuptools
 
 WRKSRC=		${WRKDIR}/sydent-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe
 #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-sydent/distinfo b/py-sydent/distinfo
index ec6a0c9c10..a93e7d1dd9 100644
--- a/py-sydent/distinfo
+++ b/py-sydent/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (py27-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = 38922426a4803f37c1abbf5fc057a22502b060d0
-RMD160 (py27-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = d61bf0f1f0ef62dc6ee3e5f3563119f5437db5c2
-SHA512 (py27-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = 85ffd69123915cc6ac2c65f0c9dc881671eab8f94e2e6befd1e71aa4d6be6b8d64673ca35d6a5afd4b1ce364b40cfd65f97aeeb6533bd80cc00b0480007d396a
-Size (py27-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = 33392 bytes
+SHA1 (py-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = 38922426a4803f37c1abbf5fc057a22502b060d0
+RMD160 (py-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = d61bf0f1f0ef62dc6ee3e5f3563119f5437db5c2
+SHA512 (py-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = 85ffd69123915cc6ac2c65f0c9dc881671eab8f94e2e6befd1e71aa4d6be6b8d64673ca35d6a5afd4b1ce364b40cfd65f97aeeb6533bd80cc00b0480007d396a
+Size (py-sydent-0.1-3d3ac5ab802ad91bbecfc0cd6a50bdd31875c1fe.tar.gz) = 33392 bytes
diff --git a/py-symbolic/Makefile b/py-symbolic/Makefile
index 92114a7836..d3d59513e6 100644
--- a/py-symbolic/Makefile
+++ b/py-symbolic/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE=	https://github.com/getsentry/symbolic/
 COMMENT=	Library for dealing with symbol files and more
 LICENSE=	mit
 
-
 MAKE_ENV+=	RUSTFLAGS="-Clink-arg=${COMPILER_RPATH_FLAG}${PREFIX}/lib"
 
-DEPENDS+=       ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+PYTHON_VERSIONED_DEPENDENCIES+=	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
@@ -90,4 +90,5 @@ 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"