[gentoo-commits] repo/gentoo:master commit in: dev-python/microversion-parse/, app-admin/glance/, dev-python/os-testr/, ...

[Matt Thode]

commit:     b54a183dd82914e18bd3ddaae8605e029c4ad14d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 23:43:23 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 02:12:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b54a183d

openstack p2, newton is done, will add heat later

 app-admin/glance/glance-2016.2.9999.ebuild         | 142 +++++++++++++
 dev-python/cliff/Manifest                          |   1 +
 dev-python/cliff/cliff-2.2.0.ebuild                |  58 ++++++
 dev-python/cursive/Manifest                        |   1 +
 dev-python/cursive/cursive-0.1.1.ebuild            |  33 +++
 dev-python/cursive/metadata.xml                    |  19 ++
 dev-python/glance_store/Manifest                   |   1 +
 dev-python/glance_store/glance_store-0.18.0.ebuild |  48 +++++
 dev-python/microversion-parse/Manifest             |   1 +
 dev-python/microversion-parse/metadata.xml         |  19 ++
 .../microversion-parse-0.1.4.ebuild                |  26 +++
 dev-python/netifaces/Manifest                      |   1 +
 dev-python/netifaces/netifaces-0.10.5.ebuild       |  26 +++
 dev-python/neutron-lib/Manifest                    |   1 +
 dev-python/neutron-lib/neutron-lib-0.4.0.ebuild    |  33 +++
 dev-python/openstacksdk/Manifest                   |   1 +
 dev-python/openstacksdk/openstacksdk-0.9.5.ebuild  |  31 +++
 dev-python/os-brick/Manifest                       |   1 +
 dev-python/os-brick/os-brick-1.6.1.ebuild          |  44 ++++
 dev-python/os-client-config/Manifest               |   1 +
 .../os-client-config-1.21.1.ebuild                 |  81 ++++++++
 dev-python/os-testr/Manifest                       |   1 +
 dev-python/os-testr/os-testr-0.7.0.ebuild          |  44 ++++
 dev-python/os-vif/Manifest                         |   1 +
 dev-python/os-vif/metadata.xml                     |  14 ++
 dev-python/os-vif/os-vif-1.2.1.ebuild              |  40 ++++
 dev-python/os-win/Manifest                         |   1 +
 .../os-win-1.2.0.ebuild}                           |  32 ++-
 dev-python/osc-lib/Manifest                        |   1 +
 dev-python/osc-lib/metadata.xml                    |  20 ++
 dev-python/osc-lib/osc-lib-1.1.0.ebuild            |  37 ++++
 dev-python/oslo-cache/oslo-cache-1.14.0.ebuild     |   1 -
 dev-python/oslo-config/oslo-config-3.14.0.ebuild   |   1 -
 dev-python/oslo-log/oslo-log-3.16.0.ebuild         |   1 -
 dev-python/oslo-privsep/Manifest                   |   1 +
 dev-python/oslo-privsep/metadata.xml               |  18 ++
 dev-python/oslo-privsep/oslo-privsep-1.13.0.ebuild |  52 +++++
 dev-python/oslo-reports/Manifest                   |   1 +
 dev-python/oslo-reports/oslo-reports-1.14.0.ebuild |  38 ++++
 dev-python/oslo-rootwrap/Manifest                  |   1 +
 .../oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild       |   4 +-
 ...rap-4.1.0.ebuild => oslo-rootwrap-5.1.0.ebuild} |  12 +-
 dev-python/oslo-versionedobjects/Manifest          |   1 +
 ....ebuild => oslo-versionedobjects-1.17.0.ebuild} |  25 ++-
 .../oslo-versionedobjects-1.8.0.ebuild             |   4 +-
 dev-python/oslo-vmware/Manifest                    |   1 +
 .../oslo-vmware-2.14.0.ebuild}                     |  61 +++---
 dev-python/ovs/Manifest                            |   1 +
 dev-python/ovs/ovs-2.6.0.ebuild                    |  20 ++
 dev-python/python-barbicanclient/Manifest          |   1 +
 .../python-barbicanclient-4.0.1.ebuild             |  34 +++
 dev-python/python-cinderclient/Manifest            |   1 +
 .../python-cinderclient-1.9.0.ebuild               |  37 ++++
 dev-python/python-designateclient/Manifest         |   1 +
 .../python-designateclient-2.3.0.ebuild            |  34 +++
 dev-python/python-glanceclient/Manifest            |   1 +
 .../python-glanceclient-2.5.0.ebuild               |  82 ++++++++
 dev-python/python-heatclient/Manifest              |   1 +
 .../python-heatclient-1.5.0.ebuild                 |  85 ++++++++
 .../python-keystoneclient-3.5.0.ebuild             |   1 -
 dev-python/python-neutronclient/Manifest           |   1 +
 .../python-neutronclient-6.0.0.ebuild              | 101 +++++++++
 dev-python/python-novaclient/Manifest              |   1 +
 .../python-novaclient-6.0.0.ebuild                 |  73 +++++++
 dev-python/python-openstackclient/Manifest         |   1 +
 .../python-openstackclient-3.2.0.ebuild            |  86 ++++++++
 dev-python/python-swiftclient/Manifest             |   1 +
 .../python-swiftclient-3.1.0.ebuild                |  61 ++++++
 dev-python/rtslib-fb/Manifest                      |   1 +
 dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild       |  21 ++
 dev-python/ryu/Manifest                            |   1 +
 dev-python/ryu/ryu-4.5.ebuild                      |  21 ++
 dev-python/stevedore/stevedore-1.17.1.ebuild       |   3 +-
 dev-python/taskflow/Manifest                       |   1 +
 dev-python/taskflow/taskflow-2.6.0.ebuild          |  44 ++++
 dev-python/tooz/Manifest                           |   1 +
 dev-python/tooz/tooz-1.43.0.ebuild                 |  36 ++++
 dev-python/urllib3/Manifest                        |   1 +
 .../urllib3/files/urllib3-1.16.0-unbundle.patch    |  17 ++
 dev-python/urllib3/urllib3-1.16.ebuild             | 114 +++++++++++
 dev-python/websockify/Manifest                     |   1 +
 dev-python/websockify/websockify-0.8.0.ebuild      |  19 ++
 dev-python/wsgiintercept/Manifest                  |   1 +
 .../wsgiintercept/wsgiintercept-1.3.1.ebuild       |  61 ++++++
 dev-python/yaql/Manifest                           |   1 +
 dev-python/yaql/metadata.xml                       |  23 +++
 dev-python/yaql/yaql-1.1.1.ebuild                  |  28 +++
 net-misc/openvswitch/Manifest                      |   1 +
 net-misc/openvswitch/openvswitch-2.6.0.ebuild      | 162 +++++++++++++++
 sys-auth/keystone/files/CVE-2015-7546_8.0.1.patch  | 216 -------------------
 sys-auth/keystone/files/CVE-2016-4911_9.0.0.patch  | 103 ----------
 sys-auth/keystone/keystone-2016.2.9999.ebuild      |   4 +-
 sys-cluster/cinder/Manifest                        |   3 +
 sys-cluster/cinder/cinder-2016.1.9999.ebuild       |   2 +-
 ...016.1.9999.ebuild => cinder-2016.2.9999.ebuild} |  70 ++++---
 sys-cluster/cinder/cinder-8.1.0.ebuild             |   2 +-
 sys-cluster/cinder/cinder-8.1.1.ebuild             |   2 +-
 sys-cluster/neutron/Manifest                       |   2 +
 sys-cluster/neutron/neutron-2016.2.9999.ebuild     | 228 +++++++++++++++++++++
 sys-cluster/nova/Manifest                          |   1 +
 sys-cluster/nova/nova-2016.2.9999.ebuild           | 216 +++++++++++++++++++
 .../openstack-meta-2016.1.9999.ebuild              |   4 +-
 .../openstack-meta-2016.2.9999.ebuild              |  23 +++
 103 files changed, 2607 insertions(+), 433 deletions(-)

diff --git a/app-admin/glance/glance-2016.2.9999.ebuild b/app-admin/glance/glance-2016.2.9999.ebuild
new file mode 100644
index 00000000..38cd8cc
--- /dev/null
+++ b/app-admin/glance/glance-2016.2.9999.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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/newton"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#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-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${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/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	dev-python/paste[${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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${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_install() {
+	distutils-r1_python_install
+
+	for svc in api glare 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 -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 7eea56e..64695e5 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1 +1,2 @@
 DIST cliff-2.0.0.tar.gz 51837 SHA256 6e219dc3ed80a23e3dc5c88b741f3997b8450581c1d2572bde14b2dfa556d782 SHA512 6bc53c4958f21e4b67a71a97a7413bb6760065987e92c922b5de6b748deb55b5bd711c1de962573c326d0c451c755c5fad2cc0458b2d4eb4ec67bcaa750d20bc WHIRLPOOL 132ec260e55bec0dba40433abf580e5f11f265152dd8497cc42b42c5cb576284a6c0c7f867fd0ddbab2205ac27c1108e7fbd13ccfdae9ddba84cf17c2246d366
+DIST cliff-2.2.0.tar.gz 57767 SHA256 a12a6bd3cf9085f0e0589c5019037ac4ee410413abbb76189fa62695f79f84fc SHA512 b6f1c55c676e040c0ca8996a0bbb33331c83d102c17cc62700014fec47f8135ba1c9185cbf10e60401799490b2f02b8471ca4d130d1ead978f6076bf29e36de0 WHIRLPOOL 3286a91d1c0af07e408244f3179a53f6a54529b611d63adc74b12c9ea851ca38e5f32cec0039f53e97848e64fa36e1b20bcb90108d6d55d286ce638e1955c798

diff --git a/dev-python/cliff/cliff-2.2.0.ebuild b/dev-python/cliff/cliff-2.2.0.ebuild
new file mode 100644
index 00000000..2102405
--- /dev/null
+++ b/dev-python/cliff/cliff-2.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/dreamhost/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}] )
+	doc? (
+		>=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-3.4.0[${PYTHON_USEDEP}] )
+"
+# source files stipulate <sphinx-1.3 however build effected perfectly with sphinx-1.3.1
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cmd2-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/unicodecsv-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	"
+
+python_compile() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests ${PN}/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/cursive/Manifest b/dev-python/cursive/Manifest
new file mode 100644
index 00000000..2be80ef
--- /dev/null
+++ b/dev-python/cursive/Manifest
@@ -0,0 +1 @@
+DIST cursive-0.1.1.tar.gz 18522 SHA256 751745b868f6450d928749c9d08b0040bd13f82bcf7c4ed414a57da66b2bc104 SHA512 3a6ae804c010ae2b596eac8fbc3c9be6d7994ea8984513617f1eaa7c77c8335ce2c36419d8e6acadb305210d96d51ead8470a79e8425f2c00ef0dc9ead59929b WHIRLPOOL 8c5705780deb037fb61e9a511fecda55673fa069cda0d4e605c7387266a18bc6eefb3992910f44464268a86f6fd26580f381e8e96847eb04f1d51fef9deaacfe

diff --git a/dev-python/cursive/cursive-0.1.1.ebuild b/dev-python/cursive/cursive-0.1.1.ebuild
new file mode 100644
index 00000000..05b5cad
--- /dev/null
+++ b/dev-python/cursive/cursive-0.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cursive implements OpenStack-specific validation of digital signatures."
+HOMEPAGE="https://github.com/openstack/cursive"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/cursive/metadata.xml b/dev-python/cursive/metadata.xml
new file mode 100644
index 00000000..1d683b2
--- /dev/null
+++ b/dev-python/cursive/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@g.o</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@g.o</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+		Cursive implements OpenStack-specific validation of digital signatures.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">cursive</remote-id>
+    <remote-id type="github">openstack/cursive</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index e17334d..05591ac 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1 +1,2 @@
 DIST glance_store-0.13.1.tar.gz 127250 SHA256 e2f2051ff22abaa462fdb7fe8741312de8543bba7f6f65165b9c52343ccd35fc SHA512 1625849ed35d8fec6d730790485451fd740240a6fd076ad084cd0444b5b8bfadeab82164854a9bee194f6f3cabff7c30815d5fdcd800a7d982ed8c3224e6aaec WHIRLPOOL e16ad3aef7ca1ef15ead956fa7e459a4f6259b3c7ffb0086b11aa5fe2c4034011d306df09255cf6b94bf9474861546e483147c3823d804b661244455e463a217
+DIST glance_store-0.18.0.tar.gz 126949 SHA256 56b8b33f5deb74c652bd82d781aa82459e14152a5ee5c74726f0f1545c2355a7 SHA512 f23505b0081d0bb9948a4a2550868ea9864c00604358264c826551caccb4e35cbdcfcaa1e0ed3d470fbe72250196e246b596cbb57db0e99cc49fba3e0c609e01 WHIRLPOOL a1f26bc06a19a6deb14b910813829a07726ec9408b71e4fbb854ea3a2815f872cd27dfd82ae4f84e1bf49fdf5b89ef079c8f17f24a883bbf5a2cacc218f0ce8f

diff --git a/dev-python/glance_store/glance_store-0.18.0.ebuild b/dev-python/glance_store/glance_store-0.18.0.ebuild
new file mode 100644
index 00000000..9a4d873
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.18.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="https://github.com/openstack/glance_store"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+cinder"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
+"
+
+python_prepare_all() {
+	sed -i '/ordereddict/d' requirements.txt
+	distutils-r1_python_prepare_all
+}

diff --git a/dev-python/microversion-parse/Manifest b/dev-python/microversion-parse/Manifest
new file mode 100644
index 00000000..439e635
--- /dev/null
+++ b/dev-python/microversion-parse/Manifest
@@ -0,0 +1 @@
+DIST microversion_parse-0.1.4.tar.gz 12795 SHA256 040558958b5a9db618b55c326c5cb15a59e21ae7a2754c7017ffc85015b2db7c SHA512 06d7063370cc55b6c41f2d9cae33caf5cce501694d4271d0ae586cb5a468cc2e6361f93906f18405a0f99a59f442cda1b56bd565069d6dbf2bbc409942ea189f WHIRLPOOL 22d6b34f674d7b04e20571607ecda50913b50c77b42d2216e790cde6c45d3edd33dfaccd8e535dc45d44baf51d3f1fdd7d89835629ffcbb820b860bbd1b81f47

diff --git a/dev-python/microversion-parse/metadata.xml b/dev-python/microversion-parse/metadata.xml
new file mode 100644
index 00000000..5ee8fe9
--- /dev/null
+++ b/dev-python/microversion-parse/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@g.o</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@g.o</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+		A simple parser for OpenStack microversion headers.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">microversion_parse</remote-id>
+    <remote-id type="github">openstack/microversion-parse</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
new file mode 100644
index 00000000..47766e8
--- /dev/null
+++ b/dev-python/microversion-parse/microversion-parse-0.1.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple parser for OpenStack microversion headers"
+HOMEPAGE="https://github.com/openstack/microversion-parse"
+SRC_URI="mirror://pypi/${PN:0:1}/microversion_parse/microversion_parse-${PV}.tar.gz"
+S="${WORKDIR}/microversion_parse-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+"

diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 9da0ec5..eb855a9 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,2 +1,3 @@
 DIST netifaces-0.10.4.tar.gz 22969 SHA256 9656a169cb83da34d732b0eb72b39373d48774aee009a3d1272b7ea2ce109cde SHA512 1b9b92b69e01e4dd9f9304d3812d78d58ec195a657cb47b2e629ccb1311de4a8cd9716825d7b94d4791f7c479c289638780f6f9afa8a6465fb555130da622b24 WHIRLPOOL 44cb33b6ca0c6cda059bf7e88ca5b4904d1e2d5bb7201f23d8e5b9c3bd337acc99dc47dec76016b6ceee7c5d8d72af03af96afb709ff9368a8dfff8683d4b7e2
+DIST netifaces-0.10.5.tar.gz 24879 SHA256 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b SHA512 736bb985b444e78676dc10533a7597e750cadf41033196c4be49c4f33e91d46eba33a1f485e07e9f70aec2170c958564a6f54bbaa1ab193bfaca04b1fb07b3a1 WHIRLPOOL 7a0d63508dc2d2f80a4fbe4a92468696cb3335c9a47410a617de12f7c1f167a4bfc9d3a122dc666e5956b9b1422ed11f9e1839e929c85f0b0cc289eeccba4c35
 DIST netifaces-0.8.tar.gz 15484 SHA256 53a711038db3d6e5cf7129d6f751185fd052f830f12f271fbfe17bd2671ab1ec SHA512 b3735c4f83d4ed1d52f59937187659f148205a721fd05ce5a10e9ec89ea3519971001b2985e24bb30fb112ee741310babd847f84d4c3fbb34989edc6a743f551 WHIRLPOOL 4f638d769a38a474f0a27642544e1b6e932643f224133024cbfdb44e9637700afc10675fccd61e52e5f6e8a121b25173895d9f173b428aefceded22a42af7ab6

diff --git a/dev-python/netifaces/netifaces-0.10.5.ebuild b/dev-python/netifaces/netifaces-0.10.5.ebuild
new file mode 100644
index 00000000..b646b58
--- /dev/null
+++ b/dev-python/netifaces/netifaces-0.10.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Portable network interface information"
+HOMEPAGE="
+	https://pypi.python.org/pypi/netifaces/
+	http://alastairs-place.net/netifaces/
+	https://bitbucket.org/al45tair/netifaces"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )

diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 8dad826..384ad27 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1 +1,2 @@
 DIST neutron-lib-0.0.2.tar.gz 49102 SHA256 2040a08937bece401a49fb4a867ccf5a910a8267edc26947ab0c523b4903ce7d SHA512 efe524b18835ee351abc9514aa2026ed543857f523f0cb7ab47e509e2e53246aa093daa0b28cbfcede27487ba8eff3c054531bfab7d43af70354c4063f34ac92 WHIRLPOOL 159294e363e588b9d2c3204d8b92b5e5df9923d8a08b70d28d0a4cdd20f9b6bd6b01301f557e97a99fcad6aac5a2724768d0898d997750c1c015f85df02db708
+DIST neutron-lib-0.4.0.tar.gz 147871 SHA256 018550848e31e3eb20e5fb3d8173ae75cce46c6233fd020227fa9a49af593d6a SHA512 c76c17331d52dd3708be67da5b509b50580be5df7238162aa66a8b89a0ff36c08b03f2f2c1a66061f5a67dc010affa5d39616549d8ed3cc5e8df96292e6257d7 WHIRLPOOL 4949b04d3c60bb906b8912758f7229e22ae9595c3f4e335bb124687a255382452bc0e0e7bd6c7e68755a5a0b4e53498f858f4a3c86c0c1824bfebc6f77358c26

diff --git a/dev-python/neutron-lib/neutron-lib-0.4.0.ebuild b/dev-python/neutron-lib/neutron-lib-0.4.0.ebuild
new file mode 100644
index 00000000..97b3d7e
--- /dev/null
+++ b/dev-python/neutron-lib/neutron-lib-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Neutron shared routines and utilities."
+HOMEPAGE="https://github.com/openstack/neutron-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index d8c0e27..246f8f6 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1 +1,2 @@
 DIST openstacksdk-0.8.2.tar.gz 209658 SHA256 9a5d29f0d4663d1215342d1174260be7f5fb16a6348b3b485550eb923b899696 SHA512 a752da6580910a382e2a0ac8329e39279140a56a80b6596138e810a40616b848d32fdb57925232290a6117a75eed86d2d7fb1d6dc608a9ed08669e9f7cce43ed WHIRLPOOL dadb64dc8562b711556839d6710bf67a649c068f93cf881642256f1b853d4747384472daaa9520bd6c14b70e440b21c660be495b605ff42ea668e5dbd15f2d38
+DIST openstacksdk-0.9.5.tar.gz 264796 SHA256 620ed52b90a6e494b0732b63766264bede8c2fe2b4394fb1dd8d4c75a43ad4c6 SHA512 8aecfb9bbd7f950e40a25d3326d1b26436d92a7d556cb2e71fe02f127eaa96d14712e6805c83bd02109f8dec845bcb1d8857229916682bc7acd0d4a560203dfb WHIRLPOOL 1db2248ad334e8064a7ec4a3f9cd41a4f374de1b46ee82230b6723d7f6a08389c22400989952348a6a212dc39c8902d94833016f8f34464c3437773de7a13701

diff --git a/dev-python/openstacksdk/openstacksdk-0.9.5.ebuild b/dev-python/openstacksdk/openstacksdk-0.9.5.ebuild
new file mode 100644
index 00000000..5d9a64e
--- /dev/null
+++ b/dev-python/openstacksdk/openstacksdk-0.9.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of libraries for building applications to work with OpenStack."
+HOMEPAGE="https://github.com/openstack/python-openstacksdk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index 587a0bb..8264ba3 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1 +1,2 @@
 DIST os-brick-1.2.0.tar.gz 90245 SHA256 e8c5931d2a5115a7c484276add6be6b5e3ba13402c8a71e32b2313448010be30 SHA512 9e35d4244f53d495824d7da5dc7cde117b78d0bdbf1bed6234848ce6b965ddb0fb88296a54f76915bbdf1cc337ca308c46f48814c5fa6877979debae3ab58628 WHIRLPOOL 7b7e1bf264313db1d8cc9c2e1966bce7872e755bfa043c38d81a54436ddf3cf0b1362618d4131f1cf947823c775286e32b9adca2b14887e679ff8def35c1fe72
+DIST os-brick-1.6.1.tar.gz 133834 SHA256 e6cec9a9664810962ba159cc2b7dc5c272ba9ccc0a570b90dc12e25540d71eb4 SHA512 c7e3fdf88992fc9e1567379664ab097b98e3321fd430f7a7a99aeb9a0cba07e7559321637163553959a7a5e5ca541e83cc8ae3f072254e97ffa7dcaca39b5920 WHIRLPOOL 66414cacd221f086746a767f7e2e71f79c200a6bd91f1becef9fbc79dd1e1da72c16a9c868c28147d940e359dca701e4bf4eca361e04ae2bcb94503d3cddd35e

diff --git a/dev-python/os-brick/os-brick-1.6.1.ebuild b/dev-python/os-brick/os-brick-1.6.1.ebuild
new file mode 100644
index 00000000..efcc52b
--- /dev/null
+++ b/dev-python/os-brick/os-brick-1.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/cinder"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}

diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index b8e62b5..e8878eb 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1 +1,2 @@
 DIST os-client-config-1.16.0.tar.gz 53367 SHA256 d25dfb1b74552339442875bedb1e9328de66c5644b8dff0b31cc140f1d6ac9fd SHA512 a10a877dd3bc0245c6bbdaa0cb6daa5a17b519cc4fa73b368626a2e58dd44427309e1d839a3db14128ab4ed4d12fd36aaf366617ded88e14335ced8929c7f527 WHIRLPOOL 58fa3908c9ab756a610e4ce9cd99bf4f0e33602a79a773b71b8c5d5677c251d92b0e13ae33bf5d7ce9c671f672e0edef3d5780d9d806e8c72a2790f369ad5724
+DIST os-client-config-1.21.1.tar.gz 62581 SHA256 ad4c2d07c0468c8d11916ea690b977abb3e903e0c599f6eae02c4776edab2f96 SHA512 74d16d0f3e2980c1ef07134de8bdcb867e80226cb23eeaaeb95a534a2f807b186e7807d14df20003f56e7aa3bd72cafa7839c40937e52d50f8b21a40e7eba00b WHIRLPOOL 13e34ef0e20b16abc9c780d0566a516a2beb41d658f493e15f73a7c5eb6ae85fb7c27b5b60e15fbaabfd4435061400c7609084a4e649d9ab75595f1940c13d2f

diff --git a/dev-python/os-client-config/os-client-config-1.21.1.ebuild b/dev-python/os-client-config/os-client-config-1.21.1.ebuild
new file mode 100644
index 00000000..1590a40
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.21.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND="dev-python/pbr[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		dev-python/extras[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${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/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${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}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.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}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	local PATCHES=(
+		"${FILESDIR}"/test_get_all_clouds.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index 6693b04..686d158 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1 +1,2 @@
 DIST os-testr-0.6.0.tar.gz 36837 SHA256 473faa5d0e9d2f1ed5a92a8b942d79af9225f496ab74d6c734ceae8104138d19 SHA512 20648c8442c7d0adc42537e8ff841ac6766fd836bbe96aca77c5e99e787a27f3e490da09676c95f49371fd491ebfaa8e986a6cd53e16f50c3c83722726ae4d2c WHIRLPOOL f54d18c101a16bc3d9d6eaeb8bf36a423d22bb0ba32cce65b9e31b4d036999aeace1bddcc89644ca8d07f1c284645b512a3e06040911123c7adbe76a6b7236c4
+DIST os-testr-0.7.0.tar.gz 37324 SHA256 d04b06fcd8ce7692946bf470c26791358fa1c90cbc3ab3b28f7904ae04d6bf1a SHA512 5787044dae27b571ef065deb0df0cf5300c702e3bb026fe93e927b5ba24dafc4e957bba2e49cba290b2d6c615172d504c662cc90a7b180aa1c6ff76b6044eea3 WHIRLPOOL 9d739b8f42ea325da3ca1b1443f8728a54fc3d5963f87d2fd22683a4a016db8b72bd0f012d9119c5537741f6c0ffe3f3da0cdd6bc59d03de3105a98d53ff2458

diff --git a/dev-python/os-testr/os-testr-0.7.0.ebuild b/dev-python/os-testr/os-testr-0.7.0.ebuild
new file mode 100644
index 00000000..2c23d79
--- /dev/null
+++ b/dev-python/os-testr/os-testr-0.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/coverage-3.6[${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/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^discover/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}

diff --git a/dev-python/os-vif/Manifest b/dev-python/os-vif/Manifest
new file mode 100644
index 00000000..2563612
--- /dev/null
+++ b/dev-python/os-vif/Manifest
@@ -0,0 +1 @@
+DIST os_vif-1.2.1.tar.gz 41006 SHA256 57d5b306a63bcc7fde7dcab7b15929010ae03863c983368b749f97106a2ee9e5 SHA512 9eb8e2498e5bf4d1a96567fe4bbf0f9f95682db19c0123ec509e6f8f5871a340c529a347fdd8ee29c4981917e8f35396e19770da47f9265500ce4b4567ab6694 WHIRLPOOL 556d51093179f6125840b78ddf653a8da548f52e2b30bd4c2e64c04c540c93365a9332daee5f1c5cd65706bbafa69fde6462ee9855028d9d75f673969e13560d

diff --git a/dev-python/os-vif/metadata.xml b/dev-python/os-vif/metadata.xml
new file mode 100644
index 00000000..146474b
--- /dev/null
+++ b/dev-python/os-vif/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@g.o</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+	<upstream>
+		<remote-id type="github">openstack/os-vif</remote-id>
+		<remote-id type="pypi">os-vif</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/dev-python/os-vif/os-vif-1.2.1.ebuild b/dev-python/os-vif/os-vif-1.2.1.ebuild
new file mode 100644
index 00000000..ff54910
--- /dev/null
+++ b/dev-python/os-vif/os-vif-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
+HOMEPAGE="https://github.com/openstack/os-vif"
+SRC_URI="mirror://pypi/${PN:0:1}/os_vif/os_vif-${PV}.tar.gz"
+S="${WORKDIR}/os_vif-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12
+	!~dev-python/netaddr-0.7.16
+	>=dev-python/oslo-config-3.14.0
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}

diff --git a/dev-python/os-win/Manifest b/dev-python/os-win/Manifest
index 1ee48c9..2b062be 100644
--- a/dev-python/os-win/Manifest
+++ b/dev-python/os-win/Manifest
@@ -1 +1,2 @@
 DIST os-win-0.4.0.tar.gz 134421 SHA256 369d9483340ab48a5c145e4863082d2c611a02a467b7609227e3432a26880283 SHA512 6ffc33c8dbeb834ee588a8b84fb3fc6d7f6bf886d22307cac46c6f769c0d645bc76fd432be0cd8d3b76d0119ef6f5fe3276482cfda7880462f7af6969748a53e WHIRLPOOL 6c3c643b3992f98eb8551d19d067e8a56809a10005abf0940c270a77c4f1066469b367045c6e1be9f453b87db67f4f7fe9d3f614589887bc0e5d1d46c62b2099
+DIST os-win-1.2.0.tar.gz 147563 SHA256 b99891582da960134469e6c22e665811ec99fa21eaffc816ae11d567502e50ac SHA512 83e42d5d3489670aca138dff59979bca24ea5429e7922a3cce16d536ebfdf94c57d90230f01fb1c7e8c428b7d4b285464b4bbcd3af69dd004f077861947b3717 WHIRLPOOL 40c82f4c4bb773c6c6611265a1b1324f69e1a6ff9712a0757d60418314ba561d251c6562368b78433abecd1be787dc70759a3a341fe0218d7f3718dcef6a248b

diff --git a/dev-python/oslo-cache/oslo-cache-1.14.0.ebuild b/dev-python/os-win/os-win-1.2.0.ebuild
similarity index 50%
copy from dev-python/oslo-cache/oslo-cache-1.14.0.ebuild
copy to dev-python/os-win/os-win-1.2.0.ebuild
index de67eb6..6cab5f2 100644
--- a/dev-python/oslo-cache/oslo-cache-1.14.0.ebuild
+++ b/dev-python/os-win/os-win-1.2.0.ebuild
@@ -3,38 +3,34 @@
 # $Id$
 
 EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+inherit distutils-r1
 
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Windows / Hyper-V library for OpenStack projects."
+HOMEPAGE="https://github.com/openstack/os-win"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-"
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }

diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
new file mode 100644
index 00000000..1f30027
--- /dev/null
+++ b/dev-python/osc-lib/Manifest
@@ -0,0 +1 @@
+DIST osc-lib-1.1.0.tar.gz 72875 SHA256 e06ca111b2702d442f5cf70c754b6331cc7742231f0fe0b634cbd03c502610ba SHA512 8fff1c13e034168d1a410d2a86f8f88d8911af1a4bb6823c95e633599984ce06469ec7a4fb5a90a6f8bff7f79cbff1120e906c8ab319111957d663728233d77e WHIRLPOOL 7c64ee245bdfbb6578165f4b860e3e27aa942ec1aeb4ad811a416017b18bdb9b21c9aca71bdfd2039e9adf117aa3769ababc97b6a7b66d958a7db0ac5c940421

diff --git a/dev-python/osc-lib/metadata.xml b/dev-python/osc-lib/metadata.xml
new file mode 100644
index 00000000..43fe2a7
--- /dev/null
+++ b/dev-python/osc-lib/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@g.o</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@g.o</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+		OpenStackClient (aka OSC) is a command-line client for OpenStack. osc-lib
+		is a package of common support modules for writing OSC plugins.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">osc-lib</remote-id>
+    <remote-id type="github">openstack/osc-lib</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/osc-lib/osc-lib-1.1.0.ebuild b/dev-python/osc-lib/osc-lib-1.1.0.ebuild
new file mode 100644
index 00000000..522b51e
--- /dev/null
+++ b/dev-python/osc-lib/osc-lib-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A package of common support modules for writing OSC plugins."
+HOMEPAGE="https://github.com/openstack/osc-lib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/oslo-cache/oslo-cache-1.14.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.14.0.ebuild
index de67eb6..b8f8aee 100644
--- a/dev-python/oslo-cache/oslo-cache-1.14.0.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.14.0.ebuild
@@ -35,6 +35,5 @@ RDEPEND="
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }

diff --git a/dev-python/oslo-config/oslo-config-3.14.0.ebuild b/dev-python/oslo-config/oslo-config-3.14.0.ebuild
index 745ade1..d7e0db6 100644
--- a/dev-python/oslo-config/oslo-config-3.14.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-3.14.0.ebuild
@@ -56,7 +56,6 @@ RDEPEND="
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
 	use doc && esetup.py build_sphinx
 	distutils-r1_python_prepare_all
 }

diff --git a/dev-python/oslo-log/oslo-log-3.16.0.ebuild b/dev-python/oslo-log/oslo-log-3.16.0.ebuild
index 48f7f14..0145e4b 100644
--- a/dev-python/oslo-log/oslo-log-3.16.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-3.16.0.ebuild
@@ -51,7 +51,6 @@ DEPEND="
 
 python_prepare_all() {
 	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 

diff --git a/dev-python/oslo-privsep/Manifest b/dev-python/oslo-privsep/Manifest
new file mode 100644
index 00000000..d46a2e8
--- /dev/null
+++ b/dev-python/oslo-privsep/Manifest
@@ -0,0 +1 @@
+DIST oslo.privsep-1.13.0.tar.gz 29671 SHA256 45e55f5107634939bcbacec879e43a67190001e4e2b108b15753e70cb07ca4ee SHA512 d897df3b0c664062b3f2dbae76e5d4dd809d508a75f3ff7122d4c892d68b57caa5cab19794c3df8bbd69d03dcc4914e803898b4132dadd80dc04c65bec22f8d3 WHIRLPOOL a40a27c803059bcc2c734db587b0f68289b2e3183a3671b2ad2489262ca837f105ae88634d56a26042c348702fe276303eb3dc1eee48ac8fc0494265f5fbbc0c

diff --git a/dev-python/oslo-privsep/metadata.xml b/dev-python/oslo-privsep/metadata.xml
new file mode 100644
index 00000000..43a2333
--- /dev/null
+++ b/dev-python/oslo-privsep/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@g.o</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+    OpenStack library for privilege separation
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">oslo.privsep</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/oslo-privsep/oslo-privsep-1.13.0.ebuild b/dev-python/oslo-privsep/oslo-privsep-1.13.0.ebuild
new file mode 100644
index 00000000..db38ecf
--- /dev/null
+++ b/dev-python/oslo-privsep/oslo-privsep-1.13.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack library for privilege separation."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.privsep"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.privsep/oslo.privsep-${PV}.tar.gz"
+S="${WORKDIR}/oslo.privsep-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.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/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	dev-python/cffi[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# python_test() {
+# }

diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 9fa3cdb..7ab8250 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1 +1,2 @@
+DIST oslo.reports-1.14.0.tar.gz 43275 SHA256 85ca612188d1f0b4e88ef2f725139fed67b6c11a8377325c2ec78f500ff06cc2 SHA512 9af65e2479adb4ae17bade9d7c44ddb2c03b6d758f4b88745be63ed37502f3b16b4a3edf4c637070924980a3d1969d18e49f6d4b84844c66f8be0e30225e6796 WHIRLPOOL b61d024621a6c4c02b7e6e90d8d9fea9bccf3a29b92b5f723039c3ffe6f1fdb630a62c486d1da154b26fc228d02604109bce4c648b3bcba8777ef51fea1c63a6
 DIST oslo.reports-1.7.0.tar.gz 41592 SHA256 288e9a3b699fcefcb9ae8d848a965e5c6918729b4200ae0e799b077a8e8ecafa SHA512 be40ade6d4d67eb7766bf7f1609809c92817363c8788ff6a8c069d6de650eef57e4ea243a03eab2e855866966c1e95999235363066f9a84faad25f9bc4c9b138 WHIRLPOOL 2422a76258f73a33efa92bcc016a4cefd9dee40459cd1185a9f6140fb13bc91618025a0da928b629d05cd734e239558847c41e64676543a0ef92f7d0e8c808de

diff --git a/dev-python/oslo-reports/oslo-reports-1.14.0.ebuild b/dev-python/oslo-reports/oslo-reports-1.14.0.ebuild
new file mode 100644
index 00000000..7acb417
--- /dev/null
+++ b/dev-python/oslo-reports/oslo-reports-1.14.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="generified reports for openstack"
+HOMEPAGE="http://docs.openstack.org/developer/oslo.reports"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.reports/oslo.reports-${PV}.tar.gz"
+S="${WORKDIR}/oslo.reports-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}

diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 8e7e8ab..9116974 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1 +1,2 @@
 DIST oslo.rootwrap-4.1.0.tar.gz 35590 SHA256 083b6255228982484fc483db845a49e07f474cfc12ba1ba70490f56880027989 SHA512 ef06507989d168bed8d3943d69c53318b87a2de6f403b9563d79ca75b9e17da887ce68775c54cc0fb8488e99ae3dccb08f8c3e4cf2d46882b699625519a46705 WHIRLPOOL 638a8cbf3cf463067ddc26934b914d4bf50b7b6ce51ba48a83df7abcad62836a1bdb0f660120a04facf4d1cfec589bb690a7039486884cbf3013e1ab622f9dd1
+DIST oslo.rootwrap-5.1.0.tar.gz 36177 SHA256 7bcb7b6aa2fc15746b82cf9e301d1c0fe3179c374eaecb6f52a188bd5ab00167 SHA512 24b33672b8f575ff23cc463725717bf09bb70b3a5657846a63e7f9ea3627874a1865045ee62a46a449c70cb2eeaab690049f127a995943920123d2439396ad8b WHIRLPOOL c742a805a6e480ebaad1909286bc4ae247f20f467a6060ca89a37a14d11e06ebd48db66499c16922271b014abe3c289cb119fa92660dbb4d271994d0b712cd3f

diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
index c848f80..88aecff 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 
 inherit distutils-r1
 
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
+DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
 HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
 S="${WORKDIR}/oslo.rootwrap-${PV}"

diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.1.0.ebuild
similarity index 79%
copy from dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
copy to dev-python/oslo-rootwrap/oslo-rootwrap-5.1.0.ebuild
index c848f80..d309361 100644
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-4.1.0.ebuild
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.1.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
 inherit distutils-r1
 
-DESCRIPTION="The Oslo Rootwrap allows fine filtering of shell commands to run as root from OpenStack services"
+DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
 HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
 S="${WORKDIR}/oslo.rootwrap-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 CDEPEND="
@@ -22,7 +22,7 @@ CDEPEND="
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.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}]
@@ -33,7 +33,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
 		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}] )"
 RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index aaf58e3..c6fadc1 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1 +1,2 @@
+DIST oslo.versionedobjects-1.17.0.tar.gz 137712 SHA256 92b53f991e67b5aa757df368488dd3003147edb3a40235e512894e752004c871 SHA512 0568fd8499227e1f79fd9b3e7204a934ae3846c0c13393769b5a6920c318cfa1439c6516f584b0b7f76b325bdb67f4f343cdad68c0f3cd6239683b76c869a3d1 WHIRLPOOL 2050915f633ef71e3c078f6cf731e435aad8b65662a6944b607d459525c8616effe2cfd5ff13a3dce3765ee2005a746271b9d0ed6feafa3e2c26ebc11484d8fa
 DIST oslo.versionedobjects-1.8.0.tar.gz 132949 SHA256 e727d969a5a89190783bcfa10d2c0d0bfd68d2344be3eb2f1a61ff6f63d6fd59 SHA512 913cf8bfda0dcd24941e4aefff3ec76ace0e4699fc538eee38417f547374484d4916f64fee1c77425ea60d479c732da919077c243d51b51320b2bbfcd3e40422 WHIRLPOOL 9dfaec3590ee729a8be65e6cec98b9d6af5db16de1d615a4932636dab7969b57407b1f68a372c38835ff76c30e4ec0e01214b18edda7c1accc40b5c5cb82b53a

diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.17.0.ebuild
similarity index 54%
copy from dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
copy to dev-python/oslo-versionedobjects/oslo-versionedobjects-1.17.0.ebuild
index 80f96ef..f971411 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.17.0.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
 inherit distutils-r1
 
-DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
 HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
 S="${WORKDIR}/oslo.versionedobjects-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
@@ -24,16 +24,15 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.2[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]"

diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
index 80f96ef..fe1831b 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
 
 inherit distutils-r1
 
-DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
+DESCRIPTION="A library that provides a generic versioned and RPC-friendly  object model."
 HOMEPAGE="http://docs.openstack.org/developer/oslo.versionedobjects"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.versionedobjects/oslo.versionedobjects-${PV}.tar.gz"
 S="${WORKDIR}/oslo.versionedobjects-${PV}"

diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 6ff2d93..2d81612 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1 +1,2 @@
+DIST oslo.vmware-2.14.0.tar.gz 86385 SHA256 ba93eff5cb672ddee3e58f8d10e7d121e387c8090b3acdff7acbbfb05389914f SHA512 6b1c40d28b32a92e15c89b71ad6f2aea79de18144812a6f865b34072b8643814663854a1a52b732bf24ccd825b395f0744ef8514c58fe57b25ec3fc5b72e66ff WHIRLPOOL 5ff5e039363fa8cc67567ac3c85ecedcc0b948f524fb2f4021fc5f04e783ec88b50f6408ce3256f8ed2d19c2e3bebe1bee19626d2730e0b18ad20c411304813a
 DIST oslo.vmware-2.5.0.tar.gz 81830 SHA256 cb1685acf7cb11be4cb72412c078d7b21350c4d34fd36e9a57361a4a51df018c SHA512 f5cc084e235fa48931744a30f6d8e1c42a95bf34b97a9adeeb79d29939b8feb76994de96e8e78b323436fd43846be5a0d2d1b140472ecfe99d33e77a2e28261a WHIRLPOOL f57db75ddb55c5a012dce85dbe86f03308e4f8ea577d9ad7937b7c3ab2f9e57ea6712de4d540480da1b8038ca3242383421d1c13300093fedfd8c4caf6cd62cc

diff --git a/dev-python/oslo-log/oslo-log-3.16.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-2.14.0.ebuild
similarity index 52%
copy from dev-python/oslo-log/oslo-log-3.16.0.ebuild
copy to dev-python/oslo-vmware/oslo-vmware-2.14.0.ebuild
index 48f7f14..ed5abd9 100644
--- a/dev-python/oslo-log/oslo-log-3.16.0.ebuild
+++ b/dev-python/oslo-vmware/oslo-vmware-2.14.0.ebuild
@@ -3,58 +3,63 @@
 # $Id$
 
 EAPI=6
-
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
 
 inherit distutils-r1
 
-DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
+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 ~arm64 ~x86"
 IUSE="test"
 
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]"
-DEPEND="
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
-	test? ( ${RDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.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-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.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/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
 		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-
-python_prepare_all() {
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+"
+python_prepare() {
+	sed -i '/^suds-jurko/d' requirements.txt || die
 	sed -i '/^hacking/d' test-requirements.txt || die
-	sed -i '/^argparse/d' requirements.txt || die
-	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
+	nosetests tests/ || die "test failed under ${EPYTHON}"
 }

diff --git a/dev-python/ovs/Manifest b/dev-python/ovs/Manifest
index ac26ba4..6957f48 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1 +1,2 @@
 DIST ovs-2.4.0.tar.gz 61230 SHA256 ea38287b56fd19af24dd6d1c0098ccc8ded9e8f9daeb04b152e3835278becd01 SHA512 45dd7e040c56f8ef16a2ca1fddb769c6d2c67c729f1889dcd867d57d6de8fe4f6baafe99113db05e20adf41389feea2ea9f69739256842404edce6ac28782e07 WHIRLPOOL 2dfde0a2eb334deea8bf88ceea15ad8c5e237cdd3e01cf6a0a7a5a1029bb7aca9bfc3ee83f88687d014723e82199776882ac89ccca1cac051142f48e46ad53a5
+DIST ovs-2.6.0.tar.gz 67450 SHA256 f30d7c4bf06398f5b0d5992d0460e90efb1b8334337fd27078ec28a5c9e34d89 SHA512 6efc35a6935253cbf5f7b17b200d79e8c705c43c465668fbe060d76708728b27a537e25120539628ea10d041643caa61d70871adf6d6dfdbd394cc221cc0bd63 WHIRLPOOL 08cf29e1fe2bc3caf744a35b3bdedba4111b8cca5646e72aaea9290a8a211cf2240043e6ee329357a9f85956d8feb0e396bb083d4eafb34552d4b09c771f1b21

diff --git a/dev-python/ovs/ovs-2.6.0.ebuild b/dev-python/ovs/ovs-2.6.0.ebuild
new file mode 100644
index 00000000..ddc9241
--- /dev/null
+++ b/dev-python/ovs/ovs-2.6.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OVS bindings for python."
+HOMEPAGE="https://github.com/openvswitch/ovs/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""

diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index ad400f2..ae0daf0 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1 +1,2 @@
 DIST python-barbicanclient-3.3.0.tar.gz 82210 SHA256 d5c68354fb5d18a6fcdcd0a0788b3f502dd6ffa57a2e47a1426cce2d63ecb6cf SHA512 9c9ea055a375cb631f081ac0dc54ff20f60e6f6c3340b0f0a92a91eed4858202d9f85e00b662a8b3b7b5183633d8f5500f6925df5a182b20046d66be48b34e37 WHIRLPOOL 94a1d91a2bb8c8aaddfe775e7a5e955eace20e75e6c75707bd56aa62a1538193161d14534c1cd9d91ece5fb57a03f0fa7e71370531c576d1f5c35a0ed113830b
+DIST python-barbicanclient-4.0.1.tar.gz 103093 SHA256 6dad260ddb68843fe28e8f0d106d4a4aadf766ba5131123ea18a27e9349c5d5d SHA512 d66d6d21fdd2033ac01fd9275ccedf21925cbf48f3344fa763a3f13ec4796584afa911a3f4f6907e4181b2bf0bf10813e5757e397c4fb87ec266b5753be83d91 WHIRLPOOL ceef7613bdb4124517082be14589fd6a436c4bc735a949d5a74110507d25f3dc91567858188b0b62a545dba59ca2214c8a28edfdc01643220d39864db8eefbf2

diff --git a/dev-python/python-barbicanclient/python-barbicanclient-4.0.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-4.0.1.ebuild
new file mode 100644
index 00000000..10376fa
--- /dev/null
+++ b/dev-python/python-barbicanclient/python-barbicanclient-4.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for Barbican API."
+HOMEPAGE="https://github.com/openstack/barbican"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
+"

diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index b99d489..e3c9961 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1 +1,2 @@
 DIST python-cinderclient-1.6.0.tar.gz 194134 SHA256 b00b7ffc3394b7ae3f8804a10877f7c980ff65f66d7b0d4b51bf4526933951b2 SHA512 421c665be2d410f511c751687df438dc268c4d2ae5ca83d8ee2d37d3b61cd08f718851c65338e14c8cbb8304703b5f9acf98611246ca6866c5a31cc3dd86e39b WHIRLPOOL 5e3f3326ce1ccd1cb555303b0d9f5ede0cfd4c329a490f79f88ad04e2dc9d6123d294b09d393a2fd7274f5b7a3696efeabdade9b39bd93da5b7e9d421b0e0fba
+DIST python-cinderclient-1.9.0.tar.gz 231331 SHA256 17cab946a64808404c6c6840d43487a5082a730cc517d0ebbe6824b54a267fb7 SHA512 be9c976ad9ef6005100f51bda75234253f9394aeda9ccc28f0b673bf39f5856fae2f23208e05057a58f2155d1b4fb728ec178b7fab21abca9eb88fe2ac82c018 WHIRLPOOL 88bc1c8492f0f508f4332b9cba1dba27c9184ddabd6d9f8131b3760d8229166fd10e9f366199155b4f67adde8ab13eb949cf1af0a9636d44f175e762dfde95c7

diff --git a/dev-python/python-cinderclient/python-cinderclient-1.9.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.9.0.ebuild
new file mode 100644
index 00000000..78dbc47
--- /dev/null
+++ b/dev-python/python-cinderclient/python-cinderclient-1.9.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}

diff --git a/dev-python/python-designateclient/Manifest b/dev-python/python-designateclient/Manifest
index fa576d6..fc79639 100644
--- a/dev-python/python-designateclient/Manifest
+++ b/dev-python/python-designateclient/Manifest
@@ -1 +1,2 @@
 DIST python-designateclient-2.0.0.tar.gz 63215 SHA256 516e883b74726eae0b24755dff682857bb6b11b26dc06eb231ffee5a696e48a8 SHA512 e5c10915d6f5619949b385096e2bce02e1115c4842ae315ffbd4488b29703fb0a038628818c80364c32461b4f9eeb083e2877c38a15bd4f6ec323942957c75bc WHIRLPOOL 732e8d4378074fb8c78ab40659fae8eca7a81fe831714cd1d62588d784be66e43d80fceb5344adb679371fec47a309c2e3c984eae976a29b293ef0788d729c2d
+DIST python-designateclient-2.3.0.tar.gz 78445 SHA256 f41e533cd9eda72638ce288e3dfad1e18cfc4210bd9ca248d70939ff2fccf856 SHA512 f45194f3d04c139148bb11f16b7df0d7a701548c37d99bbac52d1f0badc2cb1ff7a7fda801a2556899fe51ae17903903214a558798e04ccb9ec4b6d994fd5d41 WHIRLPOOL 56472534b08b60bd6e48df0023c7b76beefc09fd02d2163c70721c5346c7fd13ba551cda4a2cd9a97ab6356f43d6ed14e8fcc0622b973b81631b1758253c15dc

diff --git a/dev-python/python-designateclient/python-designateclient-2.3.0.ebuild b/dev-python/python-designateclient/python-designateclient-2.3.0.ebuild
new file mode 100644
index 00000000..9962031
--- /dev/null
+++ b/dev-python/python-designateclient/python-designateclient-2.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the Designate API."
+HOMEPAGE="https://github.com/openstack/python-designateclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${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/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index d60f0d6..fa33bab 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1 +1,2 @@
 DIST python-glanceclient-2.0.1.tar.gz 159091 SHA256 77e92a256679ebc76101198482ca34dd0b636f12313c4aa92132b831064b3968 SHA512 48253d70c50ad5b671e0d662612217f76e79b2e15ec1714d578c85ffae3d6b18e019f90946d11cc90e41b981c6bb24c7f47094c046892fdee33034689631af53 WHIRLPOOL 55ba594d226a9dc9bc7d007b7f3bdabed5be084f0c204b93ad604e854ed9db27f180817b8ec0510c06586bcbfc8b7998b20f7777f61ac23fd56550ef08d91abb
+DIST python-glanceclient-2.5.0.tar.gz 157864 SHA256 8c510a089fb4dc8355d5db0de608361888b5e4e0c81e0d153ae1b1366bfb8a08 SHA512 1a702666c9430577e4d6018c95df59600bdb644b224708aaedcef3308d6209f9bc60d5f228126554b27e723414703ef7fe20d0c69058882748eb1e59d63afaa2 WHIRLPOOL a96a7b49ffcd280c085669d4c04a73ad9f6023f774cc56db8142ffb3f52fc68ee0a1eeb047aa31731b15b37f70bb5c1de178172097ae704b05d5e66c2e08b16c

diff --git a/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild
new file mode 100644
index 00000000..14a4844
--- /dev/null
+++ b/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Glance API"
+HOMEPAGE="https://github.com/openstack/python-glanceclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.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}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
+	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/warlock-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests && einfo "run flake8 over tests folder passed" || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/python-heatclient/Manifest b/dev-python/python-heatclient/Manifest
index 13e7bb5..55b88c5 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1 +1,2 @@
 DIST python-heatclient-0.8.0.tar.gz 121399 SHA256 5cd1c855ee21f18bfffbc7269e40c417b953d0855aa3cc8b56d778b8612467d5 SHA512 c17d445e646c3fc2f10bb622ba2a38299182e0a7841e0dae0e7c4482bc4d8868569b2204c18dc98456507d6f5abbf64db0b8e06c21bacf360883b24bfb01efc1 WHIRLPOOL 9c0b41d01458bcb3b26be163fb1e9e557b37fafc26d9698df73cfe722f8e02b991f36731e42bb5de88f2c7c3c0d86ee7154e1da76c99755cf9b7dcea0d79718e
+DIST python-heatclient-1.5.0.tar.gz 176692 SHA256 42c253671c98c92dbd379b471f498000739e711afc2831d32b258a59bc48ee12 SHA512 656daa6a9f515f2d3b1f7fb7f3b4f54b0fc4798156b399486a8e950526be97707784521b252bf4551eaee6469df9aaff62cb98c935c215e149a77347c74a6138 WHIRLPOOL c28bbc4bcfeb47ad9fa56ca1b75a6e5c36ffa437ae3bb7071279bc5f34c96051d9dc0ac6bd44913444c1e02ee2548096c27ad17f1f9b3b7c25d32f921856eb79

diff --git a/dev-python/python-heatclient/python-heatclient-1.5.0.ebuild b/dev-python/python-heatclient/python-heatclient-1.5.0.ebuild
new file mode 100644
index 00000000..129eeb4
--- /dev/null
+++ b/dev-python/python-heatclient/python-heatclient-1.5.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Orchestration API Client Library"
+HOMEPAGE="http://www.openstack.org/"
+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="doc test"
+
+CDEPEND="
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.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}]
+	)
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init
+	testr run || die "testsuite failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.5.0.ebuild
index 0ee177f..395b823 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-3.5.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.5.0.ebuild
@@ -49,7 +49,6 @@ RDEPEND="
 #)
 
 python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
 	sed -i '/^hacking/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all
 }

diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 880344f..7ff13cb 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1 +1,2 @@
 DIST python-neutronclient-4.1.1.tar.gz 187794 SHA256 4d5c60358272174afb019d68940f67ddad09367b2e6210e3206d19566777c293 SHA512 654a7e8d98b1b6c3fbd1a183196982ea8bb9a0a97707e7a4ddb4cde47a97e93c3356961193c305b3ab33cb8ee2273b1a941c2655e1f56a3e2a8131deaed54922 WHIRLPOOL ead87cb41f57f285a03583ca91e843a0f9c4edaefaa7020d38c949dbd56d46611f44e36c087a9684d2e87c0d236ff8124022b2afacd9b8438b6b8b6716ec9c81
+DIST python-neutronclient-6.0.0.tar.gz 205872 SHA256 a30556f8b9541e94f44a9911d9af89037710761755758a2c1598fa92809293a2 SHA512 eb9a71fee8e551d4436236bbb93ea03496f6094b6b444a1624a98bc85c26122b5bbe3a935fbc8a1f921b6449a481deaba284645ca62c56e3771d57bf526c6d8a WHIRLPOOL 966ced0e9f195b2e71cf7944f3eeb699ef59c7ca7a4df4cb2835dbb1d7f8c47f4483ea51deb974b56c43ceec8b52f92778d56f7d89aec3d0c5fee74b1dc13048

diff --git a/dev-python/python-neutronclient/python-neutronclient-6.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.0.0.ebuild
new file mode 100644
index 00000000..debff5a
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-6.0.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+REQUIRED_USE="test? ( doc )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+	!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	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() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D%/}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index 9a6ddc0..4afa29d 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,2 +1,3 @@
 DIST python-novaclient-3.3.0.tar.gz 270526 SHA256 3674e9a9e3d2d9cff4a7e625e299780195e04df52361a58d94e7db4fda88739c SHA512 218e176f105211c77e34ade6ab88012d880f836afcb60628eb470d07f36cba4f051fee92f9068e41cb07124a36d4ca4db48b96ac52edd36963489ded5e974741 WHIRLPOOL d719debd25151b19b7b308dc498faea247c51dcea3ba79f0d803be5114f888dd412ab10d49c5c34018890df7b51a7eba8c15b1c59ac831f6bf80a33a87b120e3
 DIST python-novaclient-3.3.2.tar.gz 271509 SHA256 6eba078c998d676f598925d9e6160f781e56f4b4d2afa0116c0134c326d5df49 SHA512 b2aa678aedad60e168b6adf5eb79ae403b1d6723ba1ff5c88bd51097b67bcbd5b1aac06f68f2040059b16bb39951399c1ced7033f8f6f9c271173b2d0ca921e5 WHIRLPOOL cf472691851340c69c1cd53987b4cfe3fe290ec64c14a939badcbe92ecddfcf06a68056badea5732d1a96b0aaad2fe828a02b34038f90c573f2dcf0dd23f9dea
+DIST python-novaclient-6.0.0.tar.gz 288335 SHA256 68fb4e75012a66d23198ca9c6cdc425cd9e0ce750bf759af6cd48fdb19ee6068 SHA512 b14a2ce3471e8853f9ccd67ed95779b8c9b9d6152eafb777c5b48c188f68a3046ff3886c02b76e1b04a4e9d7abf9bc6665f99ff6819fd9b0ee69fe4991dafde6 WHIRLPOOL b5e6853eb9147724879eceed8d08bacca6d2ecfca9527a49fb5fc4d0b31566bb9c9ca1597e4dfaf3dd6a15ce28ad145afc584f0cf0837c65cee17c38ea54cd5d

diff --git a/dev-python/python-novaclient/python-novaclient-6.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-6.0.0.ebuild
new file mode 100644
index 00000000..3164de1
--- /dev/null
+++ b/dev-python/python-novaclient/python-novaclient-6.0.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+		!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+		!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+		!~dev-python/python-glanceclient-2.4.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/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run --parallel || die "testsuite failed under python2.7"
+}

diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index c79c4b3..d49839b 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1 +1,2 @@
 DIST python-openstackclient-2.3.0.tar.gz 329808 SHA256 5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1 SHA512 efc58927c109ea227322371f6a6ef165be2878a8559f32b315b73a2d70c1f0aeb96f7dd2fa91b765ab85462a566569d412b13411aa859fef3b8ae5e73d2eceab WHIRLPOOL 92fb3d2834bbb54f16e0f7760f223e5e94e3b933ca016c7b80eb6562af25a9fe1d3428b02fe2c7e1cf413cef6a8eb1abaaae2814acd8914b1bf1f7f8793b403e
+DIST python-openstackclient-3.2.0.tar.gz 431887 SHA256 4f66ccbdb2b3de71d69fee305a9585435cdaa0f9e523240c2f6c756555283c7a SHA512 819e4de30322c3c057799467eb2d9ffa3ef5c5060e49d7fb2c023a077f49c86e6c5626acfd01288cfc5dfdc551ef2702cd61c7c10721c00af579aaee72182f99 WHIRLPOOL 0aaccf7f460e5932257208aec64824271af70db0f64ec44f1f0c644962c77788afc61d7c5e7777d6fd65bdaa45c3c339e8a682b8705cc668473e2d15167c6ec2

diff --git a/dev-python/python-openstackclient/python-openstackclient-3.2.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-3.2.0.ebuild
new file mode 100644
index 00000000..396fa87
--- /dev/null
+++ b/dev-python/python-openstackclient/python-openstackclient-3.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack APIs"
+HOMEPAGE="https://github.com/openstack/python-openstackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.20.1[${PYTHON_USEDEP}]
+		!~dev-python/os-client-config-1.21.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cliff-1.15.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.9.4[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.1[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# clients aren't actually needed
+	sed -i '/client\>/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "testsuite failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index a7d7501..91338f3 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1 +1,2 @@
 DIST python-swiftclient-3.0.0.tar.gz 134376 SHA256 824b8f204c5a7764de51795256e4175fdcd655ae4df85b8ae6e6ea9ec0b41f68 SHA512 4e81504876fb81bf74c3a3e034958c4783a4a9c2c426b7ae849e1968f98d9886c2299c2e67a2b366d6d4721b4635cef90ff49201ba9a4c86da9d61bfb96fa350 WHIRLPOOL d48902f331d04b3250dc6a90aa44f31d403012e10e1617a2fa52cb05b3d615293efc65a4f35872ec019254c096e44a79544d314cd1d4e6065e8e093febb3b3b7
+DIST python-swiftclient-3.1.0.tar.gz 155598 SHA256 7bb5984862b85ba2a18c16b4dc6af2fd14272871ad165eec47e9da111ab3fb9a SHA512 693fcea571721e2f578a21b05a3c908dd6621bcfdd70f09003a981e233e2b3061318d60e301dcfdbb03d08a326ca3f14f3297d8226b5a0a6d78f88b1a72b2ea4 WHIRLPOOL eaf7c4e78e2b642fa124c5044136fffe530450cbabf5bc4132e7d7e2f93d06dcfa2f6a4751e32a6ba1d90abf060ffd9eec679d3ece973594de9650e53557ee5f

diff --git a/dev-python/python-swiftclient/python-swiftclient-3.1.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.1.0.ebuild
new file mode 100644
index 00000000..3668561
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-3.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		dev-python/oslo-sphinx[${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/testrepository-0.0.18[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/oslo-sphinx[${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}]
+	)"
+RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
+
+#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
+
+python_prepare() {
+	sed -i '/hacking/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2_7"
+	flake8 tests && einfo "run of tests folder by flake8 passed"
+	flake8 bin/swift && einfo "run of ./bin/swift by flake8 passed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index ba95a1c..93ba2e8 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1 +1,2 @@
 DIST rtslib-fb-2.1.57.tar.gz 30746 SHA256 bca0fb05e3d96fdfc8495a6b1e82d6ff92190c610863c2ec6400bfcf3120361c SHA512 0b46b17498bf2a5f4853c9d989bf6a192280d95416b195c0c9eaede4759612b6c3800fb1d3f44979c10e95ba0c3f06dd9756a805d63f61b292a611003f48059b WHIRLPOOL b707f5f4978dced01e5a92a2f709010925cdfa3ee0485f7bc677ad81df6f0fc177f03ee075763e159990e4f7fbf60ab51c030d309cb2e2bc329f9557b6658145
+DIST rtslib-fb-2.1.58.tar.gz 30706 SHA256 5806f9903557907787abd9c8b9dffb2b312e6c5e3ff40d50d26b10c37b118d47 SHA512 a3f4c22d42b4b76bb9a5ce2d1027c4964385fa427ec55cb92f1acb0f9b647fc0788307354144534e3f216fc12f3fc1a0a55fd4454225324aa13488f21df092c5 WHIRLPOOL 0c773035c7e8502550f2835ae92ed3a31a2bb05661b12c6e4fe59a0f7065a3dc2d08962af69a7e5f07f4a0a4736d5d9e9204c47b6af6e478500c435d642d8324

diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
new file mode 100644
index 00000000..c3038c1
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.58.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/agrover/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	!dev-python/rtslib[${PYTHON_USEDEP}]"
+RDEPEND="!dev-python/rtslib[${PYTHON_USEDEP}]"

diff --git a/dev-python/ryu/Manifest b/dev-python/ryu/Manifest
index 9bc61f4..740b24e 100644
--- a/dev-python/ryu/Manifest
+++ b/dev-python/ryu/Manifest
@@ -1 +1,2 @@
 DIST ryu-4.0.tar.gz 1344663 SHA256 bf6d1ad6977fb0b9ee01567fbb7a4ec28d70d14bff8fe4370b617b1228f1ee12 SHA512 fbc0f3f903098c9682215eb8fb99cedeeb29b2bdec94801c3832bbf90e7beaf7aa7173ccb87959846c4fe23d21a8390b6672817aec2cc6bc75ef20a376944154 WHIRLPOOL 32ed4b2f23b09785c28ad99b45e101750866f48ffc57294683db25af88ab19e63966eb9e6c649d3af1160e8381b785b01a3ed95de24929f45db2124ec9e00e59
+DIST ryu-4.5.tar.gz 1368324 SHA256 ef9ee003e4a3d37222119175d98c64f4684124c2c6cdacb16e67b308cd71e8e8 SHA512 5b109d5e88a6a6384ac59597677978e974e5747d2bd9324cc143ee5e29823a76c2e2d0354024ff6680ff090bff129933d6a3bdc227b82d0b157e1942950e2370 WHIRLPOOL 8918aabdf19f45bf47d7dee53003c2b52fcc596a47183531cff091877fa37f29748a15dcdb783161c5b5fe1f71cb0024a6ee210f54f1fcab0026cadf2a6ad815

diff --git a/dev-python/ryu/ryu-4.5.ebuild b/dev-python/ryu/ryu-4.5.ebuild
new file mode 100644
index 00000000..48fd9d0
--- /dev/null
+++ b/dev-python/ryu/ryu-4.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Component-based Software-defined Networking Framework"
+HOMEPAGE="http://osrg.github.io/ryu/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]"
+RDEPEND=""

diff --git a/dev-python/stevedore/stevedore-1.17.1.ebuild b/dev-python/stevedore/stevedore-1.17.1.ebuild
index 7c64dd6..6b88faf 100644
--- a/dev-python/stevedore/stevedore-1.17.1.ebuild
+++ b/dev-python/stevedore/stevedore-1.17.1.ebuild
@@ -43,8 +43,7 @@ RDEPEND="
 
 python_prepare_all() {
 	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -e '/^argparse/d' \
-		-i requirements.txt || die
+	sed -e '/^pbr/d' -i requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 

diff --git a/dev-python/taskflow/Manifest b/dev-python/taskflow/Manifest
index 6dcfcf3..74bd614 100644
--- a/dev-python/taskflow/Manifest
+++ b/dev-python/taskflow/Manifest
@@ -1 +1,2 @@
 DIST taskflow-1.30.0.tar.gz 1047559 SHA256 ad7aec6756b1cf26d11f1971ee50075d42024cd8b1ce4d59f469791339c3b51e SHA512 638aa8264d2402a2cc0100f7ea742e0465f2c772816b56c60508d38ac42ecd35f5a228227706f3d223320c249de910fe19866e3f4b4d27fd93c30fa9657ada58 WHIRLPOOL 7d81b340f2be1d978450d2966730a4ee3d251700b03fea48014a4a248991aadb137af728e2936436e62745cc88cb9a7879fe92bb4a2873106cdce17ffe618e35
+DIST taskflow-2.6.0.tar.gz 1052292 SHA256 be3ddc948a1e0cc1d65376181dea64478b4833cc38a7552350100fa42abdee66 SHA512 b330f46f0d7b8eb91772787866c1a45a5d8feb61ac0beb5f05875190779460349ff579543202b50c66dbe59266b74b968a1a1e5a7885fd44d82ab600fd0a7033 WHIRLPOOL 03e00924d618a369d14aec1228fb4cd40ab23cb352d07d3a5e823f2ef342526825796a37ffd4423fc030638e7ee1c5f641866fec19e28b11ff3d0069837aae70

diff --git a/dev-python/taskflow/taskflow-2.6.0.ebuild b/dev-python/taskflow/taskflow-2.6.0.ebuild
new file mode 100644
index 00000000..2159cc1
--- /dev/null
+++ b/dev-python/taskflow/taskflow-2.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
+HOMEPAGE="https://github.com/openstack/taskflow"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${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/automaton-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"

diff --git a/dev-python/tooz/Manifest b/dev-python/tooz/Manifest
index 6a42ff8..6ed934c 100644
--- a/dev-python/tooz/Manifest
+++ b/dev-python/tooz/Manifest
@@ -1 +1,2 @@
 DIST tooz-1.34.0.tar.gz 64439 SHA256 116116ab5971dfed13b81176a8f9e353f46ae687d8ff94124813c5f6ad274fa4 SHA512 2b5165b8f9c92ee24be005ef4e9036b8493379b78ae14dbdc92e6cba48ca79f59da70812c806a9ce45b0335779d96712b8a71fe565966fdf647ab908392d54c7 WHIRLPOOL e247218a2e5911605134126d05fa566217f6e894eecf0e4aed0c523bf16c976efe57cfa9d2c72e0e27cb111c7c9cacb1df0aede8f24e270b9107f2b1ad60359a
+DIST tooz-1.43.0.tar.gz 68760 SHA256 6508d5089ecb76e25c51bd682ece30b2d12237b97f82f75b76baf9e60bbf2173 SHA512 0772c09f934a67d0b5b257203a050b63d63d8bd8556bcb8c66a895b17840e1bc42659da0aa38a4a2671adad13fb6f22abf54a04d9821904c998d84f858aa0ed2 WHIRLPOOL da65d912104cce892ec21c9de449f64c80ef4b1bd5c39563e40dd2526a5b75a7b548ab6b535f39ab4d610c92c69c844f496e1d0d2e55f5197003e5040ad10382

diff --git a/dev-python/tooz/tooz-1.43.0.ebuild b/dev-python/tooz/tooz-1.43.0.ebuild
new file mode 100644
index 00000000..cc1f1fa
--- /dev/null
+++ b/dev-python/tooz/tooz-1.43.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library centralizing the most common distributed primitives"
+HOMEPAGE="http://docs.openstack.org/developer/tooz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.8.9[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	"

diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index f81a6bb..f5d0b4d 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,3 +2,4 @@ DIST urllib3-1.10.4.tar.gz 138538 SHA256 52131e6a561466f1206e1a648d9a73dda2a804d
 DIST urllib3-1.12.tar.gz 151072 SHA256 0ea512776971fe4e76192600fe41e4e7ee96b4b9a5b15aefc1ac31d2a63872c6 SHA512 44f1cf9c5d5538e35d026551a2d1dc7119786c1148b9a769fa9f652f0368e996512962c6245c92d1f4bb1d8e816e2fb0ffebeb0060b01f92b2a5d6e01d15426f WHIRLPOOL d386e4fb47b2ea4d78d2ad690c9252d6be1b3f5a624e20670e22c9b3a28dc910e3d5ecd24ca54d8f8337f8e9a9875208efce06952cd392d9c8254257eadeee70
 DIST urllib3-1.13.1.tar.gz 156259 SHA256 6eba1d713f8552e37ac4081c6bdf7be9f5a79f58447aed762bf24cc34c5e3983 SHA512 663c0a10b0e6b8a2c337cf799e45b8d949cbf0f542e22204fe31af193c7275c499ddf0ac3470152cc51bed56a0f5b77f1897140801b732773f606e77e8cea420 WHIRLPOOL d0c3ea06f7a8180eca9b22197ddad6f04ea9b9c5fe254ade00e12fb9a5ffeaa9264a5a160cc49ebd87a1822ba13af22bef357a241b7b76b2281f400f776e309e
 DIST urllib3-1.14.tar.gz 161497 SHA256 dd4fb13a4ce50b18338c7e4d665b21fd38632c5d4b1d9f1a1379276bd3c08d37 SHA512 8c315b442bc7454e421f2c801cc2bbfc011fb2eb5dcbd2ff7d6078dab0bb5254e3e1489496758cec190ebd0c249962fa1fe24fe6535e844a681350e9d7353562 WHIRLPOOL 3be475d5591328d304bbf48392ab563a7d5013907c96298abaf34b06a7a16fe81d56a03f6a73d50c9679334b140f00789a71a918f2ea1e6951e5351324852f3c
+DIST urllib3-1.16.tar.gz 179763 SHA256 63d479478ddfc83bbc11577dc16d47835c5179ac13e550118ca143b62c4bf9ab SHA512 646b35a9a4490b2d1f068883a29cbb5be5050a6eea7bb7842f77cd666b7f88101a7612e8eb45ae0eb900d914518db5202f548ab688b8db1c20ed248ba2edac66 WHIRLPOOL a4a813a5fc560a1487a87e492185122ffe8a41ba263e3c5e5962a48b9f4577a6360fa5d47d474f3c97a56e7ef99b2854c0f742075c05b88461f41d69e10c7a04

diff --git a/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch b/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch
new file mode 100644
index 00000000..9a8a11e
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-1.16.0-unbundle.patch
@@ -0,0 +1,17 @@
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 0a2dac3..b7ad412 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,7 @@ setup(name='urllib3',
+       url='http://urllib3.readthedocs.org/',
+       license='MIT',
+       packages=['urllib3',
+-                'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
++                'urllib3.packages',
+                 'urllib3.packages.backports', 'urllib3.contrib',
+                 'urllib3.util',
+                 ],
+       requires=[],

diff --git a/dev-python/urllib3/urllib3-1.16.ebuild b/dev-python/urllib3/urllib3-1.16.ebuild
new file mode 100644
index 00000000..d86a98a
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.16.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="https://github.com/shazow/urllib3"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/ndg-httpsclient[${PYTHON_USEDEP}]' python2_7 pypy)
+	$(python_gen_cond_dep 'dev-python/pyasn1[${PYTHON_USEDEP}]' python2_7 pypy)
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=www-servers/tornado-4.2.1[$(python_gen_usedep 'python*')]
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/nose-exclude-0.4.1[${PYTHON_USEDEP}]
+	)
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	"
+
+# Testsuite written requiring mock to be installed under all Cpythons
+
+PATCHES=( "${FILESDIR}"/${PN}-1.16.0-unbundle.patch )
+
+python_prepare_all() {
+	# Replace bundled copy of dev-python/six
+	cat > urllib3/packages/six.py <<-EOF
+		from __future__ import absolute_import
+		from six import *
+	EOF
+
+	rm -r urllib3/packages/ssl_match_hostname || die
+	cat > urllib3/packages/ssl_match_hostname.py <<- EOF
+		from __future__ import absolute_import
+		try:
+		    from backports.ssl_match_hostname import CertificateError, match_hostname
+		except ImportError:
+		    from ssl import CertificateError, match_hostname
+	EOF
+
+	cat > urllib3/packages/ordered_dict.py <<- EOF
+		from __future__ import absolute_import
+		from collections import OrderedDict
+	EOF
+
+	sed \
+		-e 's:\.packages\.six:six:g' \
+		-e 's:\.six:six:g' \
+		-i urllib3/util/response.py urllib3/response.py || die
+
+	sed -i '/cover-min-percentage/d' setup.cfg || die
+	# Fix tests
+	sed -i 's/urllib3.packages.six/six/' test/test_retry.py || die
+
+	# Reset source of objects.inv
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed \
+			-e "s|'python': ('http://docs.python.org/2.7', None|'${PYTHON_DOC}': ('${PYTHON_DOC_INVENTORY}'|" \
+			-i docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Failures still occur under py2.7.
+	# https://github.com/shazow/urllib3/issues/621
+
+	[[ "${EPYTHON}" == pypy ]] && return
+
+	nosetests -v \
+		--exclude test_headerdict \
+		--exclude test_headers \
+		--exclude test_source_address_error \
+		--exclude test_no_ssl \
+		--exclude test_ca_dir_verified \
+		--exclude test_verified \
+		test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index eecbcdb..b9f0716 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1 +1,2 @@
 DIST websockify-0.7.0.zip 316823 SHA256 a1d1f2a188f34622ae6349c2cd19067a9a6f89ff3d35e249559ffa9c75a9d05b SHA512 642a65239fbaa409127e18f637cbcc815af0e34b89573517c5fef0b2c5af71442ab2ff563ff0cc7fcfa41c87711b9d478c708ca4424bb08d288537f0f1b4b4ef WHIRLPOOL eb331874712f2ac98eff4749b7b2c76ee5976a5488b7db49006624a88a019a7813da2ccd45b68bc4930cb43e9b2c69b2a4cbd6fd3ab2ae02c2e9ea3dc131f4cd
+DIST websockify-0.8.0.zip 319105 SHA256 fc0cadd72c22a245ddd0d418e68cab07c4355754a070e39371c86ad92980ae0f SHA512 625cecbf37149c82edd2ebb9cd1f1a20a35415f7c7696ebe88b2e86563a170573959f9ede2c7a1db82ace9edddfb9d2da6e2e20d29fd916ae238235880d9a943 WHIRLPOOL 39e19a253b518b4cf53cce27a293317e47eb4159fd0bac21324649dfc872bfa3372a1043b4d4f976a72595cf5be84a7f88307b123af6938130339cdc99b76d56

diff --git a/dev-python/websockify/websockify-0.8.0.ebuild b/dev-python/websockify/websockify-0.8.0.ebuild
new file mode 100644
index 00000000..bba0c42
--- /dev/null
+++ b/dev-python/websockify/websockify-0.8.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.zip -> ${P}.zip"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"

diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
index 93a6fc4..1074816 100644
--- a/dev-python/wsgiintercept/Manifest
+++ b/dev-python/wsgiintercept/Manifest
@@ -3,3 +3,4 @@ DIST wsgi_intercept-0.10.2.tar.gz 30369 SHA256 0294469aa07bbfcf3a490cace2ce54cec
 DIST wsgi_intercept-0.9.0.tar.gz 28865 SHA256 55b01e89a8752625ee94c13f2d125a73a61ee924f4cfd982983ca28c0a7addeb SHA512 3964fec587408b44d5ea0371b279d7686edaa98591438e5d679f8b954396f93408df13a33c809b6d0338a26da2ad3bad666bf66646da585ca73461a0beb1e439 WHIRLPOOL 090a9e607dcd9c56442ec0aa2f0f4c4aeb6c8764777fa29febf89c53e1fd687c2477db5e818480b4d90b9f846205a592125913f4ac0fdac5ce199a16dedb10b1
 DIST wsgi_intercept-0.9.1.tar.gz 29391 SHA256 4eab9fc11fd6abaf74791b6a5a6dd81bdc599d1c385fac834340868489a61d22 SHA512 12c1abb3c88831f90c15e11f8ab45d1262b3547a15192a1fe8ad766bbe36959a3bb4cbdb33cf303ccfd4425e8a355fd73ae6aef4afbf1a1d10f7b753e74a7b1f WHIRLPOOL e901b1719f0cbef675c2b7a0fe73b91a28d1d1efc373c99494c9648d77f1b8145e194d37eaacbbfdffa6f599ea365ef456b9c6fe5ee5d5f32a214628300db660
 DIST wsgi_intercept-1.1.2.tar.gz 25517 SHA256 f42772dd0965844b1d0ac2ab03d57f941b73452a8bbcab6d03ad405602f15291 SHA512 59dd14c2c012ff5bc951f03b7ce7a65e70becce300a265e45ed46932bcdc58db89926df773cba846e93d94b1d7458fc7935d8b86b04fa2af81a0e6afd7f1e743 WHIRLPOOL 1a8e6be795836f2c59bcaada1e403730ba116354f6cf114f88a7c15392970e242dd5f340c80b0cbb9a2092b822e693bed0805073f43053369c03e69c7f2b07a3
+DIST wsgi_intercept-1.3.1.tar.gz 24596 SHA256 5de354a99ca2b400ae302e423f6bb6c1d2a01767fdcc8e5589340d3e542eb97e SHA512 6b435246b20694437ec0c79b9675af3a24c43b77e3b1ca6b8ede473c2077259197ada5c4dcb9f197331975ed97e7d475792f9ab4a7da2aa9c657203c55662479 WHIRLPOOL aebe450bfe7aaf7409acc31eaee3a17a565c7b7460c9eed64c0f482cf2d074de325e99c3cf023b642465399803465ea59bff5ed65d255694cbee19cc2aa43cf8

diff --git a/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
new file mode 100644
index 00000000..7fbde76
--- /dev/null
+++ b/dev-python/wsgiintercept/wsgiintercept-1.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+MY_PN="wsgi_intercept"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="WSGI application in place of a real URI for testing"
+HOMEPAGE="https://github.com/cdent/python3-wsgi-intercept"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-1.11.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mechanize[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# .pyc files cause failure of tests
+	rm -rf test/__pycache__/ || die
+
+	# Req'd to avoid file collisions
+	sed -e s":find_packages():find_packages(exclude=['test']):" \
+		-i setup.py || die
+
+	# Disable tests connecting to the network; Bug #550710
+	sed -e 's:test_http_not_intercepted:_&:' \
+		-e 's:test_https_not_intercepted:_&:' \
+		-i test/{test_urllib.py,test_http_client.py,test_requests.py} || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html//. )
+	distutils-r1_python_install_all
+}

diff --git a/dev-python/yaql/Manifest b/dev-python/yaql/Manifest
new file mode 100644
index 00000000..d7b0e8c
--- /dev/null
+++ b/dev-python/yaql/Manifest
@@ -0,0 +1 @@
+DIST yaql-1.1.1.tar.gz 68366 SHA256 2e06a56e39da21765306e4709cd87ec3ed366223badc95499576f0662f69a04c SHA512 07e41e58d85a357f7b980501501558d50264a7e3c9b81b0117e3bd202ac06bd562d1b4ea505a613ed11051f5e45ae1687f010a3c75d2f9dbff673f81a04644e9 WHIRLPOOL 8adef15359e80070d15022162b4b0ade6df15e6350c20d966a46109adda17b1e9e7db31a1b68a55c1b96eee683f5a06fd7c13f29656924d10556224218a6aaaf

diff --git a/dev-python/yaql/metadata.xml b/dev-python/yaql/metadata.xml
new file mode 100644
index 00000000..51c0070
--- /dev/null
+++ b/dev-python/yaql/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>prometheanfire@g.o</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@g.o</email>
+    <name>Openstack</name>
+  </maintainer>
+  <longdescription lang="en">
+		YAQL (Yet Another Query Language) is an embeddable and extensible query
+		language, that allows performing complex queries against arbitrary objects.
+		It has a vast and comprehensive standard library of frequently used
+		querying functions and can be extend even further with user-specified
+		functions. YAQL is written in python and is distributed via PyPI.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">yaql</remote-id>
+    <remote-id type="github">openstack/yaql</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-python/yaql/yaql-1.1.1.ebuild b/dev-python/yaql/yaql-1.1.1.ebuild
new file mode 100644
index 00000000..d5ac647
--- /dev/null
+++ b/dev-python/yaql/yaql-1.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAQL: Yet Another Query Language"
+HOMEPAGE="https://github.com/openstack/yaql"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"

diff --git a/net-misc/openvswitch/Manifest b/net-misc/openvswitch/Manifest
index 0f04292..efed71d 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -2,3 +2,4 @@ DIST openvswitch-1.11.0.tar.gz 2551510 SHA256 007d7d3f2deabe5a3845d1045d23b6b1de
 DIST openvswitch-2.0.0.tar.gz 2708774 SHA256 5060e2be69cce01c15f67b481482cb1a0eaa6ef5cbdbed592bac3c3ab2a390f8 SHA512 f6d36663b65d054d179e5a09a478cf45ae9510c8f3aa31bb2013aaee1b146ee21ce986bb8b9f63ac72036f94d0b415f30ab874451b661b855f46b44eaa42537d WHIRLPOOL be6ac428d5d01b751d8d6312e7e028a23160d44da62231cc84c21d42c19c8c5f6b9457c29c26e7b283db91b08a00d8b54368534a621e556c54e15c0682dad4a1
 DIST openvswitch-2.1.3.tar.gz 3080126 SHA256 43a2562fe5e8e48e997bfdb04691ffaaaefe73069b5699654538bf2f16ebfb1a SHA512 ede64d37f8bf4a475ab3e4a1e0cd83ae1f29df318f7834b804d9f334710ba43b25b9f562f8c7e91041e24f3121fd03e9e09fc789f398d352a2dceaa0576013dd WHIRLPOOL ddd6c1c733a7a139d58d0492ea8c0efa40065443f763faffd5964e5578acfe9b02ec1dd009c52843759d8a93027eb89412e768ca3e70d9ceeb0d030e791a9b7e
 DIST openvswitch-2.5.0.tar.gz 4603077 SHA256 34da54fbad503205b1a66b48ca4312679e1ce5b04763a9fb86050b2b25d66f21 SHA512 32addb6ed8d4b78e6eb5b951de6b2390dacb3a66096ff8de6020e6d42d460e1038eec43c4057707942f8043ebcad848488d09c7aabfa4599d53782a9cc69f089 WHIRLPOOL 3b879ce376268bb65858f4c4b7193c54fc43a9903029f2000cee1a4f8739eae3ed5b2ad67c57de7ecfe3028874831796bd69a1b8a0599d9dad56f1b524302c5d
+DIST openvswitch-2.6.0.tar.gz 5386102 SHA256 c6f86b47b5847e739ca1c5a80059a804cd49e2b98eefef0fdbce1c4d93c7d0f1 SHA512 7bcf02a00b94924e7931642790f40a49b86338baa63405e9454bff20b82d5a53bbc43279c223946f082d050c73ce6caedcb8a1e52979c873262bc9e8ff84b42d WHIRLPOOL d275071d3491167d3672966381403e704580797eb53fb8d8da2de3c08efd614a709d70af256172670271601d8d90a1350f1c2fae0e9236f729b6c278d5038513

diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild
new file mode 100644
index 00000000..b80877a
--- /dev/null
+++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit eutils linux-info linux-mod python-r1 systemd autotools
+
+DESCRIPTION="Production quality, multilayer virtual switch"
+HOMEPAGE="http://openvswitch.org"
+SRC_URI="http://openvswitch.org/releases/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug modules monitor +ssl"
+
+RDEPEND="
+	|| (
+		>=sys-apps/openrc-0.10.5
+		sys-apps/systemd
+	)
+	ssl? ( dev-libs/openssl:= )
+	monitor? (
+		${PYTHON_DEPS}
+		dev-python/twisted-core
+		dev-python/twisted-conch
+		dev-python/twisted-web
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}] )
+	debug? ( dev-lang/perl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN"
+MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
+BUILD_TARGETS="all"
+
+pkg_setup() {
+	if use modules ; then
+		CONFIG_CHECK+=" ~!OPENVSWITCH"
+		kernel_is ge 3 10 0 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		kernel_is le 4 7 999 || die "Linux >= 3.10.0 and <= 4.8 required for userspace modules"
+		linux-mod_pkg_setup
+	else
+		CONFIG_CHECK+=" ~OPENVSWITCH"
+		linux-info_pkg_setup
+	fi
+	use monitor && python-r1_pkg_setup
+}
+
+src_prepare() {
+	# Never build kernelmodules, doing this manually
+	sed -i \
+		-e '/^SUBDIRS/d' \
+		datapath/Makefile.in || die "sed failed"
+	epatch "${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch"
+	eautoreconf
+	default
+}
+src_configure() {
+	set_arch_to_kernel
+	use monitor || export ovs_cv_python="no"
+	#pyside is staticly disabled
+	export ovs_cv_pyuic4="no"
+
+	local linux_config
+	use modules && linux_config="--with-linux=${KV_OUT_DIR}"
+
+	PYTHON=python2.7 econf ${linux_config} \
+		--with-rundir=/var/run/openvswitch \
+		--with-logdir=/var/log/openvswitch \
+		--with-pkidir=/etc/ssl/openvswitch \
+		--with-dbdir=/var/lib/openvswitch \
+		$(use_enable ssl) \
+		$(use_enable !debug ndebug)
+}
+
+src_compile() {
+	default
+
+#	use monitor && python_fix_shebang \
+#		utilities/ovs-{pcap,tcpundump,test,vlan-test} \
+#		utilities/bugtool/ovs-bugtool
+	if use monitor; then
+		sed -i \
+			's/^#\!\ python2\.7/#\!\/usr\/bin\/env\ python2\.7/' \
+			utilities/ovs-{pcap,parse-backtrace,dpctl-top,l3ping,tcpundump,test,vlan-test} \
+			utilities/bugtool/ovs-bugtool || die "sed died :("
+	fi
+
+	use modules && linux-mod_src_compile
+}
+
+src_install() {
+	default
+
+	if use monitor ; then
+		python_domodule "${ED}"/usr/share/openvswitch/python/*
+		rm -r "${ED}/usr/share/openvswitch/python"
+		python_optimize "${ED}/usr/share/ovsdbmonitor"
+	fi
+	# not working without the brcompat_mod kernel module which did not get
+	# included in the kernel and we can't build it anymore
+	rm "${D}/usr/sbin/ovs-brcompatd" "${D}/usr/share/man/man8/ovs-brcompatd.8"
+
+	keepdir /var/{lib,log}/openvswitch
+	keepdir /etc/ssl/openvswitch
+	fperms 0750 /etc/ssl/openvswitch
+
+	rm -rf "${ED}/var/run"
+	use monitor || rmdir "${ED}/usr/share/ovsdbmonitor"
+	use debug || rm "${ED}/usr/bin/ovs-parse-leaks"
+
+	newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server
+	newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd
+	newinitd "${FILESDIR}/ovsdb-server-r1" ovsdb-server
+	newinitd "${FILESDIR}/ovs-vswitchd-r1" ovs-vswitchd
+
+	systemd_dounit "${FILESDIR}/ovsdb-server.service"
+	systemd_dounit "${FILESDIR}/ovs-vswitchd.service"
+	systemd_newtmpfilesd "${FILESDIR}/openvswitch.tmpfiles" openvswitch.conf
+
+	insinto /etc/logrotate.d
+	newins rhel/etc_logrotate.d_openvswitch openvswitch
+
+	use modules && linux-mod_src_install
+}
+
+pkg_postinst() {
+	use modules && linux-mod_pkg_postinst
+
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.9.0 ${pv} ; then
+			ewarn "The configuration database for Open vSwitch got moved in version 1.9.0 from"
+			ewarn "    /etc/openvswitch"
+			ewarn "to"
+			ewarn "    /var/lib/openvswitch"
+			ewarn "Please copy/move the database manually before running the schema upgrade."
+			ewarn "The PKI files are now supposed to go to /etc/ssl/openvswitch"
+		fi
+	done
+
+	elog "Use the following command to create an initial database for ovsdb-server:"
+	elog "   emerge --config =${CATEGORY}/${PF}"
+	elog "(will create a database in /var/lib/openvswitch/conf.db)"
+	elog "or to convert the database to the current schema after upgrading."
+}
+
+pkg_config() {
+	local db="${EPREFIX}/var/lib/openvswitch/conf.db"
+	if [ -e "${db}" ] ; then
+		einfo "Database '${db}' already exists, doing schema migration..."
+		einfo "(if the migration fails, make sure that ovsdb-server is not running)"
+		"${EPREFIX}/usr/bin/ovsdb-tool" convert "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "converting database failed"
+	else
+		einfo "Creating new database '${db}'..."
+		"${EPREFIX}/usr/bin/ovsdb-tool" create "${db}" "${EPREFIX}/usr/share/openvswitch/vswitch.ovsschema" || die "creating database failed"
+	fi
+}

diff --git a/sys-auth/keystone/files/CVE-2015-7546_8.0.1.patch b/sys-auth/keystone/files/CVE-2015-7546_8.0.1.patch
deleted file mode 100644
index 82bff1e..00000000
--- a/sys-auth/keystone/files/CVE-2015-7546_8.0.1.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From bff03b5726fe5cac93d44a66715eea49b89c8cb0 Mon Sep 17 00:00:00 2001
-From: Brant Knudson <bknudson@××××××.com>
-Date: Tue, 1 Dec 2015 11:09:14 -0600
-Subject: [PATCH] Add audit IDs to revocation events
-
-The revoked tokens' audit ID is now included in the data returned in
-the revocation list.
-
-Closes-Bug: 1490804
-Change-Id: Ifcf88f1158bebddc4f927121fbf4136fb53b659f
-(cherry picked from commit d5378f173da14a34ca010271477337879002d6d0)
-Conflicts:
-	keystone/tests/unit/test_backend.py
----
- keystone/tests/unit/test_backend.py                | 39 ++++++++++++++--------
- keystone/tests/unit/test_backend_sql.py            |  3 +-
- keystone/token/persistence/backends/kvs.py         |  9 +++++
- keystone/token/persistence/backends/sql.py         | 12 ++++++-
- .../notes/bug-1490804-de58a9606edb31eb.yaml        | 13 ++++++++
- 5 files changed, 61 insertions(+), 15 deletions(-)
- create mode 100644 releasenotes/notes/bug-1490804-de58a9606edb31eb.yaml
-
-diff --git a/keystone/tests/unit/test_backend.py b/keystone/tests/unit/test_backend.py
-index 2340645..1273736 100644
---- a/keystone/tests/unit/test_backend.py
-+++ b/keystone/tests/unit/test_backend.py
-@@ -4426,7 +4426,9 @@ class TokenTests(object):
-         token_id = self._create_token_id()
-         data = {'id': token_id, 'a': 'b',
-                 'trust_id': None,
--                'user': {'id': 'testuserid'}}
-+                'user': {'id': 'testuserid'},
-+                'token_data': {'access': {'token': {
-+                    'audit_ids': [uuid.uuid4().hex]}}}}
-         data_ref = self.token_provider_api._persistence.create_token(token_id,
-                                                                      data)
-         expires = data_ref.pop('expires')
-@@ -4461,7 +4463,8 @@ class TokenTests(object):
-         # FIXME(morganfainberg): These tokens look nothing like "Real" tokens.
-         # This should be fixed when token issuance is cleaned up.
-         data = {'id': token_id, 'a': 'b',
--                'user': {'id': user_id}}
-+                'user': {'id': user_id},
-+                'access': {'token': {'audit_ids': [uuid.uuid4().hex]}}}
-         if tenant_id is not None:
-             data['tenant'] = {'id': tenant_id, 'name': tenant_id}
-         if tenant_id is NULL_OBJECT:
-@@ -4470,7 +4473,7 @@ class TokenTests(object):
-             data['expires'] = expires
-         if trust_id is not None:
-             data['trust_id'] = trust_id
--            data.setdefault('access', {}).setdefault('trust', {})
-+            data['access'].setdefault('trust', {})
-             # Testuserid2 is used here since a trustee will be different in
-             # the cases of impersonation and therefore should not match the
-             # token's user_id.
-@@ -4633,17 +4636,21 @@ class TokenTests(object):
- 
-         self.assertEqual(data_ref, new_data_ref)
- 
--    def check_list_revoked_tokens(self, token_ids):
--        revoked_ids = [x['id']
--                       for x in self.token_provider_api.list_revoked_tokens()]
-+    def check_list_revoked_tokens(self, token_infos):
-+        revocation_list = self.token_provider_api.list_revoked_tokens()
-+        revoked_ids = [x['id'] for x in revocation_list]
-+        revoked_audit_ids = [x['audit_id'] for x in revocation_list]
-         self._assert_revoked_token_list_matches_token_persistence(revoked_ids)
--        for token_id in token_ids:
-+        for token_id, audit_id in token_infos:
-             self.assertIn(token_id, revoked_ids)
-+            self.assertIn(audit_id, revoked_audit_ids)
- 
-     def delete_token(self):
-         token_id = uuid.uuid4().hex
-+        audit_id = uuid.uuid4().hex
-         data = {'id_hash': token_id, 'id': token_id, 'a': 'b',
--                'user': {'id': 'testuserid'}}
-+                'user': {'id': 'testuserid'},
-+                'token_data': {'token': {'audit_ids': [audit_id]}}}
-         data_ref = self.token_provider_api._persistence.create_token(token_id,
-                                                                      data)
-         self.token_provider_api._persistence.delete_token(token_id)
-@@ -4655,7 +4662,7 @@ class TokenTests(object):
-             exception.TokenNotFound,
-             self.token_provider_api._persistence.delete_token,
-             data_ref['id'])
--        return token_id
-+        return (token_id, audit_id)
- 
-     def test_list_revoked_tokens_returns_empty_list(self):
-         revoked_ids = [x['id']
-@@ -4706,12 +4713,16 @@ class TokenTests(object):
-         token_data = {'id_hash': token_id, 'id': token_id, 'a': 'b',
-                       'expires': expire_time,
-                       'trust_id': None,
--                      'user': {'id': 'testuserid'}}
-+                      'user': {'id': 'testuserid'},
-+                      'token_data': {'token': {
-+                          'audit_ids': [uuid.uuid4().hex]}}}
-         token2_id = uuid.uuid4().hex
-         token2_data = {'id_hash': token2_id, 'id': token2_id, 'a': 'b',
-                        'expires': expire_time,
-                        'trust_id': None,
--                       'user': {'id': 'testuserid'}}
-+                       'user': {'id': 'testuserid'},
-+                       'token_data': {'token': {
-+                           'audit_ids': [uuid.uuid4().hex]}}}
-         # Create 2 Tokens.
-         self.token_provider_api._persistence.create_token(token_id,
-                                                           token_data)
-@@ -4746,7 +4757,8 @@ class TokenTests(object):
-     def _test_predictable_revoked_pki_token_id(self, hash_fn):
-         token_id = self._create_token_id()
-         token_id_hash = hash_fn(token_id).hexdigest()
--        token = {'user': {'id': uuid.uuid4().hex}}
-+        token = {'user': {'id': uuid.uuid4().hex},
-+                 'token_data': {'token': {'audit_ids': [uuid.uuid4().hex]}}}
- 
-         self.token_provider_api._persistence.create_token(token_id, token)
-         self.token_provider_api._persistence.delete_token(token_id)
-@@ -4768,7 +4780,8 @@ class TokenTests(object):
- 
-     def test_predictable_revoked_uuid_token_id(self):
-         token_id = uuid.uuid4().hex
--        token = {'user': {'id': uuid.uuid4().hex}}
-+        token = {'user': {'id': uuid.uuid4().hex},
-+                 'token_data': {'token': {'audit_ids': [uuid.uuid4().hex]}}}
- 
-         self.token_provider_api._persistence.create_token(token_id, token)
-         self.token_provider_api._persistence.delete_token(token_id)
-diff --git a/keystone/tests/unit/test_backend_sql.py b/keystone/tests/unit/test_backend_sql.py
-index 69fac63..51221a3 100644
---- a/keystone/tests/unit/test_backend_sql.py
-+++ b/keystone/tests/unit/test_backend_sql.py
-@@ -492,7 +492,8 @@ class SqlToken(SqlTests, test_backend.TokenTests):
-         # necessary.
- 
-         expected_query_args = (token_sql.TokenModel.id,
--                               token_sql.TokenModel.expires)
-+                               token_sql.TokenModel.expires,
-+                               token_sql.TokenModel.extra,)
- 
-         with mock.patch.object(token_sql, 'sql') as mock_sql:
-             tok = token_sql.Token()
-diff --git a/keystone/token/persistence/backends/kvs.py b/keystone/token/persistence/backends/kvs.py
-index 5193158..60f7931 100644
---- a/keystone/token/persistence/backends/kvs.py
-+++ b/keystone/token/persistence/backends/kvs.py
-@@ -210,6 +210,15 @@ class Token(token.persistence.TokenDriverV8):
-                                                       subsecond=True)
-         revoked_token_data['id'] = data['id']
- 
-+        token_data = data['token_data']
-+        if 'access' in token_data:
-+            # It's a v2 token.
-+            audit_ids = token_data['access']['token']['audit_ids']
-+        else:
-+            # It's a v3 token.
-+            audit_ids = token_data['token']['audit_ids']
-+        revoked_token_data['audit_id'] = audit_ids[0]
-+
-         token_list = self._get_key_or_default(self.revocation_key, default=[])
-         if not isinstance(token_list, list):
-             # NOTE(morganfainberg): In the case that the revocation list is not
-diff --git a/keystone/token/persistence/backends/sql.py b/keystone/token/persistence/backends/sql.py
-index 6fc1d22..d677620 100644
---- a/keystone/token/persistence/backends/sql.py
-+++ b/keystone/token/persistence/backends/sql.py
-@@ -228,13 +228,23 @@ class Token(token.persistence.TokenDriverV8):
-         session = sql.get_session()
-         tokens = []
-         now = timeutils.utcnow()
--        query = session.query(TokenModel.id, TokenModel.expires)
-+        query = session.query(TokenModel.id, TokenModel.expires,
-+                              TokenModel.extra)
-         query = query.filter(TokenModel.expires > now)
-         token_references = query.filter_by(valid=False)
-         for token_ref in token_references:
-+            token_data = token_ref[2]['token_data']
-+            if 'access' in token_data:
-+                # It's a v2 token.
-+                audit_ids = token_data['access']['token']['audit_ids']
-+            else:
-+                # It's a v3 token.
-+                audit_ids = token_data['token']['audit_ids']
-+
-             record = {
-                 'id': token_ref[0],
-                 'expires': token_ref[1],
-+                'audit_id': audit_ids[0],
-             }
-             tokens.append(record)
-         return tokens
-diff --git a/releasenotes/notes/bug-1490804-de58a9606edb31eb.yaml b/releasenotes/notes/bug-1490804-de58a9606edb31eb.yaml
-new file mode 100644
-index 0000000..0d5c203
---- /dev/null
-+++ b/releasenotes/notes/bug-1490804-de58a9606edb31eb.yaml
-@@ -0,0 +1,13 @@
-+---
-+features:
-+  - >
-+    [`bug 1490804 <https://bugs.launchpad.net/keystone/+bug/1490804>`_]
-+    Audit IDs are included in the token revocation list.
-+security:
-+  - >
-+    [`bug 1490804 <https://bugs.launchpad.net/keystone/+bug/1490804>`_]
-+    [`CVE-2015-7546 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7546>`_]
-+    A bug is fixed where an attacker could avoid token revocation when the PKI
-+    or PKIZ token provider is used. The complete remediation for this
-+    vulnerability requires the corresponding fix in the keystonemiddleware
-+    project.
--- 
-1.9.1
-

diff --git a/sys-auth/keystone/files/CVE-2016-4911_9.0.0.patch b/sys-auth/keystone/files/CVE-2016-4911_9.0.0.patch
deleted file mode 100644
index 0ea6cd8..00000000
--- a/sys-auth/keystone/files/CVE-2016-4911_9.0.0.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From ee1dc941042d1f71699971c5c30566af1b348572 Mon Sep 17 00:00:00 2001
-From: Lance Bragstad <lbragstad@×××××.com>
-Date: Mon, 2 May 2016 19:16:11 +0000
-Subject: Fix fernet audit ids for v2.0
-
-The fernet token provider was doing some weird things with audit ids that
-caused token rescoping to not work because audit ids were never pulled from the
-original token. This commit also enables some tests for v2.0 authentication
-with the Fernet as the token provider.
-
-Closes-Bug: 1577558
-Change-Id: Iffbaf505ef50a6c6d97c5340645acb2f6fda7e0e
-(cherry picked from commit 0d376025bae61bf5ee19d992c7f336b99ac69240)
----
- keystone/tests/unit/test_auth.py        | 22 ++++++++++++++++++++++
- keystone/token/controllers.py           |  3 ++-
- keystone/token/providers/fernet/core.py |  9 ++-------
- 3 files changed, 26 insertions(+), 8 deletions(-)
-
-diff --git a/keystone/tests/unit/test_auth.py b/keystone/tests/unit/test_auth.py
-index b09d9ac..6f44b31 100644
---- a/keystone/tests/unit/test_auth.py
-+++ b/keystone/tests/unit/test_auth.py
-@@ -33,6 +33,7 @@ from keystone import exception
- from keystone.models import token_model
- from keystone.tests import unit
- from keystone.tests.unit import default_fixtures
-+from keystone.tests.unit import ksfixtures
- from keystone.tests.unit.ksfixtures import database
- from keystone import token
- from keystone.token import provider
-@@ -671,6 +672,27 @@ class AuthWithToken(AuthTest):
-                               token_id=token_2_id)
- 
- 
-+class FernetAuthWithToken(AuthWithToken):
-+    def config_overrides(self):
-+        super(FernetAuthWithToken, self).config_overrides()
-+        self.config_fixture.config(group='token', provider='fernet')
-+        self.useFixture(ksfixtures.KeyRepository(self.config_fixture))
-+
-+    def test_token_auth_with_binding(self):
-+        self.config_fixture.config(group='token', bind=['kerberos'])
-+        body_dict = _build_user_auth()
-+        self.assertRaises(exception.NotImplemented,
-+                          self.controller.authenticate,
-+                          self.context_with_remote_user,
-+                          body_dict)
-+
-+    def test_revoke_with_no_audit_info(self):
-+        self.skipTest('Fernet with v2.0 and revocation is broken')
-+
-+    def test_deleting_role_revokes_token(self):
-+        self.skipTest('Fernet with v2.0 and revocation is broken')
-+
-+
- class AuthWithPasswordCredentials(AuthTest):
-     def test_auth_invalid_user(self):
-         """Verify exception is raised if invalid user."""
-diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py
-index f610fc4..6eeb23e 100644
---- a/keystone/token/controllers.py
-+++ b/keystone/token/controllers.py
-@@ -180,7 +180,8 @@ class Auth(controller.V2Controller):
-         try:
-             token_model_ref = token_model.KeystoneToken(
-                 token_id=old_token,
--                token_data=self.token_provider_api.validate_token(old_token))
-+                token_data=self.token_provider_api.validate_v2_token(old_token)
-+            )
-         except exception.NotFound as e:
-             raise exception.Unauthorized(e)
- 
-diff --git a/keystone/token/providers/fernet/core.py b/keystone/token/providers/fernet/core.py
-index 8042aab..ff6fe9c 100644
---- a/keystone/token/providers/fernet/core.py
-+++ b/keystone/token/providers/fernet/core.py
-@@ -15,7 +15,6 @@ from oslo_config import cfg
- from keystone.common import dependency
- from keystone.common import utils as ks_utils
- from keystone.federation import constants as federation_constants
--from keystone.token import provider
- from keystone.token.providers import common
- from keystone.token.providers.fernet import token_formatters as tf
- 
-@@ -145,12 +144,8 @@ class Provider(common.BaseProvider):
-         expires_at = token_data['access']['token']['expires']
-         audit_ids = token_data['access']['token'].get('audit_ids')
-         methods = ['password']
--        if audit_ids:
--            parent_audit_id = token_data['access']['token'].get(
--                'parent_audit_id')
--            audit_ids = provider.audit_info(parent_audit_id)
--            if parent_audit_id:
--                methods.append('token')
-+        if len(audit_ids) > 1:
-+            methods.append('token')
-         project_id = token_data['access']['token'].get('tenant', {}).get('id')
-         domain_id = None
-         trust_id = None
--- 
-cgit v0.11.2
-

diff --git a/sys-auth/keystone/keystone-2016.2.9999.ebuild b/sys-auth/keystone/keystone-2016.2.9999.ebuild
index 29978b0..01e73dd 100644
--- a/sys-auth/keystone/keystone-2016.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2016.2.9999.ebuild
@@ -4,14 +4,14 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_4 )
 
 inherit distutils-r1 git-r3 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/mitaka"
+EGIT_BRANCH="stable/newton"
 
 LICENSE="Apache-2.0"
 SLOT="0"

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 423c9d8..d46763c 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -4,3 +4,6 @@ DIST mitaka-cinder-api-paste.ini 2416 SHA256 3794a5e34dace60474274e93a7346662eb0
 DIST mitaka-cinder-policy.json 4959 SHA256 5a9cd9d5d4cf80a9271fd7a5146d6d5415d10f8d699a8499a39a3cde29f50bd6 SHA512 b36daa51ab7719e1a56ca760e7ec62a98fb3a88ffed96196852023abf4ffe483200c9dcb934e3c7910fc6988f9c2bb9bb914121d0d649dc3b01466f467a82fe2 WHIRLPOOL f288b6dba2593fa6deb8ad94862948899ec10f71e4751f108ec1fbfff814c3206b5c541aaac0bb7edd2fb5311639a1cd3a44586855912cb2e0e675d5ad78161c
 DIST mitaka-cinder-volume.filters 9819 SHA256 20e4833aaf18b6be247e8ea2a0f63cc509ed595ea799c3ccfbcc1d0afc5bf9d8 SHA512 7b7aacdd843b960ed075b466e0bd7d2973a7733e7db63b4cb02df4b824a9528f6b7074870bf0048674e600bed983bc66caa1914963fff4aed00e8ab40e2ef600 WHIRLPOOL 32fb88041b8f38c821896d82139ea712ea0fc0a71bd6154e31887e85baf58d80b2c8bfd6c60b21613e522fe32fb022078091fcdc74110e5c9968826ae218c085
 DIST mitaka-cinder.conf.sample 125293 SHA256 458d51db85e57beebbe054f60fccd2c159d70d7d31730558b7b3be36f7db4bef SHA512 0293211844321378843da79c5680d403c8e01fa8582d1d2b3e9e2a90548f39de949415e722039f3782cf8c96145a6de23a6db008d2eeea0c7bb56c45fd45ea4b WHIRLPOOL d71bd68a3bfb7527df1e20d4514904122acb0b598ee16dc248df8f0e633103eec1b88e73f6fa389692f65a57e1c5830eef513b2610e109bf440cb290b88ebe45
+DIST newton-cinder-policy.json 6412 SHA256 3a140134201452c52a97eae9f4c45ea30a3a21cc7a30ee619ed37ab0723b6479 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56 WHIRLPOOL f34dc729425fd82ddd9905c675fca9b765b4535dc87ec9d94acd1781c331e466f8688aace4954532e376e704cf3f1c8f4103f22e6838d4403c10311358e1ed2b
+DIST newton-cinder-volume.filters 11025 SHA256 c36bdb9abb4d97350db9971dae1c44a713911920362a0c6c5bc3cfe2701dd4f6 SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d WHIRLPOOL 7496fffec8e42eb1c3bea39563cef8d48cb607b7de1ba8a4ac9a831b6def3dcbcfdf7d485aa81f52aa9bdf7600a51ba07ff85fbf88c5c70091ad88f8c01ca37e
+DIST newton-cinder.conf.sample 50793 SHA256 5179c86590fb5c9477ec838f1ccb8cd9c481e8c31384eb7a012f296c68e0ddc1 SHA512 bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db WHIRLPOOL 7798325f7da5e236d49c8aec4218ef1e50e8e1bf8466f5fdb7b51844c5e6059868c9e4286afecefa637acd0e1df5315de2ac787947a31f4c51978529a54e1862

diff --git a/sys-cluster/cinder/cinder-2016.1.9999.ebuild b/sys-cluster/cinder/cinder-2016.1.9999.ebuild
index 4dcaa31..79b9d75 100644
--- a/sys-cluster/cinder/cinder-2016.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2016.1.9999.ebuild
@@ -168,7 +168,7 @@ python_install() {
 	doins "etc/cinder/rootwrap.conf"
 	newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini"
 	newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample"
+	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
 	newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters"
 

diff --git a/sys-cluster/cinder/cinder-2016.1.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
similarity index 71%
copy from sys-cluster/cinder/cinder-2016.1.9999.ebuild
copy to sys-cluster/cinder/cinder-2016.2.9999.ebuild
index 4dcaa31..d9580fd 100644
--- a/sys-cluster/cinder/cinder-2016.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
@@ -9,12 +9,11 @@ inherit distutils-r1 eutils git-r3 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/openstack/cinder/mitaka/cinder.conf.sample -> mitaka-cinder.conf.sample
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/api-paste.ini -> mitaka-cinder-api-paste.ini
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/policy.json -> mitaka-cinder-policy.json
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/mitaka/volume.filters -> mitaka-cinder-volume.filters"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample
+https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json
+https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters"
 EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-EGIT_BRANCH="stable/mitaka"
+EGIT_BRANCH="stable/newton"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -29,53 +28,59 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	dev-python/enum34[$(python_gen_usedep 'python2_7')]
 	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
 	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
 	dev-python/paste[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.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-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
 	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
 	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.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/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
 	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
@@ -95,15 +100,16 @@ RDEPEND="
 		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
 	)
 	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
 	~dev-python/suds-0.6[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-1.16.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
 	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
 	>=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
 	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
 	iscsi? (
 		tgt? ( sys-block/tgt )
 		lio? (
@@ -166,11 +172,11 @@ python_install() {
 	doins "etc/cinder/api-httpd.conf"
 	doins "etc/cinder/logging_sample.conf"
 	doins "etc/cinder/rootwrap.conf"
-	newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini"
-	newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample"
+	doins "etc/cinder/api-paste.ini"
+	newins "${DISTDIR}/newton-cinder-policy.json" "policy.json"
+	newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
-	newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters"
+	newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters"
 
 	dodir /var/log/cinder
 	fowners cinder:cinder /var/log/cinder

diff --git a/sys-cluster/cinder/cinder-8.1.0.ebuild b/sys-cluster/cinder/cinder-8.1.0.ebuild
index 6f7138c..cad8608 100644
--- a/sys-cluster/cinder/cinder-8.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-8.1.0.ebuild
@@ -161,7 +161,7 @@ python_install() {
 	doins "etc/cinder/rootwrap.conf"
 	newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini"
 	newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample"
+	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
 	newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters"
 

diff --git a/sys-cluster/cinder/cinder-8.1.1.ebuild b/sys-cluster/cinder/cinder-8.1.1.ebuild
index 52e541f..794ab97 100644
--- a/sys-cluster/cinder/cinder-8.1.1.ebuild
+++ b/sys-cluster/cinder/cinder-8.1.1.ebuild
@@ -161,7 +161,7 @@ python_install() {
 	doins "etc/cinder/rootwrap.conf"
 	newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini"
 	newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample"
+	newins "${DISTDIR}/mitaka-cinder.conf.sample" "cinder.conf.sample"
 	insinto /etc/cinder/rootwrap.d
 	newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters"
 

diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 9c81cd3..3f0bfa9 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,5 +1,7 @@
 DIST neutron-8.2.0.tar.gz 2820699 SHA256 8d6edde5cacd5f77bf9f95c0ecee8acfcdceafa1ae4a2dd4ad3ea7ad7343811c SHA512 e7ec025678d23a13c7cbefa4a23f0a72afeefb7118f93419b8227d74de38661024d80a5797e0b67a0322dd5118010de3ef8c8a62106ea46cff4579f6f29f0d68 WHIRLPOOL e719d16d690cb6f0e99021854358758a1dc64c50239593785dae3313e1284068ada80566bb6f064666a2b140a64f988194d32d9ed0908575bbae651b5f5db0e5
 DIST neutron-configs-2016.1.9999.tar.gz 11523 SHA256 906229c66882eb05d782a749b53b9368df28ae69eb99179cbaed2640996dd227 SHA512 95ff31ce599977b8bbd7f8783ba41c1f760a30721e8a6ea84fc8f0ecfc4f429d624dad29728d5bc026f7d76a4da6e19c0f4718fd1b58b65c50ff0470a3cf8f2d WHIRLPOOL 38868696cb444cd7c4eaaf704bfb8e2efb6486aa67a99951afd43de1a8e8ca7224e8b8592a2c28e09a7a43c1a9cf0ca02e44e05a50cc370bb9dacee873022a6d
+DIST neutron-configs-2016.2.9999.tar.gz 13458 SHA256 111e940f7da24c18673794188f348285997a0e1f250446076700902bab101f71 SHA512 42f9a685f0869c491610c66f5bc5f952b959a0a8514687007814e0ca97e27fb491460bc64eaf8fc47e982c8519b1dc9b5e2b4a3c047535b52521b3325ba38d44 WHIRLPOOL bcceb81f46d69aa02876f2d2a76c642f9b48b472dc3e6217bef48649ecfa64d535c2361d224889f31f21b7fb40bb97930ab93443abe6d9cddfd56f19d84f5601
 DIST neutron-configs-8.2.0.tar.gz 11523 SHA256 906229c66882eb05d782a749b53b9368df28ae69eb99179cbaed2640996dd227 SHA512 95ff31ce599977b8bbd7f8783ba41c1f760a30721e8a6ea84fc8f0ecfc4f429d624dad29728d5bc026f7d76a4da6e19c0f4718fd1b58b65c50ff0470a3cf8f2d WHIRLPOOL 38868696cb444cd7c4eaaf704bfb8e2efb6486aa67a99951afd43de1a8e8ca7224e8b8592a2c28e09a7a43c1a9cf0ca02e44e05a50cc370bb9dacee873022a6d
 DIST neutron-ml2-plugins-2016.1.9999.tar.gz 2031 SHA256 af1f0436924a64d9a07f0770f06d0a2e48457b45389e1ab90e42c7157797557b SHA512 b0c194ad29d7e7a44c04b74a109523044cf268ebd8cb91965759a5cbba7cef47c252f7d0ab49bf888a74b1776891b99402dd54d45fd6099734fa03afd519350d WHIRLPOOL c279518f1868c54409a28dea03f32aa60a413af9dc3ce4387034aaab6387f1c96a937c370bcab3e6e96474a12f19f3794e7b3e0482cb067fb2b060ad09faabad
+DIST neutron-ml2-plugins-2016.2.9999.tar.gz 2073 SHA256 1e12e81673168860a2d7c5172deb00a7301d0a698014113dfcfba74759ba444d SHA512 bcde3a4d5e041c0080503cdf8f60c83e1c09f873010e78f4bc9066f57b17cf69394cf71cedbb8d3819a62d9cfdd545b102f16b53c0e3deb44b1d03136c14d711 WHIRLPOOL 099e19f4ec98fb54187e100af057711db3df3f86ae117a03f38afe37b6c5135666330aeb05867331cc015e8f14bee6e34942d1cb5aec63f92e01e7d6ae69f671
 DIST neutron-ml2-plugins-8.2.0.tar.gz 2031 SHA256 af1f0436924a64d9a07f0770f06d0a2e48457b45389e1ab90e42c7157797557b SHA512 b0c194ad29d7e7a44c04b74a109523044cf268ebd8cb91965759a5cbba7cef47c252f7d0ab49bf888a74b1776891b99402dd54d45fd6099734fa03afd519350d WHIRLPOOL c279518f1868c54409a28dea03f32aa60a413af9dc3ce4387034aaab6387f1c96a937c370bcab3e6e96474a12f19f3794e7b3e0482cb067fb2b060ad09faabad

diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
new file mode 100644
index 00000000..035a2c4
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 git-r3 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
+EGIT_REPO_URI="https://github.com/openstack/neutron.git"
+EGIT_BRANCH="stable/newton"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server 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"
+
+RDEPEND="
+	${CDEPEND}
+	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/routes-2.1[$(python_gen_usedep 'python2_7')]
+	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!=dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!=dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ryu-3.30[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.1[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.2[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.2.1[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.4[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	openvswitch? ( <=net-misc/openvswitch-2.6.9999 )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	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_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
+	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
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+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 30cb67e..3a20fc2 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1,2 +1,3 @@
 DIST mitaka-nova.conf.sample 36427 SHA256 dd4c3ccab89fbe9f69df520f47d439c7ffa440d3f8b288b0ab99ac328a02ec75 SHA512 169671bde5cb5bb89065d801f80aa0d3c664af652d9ddb0c409ed3e0af2c0b94f1dbd0ebf834849e3e75dc38972935ec65a6e533d86148a7315839597d577cad WHIRLPOOL 20f95a296c3d112a532c9c5cc911d30b67472868d94bcfd52fadfd7105f9095a6b77020ca1caa6a70319548239358868d809feed363a82e4d574aceb6e5f016d
+DIST newton-nova.conf.sample 44496 SHA256 a7d9b95e67b77d0335edac760e037ad117d8c9f18c4792939ba8bb02739eae58 SHA512 ac917f0fed24c6705cbe43b4e1af31138bb656ea06f0cbe66d5b820677a47ca854abf6ca7fdf76a9a7f3a5afff758dac294ffd778d1bda82bb9f95c48d103d6e WHIRLPOOL 3c54dc8e4721f4289a8f64e9ac215c4b2e4b6afd2904fea4080659d3c292dcd942535d998b463efa4dd96a6090afb9830dfa6b9b3f2062439a8d03ec09356adc
 DIST nova-13.1.1.tar.gz 5407219 SHA256 1af74830f52deb24ca0f25acf150c2338a414ccd2082bbb31092d55d28a92a9d SHA512 18866a1fb9e1e94b91b27d72318401de755255be3b3fd374f156ccf88c84697a8f54b6f5be17842f55b5ff323f19d778213925dbeb4ae9c02225d2b3fb56b3cc WHIRLPOOL d5bd05f773b49cf309f02ea34c7d5cbbd82078a17a7aadc66ebd1ed9dd8180a036f31d74d27ea6f1af644eaa873e0e955a52b44ee66448ea93e0507561055d50

diff --git a/sys-cluster/nova/nova-2016.2.9999.ebuild b/sys-cluster/nova/nova-2016.2.9999.ebuild
new file mode 100644
index 00000000..911dd68
--- /dev/null
+++ b/sys-cluster/nova/nova-2016.2.9999.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+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/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample"
+EGIT_REPO_URI="https://github.com/openstack/nova.git"
+EGIT_BRANCH="stable/newton"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.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.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${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/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${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-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/wsgiintercept-0.6.1[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${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.58
+	)
+	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.873-r2
+	)"
+
+#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_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 "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample"
+	doins "${S}/etc/nova/"*
+	#rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+	#copy migration conf file (not coppied on install via setup.py script)
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "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-2016.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
index b37463d..9c0a605 100644
--- a/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
+++ b/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ IUSE="keystone swift neutron glance cinder nova"
 
 DEPEND=""
 RDEPEND="keystone? ( ~sys-auth/keystone-2016.1.9999 )
-		swift? ( ~sys-cluster/swift-2.7.0 )
+		swift? ( ~sys-cluster/swift-2.9.0 )
 		neutron? ( ~sys-cluster/neutron-2016.1.9999 )
 		glance? ( ~app-admin/glance-2016.1.9999 )
 		cinder? ( ~sys-cluster/cinder-2016.1.9999 )

diff --git a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
new file mode 100644
index 00000000..12e6ba4
--- /dev/null
+++ b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+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-${PV} )
+	swift? ( || ( ~sys-cluster/swift-2.9.0 ~sys-cluster/swift-2.10.0 ) )
+	neutron? ( ~sys-cluster/neutron-${PV} )
+	glance? ( ~app-admin/glance-${PV} )
+	cinder? ( ~sys-cluster/cinder-${PV} )
+	nova? ( ~sys-cluster/nova-${PV} )
+"