Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/neutron: neutron-9999.ebuild ChangeLog
Date: Fri, 01 Aug 2014 05:14:55
Message-Id: 20140801051452.020B32004E@flycatcher.gentoo.org
1 prometheanfire 14/08/01 05:14:51
2
3 Modified: neutron-9999.ebuild ChangeLog
4 Log:
5 updating git master neutron
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
8
9 Revision Changes Path
10 1.13 sys-cluster/neutron/neutron-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild?rev=1.13&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild?rev=1.13&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild?r1=1.12&r2=1.13
15
16 Index: neutron-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v
19 retrieving revision 1.12
20 retrieving revision 1.13
21 diff -u -r1.12 -r1.13
22 --- neutron-9999.ebuild 26 Jul 2014 23:01:44 -0000 1.12
23 +++ neutron-9999.ebuild 1 Aug 2014 05:14:51 -0000 1.13
24 @@ -1,14 +1,12 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.12 2014/07/26 23:01:44 prometheanfire Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.13 2014/08/01 05:14:51 prometheanfire Exp $
29
30 EAPI=5
31 PYTHON_COMPAT=( python2_7 )
32
33 inherit distutils-r1 git-2 user
34
35 -#restricted due to packages missing and bad depends in the test ==webob-1.0.8
36 -RESTRICT="test"
37 DESCRIPTION="A virtual network service for Openstack."
38 HOMEPAGE="https://launchpad.net/neutron"
39 EGIT_REPO_URI="https://github.com/openstack/neutron.git"
40 @@ -16,41 +14,45 @@
41 LICENSE="Apache-2.0"
42 SLOT="0"
43 KEYWORDS=""
44 -IUSE="+dhcp +l3 +metadata +openvswitch +server test sqlite mysql postgres"
45 +IUSE="+dhcp doc +l3 +metadata +openvswitch +server test sqlite mysql postgres"
46 REQUIRED_USE="|| ( mysql postgres sqlite )"
47
48 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
49 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
50 + >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
51 + <dev-python/pbr-1.0[${PYTHON_USEDEP}]
52 app-admin/sudo
53 - test? ( dev-python/cliff[${PYTHON_USEDEP}]
54 - dev-python/configobj[${PYTHON_USEDEP}]
55 - dev-python/coverage[${PYTHON_USEDEP}]
56 + test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
57 + <dev-python/hacking-0.9[${PYTHON_USEDEP}]
58 + >=dev-python/cliff-1.4.3[${PYTHON_USEDEP}]
59 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
60 + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
61 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
62 - ~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
63 - dev-python/nose[${PYTHON_USEDEP}]
64 - dev-python/nosehtmloutput[${PYTHON_USEDEP}]
65 - dev-python/nosexcover[${PYTHON_USEDEP}]
66 - dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
67 - ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
68 + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
69 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
70 - ~dev-python/webtest-1.3.3[${PYTHON_USEDEP}] )"
71 -RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
72 - >=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
73 - dev-python/paste[${PYTHON_USEDEP}]
74 + <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
75 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
76 + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
77 + >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
78 + dev-python/configobj[${PYTHON_USEDEP}] )"
79 +
80 +RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
81 + >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
82 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
83 >=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
84 - >=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
85 - >=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
86 - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
87 - dev-python/httplib2[${PYTHON_USEDEP}]
88 - >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
89 - >=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
90 - dev-python/netaddr[${PYTHON_USEDEP}]
91 - >=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
92 - dev-python/python-novaclient[${PYTHON_USEDEP}]
93 - >=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
94 + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
95 + >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
96 + >=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
97 + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
98 + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
99 + >=dev-python/requests-1.1[${PYTHON_USEDEP}]
100 + >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
101 + dev-python/jsonrpclib[${PYTHON_USEDEP}]
102 + dev-python/jinja[${PYTHON_USEDEP}]
103 + >=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
104 + >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
105 + >=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
106 <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
107 - dev-python/pyudev[${PYTHON_USEDEP}]
108 sqlite? (
109 >=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
110 !~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
111 @@ -68,18 +70,56 @@
112 !~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
113 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
114 )
115 - >=dev-python/webob-1.2[${PYTHON_USEDEP}]
116 - >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
117 - <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
118 - net-misc/bridge-utils
119 - net-misc/openvswitch
120 + >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
121 + >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
122 + >=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
123 + >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
124 + >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
125 + >=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
126 + dev-python/oslo-rootwrap[${PYTHON_USEDEP}]
127 + >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
128 + dev-python/pyudev[${PYTHON_USEDEP}]
129 + sys-apps/iproute2
130 + openvswitch? ( net-misc/openvswitch )
131 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
132
133 +PATCHES=( "${FILESDIR}/sphinx_mapping.patch" )
134 +
135 pkg_setup() {
136 enewgroup neutron
137 enewuser neutron -1 -1 /var/lib/neutron neutron
138 }
139
140 +pkg_config() {
141 + fperms 0700 /var/log/neutron
142 + fowners neutron:neutron /var/log neutron
143 +}
144 +
145 +src_prepare() {
146 + #it's /bin/ip not /sbin/ip
147 + sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
148 + distutils-r1_src_prepare
149 +}
150 +
151 +python_compile_all() {
152 + use doc && make -C doc html
153 +}
154 +
155 +python_test() {
156 + # https://bugs.launchpad.net/neutron/+bug/1234857
157 + # https://bugs.launchpad.net/swift/+bug/1249727
158 + # https://bugs.launchpad.net/neutron/+bug/1251657
159 + # turn multiprocessing off, testr will use it --parallel
160 + local DISTUTILS_NO_PARALLEL_BUILD=1
161 + # Move tests out that attempt net connection, have failures
162 + mv $(find . -name test_ovs_tunnel.py) . || die
163 + sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
164 + -e 's:test_start_random_port_with_ipv6:_&:' \
165 + -i neutron/tests/unit/test_wsgi.py || die
166 + testr init
167 + testr run --parallel || die "failed testsuite under python2.7"
168 +}
169 +
170 python_install() {
171 distutils-r1_python_install
172 newconfd "${FILESDIR}/neutron-confd" "neutron"
173 @@ -92,14 +132,11 @@
174 use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
175
176 diropts -m 750
177 - dodir /var/log/neutron /var/log/quantum
178 + dodir /var/log/neutron /var/log/neutron
179 fowners neutron:neutron /var/log/neutron
180 keepdir /etc/neutron
181 insinto /etc/neutron
182
183 - #it's /bin/ip not /sbin/ip
184 - sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
185 -
186 doins "etc/api-paste.ini"
187 doins "etc/dhcp_agent.ini"
188 doins "etc/l3_agent.ini"
189 @@ -120,7 +157,7 @@
190 doins "${FILESDIR}/neutron-sudoers"
191 }
192
193 -pkg_config() {
194 - fperms 0700 /var/log/neutron
195 - fowners neutron:neutron /var/log neutron
196 +python_install_all() {
197 + use doc && local HTML_DOCS=( doc/build/html/. )
198 + distutils-r1_python_install_all
199 }
200
201
202
203 1.38 sys-cluster/neutron/ChangeLog
204
205 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.38&view=markup
206 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.38&content-type=text/plain
207 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?r1=1.37&r2=1.38
208
209 Index: ChangeLog
210 ===================================================================
211 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v
212 retrieving revision 1.37
213 retrieving revision 1.38
214 diff -u -r1.37 -r1.38
215 --- ChangeLog 26 Jul 2014 23:01:46 -0000 1.37
216 +++ ChangeLog 1 Aug 2014 05:14:51 -0000 1.38
217 @@ -1,6 +1,9 @@
218 # ChangeLog for sys-cluster/neutron
219 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
220 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.37 2014/07/26 23:01:46 prometheanfire Exp $
221 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.38 2014/08/01 05:14:51 prometheanfire Exp $
222 +
223 + 01 Aug 2014; Matthew Thode <prometheanfire@g.o> neutron-9999.ebuild:
224 + updating git master neutron
225
226 26 Jul 2014; Matthew Thode <prometheanfire@g.o>
227 neutron-2014.1.1.ebuild, neutron-2014.1.9999.ebuild, neutron-9999.ebuild:
Report Message
Find on MARC Find on Google Groups