From 677d24c5946677168afc96e51eeaef4aa3b5260c Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Wed, 21 Apr 2010 08:56:16 +0000
Subject: [PATCH] Fix tests. Package-Manager: portage-HEAD/cvs/Linux x86_64

---
 dev-python/sqlalchemy/Manifest                |  2 +-
 dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index d3f22ad3276a..e449c486da75 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -3,6 +3,6 @@ DIST SQLAlchemy-0.5.8.tar.gz 1546523 RMD160 1118b0d89b13c8866674199302976f17677e
 DIST SQLAlchemy-0.6.0.tar.gz 1830659 RMD160 ede60c362543fc18f9c8959b72d0c1ed3b5525da SHA1 fb90e2c769ebab9e3c7f769aa8e0fa78b0a6460d SHA256 b97714633f81b93bbcaf18dd6219518cba6f82db2c3129970eb1b4b64407c87d
 EBUILD sqlalchemy-0.5.7.ebuild 1372 RMD160 0cba1c1845513b56455a5098fa54db52abd57ca4 SHA1 ef0566f84928a99cb82cb27631df37491e321995 SHA256 6c8ed9df3a79a7ee0e16264e7ae5a469c2a38ace354d839c12659f8c1f62961b
 EBUILD sqlalchemy-0.5.8.ebuild 1476 RMD160 3b390c226151e5e0fd830eab48f6a71bb56449ea SHA1 97dff78fa2e862b7f1065a9aa78c386eeb027c81 SHA256 7147eb20b090ac5d966f6577a9665afc3abab3f59498ded10ec8b98f9526e831
-EBUILD sqlalchemy-0.6.0.ebuild 1524 RMD160 cc32fab0770f215b82925b06d8916a5b9172c4c3 SHA1 e4ec0f8c021c3c18c40e23331bf63079da0507d2 SHA256 ffd02b69951107ae145d4ce2b8af5dae6585199fe279ef79c1ea6bcddd866f6e
+EBUILD sqlalchemy-0.6.0.ebuild 1759 RMD160 743ed1189643b7d5b2f0f89196f90ae67d9da1fb SHA1 947eb77dc430f6227a1da0953e575252361a8475 SHA256 1b99d69c52b6fd8c6add4f2d22b1100d1583bda16b1271a6c679f1c12608525f
 MISC ChangeLog 6732 RMD160 83bc67016ec6108cb322930a2810b2ef7eb9b2da SHA1 abb6269ac8dfef5dd9fd100aa973eea00fb57eb0 SHA256 3cc79cb559017173e919043a2cf3c270ef1e93cd85cf883114ce5a086b922ea5
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild
index ec16e4f2b187..c1639deb340d 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild,v 1.1 2010/04/19 18:35:53 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.6.0.ebuild,v 1.2 2010/04/21 08:56:16 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
@@ -36,13 +36,21 @@ DEPEND="dev-python/setuptools
 		>=dev-python/nose-0.10.4
 		|| ( >=dev-lang/python-2.5[sqlite] dev-python/pysqlite )
 	)"
-RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	sed \
+		-e "s/test_first_connect/_&/" \
+		-e "s/test_second_connect/_&/" \
+		-i test/aaa_profiling/test_pool.py
+}
+
 src_test() {
 	testing() {
-		PYTHONPATH="lib" nosetests-${PYTHON_ABI}
+		[[ "${PYTHON_ABI}" == 3.* ]] && return
+		PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests
 	}
 	python_execute_function testing
 }
-- 
2.26.2