updating git master neutron

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

3 files changed, 96 insertions, 56 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 01a2453a4c7b..ab88be1c76e3 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.37 2014/07/26 23:01:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.38 2014/08/01 05:14:51 prometheanfire Exp $
+
+  01 Aug 2014; Matthew Thode <prometheanfire@gentoo.org> neutron-9999.ebuild:
+  updating git master neutron
 
   26 Jul 2014; Matthew Thode <prometheanfire@gentoo.org>
   neutron-2014.1.1.ebuild, neutron-2014.1.9999.ebuild, neutron-9999.ebuild:
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index da4c5d0cc08f..fe7163b0edf0 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -21,23 +21,23 @@ AUX sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c
 DIST neutron-2014.1.1.tar.gz 6404237 SHA256 4723713b124ec7be0ae5f280d30a53b00ab5bec8a27be6165bdc630b8f22c1b5 SHA512 8a586741c035700ed8f33089830278e9eee9745a8fa58ef4ec71638ffecbd7c8689387f1597d948ca18a7f7edbad1ff67aab6d5304b61069556d5418e55738c5 WHIRLPOOL 6b7d139f1265a719edf05dbe2648fb7a056f708984da3e2b7b89f17746694137b5201bc69587e0af1a9729710205538c5841c860180ea9d7e7f5f0a17ece43dc
 EBUILD neutron-2014.1.1.ebuild 6792 SHA256 7c501a43c3a0f4e91ec892ec68621cb768c5515fdffd4deff98b50a7ac8b04a3 SHA512 f54f2f3ea9d065895f2fb6b710727bfcea11c3c05c8a56cbb22027589d2c0d0279d74d053007449fa82789072303f29e01cca36f6db23caeff723ea9eece29fc WHIRLPOOL 1c31972ee88325858862c3f923032a416c270549908350618e9d629cf1b2150ed081d8082dedf5178bac8724ee96ddad580d8c935f873b48dcc481d1d40b4ade
 EBUILD neutron-2014.1.9999.ebuild 5753 SHA256 04b7dad872e1ad9bf0f5a6356fdef730b8001095de41408cbb1f1eafcf8fb290 SHA512 5bd3801d6f395202f43e3988aa4917e97adb9ca273acd4a1e79dceca1a36bdc00951bbd86578953abecff734041fe8e2b8c881f41412fe3d396370add7de344b WHIRLPOOL 3d5684fa578f2cbaa9570b6e9c9ffa791f645be50ffd97bc0bc62f8392e3e4c48aa4a50522dcf44218f4bccece61086ecddc96ef56421c777443a883038bf388
-EBUILD neutron-9999.ebuild 4504 SHA256 7bdf3bdb8e2d6db5f68d4c2eda28c4f3e4adbf2ac80f87ba1cf4e75a649fca52 SHA512 1bdcdfc5e80b5b4b27199c13d1ef69812a98d9efccf966dd6e94b31d1987fcf7237d348d0fddbfc58cb04c0db713193f832f2a60b18c837415a2f8d2bce35ed9 WHIRLPOOL 4217ef88173e96b44b09bd12a674fa83700cc7d213a3b101e6aa0a0b94b70151aa641db85e5411d8bcc96dd65fe6237718ab4e7c61b5cbda642ebaf7cfe4755b
-MISC ChangeLog 12311 SHA256 cdfdf0fa6f33f093d74120e1890402920c3da30ced0c7b73c1d7568f2cba0c20 SHA512 184fa345cf3450991c721b0664cf4967623883d0a9aee76ca405118be4f437c6d61416ec0ed79f596eba08db51d1afe2c8d34e2e2c4c4fcfaace1d4e0b851919 WHIRLPOOL 94d319f3001fc793031c98f126216e9296d861266c7addbf7a12173e9edd767a42914283f14d3fc3c435d1967f37ad749a965fecde364639511f7ee386792dfe
+EBUILD neutron-9999.ebuild 5717 SHA256 d864a4b6e6f426332c1e41cb44633df9c63ff16db1310195c33c3a6f4a20aba9 SHA512 fc0bf7ecded2a2e179cde382102de2768d7f4381c91489df536588fde63e81de2efd379eb30b2c87e4896da80926b7f6be4df7c1e59c80119bce3992051b0ed7 WHIRLPOOL e73a707cac8ab6660835662aee947a5db63f34b02412f932e8025652a58bcdbcb83d6f56611566853a8589dd4b957bce0fc08e230b71c700a59b068b4cb0bd62
+MISC ChangeLog 12420 SHA256 0aef78374e8cd6d2ad8ba8aa4afc776386e62e227dd07e8b33f41ced2c1eae63 SHA512 1e8050aa7fe314db7caa71e87c100482282605d787481f1da3048fd5842dcbb6b8de3edfe95d98f32f687f6a51b7938d406dea72a35ca853b3755e0e18433474 WHIRLPOOL 815a30f4a22e23fb0633d7dbfa7e46e2378f6c084988b95299495fe2bcfe96b143134340d7feb3f12a0d927c6d5278ee86edd2229aec00e617f047e794b2f111
 MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT1DN2AAoJECRx6z5ArFrD9LkQAMpb1StSCY/FOAzIdZss3ot7
-1ep9HgfZobAOqgJ9tmW3qYSSOdtxnDevbZONmRODccgQ9rTzVxlYwUhlO5bubBRz
-hquaTi6+0qq+MPyDmjPB/LohWOJDjQ3yKwyNa7YF1p1F7a2s3tRjyPxwvcW6NJGK
-0mVcVpUDQgGeP+H6cLMI7aHJg5b7Hhf0a485W/38ykXjX01xjso6KJ/yIFYSApAx
-VAUKyFX71cF0rDoydcmYgS8u1Mfrksa0fnPymObMgUjBNtH6pdLh/ISSI06YCiSI
-xHcIked8wJXVLG1C/zWaQlCkcP/dMiP2m56tUCl5u3oqZf/E+LW9S5G2s+MKjxPu
-1+sglXtIlmhNzCiRjvkyUGsRQ2MoKw6mdiNW4y6+wM6lZeMGdvheUNuDFnsrQhu+
-vSxWKVUzKmDx3IVo2eMW0JczGBAqB4yRhl1fGwJANuHFZVus+LmNt7z/1pycXBX9
-gU2YjIxoEOdhw5jFLbkXq+c/402Yt00JZXjoMNDUcp1DeYQ5LVuBd6ZBg9WT66b/
-lN5ajIB+QvByruzV1O2n58/FP4ZqycXI0j1PAUrh1qu4Nd60T74hF6TjGzjsFaFw
-iC1WvL0Avabd1wn5GqWqklvdyE+Ix6gpD1I1Y85+twuerpLhE6Q8n4Nm6XvpdQXw
-VuG1fXGWWHUxwJ8gV9Aq
-=5Bcy
+iQIcBAEBCAAGBQJT2yJqAAoJECRx6z5ArFrDpecQAN9pswtOOYErSZBA3PTiQr5x
+2Blj282i0S+HnMnurz2UUjUhknBYFs+Q35NEhBH2WFTXkOW4uMtbKzQu1Kv4HziC
+UhehOaT67JZAmMgZ0/1ujish4Ukfq6DZy75ImxQHNWVcdYfiSZG51wUz/mCzFg9U
+bywL5xiY8gvUZoGXKlYTe4t5foDTmwrl4mkYsLt3u8g4f5189dhKbd8CS+V/J4bj
+l/MfBzeLhyiP0mlf+tK87fizbcp6YgIvOL8fTzxl4SM53ZhGAoc1//REZuZHE1lF
+65uD3h8MQ8gYqcjjJk6p2fcoSv5eFcEVK2TZQjc8SHkQ+4d3RSa86OhMBIaclW39
+aMBjltdamGqo7UJNp7cRDRW4NImv+WJ8rdjNlMzG8HVSEPfxWMRMQ/wBFSkcxY6j
+ESItWXSEE7pRFOQ2UCLn6bhL5RjMo8z0plR9XG2VmsKABENbt0qhL3lrlS0jmWHm
+gbkTc7LH8/PMMq7xxBqmlckkONlHZ9bOezkg2wxMb2E3GkhyISrqYLHpNvL59QqJ
+B/jSGW3COSFFtfklW5DbEL/npqs/CRMGRchYrxSQXW6CPdhMJIc/JWI76laDVfd+
+wCMI1ou0Tw3ATxjWf2F20yYCCqk1aPRJvqcJhy6gSuwQgXOvno4emKU30QUM9/0I
+4OZiC1tuOspH8Z6JFX9D
+=1dQU
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index 61842b79be13..af59ebaa501a 100644
--- a/sys-cluster/neutron/neutron-9999.ebuild
+++ b/sys-cluster/neutron/neutron-9999.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.12 2014/07/26 23:01:44 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.13 2014/08/01 05:14:51 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-2 user
 
-#restricted due to packages missing and bad depends in the test ==webob-1.0.8
-RESTRICT="test"
 DESCRIPTION="A virtual network service for Openstack."
 HOMEPAGE="https://launchpad.net/neutron"
 EGIT_REPO_URI="https://github.com/openstack/neutron.git"
@@ -16,41 +14,45 @@ EGIT_REPO_URI="https://github.com/openstack/neutron.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+dhcp +l3 +metadata +openvswitch +server test sqlite mysql postgres"
+IUSE="+dhcp doc +l3 +metadata +openvswitch +server test sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo
-		test? ( dev-python/cliff[${PYTHON_USEDEP}]
-				dev-python/configobj[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
+		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+				>=dev-python/cliff-1.4.3[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				dev-python/nosexcover[${PYTHON_USEDEP}]
-				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
+				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				~dev-python/webtest-1.3.3[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
+				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+				>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+				dev-python/configobj[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
 		>=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		dev-python/python-novaclient[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+		dev-python/jsonrpclib[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.4[${PYTHON_USEDEP}]
 		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev[${PYTHON_USEDEP}]
 		sqlite? (
 			>=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
 			!~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
@@ -68,18 +70,56 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 			!~dev-python/sqlalchemy-0.9.5[${PYTHON_USEDEP}]
 			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 		)
-		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		net-misc/bridge-utils
-		net-misc/openvswitch
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		dev-python/oslo-rootwrap[${PYTHON_USEDEP}]
+		>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		sys-apps/iproute2
+		openvswitch? ( net-misc/openvswitch )
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
+PATCHES=( "${FILESDIR}/sphinx_mapping.patch" )
+
 pkg_setup() {
 	enewgroup neutron
 	enewuser neutron -1 -1 /var/lib/neutron neutron
 }
 
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	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/*
+	distutils-r1_src_prepare
+}
+
+python_compile_all() {
+	use doc && make -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/neutron/+bug/1234857
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	# https://bugs.launchpad.net/neutron/+bug/1251657
+	# turn multiprocessing off, testr will use it --parallel
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	# Move tests out that attempt net connection, have failures
+	mv $(find . -name test_ovs_tunnel.py) . || die
+	sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+		-e 's:test_start_random_port_with_ipv6:_&:' \
+		-i neutron/tests/unit/test_wsgi.py || die
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
 python_install() {
 	distutils-r1_python_install
 	newconfd "${FILESDIR}/neutron-confd" "neutron"
@@ -92,14 +132,11 @@ python_install() {
 	use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
 
 	diropts -m 750
-	dodir /var/log/neutron /var/log/quantum
+	dodir /var/log/neutron /var/log/neutron
 	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/neutron
 	insinto /etc/neutron
 
-	#it's /bin/ip not /sbin/ip
-	sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
-
 	doins "etc/api-paste.ini"
 	doins "etc/dhcp_agent.ini"
 	doins "etc/l3_agent.ini"
@@ -120,7 +157,7 @@ python_install() {
 	doins "${FILESDIR}/neutron-sudoers"
 }
 
-pkg_config() {
-	fperms 0700 /var/log/neutron
-	fowners neutron:neutron /var/log neutron
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
 }