don't depend on py-setuptools directly

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: don't depend on py-setuptools directly
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Sun, 01 Nov 2015 18:30:56 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Nov 1 19:30:56 2015 +0100
Changeset:	23cf9b7049c02af68d69bc382e50ff292b993907

Modified Files:
	fs-uae-launcher/Makefile
	livestreamer/Makefile
	py-CalendarServer/Makefile
	py-CalendarServer/PLIST
	py-algopy/Makefile
	py-algopy/PLIST
	py-automata/Makefile
	py-automata/PLIST
	py-cbc/Makefile
	py-djvulibre/Makefile
	py-editorconfig-core/Makefile
	py-editorconfig-core/PLIST
	speedtest-cli/Makefile

Log Message:
don't depend on py-setuptools directly

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=23cf9b7049c02af68d69bc382e50ff292b993907

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

diffstat:
 fs-uae-launcher/Makefile      |  3 ++-
 livestreamer/Makefile         |  1 -
 py-CalendarServer/Makefile    |  6 ++----
 py-CalendarServer/PLIST       | 14 +++++++-------
 py-algopy/Makefile            |  4 +---
 py-algopy/PLIST               | 10 +++++-----
 py-automata/Makefile          |  4 +---
 py-automata/PLIST             | 14 +++++++-------
 py-cbc/Makefile               |  2 --
 py-djvulibre/Makefile         |  2 --
 py-editorconfig-core/Makefile |  6 ++----
 py-editorconfig-core/PLIST    | 10 +++++-----
 speedtest-cli/Makefile        |  4 +---
 13 files changed, 33 insertions(+), 47 deletions(-)

diffs:
diff --git a/fs-uae-launcher/Makefile b/fs-uae-launcher/Makefile
index 0d38c9d..fd1de69 100644
--- a/fs-uae-launcher/Makefile
+++ b/fs-uae-launcher/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Graphical launcher for FS-UAE, the Amiga Emulator
 LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake
+PYDISTUTILSPKG=	yes
 
 INSTALL_ENV+=	prefix=${PREFIX}
 INSTALL_ENV+=	DESTDIR=${DESTDIR}
@@ -27,7 +28,6 @@ PLIST_SUBST+=   PYVERSSUFFIX=${PYVERSSUFFIX}	# 3.4
 PLIST_SUBST+=   PYVERS=${PYPKGPREFIX:S/py//}	# py34 -> 34
 PLIST_SUBST+=   VERSION=${VERSION}
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=1.1.5:../../devel/py-setuptools
 #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
@@ -43,5 +43,6 @@ post-install:
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/livestreamer/Makefile b/livestreamer/Makefile
index 826493a..1e5f6c2 100644
--- a/livestreamer/Makefile
+++ b/livestreamer/Makefile
@@ -10,7 +10,6 @@ HOMEPAGE=	http://livestreamer.tanuki.se/
 COMMENT=	Tool that pipes video streams into a video player
 LICENSE=	2-clause-bsd
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-requests-[0-9]*:../../devel/py-requests
 
 .include "../../lang/python/egg.mk"
diff --git a/py-CalendarServer/Makefile b/py-CalendarServer/Makefile
index 419c290..4560a4d 100644
--- a/py-CalendarServer/Makefile
+++ b/py-CalendarServer/Makefile
@@ -29,21 +29,19 @@ DEPENDS+=	${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
 DEPENDS+=	${PYPKGPREFIX}-nevow-[0-9]*:../../www/py-nevow
 DEPENDS+=	${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-sqlparse-[0-9]*:../../databases/py-sqlparse
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-xattr-[0-9]*:../../sysutils/py-xattr
 DEPENDS+=	epydoc-[0-9]*:../../devel/epydoc
 DEPENDS+=	memcached-[0-9]*:../../devel/memcached
 DEPENDS+=	openldap-client-[0-9]*:../../databases/openldap-client
-DEPENDS+=	postgresql93-server-[0-9]*:../../databases/postgresql93-server
+DEPENDS+=	postgresql94-server-[0-9]*:../../databases/postgresql94-server
 DEPENDS+=	subversion-base-[0-9]*:../../devel/subversion-base
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-twisted, py-xml via py-nevow, py-psutil, py-Kerberos, py-ldap
 
-USE_LANGUAGES=	c
 USE_TOOLS+=	bash:run
 
 EGG_NAME=	CalendarServer-6.0a.unknown_r14210MS
@@ -59,6 +57,6 @@ REPLACE_PYTHON+=	txdav/common/datastore/upgrade/migrate.py
 REPLACE_PYTHON+=	txdav/common/datastore/upgrade/sql/upgrade.py
 
 .include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
 .include "../../lang/python/versioned_dependencies.mk"
-.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-CalendarServer/PLIST b/py-CalendarServer/PLIST
index 7688049..0473799 100644
--- a/py-CalendarServer/PLIST
+++ b/py-CalendarServer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/12/09 10:17:42 thomasklausner Exp $
+@comment $NetBSD$
 bin/caldavd
 bin/calendarserver_check_database_schema
 bin/calendarserver_command_gateway
@@ -22,12 +22,12 @@ bin/calendarserver_shell
 bin/calendarserver_upgrade
 bin/calendarserver_verify_data
 caldavd/caldavd.plist
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/calendarserver/__init__.py
 ${PYSITELIB}/calendarserver/__init__.pyc
 ${PYSITELIB}/calendarserver/__init__.pyo
diff --git a/py-algopy/Makefile b/py-algopy/Makefile
index 7188950..bd23b8b 100644
--- a/py-algopy/Makefile
+++ b/py-algopy/Makefile
@@ -10,8 +10,6 @@ HOMEPAGE=	http://packages.python.org/algopy
 COMMENT=	Taylor Arithmetic Computation and Algorithmic Differentiation
 LICENSE=	modified-bsd
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-
 WRKSRC=		${WRKDIR}/algopy-0.5.0
 
 USE_LANGUAGES=	# none
@@ -20,5 +18,5 @@ do-test:
 	${RUN} cd ${WRKSRC}/algopy; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_utils.py
 
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-algopy/PLIST b/py-algopy/PLIST
index 9f6dd7a..743dc8b 100644
--- a/py-algopy/PLIST
+++ b/py-algopy/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2013/08/31 22:13:21 jihbed Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD$
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/algopy/__init__.py
 ${PYSITELIB}/algopy/__init__.pyc
 ${PYSITELIB}/algopy/__init__.pyo
diff --git a/py-automata/Makefile b/py-automata/Makefile
index 6539777..1ed01f9 100644
--- a/py-automata/Makefile
+++ b/py-automata/Makefile
@@ -10,9 +10,7 @@ HOMEPAGE=	http://github.com/bniemczyk/automata
 COMMENT=	Finite automata for python
 LICENSE=	modified-bsd
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-
 USE_LANGUAGES=	c c++
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-automata/PLIST b/py-automata/PLIST
index af1977a..a1e035b 100644
--- a/py-automata/PLIST
+++ b/py-automata/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2014/01/14 21:20:57 jihbed Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/not-zip-safe
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD$
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/automata/Makefile
 ${PYSITELIB}/automata/VM.py
 ${PYSITELIB}/automata/VM.pyc
diff --git a/py-cbc/Makefile b/py-cbc/Makefile
index 8ff09ae..e13ea25 100644
--- a/py-cbc/Makefile
+++ b/py-cbc/Makefile
@@ -10,13 +10,11 @@ HOMEPAGE=	https://github.com/ligo-cbc/pycbc
 COMMENT=	Gravitational wave CBC analysis toolkit
 #LICENSE=	# TODO: (see mk/license.mk)
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=       ${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 WRKSRC=		${WRKDIR}/PyCBC-1.1.0
 
 USE_TOOLS+=	bash
-USE_LANGUAGES=	# none
 
 REPLACE_BASH+=	bin/pycbc_submit_dax \
 						bin/pycbc_submit_dax_stampede
diff --git a/py-djvulibre/Makefile b/py-djvulibre/Makefile
index a9ee815..876ba84 100644
--- a/py-djvulibre/Makefile
+++ b/py-djvulibre/Makefile
@@ -11,14 +11,12 @@ COMMENT=	Python bindings for the DjVuLibre library
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-pyrex-[0-9]*:../../lang/py-pyrex
-DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 
 USE_TOOLS+=	pkg-config #gsed
 #DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
 
 USE_LANGUAGES=	c
 
-PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-pyrex
 
 SUBST_CLASSES+=		setup
diff --git a/py-editorconfig-core/Makefile b/py-editorconfig-core/Makefile
index 64c9602..5c4f8d9 100644
--- a/py-editorconfig-core/Makefile
+++ b/py-editorconfig-core/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	editorconfig-core-py-0.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-py//1}
+EGG_NAME=	EditorConfig-${PKGVERSION_NOREV}
 CATEGORIES=	devel
 MASTER_SITES=	-https://github.com/editorconfig/editorconfig-core-py/archive/v${PKGVERSION}.tar.gz
 
@@ -10,8 +11,5 @@ HOMEPAGE=	http://editorconfig.org/
 COMMENT=	Editorconfig python library
 LICENSE=	python-software-foundation AND modified-bsd
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
-
-.include "../../lang/python/distutils.mk"
-# url2pkg-marker (please do not remove this line.)
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-editorconfig-core/PLIST b/py-editorconfig-core/PLIST
index b47260f..aca8d89 100644
--- a/py-editorconfig-core/PLIST
+++ b/py-editorconfig-core/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2014/04/23 19:50:38 nros Exp $
-${PYSITELIB}/EditorConfig-${PKGVERSION}-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/EditorConfig-${PKGVERSION}-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/EditorConfig-${PKGVERSION}-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/EditorConfig-${PKGVERSION}-py2.7.egg-info/top_level.txt
+@comment $NetBSD$
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/editorconfig/__init__.py
 ${PYSITELIB}/editorconfig/__init__.pyc
 ${PYSITELIB}/editorconfig/__init__.pyo
diff --git a/speedtest-cli/Makefile b/speedtest-cli/Makefile
index 78276f7..cd0fd2a 100644
--- a/speedtest-cli/Makefile
+++ b/speedtest-cli/Makefile
@@ -18,9 +18,7 @@ USE_LANGUAGES=	# none
 
 REPLACE_PYTHON+=	speedtest_cli.py
 
-PYDISTUTILSPKG=	YES
-
-BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+PYDISTUTILSPKG=	yes
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
Prev by Date: py-*: various PY_VERSIONS_INCOMPATIBLE, DESTDIR, dependency and PLIST fixes
Next by Date: apache-velocity: broken after jakarta-oro was removed, so remove it too
Previous by Thread: py-*: various PY_VERSIONS_INCOMPATIBLE, DESTDIR, dependency and PLIST fixes
Next by Thread: apache-velocity: broken after jakarta-oro was removed, so remove it too
Indexes:
Home | Main Index | Thread Index | Old Index