fixing sqlalchemy deps

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 67 insertions, 27 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index e83ea7b59960..1d2998de7d4e 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.46 2014/11/18 23:17:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.47 2014/11/21 00:11:13 prometheanfire Exp $
+
+  21 Nov 2014; Matthew Thode <prometheanfire@gentoo.org>
+  cinder-2014.2.9999.ebuild, cinder-2014.2.ebuild:
+  fixing sqlalchemy deps
 
 *cinder-2014.2 (18 Nov 2014)
 *cinder-2014.2.9999 (18 Nov 2014)
diff --git a/sys-cluster/cinder/cinder-2014.2.9999.ebuild b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
index 9933c0f9ed9c..e1a7d596736c 100644
--- a/sys-cluster/cinder/cinder-2014.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.1 2014/11/18 23:17:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.2 2014/11/21 00:11:13 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -69,24 +69,42 @@ RDEPEND="
 	>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 	sqlite? (
-		>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+			)
+		)
 	)
 	mysql? (
 		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+			)
+		)
 	)
 	postgres? (
 		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+			)
+		)
 	)
 	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
diff --git a/sys-cluster/cinder/cinder-2014.2.ebuild b/sys-cluster/cinder/cinder-2014.2.ebuild
index fa08f1f79412..021721cccd5f 100644
--- a/sys-cluster/cinder/cinder-2014.2.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.ebuild,v 1.1 2014/11/18 23:17:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.ebuild,v 1.2 2014/11/21 00:11:13 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -68,24 +68,42 @@ RDEPEND="
 	>=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 	sqlite? (
-		>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+			)
+		)
 	)
 	mysql? (
 		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+			)
+		)
 	)
 	postgres? (
 		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+		|| (
+			(
+				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+			)
+			(
+				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+			)
+		)
 	)
 	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]