Fixup deps and python_install_all function. Enable parallel build, but disable parallel tests.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 29 insertions, 9 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index 78393978f945..7f7341d82a97 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.98 2013/03/17 05:38:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.99 2013/03/19 03:06:24 floppym Exp $
+
+  19 Mar 2013; Mike Gilbert <floppym@gentoo.org> sqlalchemy-0.8.0.ebuild:
+  Fixup deps and python_install_all function. Enable parallel build, but disable
+  parallel tests.
 
 *sqlalchemy-0.8.0 (17 Mar 2013)
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 0f4005a6e2c2..1590c81e9f01 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX lru_cache_timestamping.patch 1088 SHA256 e4bbc35e94b5091f9abb1cede122d2773bfa3f96a21a62a090fb1c1733a9f0ac SHA512 9d7ad6990b312dec26ede2c1c0717447cb034c4d701435aa278dd9d0214115c6d94d02c6a608c0aab0e28da69c3bfa7cf8bc1c9d61b3bc3dfdca1eb47f63eda8 WHIRLPOOL 149302829080935d5f620c7d6f97cb939b027b944f24c5d5650e009cbbe1bdba8ce2f7172eb2ca761b5a3ab1513c078710f679ccd61b23909423e4b2c1b0ae10
 AUX sqlalchemy-0.7-logging.handlers.patch 466 SHA256 3e2034457bbd4f4cd775f41cad156e27006c0b87cb3bec502b9b405a969d1099 SHA512 a09af91fdd6a1cc9f219c9b45fbe2fa5d9a675d2c2dc769545af52fda44ced40f673426975a09dd943e6ba5087cf0c0caa771c106e0eb755c3ed97c4ddc267fa WHIRLPOOL 8691dd7dbb09a45296dc6890644b06de63bd779cefbfe7b90d2d5753d7d752c5f6836151e26734090e69e928deb396b9a7c70fe8c980bf1a8442e623211ebdc6
 DIST SQLAlchemy-0.7.10.tar.gz 3541639 SHA256 77aa39d65c9d043eba6ba329b359ff867424fd6c403b7c0cb112b65e507e1d66 SHA512 631bc4ffb419defa531a66d82449fe48f93c88371ba0b8ab4217d900a0d1d90efe9699d8a9048d5c2ed33948c6d2f7cae46452ee45d442914018f3361e804367 WHIRLPOOL 74ffc17efbcbb2ac67712b9e11aa48431d18970f46ae5985aaa345aa8691f96e4acc4cf6fa37606699fbba83fcb7f74b0360fea2ac5e93a451585019e110f2ed
@@ -15,6 +18,13 @@ EBUILD sqlalchemy-0.7.6.ebuild 1873 SHA256 8663a56b2bba5be2f41b1da9405872252e3ae
 EBUILD sqlalchemy-0.7.7.ebuild 1880 SHA256 40bd4517bf6a4533a91a3a151762a917c22f7818aa7c654eb97745ca3c035892 SHA512 2dc3cbf311a55e9c20bb7abbdb5961e4c65f27bbe84832afed848e2f0bdad6589654f392ffd1c18c2df871c8cd3a34667bbb66612746acddccf0dfb52b585031 WHIRLPOOL 9a03e6f9a80b6654d17d3185a17b78b2c540a230c960140114b29b0a0dd8692e28afc005d850c1b987536969cede77f6c3de17011f5653c204358f9ca574b366
 EBUILD sqlalchemy-0.7.8.ebuild 1910 SHA256 4fa40481cd84b3fcdc28f0e0c14270623279e3af4ff28ecadd4fef9189791366 SHA512 c50aa7d79db8e46fa2b09118d22da54c19fdf0cddcce89bbcc49f3e63892fcf695bbb8c45e6fcf4a51e1d649c6419aadc3b1c1bf05f84106e404b48702c67111 WHIRLPOOL 7f5b5a44ff27e81f9d146b291cb600be130c7a3abb8d82040c5f061119319d1f8919d0522ea4afc5df7c670d18d365b8bbca9b5708d0c1205dd0c14d00051fe9
 EBUILD sqlalchemy-0.7.9.ebuild 1965 SHA256 47fd350c76b2dcb834ac8d75b677cdb27da09ec8e6b2b78b9df067fb997dd5a9 SHA512 6023a022a3e5836f4c6b94516870b580acb9602c42a59404b4eaefc1ad250b902032693c7425b8b3f3b047d8fcc4c772f71763bfc235df054a65c89b675c9839 WHIRLPOOL 69f562b311cfdca31b56fbaee3dd5b740c4014e74af2ed266f617c4ff661c2940d36f47128851e3f3c6c9dd12b500a60002ffde9593a41499ba00f4177dcfcaa
-EBUILD sqlalchemy-0.8.0.ebuild 1718 SHA256 d89bc316fd12ce988a8aef2c293e8aa5b3337b78755931f5dd51ecbbed369abc SHA512 2424bb1e9565b79a7926ba03eef7b5f41318ee0769a35e1b2559bd996baf41be9502963d98a89ba5f97d47c32acb462dec67ce1c52a535a696436f28a668e764 WHIRLPOOL d751e3cbdb6c7ee82c46f0010bea30bc474575df8bc7ff77595474d79eef158cfb332a45cfc743c16b41c5ac34a4f328bc23a437e83f640c6cc8d306291b5033
-MISC ChangeLog 14432 SHA256 5f58d2c95e7f0303ba6b4b9fcbda91bae14cc64785f8bac8f2ebf3869f97e73a SHA512 de0beb97d76162a38bd0c15a117e680d2eb0320969c9f82f856102d9cdfbc7248c9a23070567ca7a29c74cc8af6a4860d86e82dcdf7cfd38e7ffda5a22dc9e9a WHIRLPOOL d09d2fb5db29a5bd43b3d8a6971c95a33d5152bccbdc8a05ac676d268655e3d9f3a5cbcecb1b4cdcc6bd79ff8b04bc89b68dc395901292b0cc29867503043ff1
+EBUILD sqlalchemy-0.8.0.ebuild 2001 SHA256 8addb5f15a81ea5119fd34bc4cd1be2f86d2b61600fc0ea5df57a0a09eb25007 SHA512 23115f3fe7104d001a5efcc52f7753abbfb36b126ec62efbda66cab41d0b3b273e133283ec82649611fd3226d347ce670cb2770561b75fa30167166b177ae87c WHIRLPOOL 8265eda8603842db773f8e9d989dac57308502b868446376aa0c46999476d6d18029d34f0e11f9b980dc21de9263dd46d5285a5e9496f6c00f1a72cf33dd1986
+MISC ChangeLog 14606 SHA256 69aae20d42b5996b1cad57c7f7940c4bc99dab86da009a13022c0ffbeda5cb34 SHA512 976e4c222f9c9ffa7896fd9f30bb7eb7b5b65441b871ea03814e89561a5e28262af1dd26a35ebf6a94a347b4d1e174343859dd4f5adf65b385e3e129b4f746fc WHIRLPOOL bd965389ff220823f9a9175f520af6b638d4c5c5a40b9f0c1fc0896c5236eaaf9d487fca2dd4493fcdc5476334f99b39cfe8ded853703ed14afc2e3076a52167
 MISC metadata.xml 233 SHA256 77ca0910fec09997d5679f4de22c824a0b0de12d9ac12b253ad544ae7357f720 SHA512 1521eab2401d4b820c053a13680ec44b9bf4931516f4f4c1508ca92b288bf6cae2db36a875ddc5c2475e862c16d3e92cb662c093958950ead4eb72e463abcff6 WHIRLPOOL 9279e4a60e5c11a72f329dcc13bd9c18d3bbfc1fcaab98f46df1336835f407a8471b4a76b61e74a5fa1bb8e24156cd5e3c2e8418752a412479f37b6193b74ec6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFH1jIACgkQC77qH+pIQ6Q37gEAx1zLDkB7tIP9mwi73ZDELiQP
+tnzIwTq6stn3G+CJHjMA/i62px0MOFTItl5pwm2xUcdQCyHSwiACeRiY1MnExQSL
+=f5iA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
index c6154b3c206f..7cfb9b0a6e1c 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild,v 1.1 2013/03/17 05:38:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.0.ebuild,v 1.2 2013/03/19 03:06:24 floppym Exp $
 
 EAPI=5
 # py3 appears underdone, 
@@ -24,8 +24,8 @@ IUSE="doc examples firebird mssql mysql postgres +sqlite test"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	firebird? ( dev-python/kinterbasdb )
 	mssql? ( dev-python/pymssql )
-	mysql? ( dev-python/mysql-python )
-	postgres? ( >=dev-python/psycopg-2 )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	sqlite? (
 		>=dev-db/sqlite-3.3.13 )"
 DEPEND="${RDEPEND}
@@ -34,8 +34,6 @@ DEPEND="${RDEPEND}
 		>=dev-python/nose-0.10.4[${PYTHON_USEDEP}]
 	)"
 
-# py26 tests needs
-DISTUTILS_NO_PARALLEL_BUILD=1
 S="${WORKDIR}/${MY_P}"
 
 python_prepare_all() {
@@ -45,6 +43,7 @@ python_prepare_all() {
 }
 
 python_configure_all() {
+	# Make sure to disable this if python3 support is added.
 	append-flags -fno-strict-aliasing
 }
 
@@ -52,7 +51,14 @@ python_test() {
 	"${PYTHON}" sqla_nose.py || die
 }
 
-src_install_all() {
+src_test() {
+	# Possible problem in test.ext.test_serializer.SerializeTest.test_query
+	# AssertionError: desired statement count 1 does not match 2
+	# Investigate if you are bored.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
+python_install_all() {
 	if use doc; then
 		pushd doc > /dev/null
 		rm -fr build