bup

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

5 files changed, 59 insertions, 92 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index da7a7a9c96e6..8b2fb3750e88 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.82 2015/01/13 04:16:16 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.83 2015/02/08 02:44:24 prometheanfire Exp $
+
+*nova-2014.2.2 (08 Feb 2015)
+
+  08 Feb 2015; Matthew Thode <prometheanfire@gentoo.org> +nova-2014.2.2.ebuild,
+  -nova-9999.ebuild, metadata.xml, nova-2014.2.9999.ebuild:
+  bup
 
   13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org> -files/nova-confd,
   -files/nova-initd, -files/nova.sudoersd, -nova-2014.2.ebuild,
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 1f23bdb03b5c..91a38897bbb0 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -4,25 +4,26 @@ Hash: SHA256
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce9fec3617b8 SHA512 163d5d94f6ce7c67413b9e90161590651329c96e1c8df480d1c983294f43bd596ef75ebe818cd1a8f1557babfd6bbd02a7deaf597d936acfe882dc3c9c5a1f42 WHIRLPOOL b51a0316513d06083f2cfa572427926c14663ab984bcd26a9521bf88699bfefd745e7ff91e9330bae86bd769d809837e010caa948cd133fbd010e820b7ab8448
 DIST nova-2014.2.1.tar.gz 4422203 SHA256 f2a600722e55ba170d756ee54fc20517214865b0521d52ca385336ea311e6d31 SHA512 f04330ecd41548e87ea821d6eb2487644f2ab9f06705b630d9f399bce65fe1abb64dedf37b549efa0ec480b3227c3eec543ee99860205f3b924f18909b202ee0 WHIRLPOOL 436a37b8cba721a5016649b2da40a77270df4608915af49ca18188af80b2d515829a80c620e89baa6138ec20e117fdda1380cf834b8891c73936b671ec8c07c3
+DIST nova-2014.2.2.tar.gz 4423122 SHA256 18dfd433aa043389318f28890578dcbe3c0606a38360f39ec8df8670150f89d7 SHA512 d2564066c5c96a32cc47e5066b2310611eb2488fb2082f43bf89dccc92ebd8ac536d8f591ebe2b9c1865b22f69acd308e5bb3a2a636f5b27f9ddfa765dd18300 WHIRLPOOL ed563e9caa37bd0df2a587597494fb33525ad84cba46c7c1f7f4f45cffc20c38cf843b642a2e67d99af994c42a4ac5a81b358ec63e7898de3225c6629dc50f24
 EBUILD nova-2014.2.1.ebuild 6255 SHA256 4372f7ebe8b6e3a7553f94b6e50f784eba89c39e4989e521577b958123bff306 SHA512 0d72e1c9206f8b70157d06c5c7ae310aa519f3a5f62cc52c9a0fe4eef62dc8296ae8b4480a7639aa8f0f92eac1ecba491bbd9247b8325377a7aeaa9632e8dec4 WHIRLPOOL c823e5c4fad72f300aea9bb977932f1bd3180507c02b526a0ce528690dbc877b13269d3908288d140f0194dc1930a09c28f5feb6b4a3c0aedc9a5fc22d171505
-EBUILD nova-2014.2.9999.ebuild 6263 SHA256 15be77da2856e035815ed4583c48842159652032bd11a07a94021b21cb85d4ab SHA512 0e0181800ba4a70b8f499d5ca6d2b60d0d30b5bcb00ede1b69db7fd18bc20a8969e81e4c714cef223d5ce7b15932e8f58b525aed98aeb1ffaa43afa8e067368c WHIRLPOOL 578850eab991ac28dbd8e88b2a06f2fdd6cfc7113d635b53ecc673c390af3884d38321b1182f85bd35846c8051f60c1742ce3de66eda7dabe3df3bed2db8b5bb
-EBUILD nova-9999.ebuild 6252 SHA256 8ecf78790428fb73700143c8b9c804d86e0a5880b52887474bea0030da0ad762 SHA512 959ea1f3805908bd2b261c3bb5f96081f78c071cc6076069c4406108a468609ec5d32b299887f7b6a22cddec7d8d7af736785c05f352e8b60173f451459fea46 WHIRLPOOL f28f8f7cd9ed7ed02a86c69d6e984d64eb21f193a594937b26add6fe545c584eb6f06455de7b90079a8683c356ca4fff8eedcf4e3e26432bb1c150cf2fac9a58
-MISC ChangeLog 18288 SHA256 929a41dc03e244e615a1082fb4311d86c9c81551f57250b28ab7687a6584aa0f SHA512 1b8a9dbd4fdbe59f74961f8e7dd337799cc9431b4578a1e09444bc9ce976dfec46e00a4a681c0d2e3c5fb212a1ef048a858211eae32f7d81ba800db70ba4dbe1 WHIRLPOOL a9d679773dc97341ffc176628d810e1bd4f89c4b8a903c2738c8b17b26aaec2b95a0a586f8951ee103368ccc1400866ffcc010e28c4b53549682cfbd1fcc3085
-MISC metadata.xml 818 SHA256 2db18087f26467d27436c57cc533ab1dc0e31e643ed2b212a78eaf1e9e4d702b SHA512 cd64b2b5fff76252104a60670edab8a732ea0c6ab5e72b083f988bbc18dcf38e455cadd589e89597fa049009b60a99631306ea61bb02e14f1658a52b22d4c5aa WHIRLPOOL 05cca8681c60b074f53e6874f1e8a5b17a3ebcdd06e552e4ac6a2672f91077ce71e0d343f0db27ba0722a33bc5b1e97d38ad34dbe418e2961ca067d8b863c6db
+EBUILD nova-2014.2.2.ebuild 6028 SHA256 16ecfa06919a5c2ba6ef86de3b4d9ecca7346e6d49c9304ea1edfeb52698ef09 SHA512 7d1aa76804253485876aef68e720b25430642a232b7714e9a9262e4c3985c18a454a5d058bb7c50d5ea1642141bec63df3a0537bb930fc2ec80c5032972bafc0 WHIRLPOOL f117c1eb045b9157eca95a8e32dd3a430fc68024f2de8b280bf84dbad962641941ddc260cc44f1f0ad5f6bafe0ba559bf28810fd0b28814655a2170dfa06c4c1
+EBUILD nova-2014.2.9999.ebuild 6036 SHA256 9557a538a2a3d2cdef37c57a23286defe0ba64972a60b68937cc3ff9413e6028 SHA512 7ab6258a1b5426ccbc81333ad36a1530a32cb754ce7b86fb86abd82b60f221202f6c4b511113c48142d9dc0703511f03339517201ac4622033d9e057e58f0c31 WHIRLPOOL 6385eb491d5b7d947b377f9534c53a8eb59631300e712ecce615d0e7971e6eea9d0a79f4a014db0fc8f6b2ca18a1cd448a08b8a349ae6fc56c90bcb2808b6553
+MISC ChangeLog 18465 SHA256 49ed1bce3d5793ab0177a0271a2e7dd84ce9a5973bd53ce2ac587fd4270ea286 SHA512 5395b3f2052b244051954273f5e40ccd6438b5469b5588a95634736d360db60ca52b14b0ca9716d58492cf2e174d5d52bc2e0aec0816fb8d9dfa0fb234fb0f9f WHIRLPOOL 8c707b3d50f1e121113f70118eaf22e5e7f9b8117b837032e2da33413f199446e977647eeb5abbcd4eb2c4ebf3b979a043a4b7f19b51a21e6680778a1dc73c00
+MISC metadata.xml 911 SHA256 d5ba172160431f66d7d3bfa414209ef83b9e449efd3a55ded6d6ab91b3adeece SHA512 eb2c13ad92930a0792580d276672c7e9aae07ae09109bb6149429dff5e24951509ea95fa182ebdbb8a9a94b5dcbf6b25b580a16878c9b201ffa840270919d30e WHIRLPOOL 0a0eb3e24dade3fb862a89ad92a3da54191fa3bca682a8a512410c5f376d575ef21703cdcb085e7a423b89e8c08bdb682ef53392c43f19fdb0f6fd4984bfd0ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUtJwYAAoJEGSje+quGaTo66QP/jA0XrnWmfauctUfy3AxyZ4G
-gIYsxfASJRa+1VVwwzhZmdu5YAriATNx9XS/WwyAwaVOkgkDAquQkmjk4TexvhOn
-0xaEsy8iPIWrAYanYp6KqDeD22oPzoEUMEpB4+B6wa3CCIi0Gh47vXl81lynoF2s
-UjJOln/PqjEZUKKFOxpYpSEjj8/whhBf2jq42ktNBXqI0TBl5D2tMjdkeONx/zPy
-hwH2mALyuIq1WjcHb/pu+j81y1BtI4ZKYX26/xF6MQ7NGe/VCtvZeZUYQMrnJUBc
-mbS0gAwf/MBBWceDBE86buLgj3T2mfr33d2y/I0IBeriMVIQLOUVp7sIAlGWki9R
-focvogyMJ8sZu73B6TokwOeA5tIpK6yecnpx/LLNqHZyIXeSiQzJhjc+PeFAaJQu
-1SnMzd5qxgylpvh2/MoI2HmGCrbcrkjvXeJeFQ8IkOEjmYO4nnTg2uTAj1pyfDtj
-t8XQWJat9Upmqd33tSBIy1EQHaN+gc1gd/2JQe1+xMosdh5V3UQI4SGnp5nHnNQ2
-oIzUTgfsZ2NWGw7rQSNndL+rsFyDseBVqM/Ug0CCinAlizPDLgaZcHBAQO/H8u1Q
-3yr4IijZJB+IPrxo1fuTxQgfuA7XpJRiGW2fMcUiBJp23f4IAHvVktiMM3ZzIgtJ
-5BRQ9Pvjzc32pSvMb4pU
-=SZ89
+iQIcBAEBCAAGBQJU1s2kAAoJEGSje+quGaToHLkQAMTNgwozvzYA1FnSM6hZrssi
+fyij+a3EXKqF/mMpxGTyNvyFHLK1nkxEnHsdmGcVoFoa3t1qHte3PNQDIAP9EhjG
+SnFNrp1uK7IAjzoZVsmFrLF7GQLk+/cn8bSTNYtMEDlAo+biiF6UeP2jX4yIl5fY
+7QI111IhgaPHlxYNIds0eCzjMxVs3Jl6pS06gvNtveEUF7BJlSmA5aAxVvLKReXu
+fG7KlShRsTBLw9dZJgT/3bcH6nh0KqChjbNV7JAiAn4rEgeHVC97TwsioYOLiaCq
+siBBMJiGSr9pj9ZUPZ4EZIq5u02h2BCJ/T9Toi5ZyvjoXru0kM91anWD6IMIJ1XT
+ng9yyGsbOl4qrZZe9TWdZkjlrYMywsEESjFvgsDGCHSMoSfzDZrucUqlX04L1snI
+ffiw1L1LPVQKDf8px8Rh6VNB+IrAbcmOY/+1OOPkbVyFMiAluG92vSkIA4I0DA/7
+V63oupoyhqJE5xE4sKQ1zyp8/7IwAqQx0AsNr9rk96M0SY5moGVL0Ee22J1PsFSm
+QUU3firoVDrnsPTZ/W+Mp5kQJV3PjlBzPJzqMjqrXClEb3LyDYtg+1euwmyBJM6l
+21r+8gcyhxsnGKzZO3OGHwFO4+IHd21D06z99RRqjo7YaumqthLhPkpUGLPBIKsv
+/7WVMCTwEcq4ux1KQyqs
+=ILNf
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index a64713858dea..55d0694c1363 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -15,6 +15,7 @@
     <flag name="kvm">qemu-kvm hypervisor support</flag>
     <flag name="network">Installs the initscripts for the nova network service</flag>
     <flag name="novncproxy">Installs the initscripts for the nova novncproxy service</flag>
+    <flag name="openvswitch">Installs openvswitch for the neutron openvswitch support</flag>
     <flag name="xen">xen hypervisor support</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-2014.2.2.ebuild
index 9ec853185595..f737a082270b 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-2014.2.2.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.19 2015/01/13 04:16:16 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.2.ebuild,v 1.1 2015/02/08 02:44:24 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-2 linux-info multilib user
+inherit distutils-r1 eutils linux-info multilib user
 
 DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
 HOMEPAGE="https://launchpad.net/nova"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="master"
+SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compute +kvm +network +novncproxy openvswitch sqlite mysql postgres xen"
 REQUIRED_USE="|| ( mysql postgres sqlite )
 			  compute? ( || ( kvm xen ) )"
 
@@ -26,47 +25,25 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 RDEPEND="
 	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.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.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.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	<dev-python/boto-2.35.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
@@ -77,8 +54,7 @@ RDEPEND="
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -99,19 +75,22 @@ RDEPEND="
 	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pycadf-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.9.0[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	novncproxy? ( www-apps/novnc )
 	sys-apps/iproute2
-	net-misc/openvswitch
+	openvswitch? ( net-misc/openvswitch )
 	net-misc/rabbitmq-server
 	sys-fs/sysfsutils
 	sys-fs/multipath-tools
diff --git a/sys-cluster/nova/nova-2014.2.9999.ebuild b/sys-cluster/nova/nova-2014.2.9999.ebuild
index be6c4ddba7f7..d86361af9470 100644
--- a/sys-cluster/nova/nova-2014.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2014.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.9999.ebuild,v 1.4 2015/01/13 04:16:16 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2014.2.9999.ebuild,v 1.5 2015/02/08 02:44:24 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ EGIT_BRANCH="stable/juno"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
+IUSE="+compute +kvm +network +novncproxy openvswitch sqlite mysql postgres xen"
 REQUIRED_USE="|| ( mysql postgres sqlite )
 			  compute? ( || ( kvm xen ) )"
 
@@ -26,47 +26,25 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 RDEPEND="
 	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.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.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.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	<dev-python/boto-2.35.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
@@ -77,8 +55,7 @@ RDEPEND="
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -99,19 +76,22 @@ RDEPEND="
 	<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pycadf-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.9.0[${PYTHON_USEDEP}]
 	dev-python/libvirt-python[${PYTHON_USEDEP}]
 	novncproxy? ( www-apps/novnc )
 	sys-apps/iproute2
-	net-misc/openvswitch
+	openvswitch? ( net-misc/openvswitch )
 	net-misc/rabbitmq-server
 	sys-fs/sysfsutils
 	sys-fs/multipath-tools