Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/neutron/
Date: Mon, 25 Sep 2017 15:22:07
Message-Id: 1506352886.5f945f39b3502145e7b4713fae6feb696211fb98.prometheanfire@gentoo
1 commit: 5f945f39b3502145e7b4713fae6feb696211fb98
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 25 15:21:26 2017 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 25 15:21:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f945f39
7
8 sys-cluster/neutron: 10.0.4 and 11.0.1 bup
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 sys-cluster/neutron/Manifest | 9 +-
13 ...tron-11.0.0-r1.ebuild => neutron-10.0.4.ebuild} | 100 +++++++++------------
14 ...tron-11.0.0-r1.ebuild => neutron-11.0.1.ebuild} | 2 +-
15 3 files changed, 48 insertions(+), 63 deletions(-)
16
17 diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
18 index 409c851176f..706bb16c789 100644
19 --- a/sys-cluster/neutron/Manifest
20 +++ b/sys-cluster/neutron/Manifest
21 @@ -1,14 +1,17 @@
22 DIST neutron-10.0.3.tar.gz 3125880 SHA256 7f4c455d54647f5f32871b61acac0d66de32dd1e7a589bad04b266560d0ba7ef SHA512 615c5ece84d61c1e3878566cc538af15f32d92a3a3def0bfe627e804c44c9d64cb1160f7adf4f136596e687348036a795035c773213f7d57e79422fb149f560e WHIRLPOOL 1c249112c5f850b6244db7264f2295106ef2b8b68cc472eafe19e407f36c6afcfd8024ac160d9b2e7da85a60c86a88f70bd385763bdd8c22fc276000151ff46c
23 -DIST neutron-11.0.0.tar.gz 10465282 SHA256 ba43241542c716dab56c2911c933c77e7d3afff9b15da6e1948376c22d30b7e3 SHA512 04a6a6338eb6fe01cd61b98e4c025bea80c0a15a004eb560dfc6b3aec5835c4e75ccefd0d4a583578709067053f76c1957cfeccdf9a109797a9a09ea1e9da4c0 WHIRLPOOL fc75ae1c9919f15cd82965cb921ba1c67c97b421ab1750e6c784635480aad8c123023a3d56931ec50ac51c71db5b964e7f0499851043d4d8f8c90bf9d1f9a3f5
24 +DIST neutron-10.0.4.tar.gz 3124422 SHA256 1e7c999045c8d5c1e3dcb6aca05984f880bc58935682f6b8146239739a3a121a SHA512 f85949ac08728b6338cf58abfaf2c9e67882d49fefa16104580c73aaea3f0634602712583e88248f261fd3b0c8690172e4a72f550bd159cacf732440274cc844 WHIRLPOOL 6694f8372e8a2af3ff2bcc766523c11837515ebb85548160779d4cc4ea21ee7a68f1bc0636efb56f2f83764521625a1f238b59999df21849c36826c8186b03e4
25 +DIST neutron-11.0.1.tar.gz 10472277 SHA256 a6ea7a9e57c507bbcffea9373383543f976289c692c9aafc458a530e51db10f0 SHA512 ab353e6ae09e32c9b520a918624a661c5635f2de4df05f78f3e9c6102258ab12ee5c657f89732d89ef182833f80cb70454418a5556cc7738bd7f86b995762b37 WHIRLPOOL cb74b2feaa659f980e619c1f0fd95b5d40ddc1a581a0cc0b6b35fb2d74ec6ff93b2fb675c7b5be4ea59769c878e777ee920a6943c9612b32219a4fc619d5f2eb
26 DIST neutron-9.4.1.tar.gz 3060881 SHA256 c8a4c5a9f696b3d4455ef4b823d47d2cccfdfff7a160981e4d26c61a9cf41d0a SHA512 94a374a2f03ab9d586d6be6a612aabcc9cb71565d5ec2415442cfdb09463811418b04d1f159f4b5a286798020ae3e83196bb0c9db3f27c43e5abedfe66ecdb33 WHIRLPOOL db09caef44b969fec9b80b1898cab4293bb62d6188938aa943ccd00bc736a64e5b8f85f4a07f12de2866b4b76966e55d01b991f0db82d648b73fc8710095659d
27 DIST neutron-configs-10.0.3.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
28 -DIST neutron-configs-11.0.0.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
29 +DIST neutron-configs-10.0.4.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
30 +DIST neutron-configs-11.0.1.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
31 DIST neutron-configs-2016.2.9999.tar.gz 13458 SHA256 111e940f7da24c18673794188f348285997a0e1f250446076700902bab101f71 SHA512 42f9a685f0869c491610c66f5bc5f952b959a0a8514687007814e0ca97e27fb491460bc64eaf8fc47e982c8519b1dc9b5e2b4a3c047535b52521b3325ba38d44 WHIRLPOOL bcceb81f46d69aa02876f2d2a76c642f9b48b472dc3e6217bef48649ecfa64d535c2361d224889f31f21b7fb40bb97930ab93443abe6d9cddfd56f19d84f5601
32 DIST neutron-configs-2017.1.9999.tar.gz 25094 SHA256 7f210828b0c3fa9d859fca8c4735fd60aefad3cd5d0cf810b762af268df59269 SHA512 40ab9f2f4ea338c061c57d9aa5611ee3f3476ab8f5199ac50577f94fec032ccd27028bd072d9d9d0cc9f12327613e542b4d62a0403540730f9d6efbc4992a00d WHIRLPOOL dbdaff979a40e33cd171390657e39fb9b2a311c972e8d018e301af5361b0224ba62972241febfc4991a06bf9f16390e5c779de86823ed94eaebbee610c8c6657
33 DIST neutron-configs-2017.2.9999.tar.gz 25030 SHA256 ad2a57865a13ccf62b852c2d31336e9f0aab0f979caaaa6227856c59a3ef86ac SHA512 d82abfcfe5c911dc8a0689e23aaad810bb3aacaf64bd35439220f41390a71958e7cd34e60500580c24ea9e8b55a6fb0441ce4e5612fad9aba2e48d6f14d4d87a WHIRLPOOL 30a577afb2d48ee5d5c13666dc23843bee1aadcd3369d090ffa150bf7ea60ae97bfac0ecc39aa09d29106f9117aab477632c520b146db4c9a78ec021c959851d
34 DIST neutron-configs-9.4.1.tar.gz 13458 SHA256 111e940f7da24c18673794188f348285997a0e1f250446076700902bab101f71 SHA512 42f9a685f0869c491610c66f5bc5f952b959a0a8514687007814e0ca97e27fb491460bc64eaf8fc47e982c8519b1dc9b5e2b4a3c047535b52521b3325ba38d44 WHIRLPOOL bcceb81f46d69aa02876f2d2a76c642f9b48b472dc3e6217bef48649ecfa64d535c2361d224889f31f21b7fb40bb97930ab93443abe6d9cddfd56f19d84f5601
35 DIST neutron-ml2-plugins-10.0.3.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
36 -DIST neutron-ml2-plugins-11.0.0.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
37 +DIST neutron-ml2-plugins-10.0.4.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
38 +DIST neutron-ml2-plugins-11.0.1.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
39 DIST neutron-ml2-plugins-2016.2.9999.tar.gz 2073 SHA256 1e12e81673168860a2d7c5172deb00a7301d0a698014113dfcfba74759ba444d SHA512 bcde3a4d5e041c0080503cdf8f60c83e1c09f873010e78f4bc9066f57b17cf69394cf71cedbb8d3819a62d9cfdd545b102f16b53c0e3deb44b1d03136c14d711 WHIRLPOOL 099e19f4ec98fb54187e100af057711db3df3f86ae117a03f38afe37b6c5135666330aeb05867331cc015e8f14bee6e34942d1cb5aec63f92e01e7d6ae69f671
40 DIST neutron-ml2-plugins-2017.1.9999.tar.gz 6811 SHA256 6ad759c8720563e502602fc32a72569884bdaad1443f4b8d23c8e9d240071f70 SHA512 51c01eab8f424b871f55b7dc45bbae6300d477e8bc7be4587c4945f75a4fc65f622ed69dbfe0c63db7fced2118987730204d259bce53e353a6b4d24df89dadcb WHIRLPOOL 5e4bf872895e8354fa9e6d7bb071f3d973f28c22297ea414f1bfc8f1bb3ae3102609ff61f19efda59f9d9d7a515fb8ae8216347a2935af64e4bdeeb6ec610863
41 DIST neutron-ml2-plugins-2017.2.9999.tar.gz 6885 SHA256 bcd177baaed1c4438f8852607a7a660aa5d6181c18b42dd52a489a229730b3a5 SHA512 e5acaed2fc370e99c9c8b54040cdc994cd35bfbd3d74682d3c03c381568c89b316a6a87356aa6ae538a19c2ae83b6b3c512095afcc778525c2885b9b6bef04bd WHIRLPOOL a77d3c00d63f21e96d2996ea59af326555499455f63a63d517a2580435d9ec822f1e74d0cb747c3bc04edeb183d65cc918f4e3336b2d6ea5db7ecd72d6a014e4
42
43 diff --git a/sys-cluster/neutron/neutron-11.0.0-r1.ebuild b/sys-cluster/neutron/neutron-10.0.4.ebuild
44 similarity index 67%
45 copy from sys-cluster/neutron/neutron-11.0.0-r1.ebuild
46 copy to sys-cluster/neutron/neutron-10.0.4.ebuild
47 index 3edbd0c8762..3d7f813965c 100644
48 --- a/sys-cluster/neutron/neutron-11.0.0-r1.ebuild
49 +++ b/sys-cluster/neutron/neutron-10.0.4.ebuild
50 @@ -9,8 +9,8 @@ inherit distutils-r1 linux-info user
51
52 DESCRIPTION="A virtual network service for Openstack"
53 HOMEPAGE="https://launchpad.net/neutron"
54 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/configs.tar.gz -> neutron-configs-${PV}.tar.gz
55 - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/pike/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
56 +SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/configs.tar.gz -> neutron-configs-${PV}.tar.gz
57 + https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/ocata/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
58 https://tarballs.openstack.org/${PN}/${P}.tar.gz"
59
60 LICENSE="Apache-2.0"
61 @@ -21,8 +21,7 @@ REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
62 compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
63 || ( openvswitch linuxbridge ) )"
64
65 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
66 - !~dev-python/pbr-2.1.0"
67 +CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
68 DEPEND="
69 dev-python/setuptools[${PYTHON_USEDEP}]
70 ${CDEPEND}
71 @@ -32,17 +31,20 @@ RDEPEND="
72 ${CDEPEND}
73 dev-python/paste[${PYTHON_USEDEP}]
74 >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
75 - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
76 + >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
77 + !~dev-python/routes-2.0[${PYTHON_USEDEP}]
78 + !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
79 + !~dev-python/routes-2.3[${PYTHON_USEDEP}]
80 >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
81 >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
82 - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
83 - <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
84 >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
85 !~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
86 !~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
87 !~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
88 !~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
89 >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
90 + >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
91 + !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
92 >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
93 !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
94 !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
95 @@ -53,79 +55,60 @@ RDEPEND="
96 >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
97 !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
98 >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
99 - >=dev-python/neutron-lib-1.9.0[${PYTHON_USEDEP}]
100 - >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
101 + >=dev-python/neutron-lib-1.1.0[${PYTHON_USEDEP}]
102 + >=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
103 >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
104 - >=dev-python/ryu-4.14[${PYTHON_USEDEP}]
105 + >=dev-python/ryu-4.9[${PYTHON_USEDEP}]
106 compute-only? (
107 >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
108 - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
109 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
110 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
111 - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
112 + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
113 )
114 sqlite? (
115 >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
116 - !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
117 - !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
118 - !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
119 - !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
120 + <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
121 )
122 mysql? (
123 >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
124 !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
125 >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
126 - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
127 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
128 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
129 - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
130 + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
131 )
132 postgres? (
133 - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
134 + >=dev-python/psycopg-2.5.0
135 >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
136 - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
137 - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
138 - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
139 - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
140 + <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
141 )
142 - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
143 - >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
144 + >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
145 + >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
146 >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
147 >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
148 - >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
149 + >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
150 >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
151 >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
152 - >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
153 - !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
154 - !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
155 + >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
156 !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
157 - >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
158 - >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
159 + >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
160 + >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
161 >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
162 - !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
163 - >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
164 - >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
165 - !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
166 - >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
167 - >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
168 + >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
169 + >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
170 + >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
171 + >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
172 >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
173 - !~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
174 >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
175 >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
176 >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
177 - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
178 >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
179 - >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
180 + >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
181 >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
182 >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
183 - >=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
184 - >=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
185 - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
186 - >=dev-python/pyroute2-0.4.17[${PYTHON_USEDEP}]
187 + >=dev-python/ovs-2.6.1[${PYTHON_USEDEP}]
188 + >=dev-python/pyroute2-0.4.12[${PYTHON_USEDEP}]
189 >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
190 - >=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
191 + >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
192 + !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
193 >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
194 - >=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
195 + virtual/python-singledispatch[${PYTHON_USEDEP}]
196 dev-python/pyudev[${PYTHON_USEDEP}]
197 sys-apps/iproute2
198 net-misc/iputils[arping]
199 @@ -134,8 +117,7 @@ RDEPEND="
200 net-firewall/iptables
201 net-firewall/ebtables
202 net-firewall/conntrack-tools
203 - net-proxy/haproxy
204 - openvswitch? ( <=net-misc/openvswitch-2.8.9999 )
205 + openvswitch? ( <=net-misc/openvswitch-2.6.9999 )
206 ipv6? (
207 net-misc/radvd
208 >=net-misc/dibbler-1.0.1
209 @@ -177,30 +159,30 @@ src_prepare() {
210 python_install_all() {
211 distutils-r1_python_install_all
212 if use server; then
213 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-server"
214 + newinitd "${FILESDIR}/neutron.initd" "neutron-server"
215 newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
216 dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
217 fi
218 if use dhcp; then
219 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-dhcp-agent"
220 + newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
221 newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
222 fi
223 if use l3; then
224 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-l3-agent"
225 + newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
226 newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
227 fi
228 if use metadata; then
229 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-metadata-agent"
230 + newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
231 newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
232 fi
233 if use openvswitch; then
234 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-openvswitch-agent"
235 + newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
236 newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
237 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-ovs-cleanup"
238 + newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
239 newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
240 fi
241 if use linuxbridge; then
242 - newinitd "${FILESDIR}/neutron.initd-2" "neutron-linuxbridge-agent"
243 + newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
244 newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
245 fi
246 diropts -m 755 -o neutron -g neutron
247
248 diff --git a/sys-cluster/neutron/neutron-11.0.0-r1.ebuild b/sys-cluster/neutron/neutron-11.0.1.ebuild
249 similarity index 99%
250 rename from sys-cluster/neutron/neutron-11.0.0-r1.ebuild
251 rename to sys-cluster/neutron/neutron-11.0.1.ebuild
252 index 3edbd0c8762..7c495140caf 100644
253 --- a/sys-cluster/neutron/neutron-11.0.0-r1.ebuild
254 +++ b/sys-cluster/neutron/neutron-11.0.1.ebuild
255 @@ -121,7 +121,7 @@ RDEPEND="
256 >=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]
257 >=dev-python/ovsdbapp-0.4.0[${PYTHON_USEDEP}]
258 >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
259 - >=dev-python/pyroute2-0.4.17[${PYTHON_USEDEP}]
260 + >=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}]
261 >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')]
262 >=dev-python/python-novaclient-9.0.0[${PYTHON_USEDEP}]
263 >=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]