pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

*: switch py-dateutils to plain depends

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Feb 20 17:58:54 2017 +0100
Changeset:	e22acaed4e6ff49ce66f73253511d5be3c9be8a0

Modified Files:
	gcalcli-git/Makefile
	gfeedline/Makefile
	libopensync-plugin-moto/Makefile
	py-CalendarServer/Makefile
	py-astropysics/Makefile
	py-logtools/Makefile
	py-openastro/Makefile

Log Message:
*: switch py-dateutils to plain depends

It supports both python 2 and 3 nowadays.

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

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

diffstat:
 gcalcli-git/Makefile             | 3 +--
 gfeedline/Makefile               | 3 +--
 libopensync-plugin-moto/Makefile | 4 +---
 py-CalendarServer/Makefile       | 4 +---
 py-astropysics/Makefile          | 4 +---
 py-logtools/Makefile             | 4 +---
 py-openastro/Makefile            | 4 +++-
 7 files changed, 9 insertions(+), 17 deletions(-)

diffs:
diff --git a/gcalcli-git/Makefile b/gcalcli-git/Makefile
index fec746be05..af1f5fa6dc 100644
--- a/gcalcli-git/Makefile
+++ b/gcalcli-git/Makefile
@@ -12,16 +12,15 @@ GIT_REPOSITORIES=	gcalcli
 GIT_REPO.gcalcli=	git://github.com/insanum/gcalcli.git
 WRKSRC=			${WRKDIR}/gcalcli
 
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-gflags-[0-9]*:../../devel/py-gflags
 DEPENDS+=	${PYPKGPREFIX}-google-api-python-client-[0-9]*:../../www/py-google-api-python-client
 DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 DEPENDS+=	${PYPKGPREFIX}-parsedatetime-[0-9]*:../../time/py-parsedatetime
 DEPENDS+=	${PYPKGPREFIX}-vobject-[0-9]*:../../textproc/py-vobject
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gflags
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/gfeedline/Makefile b/gfeedline/Makefile
index a65855f316..0df9eee9fd 100644
--- a/gfeedline/Makefile
+++ b/gfeedline/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Social network client for GNOME
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-gobject-[0-9]*:../../devel/py-gobject
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 #gir1.2-webkit-3.0
 DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
 #python-openssl
@@ -19,7 +20,6 @@ DEPENDS+=	${PYPKGPREFIX}-oauth-[0-9]*:../../security/py-oauth
 DEPENDS+=	${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 DEPENDS+=	${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-extra
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-beautifulsoup, py-gobject
 
 USE_LANGUAGES=	# none
@@ -66,5 +66,4 @@ post-install:
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/pyversion.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libopensync-plugin-moto/Makefile b/libopensync-plugin-moto/Makefile
index cba97ff1b4..a5fd07b59e 100644
--- a/libopensync-plugin-moto/Makefile
+++ b/libopensync-plugin-moto/Makefile
@@ -9,10 +9,9 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.opensync.org/attachment/wiki/download/
 COMMENT=	Moto plugin for opensync (for Motorola phones)
 
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-libopensync-plugin>=0.22:../../wip/py-libopensync-plugin
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-
 USE_TOOLS+=			pkg-config:run
 
 INSTALLATION_DIRS=		bin lib/opensync/python-plugins share/opensync/defaults
@@ -32,5 +31,4 @@ do-install:
 
 .include "../../comms/libopensync/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-CalendarServer/Makefile b/py-CalendarServer/Makefile
index a9b6c87ef5..48a45460ad 100644
--- a/py-CalendarServer/Makefile
+++ b/py-CalendarServer/Makefile
@@ -23,6 +23,7 @@ DEPENDS+=	${PYPKGPREFIX}-asn1-[0-9]*:../../security/py-asn1
 DEPENDS+=	${PYPKGPREFIX}-cffi-[0-9]*:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
 DEPENDS+=	${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-doctor-[0-9]*:../../devel/py-doctor
 DEPENDS+=	${PYPKGPREFIX}-flakes>=0.6:../../devel/py-flakes
 DEPENDS+=	${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
@@ -37,8 +38,6 @@ DEPENDS+=	memcached-[0-9]*:../../devel/memcached
 DEPENDS+=	openldap-client-[0-9]*:../../databases/openldap-client
 DEPENDS+=	subversion-base-[0-9]*:../../devel/subversion-base
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xml via py-nevow, py-psutil, py-Kerberos, py-ldap
 
 USE_TOOLS+=	bash:run
@@ -57,5 +56,4 @@ 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 "../../mk/bsd.pkg.mk"
diff --git a/py-astropysics/Makefile b/py-astropysics/Makefile
index e1e332cf26..047c84dc46 100644
--- a/py-astropysics/Makefile
+++ b/py-astropysics/Makefile
@@ -11,11 +11,10 @@ HOMEPAGE=	http://www.physics.uci.edu/~etolleru/software.html#astropysics
 COMMENT=	Astrophysics libraries for Python
 LICENSE=	apache-2.0
 
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-fits>=2.3.1:../../graphics/py-fits
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-
 EGG_NAME=	${DISTNAME:S/-r596//}0
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.1dev-r596
@@ -23,5 +22,4 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.1dev-r596
 .include "../../graphics/py-matplotlib/buildlink3.mk"
 .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-logtools/Makefile b/py-logtools/Makefile
index 4f3768d89d..6af117558b 100644
--- a/py-logtools/Makefile
+++ b/py-logtools/Makefile
@@ -11,6 +11,7 @@ HOMEPAGE=	https://github.com/adamhadani/logtools
 COMMENT=	Log files analysis/filtering framework written in Python
 LICENSE=	apache-2.0
 
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-prettytable>=0.5:../../textproc/py-prettytable
 DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.7.9:../../databases/py-sqlalchemy
 DEPENDS+=	${PYPKGPREFIX}-sqlsoup>=0.9.0:../../databases/py-sqlsoup
@@ -19,8 +20,6 @@ DEPENDS+=	${PYPKGPREFIX}-acora>=1.7:../../textproc/py-acora
 USE_LANGUAGES=	# none
 USE_TOOLS+=	bash
 
-PYTHON_VERSIONED_DEPENDENCIES=	dateutil
-
 REPLACE_BASH+=	scripts/*
 
 REPLACE_PYTHON+=	logtools/__init__.py logtools/_config.py
@@ -35,5 +34,4 @@ REPLACE_PYTHON+=	logtools/test/test_logtools.py logtools/utils.py
 
 .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-openastro/Makefile b/py-openastro/Makefile
index 3576422851..af2e483bdd 100644
--- a/py-openastro/Makefile
+++ b/py-openastro/Makefile
@@ -11,7 +11,9 @@ HOMEPAGE=	http://www.openastro.org/
 COMMENT=	Open source astrology program, openastro.org
 LICENSE=	gnu-gpl-v3
 
-PYTHON_VERSIONED_DEPENDENCIES=	cairo dateutil
+DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+
+PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gtk2
 
 WRKSRC=			${WRKDIR}/openastro.org-1.1.38
Home | Main Index | Thread Index | Old Index