Add mssql to IUSE and fix dependencies for <dev-python/psycopg-2. Closes bug #146248, thanks to Jakub Moc for reporting.

Package-Manager: portage-2.1.1

3 files changed, 23 insertions, 18 deletions

diff --git a/dev-python/sqlalchemy/ChangeLog b/dev-python/sqlalchemy/ChangeLog
index c3b33f43da8a..92c254249d63 100644
--- a/dev-python/sqlalchemy/ChangeLog
+++ b/dev-python/sqlalchemy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sqlalchemy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.1 2006/09/02 11:42:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/ChangeLog,v 1.2 2006/09/12 20:48:10 marienz Exp $
+
+  12 Sep 2006; Marien Zwart <marienz@gentoo.org> sqlalchemy-0.2.7.ebuild:
+  Add mssql to IUSE and fix dependencies for <dev-python/psycopg-2. Closes bug
+  #146248, thanks to Jakub Moc for reporting.
 
 *sqlalchemy-0.2.7 (02 Sep 2006)
 
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index cbb6535a798f..2bb31b447e76 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST SQLAlchemy-0.2.7.tar.gz 626974 RMD160 8f89568714b27331ee6b88b02bbafe67f599a7a6 SHA1 298fa253960318b4631bc0285e55b35b768e682a SHA256 d12ff098ae9206114d0d024469b3f93cc4c9dc5febfd92390391c6155642f19e
-EBUILD sqlalchemy-0.2.7.ebuild 1345 RMD160 1962d5cf80fcaa482c261eac300853146ace053b SHA1 eb428849c880f266a5b4740a804a1bbbca46e963 SHA256 61e1f09aab8236941d3c78d0b989f1f0d200a3a05fd4da4f42997686583de0ce
-MD5 f01c4a7c16d64ef094d33720b3c27e8b sqlalchemy-0.2.7.ebuild 1345
-RMD160 1962d5cf80fcaa482c261eac300853146ace053b sqlalchemy-0.2.7.ebuild 1345
-SHA256 61e1f09aab8236941d3c78d0b989f1f0d200a3a05fd4da4f42997686583de0ce sqlalchemy-0.2.7.ebuild 1345
-MISC ChangeLog 448 RMD160 5db3bc5a31d3402c820b3e6e4da6d316967c4df6 SHA1 ff44b060c392768eb85a02da465e321c34deeb25 SHA256 79368d5c44ec9f66eeb09da3f16877f9f57ae81c04f8727a70172078f1e06485
-MD5 498ebb84145ae1c1282a249a32415c20 ChangeLog 448
-RMD160 5db3bc5a31d3402c820b3e6e4da6d316967c4df6 ChangeLog 448
-SHA256 79368d5c44ec9f66eeb09da3f16877f9f57ae81c04f8727a70172078f1e06485 ChangeLog 448
+EBUILD sqlalchemy-0.2.7.ebuild 1350 RMD160 f9eaeb65d45efe29adea537d93d2d14d58cafa5d SHA1 a82060ee56e3f7246de234c927c14c8edd76dcf6 SHA256 edf0f32ffd8175155af62600d0b513713f33b1e1a8dbae98d0d71c573f9a51d4
+MD5 97b9d5883cfa2506fee0afd4a49f9c4b sqlalchemy-0.2.7.ebuild 1350
+RMD160 f9eaeb65d45efe29adea537d93d2d14d58cafa5d sqlalchemy-0.2.7.ebuild 1350
+SHA256 edf0f32ffd8175155af62600d0b513713f33b1e1a8dbae98d0d71c573f9a51d4 sqlalchemy-0.2.7.ebuild 1350
+MISC ChangeLog 648 RMD160 d85fbed4ad8a908e7d9fa9c12727410567b57614 SHA1 86aaa8454f857c0f40ce459ee7ef20aa45a715eb SHA256 612082cb346321e1eb62c67596b9f730ac3d065d9b29119908dbb4d31aa5c089
+MD5 a723eaa951aafb797b5660df13b31ab5 ChangeLog 648
+RMD160 d85fbed4ad8a908e7d9fa9c12727410567b57614 ChangeLog 648
+SHA256 612082cb346321e1eb62c67596b9f730ac3d065d9b29119908dbb4d31aa5c089 ChangeLog 648
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -18,9 +18,9 @@ MD5 a442be07ba64d56f34a792d5f40e2f91 files/digest-sqlalchemy-0.2.7 250
 RMD160 582312d2f8081a436064f29108863dbf7480c454 files/digest-sqlalchemy-0.2.7 250
 SHA256 b9c63c31d3f9ccf52c0a4cb1c62dce4459337d85cff2d9d4fdb41fa2f0dc28e5 files/digest-sqlalchemy-0.2.7 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+W5ouB6ZT1m7QRERAnroAJ9lwEJYmTx3Y/4VHcLBfZUTghxH0gCgmSVN
-WoJaRrt/ONCyXz4afxvN5Bg=
-=zFpx
+iD8DBQFFBx0RUElL7eJpfEQRAs1eAJ996+ZckaN4TKcRnzavex+C8ku3vQCfdSzi
+MoI4zYj77CTQdJabeONUtig=
+=+jvq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.2.7.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.2.7.ebuild
index cbb6a9b8ef30..6e5a94a56a38 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.2.7.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.2.7.ebuild,v 1.1 2006/09/02 11:42:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.2.7.ebuild,v 1.2 2006/09/12 20:48:10 marienz Exp $
 
 inherit distutils python
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.sqlalchemy.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-IUSE="firebird mysql postgres sqlite"
+IUSE="firebird mssql mysql postgres sqlite"
 KEYWORDS="~amd64 ~x86"
 
 # note: if you use psycopg-1, then you need egenix-mx-base
@@ -19,9 +19,10 @@ RDEPEND=">=dev-lang/python-2.4
 	mssql? ( dev-python/pymssql )
 	mysql? ( dev-python/mysql-python )
 	postgres? (
-		|| ( ( >=dev-python/psycopg-2 )
-			 ( <dev-python/psycopg-1 dev-python/egenix-mx-base )
-		   )
+		|| (
+			( >=dev-python/psycopg-2 )
+			( <dev-python/psycopg-2 dev-python/egenix-mx-base )
+		)
 	)
 	sqlite? ( dev-python/pysqlite )"