update of neutron to havana

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

3 files changed, 147 insertions, 16 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index d2d3c07d4a0c..f76f58907d40 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.11 2013/09/27 00:41:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.12 2013/10/23 03:39:07 prometheanfire Exp $
+
+*neutron-2013.2.9999 (23 Oct 2013)
+
+  23 Oct 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2013.2.9999.ebuild:
+  update of neutron to havana
 
 *neutron-2013.1.3-r6 (27 Sep 2013)
 *neutron-2012.2.4-r7 (27 Sep 2013)
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index c2fe628f5859..31fe30786656 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -9,23 +9,24 @@ DIST quantum-2013.1.3.tar.gz 1174471 SHA256 79e60ec1aef800da3a4e1841909cdd8b2cf6
 EBUILD neutron-2012.2.4-r7.ebuild 3972 SHA256 3cff59ae8fbeee31f47eeb2cb6fb6e1507f1cf5f9f4dd191547f592f3aa1e362 SHA512 f2bea511555b48a64ac70a59dda848b4fc0b5308905ff7483c3d658baf22d5c2f380e6e4a11fcef0edb71f3f764d01363f62d965fb11f523165c12d32115a9d4 WHIRLPOOL 4b31768a012fe4535b3d5e04262a71f7abacdeada32fcc2a803756680300a82b4f4fdf583eb0ab2f03dd0381275f7945335d6027555669afb47dd5fa4763e076
 EBUILD neutron-2013.1.3-r6.ebuild 4489 SHA256 d284b2a8b1f73b3059b227a791632915570d754bb12a4fc4fcef8f7739eb9a85 SHA512 05f970692921695d735c819c61a56dda7f5b04d09842492f2b37795e40e7309d5406336ec439785979306ecbce2cb07538911f1cdbb1f1bd2379ba41ccb69acf WHIRLPOOL 89691b14370cf6af0023ca3dff3a1279009d9406301bd665aaca56ce4e9d8b93e3fe0b9be36d69eed8363ce8c2c8e7e3d3754c6e415a30c560bf9d2db1b5f25f
 EBUILD neutron-2013.1.9999.ebuild 4460 SHA256 c90d3f9c5141669a58a21ca93df64a58d167495d5184a81b17e022187193ccc7 SHA512 ca2423b4b316a711b069a5737fb1cdf82c60be7355617a2adf521e7536a94c9b3eb44521c39d60349f589941368f53abc0c9ca140da6d907db9fd0c073460fdb WHIRLPOOL 0681158da5988a8bd1f9f4f3ab7f0170d1a3153a3b4a9c93521cf7bb1807c6db65cc00317315e24cd7f42cc5242dd814a6fae4ea243e5c7f1a20360d55494a7a
+EBUILD neutron-2013.2.9999.ebuild 4733 SHA256 3f813e98f0d1a7ac95f85c87eea27c77cbc0d8c6310a2f17f1c7331c82348e9f SHA512 fd7b35b963bbdf2c84cd0f657e47181b35be48abb532c5432aed7d593f18b3ffff4498f2284323c3030cfc44f0753d569fd22c7ca6f84749ccbe044df33250c2 WHIRLPOOL aa7b1fc477e99021cc8754a3de75e94682e7d96925266a76303e9c1d85f045f30daf4d2753cfa11b2d39953061da4b91a990e30f076c6e78f0ed9f8d8864d5fa
 EBUILD neutron-9999.ebuild 4423 SHA256 857cd3177f9c6cfd20d5d93d56713bdbe4e6d907fb522518ed780864fe12f9c2 SHA512 dd22e052a1ad5b269f47c181dfe9e01daf58e5213654203062e009e5dc25006c5d9e0a9d83bcf33e0641ed649c505e90c59d2a0d05ed1585562a4e381660f518 WHIRLPOOL 40d6ad579c9dcafa3da95553c0a1f8e6be09df930764071a87a80053b0252e0d6fb1c50151da2e83bb8435f480b75452e0d2f5e9fba140b9af4b556d3602d09e
-MISC ChangeLog 6472 SHA256 d8796fd0dfd9417ded6d5bd34b24172a4d9fc3150df4ec8577a39782f1dd861e SHA512 08c859be6c70a40429f55b2f0a68f5690bb0ce990dbee56da6eecef5f3fbc56c8c21ee395f9343a25c17b74e0e01fadc14379259103bb69084916a941069b1fd WHIRLPOOL 81897ea55791df21db844a0a6d0caf1d1c59d8e1270439770d26b7ddfb68710a5180e09bcaf587dbab14f7be9270cfabfe167d0cda77f5e2e943b81afb728dbe
+MISC ChangeLog 6627 SHA256 ef56356274bfbca14c46c67b831deddf42478b3c4a9fbb75afac6e4ce31941bf SHA512 f95e4398ad0fdfad44c756c2b1f21465b4e98b246c4b47def6f2c6e2691b00f5714e3219eb3a56184e4139e738af918d3a67622f19a4b6b09c1fa2d38d125810 WHIRLPOOL 5acc8e766ccd5d92356d91c8fa3b53e6953b45960b348619dfc7af62fb2e41b849ada5d01e6d84590958622082815fcf833fd13c51dcf544141fa18052154fdd
 MISC metadata.xml 1172 SHA256 afbc9be698ec774a49fc53222bb9895ce39a03733608c764dc07590d7a918991 SHA512 d19ec3124132d8b7408de986825c070aa6796b25959e3e13a08598f1dbb1afcf14afe4afbacf8bfdc5a6e24bbc69be7b412af9b0e4d6f207c0659418da16847d WHIRLPOOL d236b792aaf656dd909452ef32f4a3a1e174a4cf291a7e286cb38139a3798f5348caf8b8cb43cd447aa8033c98921d4ca299f325c80c85bbf238a076812c5b19
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSRNSeAAoJECRx6z5ArFrDtrYP/1IzXW1hIp0HQUrsqvHyhYgJ
-ZaqGaF9fcGD41ZierIUlnE81NjWTJXGYmSeCBoST5EY3pIAygx7Z3x2ZGkJD+A8C
-cHCHOqVxXxMxNGBTid+U8WBnvO7uy6uvoSacdcpKN3cOvD4bNadsw6rZNArZSYf5
-lr6psvZwNH9W0rhOPLsaLaCnIG+8CAwhWiX7kM2MJLWthVD/KMUcYUZpf4eqiMmf
-mykEJYQzhK/rjh7ielqMV6V94FwxtVDn4I1Ef/ml/U5vWMfigHjZ/wfCf6cy00Go
-mxMc6pw3HwPf95Fm8S7OEtoWEEaV93D4IYmMlqdXYr/gSeBeijLaGiw1x2e8G5KJ
-zb26DgKPwzpFqQuj/DXNhsuHnwNUpHbIcJHV6mvSStPIXw1rKN4sLAK+XzOM6SL/
-yx2O9txw4PNqiFGVwSmOjjDfL3FPnCK7j2Elyy9D6/xBDHngRR1sfm7OabdBQCZ0
-YYJ60DKaJKTY+AJ9Gx08COGAWN+Q4TJAcfaB6YZPKWjA9IJa45HB/Ft9ajsFRHX4
-qPN0AyTVyea1FDY+3eiQTPQKA+swS9Ca78r3RDzV3i1QWmC3Pll10BSRXMUqqJaY
-coiQN1zK2jFIkFSkX9M2Suc8V2vMuunt52oVu/xhAYYFddFM15vbsdyA9cWXat9l
-Luioyaj+LrybaXdYBqKC
-=HgZH
+iQIcBAEBCAAGBQJSZ0VYAAoJECRx6z5ArFrDpeYP/2mFMWzODxQ+ScYu3wUj83lO
+aQoEHujiCqhiDLD4HlIocjYK8fnp19C4duOt/ZKlSUoBmKjXpmSrjxT7W0BlFJuc
+QhscgTN5q8MlvwiGPl+a1INQyLliHiM76+Ron+P2LPM5BAu+aDd5x98sbDeZPBAP
+FEs6bYTOhuYcHF4n9uGMDSBvuYyRGWOUW83GaaHljIQh3SSg3zaSz/odIBlKW8Uo
+Dgm9RL8ohLZKXnUpI2SfMuqvb9mO33jn16lSIiOTZ+bd5l3sysfgii4n6mBe0qsT
+H4mhbgv5reUu7dpwHC9lYrT3VLjfumb1G3tO4RUFJiY8lCUM0QVfWrNVL3ge+C49
+Mz4sjDa2puZiuEGN+iX88sL0zhe79G3Tmcnmf+35o2dS/nhtcvWqYGxff3rcUz4f
+019I+YtQqhAhml0+i/drlBk2NL1E0i0dFcjiJrsF7gvuAwZs1CEk8nJXjyqzWipM
+XNYvTao4bSUIl5+Z9IStiPGl3q3pvq0vwTT3S2v1lqky+BFruZpZP+AR3nSV3NZd
+tN+ugk2HC8JvDqp+KUCUmEqMszvYEcueE8l+8RqI+21cCIxy46JXmLGTEq4+bOb8
+Dpvc1M+5Mhs2Dlopd7A0IbAdR/oTWZFi31uT/1gClkcuevSv3J3hfZEXVVRqX8wK
+NMBVlumLnSooFhoAwNhp
+=Y36E
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/neutron-2013.2.9999.ebuild b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
new file mode 100644
index 000000000000..13f7704feceb
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.2.9999.ebuild,v 1.1 2013/10/23 03:39:07 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 git-2
+
+#restricted due to packages missing and bad depends in the test ==webob-1.0.8   
+RESTRICT="test"
+DESCRIPTION="Quantum is a virtual network service for Openstack."
+HOMEPAGE="https://launchpad.net/neutron"
+EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+EGIT_BRANCH="stable/havana"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+dhcp +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.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		app-admin/sudo
+		test? ( >=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/subunit[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+				>=dev-python/testtools-0.9.32[${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.3.3[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		dev-python/jsonrpclib[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
+		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
+		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
+	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
+		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
+	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
+		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
+	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
+		dev-python/pyudev[${PYTHON_USEDEP}]
+		net-misc/bridge-utils
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+python_install() {
+	distutils-r1_python_install
+	newconfd "${FILESDIR}/neutron-confd" "quantum"
+	newinitd "${FILESDIR}/neutron-initd" "quantum"
+
+	use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
+	use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
+	use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
+	use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
+	use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
+
+	diropts -m 750
+	dodir /var/log/neutron /var/log/quantum
+	fowners neutron:neutron /var/log/neutron
+	keepdir /etc/quantum
+	insinto /etc/quantum
+
+	#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"
+	doins "etc/policy.json"
+	doins "etc/quantum.conf"
+	doins "etc/rootwrap.conf"
+	insinto /etc
+	doins -r "etc/quantum/"
+
+	#remove the etc stuff from usr...
+	rm -R "${D}/usr/etc/"
+
+	insinto "/usr/lib64/python2.7/site-packages/quantum/db/migration/alembic_migrations/"
+	doins -r "quantum/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}