6 files changed, 52 insertions, 24 deletions

diff --git a/databases/py-sqlalchemy/Makefile b/databases/py-sqlalchemy/Makefile
index 6c6c55a414cb..7d30b46f1b75 100644
--- a/databases/py-sqlalchemy/Makefile
+++ b/databases/py-sqlalchemy/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
 CATEGORIES=	databases python
-MASTER_SITES=	SF \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLAlchemy-${DISTVERSION}
 
@@ -30,6 +29,7 @@ OPTIONS+=	MSSQL "support MS SQL Server" off
 OPTIONS+=	MYSQL "support MySql" on
 OPTIONS+=	POSTGRE "support PostGreSQL" on
 OPTIONS+=	SQLITE "support Sqlite" on
+OPTIONS+=	SYBASE "support Sybase" off
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
@@ -58,7 +58,15 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-ps
 .endif
 
 .if !defined(WITHOUT_SQLITE)
+.if ${PYTHON_REL} < 250
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23
+.else
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+.endif
+.endif
+
+.if !defined(WITHOUT_SYBASE)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
 .endif
 
 post-install:
diff --git a/databases/py-sqlalchemy/distinfo b/databases/py-sqlalchemy/distinfo
index 48818a1f3d43..e2059a963955 100644
--- a/databases/py-sqlalchemy/distinfo
+++ b/databases/py-sqlalchemy/distinfo
@@ -1,3 +1,3 @@
-MD5 (SQLAlchemy-0.6.4.tar.gz) = f1e553e73ca989c162ea039b55bd93f5
-SHA256 (SQLAlchemy-0.6.4.tar.gz) = c439342f0e6fd46f564431c9ae4b04a0088897214265e2d18d41ae818d3d6ff1
-SIZE (SQLAlchemy-0.6.4.tar.gz) = 1922090
+MD5 (SQLAlchemy-0.6.5.tar.gz) = a64f3d3115285d50ec52349e5e8e0214
+SHA256 (SQLAlchemy-0.6.5.tar.gz) = 21c8fea3518e2ab0be4f8c19616233af95d1e6a45ddeed92f233fc6cf2a26542
+SIZE (SQLAlchemy-0.6.5.tar.gz) = 2062676
diff --git a/databases/py-sqlalchemy/pkg-plist b/databases/py-sqlalchemy/pkg-plist
index 0c9e318c098a..4907dd7005bc 100644
--- a/databases/py-sqlalchemy/pkg-plist
+++ b/databases/py-sqlalchemy/pkg-plist
@@ -316,18 +316,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/assertsql.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/assertsql.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/assertsql.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/config.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/engines.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/engines.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/engines.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/entities.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/entities.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/entities.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/noseplugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/noseplugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/noseplugin.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/orm.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/orm.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/orm.pyo
@@ -358,10 +352,20 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyo
 %%PORTDOCS%%%%DOCSDIR%%/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/core/compiler.html
 %%PORTDOCS%%%%DOCSDIR%%/core/connections.html
 %%PORTDOCS%%%%DOCSDIR%%/core/engines.html
+%%PORTDOCS%%%%DOCSDIR%%/core/exceptions.html
 %%PORTDOCS%%%%DOCSDIR%%/core/expression_api.html
 %%PORTDOCS%%%%DOCSDIR%%/core/index.html
 %%PORTDOCS%%%%DOCSDIR%%/core/interfaces.html
@@ -387,6 +391,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/orm/collections.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/exceptions.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/extensions/associationproxy.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/extensions/horizontal_shard.html
@@ -457,6 +462,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike-polymorphic.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike.py
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm
diff --git a/databases/py-sqlalchemy06/Makefile b/databases/py-sqlalchemy06/Makefile
index 6c6c55a414cb..7d30b46f1b75 100644
--- a/databases/py-sqlalchemy06/Makefile
+++ b/databases/py-sqlalchemy06/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	sqlalchemy
-PORTVERSION=	0.6.4
+PORTVERSION=	0.6.5
 CATEGORIES=	databases python
-MASTER_SITES=	SF \
-		CHEESESHOP
+MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLAlchemy-${DISTVERSION}
 
@@ -30,6 +29,7 @@ OPTIONS+=	MSSQL "support MS SQL Server" off
 OPTIONS+=	MYSQL "support MySql" on
 OPTIONS+=	POSTGRE "support PostGreSQL" on
 OPTIONS+=	SQLITE "support Sqlite" on
+OPTIONS+=	SYBASE "support Sybase" off
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
@@ -58,7 +58,15 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.0.8:${PORTSDIR}/databases/py-ps
 .endif
 
 .if !defined(WITHOUT_SQLITE)
+.if ${PYTHON_REL} < 250
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite23
+.else
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+.endif
+.endif
+
+.if !defined(WITHOUT_SYBASE)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Sybase.py:${PORTSDIR}/databases/py-sybase
 .endif
 
 post-install:
diff --git a/databases/py-sqlalchemy06/distinfo b/databases/py-sqlalchemy06/distinfo
index 48818a1f3d43..e2059a963955 100644
--- a/databases/py-sqlalchemy06/distinfo
+++ b/databases/py-sqlalchemy06/distinfo
@@ -1,3 +1,3 @@
-MD5 (SQLAlchemy-0.6.4.tar.gz) = f1e553e73ca989c162ea039b55bd93f5
-SHA256 (SQLAlchemy-0.6.4.tar.gz) = c439342f0e6fd46f564431c9ae4b04a0088897214265e2d18d41ae818d3d6ff1
-SIZE (SQLAlchemy-0.6.4.tar.gz) = 1922090
+MD5 (SQLAlchemy-0.6.5.tar.gz) = a64f3d3115285d50ec52349e5e8e0214
+SHA256 (SQLAlchemy-0.6.5.tar.gz) = 21c8fea3518e2ab0be4f8c19616233af95d1e6a45ddeed92f233fc6cf2a26542
+SIZE (SQLAlchemy-0.6.5.tar.gz) = 2062676
diff --git a/databases/py-sqlalchemy06/pkg-plist b/databases/py-sqlalchemy06/pkg-plist
index 0c9e318c098a..4907dd7005bc 100644
--- a/databases/py-sqlalchemy06/pkg-plist
+++ b/databases/py-sqlalchemy06/pkg-plist
@@ -316,18 +316,12 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/assertsql.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/assertsql.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/assertsql.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/config.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/engines.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/engines.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/engines.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/entities.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/entities.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/entities.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/noseplugin.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/noseplugin.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/noseplugin.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/orm.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/orm.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test/orm.pyo
@@ -358,10 +352,20 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/config.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose/noseplugin.pyo
 %%PORTDOCS%%%%DOCSDIR%%/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/core/compiler.html
 %%PORTDOCS%%%%DOCSDIR%%/core/connections.html
 %%PORTDOCS%%%%DOCSDIR%%/core/engines.html
+%%PORTDOCS%%%%DOCSDIR%%/core/exceptions.html
 %%PORTDOCS%%%%DOCSDIR%%/core/expression_api.html
 %%PORTDOCS%%%%DOCSDIR%%/core/index.html
 %%PORTDOCS%%%%DOCSDIR%%/core/interfaces.html
@@ -387,6 +391,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/orm/collections.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/exceptions.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/extensions/associationproxy.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/extensions/horizontal_shard.html
@@ -457,6 +462,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike-polymorphic.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike.py
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy_nose
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/test
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/sql
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/sqlalchemy/orm