fixing sqlalchemy deps

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 83 insertions, 43 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index f4e8720651b9..854224c64c65 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.81 2014/11/10 07:07:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.82 2014/11/21 00:07:57 prometheanfire Exp $
+
+  21 Nov 2014; Matthew Thode <prometheanfire@gentoo.org>
+  keystone-2014.2.9999.ebuild, keystone-2014.2.ebuild:
+  fixing sqlalchemy deps
 
 *keystone-2014.2 (10 Nov 2014)
 *keystone-2014.2.9999 (10 Nov 2014)
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index fa02c80ee4fb..b1971eefb15b 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -8,25 +8,25 @@ DIST keystone-2014.1.3.tar.gz 1439869 SHA256 19edd558718518e9d1bedc70d1ea643cf05
 DIST keystone-2014.2.tar.gz 938026 SHA256 b92767f56599622590431b4606b843e888ddc8fceb8d84c5eb8490eb33e5920b SHA512 1108d462e7f8f9d219188cd95027e6067cd17780b80481522e783fdf56f9ec95d5740c2b90cb80871dd6bfd28e445afacd9680dbd7b5c3e39768aeb34734ba43 WHIRLPOOL ca796d37027e26e5f296c61ef42c9670c5893faedeee7d6992944e6ba2dbbe1616121574b5ad6c819db48cc4fcd47d23dfc7e69634f05ab6a04737f86b6447d6
 EBUILD keystone-2014.1.3.ebuild 5593 SHA256 de06de53e8f9d369687f25c66ee4f909ae8ce613b2f8447bcd32aa2c45370b3f SHA512 7e462f6607e96eff9b02f3bb026aabd6431c456d85dc72bd166dbd57e735acf76e35e37a5dd93cf51586a58220e51374ccf4c4bfc4ee1144c6f6502d70ff73cd WHIRLPOOL 0ec2d940167c2d310c89501407db7ea04006fec2356d295f89b76f50db4474e1e3bf8ff8ba9e79bdf297a0a3ec29e010f0df246f88db0e2cbc914c33cf168b31
 EBUILD keystone-2014.1.9999.ebuild 5452 SHA256 24e4350808a84ce2119676d58fb20295cea722c9090521b11c9ec8e313e3018e SHA512 9817e8c414ab772a889b27404cd0deccd31171ca2224591940ea3866188cd37491bc9fdc9ffa8caf1f1349e6529a279dc415a108c1e5ecbd356ffe62c59e4307 WHIRLPOOL 4042bdd031e95506b79b13e7c2572f72de90a3432103c8f63e060eda41648e250380ee51769879156bea10e948d86cae72b6561e22d41dc866e830f6ebd0b4e0
-EBUILD keystone-2014.2.9999.ebuild 6232 SHA256 679694d6c989550588dee41a5ad96f3d7ac97f82bfa018f501a7492ae3f5e11f SHA512 c36cc8c309f0a0ab5a1984c8d4f81d6c3820249652b47980e8d501748e270c04b8e2fdcad821520c6ed2e50d3dcc3e929fa679297c7910a0f37fc80216bed8af WHIRLPOOL 33a8059f452599939dbe7863069f442575e0b4c65793bf54c30a97bba14b24651f0caf05ed004019f8e4903581e56d527bb5d9e43a7390bae1d04dd36831123f
-EBUILD keystone-2014.2.ebuild 6218 SHA256 31012894c541a464bf02df032bb554d4eb1ddd560aff0b228b2eeab64215b375 SHA512 dc4500703474d5d774fec35e9520d6cdfaf8040f92cd487ac72914e699f0d20d8c58b69dcfe9d1f0051b394f6f5613a0c6c6053d60c4b526b4ad36c887288134 WHIRLPOOL 2d5e0f6246fea92b60212f8cd47e99341d5f07e053c863c3cb39a22b6e007bab526e59cb25ee61358a43c4110191cc8214e4cc420b965d2a30167d54acae2cc4
+EBUILD keystone-2014.2.9999.ebuild 6349 SHA256 61f70a8fcbed72c47b80837bdaca59970d6fb555569d34dd5b394da10f8a2c39 SHA512 ea762e958ecf89de4714a8687889db915063878a05e2413cbd695abed99c902216fa936a28931de907842794e301868585397bf3f3135b3ac2548507dbbadf2d WHIRLPOOL cb833883f485498ec2e388920dc58ebd96669aeef0b01f96bf252db35ef0b88e4aecb9810b4a2f74febbcf9ec57368e8a0984a60a41b7470b926fb1d3892f834
+EBUILD keystone-2014.2.ebuild 6335 SHA256 62abbfc0cafbf3c017740e23183d0ab92876a1020a24442509bc5e92d3104f07 SHA512 b51fb88e2feebe8a7149a0a630515f93bd1e114c9eb863e685cac67df9211b30a49f880aef73d484f6882147a596c2c970aca0cd399b1247a691add0d62324d1 WHIRLPOOL d1c2346d2d7b9a2bc5a5420aaf7b45e376486d7ba83fae4ff03b57addcdc3da79c443725122efc37653f936983dc1832394f4b176bdcb2668cfef166a6499a01
 EBUILD keystone-9999.ebuild 6221 SHA256 43e52aca0fd2d106005fd0a668af717d3fcf592b8fecfa426a11f77e6bc92399 SHA512 8793eba2625b889ea507e9b1c037961b3258ec2d58e8e920d579ca4986da5042d72c5c4732f10a3ea4a216a859d7029df67748d187c5c9c05018eb3cbb01e702 WHIRLPOOL 7b8d035dfae545de6f70f621d8279d816cc00371e359a26f377860a13dcae101e743997d3200fd03fc350ad5e3a2baeb02fc21dfc1a5a5e63c0b2842f6494736
-MISC ChangeLog 17472 SHA256 728681811d3a5ac1d178ae8aa91992c5a4dcbaf80af632effdb9047036a9119d SHA512 a6c9b9d8b0afba00e6f89527571bd2f3190577f696502d19475234ae48aee7b2763bcae93f79b5e17625b0d46b61d9bbb54b27409f0598c27865ba7db04f106d WHIRLPOOL be026d2dde774f7bed03bc314c8ddfe0d922fdf288b2c8f1eaf9f6f3ff2e001d5a5f0b09b5b658958f92901a7b86d3ed65f2a877af243e44b875435856b07839
+MISC ChangeLog 17610 SHA256 9c1c3fb3ef22ca57499363ee1a31a7e4b82c88cf49f95d0e86e828b8f2cb2a01 SHA512 6cb1c6b5b554ed2feba06a0b0ca71573157339a5b6fb8980de4b6fe157fcb852cc2c7f69c4c398e148af9867046ab09ab6af697f0d9915cb0f822b90e642b3db WHIRLPOOL 3f771ba4383a576af1603d0273c04ee64e06b91da54242e149d90158fa5f8f07e49bb7578368897e5ee5c1c99283f8672b06b2fb9bd88d21fe4bb442b84dfce8
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUYGRhAAoJECRx6z5ArFrDm+oQAJJPdmcaHKiAAs16GsaVvcvo
-Dif4j80DDOQiGH2gtVi2UlYUTC/KzJzZlaVmLzlTax7aE58PDDkKC6EfVev0x8rv
-IBYZisi4gFPQMl+5xuGWlverDft8dkJwA0MbE2e5YbK+Ws+aOePOVY067BXLOwnC
-6RDJNd6a++xq7wXq6MUtkUIil7lVU1QEA0IkvGLwoJ2nQepcHuxtgDRJj5ne/4Jr
-Myuul8Taf/v+f4i9m+Di3VQERbvyDfKK+x1oClc5BEUTDIY+pMgym4OA7eMe78zV
-HEyfDarzfcJ3Uz5mAHnP7hLJGHEvhtytaFEy7unb10TRIEyK8aLUXbOg7s74a2Fr
-npXTeNROeMY2rhmVAtjSHrZKGYgUYX4VZPRDxwSayjplr2RmlUn+bMvCNW07uwnT
-3MYoTO2WdLLqZckXozXGhiwJe89YrhoL1Z75FpbJ/uaTDsTQigwnrt1DUYNfeaxj
-YgQT2vtUe8LuwHnsAGUDyqqPe8n/Xnb6yIWWr2R4AeIRII83Dt0Y0GI+SlCtnPzd
-8NvAmalIghy7FNLMkwe5puPvg8vMKWe3GX3XnDcpjaq6uXQnQ364BRwsALR2K23i
-SyEpjOLct/HK6/CpZxJusUfLaHPeHEDBeTgticLZUrOp65GRHkRsaID/I/0kwyFT
-/edc9JpN83mDA1HT5I4e
-=5Tsq
+iQIcBAEBCAAGBQJUboKPAAoJECRx6z5ArFrD+VwQAM69pT7pdUpFSClB5SAZRFE2
+spocqP5RPNGTYjEUi5lypcFpOKvFNdFnL7mRyoBd7Y0zsBpuEcNf+lIHakgLM/fK
+a46+wFRThftCWh+wCSiCpHhY4Zkb2Ry/XWqXIPu00JAKMniMvopwiY4uSVbcJ2fT
+A16uQ+l+lJam1+3z+3dLmMy1KcQA9gZ344gZIrTnWMHk0K1CnBxciuttemPYfieg
+yugdBlkN99dBVjIQff+BsKDCIA8pzkfa6bljPG6f71pgbqcV4BttsPsUJbfR9UaP
+TLaLqpUONNRYPfR5Nu2BkNwIGwu2rfXi1KKhIrMqD/+UHS/MwbBXuewjGJGzpsUd
+acOn3nvIZpmhhhj+t5OZtNbdmBRE/6DxIEfB+zJpyXdENbhGWEkUoAQFk5KLJRUx
+RedxkrypiO/qOhluoGa83oWYjUQ4p3R/eab6aUz1Xl6qjmym/bih+8Ai4aFj3+1W
+B4xr145gax4vU7t4VSlIwxnjSeZR8B20oC2pSV2kb8c/QakxEjTF/I+0aA+RUn8v
++l/zBPhO6qIhU/x1lrDhV3DHnnIxBobcIYqdCtLPape6DsbAjluqBuP+zx63Nslz
+2jFXBJXdgYq12mh73eXP6jkPn/ylXmJ662a0r2nssJtgR/5muqiFEppMThN/gzH3
+omIXNkz6N5IH5B8Xjiyg
+=zdq6
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/keystone-2014.2.9999.ebuild b/sys-auth/keystone/keystone-2014.2.9999.ebuild
index 740df872b716..9d41b0a61675 100644
--- a/sys-auth/keystone/keystone-2014.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-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-auth/keystone/keystone-2014.2.9999.ebuild,v 1.1 2014/11/10 07:07:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.2 2014/11/21 00:07:57 prometheanfire Exp $
 
 EAPI=5
 
@@ -68,24 +68,42 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${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-auth/keystone/keystone-2014.2.ebuild b/sys-auth/keystone/keystone-2014.2.ebuild
index 2a4ee25b0a8b..732e6dfb42b9 100644
--- a/sys-auth/keystone/keystone-2014.2.ebuild
+++ b/sys-auth/keystone/keystone-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-auth/keystone/keystone-2014.2.ebuild,v 1.1 2014/11/10 07:07:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.ebuild,v 1.2 2014/11/21 00:07:57 prometheanfire Exp $
 
 EAPI=5
 
@@ -67,24 +67,42 @@ RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	!~dev-python/routes-2.0[${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}]