D9983.id.diff
No OneTemporary
Actions

Size

19 KB

Referenced Files

None

Subscribers

None

D9983.id.diff
View Options

	Index: MOVED
	===================================================================
	--- MOVED
	+++ MOVED
	@@ -9132,3 +9132,9 @@
	databases/py-sqlalchemy09\|databases/py-sqlalchemy10\|2017-03-12\|Has expired: Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10
	devel/avr-gcc-devel\|\|2017-03-13\|Has expired: There's no longer a point to have both, a -devel and a regular port of GCC for the AVR
	net/py-pysimplesoap\|net/py-soap2py\|2017-03-13\|Rename to match upstream naming
	+devel/py-setuptools\|devel/py27-setuptools\|2017-XX-XX\|Renamed to match other python ports
	+devel/py-setuptools27\|devel/py27-setuptools\|2017-XX-XX\|Renamed to better match other python ports
	+devel/py-setuptools33\|devel/py33-setuptools\|2017-XX-XX\|Renamed to better match other python ports
	+devel/py-setuptools34\|devel/py34-setuptools\|2017-XX-XX\|Renamed to better match other python ports
	+devel/py-setuptools35\|devel/py35-setuptools\|2017-XX-XX\|Renamed to better match other python ports
	+devel/py-setuptools36\|devel/py36-setuptools\|2017-XX-XX\|Renamed to better match other python ports
	Index: Mk/Uses/python.mk
	===================================================================
	--- Mk/Uses/python.mk
	+++ Mk/Uses/python.mk
	@@ -481,9 +481,9 @@

	_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
	.if defined(_PYTHON_FEATURE_DISTUTILS) && \
	- ${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools
	-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+ ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools
	+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	.endif

	# distutils support
	Index: UPDATING
	===================================================================
	--- UPDATING
	+++ UPDATING
	@@ -5,6 +5,20 @@
	You should get into the habit of checking this file for changes each time
	you update your ports collection, before attempting any port upgrades.

	+2017XXXX:
	+ AFFECTS: users of python setuptools
	+ AUTHOR: antoine@FreeBSD.org
	+
	+ The python setuptools ports have been renamed to better match other python ports.
	+ Ports users need to rename them so that portupgrade and portmaster do not
	+ get confused. For example:
	+
	+ pkg set -n py27-setuptools27:py27-setuptools
	+ pkg set -o devel/py-setuptools27:devel/py27-setuptools
	+ or:
	+ pkg set -n py35-setuptools35:py35-setuptools
	+ pkg set -o devel/py-setuptools35:devel/py35-setuptools
	+
	20170312:
	AFFECTS: users of textproc/ack
	AUTHOR: sunpoet@FreeBSD.org
	Index: devel/Makefile
	===================================================================
	--- devel/Makefile
	+++ devel/Makefile
	@@ -4675,13 +4675,7 @@
	SUBDIR += py-semantic_version
	SUBDIR += py-serpent
	SUBDIR += py-setproctitle
	- SUBDIR += py-setuptools
	SUBDIR += py-setuptools-git
	- SUBDIR += py-setuptools27
	- SUBDIR += py-setuptools33
	- SUBDIR += py-setuptools34
	- SUBDIR += py-setuptools35
	- SUBDIR += py-setuptools36
	SUBDIR += py-setuptools_darcs
	SUBDIR += py-setuptools_hg
	SUBDIR += py-setuptools_scm
	@@ -4902,6 +4896,7 @@
	SUBDIR += py-zope.testing
	SUBDIR += py-zope.traversing
	SUBDIR += py-zope.viewlet
	+ SUBDIR += py27-setuptools
	SUBDIR += py3-Jinja2
	SUBDIR += py3-babel
	SUBDIR += py3-click
	@@ -4941,6 +4936,10 @@
	SUBDIR += py3-wcwidth
	SUBDIR += py3-xdg
	SUBDIR += py3-yaml
	+ SUBDIR += py33-setuptools
	+ SUBDIR += py34-setuptools
	+ SUBDIR += py35-setuptools
	+ SUBDIR += py36-setuptools
	SUBDIR += py_static_check
	SUBDIR += pybugz
	SUBDIR += pychecker
	Index: devel/py-d2to1/Makefile
	===================================================================
	--- devel/py-d2to1/Makefile
	+++ devel/py-d2to1/Makefile
	@@ -11,7 +11,7 @@

	LICENSE= BSD3CLAUSE

	-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose

	USES= python
	Index: devel/py-mock/Makefile
	===================================================================
	--- devel/py-mock/Makefile
	+++ devel/py-mock/Makefile
	@@ -14,7 +14,7 @@
	LICENSE= BSD2CLAUSE

	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr \
	${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six
	TESTS_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox
	Index: devel/py-setuptools/Makefile
	===================================================================
	--- devel/py-setuptools/Makefile
	+++ /dev/null
	@@ -1,46 +0,0 @@
	-# $FreeBSD$
	-
	-PORTNAME= setuptools
	-PORTVERSION= 32.1.0
	-CATEGORIES= devel python
	-MASTER_SITES= CHEESESHOP
	-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
	-DIST_SUBDIR= python
	-
	-MAINTAINER= python@FreeBSD.org
	-COMMENT= Python packages installer
	-
	-LICENSE= PSFL
	-
	-NO_ARCH= yes
	-USES= python
	-USE_PYTHON= autoplist concurrent distutils
	-
	-PYDISTUTILS_SETUP= ${PYSETUP}
	-
	-CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}distribute-[0-9]*
	-MAKE_ENV+= SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
	-
	-PLIST_FILES= "@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
	-
	-.include <bsd.port.pre.mk>
	-
	-.if ${PYTHON_VERSION} != ${PYTHON_DEFAULT_VERSION}
	-SUB_FILES+= pkg-message
	-SUB_LIST+= PYTHON_VER=${PYTHON_VER}
	-.endif
	-
	-# These create dependency loops in redports/poudriere, because setuptools
	-# is currently an explicit BUILD & RUN dependency in Uses/python.mk.
	-#TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest
	-#.if ${PYTHON_REL} < 3300
	-#TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
	-#.endif
	-
	-post-install:
	- ${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
	-
	-do-test:
	- @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
	-
	-.include <bsd.port.post.mk>
	Index: devel/py-setuptools/distinfo
	===================================================================
	--- devel/py-setuptools/distinfo
	+++ /dev/null
	@@ -1,3 +0,0 @@
	-TIMESTAMP = 1482063347
	-SHA256 (python/setuptools-32.1.0.tar.gz) = 86d57bf86edc0ecfd2dc0907ed3710bc4501fb13a06c0fcaf7632305b00ce832
	-SIZE (python/setuptools-32.1.0.tar.gz) = 656843
	Index: devel/py-setuptools/files/easy-install.pth.dist
	===================================================================
	--- devel/py-setuptools/files/easy-install.pth.dist
	+++ /dev/null
	@@ -1,2 +0,0 @@
	-import sys; sys.__plen = len(sys.path)
	-import sys; new=sys.path[sys.__plen:]; del sys.path[sys.__plen:]; p=getattr(sys,'__egginsert',0); sys.path[p:p]=new; sys.__egginsert = p+len(new)
	Index: devel/py-setuptools/files/pkg-message.in
	===================================================================
	--- devel/py-setuptools/files/pkg-message.in
	+++ /dev/null
	@@ -1,7 +0,0 @@
	-
	-*******************************************************************
	-
	- Only %%PREFIX%%/bin/easy_install-%%PYTHON_VER%% script has been installed
	- since Python %%PYTHON_VER%% is not the default Python version.
	-
	-*******************************************************************
	Index: devel/py-setuptools/pkg-descr
	===================================================================
	--- devel/py-setuptools/pkg-descr
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-Setuptools is a fully-featured, actively-maintained, and stable library
	-designed to facilitate packaging Python projects, where packaging includes:
	- - Python package and module definitions
	- - Distribution package metadata
	- - Test hooks
	- - Project installation
	- - Platform-specific details
	- - Python 3 support
	-
	-WWW: https://pypi.python.org/pypi/setuptools
	Index: devel/py-setuptools27/Makefile
	===================================================================
	--- devel/py-setuptools27/Makefile
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	-# $FreeBSD$
	-
	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	-
	-PYTHON_VERSION= python2.7
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	-
	-.include "${MASTERDIR}/Makefile"
	Index: devel/py-setuptools33/Makefile
	===================================================================
	--- devel/py-setuptools33/Makefile
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	-# $FreeBSD$
	-
	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	-
	-PYTHON_VERSION= python3.3
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	-
	-.include "${MASTERDIR}/Makefile"
	Index: devel/py-setuptools34/Makefile
	===================================================================
	--- devel/py-setuptools34/Makefile
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	-# $FreeBSD$
	-
	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	-
	-PYTHON_VERSION= python3.4
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	-
	-.include "${MASTERDIR}/Makefile"
	Index: devel/py-setuptools35/Makefile
	===================================================================
	--- devel/py-setuptools35/Makefile
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	-# $FreeBSD$
	-
	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	-
	-PYTHON_VERSION= python3.5
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	-
	-.include "${MASTERDIR}/Makefile"
	Index: devel/py-setuptools36/Makefile
	===================================================================
	--- devel/py-setuptools36/Makefile
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	-# $FreeBSD$
	-
	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	-
	-PYTHON_VERSION= python3.6
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	-
	-.include "${MASTERDIR}/Makefile"
	Index: devel/py-twine/Makefile
	===================================================================
	--- devel/py-twine/Makefile
	+++ devel/py-twine/Makefile
	@@ -16,7 +16,7 @@
	${PYTHON_PKGNAMEPREFIX}pkginfo>=0:sysutils/py-pkginfo \
	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests \
	${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt \
	- ${PYTHON_PKGNAMEPREFIX}setuptools27>=0:devel/py-setuptools27
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/${PYTHON_PKGNAMEPREFIX}setuptools

	USES= python
	USE_PYTHON= distutils autoplist
	Index: devel/py27-setuptools/Makefile
	===================================================================
	--- devel/py27-setuptools/Makefile
	+++ devel/py27-setuptools/Makefile
	@@ -13,7 +13,7 @@
	LICENSE= PSFL

	NO_ARCH= yes
	-USES= python
	+USES?= python:2.7
	USE_PYTHON= autoplist concurrent distutils

	PYDISTUTILS_SETUP= ${PYSETUP}
	Index: devel/py33-setuptools/Makefile
	===================================================================
	--- devel/py33-setuptools/Makefile
	+++ devel/py33-setuptools/Makefile
	@@ -1,10 +1,8 @@
	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	# $FreeBSD$

	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	+MASTERDIR= ${.CURDIR}/../py27-setuptools

	-PYTHON_VERSION= python3.3
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	+USES= python:3.3

	.include "${MASTERDIR}/Makefile"
	Index: devel/py34-setuptools/Makefile
	===================================================================
	--- devel/py34-setuptools/Makefile
	+++ devel/py34-setuptools/Makefile
	@@ -1,10 +1,8 @@
	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	# $FreeBSD$

	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	+MASTERDIR= ${.CURDIR}/../py27-setuptools

	-PYTHON_VERSION= python3.4
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	+USES= python:3.4

	.include "${MASTERDIR}/Makefile"
	Index: devel/py35-setuptools/Makefile
	===================================================================
	--- devel/py35-setuptools/Makefile
	+++ devel/py35-setuptools/Makefile
	@@ -1,10 +1,8 @@
	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	# $FreeBSD$

	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	+MASTERDIR= ${.CURDIR}/../py27-setuptools

	-PYTHON_VERSION= python3.5
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	+USES= python:3.5

	.include "${MASTERDIR}/Makefile"
	Index: devel/py36-setuptools/Makefile
	===================================================================
	--- devel/py36-setuptools/Makefile
	+++ devel/py36-setuptools/Makefile
	@@ -1,10 +1,8 @@
	# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
	# $FreeBSD$

	-PKGNAMESUFFIX= ${PYTHON_SUFFIX}
	+MASTERDIR= ${.CURDIR}/../py27-setuptools

	-PYTHON_VERSION= python3.6
	-
	-MASTERDIR= ${.CURDIR}/../py-setuptools
	+USES= python:3.6

	.include "${MASTERDIR}/Makefile"
	Index: net-mgmt/net-snmp/Makefile
	===================================================================
	--- net-mgmt/net-snmp/Makefile
	+++ net-mgmt/net-snmp/Makefile
	@@ -73,8 +73,8 @@
	PYDISTUTILS_PKGNAME?= netsnmp-python
	PYDISTUTILS_PKGVERSION?= 1.0a1
	USES+= python
	-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	CONFIGURE_ARGS+=--with-python-modules
	CONFIGURE_ENV+= PYTHONPROG="${PYTHON_CMD}"
	MAKE_ENV+= PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}"
	Index: security/gpgme/Makefile
	===================================================================
	--- security/gpgme/Makefile
	+++ security/gpgme/Makefile
	@@ -74,8 +74,8 @@

	. if ${SLAVEPORT} == "python"
	BUILD_DEPENDS+= swig3.0:devel/swig30 \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	USES+= python
	USE_PYTHON= py3kplist
	CONFIGURE_ENV+= SWIG=${LOCALBASE}/bin/swig3.0
	Index: security/py-acme/Makefile
	===================================================================
	--- security/py-acme/Makefile
	+++ security/py-acme/Makefile
	@@ -23,7 +23,7 @@
	${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>=1.0:devel/py-setuptools${PYTHON_SUFFIX} \
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
	${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \
	Index: security/py-certbot/Makefile
	===================================================================
	--- security/py-certbot/Makefile
	+++ security/py-certbot/Makefile
	@@ -24,7 +24,7 @@
	${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
	${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
	${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>=1.0:devel/py-setuptools${PYTHON_SUFFIX} \
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
	${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
	${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
	Index: security/py-crits/Makefile
	===================================================================
	--- security/py-crits/Makefile
	+++ security/py-crits/Makefile
	@@ -33,7 +33,7 @@
	${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl \
	${PYTHON_PKGNAMEPREFIX}pydot>=0:graphics/py-pydot \
	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy \
	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib \
	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
	Index: sysutils/bsdploy/Makefile
	===================================================================
	--- sysutils/bsdploy/Makefile
	+++ sysutils/bsdploy/Makefile
	@@ -11,7 +11,7 @@

	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \
	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}pyliblzma>0:archivers/py-pyliblzma \
	${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
	${PYTHON_PKGNAMEPREFIX}ploy_ansible>=1.3.0:sysutils/py-ploy_ansible \
	Index: sysutils/py-ploy/Makefile
	===================================================================
	--- sysutils/py-ploy/Makefile
	+++ sysutils/py-ploy/Makefile
	@@ -16,7 +16,7 @@

	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy \
	${PYTHON_PKGNAMEPREFIX}paramiko1>0:security/py-paramiko1 \
	- ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+ ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools

	USES= python
	USE_PYTHON= autoplist distutils
	Index: sysutils/py-ploy_ansible/Makefile
	===================================================================
	--- sysutils/py-ploy_ansible/Makefile
	+++ sysutils/py-ploy_ansible/Makefile
	@@ -13,7 +13,7 @@

	LICENSE= GPLv3

	-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
	+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
	${PYTHON_PKGNAMEPREFIX}execnet>0:sysutils/py-execnet \
	ansible1<2.0:sysutils/ansible1
	Index: sysutils/py-ploy_ec2/Makefile
	===================================================================
	--- sysutils/py-ploy_ec2/Makefile
	+++ sysutils/py-ploy_ec2/Makefile
	@@ -13,7 +13,7 @@
	LICENSE= BSD3CLAUSE
	LICENSE_FILE= ${WRKSRC}/LICENSE.txt

	-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
	+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}ploy>=1.0.0:sysutils/py-ploy \
	${PYTHON_PKGNAMEPREFIX}boto>=2.0:devel/py-boto \
	${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy
	Index: sysutils/py-ploy_ezjail/Makefile
	===================================================================
	--- sysutils/py-ploy_ezjail/Makefile
	+++ sysutils/py-ploy_ezjail/Makefile
	@@ -13,7 +13,7 @@
	LICENSE= BSD3CLAUSE
	LICENSE_FILE= ${WRKSRC}/LICENSE.txt

	-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX} \
	+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
	${PYTHON_PKGNAMEPREFIX}ploy>=1.2.0:sysutils/py-ploy \
	${PYTHON_PKGNAMEPREFIX}lazy>0:devel/py-lazy

	Index: www/uzbl/Makefile
	===================================================================
	--- www/uzbl/Makefile
	+++ www/uzbl/Makefile
	@@ -12,7 +12,7 @@
	LICENSE= GPLv3
	LICENSE_FILE= ${WRKSRC}/LICENSE

	-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
	+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/${PYTHON_PKGNAMEPREFIX}setuptools
	LIB_DEPENDS= libwebkitgtk-1.0.so:www/webkit-gtk2 \
	libfontconfig.so:x11-fonts/fontconfig \
	libfreetype.so:print/freetype2 \

File Metadata

Mime Type: text/plain
Expires: Fri, Apr 24, 9:29 AM (5 h, 34 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 32070960
Default Alt Text: D9983.id.diff (19 KB)

D9983.id.diffNo OneTemporaryActions

D9983.id.diffView Options

File Metadata

Event Timeline

D9983.id.diff
No OneTemporary
Actions

D9983.id.diff
View Options