Attachment #155388 for bug #199334

Lines 2-8 Link Here

(-)py-gitdb/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gitdb	4	PORTNAME= gitdb
5	PORTVERSION= 0.5.4	5	PORTVERSION= 0.6.4
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= devel python	7	CATEGORIES= devel python
8	MASTER_SITES= CHEESESHOP	8	MASTER_SITES= CHEESESHOP
Lines 14-20 Link Here
14	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
15		15
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async>=0.6.1:${PORTSDIR}/devel/py-async \	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}async>=0.6.1:${PORTSDIR}/devel/py-async \
17	${PYTHON_PKGNAMEPREFIX}smmap>=0.8.0:${PORTSDIR}/devel/py-smmap	17	${PYTHON_PKGNAMEPREFIX}smmap>=0.8.5:${PORTSDIR}/devel/py-smmap
18		18
19	USES= python	19	USES= python
20	USE_PYTHON= distutils autoplist	20	USE_PYTHON= distutils autoplist

Lines 1-2 Link Here

(-)py-gitdb/distinfo (-2 / +2 lines)
1	SHA256 (gitdb-0.5.4.tar.gz) = de5d2dac0daec4a9cd7bb1ae1cd42d53510dcf597397c608c12a154b69ad3783	1	SHA256 (gitdb-0.6.4.tar.gz) = a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658
2	SIZE (gitdb-0.5.4.tar.gz) = 50258	2	SIZE (gitdb-0.6.4.tar.gz) = 400506




--- setup.py.orig	2015-04-10 00:00:26.000000000 +0300
+++ setup.py	2015-04-10 00:02:33.000000000 +0300
@@ -8,14 +8,6 @@
 
 # wow, this is a mixed bag ... I am pretty upset about all of this ...
 setuptools_build_py_module = None
-try:
-    # don't pull it in if we don't have to
-    if 'setuptools' in sys.modules:
-        import setuptools.command.build_py as setuptools_build_py_module
-        from setuptools.command.build_ext import build_ext
-except ImportError:
-    pass
-
 
 class build_ext_nofail(build_ext):
 

Return to bug 199334

Lines 1-16 Link Here

(-)py-gitdb/files/patch-setup.py (-10 / +11 lines)
1	--- setup.py.orig 2011-07-05 18:59:59.000000000 +0400	1	--- setup.py.orig 2015-04-10 00:00:26.000000000 +0300
2	+++ setup.py 2011-07-14 22:37:09.000000000 +0400	2	+++ setup.py 2015-04-10 00:02:33.000000000 +0300
3	@@ -7,13 +7,6 @@	3	@@ -8,14 +8,6 @@
4		4
5	# wow, this is a mixed bag ... I am pretty upset about all of this ...	5	# wow, this is a mixed bag ... I am pretty upset about all of this ...
6	setuptools_build_py_module = None	6	setuptools_build_py_module = None
7	-try:	7	-try:
8	- # don't pull it in if we don't have to	8	- # don't pull it in if we don't have to
9	- if 'setuptools' in sys.modules:	9	- if 'setuptools' in sys.modules:
10	- import setuptools.command.build_py as setuptools_build_py_module	10	- import setuptools.command.build_py as setuptools_build_py_module
11	- from setuptools.command.build_ext import build_ext	11	- from setuptools.command.build_ext import build_ext
12	-except ImportError:	12	-except ImportError:
13	- pass	13	- pass
		14	-
14		15
15	class build_ext_nofail(build_ext):	16	class build_ext_nofail(build_ext):
16	"""Doesn't fail when build our optional extensions"""	17