Version bump.

(Portage version: 2.1.2.2)

6 files changed, 13 insertions, 73 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index ac4991101ee2..7a32982ee5fa 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.7 2007/03/20 08:23:56 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.8 2007/03/24 07:59:14 lucass Exp $
+
+*sqlalchemy-0.3.6 (24 Mar 2007)
+
+  24 Mar 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -sqlalchemy-0.3.4.ebuild, -sqlalchemy-0.3.5.ebuild,
+  +sqlalchemy-0.3.6.ebuild:
+  Version bump.
 
   20 Mar 2007; Lukasz Strzygowski <lucass@gentoo.org>
   sqlalchemy-0.3.5.ebuild:
diff --git a/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.4 b/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.4
deleted file mode 100644
index b7810b453414..000000000000
--- a/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 38b258725d3c76c9d5aa36f471789064 SQLAlchemy-0.3.4.tar.gz 769753
-RMD160 af1f1f2eaaffc61beb64d620995454b6dc26dfef SQLAlchemy-0.3.4.tar.gz 769753
-SHA256 c68f56ffe6986a331ab83be29ca2fa57ee9330b609f6c003ef8034603d122e1c SQLAlchemy-0.3.4.tar.gz 769753
diff --git a/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.5 b/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.5
deleted file mode 100644
index 9e9615e673dd..000000000000
--- a/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5d4a317c542247f82d1ed7e256976117 SQLAlchemy-0.3.5.tar.gz 794157
-RMD160 a5627cb8cd693237fdce3008b76461a5453e93e6 SQLAlchemy-0.3.5.tar.gz 794157
-SHA256 b47083487335d037f01f5bce59fdce069a96870d6cc7a2b677f026ca178e5882 SQLAlchemy-0.3.5.tar.gz 794157
diff --git a/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.6 b/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.6
new file mode 100644
index 000000000000..8bbac39dd882
--- /dev/null
+++ b/dev-python/sqlalchemy/files/digest-sqlalchemy-0.3.6
@@ -0,0 +1,3 @@
+MD5 06cd60950d8f97f9466a323d3fae5cb5 SQLAlchemy-0.3.6.tar.gz 824550
+RMD160 507eacb1c2f86c0d8e718423f56abb16a17d97c5 SQLAlchemy-0.3.6.tar.gz 824550
+SHA256 32099b7d3190fe2c4dba14890eae829d403e4780f68d270dfe410c484d521c05 SQLAlchemy-0.3.6.tar.gz 824550
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.3.4.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.3.4.ebuild
deleted file mode 100644
index 8660670acd9d..000000000000
--- a/dev-python/sqlalchemy/sqlalchemy-0.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.3.4.ebuild,v 1.1 2007/01/24 11:26:47 dev-zero Exp $
-
-inherit distutils
-
-MY_P=SQLAlchemy-${PV}
-
-DESCRIPTION="Python SQL toolkit and Object Relational Mapper."
-HOMEPAGE="http://www.sqlalchemy.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="firebird mssql mysql postgres sqlite test"
-KEYWORDS="~amd64 ~x86"
-
-# note: if you use psycopg-1, then you need egenix-mx-base
-RDEPEND=">=dev-lang/python-2.4
-	firebird? ( dev-python/kinterbasdb )
-	mssql? ( dev-python/pymssql )
-	mysql? ( dev-python/mysql-python )
-	postgres? (
-		|| (
-			( >=dev-python/psycopg-2 )
-			( <dev-python/psycopg-2 dev-python/egenix-mx-base )
-		)
-	)
-	sqlite? ( || ( dev-python/pysqlite >=dev-lang/python-2.5 ) )"
-
-DEPEND="dev-python/setuptools
-	test? ( || ( dev-python/pysqlite >=dev-lang/python-2.5 ) )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}/test"
-	sed -e 's/\\\.p/.p/g' \
-		-i sql/testtypes.py || die "sed failed"
-}
-
-src_install() {
-	distutils_src_install
-	dohtml doc/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
-
-src_test() {
-	PYTHONPATH="./test/" python test/alltests.py
-}
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.3.6.ebuild
index b8ba81ccc29d..d52536301715 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.3.5.ebuild,v 1.2 2007/03/20 08:23:56 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.3.6.ebuild,v 1.1 2007/03/24 07:59:14 lucass Exp $
 
 NEED_PYTHON=2.4
 
@@ -41,18 +41,8 @@ src_unpack() {
 	# skip testorderby and testorderby_desc
 	# which require sqlite-3.3.13 to pass
 	sed -i \
-		-e '1048,1060d' \
-		-e '1142,1155d' \
+		-e '1091,1119d' \
 		test/orm/mapper.py || die "sed failed"
-
-	sed -i -e 's/sleep(3)/sleep(5)/' \
-		test/engine/pool.py || die "sed failed"
-
-	# fix alltests.py to return 1 on failure
-	sed -i \
-		-e '1iimport sys' \
-		-e 's/\(testbase\.run.*\)/sys.exit(not \1.wasSuccessful())/' \
-		test/alltests.py || die "sed failed"
 }
 
 src_install() {