commit:     cd355ddd8281781a7cfd0177aa001b8d3caa6f9c
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 01:14:32 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 01:14:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd355ddd

clean up liberty openstack

 app-admin/glance/glance-2015.2.9999.ebuild         | 229 ---------------
 sys-auth/keystone/keystone-2015.2.9999.ebuild      | 227 ---------------
 sys-cluster/cinder/Manifest                        |   1 -
 sys-cluster/cinder/cinder-2015.2.9999.ebuild       | 264 -----------------
 sys-cluster/neutron/neutron-2015.2.9999.ebuild     | 305 --------------------
 sys-cluster/nova/Manifest                          |   1 -
 sys-cluster/nova/nova-2015.2.9999.ebuild           | 312 ---------------------
 .../openstack-meta-2015.2.9999.ebuild              |  21 --
 8 files changed, 1360 deletions(-)

diff --git a/app-admin/glance/glance-2015.2.9999.ebuild 
b/app-admin/glance/glance-2015.2.9999.ebuild
deleted file mode 100644
index 8acd4f9..00000000
--- a/app-admin/glance/glance-2015.2.9999.ebuild
+++ /dev/null
@@ -1,229 +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 git-r3 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance";
-EGIT_REPO_URI="https://github.com/openstack/glance.git";
-EGIT_BRANCH="stable/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       test? (
-               ${RDEPEND}
-               >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-               <=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-               >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-               <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
-               >=dev-python/mock-1.2[${PYTHON_USEDEP}]
-               <=dev-python/mock-1.3.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.5.2[${PYTHON_USEDEP}]
-               !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-               <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-               >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-               <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
-               >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-               <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-               >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-               <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-               >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
-               >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-               <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-               >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
-               <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
-               >=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-               <=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-               <=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
-               >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-               >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-               <=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
-               >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-       )"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-       ${CDEPEND}
-       sqlite? (
-               >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               dev-python/mysql-python
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               dev-python/psycopg:2[${PYTHON_USEDEP}]
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-       ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       <=dev-python/routes-2.2[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-       <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-       <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-       <=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
-       >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-       <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-       <=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
-       <=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-       <=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/WSME-0.7[${PYTHON_USEDEP}]
-       <=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-       <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-       >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-       <=dev-python/pyopenssl-0.15.1-r9999[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-       !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-       <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-       <=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
-       !~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
-       >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-       <=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-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
-       sed -i '/^hacking/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/sys-auth/keystone/keystone-2015.2.9999.ebuild 
b/sys-auth/keystone/keystone-2015.2.9999.ebuild
deleted file mode 100644
index 19e22bd..00000000
--- a/sys-auth/keystone/keystone-2015.2.9999.ebuild
+++ /dev/null
@@ -1,227 +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 git-2 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone";
-EGIT_REPO_URI="https://github.com/openstack/keystone.git";
-EGIT_BRANCH="stable/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+sqlite memcached mongo mysql postgres ldap test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       test? (
-               ${RDEPEND}
-               >=dev-python/bashate-0.2[${PYTHON_USEDEP}]
-               <=dev-python/bashate-0.3.2[${PYTHON_USEDEP}]
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-               >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-               <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-               <=dev-python/lxml-3.5.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/mock-1.2[${PYTHON_USEDEP}]
-               <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-2.0.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/webtest-2.0.20[${PYTHON_USEDEP}]
-               >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-               >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-               <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-               >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-               >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-               <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
-               >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-               !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-               <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-       )"
-RDEPEND="
-       ${CDEPEND}
-       >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-       <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-       ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-       <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       <=dev-python/routes-2.2[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       <=dev-python/six-1.10.0-r9999[${PYTHON_USEDEP}]
-       sqlite? (
-               >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               dev-python/mysql-python
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               dev-python/psycopg:2
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-       <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/passlib-1.6[${PYTHON_USEDEP}]
-       <=dev-python/passlib-1.6.5[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-4.0.0-r9999[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oauthlib-1.0.3[${PYTHON_USEDEP}]
-       >=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/pysaml2-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
-       <=dev-python/dogpile-cache-0.5.7[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-       ~dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-       <=dev-python/pycadf-2.0.1[${PYTHON_USEDEP}]
-       ~dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
-       memcached? (
-               >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
-               <=dev-python/python-memcached-1.57[${PYTHON_USEDEP}]
-       )
-       mongo? (
-               >=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
-               <dev-python/pymongo-3.2[${PYTHON_USEDEP}]
-       )
-       ldap? (
-               >=dev-python/python-ldap-2.4[$(python_gen_usedep 'python2_7')]
-               <=dev-python/python-ldap-2.4.20[$(python_gen_usedep 
'python2_7')]
-               ~dev-python/ldappool-1.0[$(python_gen_usedep 'python2_7')]
-       )
-       www-servers/uwsgi[python,${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.....
-       sed -i '/^hacking/d' test-requirements.txt || die
-       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
-       insopts -m0640 -okeystone -gkeystone
-       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
-       insinto /etc/keystone/httpd
-       doins httpd/*
-
-       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 9c46ada..63ced0cb 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,6 +1,5 @@
 DIST cinder-8.0.0.tar.gz 3955244 SHA256 
bd05f3c0b7b2ae098284c062d20230aecdaa47ed623cb79907c39dd1e28f8a2e SHA512 
5c6ec1dc172036068016373e2d30e55c88f07dae12438fcfe207caea2965360f0c7df5aff1a901c6e2442ebf0dbd56f0428e3f24651f6cdd682bb659f636b20c
 WHIRLPOOL 
3bcd4477b7fd65b45dc305198fa8462e5c3bfffbdf75170607facdb446308aa9301a609090b4b43968369bf737b851d73a31af9b63752522b960850b3b6c0845
 DIST cinder-8.1.0.tar.gz 3860875 SHA256 
f2bd093ee6ed56b10a694e198eb2b3b436340b492d2bb1c6ae85eba5ef1e0326 SHA512 
df6be20bfa90c6b1603125986e9b1b90f9f5e86b07a72acf52f53bd68adbc6971b5b9b88b70a312647d8306480ef55eade8cbe747d27646b302f886972631abb
 WHIRLPOOL 
3516447f85bd2cecb907931d0c3eb0c379f2246c97be94b80549d01da68830d82d0dfe5967b153a287e98ee3a833c6d27491f5e3cb21a989bec490117c3b1b75
-DIST liberty-cinder.conf.sample 122223 SHA256 
dad765cbe995576c23b4aa45e316272826fd9a293bf111bcdcb2da9ab562fb43 SHA512 
64696a606233fa6a0f2c844924a61e48552f38ce54dadbc8202455d32b9fa37575c8e1d5c1b3e086d37f832e60f754007f2bfa9cd4915e3ae5fd52e283896f64
 WHIRLPOOL 
2d03754cfe60be0b0f278181e3b9cec399227e643032d9bb53fdafb4504793da6459ceb9b93802d5452ab9b77d9b613ff87f04605833553011a0847d9d3f7e2c
 DIST mitaka-cinder-api-paste.ini 2416 SHA256 
3794a5e34dace60474274e93a7346662eb03a485d1b9b67afded591e764aba9d SHA512 
f6e3800557fa7efb562a69f80eea9b516c0ad2e54b9a013c92118bf91daaf2bdd2a9ced309626fab13fe9b979f0c768ac22bba63c7fa8aa3443004d50359d844
 WHIRLPOOL 
90e8c7bf065609e6a85d247c15b1022ea51bb94b000841c30a69d99c96082a08125fca58cf5b216990c6b746f52af5cedebbafc5b9450a91c0d32cdc21951952
 DIST mitaka-cinder-policy.json 4959 SHA256 
5a9cd9d5d4cf80a9271fd7a5146d6d5415d10f8d699a8499a39a3cde29f50bd6 SHA512 
b36daa51ab7719e1a56ca760e7ec62a98fb3a88ffed96196852023abf4ffe483200c9dcb934e3c7910fc6988f9c2bb9bb914121d0d649dc3b01466f467a82fe2
 WHIRLPOOL 
f288b6dba2593fa6deb8ad94862948899ec10f71e4751f108ec1fbfff814c3206b5c541aaac0bb7edd2fb5311639a1cd3a44586855912cb2e0e675d5ad78161c
 DIST mitaka-cinder-volume.filters 9819 SHA256 
20e4833aaf18b6be247e8ea2a0f63cc509ed595ea799c3ccfbcc1d0afc5bf9d8 SHA512 
7b7aacdd843b960ed075b466e0bd7d2973a7733e7db63b4cb02df4b824a9528f6b7074870bf0048674e600bed983bc66caa1914963fff4aed00e8ab40e2ef600
 WHIRLPOOL 
32fb88041b8f38c821896d82139ea712ea0fc0a71bd6154e31887e85baf58d80b2c8bfd6c60b21613e522fe32fb022078091fcdc74110e5c9968826ae218c085

diff --git a/sys-cluster/cinder/cinder-2015.2.9999.ebuild 
b/sys-cluster/cinder/cinder-2015.2.9999.ebuild
deleted file mode 100644
index 443a6c7..00000000
--- a/sys-cluster/cinder/cinder-2015.2.9999.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-2 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://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample
 -> liberty-cinder.conf.sample"
-EGIT_REPO_URI="https://github.com/openstack/cinder.git";
-EGIT_BRANCH="stable/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       app-admin/sudo
-       test? (
-               ${RDEPEND}
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-               >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-               >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-               <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/mock-1.2[${PYTHON_USEDEP}]
-               <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
-               >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-               <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-               >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
-               <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
-               >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-2.0.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/subunit-1.2.0[${PYTHON_USEDEP}]
-               >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-               <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-               >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-               <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
-               >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-               >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-               <=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
-               >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-               <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
-               >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-               <=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
-               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-       )"
-
-RDEPEND="
-       ${CDEPEND}
-       ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-       >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-       <=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-       <=dev-python/enum34-1.1.1[$(python_gen_usedep 'python2_7')]
-       >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-       <=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-       <=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
-       <=dev-python/kombu-3.0.30[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       <=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-       !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-       <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-       <=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
-       <=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-       <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-       >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-       <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-       >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-       <=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}]
-       ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-       <=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-       <=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-       <=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
-       >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-       <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-       !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-       <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       <=dev-python/routes-2.2[${PYTHON_USEDEP}]
-       >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-       <=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
-       >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-       <=dev-python/rtslib-fb-2.1.58[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       sqlite? (
-               >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               dev-python/mysql-python
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               dev-python/psycopg:2
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-       <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-       ~dev-python/suds-0.6[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-       <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
-       <=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
-       iscsi? (
-               sys-block/tgt
-               sys-block/open-iscsi
-       )
-       lvm? ( sys-fs/lvm2 )
-       memcached? ( net-misc/memcached )
-       app-emulation/qemu
-       sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-PATCHES=(
-
-)
-
-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_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-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
-       insopts -m0640 -o cinder -g cinder
-       newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf"
-       newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
-       newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample"
-       newins "${FILESDIR}/etc.liberty/logging_sample.conf" 
"logging_sample.conf"
-       newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
-       newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
-       insinto /etc/cinder/rootwrap.d
-       newins "${FILESDIR}/etc.liberty/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
-}
-
-pkg_postinst() {
-       if use iscsi ; then
-               elog "Cinder needs tgtd to be installed and running to work 
with iscsi"
-               elog "it also needs 'include /var/lib/cinder/volumes/*' in 
/etc/tgt/targets.conf"
-       fi
-}

diff --git a/sys-cluster/neutron/neutron-2015.2.9999.ebuild 
b/sys-cluster/neutron/neutron-2015.2.9999.ebuild
deleted file mode 100644
index e0be6c7..00000000
--- a/sys-cluster/neutron/neutron-2015.2.9999.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2 linux-info 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/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="compute-only dhcp doc ipv6 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 ) 
)"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       app-admin/sudo
-       test? (
-               ${RDEPEND}
-               >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-               <=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
-               >=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-               >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-               <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/mock-1.2[${PYTHON_USEDEP}]
-               <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-               >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-               <=dev-python/requests-mock-0.7.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-4.1.0[${PYTHON_USEDEP}]
-               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-               >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-               <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-               >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-               <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
-               >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
-               <=dev-python/webtest-2.0.20[${PYTHON_USEDEP}]
-               >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
-               >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-               <=dev-python/os-testr-0.4.2[${PYTHON_USEDEP}]
-               >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-               <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
-               >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-               ~dev-python/pylint-1.4.4[${PYTHON_USEDEP}]
-               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-       )"
-
-RDEPEND="
-       <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       <=dev-python/routes-2.2[${PYTHON_USEDEP}]
-       >=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-       <=dev-python/debtcollector-1.1.0[${PYTHON_USEDEP}]
-       ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-       >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-       <=dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-       <=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-       <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-       >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-       <=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       !=dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-       !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-       <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-       !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-       <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-       >=dev-python/ryu-3.23.2[${PYTHON_USEDEP}]
-       <=dev-python/ryu-3.26[${PYTHON_USEDEP}]
-       compute-only? (
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               dev-python/mysql-python
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               dev-python/psycopg:2
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-       <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-       >=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-       <=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-middleware-3.1.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-middleware-3.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-       <=dev-python/python-novaclient-2.35.0[${PYTHON_USEDEP}]
-       <=dev-python/pyudev-0.18[${PYTHON_USEDEP}]
-       sys-apps/iproute2
-       net-misc/bridge-utils
-       net-firewall/ipset
-       net-firewall/iptables
-       net-firewall/ebtables
-       openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
-       ipv6? ( net-misc/radvd )
-       dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
-
-PATCHES=(
-)
-
-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() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       # it's /bin/ip not /sbin/ip
-       sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
-       distutils-r1_python_prepare_all
-}
-
-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
-       # 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.liberty" 
"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
-}

diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 3b1a805..84dc497 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,4 +1,3 @@
-DIST liberty-nova.conf.sample 134201 SHA256 
32752212c571c4a1473c3fa8bbd197a658ee54e233b4d46a157807be42997e42 SHA512 
5325a31a0fccb9898bec0a022f5430dcc1729615c8eac88a4261c403f9ecd8ce2b07d73b52f3bc2c5cbe681234b30b923adb94385aac28e08d982a8f8bfef350
 WHIRLPOOL 
6d2894160a96742551777ce397b67f332c4f2793402f4634a2cfd0005ba99fb077cf0d0306a59e4b8c7f689914860e5d7f45d838c845d6a896a66c24f0f141c0
 DIST mitaka-nova.conf.sample 36427 SHA256 
dd4c3ccab89fbe9f69df520f47d439c7ffa440d3f8b288b0ab99ac328a02ec75 SHA512 
169671bde5cb5bb89065d801f80aa0d3c664af652d9ddb0c409ed3e0af2c0b94f1dbd0ebf834849e3e75dc38972935ec65a6e533d86148a7315839597d577cad
 WHIRLPOOL 
20f95a296c3d112a532c9c5cc911d30b67472868d94bcfd52fadfd7105f9095a6b77020ca1caa6a70319548239358868d809feed363a82e4d574aceb6e5f016d
 DIST nova-13.1.0.tar.gz 5461429 SHA256 
2c44b0f015f48348d768abff0e0fc90c6f8faf46743cae94736d77704f249368 SHA512 
f16ce0248b86a19688500b97c364fe264919a900f0182f68c900a8e68b06bb22d688be597d5b3d7e8e38753cedaa732360972412508f3ecfea950394a526c6c5
 WHIRLPOOL 
f5d46a1166524d5ad79574f5f63ecc99a6a42865d2280d33a66103d2a88fb26e9c54c8a9ec85901970effd1aed89c42e33ce70a7e900cf642b9c90bfdc4bc52d
 DIST nova-13.1.1.tar.gz 5407219 SHA256 
1af74830f52deb24ca0f25acf150c2338a414ccd2082bbb31092d55d28a92a9d SHA512 
18866a1fb9e1e94b91b27d72318401de755255be3b3fd374f156ccf88c84697a8f54b6f5be17842f55b5ff323f19d778213925dbeb4ae9c02225d2b3fb56b3cc
 WHIRLPOOL 
d5bd05f773b49cf309f02ea34c7d5cbbd82078a17a7aadc66ebd1ed9dd8180a036f31d74d27ea6f1af644eaa873e0e955a52b44ee66448ea93e0507561055d50

diff --git a/sys-cluster/nova/nova-2015.2.9999.ebuild 
b/sys-cluster/nova/nova-2015.2.9999.ebuild
deleted file mode 100644
index 04eabbe..00000000
--- a/sys-cluster/nova/nova-2015.2.9999.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-r3 linux-info multilib user
-
-DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) 
in Python"
-HOMEPAGE="https://launchpad.net/nova";
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/nova/liberty/nova.conf.sample
 -> liberty-nova.conf.sample"
-EGIT_REPO_URI="https://github.com/openstack/nova.git";
-EGIT_BRANCH="stable/liberty"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch 
postgres +rabbitmq sqlite test"
-REQUIRED_USE="
-       !compute-only? ( || ( mysql postgres sqlite ) )
-       compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-# need to package dev-python/sphinxcontrib-seqdiag
-DEPEND="
-       >=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-       ${CDEPEND}
-       app-admin/sudo
-       test? (
-               ${RDEPEND}
-               >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-               <=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-               >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-               <=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/mock-1.2[${PYTHON_USEDEP}]
-               <=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-               >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-               <=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
-               >=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
-               <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
-               >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-               <=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-               ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-               >=dev-python/python-ironicclient-0.8.0[${PYTHON_USEDEP}]
-               <=dev-python/python-ironicclient-1.0.0[${PYTHON_USEDEP}]
-               >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
-               >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-               <=dev-python/requests-mock-0.7.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/pillow-2.4.0[${PYTHON_USEDEP}]
-               <dev-python/pillow-3.0.0[${PYTHON_USEDEP}]
-               >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
-               >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-               <=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
-               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-               <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-               >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-               <=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
-               >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-               <=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
-               >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-               <=dev-python/tempest-lib-0.11.0[${PYTHON_USEDEP}]
-               >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-               <=dev-python/bandit-0.16.2[${PYTHON_USEDEP}]
-               >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}]
-               <=dev-python/oslo-vmware-2.1.0[${PYTHON_USEDEP}]
-               >=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-       )"
-
-# barbicanclient is in here for doc generation
-RDEPEND="
-       ${CDEPEND}
-       compute-only? (
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       sqlite? (
-               >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-       )
-       mysql? (
-               dev-python/mysql-python
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       postgres? (
-               dev-python/psycopg:2
-               >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-               <dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-       )
-       >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-       <=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
-       >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-       <=dev-python/decorator-4.0.6[${PYTHON_USEDEP}]
-       ~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-       >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-       <=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
-       <=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       <=dev-python/lxml-3.5.0[${PYTHON_USEDEP}]
-       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
-       !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-       <=dev-python/routes-2.2[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-       <=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
-       >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-       <=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-       <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-       <=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-       >=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-       <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-       >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-       <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-       >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-       !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-       <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-       ~dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
-       <=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
-       >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-       <=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-       <=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-       <dev-python/jsonschema-2.5.1-r9999[${PYTHON_USEDEP}]
-       >=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-       <=dev-python/python-cinderclient-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-       !~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
-       >=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/python-neutronclient-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-       <=dev-python/python-glanceclient-1.2.0[${PYTHON_USEDEP}]
-       >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
-       <=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-       <=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-       <=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
-       >=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
-       >=dev-python/websockify-0.6.1[${PYTHON_USEDEP}]
-       <=dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-reports-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-       <=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-rootwrap-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
-       <=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-middleware-3.1.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-middleware-3.2.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-       <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}]
-       <=dev-python/oslo-versionedobjects-1.1.0[${PYTHON_USEDEP}]
-       >=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-       <=dev-python/alembic-0.8.3[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}]
-       <=dev-python/os-brick-0.6.0[${PYTHON_USEDEP}]
-       >=dev-python/libvirt-python-1.3.4[${PYTHON_USEDEP}]
-       app-emulation/libvirt[iscsi?]
-       novncproxy? ( www-apps/novnc )
-       sys-apps/iproute2
-       openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
-       rabbitmq? ( net-misc/rabbitmq-server )
-       memcached? ( net-misc/memcached
-       <=dev-python/python-memcached-1.57 )
-       sys-fs/sysfsutils
-       sys-fs/multipath-tools
-       net-misc/bridge-utils
-       compute? (
-               app-cdr/cdrkit
-               sys-fs/dosfstools
-               app-emulation/qemu
-       )
-       iscsi? (
-               sys-fs/lsscsi
-               >=sys-block/open-iscsi-2.0.872-r3
-       )"
-
-PATCHES=(
-)
-
-pkg_setup() {
-       linux-info_pkg_setup
-       CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER 
IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-       IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER 
IP_NF_IPTABLES \
-       NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK 
NETFILTER_XTABLES \
-       ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-       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 nova
-       enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_prepare_all() {
-       sed -i '/^hacking/d' test-requirements.txt || die
-       distutils-r1_python_prepare_all
-}
-
-python_test() {
-       testr init
-       testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-       distutils-r1_python_install
-
-       if use !compute-only; then
-               for svc in api cert conductor consoleauth network scheduler 
spicehtml5proxy xvpvncproxy; do
-                       newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-               done
-       fi
-       use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-       use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-       diropts -m 0750 -o nova -g qemu
-       dodir /var/log/nova /var/lib/nova/instances
-       diropts -m 0750 -o nova -g nova
-
-       insinto /etc/nova
-       insopts -m 0640 -o nova -g nova
-       newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
-       newins "${FILESDIR}/etc.liberty/cells.json" "cells.json"
-       newins "${FILESDIR}/etc.liberty/logging_sample.conf" 
"logging_sample.conf"
-       newins "${DISTDIR}/liberty-nova.conf.sample" "nova.conf.sample"
-       newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
-       newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
-       #rootwrap filters
-       insinto /etc/nova/rootwrap.d
-       newins "${FILESDIR}/etc.liberty/rootwrap.d/api-metadata.filters" 
"api-metadata.filters"
-       newins "${FILESDIR}/etc.liberty/rootwrap.d/compute.filters" 
"compute.filters"
-       newins "${FILESDIR}/etc.liberty/rootwrap.d/network.filters" 
"network.filters"
-       #copy migration conf file (not coppied on install via setup.py script)
-       insopts -m 0644
-       insinto 
/usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-       doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-       #copy the CA cert dir (not coppied on install via setup.py script)
-       cp -R "${S}/nova/CA" 
"${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA 
files failed"
-
-       #add sudoers definitions for user nova
-       insinto /etc/sudoers.d/
-       insopts -m 0600 -o root -g root
-       doins "${FILESDIR}/nova-sudoers"
-
-       if use iscsi ; then
-               # Install udev rules for handle iscsi disk with right links 
under /dev
-               udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 
60-openstack-scsi-disk.rules
-
-               insinto /etc/nova/
-               doins "${FILESDIR}/scsi-openscsi-link.sh"
-       fi
-}
-
-pkg_postinst() {
-       if use iscsi ; then
-               elog "iscsid needs to be running if you want cinder to connect"
-       fi
-}

diff --git a/sys-cluster/openstack-meta/openstack-meta-2015.2.9999.ebuild 
b/sys-cluster/openstack-meta/openstack-meta-2015.2.9999.ebuild
deleted file mode 100644
index 865649d..00000000
--- a/sys-cluster/openstack-meta/openstack-meta-2015.2.9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="A openstack meta-package for installing the various openstack 
pieces"
-HOMEPAGE="https://openstack.org";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="keystone swift neutron glance cinder nova"
-
-DEPEND=""
-RDEPEND="keystone? ( ~sys-auth/keystone-2015.2.9999 )
-               swift? ( ~sys-cluster/swift-2.5.0 )
-               neutron? ( ~sys-cluster/neutron-2015.2.9999 )
-               glance? ( ~app-admin/glance-2015.2.9999 )
-               cinder? ( ~sys-cluster/cinder-2015.2.9999 )
-               nova? ( ~sys-cluster/nova-2015.2.9999 )"

Reply via email to