summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2015-10-13 13:22:52 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2015-10-13 13:26:45 -0500
commit3f031bff4ee29549ce48aa6a09d59b64dc826241 (patch)
treeba7c4d5b7818adfe927ff11f333009a206f757d6 /sys-cluster
parentsys-cluster/cinder: updating 2015.1.9999 deps (diff)
downloadgentoo-3f031bff4ee29549ce48aa6a09d59b64dc826241.tar.gz
gentoo-3f031bff4ee29549ce48aa6a09d59b64dc826241.tar.bz2
gentoo-3f031bff4ee29549ce48aa6a09d59b64dc826241.zip
sys-cluster/neutron: updating 2015.1.9999 deps
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/neutron/neutron-2015.1.9999.ebuild16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
index 0c103b718b37..6d4f5d4b9b71 100644
--- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
@@ -27,8 +27,6 @@ DEPEND="
app-admin/sudo
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
@@ -70,7 +68,7 @@ RDEPEND="
>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
@@ -96,10 +94,11 @@ RDEPEND="
>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+ <dev-python/alembic-0.8.1[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -120,6 +119,7 @@ RDEPEND="
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
@@ -134,7 +134,6 @@ RDEPEND="
dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
PATCHES=(
-
)
pkg_setup() {
@@ -156,9 +155,10 @@ pkg_config() {
fowners neutron:neutron /var/log neutron
}
-src_prepare() {
- #it's /bin/ip not /sbin/ip
- sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
+sddrc_prepare() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ # it's /bin/ip not /sbin/ip
+ sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
distutils-r1_src_prepare
}