new logdir, olso dep fix, /sbin/ip fix, initscript fix, bridge-utils dep fix

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

7 files changed, 62 insertions, 30 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index b76fa7b2713d..d2d3c07d4a0c 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,15 @@
 # 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.10 2013/09/13 20:44:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.11 2013/09/27 00:41:28 prometheanfire Exp $
+
+*neutron-2013.1.3-r6 (27 Sep 2013)
+*neutron-2012.2.4-r7 (27 Sep 2013)
+
+  27 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2012.2.4-r7.ebuild, +neutron-2013.1.3-r6.ebuild,
+  -neutron-2012.2.4-r6.ebuild, -neutron-2013.1.3-r5.ebuild, files/neutron-initd,
+  neutron-2013.1.9999.ebuild, neutron-9999.ebuild:
+  new logdir, olso dep fix, /sbin/ip fix, initscript fix, bridge-utils dep fix
 
 *neutron-2013.1.3-r5 (13 Sep 2013)
 *neutron-2012.2.4-r6 (13 Sep 2013)
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 658908e73934..c2fe628f5859 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -2,30 +2,30 @@
 Hash: SHA256
 
 AUX neutron-confd 75 SHA256 2e03d5dee96eb235d3d2742fb59b52376914dae1d8683144396d796dd35ea9f5 SHA512 fefe7dd1924fabed3cdddae2a407b254c62f39c49abeae238486896e9d26863caebfdfea6d52c5eef34d25452b163c373105929bd069b969c2af0f7d62d6c0e6 WHIRLPOOL 1ac7ed6b2287e66bc51be8b521e355a48e888e1e57371362bfd41fb831d63cc90aab542c1668b4acc1c087cb6bacd418a480e2732a7611b8df290bf63444c902
-AUX neutron-initd 1610 SHA256 7fc071ea376a2b2a4344afef4d5f1815a8588dd8400c3770fa8893518dd69c1b SHA512 0589b04b99f391c71e486efac8b923ef2c134fb92424b3569c617d4214d63e46a7e97257df656a0655a8fdebfe15367717d73db3e47d6f2178038cd1d58303f8 WHIRLPOOL d3d96bf3f3a710500aa64fbcd7d416377e3b9f3da8ebf402353b477124421761c73761f1204b17a2b88b61668487fd9b974fcc4796f617964ef7a60b9fb73b80
+AUX neutron-initd 1610 SHA256 58f26e65b4f81ec3d4b0a670f06d9e5dddb35d2ad0dc5376587e654064059d81 SHA512 abd4170e7d7b720cd2aa7b4a65bd2fb4fdba0c11f976eb516a086e9e0e40a92428f4bcf5b3095ee8c31a0839a9d28a703fc42c0baf21bcf280867a805e86f19f WHIRLPOOL 7702f2df1e6fbebc8cc7fffb2590d9a2d3d7d496f0f5b62e72ab2c35fa226dad96492626c9ed5f5c59a33c1e9f06501f7625f037efe1926e22de0ad023d20669
 AUX neutron-sudoers 88 SHA256 bb631691e67d9ddc405fd1f6a23b066120ecebfbf3a48bca752e82aa8224922b SHA512 c6a87ad7047604caf1c5d66ff1f44e9f1a289cbaaf2031ffc6bf8c705fd439db2afaa8d5858746f8539beac84945886bbbc347be0ba85e7446ea7451bb81f027 WHIRLPOOL cbcb5da9b6c7629741a076767aadad9d849462005526dde7fad76fe93285724361839b64d28aa3f0ed7dafaa35b110765b759b3f6b525a52cad5abfe6679ef1c
 DIST quantum-2012.2.4.tar.gz 780156 SHA256 b9a28ceca9b6c3d0389498f4219f4432664a57657fade4490e494ac5359f7693 SHA512 697a8cad0727e8db45062b0141e61349f6043cd48df234ed1dac5ab1277665e314c7fab58d35eaea303f6905d49a1082c0b35e296c662ba87f93850aa265cd0e WHIRLPOOL e0566ee292d62fb066bb17311a883ebfeda191c9decddf80c6c8c75a0e0f57836d8f761e20af122c460a584a12326a5c24767a5b8a85832cd5d55b9fa4dfaa12
 DIST quantum-2013.1.3.tar.gz 1174471 SHA256 79e60ec1aef800da3a4e1841909cdd8b2cf645979d08f27bc481957c7944e93d SHA512 cba87ff6b6695bc6d09b60bea86e9fb42fcc9d5358dd3c06d1a6880f9654d9155d881485b49cec05aaae9428fdafa7d2d4061b15b9c02a69de49475b0cc064b8 WHIRLPOOL deaf4a9ae8df78580a7418d65a00850c57f34cedbe40e38f4832849d2e8ae8f4eadb06d37be039c1c2a16e8893f891763888d72e3e174dac96df56e733ad8bb7
-EBUILD neutron-2012.2.4-r6.ebuild 3824 SHA256 aac44d2d8bdc16b74e25d5775a51b24c4fdfeb61ed335d1a141ddea7149a9d57 SHA512 81f74a8aca8753c0a215c93c5c429a8813f8ee71d03d066d54c7461ab700f8e31209ac41166cf6ec1acaa2a7a0b95aa55a3fbb4ab0e98761960269234f09f334 WHIRLPOOL 305099817307dae7e1a4342c19c0878b2c2d80fb77e16248254da9af5152f1af45998ae52e19562aef358e188d00f1ce16f6b29cde5af3c3b2cdaf0acd228333
-EBUILD neutron-2013.1.3-r5.ebuild 4291 SHA256 16ed41f62f21d058373e8cc22fa5af35c8f05b69c1e078dd476478bbf00cb606 SHA512 099a1475bffc08e0a25f79e5fbe1075483b82f86588c39e345bc984e4351ed395ee4783af6ef43bb83f6432b0cd3c8e8e85debb56422db527be76f19226e0380 WHIRLPOOL 1338e9127633278008f3a84a887bbe8233742cacc9f90a6592c3dc87d9dbd16bfa1fcc485f630e34d3f405991fed0b40ca695b47f4b4d90b160cd7a279337ed9
-EBUILD neutron-2013.1.9999.ebuild 4261 SHA256 047d93a975a2246757768df71032f03f0a4a9d43496b800a0ab26d715bc26d05 SHA512 4350cb34eaf5d5f8f9704a4d839af1f5b1765356b31ac5753bca9349bc46cf00b1df2fbf84acdfffd7f1704614e83fa9c286a5b8f3968b6f59b92768efd97db0 WHIRLPOOL 5980c0ea983d0818ac33d3673145bc5e094a3556a304b09094434e0e5529ef3e2aff9fb41e4bbbfbf95a74cc2b050f1996142afcfc778d1f213a3db9c3dca867
-EBUILD neutron-9999.ebuild 4225 SHA256 ded554c988e2c3735ea02deaea1491bd103c1d64d38e6afe65c5d3bffa745290 SHA512 1a7fe8a0241dac51db3dec2375f18eebb6b7c48fd4211b4e524afe553c2ae7a3f2084a82c1b05b63ff0b5c48f0c11427bbe7ae242ef7dc57b9504a13be10545f WHIRLPOOL ab6b4aa981edf0ec3411cbf48219d58647bf8042ed2274c742bde0c9b7a6ade4d7c1423a055ef3fb5725898d8a7fad9cd1772b339dde55d4dd50594e5a78b903
-MISC ChangeLog 6072 SHA256 41bab3373c3dda59f4cf175fbb5494a23105d4d3974f420e1e9b7de7539be464 SHA512 ed945de87d382566501ee6e080b0cf4d940af2f1b80bdb9fee6fbdcaee3c98b5560b731cdc1140840c5f7fb592598cadd936c75a79bbbf719e73408e74169de9 WHIRLPOOL 89f6acc16b5e8976e66e777f1a2aa149e175b62222269b69db94b6fbf15563dab9046af663500fb1fea0a475d72f6714156259b852db951f4d00b8072dc8bc2b
+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-9999.ebuild 4423 SHA256 857cd3177f9c6cfd20d5d93d56713bdbe4e6d907fb522518ed780864fe12f9c2 SHA512 dd22e052a1ad5b269f47c181dfe9e01daf58e5213654203062e009e5dc25006c5d9e0a9d83bcf33e0641ed649c505e90c59d2a0d05ed1585562a4e381660f518 WHIRLPOOL 40d6ad579c9dcafa3da95553c0a1f8e6be09df930764071a87a80053b0252e0d6fb1c50151da2e83bb8435f480b75452e0d2f5e9fba140b9af4b556d3602d09e
+MISC ChangeLog 6472 SHA256 d8796fd0dfd9417ded6d5bd34b24172a4d9fc3150df4ec8577a39782f1dd861e SHA512 08c859be6c70a40429f55b2f0a68f5690bb0ce990dbee56da6eecef5f3fbc56c8c21ee395f9343a25c17b74e0e01fadc14379259103bb69084916a941069b1fd WHIRLPOOL 81897ea55791df21db844a0a6d0caf1d1c59d8e1270439770d26b7ddfb68710a5180e09bcaf587dbab14f7be9270cfabfe167d0cda77f5e2e943b81afb728dbe
 MISC metadata.xml 1172 SHA256 afbc9be698ec774a49fc53222bb9895ce39a03733608c764dc07590d7a918991 SHA512 d19ec3124132d8b7408de986825c070aa6796b25959e3e13a08598f1dbb1afcf14afe4afbacf8bfdc5a6e24bbc69be7b412af9b0e4d6f207c0659418da16847d WHIRLPOOL d236b792aaf656dd909452ef32f4a3a1e174a4cf291a7e286cb38139a3798f5348caf8b8cb43cd447aa8033c98921d4ca299f325c80c85bbf238a076812c5b19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSM3mbAAoJECRx6z5ArFrDZYEQAMlaUv8L55jPkPs5mMohVT30
-igFp3YETBCSatMipds2hOOjDbI+E6uhwzZpgSGCrNyPoeE0iUJaaTlYB85RpzWia
-cHhSwMOfkM5LkD/c/6VRYHkVjYuoCBBC4JWdo9z8rD1InieRQJTWGRWF9eKtLdZK
-ou/mAFsrljxuxKmF8cu8KD/e5mll5SfHMpJBeA97ap1pYxAVK3u3bYjo7PZIARuf
-3jwnfASdj+d/LZH0UiRMPIu5cH9E72RFtNrhonxcbfL7NeAxIQoOlc85Y6dn70w4
-mW+mEG95BwpPRPoR8ZOqEy5gq23dvjws1g4qbL1GLMEwMOYMUYfpjsRIbM3I+YsA
-p7VLNdxDCUctskJe/xFNbkLPnk0qfHABVfvEt/JDq4V1Nyvo52y/G08XyQCs/205
-lq63XGtp6Lw/y1TVx2YnJf/5KvqrC07qGC8HjrR0rJvZ8bbkmseIlP3YMhhrMhEG
-Ez3gtUEYoFLakSBUSh51ev9nWWkPsp9MkDBpeiuchQUE196zaqbRqH9ojemrtcU7
-t8PFUrmseZ48XWNy28pm5Bpdpv3r2pBy8Yt9z5jK55ebFqn7DXZZgHtgBKP0jMKQ
-a5b4WutwfipguKnnRaIwGedxbrpI9HsHgXD9tUaCzBMgbkjcb1WsgwgBOqihMKCm
-Gd1CsB4QtEbgE3zZCibE
-=ypmo
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/neutron-initd b/sys-cluster/neutron/files/neutron-initd
index 6ecae4046b01..348e62766c6d 100644
--- a/sys-cluster/neutron/files/neutron-initd
+++ b/sys-cluster/neutron/files/neutron-initd
@@ -28,7 +28,7 @@ start() {
     fi
 
     start-stop-daemon --start \
-        --user quantum:quantum \
+        --user neutron:neutron \
         --quiet \
         --pidfile "${PID_PATH}/${SVCNAME}.pid" \
         --make-pidfile \
@@ -47,7 +47,7 @@ stop() {
     
     ebegin "Stopping ${SVCNAME}"
     
-    start-stop-daemon --stop --user quantum --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+    start-stop-daemon --stop --user neutron --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" \
                       --exec /usr/bin/${SVCNAME} -- \
                       --config-file /etc/quantum/quantum.conf \
                       --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini \
diff --git a/sys-cluster/neutron/neutron-2012.2.4-r6.ebuild b/sys-cluster/neutron/neutron-2012.2.4-r7.ebuild
index 2ee71ed678ef..6e578db83427 100644
--- a/sys-cluster/neutron/neutron-2012.2.4-r6.ebuild
+++ b/sys-cluster/neutron/neutron-2012.2.4-r7.ebuild
@@ -1,6 +1,6 @@
 # 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-2012.2.4-r6.ebuild,v 1.1 2013/09/13 20:44:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r7.ebuild,v 1.1 2013/09/27 00:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -57,6 +57,7 @@ RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
 		~dev-python/webob-1.0.8[${PYTHON_USEDEP}]
 		net-misc/openvswitch
+		net-misc/bridge-utils
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
 pkg_setup() {
@@ -75,11 +76,15 @@ python_install() {
 	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
 
-	dodir /var/log/neutron
+	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"
diff --git a/sys-cluster/neutron/neutron-2013.1.3-r5.ebuild b/sys-cluster/neutron/neutron-2013.1.3-r6.ebuild
index 1e83b3967387..0722fc7d20b6 100644
--- a/sys-cluster/neutron/neutron-2013.1.3-r5.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.3-r6.ebuild
@@ -1,6 +1,6 @@
 # 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.1.3-r5.ebuild,v 1.1 2013/09/13 20:44:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r6.ebuild,v 1.1 2013/09/27 00:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -61,7 +61,9 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/pyudev[${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}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
+		net-misc/bridge-utils
 		net-misc/openvswitch
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
@@ -81,11 +83,15 @@ python_install() {
 	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
 
-	dodir /var/log/neutron
+	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"
diff --git a/sys-cluster/neutron/neutron-2013.1.9999.ebuild b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
index d4dbbe99c545..a06b14414d85 100644
--- a/sys-cluster/neutron/neutron-2013.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
 # 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.1.9999.ebuild,v 1.9 2013/09/13 20:44:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.10 2013/09/27 00:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -61,7 +61,9 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	            <dev-python/sqlalchemy-0.7.10[postgres,${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}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
+		net-misc/bridge-utils
 		net-misc/openvswitch
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
@@ -81,11 +83,15 @@ python_install() {
 	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
 
-	dodir /var/log/neutron
+	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"
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index 9717b5f50502..ec2e0f0a41f9 100644
--- a/sys-cluster/neutron/neutron-9999.ebuild
+++ b/sys-cluster/neutron/neutron-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.6 2013/09/12 22:11:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.7 2013/09/27 00:41:28 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -60,7 +60,9 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 	            <dev-python/sqlalchemy-0.7.10[postgres,${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}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
+		net-misc/bridge-utils
 		net-misc/openvswitch
 		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
 
@@ -80,11 +82,15 @@ python_install() {
 	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
 
-	dodir /var/log/neutron
+	diropts -m 750
+	dodir /var/log/neutron /var/log/quantum
 	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"