4 files changed, 24 insertions, 73 deletions

diff --git a/devel/py-gitdb/Makefile b/devel/py-gitdb/Makefile
index 4afe3c23338f..2acf7dc605d2 100644
--- a/devel/py-gitdb/Makefile
+++ b/devel/py-gitdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gitdb
-PORTVERSION=	0.5.2
+PORTVERSION=	0.5.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,6 +14,11 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pure Python git object database
 
+LICENSE=	BSD
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}async>=0.6.1:${PORTSDIR}/devel/py-async \
+		${PYTHON_PKGNAMEPREFIX}smmap>=0.8.0:${PORTSDIR}/devel/py-smmap
+
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
diff --git a/devel/py-gitdb/distinfo b/devel/py-gitdb/distinfo
index 48d1f0428298..459a16cb168b 100644
--- a/devel/py-gitdb/distinfo
+++ b/devel/py-gitdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gitdb-0.5.2.tar.gz) = 7105fa7611271ed490775a704e1c6d42b1c2886f422f707db136bad216c5bbac
-SIZE (gitdb-0.5.2.tar.gz) = 171142
+SHA256 (gitdb-0.5.4.tar.gz) = de5d2dac0daec4a9cd7bb1ae1cd42d53510dcf597397c608c12a154b69ad3783
+SIZE (gitdb-0.5.4.tar.gz) = 50258
diff --git a/devel/py-gitdb/files/patch-setup.py b/devel/py-gitdb/files/patch-setup.py
new file mode 100644
index 000000000000..e164ddf90365
--- /dev/null
+++ b/devel/py-gitdb/files/patch-setup.py
@@ -0,0 +1,16 @@
+--- setup.py.orig	2011-07-05 18:59:59.000000000 +0400
++++ setup.py	2011-07-14 22:37:09.000000000 +0400
+@@ -7,13 +7,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):
+ 	"""Doesn't fail when build our optional extensions"""
diff --git a/devel/py-gitdb/pkg-plist b/devel/py-gitdb/pkg-plist
index b716eb9054f1..f3b12ce52619 100644
--- a/devel/py-gitdb/pkg-plist
+++ b/devel/py-gitdb/pkg-plist
@@ -1,5 +1,3 @@
-%%PYTHON_SITELIBDIR%%/gitdb/AUTHORS
-%%PYTHON_SITELIBDIR%%/gitdb/README
 %%PYTHON_SITELIBDIR%%/gitdb/__init__.py
 %%PYTHON_SITELIBDIR%%/gitdb/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gitdb/__init__.pyo
@@ -40,67 +38,6 @@
 %%PYTHON_SITELIBDIR%%/gitdb/stream.py
 %%PYTHON_SITELIBDIR%%/gitdb/stream.pyc
 %%PYTHON_SITELIBDIR%%/gitdb/stream.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/__init__.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/__init__.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/lib.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/lib.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/lib.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_git.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_git.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_git.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_loose.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_loose.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_loose.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_mem.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_mem.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_mem.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_pack.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_pack.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_pack.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_ref.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_ref.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/db/test_ref.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/objects/7b/b839852ed5e3a069966281bb08d50012fb309b
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.idx
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs/pack-11fdfa9e156ab73caae3b6da867192221f2089c2.pack
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.idx
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs/pack-a2bf8e71d8c18879e499335762dd95119d93d9f1.pack
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs/pack-c0438c19fb16422b6bbcce24387b3264416d485b.idx
-%%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs/pack-c0438c19fb16422b6bbcce24387b3264416d485b.pack
-%%PYTHON_SITELIBDIR%%/gitdb/test/lib.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/lib.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/lib.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/lib.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/lib.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/lib.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_pack.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_pack.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_pack.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_pack_streaming.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_pack_streaming.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_pack_streaming.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_stream.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_stream.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/performance/test_stream.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_base.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_base.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_base.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_example.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_example.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_example.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_pack.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_pack.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_pack.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_stream.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_stream.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_stream.pyo
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_util.py
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_util.pyc
-%%PYTHON_SITELIBDIR%%/gitdb/test/test_util.pyo
 %%PYTHON_SITELIBDIR%%/gitdb/typ.py
 %%PYTHON_SITELIBDIR%%/gitdb/typ.pyc
 %%PYTHON_SITELIBDIR%%/gitdb/typ.pyo
@@ -108,11 +45,4 @@
 %%PYTHON_SITELIBDIR%%/gitdb/util.pyc
 %%PYTHON_SITELIBDIR%%/gitdb/util.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/gitdb/db
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test/db
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/objects/7b
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/objects
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test/fixtures/packs
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test/fixtures
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test/performance
-@dirrm %%PYTHON_SITELIBDIR%%/gitdb/test
 @dirrm %%PYTHON_SITELIBDIR%%/gitdb