updating a few neutron things, deps and initscripts mostly

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

10 files changed, 255 insertions, 62 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 4f9a69fad24b..2b3bc21f7b68 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,16 @@
 # 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.5 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.6 2013/09/05 21:46:49 prometheanfire Exp $
+
+*neutron-2013.1.3-r1 (05 Sep 2013)
+*neutron-2012.2.4-r2 (05 Sep 2013)
+
+  05 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> +files/neutron-confd,
+  +files/neutron-initd, +files/neutron-sudoers, +neutron-2012.2.4-r2.ebuild,
+  +neutron-2013.1.3-r1.ebuild, -neutron-2012.2.4-r1.ebuild,
+  -neutron-2013.1.3.ebuild, metadata.xml, neutron-2013.1.9999.ebuild,
+  neutron-9999.ebuild:
+  updating a few neutron things, deps and initscripts mostly
 
   22 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
   neutron-2012.2.4-r1.ebuild, neutron-2013.1.3.ebuild,
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 2d2f84367c62..d73a667107c8 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX neutron-confd 75 SHA256 2e03d5dee96eb235d3d2742fb59b52376914dae1d8683144396d796dd35ea9f5 SHA512 fefe7dd1924fabed3cdddae2a407b254c62f39c49abeae238486896e9d26863caebfdfea6d52c5eef34d25452b163c373105929bd069b969c2af0f7d62d6c0e6 WHIRLPOOL 1ac7ed6b2287e66bc51be8b521e355a48e888e1e57371362bfd41fb831d63cc90aab542c1668b4acc1c087cb6bacd418a480e2732a7611b8df290bf63444c902
+AUX neutron-initd 1610 SHA256 7fc071ea376a2b2a4344afef4d5f1815a8588dd8400c3770fa8893518dd69c1b SHA512 0589b04b99f391c71e486efac8b923ef2c134fb92424b3569c617d4214d63e46a7e97257df656a0655a8fdebfe15367717d73db3e47d6f2178038cd1d58303f8 WHIRLPOOL d3d96bf3f3a710500aa64fbcd7d416377e3b9f3da8ebf402353b477124421761c73761f1204b17a2b88b61668487fd9b974fcc4796f617964ef7a60b9fb73b80
+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-r1.ebuild 2405 SHA256 e09602da06dd1f9167d9c764c9b10dfcb8249bbb3289a35d423df08323345bc0 SHA512 d77498e17f6ccda944fbd6e7ebb4879937cbf2830022f5884f72ac706d00d5510de716c4d134d297790a6e3c338ee81c4e5db6f01b02484047b60088bec27f29 WHIRLPOOL c8dd1763580c843770236d1f94dadfe840582bc096186451f3a7b8dcb8c993ce3d8fd6f3c76788acda2ede3f974ecc0392fde346d0b08ace484c967c89695428
-EBUILD neutron-2013.1.3.ebuild 2937 SHA256 3fbb635403be7fb4680f1637e4b97d52431a9d5e3e5a35656e39f58760cd02b3 SHA512 c38f30361e3b05017192f3892f7a55bd86612906f3c1d7d4ba9b9bc7fb7801ea3b89451846578a3a6863e229ded597005015d10b8ed4e5d21b142e23ad0ba9de WHIRLPOOL a13ab20bad2e58a6ed45873626cab667a52b200e42ea74e128540a3f85f823906fad04db4f4875a6cebb604a98b85aacf2c18dd31a092a6b28bb110804ac3a84
-EBUILD neutron-2013.1.9999.ebuild 2910 SHA256 c5e9b674af7a7f42157226032c0d1cf1dc8ec1e7101663fa3cf4641e96e919b9 SHA512 ca85880e254daad9f70c5915f907654190080d3be978c38edc1f6460d720cd62f78f196691623b8e451dc246f3db492b90068551bafa992b488092baac809daa WHIRLPOOL 894f256abeff2f2458cbe13a06cc8782e1e3d9ab0818790edf657018ed2898739988e644a0359df0632ac7df15079583221fbc92dd0a555e620c361dd4aaefd6
-EBUILD neutron-9999.ebuild 2895 SHA256 0464e3d4ffced2a798b4f3050eef1840849ecb6cb9d551e14c00770452f752a3 SHA512 559a20fd353d20a60f0105ce09d59b1b6ac43ae1448129d9002a628caecb5085c22e56c19453f58b72ef343e23bf1a159bf4bad1093f995ff8a0067de60fbd6d WHIRLPOOL 203066b31a36eaed31940f0dd3852c99d8b5d2c01e58a83de1b721bc84679b1f3d67d868ca8a0696a9be93a350a0d3fe444db7d49ba9ca57f0b6e78508d07348
-MISC ChangeLog 4231 SHA256 38e6e678f7b233fe9126ef09eb9969b8f2669658fbd302d6a78670dcbf1c77b3 SHA512 e53b1f898ead75d4a47697a9a9874372ed99179c1d7ac5da5174cc3c32de511c026c06af27a3c2321b928b1aab5c287167acfeac4c5c4e27f9ad49ca7998a727 WHIRLPOOL 337520fc69623801c0c2fb9571ecec7b8fe0d16847f044cf24b7572eb66c09a01bf9efc17934d8ce149b92f930516508a6934361fcde983961ab2773b2932ef8
-MISC metadata.xml 718 SHA256 2227319bcb6153b109e4adffa37f9c3f97eab57eb318e7679c23c53a69f03316 SHA512 9dc79440edb88d9ce65c8b1f310c85020e8fd54145dac716bbe27ace8e7cbef4f46687e73717395ce47a63cc8b4de3577661cc61bce1864ff69da4bca3faf883 WHIRLPOOL b676c265fe81ec7cbf9555da271e0b37c352ec233d737b60c972f94f5d9118b95633428a067ed24144e9915bf747b9461de280cfb9d6d060b9db96dc6346c7f1
+EBUILD neutron-2012.2.4-r2.ebuild 3354 SHA256 02971fc744467e6084bfb890bb124b04052e1784f7b05245af5ad49fada1b987 SHA512 00374cceab5da143d017dbf5567b6eb75da11a9e077125909a57529b165fad22868180b63b0a6710f963cb14b40521bdc9b6a935f2cb1278dcb1b7d9946bc15a WHIRLPOOL 3727c0864c94fcb1b128c757d33138e9949bab851c36fa7ad397c31e6626192b194b5f48b71a64200cb2c1a2cdb3059b46fe773929cefb6937dc226f1f88d0da
+EBUILD neutron-2013.1.3-r1.ebuild 3870 SHA256 e4b796286c165f1d2c0fe4b3002683b1aac78c7878b1db37cbd9a0f510e3ca7a SHA512 de9f252375bcc067362ef2bf9b7cacc02e613b62e8f18fd33f3f52be2739b34ff106bd817187c7096a7eea64732fc7d40e3fb1dc3455401c25ae3c80d23d1ac9 WHIRLPOOL 4dd01a68b0f74fbe79be2621bfa16257a76be4876117185b0939ff5720f86b4d6482816399590227aacafc95853f1cf0068f0ab1c16a929b72d9d8bf2038f01d
+EBUILD neutron-2013.1.9999.ebuild 3840 SHA256 8216e596fed0fa27d1f51539fd8dad2e9e96de406a7c91f80d57d0029a1f3a9e SHA512 d1225bf12c8e4caa52d8423fd140effa6f3427030cd7d068e2ca549b88a527c0d889d44fe9bc219000c10012d67361af6465653cd4b7139ec75cf7b04952c422 WHIRLPOOL 20d44d490b869735dacd997b8c82345e4542ff1e95ff657dabae88987dfffaac71ecc6d91589bd76e8e52a25dd4685ee21b77fae14fbf1a33b81b1e8cdcc4059
+EBUILD neutron-9999.ebuild 3804 SHA256 5063e740740d8889635aa7cd0a671603e461822537314137e96023b377aff434 SHA512 50cc399a1e28cef3581ac202604070c7dc50d46dab89f1b676cc43267da8423acd1a0cfcabdb8eae53b53387651169bb8b3464f9dc4253dd957737c32cf3853f WHIRLPOOL b9fabf4125c36678fdf5b65596b9d7ea16d0e2db9cad645677cb19ace0060e6ea427614585005243d20388ead1db6db7f3e5d95d0a2fedd9e5db5a46df9883e7
+MISC ChangeLog 4673 SHA256 0da8b1f3a8126c906ad799ff7288719486de9007ac4e8841007b6f6132c41243 SHA512 5835d6a44c32e1618bb71c0174218e05d26962e76382a6a87661327419c7af572c3f184cc6537124738603bfedc70139b2696652912dae3858d5df8b52a250c4 WHIRLPOOL 04a9369deadc852f33be7b8d4409cab74dbcdf3a4e1801a6d7f9eeae77953d1d194cdfec0d200d7b11b4ead26a117ad06043b630ce5eea95b4535c140e724ee4
+MISC metadata.xml 1172 SHA256 afbc9be698ec774a49fc53222bb9895ce39a03733608c764dc07590d7a918991 SHA512 d19ec3124132d8b7408de986825c070aa6796b25959e3e13a08598f1dbb1afcf14afe4afbacf8bfdc5a6e24bbc69be7b412af9b0e4d6f207c0659418da16847d WHIRLPOOL d236b792aaf656dd909452ef32f4a3a1e174a4cf291a7e286cb38139a3798f5348caf8b8cb43cd447aa8033c98921d4ca299f325c80c85bbf238a076812c5b19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSFjhFAAoJECRx6z5ArFrDVuwP/0SotLlh/UyyGysSECTSlRCf
-2Iw2+4GY8YTevWbSY1odak4IzHhTQEobuoe88bPNJEghW2fOimQB7DK0zJzbePxr
-hiUtPmnarBgHnxUK0j1V9mJe7EP4CQRa3BNrunUzXHNNrR6E0AhAxIkkYQuBNWYy
-x/koPPqzyY4adCSFRjv3nBPqR3e8P/kOm7mENMWoLhMOIYtV7fXTnl3vHCXQCqmI
-6p0RNYrqKyaT18M+qyPJuym6GzbR1yG5P5/mThCgsU2aHVoox3eabIUXuhgTKGu9
-WgBvycPZNUu2gko9MvUS2iMQnJtziOTvvFRdhwNF4CKR7a5d4JCtWGk8thntpNmQ
-YgdeCA7fjwzBb8y846yMPekDqY15nEM+yI9iLUnQwRmLEUEUvhtpNKTeviCpE4Ww
-QF5bAQ916jHwtGxIqqbtHVrFuVTBcgLcDVhMFustxAVOKpnSpzG6uxufx90cXC5p
-ia+yzNSfClZAFxvX9VGGcEFcoy3U+yPKpWm/kdBuEbo+2m/m9fYXRHsmGXWYHDXJ
-qVdKJXFh9h41OPj2LlCApTwF9j7NjkfcDgs1q5YCH1MyI70vjqdoPQR/iGlV5viu
-bYgU+zJQCesWcrIm5WQpg7RaqeJkaAdW7pVDe0/q7K0p+9jBgbVgNU7yW/MoRRwa
-WVjLwAco6HqQn3BGZ8G2
-=9B50
+iQIcBAEBCAAGBQJSKPwcAAoJECRx6z5ArFrDfyoQAN80xlLhfpOM48hR19/hsYNl
+CnDWZyxbKm3dJv5UBZapsco0tpkUURptV2OeH4hrIdXpcRSW0ZFY8uIRs8Srw6JP
+sRy4vgPbhNJcIbGXjdq4zArPHcxw1Lji8nTCz2vjYyX9P5wV0PJu0DHFAxBbaBdW
+VDblsdeQYJ9h+vJ57Of9HtHsIPqnPtJGXIt/Kq56c1+7hypuwXZaDtnWW6Kv4WOz
+JQ4iCIXUPlfOxxgIyhoBFGUF0JDzr1G9v2GMWdx1Iy6txYUo50dbXUUrJ1rL/ZMd
+wZU/a1tQ6KaJVGYczLEkV8pyzh6/X8yvFRssosgHIP7OlgD78vWcsyd2cVazwSYN
+qOTHzamKBpU/zIdishhM8Pt+KOVmMTvJKW2YWfa0RqCjtX8ycm9xtzHgIFdw7W6c
+f/2cibqSUV9OngVWJ4Q6Mv0UB4aAmlDk5WUpXVW+46rFlSzumIR2dLOFpHHt4nWR
+yG4OXLCn5PacNVJwKXDsGlnq5jLOQ8fFkEsHByjJe16HHxq6TA+oAXqnP3sepoad
+vOX/3roS5awAKm0qfZRQ8s7p6n+hmu66N8sezuhjVeKFC4pyQ3JCOVjFXip+olJa
++Rn2ELT9YQCWqQqdXdmJ5NdKS265ACf4WZgWemh5/BRPChB780XXlZMdHGKl+I+7
+3ZbHhbrtosU+qwJWnPzg
+=Xkmu
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/neutron-confd b/sys-cluster/neutron/files/neutron-confd
new file mode 100644
index 000000000000..dae379e557c7
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-confd
@@ -0,0 +1,2 @@
+#Don't touch this unless you know what you are doing
+PID_PATH=/run/quantum
diff --git a/sys-cluster/neutron/files/neutron-initd b/sys-cluster/neutron/files/neutron-initd
new file mode 100644
index 000000000000..6ecae4046b01
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-initd
@@ -0,0 +1,60 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+    need net
+}
+
+BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
+
+checkconfig() {
+    if [ ! -r /etc/conf.d/$BASENAME ]; then
+        eerror "No quantum conf.d file found: /etc/conf.d/$BASENAME)"
+        return 1
+    fi
+    return 0
+}
+
+start() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Starting ${SVCNAME}"
+
+    if [ ! -d ${PID_PATH} ]; then
+        mkdir ${PID_PATH}
+    fi
+
+    start-stop-daemon --start \
+        --user quantum:quantum \
+        --quiet \
+        --pidfile "${PID_PATH}/${SVCNAME}.pid" \
+        --make-pidfile \
+        --background \
+        --exec /usr/bin/${SVCNAME} -- \
+            --config-file /etc/quantum/quantum.conf \
+            --config-file /etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini \
+                        --log-file /var/log/quantum/server.log
+
+    eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+    checkconfig || return $?
+    . /etc/conf.d/$BASENAME
+    
+    ebegin "Stopping ${SVCNAME}"
+    
+    start-stop-daemon --stop --user quantum --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 \
+                                          --log-file /var/log/quantum/server.log
+    eend $? "Failed to stop ${SVCNAME}"
+}
+
+#restart() {
+#
+#}
diff --git a/sys-cluster/neutron/files/neutron-sudoers b/sys-cluster/neutron/files/neutron-sudoers
new file mode 100644
index 000000000000..7d1d5a2be487
--- /dev/null
+++ b/sys-cluster/neutron/files/neutron-sudoers
@@ -0,0 +1,4 @@
+Defaults:neutron !requiretty
+
+neutron ALL = (root) NOPASSWD: /usr/bin/quantum-rootwrap
+
diff --git a/sys-cluster/neutron/metadata.xml b/sys-cluster/neutron/metadata.xml
index bf50b796793b..0637de22a8f9 100644
--- a/sys-cluster/neutron/metadata.xml
+++ b/sys-cluster/neutron/metadata.xml
@@ -14,5 +14,12 @@
 	supports extensions to provide advanced network capabilities
 	(e.g., QoS, ACLs, network monitoring, etc)
   </longdescription>
+  <use>
+    <flag name="dhcp">Installs the initscripts for the neutron dhcp service</flag>
+    <flag name="l3">Installs the initscripts for the neutron l3 service</flag>
+    <flag name="metadata">Installs the initscripts for the neutron metadata service</flag>
+    <flag name="openvswitch">Installs the initscripts for the neutron openvswitch service</flag>
+    <flag name="server">Installs the initscripts for the neutron server service</flag>
+  </use>
 </pkgmetadata>
 
diff --git a/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild b/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild
index 6ea383ab7891..b9645ca250a5 100644
--- a/sys-cluster/neutron/neutron-2012.2.4-r1.ebuild
+++ b/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild
@@ -1,11 +1,11 @@
 # 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-r1.ebuild,v 1.5 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r2.ebuild,v 1.1 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 #restricted due to packages missing and bad depends in the test ==webob-1.0.8   
 RESTRICT="test"
@@ -17,43 +17,61 @@ S="${WORKDIR}/quantum-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #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}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		=dev-python/amqplib-0.6.1
-		=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
+		~dev-python/amqplib-0.6.1[${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/kombu-1.0.4[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/netaddr
+		dev-python/netaddr[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.6.4
 		<=dev-python/sqlalchemy-0.7.9
-		=dev-python/webob-1.0.8-r1[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		~dev-python/webob-1.0.8[${PYTHON_USEDEP}]
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+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
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/quantum
 	insinto /etc/quantum
 
@@ -68,4 +86,13 @@ python_install() {
 
 	#remove the etc stuff from usr...
 	rm -R "${D}/usr/etc/"
+
+	#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
 }
diff --git a/sys-cluster/neutron/neutron-2013.1.3.ebuild b/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild
index 54009438c57d..61b06fcf043c 100644
--- a/sys-cluster/neutron/neutron-2013.1.3.ebuild
+++ b/sys-cluster/neutron/neutron-2013.1.3-r1.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.ebuild,v 1.5 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r1.ebuild,v 1.1 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,22 +17,23 @@ S="${WORKDIR}/quantum-${PV}"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #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}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -45,22 +46,39 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${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
-		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		~dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
 		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+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
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/quantum
 	insinto /etc/quantum
 
@@ -78,4 +96,13 @@ python_install() {
 
 	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
 }
diff --git a/sys-cluster/neutron/neutron-2013.1.9999.ebuild b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
index deb2a4420de3..1ece438a080b 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.4 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.5 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -17,22 +17,23 @@ EGIT_BRANCH="stable/grizzly"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #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}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -45,22 +46,39 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${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
-		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		~dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
 		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
 		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+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
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/quantum
 	insinto /etc/quantum
 
@@ -78,4 +96,13 @@ python_install() {
 
 	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
 }
diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild
index c165fedb2338..07015ead0967 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.2 2013/08/22 16:10:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.3 2013/09/05 21:46:49 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,27 +12,27 @@ 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="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="+dhcp +l3 +metadata +openvswitch +server test"
 
 #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}]
+		app-admin/sudo
 		test? ( dev-python/cliff[python_targets_python2_7]
 				dev-python/configobj[${PYTHON_USEDEP}] )
 				dev-python/coverage[${PYTHON_USEDEP}]
 				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				=dev-python/mox-0.5.3-r1[${PYTHON_USEDEP}]
+				~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 				dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
 				dev-python/nosexcover
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				~dev-python/pep8-1.3.3
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				=dev-python/webtest-1.3.3
+				~dev-python/webtest-1.3.3
 				virtual/python-unittest2[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		>=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
@@ -45,22 +45,39 @@ RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${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
-		=dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		~dev-python/pyparsing-1.5.7[${PYTHON_USEDEP}]
 		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
 		dev-python/python-novaclient[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
 		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev
+		dev-python/pyudev[${PYTHON_USEDEP}]
 		>dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		>=dev-python/webob-1.2[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
 		virtual/python-argparse[${PYTHON_USEDEP}]
-		net-misc/openvswitch"
+		net-misc/openvswitch
+		dhcp? ( net-dns/dnsmasq )"
+
+pkg_setup() {
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
 
 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
+
+	dodir /var/log/neutron
+	fowners neutron:neutron /var/log/neutron
 	keepdir /etc/neutron
 	insinto /etc/neutron
 
@@ -78,4 +95,13 @@ python_install() {
 
 	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"
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
 }