removing the old badness

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

10 files changed, 26 insertions, 1092 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index fc13a202fc4f..4ede5b636e56 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.34 2014/05/11 12:22:00 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.35 2014/06/15 04:25:17 prometheanfire Exp $
+
+  15 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -cinder-2013.2.3.ebuild, -cinder-2013.2.9999.ebuild:
+  removing the old badness
 
 *cinder-2014.1-r1 (11 May 2014)
 
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 8aaa5e6d4567..86f1d379b9e4 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,25 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX cinder-confd 75 SHA256 178148ecb30d9d1a03e4f5210dfa235be3028dc2af7d6f7a4c2e4d0ef190f0f3 SHA512 4dd3db170c1234906fa679ec6684cde16a6bdad4ac90d6a9c00bc0c4afc7ee40ebcebdc7071ad0a34f8eb5bd9c0ab32c6f8fc40624b6c575c4fbb58dad1c91e3 WHIRLPOOL 3f32cbe4f4935a5c5c34de77d638b4cbc10a7a75ba230be5be75af85b12179741bb970603252ec74f098319dffce6eef7e5f0c9bfa34a5b84119fb7642f22d22
 AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f280b08ca8154 SHA512 b6d9d5a949cd43669a28b4e2c54cf795c92f070d10b56130f5a024fcbf9934d9e4f910e78972f427c979e68ee71c55006ecc9008eacf5c8abbe4c81c7b0731bf WHIRLPOOL 5983f6cbf500359d4e03b89d240f7652bd22655c0edcb858052062c4886c4da1d72ded228dd79847f74c279d5592dab2945807f611db1bf847a2c6d2b9f8f619
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 AUX cinder.confd 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
 AUX cinder.initd 744 SHA256 187237abfa1bef35136a95d0e2addffdf2fc3cff0e7c4f05e3523c31a16d377d SHA512 473aa626026adbcc132753f620702fcbe1bedef2b122cf212994b3bc453c27d56a3be1bec7229944f9be0478776001dba80f7cb7498cb46f314d2ee06a39f5f5 WHIRLPOOL 3b1667b2a1e089ecef68d9fa5315266d486c462820ea2304c76a5954c0b718983293de9c6a955695ae4fa7d9faedf36490d3ceda49775b4b81a441f67b4875d7
 AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
-DIST cinder-2013.2.3.tar.gz 3223434 SHA256 a2740f0a0481139ae21cdb0868bebcce01b9f19832439b7f3056435e75791194 SHA512 b8e1451b3f01b2d76843fa0fe429f4b246f785f1d839397ef9ee4ab2bec1fff0f12d3f1d7ece63ee9b7ea71edf0b1aa24bb0cf685bb41e4deb9dfbbd433f175c WHIRLPOOL 11c5f8dd5fdbb1ca92ba10abccc64c292f61eac1b7bec7f681704bae623fa8bdaa585a42256496820fb1916788863a4ceb5f76f2214b85e21caf779770ccc001
 DIST cinder-2014.1.tar.gz 4624288 SHA256 5cd4e49e5e35906fcf9aa809e9d77319625383ea9ca5c4399a9d4b1c8ae984b5 SHA512 5937a735452f3bcde986ce48143415321f5a2bbc1fa33c29cc1e8d9425593d404945fb7926d881333795180788c23b790354245acb125d7d5361fa159abfac00 WHIRLPOOL 421b3f66d57d8ac33af63a7493fbe3a1c4be362a4412e7c15c7d995cb49c2d6570061c0a634e2864c5e006f22409be7c28c89a4a8c15835df3fb2eca697bb400
-EBUILD cinder-2013.2.3.ebuild 4756 SHA256 114ad223cace230ef64d518e992d70e70a108858e19b77eb304082b669a2acdf SHA512 f1ac8dd43587e37604a7452dd31f7b35b9a9ec4f98827e85b133f14c8e52a6b8debf970534e1a6a25856fc846a35b98134e598d1ab9bb811d7d49f1d4b1b1b8e WHIRLPOOL 60333c7f14a4e6d70389c803ae33332a424bd3ff223a6c5a8ec63a57a56e9db02839bd465b1aabde4371010103dd71cade87212555270719fdfbeeccfdec94e1
-EBUILD cinder-2013.2.9999.ebuild 4758 SHA256 7c15922c302e1b9a8c26fbc557892fd3a85bb23f18e877fb54b5443de069af2f SHA512 7aab183590ea0f38a13a94505dff770ee001e8e422f60c4178a61f9f997983cdfbdeb101cf837d99a37911648b5781b4f0851cb8020c81249e1dd485b58afad9 WHIRLPOOL 2e310912d350140d968694819052d7c70c4f47a5f1e92bb529699c2db10ab45f54127f28e703ad226c720a7feb0c80ab8e338db5c1dfdafb3325cba84dae0950
 EBUILD cinder-2014.1-r1.ebuild 4670 SHA256 0ae4888b738656e6771c4ad95a7f00118ca4a7d662f77b4fb78d6dc005dc73ef SHA512 50ea9f6897cdbff526e1b61c3a81296c589c6928de0543e5ba232e6cdcb7cd4d5ea8d94edef49459176da0af887168b9b341d8416de49b086dc469415984710d WHIRLPOOL dedaf58d32f43479a28fa262b292707d4c110cd7f77fe7187139e021132aaf1150926dd5978131e2544002335720e0284870d12aebb108b553b7fcbfa16f7772
 EBUILD cinder-2014.1.9999.ebuild 4946 SHA256 05301064c6814e8876da177644b33a07f150508a75923e7ec6e848499033ac36 SHA512 7ac7ed3bd45dec8dc70199d8c6b73250d30345712d18169166b8ba516197e251d8b2f4860ed4cf72448b2a6153615869bac31f0b7116127e4fae819570298dd3 WHIRLPOOL 51d638f60e0fa8db643d2006f031117f9964e604cca735212bc99d54e948cbdc658c4ad670f1e08aa80e55fe703386b3dc84feb599ec1fe70a6a468e49b300d9
 EBUILD cinder-9999.ebuild 3651 SHA256 ef4e69e7dd8f0a7dfe1978f31f38e5c3a668f58ef7af1c76a78eda399c7dad70 SHA512 4c1d88905c4394f2acebff85759987b94e38a79319f9227096fca94edc3eb56810de742874060b811c3f61d92fa01e35141445bf78afdfb925f07753f628bd69 WHIRLPOOL ebd9e226babd7d5820c16a5b201c04daf9ed29cd6699731513d93f27caabacca13a59797a418a50271e6fa8ddef5e699322d1f095eb3d598fdbf3c1ad3887b4c
-MISC ChangeLog 6616 SHA256 109d158f3d373b8250c169001f7ebaae1bf1ce1146df2611eb7299e6384c7a10 SHA512 5c4cfa96af480a5c27b757a723e46442d5dc6feddfba2fe2b9fe2d33f4fe91551f5aa44b1bd6729ca7b4bfd673f1086ac4e753d1ff261e736bbe935b2f385647 WHIRLPOOL cc8e446e964e250aa11769a6410f6e128d4c6e73977c2eb08d341e21af5f5190c70f53e02c333f5ee71cff9db5e1c31bc7a882348501d854b0a734fc0dd4323d
+MISC ChangeLog 6764 SHA256 3bc03bea7bd78741d5d1f9ada6750e7d034470749e063a1767adc8d673432369 SHA512 e4c0ba2c57dbde96492b35c948401dbb6b5a9c8b3d0e354236dcb62ed49ce0f4946190538eb199995a9daa46a779bfbc72d4145785209d4ddb333e3a450c6c70 WHIRLPOOL c7992737b430572c6929de308e136f60520e2274fd91647499dc28d0569f861a12e3e45c7c8a76e8fe14e7ded14e13797f51f8512b4bf237ef5c506afce8da76
 MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlNva3kACgkQiLKviuHfItWomwCaAn/t1yM4IDXGsObdpFQDypO1
-p+MAni6NKXFF3b00Wteu4EFFiKJVoNJc
-=i1ve
------END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2013.2.3.ebuild b/sys-cluster/cinder/cinder-2013.2.3.ebuild
deleted file mode 100644
index d6357f92ea0b..000000000000
--- a/sys-cluster/cinder/cinder-2013.2.3.ebuild
+++ /dev/null
@@ -1,120 +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/cinder/cinder-2013.2.3.ebuild,v 1.1 2014/04/06 06:12:47 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes."
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+api +scheduler +volume mysql postgres sqlite test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-		app-admin/sudo
-		test? ( >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-			<=dev-python/jsonschema-1.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/hp3parclient-2.0[${PYTHON_USEDEP}]
-			<dev-python/hp3parclient-3.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			dev-python/subunit[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="=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/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${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/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		>=sys-block/iscsitarget-1.4.20.2_p20130821
-		sys-fs/lvm2
-		sys-block/open-iscsi
-		sys-fs/sysfsutils"
-
-PATCHES=( )
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-#python_compile_all() { leave for next attempt
-#	use doc && emake -C doc html
-#}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727	
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-	newinitd "${FILESDIR}/cinder-init" "cinder"
-	newconfd "${FILESDIR}/cinder-confd" "cinder"
-	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
-	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
-	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
-
-	insinto /etc/cinder
-	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
-	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
-	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
-	newins "${S}/etc/cinder/policy.json" "policy.json"
-	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
-	insinto /etc/cinder/rootwrap.d
-	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	doins "${FILESDIR}/cinder-sudoers"
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-}
diff --git a/sys-cluster/cinder/cinder-2013.2.9999.ebuild b/sys-cluster/cinder/cinder-2013.2.9999.ebuild
deleted file mode 100644
index b288abe65c75..000000000000
--- a/sys-cluster/cinder/cinder-2013.2.9999.ebuild
+++ /dev/null
@@ -1,121 +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/cinder/cinder-2013.2.9999.ebuild,v 1.4 2014/01/08 06:02:41 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-2 user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes."
-HOMEPAGE="https://launchpad.net/cinder"
-EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-EGIT_BRANCH="stable/havana"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +scheduler +volume mysql postgres sqlite test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/pbr[${PYTHON_USEDEP}]
-		app-admin/sudo
-		test? ( >=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-			<=dev-python/jsonschema-1.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/hp3parclient-2.0[${PYTHON_USEDEP}]
-			<dev-python/hp3parclient-3.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			dev-python/subunit[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND="=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/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${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/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		>=sys-block/iscsitarget-1.4.20.2_p20130821
-		sys-fs/lvm2
-		sys-block/open-iscsi
-		sys-fs/sysfsutils"
-
-PATCHES=( )
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-#python_compile_all() { leave for next attempt
-#	use doc && emake -C doc html
-#}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727	
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-	newinitd "${FILESDIR}/cinder-init" "cinder"
-	newconfd "${FILESDIR}/cinder-confd" "cinder"
-	use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
-	use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
-	use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
-
-	insinto /etc/cinder
-	newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
-	newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
-	newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
-	newins "${S}/etc/cinder/policy.json" "policy.json"
-	newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
-	insinto /etc/cinder/rootwrap.d
-	newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	doins "${FILESDIR}/cinder-sudoers"
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-}
diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 0d98d5322d30..573c6597ab7f 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2014/05/14 06:01:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.32 2014/06/15 04:27:28 prometheanfire Exp $
+
+  15 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -files/2013.2.2-CVE-2014-0056.patch, -files/2013.2.3-CVE-2014-0187.patch,
+  -neutron-2013.2.3-r1.ebuild, -neutron-2013.2.9999.ebuild:
+  removing the old badness
 
 *neutron-2014.1-r2 (14 May 2014)
 *neutron-2013.2.3-r1 (14 May 2014)
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 0b5d2e955289..709d50953344 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 2013.2.2-CVE-2014-0056.patch 12233 SHA256 96c9225b7aa0e6c1788103776fec907a198f47038d57f650c7159ed057e5e65f SHA512 b5d3a58944d3a26369a8e4f18d982be944dea0aac8df213931dc18c599dd9648229739d988249205af2528452aa1adde1dc1b230fd0636ecdaf043e440bdb6ab WHIRLPOOL 32251b8e67fdb7c52eed1e9d36bee1bbb1d48f197c0ead4f43a2cdb736dc8d5959fbc713a2878f52bf03b30a15034b516d7a8def22c4e85abcc19907d6858946
-AUX 2013.2.3-CVE-2014-0187.patch 10952 SHA256 fa5209a06d9990cf27ef23a360c2a7ca161555a9e7d1f95b7cf694b06bf4eec0 SHA512 e9661abbd8ed4dd49e0998d791376ced29ec1d26c89fb3aa6f85e2be9524b96ef58538687ee84f22c979863c139457562e486af41f5b3e754ab62e453ff1bfc1 WHIRLPOOL 71b2be74b9836e660e1b9bbfd285e3b737cb86f9a4d8d7b1ab588ccd10e8236c729e0916a49e730fb4f7deaa092d964f17d2c8f8a43c8e7d85db4b402ad78668
 AUX 2014.1-CVE-2014-0187.patch 10926 SHA256 16001df86c4de12352ff3d0e45e7d978622c35f48c1682c1efd69982dc592765 SHA512 d17d18928452c98a3e8fe553c127f449024bfe0ffcd3b8674983bd82b4c9cb54025347f196d6467ba104c5120ca807dfc70f30973a18b27d4bc6bf1fdcc4fc9e WHIRLPOOL ff6c34b68bf6bf0e900cd37efa64813be924b34854bf5bac2d76cb1a92ab3f4bf1201e787cde740b88db630f0c29ddcfea98051baef5d1022cbdbba5dd5710c4
 AUX neutron-confd 75 SHA256 2e03d5dee96eb235d3d2742fb59b52376914dae1d8683144396d796dd35ea9f5 SHA512 fefe7dd1924fabed3cdddae2a407b254c62f39c49abeae238486896e9d26863caebfdfea6d52c5eef34d25452b163c373105929bd069b969c2af0f7d62d6c0e6 WHIRLPOOL 1ac7ed6b2287e66bc51be8b521e355a48e888e1e57371362bfd41fb831d63cc90aab542c1668b4acc1c087cb6bacd418a480e2732a7611b8df290bf63444c902
 AUX neutron-confd-2 75 SHA256 0fce0e6f6cec493b9b0bcb96fa3211ba47a6420b9ea675ef65979fd9505121c7 SHA512 e64116f6cab81a2ee56d797f8144dbc8b214fb627bc8d6c3045488b1fec694cee8e8f3f3fbd327fb28f704cdfae40ea468d8a212c819abd45e809a1fa56b9670 WHIRLPOOL fb027c386c99448c29b265adc234abbc4d23a8be015690fd024b1f39ccc18dd64a1ab57c6cc26a054d576a0bbbed797058b19db90abf0318ae79dddc4efd2056
@@ -20,29 +18,26 @@ AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d5376
 AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da
 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.3.tar.gz 4019060 SHA256 116cc2ce9f2f5b2dcbd5a314d78a496b180a148dadd02a076ff664b0f3c20cd3 SHA512 5da42379e16b06c371f460b919731c88d451b6a245fc2370378d58cae7a1e3a4f4c743efbfba5466161e60a13084e0a18b9441b1e394d11074b52a26439ff8ff WHIRLPOOL 3b248ee9c5db8636740e400c45d69147cfe34a5fd81cfd2bb4706dbb293d91a73fd387df7f70012d524a457f8cb5898bf0313f4d72a70f7454381c65baae47f6
 DIST neutron-2014.1.tar.gz 6386204 SHA256 455c0e7c8d59a6c41f0596977441d970669859272e2303ba9852290f60a3d0a6 SHA512 a00c5896a459efcc83cd48812fe378e40aaaac0756f7a51c489b14ddebb1cbecc444370fd3904b4adedde5c8fe2409beb4f4d9676a57c7d6729275328cb5c123 WHIRLPOOL 847043a76c5b6038fb2f61e495af820f3671eff26089be33153c806709212196420acce0da4b8c394d10e9ff7239dbefe8e0b061bf4b4320354cb3e7cf318b68
-EBUILD neutron-2013.2.3-r1.ebuild 5744 SHA256 47645e92904125c4f98f587ad7744e12602669d2b98c3dec67503f6595e6ad88 SHA512 247d2527f1705b825159d22ca5500af9c48038456ba7f6aa5c7bce97f07160f9bd85071520a31a804cbd0036fc626e05c648845c8aa14b00f58dc9a0556fdd4a WHIRLPOOL c115deaad1b75a4e509686054c9d492845181c861bb47873f2060a5a4ba1a77f63d76ff14fa3176838640126c01707c79538faf6fec3c8e72dc2985687596a62
-EBUILD neutron-2013.2.9999.ebuild 5699 SHA256 eca1d474ea110482cc901ada794f72efb495de226834b11a87c005185af7bb1d SHA512 94bc0bf14894f20772586b7f19694f38fba9654404c6b507cfa9e483a90df166e32f6ab1db04d24f5a0147438fbc8f4def248d08101fec59d2849744bca5dde9 WHIRLPOOL fefec821fcfb38c3af2d84e961816486b86eeb2419ee33d6353991f6fd7fa710e5ee183c2469597850116028560eb67dec1a8ab17d471dd3b5aff3ba2523950c
 EBUILD neutron-2014.1-r2.ebuild 6478 SHA256 28a59b4756f196cccd0399a4ff0c902c38655c5ee852d03bf9ea186ff5e1c550 SHA512 1f850f17d1a234b9f8ac8f5bb5ca225c809611c4a7dca668b2870ebb058cf4e88fe4e35d086ce3eadb540d80ca7f105817399ec1ee1c62a27785d0128e3153d2 WHIRLPOOL 9a2e52d50d88af5ae0dd7c575f27ea5d9700bde70f6707f4a225ea0f39f3d8f2552686456621d29906899efa69aa30cc91df6d5e1df69370649dd57366a2ef83
 EBUILD neutron-2014.1.9999.ebuild 5617 SHA256 551cf0325acae198f8f42eb72e8407a010c802918b64a237e3b736cc4aada45b SHA512 5341b3a021e9cb0f538764a6912b9db84862aad5759512cf89f62223e445e102aa35e418f6c6e55faf71dc8c1e9fefe1f9dcc12d13081c1a8b9cb8b2c5a3a3f1 WHIRLPOOL f32cc118fc3346226ae3586b349c42bab8d9915ba8b88f7deeb34df738d31ed50bc46ef8f7f86794d31100509610fa9dc08869258f0ddd77ec36b489efff5b92
 EBUILD neutron-9999.ebuild 4409 SHA256 7e81a4614bc6813ac6c71f330f02afdd4986de592bed8deb9ff662823f349b97 SHA512 cdca470997f7b31d5f99a682ae21f22870678437a1bd8128e3e7140589b3b6041f133108fdb3f390f8da768f4e131f327000ee3f3c7adb1bcc7332e038adde9d WHIRLPOOL 2288062acc8e99c6707917fc2ff80bf54ebf736cac1b3158b42148c6575e3f23c01257383ac030d75af9d0dcb422486bccc8f0d564c6eb805ff5c245d3cbcd4a
-MISC ChangeLog 11131 SHA256 08afeca5b64f7601732660c83eb5f058ddffa207f2b00f27e56087818453f950 SHA512 5520d9756b4348e660e283aa382d723c89bdd1501615d332577d2270179242ad54c23823526c58b8961afcd48d2cde2172e90b5260ef7a83073c6800ed4db45c WHIRLPOOL 27306cb4ce7c0381934de3069f70c73d24e8a15063c01017380485814b9ede2cc152f7e375f463c27fec6fc2b571c7eb30b46c594ad3b29eda85d97ecafc6d8d
+MISC ChangeLog 11352 SHA256 b9adf606219210fa585b0b784dd796644269b30c41810735c01200dcefc1ea5f SHA512 9171bd8e9acf7b5a751edad79e6924fc2ff7ed37c48716bc4999580eac4d5740a3e68e7239a858b791363f0defe71f058d2f161801bb4f97ee018926ac4550f6 WHIRLPOOL 62951b9a655ebd72707c9db7982dd50b2ade478d026c7f0659e828e9d92768743aaed9bb874c29f02154f85dd861ca1bc8913df49c87f3bd0b13b35243d4b3d3
 MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTcwbfAAoJECRx6z5ArFrD+v4QAMCITSgiCXNA2BIOdHOWxdf+
-LKTYlJyVa9Nit23GCEn1kNEBeNtEGr2ZV71c2o5a6ZcoxYVFN5s4UlhXSgnnmj53
-DUIVSPP9x9+zo9wOAOLRDgG8RY3/BOu2z270k9IcOK7JPTJnvIKPL4UDFbnSWVOS
-aAGalGj35bSQ0kdlYRp02GQU6lDbXZ17ptvegLyBvXs77HEA/AXLsMBT5H1Bw7Vo
-miTJhYG4S/97Kolr5LWra0/XDjhDeihRbiu0Lr4kWJKPNfKbComI+Q2k7I23qyhY
-wXoTOamgBA0ceH8CUxipV/qRjPA3wsS4t+zTLHo/vO3kmXpUhL/5Fbm9Xt+XYbAJ
-Ec4mP/yvyO0ncNd0xuARv+e8A/8eHn8tDa3RaUyb24j5y3OdgvITXMzNZXsnh7Fd
-krB76I+jM5ttLheT1eHpPTdlEH/gCtkgKcg9i3DXpcDhUgJlI/jdqiFYfEJMiGLX
-DeEb7ksFyOiZLNuN/BxEzbrt1tZoz0qxK2eFqNPh7+rvY/ST+eTY1EH1VmIfNnoK
-GyKdhCnN8lc1+L83lD+JeN7/ozFM0gHDm9dTMvdyH+FBASn/7hmQWlV6sJ/R+NEk
-2alW+iR5frHG/7P9wX4l85D/X0urR0NMwmLBWRXNC1Ab2VwLLvqSTmviXk0ncRFY
-r1W7GUigFh0Vax5LXhno
-=gUxk
+iQIcBAEBCAAGBQJTnSDEAAoJECRx6z5ArFrDFgEQAJhJUHRhC/AcYC7HY76mUhnI
+SgdLpFl9VrWJt1qLA3p0J2GUvC78nKNVKr05iSPzg1ssnPTHkTk4g4URSuwLDitT
+CUdd+9pYJtzZT5vbEE5kQaJFbr9CORLQGebd8mrN1mm6biN8j9FUGz2n8xEodfvp
+ipSnfE1haTd+6ibnupLZvpdavmKLjIW6pGli/c44XsLzUf1eNXDrt4IKByw/js6m
+p+qjRkuLX3vTi+VjAdmoy/T9P77eA4yyXY+fAFq8Bzoj8vYPjiOlzj43wEeDs6G1
+J08Lfu10XCkvYz6jzi17LOrnh1AbRD1Bgtx0qkMfH6Qli6w1JHq4Nz713IGks9sN
+zotQvwJJO2b2OYQelLWrpmke2I2BtD/yhF1nymazGiI2ZQG7VhXjbrBle6jWjzmU
+IbZPggtYM9fwVv7+MMVaisrJi3dQ4pAZEja4vKLOYGmgGekV9Tz0z7EXkrBm6e6G
+Nwi2cBTYgqYnfiDACtRxB+H9Yb5B9pewhxvQx31ZbcH3KowNNfzm7ssUr0Y3cOnj
+KZX+3iOSFKeFG3piVY/LmJ1yICJ8OYGzPHKldFkj0hKpRtsPD38/alnbvKx1mDy/
+YfnVWup9xxIB8wKlh5N+QUTw+0KjheWIrzirZjuPj46qncdVQhVRJHMyTq1jx8cc
+yqF7vljSESpU2WzI0Aog
+=RnLk
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/2013.2.2-CVE-2014-0056.patch b/sys-cluster/neutron/files/2013.2.2-CVE-2014-0056.patch
deleted file mode 100644
index fc3a37dbcc38..000000000000
--- a/sys-cluster/neutron/files/2013.2.2-CVE-2014-0056.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From 1faec8354a0fab953524eaeb6042ad38461a58bc Mon Sep 17 00:00:00 2001
-From: Aaron Rosen <aaronorosen@gmail.com>
-Date: Wed, 26 Mar 2014 16:36:56 -0700
-Subject: [PATCH] Prevent cross plugging router ports from other tenants
-
-Previously, a tenant could plug an interface into another tenant's
-router if he knew their router_id by creating a port with the correct
-device_id and device_owner. This patch prevents this from occuring
-by preventing non-admin users from creating ports with device_owner
-network:router_interface with a device_id that matches another tenants router.
-In addition, it prevents one from updating a ports device_owner and device_id
-so that the device_id won't match another tenants router with device_owner
-being network:router_interface.
-
-NOTE: with this change it does open up the possiblity for a tenant to discover
-router_id's of another tenant's by guessing them and updating a port till
-a conflict occurs. That said, randomly guessing the router id would be hard
-and in theory should not matter if exposed. We also need to allow a tenant
-to update the device_id on network:router_interface ports as this would be
-used for by anyone using a vm as a service router. This issue will be fixed in
-another patch upstream as a db migration is required but since this needs
-to be backported to all stable branches this is not possible.
-
-NOTE: The only plugins affect by this are the ones that use the l3-agent.
-
-NOTE: **One should perform and audit of the ports that are already
-        attached to routers after applying this patch and remove ports
-        that a tenant may have cross plugged.**
-
-Closes-bug: #1243327
-
-Conflicts:
-    neutron/common/exceptions.py
-    neutron/db/db_base_plugin_v2.py
-
-Change-Id: I8bc6241f537d937e5729072dcc76871bf407cdb3
----
- neutron/common/exceptions.py         |  5 +++
- neutron/db/db_base_plugin_v2.py      | 62 +++++++++++++++++++++++++++++++++++
- neutron/tests/unit/test_l3_plugin.py | 63 +++++++++++++++++++++++++++++++++++-
- 3 files changed, 129 insertions(+), 1 deletion(-)
-
-diff --git a/neutron/common/exceptions.py b/neutron/common/exceptions.py
-index 7b02647..88fa6e4 100644
---- a/neutron/common/exceptions.py
-+++ b/neutron/common/exceptions.py
-@@ -301,3 +301,8 @@ def __init__(self, **kwargs):
- 
- class NetworkVxlanPortRangeError(object):
-     message = _("Invalid network VXLAN port range: '%(vxlan_range)s'")
-+
-+
-+class DeviceIDNotOwnedByTenant(Conflict):
-+    message = _("The following device_id %(device_id)s is not owned by your "
-+                "tenant or matches another tenants router.")
-diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py
-index 2afbac5..872463f 100644
---- a/neutron/db/db_base_plugin_v2.py
-+++ b/neutron/db/db_base_plugin_v2.py
-@@ -27,14 +27,18 @@
- from neutron.api.v2 import attributes
- from neutron.common import constants
- from neutron.common import exceptions as q_exc
-+from neutron import context as ctx
- from neutron.db import api as db
- from neutron.db import models_v2
- from neutron.db import sqlalchemyutils
-+from neutron.extensions import l3
-+from neutron import manager
- from neutron import neutron_plugin_base_v2
- from neutron.openstack.common import excutils
- from neutron.openstack.common import log as logging
- from neutron.openstack.common import timeutils
- from neutron.openstack.common import uuidutils
-+from neutron.plugins.common import constants as service_constants
- 
- 
- LOG = logging.getLogger(__name__)
-@@ -1311,6 +1315,9 @@ def create_port(self, context, port):
-         # NOTE(jkoelker) Get the tenant_id outside of the session to avoid
-         #                unneeded db action if the operation raises
-         tenant_id = self._get_tenant_id_for_create(context, p)
-+        if p.get('device_owner') == constants.DEVICE_OWNER_ROUTER_INTF:
-+            self._enforce_device_owner_not_router_intf_or_device_id(context, p,
-+                                                                    tenant_id)
- 
-         with context.session.begin(subtransactions=True):
-             network = self._get_network(context, network_id)
-@@ -1374,6 +1381,23 @@ def update_port(self, context, id, port):
-         changed_ips = False
-         with context.session.begin(subtransactions=True):
-             port = self._get_port(context, id)
-+            if 'device_owner' in p:
-+                current_device_owner = p['device_owner']
-+                changed_device_owner = True
-+            else:
-+                current_device_owner = port['device_owner']
-+                changed_device_owner = False
-+            if p.get('device_id') != port['device_id']:
-+                changed_device_id = True
-+
-+            # if the current device_owner is ROUTER_INF and the device_id or
-+            # device_owner changed check device_id is not another tenants
-+            # router
-+            if ((current_device_owner == constants.DEVICE_OWNER_ROUTER_INTF)
-+                    and (changed_device_id or changed_device_owner)):
-+                self._enforce_device_owner_not_router_intf_or_device_id(
-+                    context, p, port['tenant_id'], port)
-+
-             # Check if the IPs need to be updated
-             if 'fixed_ips' in p:
-                 changed_ips = True
-@@ -1483,3 +1507,41 @@ def get_ports(self, context, filters=None, fields=None,
- 
-     def get_ports_count(self, context, filters=None):
-         return self._get_ports_query(context, filters).count()
-+
-+    def _enforce_device_owner_not_router_intf_or_device_id(self, context,
-+                                                           port_request,
-+                                                           tenant_id,
-+                                                           db_port=None):
-+        if not context.is_admin:
-+            # find the device_id. If the call was update_port and the
-+            # device_id was not passed in we use the device_id from the
-+            # db.
-+            device_id = port_request.get('device_id')
-+            if not device_id and db_port:
-+                device_id = db_port.get('device_id')
-+            # check to make sure device_id does not match another tenants
-+            # router.
-+            if device_id:
-+                if hasattr(self, 'get_router'):
-+                    try:
-+                        ctx_admin = ctx.get_admin_context()
-+                        router = self.get_router(ctx_admin, device_id)
-+                    except l3.RouterNotFound:
-+                        return
-+                else:
-+                    l3plugin = (
-+                        manager.NeutronManager.get_service_plugins().get(
-+                            service_constants.L3_ROUTER_NAT))
-+                    if l3plugin:
-+                        try:
-+                            ctx_admin = ctx.get_admin_context()
-+                            router = l3plugin.get_router(ctx_admin,
-+                                                         device_id)
-+                        except l3.RouterNotFound:
-+                            return
-+                    else:
-+                        # raise as extension doesn't support L3 anyways.
-+                        raise q_exc.DeviceIDNotOwnedByTenant(
-+                            device_id=device_id)
-+                if tenant_id != router['tenant_id']:
-+                    raise q_exc.DeviceIDNotOwnedByTenant(device_id=device_id)
-diff --git a/neutron/tests/unit/test_l3_plugin.py b/neutron/tests/unit/test_l3_plugin.py
-index 4f75b57..9cc5cf9 100644
---- a/neutron/tests/unit/test_l3_plugin.py
-+++ b/neutron/tests/unit/test_l3_plugin.py
-@@ -379,7 +379,8 @@ def _remove_external_gateway_from_router(self, router_id, network_id,
- 
-     def _router_interface_action(self, action, router_id, subnet_id, port_id,
-                                  expected_code=exc.HTTPOk.code,
--                                 expected_body=None):
-+                                 expected_body=None,
-+                                 tenant_id=None):
-         interface_data = {}
-         if subnet_id:
-             interface_data.update({'subnet_id': subnet_id})
-@@ -388,6 +389,10 @@ def _router_interface_action(self, action, router_id, subnet_id, port_id,
- 
-         req = self.new_action_request('routers', interface_data, router_id,
-                                       "%s_router_interface" % action)
-+        # if tenant_id was specified, create a tenant context for this request
-+        if tenant_id:
-+            req.environ['neutron.context'] = context.Context(
-+                '', tenant_id)
-         res = req.get_response(self.ext_api)
-         self.assertEqual(res.status_int, expected_code)
-         response = self.deserialize(self.fmt, res)
-@@ -968,6 +973,62 @@ def test_router_add_gateway_tenant_ctx(self):
-                 gw_info = body['router']['external_gateway_info']
-                 self.assertEqual(gw_info, None)
- 
-+    def test_create_router_port_with_device_id_of_other_teants_router(self):
-+        with self.router() as admin_router:
-+            with self.network(tenant_id='tenant_a',
-+                              set_context=True) as n:
-+                with self.subnet(network=n):
-+                    self._create_port(
-+                        self.fmt, n['network']['id'],
-+                        tenant_id='tenant_a',
-+                        device_id=admin_router['router']['id'],
-+                        device_owner='network:router_interface',
-+                        set_context=True,
-+                        expected_res_status=exc.HTTPConflict.code)
-+
-+    def test_create_non_router_port_device_id_of_other_teants_router_update(
-+        self):
-+        # This tests that HTTPConflict is raised if we create a non-router
-+        # port that matches the device_id of another tenants router and then
-+        # we change the device_owner to be network:router_interface.
-+        with self.router() as admin_router:
-+            with self.network(tenant_id='tenant_a',
-+                              set_context=True) as n:
-+                with self.subnet(network=n):
-+                    port_res = self._create_port(
-+                        self.fmt, n['network']['id'],
-+                        tenant_id='tenant_a',
-+                        device_id=admin_router['router']['id'],
-+                        set_context=True)
-+                    port = self.deserialize(self.fmt, port_res)
-+                    neutron_context = context.Context('', 'tenant_a')
-+                    data = {'port': {'device_owner':
-+                                     'network:router_interface'}}
-+                    self._update('ports', port['port']['id'], data,
-+                                 neutron_context=neutron_context,
-+                                 expected_code=exc.HTTPConflict.code)
-+                    self._delete('ports', port['port']['id'])
-+
-+    def test_update_port_device_id_to_different_tenants_router(self):
-+        with self.router() as admin_router:
-+            with self.router(tenant_id='tenant_a',
-+                             set_context=True) as tenant_router:
-+                with self.network(tenant_id='tenant_a',
-+                                  set_context=True) as n:
-+                    with self.subnet(network=n) as s:
-+                        port = self._router_interface_action(
-+                            'add', tenant_router['router']['id'],
-+                            s['subnet']['id'], None, tenant_id='tenant_a')
-+                        neutron_context = context.Context('', 'tenant_a')
-+                        data = {'port':
-+                                {'device_id': admin_router['router']['id']}}
-+                        self._update('ports', port['port_id'], data,
-+                                     neutron_context=neutron_context,
-+                                     expected_code=exc.HTTPConflict.code)
-+                        self._router_interface_action(
-+                            'remove', tenant_router['router']['id'],
-+                            s['subnet']['id'], None, tenant_id='tenant_a')
-+
-     def test_router_add_gateway_invalid_network_returns_404(self):
-         with self.router() as r:
-             self._add_external_gateway_to_router(
--- 
-1.8.5.5
-
diff --git a/sys-cluster/neutron/files/2013.2.3-CVE-2014-0187.patch b/sys-cluster/neutron/files/2013.2.3-CVE-2014-0187.patch
deleted file mode 100644
index 182b709e1e1b..000000000000
--- a/sys-cluster/neutron/files/2013.2.3-CVE-2014-0187.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-From 03eed8cd34cd4fb043c11fc99f6bb0b4fbd5728d Mon Sep 17 00:00:00 2001
-From: marios <marios@redhat.com>
-Date: Fri, 29 Nov 2013 18:23:54 +0200
-Subject: [PATCH] Validate CIDR given as ip-prefix in
- security-group-rule-create
-
-There was no validation for the provided ip prefix. This just adds
-a simple parse using netaddr and explodes with appropriate message.
-Also makes sure ip prefix _is_ cidr (192.168.1.1-->192.168.1.1/32).
-
-Validation occurs at the attribute level (API model) as well as at
-the db level, where the ethertype is validated against the ip_prefix
-address type.
-
-Unit test cases added - bad prefix, unmasked prefix and incorrect
-ethertype. Also adds attribute test cases for the added
-convert_ip_prefix_to_cidr method
-
-Closes-Bug: 1255338
-
-Conflicts:
-	neutron/tests/unit/test_security_groups_rpc.py
-	neutron/tests/unit/test_extension_security_group.py
-
-Change-Id: I71fb8c887963a122a5bd8cfdda800026c1cd3954
-(cherry picked from commit 65aa92b0348b7ab8413f359b00825610cdf66607)
----
- neutron/common/exceptions.py                       |  4 +
- neutron/db/securitygroups_db.py                    | 20 +++++
- neutron/extensions/securitygroup.py                | 18 ++++-
- .../tests/unit/test_extension_security_group.py    | 86 ++++++++++++++++++++++
- 4 files changed, 127 insertions(+), 1 deletion(-)
-
-diff --git a/neutron/common/exceptions.py b/neutron/common/exceptions.py
-index 88fa6e4..80a75d1 100644
---- a/neutron/common/exceptions.py
-+++ b/neutron/common/exceptions.py
-@@ -306,3 +306,7 @@ class NetworkVxlanPortRangeError(object):
- class DeviceIDNotOwnedByTenant(Conflict):
-     message = _("The following device_id %(device_id)s is not owned by your "
-                 "tenant or matches another tenants router.")
-+
-+
-+class InvalidCIDR(BadRequest):
-+    message = _("Invalid CIDR %(input)s given as IP prefix")
-diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py
-index 2a7d2ef..8868546 100644
---- a/neutron/db/securitygroups_db.py
-+++ b/neutron/db/securitygroups_db.py
-@@ -16,6 +16,7 @@
- #
- # @author: Aaron Rosen, Nicira, Inc
- 
-+import netaddr
- import sqlalchemy as sa
- from sqlalchemy import orm
- from sqlalchemy.orm import exc
-@@ -331,6 +332,7 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
-             new_rules.add(rule['security_group_id'])
- 
-             self._validate_port_range(rule)
-+            self._validate_ip_prefix(rule)
- 
-             if rule['remote_ip_prefix'] and rule['remote_group_id']:
-                 raise ext_sg.SecurityGroupRemoteGroupAndRemoteIpPrefix()
-@@ -411,6 +413,24 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase):
-                 if (i['security_group_rule'] == db_rule):
-                     raise ext_sg.SecurityGroupRuleExists(id=id)
- 
-+    def _validate_ip_prefix(self, rule):
-+        """Check that a valid cidr was specified as remote_ip_prefix
-+
-+        No need to check that it is in fact an IP address as this is already
-+        validated by attribute validators.
-+        Check that rule ethertype is consistent with remote_ip_prefix ip type.
-+        Add mask to ip_prefix if absent (192.168.1.10 -> 192.168.1.10/32).
-+        """
-+        input_prefix = rule['remote_ip_prefix']
-+        if input_prefix:
-+            addr = netaddr.IPNetwork(input_prefix)
-+            # set input_prefix to always include the netmask:
-+            rule['remote_ip_prefix'] = str(addr)
-+            # check consistency of ethertype with addr version
-+            if rule['ethertype'] != "IPv%d" % (addr.version):
-+                raise ext_sg.SecurityGroupRuleParameterConflict(
-+                    ethertype=rule['ethertype'], cidr=input_prefix)
-+
-     def get_security_group_rules(self, context, filters=None, fields=None,
-                                  sorts=None, limit=None, marker=None,
-                                  page_reverse=False):
-diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py
-index 85d499a..3d10b5a 100644
---- a/neutron/extensions/securitygroup.py
-+++ b/neutron/extensions/securitygroup.py
-@@ -17,6 +17,7 @@
- 
- from abc import ABCMeta
- from abc import abstractmethod
-+import netaddr
- 
- from oslo.config import cfg
- 
-@@ -102,6 +103,10 @@ class SecurityGroupRuleExists(qexception.InUse):
-     message = _("Security group rule already exists. Group id is %(id)s.")
- 
- 
-+class SecurityGroupRuleParameterConflict(qexception.InvalidInput):
-+    message = _("Conflicting value ethertype %(ethertype)s for CIDR %(cidr)s")
-+
-+
- def convert_protocol(value):
-     if value is None:
-         return
-@@ -152,6 +157,16 @@ def convert_to_uuid_list_or_none(value_list):
-     return value_list
- 
- 
-+def convert_ip_prefix_to_cidr(ip_prefix):
-+    if not ip_prefix:
-+        return
-+    try:
-+        cidr = netaddr.IPNetwork(ip_prefix)
-+        return str(cidr)
-+    except (TypeError, netaddr.AddrFormatError):
-+        raise qexception.InvalidCIDR(input=ip_prefix)
-+
-+
- def _validate_name_not_default(data, valid_values=None):
-     if data == "default":
-         raise SecurityGroupDefaultAlreadyExists()
-@@ -207,7 +222,8 @@ RESOURCE_ATTRIBUTE_MAP = {
-                       'convert_to': convert_ethertype_to_case_insensitive,
-                       'validate': {'type:values': sg_supported_ethertypes}},
-         'remote_ip_prefix': {'allow_post': True, 'allow_put': False,
--                             'default': None, 'is_visible': True},
-+                             'default': None, 'is_visible': True,
-+                             'convert_to': convert_ip_prefix_to_cidr},
-         'tenant_id': {'allow_post': True, 'allow_put': False,
-                       'required_by_policy': True,
-                       'is_visible': True},
-diff --git a/neutron/tests/unit/test_extension_security_group.py b/neutron/tests/unit/test_extension_security_group.py
-index d53e140..f0b1636 100644
---- a/neutron/tests/unit/test_extension_security_group.py
-+++ b/neutron/tests/unit/test_extension_security_group.py
-@@ -21,11 +21,13 @@ import webob.exc
- 
- from neutron.api.v2 import attributes as attr
- from neutron.common import constants as const
-+from neutron.common import exceptions as n_exc
- from neutron.common.test_lib import test_config
- from neutron import context
- from neutron.db import db_base_plugin_v2
- from neutron.db import securitygroups_db
- from neutron.extensions import securitygroup as ext_sg
-+from neutron.tests import base
- from neutron.tests.unit import test_db_plugin
- 
- DB_PLUGIN_KLASS = ('neutron.tests.unit.test_extension_security_group.'
-@@ -413,6 +415,70 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
-             self.deserialize(self.fmt, res)
-             self.assertEqual(res.status_int, webob.exc.HTTPBadRequest.code)
- 
-+    def test_create_security_group_rule_invalid_ip_prefix(self):
-+        name = 'webservers'
-+        description = 'my webservers'
-+        for bad_prefix in ['bad_ip', 256, "2001:db8:a::123/129", '172.30./24']:
-+            with self.security_group(name, description) as sg:
-+                sg_id = sg['security_group']['id']
-+                remote_ip_prefix = bad_prefix
-+                rule = self._build_security_group_rule(
-+                    sg_id,
-+                    'ingress',
-+                    const.PROTO_NAME_TCP,
-+                    '22', '22',
-+                    remote_ip_prefix)
-+                res = self._create_security_group_rule(self.fmt, rule)
-+                self.assertEqual(res.status_int, webob.exc.HTTPBadRequest.code)
-+
-+    def test_create_security_group_rule_invalid_ethertype_for_prefix(self):
-+        name = 'webservers'
-+        description = 'my webservers'
-+        test_addr = {'192.168.1.1/24': 'ipv4', '192.168.1.1/24': 'IPv6',
-+                     '2001:db8:1234::/48': 'ipv6',
-+                     '2001:db8:1234::/48': 'IPv4'}
-+        for prefix, ether in test_addr.iteritems():
-+            with self.security_group(name, description) as sg:
-+                sg_id = sg['security_group']['id']
-+                ethertype = ether
-+                remote_ip_prefix = prefix
-+                rule = self._build_security_group_rule(
-+                    sg_id,
-+                    'ingress',
-+                    const.PROTO_NAME_TCP,
-+                    '22', '22',
-+                    remote_ip_prefix,
-+                    None,
-+                    None,
-+                    ethertype)
-+                res = self._create_security_group_rule(self.fmt, rule)
-+                self.assertEqual(res.status_int, webob.exc.HTTPBadRequest.code)
-+
-+    def test_create_security_group_rule_with_unmasked_prefix(self):
-+        name = 'webservers'
-+        description = 'my webservers'
-+        addr = {'10.1.2.3': {'mask': '32', 'ethertype': 'IPv4'},
-+                'fe80::2677:3ff:fe7d:4c': {'mask': '128', 'ethertype': 'IPv6'}}
-+        for ip in addr:
-+            with self.security_group(name, description) as sg:
-+                sg_id = sg['security_group']['id']
-+                ethertype = addr[ip]['ethertype']
-+                remote_ip_prefix = ip
-+                rule = self._build_security_group_rule(
-+                    sg_id,
-+                    'ingress',
-+                    const.PROTO_NAME_TCP,
-+                    '22', '22',
-+                    remote_ip_prefix,
-+                    None,
-+                    None,
-+                    ethertype)
-+                res = self._create_security_group_rule(self.fmt, rule)
-+                self.assertEqual(res.status_int, 201)
-+                res_sg = self.deserialize(self.fmt, res)
-+                prefix = res_sg['security_group_rule']['remote_ip_prefix']
-+                self.assertEqual(prefix, '%s/%s' % (ip, addr[ip]['mask']))
-+
-     def test_create_security_group_rule_tcp_protocol_as_number(self):
-         name = 'webservers'
-         description = 'my webservers'
-@@ -1348,5 +1414,25 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
-                 self.assertEqual(res.status_int, webob.exc.HTTPBadRequest.code)
- 
- 
-+class TestConvertIPPrefixToCIDR(base.BaseTestCase):
-+
-+    def test_convert_bad_ip_prefix_to_cidr(self):
-+        for val in ['bad_ip', 256, "2001:db8:a::123/129"]:
-+            self.assertRaises(n_exc.InvalidCIDR,
-+                              ext_sg.convert_ip_prefix_to_cidr, val)
-+        self.assertIsNone(ext_sg.convert_ip_prefix_to_cidr(None))
-+
-+    def test_convert_ip_prefix_no_netmask_to_cidr(self):
-+        addr = {'10.1.2.3': '32', 'fe80::2677:3ff:fe7d:4c': '128'}
-+        for k, v in addr.iteritems():
-+            self.assertEqual(ext_sg.convert_ip_prefix_to_cidr(k),
-+                             '%s/%s' % (k, v))
-+
-+    def test_convert_ip_prefix_with_netmask_to_cidr(self):
-+        addresses = ['10.1.0.0/16', '10.1.2.3/32', '2001:db8:1234::/48']
-+        for addr in addresses:
-+            self.assertEqual(ext_sg.convert_ip_prefix_to_cidr(addr), addr)
-+
-+
- class TestSecurityGroupsXML(TestSecurityGroups):
-     fmt = 'xml'
--- 
-1.8.5.5
\ No newline at end of file
diff --git a/sys-cluster/neutron/neutron-2013.2.3-r1.ebuild b/sys-cluster/neutron/neutron-2013.2.3-r1.ebuild
deleted file mode 100644
index 663ff9cbf2f9..000000000000
--- a/sys-cluster/neutron/neutron-2013.2.3-r1.ebuild
+++ /dev/null
@@ -1,157 +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.2.3-r1.ebuild,v 1.1 2014/05/14 06:01:28 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.4[${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"
-		"${FILESDIR}/2013.2.3-CVE-2014-0187.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
-}
diff --git a/sys-cluster/neutron/neutron-2013.2.9999.ebuild b/sys-cluster/neutron/neutron-2013.2.9999.ebuild
deleted file mode 100644
index b3bca6b6bbb4..000000000000
--- a/sys-cluster/neutron/neutron-2013.2.9999.ebuild
+++ /dev/null
@@ -1,157 +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.2.9999.ebuild,v 1.7 2014/01/08 05:57:29 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2 user
-
-DESCRIPTION="A virtual network service for Openstack."
-HOMEPAGE="https://launchpad.net/neutron"
-EGIT_REPO_URI="https://github.com/openstack/neutron.git"
-EGIT_BRANCH="stable/havana"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+dhcp 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
-}