less grizzly

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

8 files changed, 38 insertions, 541 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 52964766dfc0..a71c70ef835d 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2014/03/27 22:34:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.27 2014/04/06 05:09:38 prometheanfire Exp $
+
+  06 Apr 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -neutron-2013.1.5.ebuild, -neutron-2013.1.9999.ebuild:
+  less grizzly
 
 *neutron-2013.2.2-r1 (27 Mar 2014)
 
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 7e63877f5586..2ad3726a1acf 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -10,28 +10,25 @@ 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.2.tar.gz 4010144 SHA256 3181d76992b77b47b02f43aed1b62b17930d1aedc75bcedf3e328268b8727243 SHA512 4359669f1c94505d7cab55dc224d0ab6fd36da57a056ced3d053cadc2d0e54a45d3f3daaa332a49dc0ebf0efd855b521387697fcce75997dd0e3905fc0b83cd5 WHIRLPOOL f5fa012dbca202308eb071fb0c6fa5351f139d3233a9ea6a5ceef8c868d47e92133c3cb23e3c6b9c6a3a69aa090eab9bf659c84c9eb39886e36294e9fb014068
-DIST quantum-2013.1.5.tar.gz 1182724 SHA256 1d6fd6905354225f9e225c5fa1c7a5c508f3c0c5b3236979a5e8e401876f2fb2 SHA512 e6f18e8900d56f95d099168d434c9154d4273d1958603b69fda564d1e2109b5505d2cc5c11842793e10ec07bde694cea1469e4ff727fbd5e529278147ada1cb9 WHIRLPOOL cf2789746bfb5c9b5166080f259e87bdda3d879cbcb82fa39b844aa9ee7d8d648eaab01d497d532886ed8f629f7af29c14f1d6dabeb177952e8b47d9d0f75c9f
-EBUILD neutron-2013.1.5.ebuild 4617 SHA256 3ef1b29e1f24d6aa8d15186e354ce42486ca9954eaa15c91b6e358f1b4fc5c5b SHA512 b657d4b7aa6efa0648fde06ce2e142c3b5985062d0d7d38ba7cd35f2ac3a75d360fd3c386773e250f171ee9d46a88cd88dabba6e431fe254b38a7b4611c8bf82 WHIRLPOOL 22634f0f07577e4fadf6f5f90a1a57c1e2c306740216149b97c2c715858cfe573e4ca49ad9bc70371c7d0384915ab73f2d8a0adda96afaf68bd9b585f84154d1
-EBUILD neutron-2013.1.9999.ebuild 4474 SHA256 325a48eb9f212eb2603ff2f5942f9dc34fffbad1a296bed6cf1b65afc32e40ba SHA512 d80dcc568b657fa7d25748213970dd5306c35ff0a1f3d32087ae78c469baafcb9844744d60db8595cc5afbcea8bced5087fa889f193f63870f9ba2287011d53b WHIRLPOOL 0874a425eb8e6b8ce1245453c1e095b6badb8a53c1912f05a9ffee5a4774f1e7e9e75b59793efb5fd2cf59b5c39488fd28bc86cce5aa910389d432f4119ffe75
 EBUILD neutron-2013.2.2-r1.ebuild 5744 SHA256 8587a660a4d1ce37a07492b8527ba6f4aa5c5a633cff1976f8f32ff836f6da24 SHA512 ff73809d4634fa3ebdd652db64b599d921d2285f3adab9131e412f741b010597bd6d5b8a08a95204dfe394172309bf9dce3be06c633dfd4606559fada1c8c02f WHIRLPOOL ab3755438582661071f90621145914de1a914bf0a72f79bdf3fdc40278ae09f25bc15d74ffed237a45ebe09e119c163c91c06d1f71cc7a29222d26905b076c69
 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 9773 SHA256 5fea7ad7ee143be876564dceb0adb3c61fd0682f54fe14db4d2a8e65a818d03e SHA512 7e448a479c77433fad44f8b72cf7588d21ada70f1d17da10874008dda17a4773186dcfd07820be5d9c41fe3fd18722ef60399ec4711fc73ac688e54865c7f2e8 WHIRLPOOL 1f2b5ced057a79e4ad239c601788880e865e7f9839c39e233e257b60c5dbb55932fa86bf54c57bbe19346eea59d37dc8686a510ca01bf51899e9541da3d69017
+MISC ChangeLog 9903 SHA256 d422e91d01795ab963af0af0c55d4ee426b705583663416aef3c36ea54e47d44 SHA512 3fda7f61e2017e271ebe27d3d2bea57529a95453a05548185985b1fcdb85d538bc15ceb297a743de13a8cf9be9a854e853dfd47b9f5422ae26f3d4f0235c7e88 WHIRLPOOL 22271351b6f6d63f03a5368349da445e72577b631a4e29fb34dc2f6216fde1ad3582f004823331d856541efdde4e7f72af9cda1b78a3e1c6ddc695831abc3ec6
 MISC metadata.xml 1175 SHA256 95ceaccefb744f80032d97a4cc13c43c13d7e4116d6810d5779df5be3ebe11ce SHA512 74a46511f82bef78397bfaef2901606c6f468f532bbd7112fc8196b69362a4666fafbda8023a281514ada958cd2b4ba567f11dfa071d0b76bc94e456d96ed287 WHIRLPOOL 783aa30c05484b68b2a8f1ebcfd39294a21731cfa9587c0e1cd07ff291416d10912066e23c0572ac63a125f9836374c73b91775858c863abb0779eb13356ca11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTNKePAAoJECRx6z5ArFrDUFYP/0azBrkr719AblYnLJ2km0EG
-/nS5BRv4EaiVfy5OrzZzLmnlrUoZITimVndug8zDf+JqTrAgFEJ5yDulJUIMgp4C
-Hu9amCpjm1NAAM/EByvkxJQy0NZpIXaiRr0paRDnZCj8KQufiFx+M7sHOgq3VhB/
-39BMnab/DDUmFNRFiY4JqsLlNwOiQj2wAZNgV3XfrN+RDiOXplNVkROnb483pqzb
-tyOzzMii95gClerQcD2GBhh16lr5vaeZOaF0gjnvfLpabFK3LsKbEEAHnjQ3HlPV
-RuLXVE8dZMvt5V5hb8F3EsJphDXunZjjKMpdbntt5RbFcrGwni1fjzFMBnwougGC
-HYYROaroqS7GzeAKHgIQ9FtaCgiEwMwO/Fh0ifJqKWxrbFfeqPxuWMrfQ3kopIdx
-00QEFAyt7sJiydEHCrH2pU/yX2huE+px8S5CPv8iOTrSTBiCF4W6ST0xu5oHMKM2
-/WhcKl1YeLGf/lbhpPPacF/SbXSwEGyb5bMSjeAgvuP0uMkwf5+ic/uP2b/uKg5n
-lx/Xsk7zo0dwFDCrFEMiqVbsoebxdKQGgCS8K1ZY5LfcLYUdV55lAUVDAs5p4mZ8
-3W9JPWS+vPvStfGK8j4VIunlSPUTTE2VH2KF6sSLW50g1SKuPtVPvE2yE3YVtGuf
-4pq7QnGDaFkoQ7bW+AUB
-=oRH3
+iQIcBAEBCAAGBQJTQOHXAAoJECRx6z5ArFrDPY0QAMkT0wRXsNpKl0RxuHyAcEfN
+nfiUQO3d/3xMIcyjXeGxqLFtDd63mtiviNl4pgnnXPzfiw4LvIcAdPc3T1UxOsbJ
+csgMZRYzMvUaYOZzqZymJ3wFPnBFqAL/q+6liYVR+Z3TtoxInn3QnDzX1iZPNkAm
+skrKjQcELckFPxanhbdJNYzDugUf88F0zy1iW47qPJ65xlLPmhNU71jogmt+8mZH
+riJBQz/anBwZa0sMi4z7kxnoSUglkAU6ci9gncfR/wde1SfC3FBH6T8P3+vR9x00
+VKG21ofGU3ToyujF7SV+2WIubpGqJQ1KuoFo+/DcgfDMgBszynIiVVHsMKi9V4Pu
+oMtzB8dCh2ivq16kVanffkfpc4AB9pWZc7kvbTodkxYSrXxlpHX9sQSovaCAvo+p
+aKF/25hrx3bm44xsFyOERFGGZnBiXh9xccNHjXkce8E3QM16xZ15fo0oOIXTUp1X
+eraypKBLtC5V0//2pZgpcvhm9OoRSC9eYq5LsfzsL7ECxCU8P5fAsnqIvb+7qnR1
+mhNEUjzCNn55hr6aqWg6hOHb5ZNFi760pdmLr3U1H9CSgvFb68Rg1/x0QastM9A/
+9fHA+yigjYe0J6p5VrMymxQ4MzqwHMfH2+HKWWG1bdgaNrBDj3yDnyQM84WE/QsG
+LsURJ7cJXFJOaijA7KKJ
+=kkPd
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/neutron-2013.1.5.ebuild b/sys-cluster/neutron/neutron-2013.1.5.ebuild
deleted file mode 100644
index a98adc2117aa..000000000000
--- a/sys-cluster/neutron/neutron-2013.1.5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.1.5.ebuild,v 1.1 2014/03/23 20:27:12 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-#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"
-SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/quantum-${PV}.tar.gz"
-S="${WORKDIR}/quantum-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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}]
-		app-admin/sudo
-		test? ( dev-python/cliff[${PYTHON_USEDEP}]
-				dev-python/configobj[${PYTHON_USEDEP}]
-				dev-python/coverage[${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/sphinx-1.1.2[${PYTHON_USEDEP}]
-				~dev-python/webtest-1.3.3[${PYTHON_USEDEP}]
-				virtual/python-unittest2[${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/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.2.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.10[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.10[postgres,${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
-		openvswitch? ( net-misc/openvswitch )
-		dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup neutron
-	enewuser neutron -1 -1 /var/lib/neutron neutron
-}
-
-src_prepare() {
-	sed -i 's/setuptools_git>=0.4//g' "${S}/setup.py"
-	distutils-r1_src_prepare
-}
-
-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
-}
diff --git a/sys-cluster/neutron/neutron-2013.1.9999.ebuild b/sys-cluster/neutron/neutron-2013.1.9999.ebuild
deleted file mode 100644
index cd681054124b..000000000000
--- a/sys-cluster/neutron/neutron-2013.1.9999.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.1.9999.ebuild,v 1.12 2014/01/08 05:57:29 vapier 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="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/grizzly"
-
-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}]
-		app-admin/sudo
-		test? ( dev-python/cliff[${PYTHON_USEDEP}]
-				dev-python/configobj[${PYTHON_USEDEP}]
-				dev-python/coverage[${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/sphinx-1.1.2[${PYTHON_USEDEP}]
-				~dev-python/webtest-1.3.3[${PYTHON_USEDEP}]
-				virtual/python-unittest2[${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/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.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		dev-python/pyudev[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${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
-		openvswitch? ( 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
-}
diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 27d67ad0634d..9d5e539a0861 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.56 2014/04/01 03:46:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.57 2014/04/06 05:05:47 prometheanfire Exp $
+
+  06 Apr 2014; Matthew Thode <prometheanfire@gentoo.org> -nova-2013.1.5.ebuild,
+  -nova-2013.1.9999.ebuild:
+  less grizzly
 
   01 Apr 2014; Matthew Thode <prometheanfire@gentoo.org> +files/nova.initd,
   metadata.xml, nova-2013.2.9999.ebuild:
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 1d074f3a25a4..41f6e6de6628 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,29 +6,26 @@ AUX nova-confd 101 SHA256 d9013141618d1e8b8ba85297155747d9c8fc362238de7bba3108b9
 AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087aef172e5edf8 SHA512 cca06baba484d505f3a96643d836204a08e9dde50197531cdab2d95188b992a95a375a386b9c54fcc8e0a4f6167babba975db7510db1087f044afa39effe4eec WHIRLPOOL 4c667a5cc469826063a65879c1beddc98371edf295a273c9b8f679627cabfe2260d8b3bbdf9550d3894fc1525d63b9f98d6e939406f90ac5f2f745daa59311c2
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 AUX nova.initd 537 SHA256 523587620208419cc73ea150ad1cc04502a2945e51970c3cae18bbfb1d328ce0 SHA512 c1bce2214e10e41e23d17034126c666d63fca5f7709d5bf93608778aa40d0ec518397151fec029b9be3b9639be66213b619f5a2a30617442ba07aff8335192b7 WHIRLPOOL 600946df334247c381bbf1d87e039e39bf3e2962afd5129a63751cd56ea348c804af50014f62141807e6f0181d74b7313f268834e5146b451b125e60cdb61643
-DIST nova-2013.1.5.tar.gz 5807073 SHA256 8e67f60a385e6fe4818856f0581ae2acf9b9eca1187f3b9a3c298ccbeeda1134 SHA512 d2069b4c84eae9f6185b0918b4b9de3499d660baa8a3345e97355aa31d2c75533ed8a9b52b612c37635242fce354614a95cabaa55c2148fc3c1387b606934a12 WHIRLPOOL 04e8f3e796a7d0d64b251a71087edf228f141c90b9bcab7e40c97019257da4d0f3c21b540ec2faaee1da12c0f6545c19fcaf9cbc9184daf0c386d34198bb5c54
 DIST nova-2013.2.2.tar.gz 6884905 SHA256 203bb5f7b773006bfbc4a946ae00e899896c27a21e73d1e4103bacc55bb83744 SHA512 6a1380204a22535a42c38f21efae8cf306d5d1c34da7997a1c9b3aebaa815c5e16d9cf6626e72575bbba3bba9dc93512ddc43a3f2d5bceac9dd518f409e9f14f WHIRLPOOL c620184e2d67e4ce726011ddcecc17ffdfec0e02934209feff891c3782c389cd9607ec393a9f3edd95905ea1da1ced18b9867e13cbdfed3a59a49d8336ee1e5a
-EBUILD nova-2013.1.5.ebuild 5190 SHA256 ec04a1a65a2c7c066c026eb12ec7670ec9f887288dbec0267023ff7d60eb2b79 SHA512 4ed71335909dcf9d818f65c865a851b668eccca9ea245ef65a306a86dc61c616d78de9a59f1a39e9d0e389d32c667e43cddb006f4f8f3c825aa676f15ba48112 WHIRLPOOL df8230828fb518ca5e0ac6485d0190e14d2e1915d71aaa2812c7d385a3732902c0665f9494cd6d30b61f1cadb4dc893e115ffaccf28c0fa1faefc6873d3a580d
-EBUILD nova-2013.1.9999.ebuild 5070 SHA256 1dd4815b62e7290b24f0a6ebed20b388546d1cc143fc9ee3ecf1fc9a572188c6 SHA512 d75b2d6e7c100b86627f06de5d14b9094b3074f8bf758b5f9195f5fd589bf3bd0fe6a5d0ac9d1b74e604754b905f9e2020c953631da7549156de6b50bb273b09 WHIRLPOOL 83349cd2a1d59d7faef7112d786e223dcc0403664ce763cfb8b793b1ad7fb2d68b33dc1134eafc9cddccfd366815013e578e992080d280d29239e33cfdd12e46
 EBUILD nova-2013.2.2-r1.ebuild 5133 SHA256 88a89a8476c994654563f862d3257e08802c398628c9fa45734524f93c678294 SHA512 130e6a2232255f470054b73b01f09903a329a1bbe9db61e118fa1a77058a3b0bab0e1b5e794831d4be58ccad8d904b8627758a6290fb9c56fa8b48b57054c85e WHIRLPOOL c66627ee4db02a3d1aed1025f427c3e1dd90d4684d03e2a585f5a9886251e414ebb57226202e811652d57edefd8e9fdb26c725aec290cc82356c5386b7446127
 EBUILD nova-2013.2.9999.ebuild 4518 SHA256 42627c742512560265a319926890550b727240879a7c72f9202c7622ed1c3631 SHA512 0da6abfdeec6b5c7c79947e2de096b753d2de5f3115faba9c894741975724b59f792e465aedcbd457c5667120f7c8fb5728f510d56ab5955e5af4cf0effb0d7b WHIRLPOOL 9c207b051fc867a11787fa2588ef549ea96e506a15f6d64eff29676b08a917b063e88db524958d5950b8b78253fe937d71ba23ae5beca9919529a9c7aff145ea
 EBUILD nova-9999.ebuild 5225 SHA256 8336956c0a15fd17e15f748c6445c3b144f2a9047dd8257ba3dda7a7b7f1ad01 SHA512 6d961e646096eb4df5814d31b06352f999291becefa5e8fdd88afd14e6ede54e583ba224e474e1122e90b114da4136782cd8336afb467c61fc5400a7dd3a05e8 WHIRLPOOL c4bad3d35be8adb4af48562507ef213185e6d722541226e7d8bedd02578265c035874b371f432db4d1db222fc2776cc74374a508ca562a30dae622a86e0bab10
-MISC ChangeLog 13423 SHA256 6fc4ab238c0470aa304adaf0ecdbfbfaba0f1d714b8e86993450d47c4cb48d9b SHA512 aa8a13457aab71780a8d1d84fd0f8870861c23f2b5a3b88f9b8a6d372b9d9914bea45bbe8646dbc8c6c22971bc25dfd841bff4097b501b08c48424b80a18b4bc WHIRLPOOL 667dcc737d69cb9a2125cdd2ab9585f847a46750b0be7afa1ad9c48517d9d5c7ecbc069094b036aa741707120b6279f580286979672026a97cd6058551352cfe
+MISC ChangeLog 13547 SHA256 d411ea85d65db429b26fe5810a52c440130f4fd42bd35c9a85b5ab2ebad09d36 SHA512 f0c1cc03860bde4522c335076a20d202643ed44acaf7b050e5a919767fd55f400eb785d539ce5b2016455a1e8781007a49e5c825e22ae7a11d6c4fc16203cf1f WHIRLPOOL 78b9c610139738b07c1b546ae85660b9a7972db7c1d92a7471601067d98908f7fa6f6e994a1a4a9d60618871e1e6140e9d39cdd84cfb491cbef0f9df07c5442f
 MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTOjbfAAoJECRx6z5ArFrDMcwP/R3VQepaj6ZGMlz/BNcmBL9a
-PCfppJMe3YXDWRrXOPkILjtZ+B1DAm07Rt9OKB2R3n87Te3A/to+JOEDeNZLYXQA
-RJ+3yoEVIzO9lT2oXJtlnZ1sDxNrSWXpGO0WVy72Qa1HyHq1LQDGTHE5xxS+yI9/
-Ahu5j0vosOp33Ij10L52TNNg/cyJ0WjKYrh9nNUeocHOzvYJxuTUphqOmcfg3hzd
-Ghr5dIatw/zwWkD/8A2swjBP+PdLS1tdnIzNxXkxRYXW7FGmOSJ49gvKdVClZjap
-m4WLAfe9/1e8ajEIndO0DLXB9eVute2Y3Xta0EwJliDfbKRuWdEXMAfvvKaGfiqj
-WR5HimjPMs0C+E0Y/9+LIj2XVKGnCfBY/6QKlCSyrDIK4DnXTmEkutQRaz6Xq4NJ
-MF8/Y3D/z5CcBD7Yy+0DjQfU9I9XGwB/aJKM4uZDkpbMk5sev5STQpral5rXmmxk
-LJA7SV4uJyrSyl9sGyGfQKbQalytrLYZA+nd60yqLr8KzOLWZXbmZ4jPul26xe63
-RISdj6LHZtcsMknJ5WDAU3PgkQAT471q23wYv+JBSno80XuLeTM1yej9ENUWWaWW
-n9Yl7isRc2BjYDQHlP8Y3qojKi627X9MumIIl3Wt8lzxDmEhcQK/lUgAmADpHZaP
-bamKP3SdswodaxKtFT2T
-=LBed
+iQIcBAEBCAAGBQJTQODjAAoJECRx6z5ArFrD8IQP/ApN5LWZ3JO0mtsT/+sdQx99
+fve4TZysnZhUUXS/S2dqJ+kaxpjXMlr4tj8beZZ01I5ZWmNCi0xkvq6l5kOlrWhm
+1wKwxquDf65ETXLKTkNX1tZICghpVZzotkCmVWzra79LU8WFb0D10yYCfESHK0Bu
+3Uti8UB20AdG+rFvHyYNsQ+yrVNmPlHkyAEO6QxTPPCRJSTFP8SgThKuSdKbkOWh
+mZOy/cuLPnjA7Fdx2R5e/sjIgKO3Jedj8/+416Hk7y1Xt/XVK73JdVD/qfDoNWj0
+Bp55w6v3ukKMQjokYaWSSsoV4SjX/7z/wLxumESC0FKoqM3giAh94HRSHdqyEadi
+UA9AWdNl69cy7+I3cxp2z9k1+keF9xkRK8Vvw56jtb/vzsDE3t5kP+2tJmhuVI+Z
+pRX3ZZee4gFSGSwId2ESluO37DElqPQ9g9QRwO9uhyXDrG0oXBW4qWWOZWS1hv1D
+0iaPH3Lb9skdqi+BInoBhcUj/2dvFiTLspN2xtmoQSziVqwcY2xGnWaFm4yu6lnF
+cBVXxGxjkVCVRXxmBPlCbDJ9UY7tNLLpog/gWMWwYRzZVjtVAn50plZQhvzhQ0Yd
+rnG0H4HlDiKGAzowDkMS1g/R86kz6EGQC8NBNuZkNg907RITq2HBF+lKKY0fzE+J
+XOsnGa9y01FdndMmmzBF
+=RBYX
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2013.1.5.ebuild b/sys-cluster/nova/nova-2013.1.5.ebuild
deleted file mode 100644
index 61951a3dde88..000000000000
--- a/sys-cluster/nova/nova-2013.1.5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.5.ebuild,v 1.1 2014/03/23 20:32:06 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib user
-
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python."
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy xen sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-			  || ( kvm xen )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		app-admin/sudo"
-
-RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/cheetah-2.4.4[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
-		dev-python/boto[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
-		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
-		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.7[${PYTHON_USEDEP}]
-		<dev-python/websockify-0.4[${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}]
-		app-emulation/libvirt[${PYTHON_USEDEP}]
-		novncproxy? ( www-apps/novnc )
-		sys-apps/iproute2
-		net-misc/openvswitch
-		sys-fs/sysfsutils
-		sys-fs/multipath-tools
-		kvm? ( app-emulation/qemu )
-		xen? ( app-emulation/xen
-			   app-emulation/xen-tools )"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-src_prepare() {
-	sed -i 's/setuptools_git>=0.4//g' "${S}/setup.py"
-	distutils-r1_src_prepare
-}
-
-#python_test() {
-#	nosetests || die
-#}
-
-python_install() {
-	distutils-r1_python_install
-	newconfd "${FILESDIR}/nova-confd" "nova"
-	newinitd "${FILESDIR}/nova-initd" "nova"
-	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
-	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
-	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
-	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
-	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
-	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
-	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
-	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
-	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
-
-	diropts -m 0750
-	dodir /var/run/nova /var/log/nova /var/lock/nova
-	fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova
-
-	diropts -m 0755
-	dodir /var/lib/nova/instances
-	fowners nova:nova /var/lib/nova/instances
-
-	keepdir /etc/nova
-	insinto /etc/nova
-	newins "etc/nova/nova.conf.sample" "nova.conf"
-	doins "etc/nova/api-paste.ini"
-	doins "etc/nova/logging_sample.conf"
-	doins "etc/nova/policy.json"
-	doins "etc/nova/rootwrap.conf"
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	#copy migration conf file (not coppied on install via setup.py script)
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	doins "${FILESDIR}/nova-sudoers"
-}
diff --git a/sys-cluster/nova/nova-2013.1.9999.ebuild b/sys-cluster/nova/nova-2013.1.9999.ebuild
deleted file mode 100644
index 02c80c3a7736..000000000000
--- a/sys-cluster/nova/nova-2013.1.9999.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.12 2014/01/08 06:00:45 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-2 multilib user
-
-DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
-IaaS system). It is written in Python."
-HOMEPAGE="https://launchpad.net/nova"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="stable/grizzly"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +cert +compute +conductor +consoleauth +kvm +network +novncproxy +scheduler +spicehtml5proxy +xvpvncproxy sqlite mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-			  || ( kvm xen )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		app-admin/sudo"
-
-RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/cheetah-2.4.4[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
-		dev-python/boto[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
-		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		~dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		dev-python/paramiko[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
-		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.7[${PYTHON_USEDEP}]
-		<dev-python/websockify-0.4[${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}]
-		app-emulation/libvirt[${PYTHON_USEDEP}]
-		novncproxy? ( www-apps/novnc )
-		sys-apps/iproute2
-		net-misc/openvswitch
-		sys-fs/sysfsutils
-		sys-fs/multipath-tools
-		kvm? ( app-emulation/qemu )
-		xen? ( app-emulation/xen
-			   app-emulation/xen-tools )"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_install() {
-	distutils-r1_python_install
-	newconfd "${FILESDIR}/nova-confd" "nova"
-	newinitd "${FILESDIR}/nova-initd" "nova"
-	use api && dosym /etc/init.d/nova /etc/init.d/nova-api
-	use cert && dosym /etc/init.d/nova /etc/init.d/nova-cert
-	use compute && dosym /etc/init.d/nova /etc/init.d/nova-compute
-	use conductor && dosym /etc/init.d/nova /etc/init.d/nova-conductor
-	use consoleauth && dosym /etc/init.d/nova /etc/init.d/nova-consoleauth
-	use network &&  dosym /etc/init.d/nova /etc/init.d/nova-network
-	use novncproxy &&dosym /etc/init.d/nova /etc/init.d/nova-novncproxy
-	use scheduler && dosym /etc/init.d/nova /etc/init.d/nova-scheduler
-	use spicehtml5proxy && dosym /etc/init.d/nova /etc/init.d/nova-spicehtml5proxy
-	use xvpvncproxy && dosym /etc/init.d/nova /etc/init.d/nova-xvpncproxy
-
-	diropts -m 0750
-	dodir /var/run/nova /var/log/nova /var/lock/nova
-	fowners nova:nova /var/log/nova /var/lock/nova /var/run/nova
-
-	diropts -m 0755
-	dodir /var/lib/nova/instances
-	fowners nova:nova /var/lib/nova/instances
-
-	keepdir /etc/nova
-	insinto /etc/nova
-	newins "etc/nova/nova.conf.sample" "nova.conf"
-	doins "etc/nova/api-paste.ini"
-	doins "etc/nova/logging_sample.conf"
-	doins "etc/nova/policy.json"
-	doins "etc/nova/rootwrap.conf"
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-
-	#copy migration conf file (not coppied on install via setup.py script)
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	doins "${FILESDIR}/nova-sudoers"
-}