From 2a0e11ee87ffc76ac12928d6af3bb25c9f683ffd Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Tue, 25 Aug 2015 23:21:19 -0500
Subject: [PATCH] project/openstack: cleaning up old ebuilds

Package-Manager: portage-2.2.20.1
---
 app-admin/glance/Manifest                     |   1 -
 app-admin/glance/glance-2015.1.0-r1.ebuild    | 186 -------------
 dev-python/oslo-vmware/Manifest               |   1 -
 .../oslo-vmware/oslo-vmware-0.11.1.ebuild     |  61 -----
 dev-python/python-cinderclient/Manifest       |   1 -
 .../python-cinderclient-1.1.1.ebuild          |  48 ----
 dev-python/python-novaclient/Manifest         |   2 -
 .../python-novaclient-2.23.0.ebuild           |  64 -----
 .../python-novaclient-2.23.1.ebuild           |  67 -----
 sys-auth/keystone/Manifest                    |   1 -
 sys-auth/keystone/keystone-2015.1.0.ebuild    | 180 -------------
 sys-cluster/cinder/Manifest                   |   1 -
 sys-cluster/cinder/cinder-2015.1.0-r1.ebuild  | 184 -------------
 sys-cluster/neutron/Manifest                  |   1 -
 .../neutron/neutron-2015.1.0-r2.ebuild        | 249 ------------------
 15 files changed, 1047 deletions(-)
 delete mode 100644 app-admin/glance/glance-2015.1.0-r1.ebuild
 delete mode 100644 dev-python/oslo-vmware/oslo-vmware-0.11.1.ebuild
 delete mode 100644 dev-python/python-cinderclient/python-cinderclient-1.1.1.ebuild
 delete mode 100644 dev-python/python-novaclient/python-novaclient-2.23.0.ebuild
 delete mode 100644 dev-python/python-novaclient/python-novaclient-2.23.1.ebuild
 delete mode 100644 sys-auth/keystone/keystone-2015.1.0.ebuild
 delete mode 100644 sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
 delete mode 100644 sys-cluster/neutron/neutron-2015.1.0-r2.ebuild

diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 809968145c3f..ccfeedec0ea6 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,2 +1 @@
-DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
 DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
diff --git a/app-admin/glance/glance-2015.1.0-r1.ebuild b/app-admin/glance/glance-2015.1.0-r1.ebuild
deleted file mode 100644
index c57e674f45d0..000000000000
--- a/app-admin/glance/glance-2015.1.0-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			${RDEPEND}
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			~dev-python/Babel-1.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/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-			dev-python/qpid-python[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
-		)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	swift? (
-		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.2[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/CVE-2015-3289_2015.1.0.patch"
-)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	# https://bugs.launchpad.net/glance/+bug/1251105
-	# https://bugs.launchpad.net/glance/+bug/1242501
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins etc/*.ini
-	doins etc/*.conf
-	doins etc/*.sample
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 1e59a5ff9d1b..170a78814bc5 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,3 +1,2 @@
-DIST oslo.vmware-0.11.1.tar.gz 103846 SHA256 594231dfeb2294d2cee627da9c4ec8438d985c03e4e711f8d10c073641cde293 SHA512 04c27708e5da05710ef7f86e0a2dace7c3400e27728947d02d2d5fe4362811baa42b0e1c5298709b1bb416e45327129345276dce0c34bc9b2fa6f3d338f8d0ba WHIRLPOOL 6f6337ab64a0de5773791b1f282c1c9cef221705c4ea346a067d4b450b4e6e17ae27990244f2f8051996cf7e739e4c027f96c01e6cc3b3381e17d5c0bf985a3b
 DIST oslo.vmware-0.11.2.tar.gz 102933 SHA256 036cf0ad6ab0d4defd743678999851d570c2ca1ff34eba916920ce54d9a5d348 SHA512 632635adcc09749d0fe8bd204e1b06374e9790cec4d53cbaa06b2afa6745460cd417d60df26cb1e287d6e9de98eaa09788c6797993a06d8649b765a9298d0f39 WHIRLPOOL dd77312f307e5f65a969bae52e52dbab175e4a25f627d3ccf35435ac64c551093b8b67b707388d46175d93f344e2731ebdfa2ba6062ac3b562a00877cc98b880
 DIST oslo.vmware-0.7.0.tar.gz 69513 SHA256 c4c7f3b0a3734d357122beec977fea3cb48988c09c34ad4c5cfcd8211853484f SHA512 02e899613c23f4d7b2f46b7388a5a15aceae2537af0d9bf311b0b2a4b22d3afd534b07d0d444e1bfe2a0c0ae481924970a2b9b0274ca496dce1b6ff909f8eaab WHIRLPOOL 049cd90379a11b0e59884a25c5f8224bca40b8cdd28aaa5d8c2cc9da2c83850fb6ace2bd92cf04e665c4658831eb94bbaa3ffcbd702bb4e1e6663624d154bbd7
diff --git a/dev-python/oslo-vmware/oslo-vmware-0.11.1.ebuild b/dev-python/oslo-vmware/oslo-vmware-0.11.1.ebuild
deleted file mode 100644
index 23d1df818134..000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-0.11.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.4.1[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 5e50b3d3c2bb..b3afc5d6774d 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,4 +1,3 @@
 DIST python-cinderclient-1.0.9.tar.gz 136309 SHA256 e146e370c9a6e4aa44e8f0662fd33aec532f3965bae9fd564360c279bee03f97 SHA512 102e0ffec8aab143349f51e29b1265ea564b4cb8eeb9a546e353d6a9ee1ce08f8c258776ea96975be1d55f53ebaaa1b0fc01d7b7a12cde7baf5df8142368ed43 WHIRLPOOL 2360f4efcee62286cc1e45ca28013ded25b473d9a13e6e19ac53d811c2285e0031732077fae60d83b59a6abbe637406bd5a539348168f1884739381379b44bdf
-DIST python-cinderclient-1.1.1.tar.gz 156853 SHA256 107ff53c9bb9403c4e751b9a949cb84eff483d3378007415066d0c7727a6e37e SHA512 e437aa7759b9ed046aa35ad64f568b6070cd641b438e294c8cdb1fffba92296bc58e07825c5c02ef3a2933ac95fbd0717c42f246deca3ab6ce2620c4e2c44c1d WHIRLPOOL 90d4ab0d0a28f0b2456f9a703f93874870a944d696886eafd458f2d8fe8abd46475e425aa2d4f70f221f71d72e8e79757adc65da66254cf8457f3df50af48a9d
 DIST python-cinderclient-1.1.2.tar.gz 153104 SHA256 d364b627fbcbd049b2cedf125fb6aa06e2ca6213208f92b7ea393a7e1d7ecbe2 SHA512 84dc5bc89c547b05b9f305f6779ea2a47f2f964f985580d1555d0183da89c7e617433bacb11f2af23a1791a549de045e55d021bdb65f06def01062349a8cbc7e WHIRLPOOL 12082f19db2a583f9576396f20bf81f44b9769e9e9dd8e07ba54fb3cfce70a061f2e657949cf082abfd2a7f091387463e4e29065b9457d02051f27eb20cb173b
 DIST python-cinderclient-1.2.1.tar.gz 176466 SHA256 c9ccb89960b936ee261a9d6aac3895fde9b5c68e8c8e87d66ad3298a13bfd460 SHA512 ad27a7e32fc9da3c38abd5ca9f72f771229b00ab8a9f9f52c4001997afec194bda5270307ed2506747070f07e804952fef374fdb14ac75b646fb3dc6548aaea7 WHIRLPOOL afc4e2a6f5fa2917be408752f56215e5ee1c47dc6a952d5f6d294505a3c0843254136e5afd5370b9554bf6dfb97a47855e7b42122bdef0528d80a08f2feca6f6
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.1.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.1.1.ebuild
deleted file mode 100644
index 21b22ecd4f3a..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${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/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 5d9f4f15715a..ae258b1c1452 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,6 +1,4 @@
 DIST python-novaclient-2.17.0.tar.gz 230712 SHA256 af6f46890715eb5f4e0d25a714effbbac8da020715f81b1572a301c5e9887197 SHA512 6493aadab5589fb2a02c4a1440cd3f71e6918688ba634a89101c7c7b10aaa6600d8511097b07679f5927746c3463584287a0d7602a47397f169697a944b6a731 WHIRLPOOL d7523bee3ad59e40e021177cd98dff5a91136ea3ee56e2844857dced5b9af7a2bb47c5880d9fe0d35e4de9a022864c88e009b71ca762dea84eb139ff5b99cad1
 DIST python-novaclient-2.20.0.tar.gz 267956 SHA256 73fc8169d58e910340aae1ac5370c3b63a9943f748e2a20e4a1dfd7277525c86 SHA512 a1ff87b46d1520346380bf5396383d84e036892f1568d2eb201eb667837919e1cd8db3267a1ea9f6dfc616de0714374c81465de76b8a9bfec32c4742eeee3807 WHIRLPOOL 1fb3052d3fa457524c65b3de087a7cf7377d274b7a9d924529289e2e2b02992c5182cd1ec5aeef443a81c8e1d08fa1202caf6c5e12e3df40b5011f75df0837f8
-DIST python-novaclient-2.23.0.tar.gz 224690 SHA256 0f82e723b1cef48df75d4b47ece7dd6ee980563628d8cfbef10cd35707193e07 SHA512 38f7aa5747c9cea2e8e98ec91e18ada70c1cd61b0236285a6335cff2a90ff465963d648489fec8c4bb96e55e4c8f2c77ddbae58d42e43807e1d0d70f4bdfe9fe WHIRLPOOL 883b5e04ec39e525fea8c22969a72a8fc334c741b2419e3a4cab9f2f6563286dc6968615b7df7a17d2ab4e17de5d182163eb60682fd69bfa84312629d2ea731d
-DIST python-novaclient-2.23.1.tar.gz 225659 SHA256 8a8b0ace401099518ab852b294f89199a9358085b51ffa0e52dfd05c2332e09e SHA512 a3ac753a4cac5e769cef59e6ae8d182f0abfe03b9ff10fa8a34b1d395fd5a83e92e999af644d1248417700654a6e3b3cb3d9818044c4c258d06304d99738a978 WHIRLPOOL 99a38df0e76f8c18c7bea23154c9b4641fe1b9a2086493a0ee2807c151173be21b8f18b27a48231991cca10ffbc32f2fa26bf265d30baa8c310a654c7557c30d
 DIST python-novaclient-2.23.2.tar.gz 224170 SHA256 730cb006395b2df336bbfd75aa2f459375594726a50fe3b9126212ed487fcf98 SHA512 a207afcdb14e811980c6f3962342e3aa4da52f2e9663f94dbbac78b9d5e1e5a555d657b61948acf07cf238eaf04e32b9e440e9495adf80e19e8877e5e6510bcb WHIRLPOOL 8bd7c7f3431ec9dc78ed023e15227c5c5d40becbb9ef06d6fee65d177732af8d98154b27a39da722716ff9fffab7bc0c9790306d5ae184c4335361ac990666a4
 DIST python-novaclient-2.25.0.tar.gz 228156 SHA256 433e314223218031e7ea6e71baa54c1b13485d47fbb128ed3752e2a72ad7cb83 SHA512 b65495e94da9d42aa6eb51090ea7c2af6784e74121ea96c7021d013b8570af1df90d993df332b92274d5f92bc634149ad14616804e68e93fb4529b6b15dbb5c4 WHIRLPOOL 7401147c278a23768e18998b90842c6c17fe2c9dfb28cd320dfe0dc6ce7afd2e0481d6275deb82a4ce5c3ac826b8303390a8d80c011a242c4bed0fff2e446615
diff --git a/dev-python/python-novaclient/python-novaclient-2.23.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.23.0.ebuild
deleted file mode 100644
index 3dc13465a848..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.23.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.3.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.23.1.ebuild b/dev-python/python-novaclient/python-novaclient-2.23.1.ebuild
deleted file mode 100644
index 5736196f7888..000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.23.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.3.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 23011bba613f..cbe01afe2bae 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,2 +1 @@
-DIST keystone-2015.1.0.tar.gz 884362 SHA256 20ad170dcc727659f30003af16272d7685238d1ad069c91c542b6ac47d903d7a SHA512 d619a75a2f840fe49a66446c7b2436583a2ca6ea292252470b41817e7c7c34972ea7fbbb68a3b292699a4b2854a01db64be9f263b2dd56389cf6fd1e8d0f4f85 WHIRLPOOL 0f85ad09d13c32c591fa8ac5495de28234b79bb47f9b9f56409ed2f36adbcacbe2bd022fd568859ea82cfba735de96e1b6f32e07c78d5509507440ec52b1d534
 DIST keystone-2015.1.1.tar.gz 884979 SHA256 6c703f2d26c6a5f4fd4963dc11474b55cf87c5890d97361a4738df35eea258c5 SHA512 0c540f2a33729a539e68cb5d3e0b0b4ef0014829c274b0b92d982cd7d75110b14a3edc9db9c15794dd4c73f45a4982f47f99f75be6cbd8c91b0550ef24040848 WHIRLPOOL c20cc32d6043e9a2e9e5441a17e55431efabc3619156256c8fe8217bd876b07abb5860a48fc4bd761f505f022579d815a29b56d5c7a0536bafe89a2ad4b3b93a
diff --git a/sys-auth/keystone/keystone-2015.1.0.ebuild b/sys-auth/keystone/keystone-2015.1.0.ebuild
deleted file mode 100644
index 87f2bd89f040..000000000000
--- a/sys-auth/keystone/keystone-2015.1.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+sqlite memcached mongo mysql postgres ldap test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
-		dev-lang/python[sqlite]
-		memcached? (
-			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
-		)
-		mongo? (
-			>=dev-python/pymongo-2.5[${PYTHON_USEDEP}]
-			<dev-python/pymongo-3.0[${PYTHON_USEDEP}]
-		)
-		ldap? (
-			dev-python/python-ldap[${PYTHON_USEDEP}]
-			>=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
-		)
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pysaml2[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pycadf-0.9.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup keystone
-	enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
-	# it's in git, but not in the tarball.....
-	mkdir -p ${PN}/tests/tmp/ || die
-	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
-	distutils-r1_python_prepare_all
-}
-
-# Ignore (naughty) test_.py files & 1 test that connect to the network
-#-I 'test_keystoneclient*' \
-python_test() {
-	nosetests -I 'test_keystoneclient*' \
-		-e test_static_translated_string_is_Message \
-		-e test_get_token_id_error_handling \
-		-e test_provider_token_expiration_validation \
-		-e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	newconfd "${FILESDIR}/keystone.confd" keystone
-	newinitd "${FILESDIR}/keystone.initd" keystone
-
-	diropts -m 0750
-	keepdir /etc/keystone /var/log/keystone
-	insinto /etc/keystone
-	doins etc/keystone.conf.sample etc/logging.conf.sample
-	doins etc/default_catalog.templates etc/policy.json
-	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
-
-	fowners keystone:keystone /etc/keystone /var/log/keystone
-}
-
-pkg_postinst() {
-	elog "You might want to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "if this is a new install."
-	elog "If you have not already configured your openssl installation"
-	elog "please do it by modifying /etc/ssl/openssl.cnf"
-	elog "BEFORE issuing the configuration command."
-	elog "Otherwise default values will be used."
-}
-
-pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
-		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
-		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
-	else
-		einfo "keystone PKI certificates directory already present, skipping configuration"
-	fi
-}
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 3cc163370779..28036c596b91 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,2 +1 @@
-DIST cinder-2015.1.0.tar.gz 2060773 SHA256 d89d588f35ce66dc7af6e9d63ebb9b3a929670db90ed2ad43d129f32928a4270 SHA512 9dddab335dae0660a59ea80b2579bca16c0cc6e5220f5f8d150f239b026fdbf085c55383d44833da5ea21fb554d9ed6f0700d503322e5467a3c6959cfcb3bd93 WHIRLPOOL 6383b7482587eb1bb298a9b6650f75225a306fe2e398a6377416f182fdc8a1614e4b0a3847bf21cb31454ad3b3c7cb87884c6770b6f4c619fa078db783cc3683
 DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9
diff --git a/sys-cluster/cinder/cinder-2015.1.0-r1.ebuild b/sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
deleted file mode 100644
index f99b461d4221..000000000000
--- a/sys-cluster/cinder/cinder-2015.1.0-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+api +scheduler +volume iscsi lvm mysql +memcached 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-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo
-		test? (
-			${RDEPEND}
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${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/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-		)"
-
-RDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
-	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
-	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
-	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
-	iscsi? (
-		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
-		sys-block/open-iscsi )
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	sys-fs/sysfsutils"
-
-PATCHES=( "${FILESDIR}"/CVE-2015-1851_2015.1.0.patch )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="ISCSI_TCP"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
-		done
-	fi
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_compile() {
-		distutils-r1_python_compile
-		mv cinder/test.py cinder/test.py.bak || die
-		./tools/config/generate_sample.sh -b ./ -p cinder -o etc/cinder || die
-		mv cinder/test.py.bak cinder/test.py || die
-}
-
-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
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	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"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index cf1242eef4bc..846acf815b37 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,2 +1 @@
-DIST neutron-2015.1.0.tar.gz 2038600 SHA256 02672a5316e637d122bb13cd2e18ee4df0df279ddd70262fa7d4102943ec33b6 SHA512 205181228a34469b2f079135fd871adfc5156d9c046f59d1347798015403530131b6f790346be31349333acd6d3f00dd818876b1c7a73a675214387482d0715d WHIRLPOOL 558a16b3c84425ac9e14960895cc7d67f26f618f47e6b24e53592555e282d49fbd52feed3da616cb576942fabef36b54fb979273071605ecbd32ba980c28f5a3
 DIST neutron-2015.1.1.tar.gz 2049496 SHA256 91569feaacc983635f64bc27f3903162526e984778aa6683129e578715f8c5b9 SHA512 aa9712a0d44efc2d52f47a2dfac449fb57b82bef675ea5d64b950859780240fbd441a3f8cd9684afff3c51502f8200c0db3b17471fabbd30724ce92662183fe2 WHIRLPOOL aeb6757f855115eb08d2707db40f54cdd488e67e69eb829ea2b31e83fe029ca3cde24e4520b8d8649da285354b161f47a237181a199cd786552d26f19c66181e
diff --git a/sys-cluster/neutron/neutron-2015.1.0-r2.ebuild b/sys-cluster/neutron/neutron-2015.1.0-r2.ebuild
deleted file mode 100644
index 766a2a168c16..000000000000
--- a/sys-cluster/neutron/neutron-2015.1.0-r2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 linux-info user
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="compute-only dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
-						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
-						|| ( openvswitch linuxbridge ) )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	app-admin/sudo
-	test? (
-		${RDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-		<dev-python/cliff-1.11.0[${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/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.4.0[${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/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
-	<dev-python/python-neutronclient-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	compute-only? (
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
-	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
-	dev-python/pyudev[${PYTHON_USEDEP}]
-	sys-apps/iproute2
-	net-misc/bridge-utils
-	net-firewall/ipset
-	net-firewall/iptables
-	net-firewall/ebtables
-	openvswitch? ( net-misc/openvswitch )
-	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-PATCHES=(
-		"${FILESDIR}/cve-2015-3221_2015.1.0.patch"
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
-	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-	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
-	if use server; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
-		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
-		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
-	fi
-	if use dhcp; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
-		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
-	fi
-	if use l3; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
-		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
-	fi
-	if use metadata; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
-		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
-	fi
-	if use openvswitch; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
-		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
-		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
-	fi
-	if use linuxbridge; then
-		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
-	fi
-	diropts -m 755 -o neutron -g neutron
-	dodir /var/log/neutron /var/lib/neutron
-	keepdir /etc/neutron
-	insinto /etc/neutron
-	insopts -m 0640 -o neutron -g neutron
-
-	doins etc/*
-	# stupid renames
-	rm "${D}etc/neutron/quantum"
-	insinto /etc/neutron
-	doins -r "etc/neutron/plugins"
-	insopts -m 0640 -o root -g root
-	doins "etc/rootwrap.conf"
-	doins -r "etc/neutron/rootwrap.d"
-
-	insopts -m 0644
-	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/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/neutron.sudoersd" neutron
-
-	#remove superfluous stuff
-	rm -R "${D}/usr/etc/"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog
-	elog "neutron-server's conf.d file may need updating to include additional ini files"
-	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
-	elog "on if you will use openvswitch or linuxbridge (or something else)"
-	elog
-	elog "Other conf.d files may need updating too, but should be good for the default use case"
-	elog
-}
-- 
2.26.2