BUMP!

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

3 files changed, 179 insertions, 15 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index fd2c09fdfb35..7ec655ac73a5 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,12 @@
 # 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.22 2014/01/08 05:57:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.23 2014/02/20 21:10:50 prometheanfire Exp $
+
+*neutron-2013.2.2 (20 Feb 2014)
+
+  20 Feb 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2013.2.2.ebuild:
+  BUMP!
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org> neutron-2013.1.4-r1.ebuild,
   neutron-2013.1.9999.ebuild, neutron-2013.2.1.ebuild,
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7935fa86b886..5209e8351b41 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -10,28 +10,30 @@ AUX neutron-sudoers 88 SHA256 bb631691e67d9ddc405fd1f6a23b066120ecebfbf3a48bca75
 AUX nicira.patch 5757 SHA256 62484fa9d817feee1edc0a51ea1eeca068406f8f76e34c845b85ea51664e20d6 SHA512 f160a36f78d9a1186e19cdfb4f97b17e39e1a6f3e20bcaf84e76e71c632b0a6e8af89645d507f2c6f60a9f7d09a741302d476731c2fc798dfa999aaf38f1e273 WHIRLPOOL b7b5e0618caa8c6acc65f46c315d81b427810f3d6b1e89b48fc79567717c90a2e81e091d532ea192ac68ad432374fb9debe79d7b2c0a5a82d7d8cec8ca64f50e
 AUX sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c65664654eb733d081252 SHA512 988236676ef0550ca96cc05e606d43280969e89b31971244ece89d63cdcbcbcfd3ac595adca03a6308996ef58ebc4f75b0dfd65a938ad7c3fb67fb785e09f8c9 WHIRLPOOL 6154ee51ecd63040d9a6c2058f369a7243c719cbda3f73484d55ea9425a5c9982d3921d91d152aa27c61c5635d74f2afa57ff1b5aaa10b1be1e7c1475ff74e5f
 DIST neutron-2013.2.1.tar.gz 4397455 SHA256 7deb45fcad21a51986955a06fbf56565b3bc8b41a2812d9ac53213051964c208 SHA512 9763e2d43224e3cf3804723cc38ce86ea61062cf603f92965d732027301bed30b250f0ef373aa90b521758c78c4f13ee5d6986b7e4bf5cfda20d40cff71beab2 WHIRLPOOL ed29e106d45ba19ed673df05c44964493cd6a6035218dad644f9a5e1af0c067baa02217220799a65a0d8d2761d86fe1be53a30e53c5a2ea849fc321569bc6e92
+DIST neutron-2013.2.2.tar.gz 4010144 SHA256 3181d76992b77b47b02f43aed1b62b17930d1aedc75bcedf3e328268b8727243 SHA512 4359669f1c94505d7cab55dc224d0ab6fd36da57a056ced3d053cadc2d0e54a45d3f3daaa332a49dc0ebf0efd855b521387697fcce75997dd0e3905fc0b83cd5 WHIRLPOOL f5fa012dbca202308eb071fb0c6fa5351f139d3233a9ea6a5ceef8c868d47e92133c3cb23e3c6b9c6a3a69aa090eab9bf659c84c9eb39886e36294e9fb014068
 DIST quantum-2013.1.4.tar.gz 1178442 SHA256 3bd26ae7dabe6093a3cbe701ac8d7022fbdbe1d8231ab1c6866de388684e272c SHA512 48ce3aa8467eefe4ef07b03dee293c7eae1800736abadd56d0bf7b559506044bea3fefba0dac6fb20783f808baada70c52ebc388137ae80b41271dcde824243d WHIRLPOOL a5456fe6fb48192a4f4d97c85b7b235093f549965b36971802302998de7d8ed76fd7f393a659371b8057aafcc4594ac246159663dfcdb5251c786eeede6d66fd
 EBUILD neutron-2013.1.4-r1.ebuild 4655 SHA256 0bf835ddd6e7c962a6a896f92a7ecb7d320c1ad3b6758adf09426ed1670fb164 SHA512 bc16d7fb062243def0a72a4605bf13608374727333466277c882068455c7c156a620b012aae50ab4256d60e9f9d83d7b54d0ad21f4dbe2d2bc78a55c6f48f3a9 WHIRLPOOL 88fe15fe93a79eff87040ac91b9661806fc75f3c120bfb9ab8313e7cf37b71667e16d3c7aaf2bc7398490e95045e49f5bc7f002f04e5d4ca6e79b9bb362f269a
 EBUILD neutron-2013.1.9999.ebuild 4474 SHA256 325a48eb9f212eb2603ff2f5942f9dc34fffbad1a296bed6cf1b65afc32e40ba SHA512 d80dcc568b657fa7d25748213970dd5306c35ff0a1f3d32087ae78c469baafcb9844744d60db8595cc5afbcea8bced5087fa889f193f63870f9ba2287011d53b WHIRLPOOL 0874a425eb8e6b8ce1245453c1e095b6badb8a53c1912f05a9ffee5a4774f1e7e9e75b59793efb5fd2cf59b5c39488fd28bc86cce5aa910389d432f4119ffe75
 EBUILD neutron-2013.2.1.ebuild 5688 SHA256 a323424e8caa3d45cf083092f8139499957a78cf61c8d405a78a6e638722d23d SHA512 12f65112e8607f292bb9fa33eb57d4550f7fca09ef68dba9aa9edafe63a9ab684908812ada7dcd856a0ff6b73724543f96233046cba73650eb99d12a5526c3f6 WHIRLPOOL ba2e48cf514d62987d5410e84df6598bc62318e31b47f6a3605ca32edba3f6fc66415d1af828624c09fa1027a64bfe20e46bda91fda0a88fd7c828f398ce2036
+EBUILD neutron-2013.2.2.ebuild 5696 SHA256 bb96184e45e89c973c4e755981d8fe5f5c737f48edc4ef8fae683652e9206c0d SHA512 6afe633a4ffb6a7ff76dc9bb9930db9b43199d6092419e14489eeda0e66734319e51c448ceb6ad154e356dad091ff6d20500b84239806d46f6589254cc5143ec WHIRLPOOL 0c2cba7b5267f39f3014faee1adc731fdfc17503740be94e590065510f332172397afd21d62554d25ceb7d851226dd059a2760be315de05cdc472e3e49d99bdd
 EBUILD neutron-2013.2.9999.ebuild 5699 SHA256 eca1d474ea110482cc901ada794f72efb495de226834b11a87c005185af7bb1d SHA512 94bc0bf14894f20772586b7f19694f38fba9654404c6b507cfa9e483a90df166e32f6ab1db04d24f5a0147438fbc8f4def248d08101fec59d2849744bca5dde9 WHIRLPOOL fefec821fcfb38c3af2d84e961816486b86eeb2419ee33d6353991f6fd7fa710e5ee183c2469597850116028560eb67dec1a8ab17d471dd3b5aff3ba2523950c
 EBUILD neutron-9999.ebuild 4409 SHA256 7e81a4614bc6813ac6c71f330f02afdd4986de592bed8deb9ff662823f349b97 SHA512 cdca470997f7b31d5f99a682ae21f22870678437a1bd8128e3e7140589b3b6041f133108fdb3f390f8da768f4e131f327000ee3f3c7adb1bcc7332e038adde9d WHIRLPOOL 2288062acc8e99c6707917fc2ff80bf54ebf736cac1b3158b42148c6575e3f23c01257383ac030d75af9d0dcb422486bccc8f0d564c6eb805ff5c245d3cbcd4a
-MISC ChangeLog 9081 SHA256 f0d7c555e4bf72402d6d63b1a7d6cec682b6e2a881e99f798f9a66e395ec0f59 SHA512 0a4b1c9188b22c669c2a62a2126dd276a3f8966debc76f5e3ff5fb7b61ee7a936e54fb48045344b82b78bd6a6d21e41412a968958f24792537d47f2bf10ec9b1 WHIRLPOOL 28fdaf728a43addb02e6c30b8e6db9f5f229fab01a9b593a09a6632c883912c49fdd714fea4b208b014e3c663f6508174b4560c830f8cd691bf5b0bfd4bce296
+MISC ChangeLog 9216 SHA256 e1c1d3d6a4da6bc409f85f6b3ff7f8c2e0d8625c0ba65c9c28e5c7e15086985e SHA512 2b09695a3b491139793baed4d833738806fe2ec4cb408305a405013224f20ba9a68657087a22958c580d47be8a5c276c0e0c8cff480073edfc1e0e32556b876b WHIRLPOOL 0b4040daebd8c6f31f1fae283739a52f62ab6516bdf7a609b40d9787d4c21bf5219ea9cf4e970589d0cf5315894a1eb2b4cf0cc6eafced2375810f470c1a8143
 MISC metadata.xml 1175 SHA256 95ceaccefb744f80032d97a4cc13c43c13d7e4116d6810d5779df5be3ebe11ce SHA512 74a46511f82bef78397bfaef2901606c6f468f532bbd7112fc8196b69362a4666fafbda8023a281514ada958cd2b4ba567f11dfa071d0b76bc94e456d96ed287 WHIRLPOOL 783aa30c05484b68b2a8f1ebcfd39294a21731cfa9587c0e1cd07ff291416d10912066e23c0572ac63a125f9836374c73b91775858c863abb0779eb13356ca11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzOjSAAoJEPGu1DbS6WIAldMP/1tjFJxsNbD5h+ahDuMQyAaA
-u1B8B1fdmKuxGZLIBxzaTiLSnG+KTQ2uQYRKusZj32dAr6qcexh8N2DWq8sq2jgO
-f5jmLPmcjcStihfMXQNUTltQ76yORXSvSuO/L+Fbv7DdM6wDCyrIAr/Yyycq7L7O
-695fik4B4LEXqDfEAIMgS1K0QYPi13B+E8/m8z4QJDZ62JhQyE3u3JYlDl67qeN1
-yYPHqsYmWuA1VfXH2rRrOZDouA+MSm0tTKA89aIpHba7Ensf0Oeekw074ub12PFO
-5nyqln71v5J4YaWfiM61tb5f/+a2Vr0xKlmQqU/ztKph87e8YdXBDU01MTZd/MQo
-1bwbvxQ9e+PA5xRqd2tWD6kMazecAGncbQsf48kogyrfzCD3icgMDI+v2/21Bpl1
-7ZGYy2MRu7a24VdEHj0srDQ4jkAetcyNohfSFwSqNMbABu3nS0KkvhgG5vUVcsF8
-39JWJhBZB2/4MXR6ObL+/SWC0GshoTmNDMFOWE6tVRHln4zY73IvmrRFbLaQa+rC
-PnNWekOE1l/yCIxXrv/5SU8FNVhJPBwss44DPUggU7xJiF+//8R2X2b0gsw7IuSC
-el2vJjOVHoeKtXLIfiHluYKHiSVFXovVrmgVEfaZYiryBh1hHbP8Usf/XJqNyX/j
-Ih81ddTSm/ATewRjAPLe
-=Rhbs
+iQIcBAEBCAAGBQJTBm9rAAoJECRx6z5ArFrDPuAP/iFvPo6Hw85K9PXyYZumPtQ/
+AiOdUOYBAqA1LJojEnO79DlKOEcW8ybr4OYrV+BP7GrgzaKrGKw0C3YZgdXv8wJs
+gZgvA12mMXb87s4dqxAnh9G+Fl4zFuXkF/MbFyzoaNZgCQmdja2MXLTCSNlD6ly3
+xLgaee0oxLfhtlrfE0mYxm9ycgmC6CrdtnQ7R7JNdvwG4R0uAf7s0Pd4exKNifXN
+lt5cM7RTGY44fyFrtkbsPZtGL9AEPIGuXCcg5fQ2FatPP4BILd+xMIsUiNN5evdM
+BBIaa1DWae4VWPJzNObnBdLOZ1bvRbUWtLhY2K/+dyzF6ZWqO/PLc6eMIngR54Tu
+1LMj2chi1zMGrwPcNiVLRStd0wJYbv28P4IhqbzzPaV3CzN95+ESY4G1XhODKse9
+c+Av9p97aRPilJvJa/FHjPKWu+b8Jzj1mhagRzgiEE406VbCNFZI4T6enMEdg0ii
+Frn/mo8mKiQdn1mhO2hJv6FF69iDyQAf5jGqpnm3iqT6YiWa6OA9YuAeC9JiHlQ/
+PHl+U/SA0vDDrDxaymA3OHjYifG4E1R58+ajQJu13DqGuoR0vraXhH6ytC0qmxAI
+jiJkdbbYXijmVClQDq9SB70uu9rkgNYoRY/wcC8xWYO5wgUlwgX12ExVxKOEfTeq
+iThdTHsx59MPitO3tGSp
+=ToJZ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/neutron-2013.2.2.ebuild b/sys-cluster/neutron/neutron-2013.2.2.ebuild
new file mode 100644
index 000000000000..dca0a0a47d19
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2013.2.2.ebuild
@@ -0,0 +1,156 @@
+# 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-2013.2.2.ebuild,v 1.1 2014/02/20 21:10:50 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="A virtual network service for Openstack."
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+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.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/sphinx-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}]
+				<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				dev-python/mimeparse[${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-1.3[${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.8[${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-1.4.1[${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}]
+		sys-apps/iproute2
+		openvswitch? ( net-misc/openvswitch )
+		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=( "${FILESDIR}/sphinx_mapping.patch"
+		"${FILESDIR}/nicira.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"
+	newinitd "${FILESDIR}/neutron-initd" "neutron"
+
+	use server && dosym /etc/init.d/neutron /etc/init.d/neutron-server
+	use dhcp && dosym /etc/init.d/neutron /etc/init.d/neutron-dhcp-agent
+	use l3 && dosym /etc/init.d/neutron /etc/init.d/neutron-l3-agent
+	use metadata && dosym /etc/init.d/neutron /etc/init.d/neutron-metadata-agent
+	use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
+
+	diropts -m 750
+	dodir /var/log/neutron /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+
+	doins "etc/api-paste.ini"
+	doins "etc/dhcp_agent.ini"
+	doins "etc/l3_agent.ini"
+	doins "etc/policy.json"
+	doins "etc/neutron.conf"
+	doins "etc/rootwrap.conf"
+	insinto /etc
+	doins -r "etc/neutron/"
+
+	#remove the etc stuff from usr...
+	rm -R "${D}/usr/etc/"
+
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	doins "${FILESDIR}/neutron-sudoers"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}