3 files changed, 58 insertions, 28 deletions

diff --git a/databases/py-simplecouchdb/Makefile b/databases/py-simplecouchdb/Makefile
index 0d80aee6153d..ab12eeedfdfe 100644
--- a/databases/py-simplecouchdb/Makefile
+++ b/databases/py-simplecouchdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	simplecouchdb
-PORTVERSION=	0.9.24
+PORTVERSION=	0.9.26
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,8 +15,9 @@ DISTNAME=	py-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Simple Librairy to Allow Python Applicationto Use CouchDB
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \
+		${PYTHON_PKGNAMEPREFIX}py-restclient>0:${PORTSDIR}/www/py-py-restclient
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
diff --git a/databases/py-simplecouchdb/distinfo b/databases/py-simplecouchdb/distinfo
index f520352a1024..415bb64b12e5 100644
--- a/databases/py-simplecouchdb/distinfo
+++ b/databases/py-simplecouchdb/distinfo
@@ -1,3 +1,3 @@
-MD5 (py-simplecouchdb-0.9.24.tar.gz) = c8d897aee903fbac58e980b030c38969
-SHA256 (py-simplecouchdb-0.9.24.tar.gz) = c2de14793bbf5acfe86ec99c3cc708de5af1be44652cb1bad343c07b801ed92e
-SIZE (py-simplecouchdb-0.9.24.tar.gz) = 16338
+MD5 (py-simplecouchdb-0.9.26.tar.gz) = 9f37e94baa72b1dbe4dc979dffc5abf2
+SHA256 (py-simplecouchdb-0.9.26.tar.gz) = 4ffb12712191c6d34d7340920e23263290e237db161461a5dc8200c0d2c54eff
+SIZE (py-simplecouchdb-0.9.26.tar.gz) = 314268
diff --git a/databases/py-simplecouchdb/pkg-plist b/databases/py-simplecouchdb/pkg-plist
index c326d18f1fd5..74059615c411 100644
--- a/databases/py-simplecouchdb/pkg-plist
+++ b/databases/py-simplecouchdb/pkg-plist
@@ -2,25 +2,32 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/database.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/database.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/database.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/view.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/view.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client/view.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/database.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/database.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/database.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/design.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/design.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/design.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/document.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/document.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/document.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/server.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/server.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/server.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/view.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/view.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core/view.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/resource.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/resource.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/resource.pyo
@@ -30,18 +37,40 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/base.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/design_doc.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/design_doc.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/design_doc.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/exceptions.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/view.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/view.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/view.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/url.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/url.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/url.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/proxy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/proxy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties/proxy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/session.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/session.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/session.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/resource_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/resource_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/resource_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/schema_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/schema_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/schema_test.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/client
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/core
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema/properties
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb/schema
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/simplecouchdb
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%