diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
index 33e719f161eef..1f4605cd0d3b0 100644
--- a/dev-python/django-openstack-auth/Manifest
+++ b/dev-python/django-openstack-auth/Manifest
@@ -1,2 +1 @@
-DIST django_openstack_auth-1.2.0.tar.gz 75577 SHA256 5ad78e5c92502f1abfb10fd101c023adf74a3e728bd42ed19ffea2185680f9a6 SHA512 793f0763b47574574864c16c9d79787d44c84259304587b5d2b3375de04291c5d200699297960b3b3904b959ceee31f696fef2233659db9b846c6af06fd8c251 WHIRLPOOL 37632e35beb810979ffb7878c9ffed0258a64caf4a80f61050bb054d70b56e09c9f0f13dac2ce339b87ccdcbeba779893c2ce81912b95f50d52a88b947872092
 DIST django_openstack_auth-1.3.1.tar.gz 75165 SHA256 99c6e92170656eade430d31f79ddf60e66355ff7b84caf038ab1ecc879cff9ba SHA512 cf9b4a1c526f237a23dadab4a7e6a2bd1f80a8d6d89d9b83f4d0fb6fc4df80aba68ad344662fbeaddeca2ca8ec36856af1074da383368d85d56460ed199609aa WHIRLPOOL b99b9381ce9eb1357939b750a40f86373fcbbe411d90a23e15f2d1e77dcfab45e58ac69e4e774228dc1b0dc3d3a0649e451efc0f271e904a4241b06c80b4d8bd
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
deleted file mode 100644
index 48e1247e15875..0000000000000
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
-HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz"
-S="${WORKDIR}/django_openstack_auth-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-	<dev-python/django-1.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
-}
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
index 53af5aa70a132..a9b838bba1b8f 100644
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
+++ b/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
@@ -20,7 +20,6 @@ IUSE="doc test"
 CDEPEND=">=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 		>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 		<dev-python/pbr-2.0[${PYTHON_USEDEP}]
@@ -38,7 +37,6 @@ RDEPEND="
 	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
 	<dev-python/django-1.8[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 850b7d7c9f91b..b8e62b592c1b3 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,3 +1 @@
 DIST os-client-config-1.16.0.tar.gz 53367 SHA256 d25dfb1b74552339442875bedb1e9328de66c5644b8dff0b31cc140f1d6ac9fd SHA512 a10a877dd3bc0245c6bbdaa0cb6daa5a17b519cc4fa73b368626a2e58dd44427309e1d839a3db14128ab4ed4d12fd36aaf366617ded88e14335ced8929c7f527 WHIRLPOOL 58fa3908c9ab756a610e4ce9cd99bf4f0e33602a79a773b71b8c5d5677c251d92b0e13ae33bf5d7ce9c671f672e0edef3d5780d9d806e8c72a2790f369ad5724
-DIST os-client-config-1.6.1.tar.gz 28783 SHA256 24323a33fe4ec4ff0c71a91aa16d26f4c4320f0b0234c5ac22d08f99e2f5c24d SHA512 3f71b17d70f2e7a75e6530203f84a5d32d9bb8c517d1379033ad5fb1d864bcb58c2b026bd2f177fe415b6c03498518bb5abb23df710c66ffd828619aeaf2a4f4 WHIRLPOOL 326c912ae153ad0bcbc7988743be880cb4b7be17762fee8a7ae82946f3502ca9085d0f17726c7d5f7aec4a81968d134674dfc55de3a14d91773279c66db445cb
-DIST os-client-config-1.6.3.tar.gz 25695 SHA256 c7bf7c91bd99e9501a6a2e5415ce4026f0d022d5df9d6123bc935db6108a423f SHA512 411e32c38fec5146eaf01c9fa0f7e1c5ff61c35847604ae2d3a4316a06bfc1b86be83166bf6cd0debef3a352483ee9119471e7a535ff01e264c42f516499b3b4 WHIRLPOOL 5799f8f4ac684e389888c0f5511d5c11ae39dde038d53b74deb29508b0d631cb17e72ea94bf4a343c5f7816aae5f92e19c53d490f46f40c723be69b82d543c65
diff --git a/dev-python/os-client-config/os-client-config-1.16.0.ebuild b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
index 44dc03c8d33ae..1f6d1ca1bbe98 100644
--- a/dev-python/os-client-config/os-client-config-1.16.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-1.16.0.ebuild
@@ -31,7 +31,6 @@ DEPEND="
 		>=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/oslotest-1.6.0[${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}]
@@ -40,7 +39,6 @@ DEPEND="
 	)
 	doc? (
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/os-client-config-1.6.1.ebuild b/dev-python/os-client-config/os-client-config-1.6.1.ebuild
deleted file mode 100644
index 1ef8b3f3bd173..0000000000000
--- a/dev-python/os-client-config/os-client-config-1.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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"
-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/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	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-client-config/os-client-config-1.6.3.ebuild b/dev-python/os-client-config/os-client-config-1.6.3.ebuild
deleted file mode 100644
index 0e3ba52cb6b08..0000000000000
--- a/dev-python/os-client-config/os-client-config-1.6.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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_{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 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/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	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/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 213f67bfa9747..be5f302d13bec 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1 @@
-DIST oslo.concurrency-1.8.2.tar.gz 53278 SHA256 149f4c972916f14c14c97d7be7b92ba59497c1bbd09c114ee3681bef0773daca SHA512 b73b52cef9dca932b8d0b737bd544f0a6d138de701aa9d2309d6e7698af337e4aea5cbb47c78c2ebda14abc164b8cc2b40fee6c8e92a30ee674318f436cf3b94 WHIRLPOOL 1ad6cc6dc0d339b2bec4959539fdadfb0914b1677005e250b4e74da3be97310474d20514003b0c0f50a4c6dff021ac8efa25e1f9b4502f419ab9763117caa16e
-DIST oslo.concurrency-2.5.0.tar.gz 35903 SHA256 279c7cca885f69cfb7b3b50d686cd3d7c8d50dfb8eb13aada01bf733ef5ccc45 SHA512 866c3b7ea938c2b1fed7a004a34398b99fd6b084ca3c709a8448464f4845445a16fc1a016ea30b391190625ac53bf6756509dfbee28c89000f689743622246e0 WHIRLPOOL 0067b6d3089d94c41491e5e208392bad7cd7eebb9d7ba9c5300b985cfbad924273c30ec575674ba2177fe4ba3b17fe2dcd709c778753b013989bfb285070aa2b
 DIST oslo.concurrency-3.7.1.tar.gz 39914 SHA256 254a42d9f0a5f21e9d56e5fd5ca7c3e355ba22d06ea47f6eb094155242ccc0f6 SHA512 8146f22c06fd75202d0bae75a99e77a613675359cab1f6221ff68f89035b105cc6d96b6a1d8013c983a94166d826fbeaa4502fd307af9707d0a1462db678fb4f WHIRLPOOL 03c55b366199e0c7a2af895fe0ad3a769778be58382ee5a40ce1e0220f80bb6273b8615d7fc295f1e25111487772291597dfc8a54ebdbe44deff68ab94916923
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-1.8.2.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-1.8.2.ebuild
deleted file mode 100644
index ce7705c8c8133..0000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-1.8.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/futures/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
deleted file mode 100644
index f51ff28790994..0000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-2.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.concurrency"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		virtual/python-futures[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index a8afcf38a4585..44674f1abbec8 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,4 +1 @@
-DIST oslo-config-2.3.0.tar.gz 77781 SHA256 780258c0910995a0f092b64144c160e6fe649b3fe7a058b3457f6111718a3088 SHA512 91e9c4d5c4b6c43c4e2614285714186b202a392d2e7b917aa4ce4f9c8d0c42780eb9b6ac42d3ca5d7944a79f90966edf4c6ed3b709cc6743f2bee437d513957c WHIRLPOOL e0260e8e91774104c29f46474c70167bc2567a442872bf723f7f8ad1caa52fe0b4ec9a792a8d695b114ec98db25d5ca85ec66fa840baff3a37b9f802f376b3f2
-DIST oslo-config-2.4.0.tar.gz 78301 SHA256 6116c973f53f33659285f844fa4f5bdaded8850bed0a7686b2d081e5243a278f SHA512 c63a2f361cc197c9bbf47c647abab45cb094808eeb4bc7647e80fb19ff6d6b32f59c570f63c3d0a4b18f0c5ef9dd73a37ce307b8d616398ba60d8b0784764897 WHIRLPOOL 0339b794e008b72724e9b2104f13117eda339b103715fcda1e1c5f4e001f413f324f48043dc735a9e018734c2363a9741841eb50b346cd94e6e9469bbb692b51
 DIST oslo-config-3.9.0.tar.gz 99255 SHA256 ec7bdf4a3d85f90cf07d2fa03a20783558ad0f490d71bd8faf50bf4ee2923df1 SHA512 c52d1ed16149a57748e81d4eed192636fc726a4f373cb5c5d7a1bcdbe43a0339f733f94a3d922aa85c6248749b69da06d6c671a152d301510603f50913176b1c WHIRLPOOL af288fc5b5c5fef3f6c5e128585355bf0624b9fc11519c679bb2d3399a67e5935510c677ef6d714c562197260081e9fbc7e8fc7b6cebcd7aa757eedf8b17eb2e
-DIST oslo.config-1.9.3.tar.gz 94155 SHA256 ab54e67776d9bbee86ba8cce9393ba3186e6e63de926e9797598dc35fe790140 SHA512 e4daa78bb82593806221c143b374ffcbba49bad5f6a7994703febf24918fe728fdf0e4f9c8e7eeebfd78acd3fe2b4e483d56e1249f0c81970d0f760a9e71f179 WHIRLPOOL a921908faa3a0f2a38fd5565cc7252f7dbd5c5074b48bfaee349984ccd81c20625940a9ea616f71bf3fe111c8ddb5e15fa398ba677521ba21173a6a52a70ab33
diff --git a/dev-python/oslo-config/oslo-config-1.9.3.ebuild b/dev-python/oslo-config/oslo-config-1.9.3.ebuild
deleted file mode 100644
index bcc1600c1d56a..0000000000000
--- a/dev-python/oslo-config/oslo-config-1.9.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.config/oslo.config-${PV}.tar.gz"
-S="${WORKDIR}/oslo.config-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/oslo-config-2.3.0.ebuild b/dev-python/oslo-config/oslo-config-2.3.0.ebuild
deleted file mode 100644
index b275cba270068..0000000000000
--- a/dev-python/oslo-config/oslo-config-2.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${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/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${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/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-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
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not 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/oslo-config/oslo-config-2.4.0.ebuild b/dev-python/oslo-config/oslo-config-2.4.0.ebuild
deleted file mode 100644
index 17d7d14569859..0000000000000
--- a/dev-python/oslo-config/oslo-config-2.4.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${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.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${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/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${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/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-
-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
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not 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/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 07d2f50ecbf14..d27550463e0b5 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,5 +1 @@
-DIST oslo.context-0.1.0.tar.gz 12320 SHA256 0340e533033607c18ce6a305d92f38a71fd89aaf439bf45074fd4ba9ee086971 SHA512 3e2e2cab4d5efbf8385277ac33d2babad3054b22713b3f343a47644c4420b1034e7711d353990116d2e149383293ba5a1ab1fe9247b42bf119705f5006e1a5b0 WHIRLPOOL 61b8b1be44213a8f1520c29de80adffd1341a3d3278fce0c7fc0bd50165a5b6793aaf6d62ea7685871cf20b59b922d773d3e67fbc26e3d7d13ef01773cbd8e7d
-DIST oslo.context-0.2.0.tar.gz 12726 SHA256 30bee9680a2bf5f947227cfd5996cebb17fd8c8e3013e5a594f7a7accb2947dd SHA512 afc1cf80a97bb90386750719e8314801057bf75c7cab1c2689d774bb337944cff324dc3737931f78b24bbf686ba4b5bbcb1e1ac1aae5347e700fd148556e6881 WHIRLPOOL 99dc8b37c582befbb9b32c26d8d106eb89bd9ef561193bc2cbf22c5ed0c2470f0f60a79bd06f9390866849eab2e65525ced9c8974c330ff5df2df3b5f3261e82
-DIST oslo.context-0.3.0.tar.gz 13108 SHA256 5ac98e1bf0f502de8f31d4ae397ce6b663beab26870e9f9a80d231400353b9cb SHA512 3a6cb17ec85b159d3bc496d3acfcfd7f03e92f32e5483c79be391d45a2af88ceb3c8ec2aae6714ac75f66b6664e3260a1e29c6f14c6802e8fa156f303b943ffa WHIRLPOOL c511b7470c09281402809af78ff7bd57d6ca241ab15736c876a9f705c08da8c7b5ce3dccd1867325e7b2052e83aec4fdd9fd9a32a9bd05f68ad10ccb4a9983cc
-DIST oslo.context-0.6.0.tar.gz 12684 SHA256 0655075480c7bc1f01977f3b13463746fd48498b9884a535498b0e36334e999b SHA512 8baf0de0be92bf061f6040d57c4121c1251a329844d341b333bf1c32398aa84313459e1d402dbee09efe8d1271306cc7e095d41e56f6711dec8f11bd086faacb WHIRLPOOL 616d9b76823cdfd9531203a5927160d1fd9b51364d64a70234cc91b3616bc486c5c05ef511cf4363e6c05193e598d885ac61896d7c260f143af236437f51a03b
 DIST oslo.context-2.2.0.tar.gz 16981 SHA256 8c9fbbf56d3f37cf00a039cac3455cffeb6588f61537e36a36ce9447c4be72ec SHA512 f4ccb7a5e652a4820fb40e538a631c11be5f978de2219dc923e18559d30625a31e0ca031f095ce2e0545290cdfdeb714fcf086add6b5a7eb2413ebd1e7a25875 WHIRLPOOL a9a5685dd62105ddaee9c48fdc96231ea700ab8821e7e918920afc1bdf1f1a0e36aa1845c9665bf753fb56d95005f69d4927b12aac9712f41f43e2d89682beaf
diff --git a/dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild b/dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild
deleted file mode 100644
index 909485b5837f3..0000000000000
--- a/dev-python/oslo-context/oslo-context-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.1.0.ebuild b/dev-python/oslo-context/oslo-context-0.1.0.ebuild
deleted file mode 100644
index 82e864ef7150d..0000000000000
--- a/dev-python/oslo-context/oslo-context-0.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.2.0.ebuild b/dev-python/oslo-context/oslo-context-0.2.0.ebuild
deleted file mode 100644
index 02d568716e2b2..0000000000000
--- a/dev-python/oslo-context/oslo-context-0.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.3.0.ebuild b/dev-python/oslo-context/oslo-context-0.3.0.ebuild
deleted file mode 100644
index 91d2d350a1e42..0000000000000
--- a/dev-python/oslo-context/oslo-context-0.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-S="${WORKDIR}/oslo.context-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${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/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-context/oslo-context-0.6.0.ebuild b/dev-python/oslo-context/oslo-context-0.6.0.ebuild
deleted file mode 100644
index a300cc41972be..0000000000000
--- a/dev-python/oslo-context/oslo-context-0.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Helpers to maintain useful information about a request context"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.context"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.context/oslo.context-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/oslo.context-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# This time half the doc files are missing; Do you want them?
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 31a49978e5830..3391e1da7ab8c 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,9 +1 @@
-DIST oslo.db-1.0.2.tar.gz 90060 SHA256 7092525eab0352748fc0c58a7facd3d6ae967d9130589b4afc12bfa171bee837 SHA512 77412e531f93966229c6cb866f34cb22c9b97e419f6035f0cb51a093ed218277aed85bf6b8a684b68ceb212ca9f17b0bda8073601cc4a569c3503d2dd1b59311 WHIRLPOOL ccde39e352adf7916b73b9883da1ef3aa99ce862d3dbd4b3ce86c058118cd49a43a50918237e0fb13ce7655cc6a88b3f745a5aee47af9af9e2a431dbb6cd4714
-DIST oslo.db-1.4.1.tar.gz 127166 SHA256 e1fc76e17db9552c42ddca7b95ef8dce9a2049c68b90c0130ed2e27c7a9d82fb SHA512 138bef9fb82d08be9f2d13061689f6f2af7f16e75968d51e423d58a0c6a5bcc12b13a3849dbb0862789256f737e9c3e72be844125bd2cdcfcce0df91b8694ecc WHIRLPOOL 7a98eae42a620699518415f191af4099b4d2cfc8d68392b2d5ae29e90d2f501670110bf19edfd223a55f52b078cb7c26125f7e99fded99eb52715a45afd578d0
-DIST oslo.db-1.7.1.tar.gz 134351 SHA256 21ceab26d3fe4f69e8ec3a7444cff2f13bc8a6e298cc8ffbfbe965f782931b74 SHA512 02f48ec51c4af4eaa76d2ead7c73f5748b6f8340d7d9d304334f44b718b6aa8f841cc7b48166521f6ca6d93d8ee2a33d06570ec99b8ef1b1b628b6aa6d1eb789 WHIRLPOOL 11f2aa7a5a67bc822216cb3694623d5d6121dd9fc48d78e4837c56af589a73b8b43c2b01b8be2e799993e0af8e57972503d4e404f9242dcca1582ca7b17cbba2
-DIST oslo.db-1.7.2.tar.gz 134542 SHA256 e10b1bc9b128aaeae652809e1659ec2d2f64e2d1a143b9c9c66eb9cfef66c02c SHA512 341289a7bdbf61382bbeab101b41e889ebea7297986fb765d0fbeeec027d47d78d249f8b1df3ff6fed77f3c457e75fca249826dbbe5a7417ae3b6da7f766dc5c WHIRLPOOL 7b29b0d6088ca666af931f90d0ec1b1cea9340066a9a90756f179cbd1944cd6e70d07b709718c6df2db50a7f14561004f4fd5411677484d20bd96764b06fb823
-DIST oslo.db-1.8.0.tar.gz 143208 SHA256 0688ced3c34c975e2a68139e0f91601ef43c79fb73308d75674fdc40d30a2d4c SHA512 c97fd671572dc1fdc2bff642e5680f1b8910c737d295ff8d79bed6e4886de46216361de47c1e7f0ac88315988b7d1cd448d6cffff58d906524d8f9ec86d2e582 WHIRLPOOL 70d72ac5f0baf1c01eea040908a2b35336f793b3c7968f218e83a2c1699fd7381ca84cabef9a612069020a1292c3e195047a5795ca6fd9c62b961c68393b3f38
-DIST oslo.db-1.9.0.tar.gz 143040 SHA256 028ed6a38c1ed6d39d04f3dc2d7b7e2e0aca3cf53e72e145c3c07a5a0fb80eb8 SHA512 2131b2641502007b9b42aecbcb7e83a0cc90527edda2df91d52507dc58f0418b0111c9fb22e9d8bcf40ed53588adc9f02bec1b3df5788d99c775c328c1b3118b WHIRLPOOL f6205bb8e06efaf549d433c236069a5f0432cf49d1c64aadab0617f7badf4b6ea1a7277e42da1f62428c81d33f802adbb8895daf3cbbf9bd0e3e95f475a6bc80
-DIST oslo.db-2.6.0.tar.gz 133772 SHA256 07fbfc19ce8f84de47819a66dcd86c2ce95c7203a4de68924165ffc367ef22ee SHA512 1371e56ed65923e3e624d6551e18c9623b8b3f6adbfcfa08591a6e3771432d4d9e88bd0bcd57ea76ffeb7bb49a476ed1a4b8a01969a2c0d3d317865f26a5ab45 WHIRLPOOL 50975dc63c339dcc0344fd897f4e5e2f655f9bfc7db642fd4a4871be760abecddc6bcb5ff4bf4c06500697069ed5a090e52e90107e90cbcd8ffbb07a7cfcf08a
-DIST oslo.db-4.7.0.tar.gz 141288 SHA256 d8110193efaed5fa13b22171dfc7c1bf4aae4fcd7f1bc95186279d4598a56f49 SHA512 efe699fa32feb65f84b08d97980e9ea87262782ca818546eabd683aef5b75e6c4770bb49d1c433b2ccfc6a31da76e565494dc56949e81d1e815a69dc9d148ccf WHIRLPOOL 462dfa6baa68c741d9c9b1d753d4037b9dc23b66a40e3630af1eb581624234401dc1456774b4c9ff84d2e5567398e50240241404e3a86eecbefde47abea86031
 DIST oslo.db-4.7.1.tar.gz 140778 SHA256 a39e091e4d06c757dd6249f121e2ae1babef595f451f7ff56110c0be718d0d8c SHA512 0df3a715ee7742ff51bcc2c291cff3076de33cb57e47fbe23ffc0649a85130a6f6a27928a1452b4087b3bacec9e8cc35e0a69fb012df494e7254b6ad7b349b59 WHIRLPOOL 4bb8751107705e46e164d47306e814d9864074e61e23220313bc5d9099d42a81545b352d960731b579eac69f02e3674cb032baafed8715e974ae2eeb59b354a7
diff --git a/dev-python/oslo-db/oslo-db-1.0.2.ebuild b/dev-python/oslo-db/oslo-db-1.0.2.ebuild
deleted file mode 100644
index 07f3281e5283a..0000000000000
--- a/dev-python/oslo-db/oslo-db-1.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-0.3.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.4.1.ebuild b/dev-python/oslo-db/oslo-db-1.4.1.ebuild
deleted file mode 100644
index a61c4cff8ccca..0000000000000
--- a/dev-python/oslo-db/oslo-db-1.4.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.7.1.ebuild b/dev-python/oslo-db/oslo-db-1.7.1.ebuild
deleted file mode 100644
index 328c9df5a1d29..0000000000000
--- a/dev-python/oslo-db/oslo-db-1.7.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.7.2.ebuild b/dev-python/oslo-db/oslo-db-1.7.2.ebuild
deleted file mode 100644
index 986c164950bbd..0000000000000
--- a/dev-python/oslo-db/oslo-db-1.7.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.8.0.ebuild b/dev-python/oslo-db/oslo-db-1.8.0.ebuild
deleted file mode 100644
index 299bb59b3b97a..0000000000000
--- a/dev-python/oslo-db/oslo-db-1.8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-1.9.0.ebuild b/dev-python/oslo-db/oslo-db-1.9.0.ebuild
deleted file mode 100644
index 299bb59b3b97a..0000000000000
--- a/dev-python/oslo-db/oslo-db-1.9.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.2[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-2.6.0.ebuild b/dev-python/oslo-db/oslo-db-2.6.0.ebuild
deleted file mode 100644
index f993a9580ef41..0000000000000
--- a/dev-python/oslo-db/oslo-db-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	sqlite? (
-		|| (
-			>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-		)
-	)
-	mysql? (
-		dev-python/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-			<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/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-4.7.0.ebuild b/dev-python/oslo-db/oslo-db-4.7.0.ebuild
deleted file mode 100644
index 552f3ad924627..0000000000000
--- a/dev-python/oslo-db/oslo-db-4.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.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/mysql-python
-		|| (
-			>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-			<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-		)
-	)
-	postgres? (
-		dev-python/psycopg:2
-		|| (
-			>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-			<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/six-1.9.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/oslo-db/oslo-db-4.7.1.ebuild b/dev-python/oslo-db/oslo-db-4.7.1.ebuild
index 343dc6c826bec..e9729cf1b20e8 100644
--- a/dev-python/oslo-db/oslo-db-4.7.1.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.7.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 50f875e3e80ab..c6aa0c4ac0391 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,7 +1,2 @@
-DIST oslo-i18n-2.7.0.tar.gz 36899 SHA256 9f510fd251510ca670ef876783a1727f67fe7a27595d772057273d33e4664f86 SHA512 c0733c63aa64046cf693676d43bece82a75f962e260d1e46f76120ada0139459184016c81a9a760d71493e414c0eb06311c9b89cc713d11c022a7faca4d46ab6 WHIRLPOOL dfb922bbf520d2a1e1691d865a0c133d0633572ede58c0ba28e51df08e5f9ad70ff40e31722b1612778ad0f96ec231978579f493b2db7b433ebbcee1d234f68c
 DIST oslo-i18n-3.5.0.tar.gz 36093 SHA256 5fff5f6ceabed9d09b18d83e049864c29eff038efbbe67e03fe68c49cc189f10 SHA512 156b28fa1db65a57a8db2744d72cb5db2706ec773746e676895121c0d6459f4806d826b76428841ee7124c27eba281095fa50d64cbb68f82133c41560ea15950 WHIRLPOOL 8d599b0e989c650d305c0f2ad85596971e6b0e3c5a8f8daa00ba76b9fdc8cdf5486a346343123247efc8dbaf4d7825a62b5340a957c7e7881c2483ea051e90e1
-DIST oslo.i18n-1.3.1.tar.gz 35050 SHA256 8e1b9b3f87cea9e43a2414bb02d8c79b0a688c916afa1f1453f6a0a65ffd85f6 SHA512 987beef5e59b213988001fb53f1b2e41b122b830bd476c64a4481f7650db45d31d66c94d79da26e1fc346035393c00a63febb1254d3ab881ce3d2b00398c5ac8 WHIRLPOOL 7b590d93c478d855edfdfba8a31dac491913426100c8e216cfd4b82ff47b60f98b34a56ff69e2af49d0c16d3e2ac1813731527ab21bb4f9fe2f33dc5847d0835
 DIST oslo.i18n-1.4.0.tar.gz 36140 SHA256 a3d64e8d2b4235a457da2c6269d8c97e867a90ba7d938fe0ed3cfc792c8c87bb SHA512 df1491bb4d98b9295c08f4b7dc18cfff2758834ff5edb9aa3bdc064e587ab475e7e060dc5212c5db1e7e2f34cc4177e5c713a4ac6908a9750f50dc6316105682 WHIRLPOOL 8e77849c0a8f3c5a7e5b314f756673f31a3464f2a65c35e8ad506fd0ce10430b2fea0fae97eaccfef258b74a24db2f86b0843575d25f3d3a84a3b19ae0c5ff12
-DIST oslo.i18n-1.5.0.tar.gz 36068 SHA256 cd09da0780e45737b784bdc026ea705ad006e3c003aa5dfeab83f269b4ea0e70 SHA512 20a640950b7e0eef69371eece396fc6b284c87e195b98a98ec689f207f9ab4f8a41c70cac1c64b0f68621742b6e9da8001d422f67242a3e03e6b4cf09d8add96 WHIRLPOOL ce22737d5285abe18a7e62d01894da59f7d1068a0d16dd055ba62d40888bba7d1408f3d739bfa6a5da7f7149fc84f3794067db4562538f7cee99fca3871924ac
-DIST oslo.i18n-1.6.0.tar.gz 36136 SHA256 29be916f3f4c79cca76d57e604a187b3020354a2ca89d486647b79d8a9adbb9e SHA512 c3a338ce0e5f7fb22f193aa749b4d2402f394af6b010cbb8dddbe2ec259cf39ff8a31d1730da4517ec24208b1bf439af48b97bfdb34acfecd78876bb3f6f4ec1 WHIRLPOOL 50274047e4ee12dc4c823f23e3dd9c7459f381d7882339e8de4b743a67ae433e9a062b1042fc4304c9b9dd9544744a76d3139265f0d1cef8320e91cd7af2fc06
-DIST oslo.i18n-2.6.0.tar.gz 36063 SHA256 b5fae03ebac2083180ecd5c7d651bea5c66924dbe2d6c90e1d835ad364dc7688 SHA512 fc6c4d68fff1a540e7b23ea684d6ff45712d04f7c53e4f4d701bc05e15b18a1548735a32a016cd39b2080cb6053850debbdddc00b4294e6799727e1737e0520f WHIRLPOOL de0f3e57c774f6406f952e3c395f16809dfa60edf86f20139d6dd8e1843ebc08f7bb844bc75f5dad5f62518aa054e4a79e7327f086d31494f41c314e0894bd61
diff --git a/dev-python/oslo-i18n/oslo-i18n-1.3.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.3.1.ebuild
deleted file mode 100644
index dcb5a611b7cae..0000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-1.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/oslo-i18n/oslo-i18n-1.5.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.5.0.ebuild
deleted file mode 100644
index a7c32d50f67ea..0000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-1.5.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/oslo-i18n/oslo-i18n-1.6.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild
deleted file mode 100644
index 8a81e4e099696..0000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-1.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/oslo-i18n/oslo-i18n-2.6.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild
deleted file mode 100644
index c86d53669037f..0000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-2.6.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.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="
-	>=dev-python/Babel-1.3[${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 || 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/oslo-i18n/oslo-i18n-2.7.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
deleted file mode 100644
index 16de121e2eb7c..0000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-2.7.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc test"
-
-CDEPEND=">dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CRDEPEND}
-	test? (
-		${CDEPEND}
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${CDEPEND}
-		>=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="
-	${CRDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 9154cf02f029e..347390dd94d8a 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1 @@
-DIST oslo.log-0.3.0.tar.gz 33955 SHA256 c32f85824f2634ffbb34fc7bc1dfebdc706b404ff787d97df98ccc508b311e59 SHA512 d50ead9274e29a9fa3d03f7cfa4de51601b4e2d3c28ccf1ded3a389d7485e5d858c418a5eafbedaec164f4d47ff40e066b0a3f6e11530f270a9d0a4a93d20556 WHIRLPOOL 6d1177899b4771660685a34ce7f91835803c27533bb8d60a047db889e243fac9e49f91ab691244beb0dbdc226bb6b0186e5d3e845e68e96005d4b574aeed01ba
-DIST oslo.log-1.0.0.tar.gz 34366 SHA256 3d66e9a70b82bc1c7c0b70114d093620e86bef679177ee1ec668c6e0a1acf52a SHA512 420a019592778e69cf339617d21b2eabde8220709f9067bbfe61ce11b8defc54f6635b8f120557b032bea15eac936ad4957e23f9f041556390c9e0b641ca0c0f WHIRLPOOL b579fe52acba0ca5957a55b6720862ef7343d0f41157e667f7bd63e57c6779af683cbaf083440c98a1cf0184cc162eb91b64a52a1a19c1e9732a7eb4ce8530c7
-DIST oslo.log-1.1.0.tar.gz 40991 SHA256 a568d567a99443b617338e4a9f120d3c866896b99e5aad2eff1bcfa448ea7e28 SHA512 761324c6a48e6c43411c44a741c7c8e38bdc0ad08e1eeadaf4efd3b264e00c428042b873bc294a0176bc0831d7a612d08e49da838611ad66e2954a7547cc42a0 WHIRLPOOL f680ce7722818bb3d1f2e682bce447ae37fd16a1ba066ac264c5c7ae1b29803c3c12e33138d6b66afcc5e222a401526f1b1eb07f294974551eef0184e83e575d
-DIST oslo.log-1.10.0.tar.gz 42768 SHA256 9f2addc788f8b316a76cd2655e5524ad962b125cd62187896f0b8c2563d75aee SHA512 4a3ec2b439c469d61934250a1a9c74a6afaf62a4ed8e7cf119a9ab1a49f120a03aa1df06e351b8e2445ef487f2a9e2f29f5c8bb2892d408ff61d26352b8e0274 WHIRLPOOL 4a9dd6f52526cee3a5cd486a4bb7a60bd70ebc382e86ffec204d5574e3c7620713ff745a20f84ba8d33c5a438589bd11038e5ff602fc79ddd9c5c44bf24d2fad
 DIST oslo.log-3.3.0.tar.gz 56039 SHA256 b3414b6f3b05f50571d8973543227f0d6445c297ba762262adfc28b704f8efd9 SHA512 77258a5861db25f46d1148a55990f9b708563837e5dbb2123db1074a837ffbe88b4fe3e788b23fbf2af3aa9ef1a0204d1ce3ef37215bd8265e0559f3d780f882 WHIRLPOOL 2ad46f549514b3cc098b65d3ecc7e73ccad078b3652398cc98ac32302b0ef62cf8c26b057c827cea12ac38bb38ee15c419f5e19f33d17dc18754d0e0c3100a8b
diff --git a/dev-python/oslo-log/oslo-log-0.3.0.ebuild b/dev-python/oslo-log/oslo-log-0.3.0.ebuild
deleted file mode 100644
index 6d3a7f23584f2..0000000000000
--- a/dev-python/oslo-log/oslo-log-0.3.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library provides standardized 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}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-1.0.0.ebuild b/dev-python/oslo-log/oslo-log-1.0.0.ebuild
deleted file mode 100644
index 168b262a4a19a..0000000000000
--- a/dev-python/oslo-log/oslo-log-1.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library provides standardized 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}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-1.1.0.ebuild b/dev-python/oslo-log/oslo-log-1.1.0.ebuild
deleted file mode 100644
index 5b65cc61edda6..0000000000000
--- a/dev-python/oslo-log/oslo-log-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library provides standardized 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}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]"
-DEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=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/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-1.10.0.ebuild b/dev-python/oslo-log/oslo-log-1.10.0.ebuild
deleted file mode 100644
index 79510e5104ed1..0000000000000
--- a/dev-python/oslo-log/oslo-log-1.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack logging config library"
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	test? ( ${RDEPEND}
-		>=dev-python/fixtures-1.3.1[${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-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=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/nose[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/oslo.log-${PV}"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/Manifest b/dev-python/oslo-messaging/Manifest
index db630ff6a9a60..514b89f755a2d 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,10 +1 @@
-DIST oslo.messaging-1.10.0.tar.gz 216864 SHA256 d7044bf66bf65848778a10955ac3ee9d7c5174c9b07687c2e36a624417e91d06 SHA512 e2a6e06248a52ddab4cf1fd02510e8d900b39002944df191776289290efac3455a78751caed018b5755158a643b31d9beaa825f0af5147caaf1571e5dbad2a50 WHIRLPOOL 61baa991eaabe168a2b2383913b74be545ac009010d0297dbac2ebb5165b2cae8c00226bf3539071a00c79d5d2db510d64c1accb9b64d03631e8b8b485818294
-DIST oslo.messaging-1.4.1.tar.gz 144160 SHA256 28243db5fb84287016d6f58fa485a71496c825bcfca3ae806035017700a11945 SHA512 e5099bafa81f0dd86459034cf8a11031fb84b1af3b1fa7820e526f45241f37e8b2eea1a11b7aa420e38b36b3d7fbc2116ceeffe6cf635af9c36cc4ef8bb3b76a WHIRLPOOL 5732bcc2857448e996743914dc1e43b56fe13c6d5715b40967177dfbe0718b6e9d166e5a90fb394ae210150487bca2e3977335971ee9bf2780003ee790cb81d3
-DIST oslo.messaging-1.5.1.tar.gz 146353 SHA256 b1bac4fe771b089e839ae6b071a441f18468a5ac7c506a506d93875dce200250 SHA512 657633df4900321dccf0ede8d1e047d628c9451c9f33d5a4f61cd4bf1e476d1212b7b05351afab8e1020555ef69e567446e26970a2593c97cceaf2153259f640 WHIRLPOOL b869843f1f9e03054466b3324887922b011868b9b520231f7299d0496bc3d7decdea9b12f437c2bc2f8b1883231c7c5af269a86662c5e40740aecc7ce463050c
-DIST oslo.messaging-1.7.0.tar.gz 201952 SHA256 dd18921a9bcdc8d34c64410bb684dcd852a7a320e6be4992b0c93a7dc02b12f8 SHA512 1531d19a585609091f490138044b5c543ef26c34811e0268245a4710d945d61bdb77cc5729cd7b3f4477e2d78c1feda3801c614e8994c9d3f2638e93af73c7f7 WHIRLPOOL f53580b6b955ffccae0e7f80e39e11895e4cc7a2e22755c0183bfc5a6c13af42ebebd71c8137a6be767f66f83d6de20510bb46e67f02de6f9dc1717a82c80687
-DIST oslo.messaging-1.8.0.tar.gz 201858 SHA256 afff6d8367e6723a64dcb518d709d4ed0f91e15960360051d2498fc34e4ddda2 SHA512 5a2f79350f0763af52df984a43464bc12126e1520e4761c2c055b011f6063604e9aac4273732f45b1056a6af7aff120d005140ee89b2a9e5118f347c0918ad0d WHIRLPOOL 1343e4b6d691756240b252fbae90301bfde08b64ed7a0fade0d8b1662913ab55d1e844dade8215dbad68c4fab64e50005b1691b68aa35772d4ece862fe3bb9e7
-DIST oslo.messaging-1.8.2.tar.gz 208688 SHA256 31222c9afe3b5655401424a6229f633bebf20cfe5027e69d2e12f7e954556f1a SHA512 a8940635fb1d08871675730d2eb841af74896963d1f9624fec6ecff03e99f280091f342abba683aa9a5eac209009e75618f637571e34c5ef76fd8617f4ffe525 WHIRLPOOL 0fa2f5531178763ff607b062b8741ba02d396e868cc41a4e668e2ec26ef119f12dfa4261da418ec314c915e36e90f2cbd8da88f1bf559460fa0e442cd4a9b0f1
-DIST oslo.messaging-1.8.3.tar.gz 208757 SHA256 149d325431e2c4415edd5bdaec0cff4e9109c02e8f428382610cfa1a238692ea SHA512 98fd93a4ae366ac413ec0ad0310b669d9e0dddf61a03b2da40bfdfb3aec63de95a187556bcdecc19a209c38398f2ed0359aa05c9024bbad429e4c79c35b91b01 WHIRLPOOL 22f2a4237f874f3a681d3ea6e87bea7ed9759f967dfe8abfa8c6dc0f68d362b248f54b98fb7e64ff388de7c406f0cde29861fd17fe2fef5a8a688855b67c436c
-DIST oslo.messaging-1.9.0.tar.gz 214963 SHA256 ac5f58378515597e6d5759653cac3828eb2ee6bb11e2bbf94ee0d65a692990ed SHA512 2e7de860fed55b0548f3cfa4a911cba0750889fd807ed7addb83192dd37f84997ceecd92faf480be97873e58286748865c8c57a09014ae0de97c60be826cd27f WHIRLPOOL 8e331116313757c93b2add853a35929e0a0603b691f9ffb322f4e39c422e13d83ee757277e42ce9b0360cf9e5823bb066a48fadc8eb706f7ebca018b014e1e06
-DIST oslo.messaging-2.4.0.tar.gz 181234 SHA256 6e505e86ebd2115992d41db2ab4e2e2b946d2a2699ef205f84d74f1a62c710bf SHA512 2d3b8dd220307d97fcf5e06269771d2c8b1412ed69e08258f4e77791a9b43077e787b8f21248c8282e53630d57c461034d93aa91d8d129ffe5e6d9abe871a72f WHIRLPOOL 99c023e230505b06a75ae51f63d67de60fadf4f44851a6a50466dd865b6a3f9b39c949ce31c36fdd35917281700b316edac6301d2d6d64b2440fc22ad61e1681
 DIST oslo.messaging-4.6.1.tar.gz 220648 SHA256 be0499c3c2bf22f7ab3934bd2c331af6eea47f8c6508774d209a8028e9582421 SHA512 b63a3e6d68261852a09a238a404459e6f0e23b60bab863702aa044bf2256244d86bdaf86a7eda8f13a73d87d7599ffcee4a8e7ea2df230ff7a7e3f84b8279d6e WHIRLPOOL c7d9b341eb243f382db2e39b90f4b430dd75b0445322fe228e26201ae75b06fec42c27f80a1f003dbb7c03382be94b1ccca3ed96b3bfd4f14c723c496db77a5f
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild
deleted file mode 100644
index bef7b6d336339..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.10.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.4.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.4.1.ebuild
deleted file mode 100644
index ea0b2f1e87c8d..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.4.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-0.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.5.1.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.5.1.ebuild
deleted file mode 100644
index 52afa0cdcc165..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.5.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.1.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.7.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.7.0.ebuild
deleted file mode 100644
index 1a8e147514a40..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.7.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.8.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.8.0.ebuild
deleted file mode 100644
index afacc9f6726fb..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.8.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild
deleted file mode 100644
index 660f9bf926655..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild
deleted file mode 100644
index 222256f0d4d81..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.8.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild
deleted file mode 100644
index 8be57bd51ef0a..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-1.9.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0
-	<dev-python/oslo-context-0.3.0
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
deleted file mode 100644
index 3c5b2849ca8d2..0000000000000
--- a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Messaging API for RPC and notifications over a number of different messaging transports"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.messaging"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
-S="${WORKDIR}/oslo.messaging-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${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/oslotest-1.10.0[${PYTHON_USEDEP}]
-		dev-python/qpid-python[$(python_gen_usedep 'python2*')]
-		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/cachetools-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-2.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-middleware-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
-	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index cfe6aea1004d9..1d2f55e799a75 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,8 +1 @@
-DIST oslo.middleware-0.4.0.tar.gz 21486 SHA256 d300f8342b5faaf712890d58da111789740aebb4b46874e41b45110b704719cb SHA512 6001ecdf42b0a2cf99c51bd43492e5d8dded2e41669e25a866808407d7762c90cdb8da2a8f5070c64df1ca81b5dedeac8dd012d2576c14fb201d236e73ed2188 WHIRLPOOL d431f55b50a6eccb29c9c4e061c8424d57a818007cec77792eb1ca2ea38c2309186f4ed5949558a60a1e385ac1a7dfb7b03940de129e3fc3f3421722b51f7503
-DIST oslo.middleware-0.5.0.tar.gz 23161 SHA256 c2d2a78debef27181d69e4f2e887cb2e4617f32ad4681a26c0d67210151bddf0 SHA512 a92c1e3bc82fdacf8028170e32600d48e4da0c422a1290ee4dde5fd848b367cc4c8906b7db1f1116d6a3a81a1d4e5d896f3bd3a89c121e58f2a108b532debe4a WHIRLPOOL 3d108f06e30273fbb99450be52512b548a152a7cd75143ff7a015b929506ed7070f4cf6b216b80d5b4c6a07724e9d72cfebaa4ae459f29d3516ebc7bc846c05e
-DIST oslo.middleware-1.0.0.tar.gz 23209 SHA256 5ccf160ae5ce23f3f59b86535352e3b5a9fa35dab0edc4ede8b17438da559995 SHA512 d1658c4608a1ba8f6501d9c576263560e2c77c24d6653081c17115f96011f298b0d203b1511830b4842efc08303b0d7452e6608f3e848145c25e9b960d11613c WHIRLPOOL 0a6c71290c2bbf5d8eca5c7264cd97f981e650139695f08a7fc6e320508cea9bdbb1d4c6d5b01f7cf702d11d5e21712477f73aa2fe2f62e17aa2c731022417d8
-DIST oslo.middleware-1.1.0.tar.gz 29957 SHA256 0647456ebf1611e2a0efc445673af3583780b0ccf694f61a8830d54fb5d6f63c SHA512 ae497098fe4edccf79ce93de1bd42967081616a81f7be8ec255a8732021943e8f377a6b57f6cc23c992506a5bed2641299d2653fcce6f6619d2ca1eff318cf71 WHIRLPOOL 410e422ea3b36e843e2ee91d64c23d84ffd86819bfca7e226fda3f1c2a6d11c9e8a8a4e7d5696764ce276a0b9984becf9361967861c17676b4fd9d77894baf82
-DIST oslo.middleware-1.2.0.tar.gz 29850 SHA256 0597ae9df233ba58e3f58e03878ba1f1d34a30918895bb109ebe50d8760495b7 SHA512 021836c40d096d96effc904a1ddd4889dde7f40e598aa435be3e8b5a0ff5dce013515bae878bf4eb05680fe01737c9fa20701de46bad151e7b795b229309e9db WHIRLPOOL 627b3c968e806cb1256768286ea580aa2ff4edd37107e3873db52030224cddda19ae2a4b341616f6a103dc4c456260d5c02f6645be4bf805758587eb54fece68
-DIST oslo.middleware-1.3.0.tar.gz 29172 SHA256 9e0fcf28f5d635c10e684bce26524e79a9da78a5c3d380c6759d2f419a0ff1c5 SHA512 39f3ba43aac0839aa47112eb6406286ae5e9ff92c53b46540e456d885617ad583a5a1ec3d86bdd1f95be9bb31354b3dba061da1fe28e6174ce01adc75901e6c7 WHIRLPOOL 05d57f094c22cddae6982cd3cc45cbf2fb881b181eceb39fc7295e9f930425180d4c2e72ce0ee700c979dffd0f40bc65d4d83eaada424553cc047cb7a8123db3
-DIST oslo.middleware-2.8.0.tar.gz 35432 SHA256 ec4c4da59abaa441814d85610f911df4be405a98f9c4af0482dc2fa03f3d2bac SHA512 73c3d18a2d97a3a06436e31124a73c6196f874a3b99ca3e698bc73426461ab4402545e53eb12fa048030508f32d523c47978723b51d30490529686b7e119087f WHIRLPOOL 419a21db7c26b31ec40fc7b28ba9b1fff600c3169e069184968af05a3631779f1e79e0159ce30752aee91f049b68b96add647d6d0988a70d0cd59776722f2538
 DIST oslo.middleware-3.8.0.tar.gz 39756 SHA256 2d985b238182cf70c1adbe1a041eb96eacde3106751fe2c7f1cd81d57a4dbda2 SHA512 575708b9f19938787d4d42accfbafcd63a9cee0aeb871dc0b3dd504dc4d5f97db27abfcfd7ae56dfc7d68eb670c11f93c1f79d3fd02d30247497614b3f51d80a WHIRLPOOL 2498c2a67ca83214c8512a2a86d78155638a107971d7a98a3534c625138c89f56273ab6dda437399799a6960129f4c7dfa758d2af46ede15813d7614d5db3a6d
diff --git a/dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild
deleted file mode 100644
index 9ac1ec6c3e050..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-0.4.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild
deleted file mode 100644
index a692c4f007cdc..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild
deleted file mode 100644
index d7d813393aefb..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild
deleted file mode 100644
index 6df908b154673..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.2.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.2.0.ebuild
deleted file mode 100644
index 96f95ba10e87f..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-1.3.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-1.3.0.ebuild
deleted file mode 100644
index 1d182ae787561..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-		<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
deleted file mode 100644
index 790ac31327952..0000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-2.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library includes components to be injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.middleware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 4093311fc0e5f..d900f0070313e 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,4 +1 @@
-DIST oslo.policy-0.11.0.tar.gz 34280 SHA256 7aa50cea4db9e26e2cb94f4fa5b42889ad3af70af74fa08bbc15b2c82190c220 SHA512 68593d5d05640d9b505532d03ba8dbf16b121b3d31cdc601ff86abdbfa7e8e2dcbd8a398692ae09496735a7a833a5913e5543cc0a99734b4f40f8b8f0de53f00 WHIRLPOOL ed2ccda20c63173cbb80f009f835348db99819e3371ed7ef3617479e084cc3b8cc1affa39f98dc83aac7237d9d8a506d81a778726a4be2cdfc60cf2e428514cc
-DIST oslo.policy-0.12.0.tar.gz 35104 SHA256 5a2319e99a5e6bff310c74222f26a1425e9554c9bf577dcb13ee3cee8c545719 SHA512 b1228d60feb91f8a787915dee46f8944a1c831009b1433ecffc7256f3e1c17efd842d17b69e723b2ff303a05e7a8099f3c9ab1f2fce73a7fd1a5ea552a454c9a WHIRLPOOL 32dcc70a6a4ccd2f9d7ef8742376e40b0bfdb58c15414ca70c46a96d464d62e92a0822f424de0cb615c81ecd07e7e6473203deca7c5c1ddef1151fbec87b5f07
-DIST oslo.policy-0.3.2.tar.gz 31745 SHA256 e69a5c559f95bcbf91eb0ea9f16aa65f0fe5fccc7fa03693d4cc991b76e969a6 SHA512 55043f7cbb93799dc53735844d8a315bbdfdba6c83121612737e6125f78e9396f071b2ff6d67133b582228e7e3a36912a4ab02aaa6641ce62f8820a1500bdd99 WHIRLPOOL a93e99f46db150e14327f5a6109dec56993a78c28ef93daa630418685da4d60d1017d8d805ae856eccf8e7553983dec7cc4b87005f12b965a9b4d75348e288e7
 DIST oslo.policy-1.6.0.tar.gz 38076 SHA256 24d5ecdf4e10f33a9fb2e8784876f73276637d8663c33f594e8efc99e179016a SHA512 468fcad020c90ce55b8f12199952f946cef6f352f3abc72b64e4538a6bd98dbf1d7ebe191600cff0e2654f97e4af3ccfc480a88c36133f33045ce37c2692a31c WHIRLPOOL b84ebb32db93710c5019dda8833129f3ccc855486655daf7b937eb3ad786b501cd51a9fdb4b55819dd414cdb3151a72b2d7ffd118c015bc1ca7b68a60c5a435d
diff --git a/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild
deleted file mode 100644
index b419486a64995..0000000000000
--- a/dev-python/oslo-policy/oslo-policy-0.11.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4)
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 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/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.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild b/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
deleted file mode 100644
index 4380073c05e86..0000000000000
--- a/dev-python/oslo-policy/oslo-policy-0.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5)
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${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/httpretty-0.8.4[${PYTHON_USEDEP}]
-		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-policy/oslo-policy-0.3.2.ebuild b/dev-python/oslo-policy/oslo-policy-0.3.2.ebuild
deleted file mode 100644
index 034d0a2d730d9..0000000000000
--- a/dev-python/oslo-policy/oslo-policy-0.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4)
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Policy library provides support for RBAC policy enforcement across all OpenStack services."
-HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
-S="${WORKDIR}/oslo.policy-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-reports/Manifest b/dev-python/oslo-reports/Manifest
index 4a21540804b2a..9fa3cdb07ce92 100644
--- a/dev-python/oslo-reports/Manifest
+++ b/dev-python/oslo-reports/Manifest
@@ -1,3 +1 @@
-DIST oslo.reports-0.5.0.tar.gz 33848 SHA256 acc8a11422536fccbd1eda4af6b70c219e994ebcf357719480d82981f518672f SHA512 afc4af1255701798e6f5786194fbdb9d523aa657987a2c7e02751482570426634c353583931f83b295fdde0c8e7919f465867344236595733788f8d38831f161 WHIRLPOOL 7ec7130987b784ef72a2382108d5dcdee809fe9b8c8b12c967af18b738dc98e5c72d52c90b93bc4aaa19bba279df98c9b9b9638dc7067ae07b3a950ed12989a7
-DIST oslo.reports-0.6.0.tar.gz 42210 SHA256 c5ac22c2a611a8fad6d3a5667dc88becc69deed11d25db69b22ef8a2f4aa4748 SHA512 43223d432a62c506d1071ec5f8bce5ecd62a49de4e69b4f63b5cfa1a4ce2794735307e9bf8dddd06e3716497c39e963fe5612463ab9eaa3f3900d72c9c4f5156 WHIRLPOOL 269f5d00b833db12dfc6b07f5bb8fba35f385edb25ece7a4d7eca587ad9a91157fe80efc6dedaa893b902640d9cea4295c9eab5a2fcdba42f31cd9ec4e2dfa03
 DIST oslo.reports-1.7.0.tar.gz 41592 SHA256 288e9a3b699fcefcb9ae8d848a965e5c6918729b4200ae0e799b077a8e8ecafa SHA512 be40ade6d4d67eb7766bf7f1609809c92817363c8788ff6a8c069d6de650eef57e4ea243a03eab2e855866966c1e95999235363066f9a84faad25f9bc4c9b138 WHIRLPOOL 2422a76258f73a33efa92bcc016a4cefd9dee40459cd1185a9f6140fb13bc91618025a0da928b629d05cd734e239558847c41e64676543a0ef92f7d0e8c808de
diff --git a/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild
deleted file mode 100644
index 09454e0186e92..0000000000000
--- a/dev-python/oslo-reports/oslo-reports-0.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="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 x86"
-IUSE=""
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.6[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.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-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.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-reports/oslo-reports-0.6.0.ebuild b/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
deleted file mode 100644
index 11ea4eec0d6c2..0000000000000
--- a/dev-python/oslo-reports/oslo-reports-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="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.6[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.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-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.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 6e5ef7df4f479..8e7e8ab9d3a2a 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,6 +1 @@
-DIST oslo.rootwrap-1.2.0.tar.gz 21838 SHA256 95dcb20ebeb5a178fa25e7815d3a17e0cbd92c5eaf0b6e9e677c1eadd2c5fc22 SHA512 868a0ca97049ca2d750b7d52401a1e87efcfefb170e8dea4768b2e75e60f01d797181421c93e1aa1166d44e5ef8abceecc69c267a249706cf8ba05bb5c21f872 WHIRLPOOL 34a0728d6e93fd27c474a9234f73ddc6d0e2762917222ea5b847251f8ae52329a02de4e29987cb9a867596cb8a43b34a80d20f9bc391090785d785863eec11f5
-DIST oslo.rootwrap-1.3.0.tar.gz 37576 SHA256 42081a30779be0a8e33ee53f4e1235c17080278c4285505a6b65243740aab629 SHA512 256b2da73818ff7b7c02a0fbfaa90f9c93877e1f5f1ec15b2f68af6c90169fde639bb6334d2eae352cbd80a3006f6de472843bf7e499d96eb056b6d57077ca56 WHIRLPOOL 4b05d567bc2ce63f6da9f144de91246ab9d6857b388f75bbb80fc529339eda1be4b485c057249e4a67fdd5702f2474fb2010f8b4155053cd607ce18df4f64533
-DIST oslo.rootwrap-1.6.0.tar.gz 48419 SHA256 5fe6d1619a5306f9181899c7cc5251ba5a0de0d3c60f85b2172a2f7d400a4962 SHA512 89f6615f87e9d45e7810157a07df3f8ceeab5f7b6826bc16256294eb9c6031cf6c5c698d92816f31e160d1f5bb98b7564cbf54079b0370ec47b9dbe83c3c2b0f WHIRLPOOL 4109b2e393b41c70e7e94f9f71674b6ea8dc6ae369cfe094f31a3372d049355f690f5bcf2a90804b5f1a0d02560d798471b855c39fcea3b5a577b1f86fba8f10
-DIST oslo.rootwrap-2.3.0.tar.gz 41367 SHA256 2ce6483fee2955f2462b529682a7afb95c6bd745038f69ff408bde9004b83a87 SHA512 6add1d88e13100f11a5e8faee76a1a42f1113dad55dd530bd923714d53beeb7007f8e37c24a12debb9db3fa81fad8b8d363ac463535b367134e93e753c9ef2a7 WHIRLPOOL b3eb54a7a0be5d59825f4d019849dc75e8d94659f47965c921d6d85215a882f79bdd3785f9f7bcab35878219053705428e5c68c64dc78d1b9a5bdf11f027672c
-DIST oslo.rootwrap-2.4.0.tar.gz 35568 SHA256 a5ad4ab3379e29db324db93fbfa405501978c7ac582d18cb31fcc7e92bcd219c SHA512 e9ebce080fad9a5c862602ab78108c4f22bc9988dce2a774614f8223b430a0fdc3a50573eac468dbf3c1a2d178dd372c51e3e30aa3a0ed3a799b6253676eb6e1 WHIRLPOOL 95652554eaf4d5b94d9cc949ed435e81819985b42a8a1016f3d43bbb46406353c0fb8f642a7e7bf8b483f7b211a5480d54660fc2d44753417e66e5b0af3d2e6e
 DIST oslo.rootwrap-4.1.0.tar.gz 35590 SHA256 083b6255228982484fc483db845a49e07f474cfc12ba1ba70490f56880027989 SHA512 ef06507989d168bed8d3943d69c53318b87a2de6f403b9563d79ca75b9e17da887ce68775c54cc0fb8488e99ae3dccb08f8c3e4cf2d46882b699625519a46705 WHIRLPOOL 638a8cbf3cf463067ddc26934b914d4bf50b7b6ce51ba48a83df7abcad62836a1bdb0f660120a04facf4d1cfec589bb690a7039486884cbf3013e1ab622f9dd1
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.2.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.2.0.ebuild
deleted file mode 100644
index e4c9c81c8d0f9..0000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap 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 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		dev-python/subunit[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.3.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.3.0.ebuild
deleted file mode 100644
index 10647f92a098a..0000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap 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 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
-
-# This time half the doc files are missing; Do you want them?
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild
deleted file mode 100644
index 3f3c734f1f73d..0000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-1.6.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap 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 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild
deleted file mode 100644
index 4bfbd1a64efeb..0000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap 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 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${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/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/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=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_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
deleted file mode 100644
index 4272b5884a911..0000000000000
--- a/dev-python/oslo-rootwrap/oslo-rootwrap-2.4.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The Oslo Rootwrap 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"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${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/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/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND=">=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_test() {
-	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 864c976dc6510..e23be6903ce7e 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1 @@
 DIST oslo-serialization-1.11.0.tar.gz 20612 SHA256 b9a5b8bd4583957476464016f1c4d3ca01a30a0125acb1cd0ddd830715c88e1f SHA512 0fbe6282f26678208c22d31e6c221d63173688151b1eb228fd1dbbc184973c1039c43efa8d4f67f7f99dc3263d46021e6f0b7efcfbc4c13515d4a4d0f55cf0c2 WHIRLPOOL 3adb4c481ed8b8b789714b2d182b43cb7e948cfc49a73380c5abd3f662f00d10f8a10a41596f31c5a3ec98e75bbd170692a6fc8f720875fd4fe35d1b23df8e7a
-DIST oslo.serialization-1.3.0.tar.gz 22586 SHA256 6d5b0f8a0bdb59a7818e62c4c85c4f1ea81f634f2add368b553c93a5c4f28e93 SHA512 47db8850d8f3111e5dd0ef7d506cd629ba36d0996487dfe80256557f505d66accbc83131d6066e323eec85f1b9b22776c4a351372e50ab66e059c89a61f8ad16 WHIRLPOOL b4a9889a66c96da0f43f40cf7647da4ea848ec408192170eefe9f3d8cea435eacd5d5e55e2d4701b961b6819147faed82189f3e90cc3e33b1766b014bdc3aa5b
-DIST oslo.serialization-1.4.0.tar.gz 20631 SHA256 082dca272f0a941e1cdca1dc02849c5ddac65fa7d19604096be54cd41e7b4317 SHA512 d6f1428dbceecdad7e0bff8895a8312f00613f17f93b9a9ed66ff4c00e803331b2b19c547ebe3e13eccdd08dce82babd5753c8ede873705bff1cc70cafc1bfd9 WHIRLPOOL 5fe72f5e5ee85d828482bcef066ee86950cc69b1b7850c3340d60b18d2cc3b5221f63e5ef449a081f57c4f31c0f15864610847f072e529da6d832be67d3439de
-DIST oslo.serialization-1.5.0.tar.gz 24068 SHA256 3ca368c96777cb54a656b6429914717d17f05a7bda13ce6065c0930dce0d4f78 SHA512 5d5f7bce43b5ac3b2c7f12a53fb78340bc0a1eb7454426f43f2e9e45c913425a58e7828cd89bcf7b1b7ba58e1e50fe09097fb9b836872a89eb85676baa40b7a8 WHIRLPOOL 68553208d25e0c8f617258ef9c8eafb3d7b331794b26659963c170474435f7456cf4e7fe33134407965cb0f5b490a48655b08a7154bb76988327dbe344cc2c87
-DIST oslo.serialization-1.9.0.tar.gz 19474 SHA256 2cb1110d083331cd764f514138c770323e005da987614720f5c1e852c2eb0a03 SHA512 f9b17d4aaee5f2434022d2f8770fc891ccd589881a3ea1b6fc017e13cadfc311ddac5f845bf863cf5cc46792ff2baf3590a0ad817a8a456503d76c4741993298 WHIRLPOOL 0d1189d41783eeaf796a25c761bc83f9582d63d9e286715895685048a63cedb4ba773db0d3b0afb613a07847d7ef6c9dc0ae6951e3789b93727fbd1fa2cf006a
diff --git a/dev-python/oslo-serialization/oslo-serialization-1.3.0-r1.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.3.0-r1.ebuild
deleted file mode 100644
index 95cf01c965353..0000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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/oslo-serialization/oslo-serialization-1.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
deleted file mode 100644
index e110bba05c58f..0000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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/oslo-serialization/oslo-serialization-1.4.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.4.0.ebuild
deleted file mode 100644
index b271274f54410..0000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.4.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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/oslo-serialization/oslo-serialization-1.5.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild
deleted file mode 100644
index e3ecfd8bdb7f3..0000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.5.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${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="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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/oslo-serialization/oslo-serialization-1.9.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild
deleted file mode 100644
index 7745695dd9c43..0000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-1.9.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="oslo.serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-# Note: not in tree
-#test? ( <dev-python/hacking-0.8[${PYTHON_USEDEP}] )
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${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="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	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/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index d883a5d739d7e..4f78ca6907fb5 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,2 +1 @@
-DIST oslo.service-0.9.0.tar.gz 57558 SHA256 f77753910391a1b2bd7fd9b5b863d7230b1ff727443dd2efcb725ce937ffb566 SHA512 6e17d1e28682732c8866e43f509a7fd7f69d2718493de3dab939600207e56fd0622036ff62928b9855b6219729e1173e62e1a1c949959a5d2d58eeeded97a1e2 WHIRLPOOL be645ac0d461056d5df4d17bbfe6f3819d6eba4fd2764459d287badf056d5c962e2c690b64fceba72160094ca1d29ff5f6c7708fef90bd192faa8ba532a4d4bb
 DIST oslo.service-1.8.0.tar.gz 66072 SHA256 cfd519945adb986f3e9e9bb01bebe1a0875ba38b1463a7deb6a7cba5a4e02d4d SHA512 f84aae9eddd4a702b289a2265bc4d53f4d0f01ebeba3c48b2614942eff6beeb3da7a978dcfccc58c9ddcc28031f358da3875926e8baece9d96bf5829a1c3b9e5 WHIRLPOOL 3da0853cb7568fbfde61e9a08cf2bbeaf741011e4768774c5e1423093adca8028861bcedf0b1451fce4c5154af17932a2944c07412d6fac3262653c8a11f4392
diff --git a/dev-python/oslo-service/oslo-service-0.9.0.ebuild b/dev-python/oslo-service/oslo-service-0.9.0.ebuild
deleted file mode 100644
index 25e7c7f2793d2..0000000000000
--- a/dev-python/oslo-service/oslo-service-0.9.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.3[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=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.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
index 14325dad08e97..73cc71887f563 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1 @@
-DIST oslosphinx-2.2.0.tar.gz 21094 SHA256 a0f650b9c79c333a4fbd51ebeab7c6f5f957c400c13f5b89a936afbc16de8874 SHA512 d8efc5c1852dd195ff5a13847674093915eb1fcaed94bd46ec50667888b851786f362340182e507cbecabbb4155ed456af4f4611c689db67738613c409bc0473 WHIRLPOOL 5e48bcac16123041f6ca9d5e2eaca329af10729a995ff8ad1db6bd01acf926891a4162515940a7984a6cca872fc80c9063ab721ccf76991eec91888f3b8d60b6
-DIST oslosphinx-2.5.0.tar.gz 26445 SHA256 d0452adbfee87d70ccddc270173362efc14c423cad3b27f96409932613051a7d SHA512 91ea48d70ff3f850f4c7ada54500f150b40f63bed2476312dc5aab3714533c906171fa88a564bc541f9c1103242dd7e96809e564fef21d6f8a529770b387159a WHIRLPOOL a58e5f7e3d391c2e91e21dd86fbafb30e7b15af7bea07994a7aa5f02da85bf44575b7b3047c34a435968d4dbfd6e70b0806f5a63943262453665380d11b44886
 DIST oslosphinx-3.0.0.tar.gz 25644 SHA256 d39129be6b6076e087ab9a108c1b17f67cbb233ffc2481528df3d76b612cc1f6 SHA512 f2b5f35124bac9bf661ba45af1f18703725d5b5432cc708689a548bde6918975722729f321fb4c1fc8a146011c7e86c1c6abfdc746806d4bf7fa7d640e057a0c WHIRLPOOL 8ccc00a71a3d5f67a33a989120ad2591977169b93a5d81fd2c7798a6b93ad33ce45e6ebd2be69c7e0b0e4fa2e79719e393e63f9a250b50e7b5b9d4621bf03e94
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild
deleted file mode 100644
index b29a64f0238a8..0000000000000
--- a/dev-python/oslo-sphinx/oslo-sphinx-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/}"
-
-DESCRIPTION="OpenStack Sphinx Extensions"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 x86"
-IUSE=""
-
-# NOTE: dev-python/hacking is unecessary as there are no tests
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild
deleted file mode 100644
index f0391516ec80e..0000000000000
--- a/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/}"
-
-DESCRIPTION="OpenStack Sphinx Extensions"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
-IUSE=""
-
-# NOTE: dev-python/hacking is unecessary as there are no tests
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index a3c248d23a6a5..0d117de197944 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,8 +1 @@
-DIST oslo-utils-2.4.0.tar.gz 56342 SHA256 fe210740eca9ef168afbb98038b94e48e3beb17f48b8a771f044a5fbfc7d0397 SHA512 6fa0b065f905c09c02748b76ef1818789fb96773beb1ac5d2bebb8edf76794e411961fd259e4ecda754ec0b8ebd3d8e323ac6ac3f971c4bf2d6755e2ca2ab64e WHIRLPOOL 888057b8720fc91b3b6ac85d8c6db88b2998d0cec1b495da7aaf10d2cd2cba0e482dd667479d5bf21d2414fc26e9373afd9d4fa8d433d9734d6a33fd789ae4c3
 DIST oslo-utils-3.8.0.tar.gz 70830 SHA256 c0e935b86e72facc02264271ed09dd9c5879d52452d7a1b4a116a6c7d05077aa SHA512 bd2e140f8f2c06c3b1ad8ee34071746e3987352d0ab79d91ea70716c34b4a8baa066e9731376618554b57b1b88ea570ab2f51c563c43f78a46ff7a132ed03fc5 WHIRLPOOL 865a2d438f0085c7cf50f2c29d12dcbb9f94dc1a5d7679d69a56f821029ef8f92d4f19dfa4375b302dd3848f77e35f7a168cefbd9e85bac26a680cfe3cfce9f1
-DIST oslo.utils-1.0.0.tar.gz 32719 SHA256 4d1fdb896eb7a690ddf2a04b47c347caefaf1117bb2be83723546fbaa5141864 SHA512 09c6b759f39eb90ec382f68f3cf70e600847bdc6c44802a82e279a10be75587fe5e67f5e5b136ab6ac338b69ff484a869dbf236e0e46fc72a90ca69619a53c9b WHIRLPOOL 470720887a248afc953c691ba8e659fb010b3b59708992a34387814487b3077f723879f603d931d1a14efd87fe95f868103ca7beaa8bb78c97a9510c28e8364c
-DIST oslo.utils-1.1.0.tar.gz 40359 SHA256 f12dfba246ff52e94ec005d5c5862c0300e6cd295ceb953b37b876571a544dc1 SHA512 6b6ffc086e88c0222e9931c78680f15f021b9e9bb211bcb9b4114cc62f47b5bf85846b58e7b792355c7bfe1c01dddcb78871f981fde719360c3889daa85a5ddc WHIRLPOOL f44c34acdecd1d4bd495c60e65d41cebdaa7ef1a39fc4a749a339161ec428e3d274462e34fa8729aa2e7bcdc1f0de66e8d3f87c022c6c91425f1778ca7bef145
-DIST oslo.utils-1.2.1.tar.gz 54946 SHA256 9cd8bcde345554582fd12c6daab81a7327a90c72861aa644e8b7b3fbfed5deba SHA512 f928afe21ef908cb6f20beb42502c4709827fdcc7e44f81fd5adeb4ac8faf07649c813824702e0a1972e8100ec894f441017dfc3a887f1b56afd4bfa24846803 WHIRLPOOL c91b4e2eb283b46df6341d7f52ca61ee20b286c84afd8ca8a287627a7d3be914b343c9fd1ea141e02f2c7179c96921ab38c6d094666ba3979dc639fa5fb2e4f7
-DIST oslo.utils-1.3.0.tar.gz 57677 SHA256 1586065ba1cb4e5dbd731fd612d52945af815b9e3e1404209d8c955b87909b84 SHA512 cd8855ab3fc7123b6410c52142a82fbce0813defe77ca6e7434bd2d4f678c8c477a045aa6abd9fde8915874e45f058094f017a6150f4e07917db44b545788f01 WHIRLPOOL 1cecace92c179f7db2c382d0e6cbf53cb7a2ec8f38d4108f87b78de7ae4204d044af8d3cd5e5a75facda0d71b3933f5339d0bc5f9ff2869696173862cdf309f6
-DIST oslo.utils-1.4.0.tar.gz 61352 SHA256 f90e1d52542225031bc7e3d9bdc1b1270a80388e30285532124586e45e9317f6 SHA512 43cb855a9f05986db34f6aec845d0c4d6eb4c2e5fdb10b7f348786a6e28122eb6f476bb09af76bb406a985e4fae3f0b94eb5f1bbfd5b41fa5853cbb2d94b3a24 WHIRLPOOL f7f282199641a22f23fd3214b73ca1c52a7f241ebd4b67c1f1ba8505b62a42d70c7ed6a665357fb017de8ac1e8d7267f0f367bf88786dc97b23b0a9669328372
-DIST oslo.utils-1.5.0.tar.gz 67945 SHA256 797c048eb266abd7cf2e872b460e466453cc593efa524675e40b5abd3cdcaba6 SHA512 c9a582ef45223eab01ef49a8c248345cfccf57edb9d7d257c71f0f6014fdc95e6d47ecc84905b380dd1a4869636cdcf84f5f5648741a01323a37e16d818f3f14 WHIRLPOOL fb15d70b4b81faddd61d1d32f07e41a8e65052c407f3dfddb1d77a7f44150ba5da99327e28edad3f8eb65a6140f30bd83d6b68646ad2bf10985ba870c1d2442a
diff --git a/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild
deleted file mode 100644
index aff843668476e..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-DISTUTILS_IN_SOURCE_BUILD=TRUE
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pbr[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due to the use of namespace packcages but root
-# cause was never truly established.
-RESTRICT="test"
-
-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/oslo-utils/oslo-utils-1.1.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.1.0.ebuild
deleted file mode 100644
index f77c52b69f7f9..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.1.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-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/oslo-utils/oslo-utils-1.2.1.ebuild b/dev-python/oslo-utils/oslo-utils-1.2.1.ebuild
deleted file mode 100644
index d296ce578a7e1..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.2.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-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/oslo-utils/oslo-utils-1.3.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
deleted file mode 100644
index ec97e17280c9c..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.3.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-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/oslo-utils/oslo-utils-1.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.4.0.ebuild
deleted file mode 100644
index 188c50a5cce90..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.4.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.9.1[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-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/oslo-utils/oslo-utils-1.5.0.ebuild b/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild
deleted file mode 100644
index de10241e7ed05..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-1.5.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.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="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-RESTRICT="test"
-
-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/oslo-utils/oslo-utils-2.4.0.ebuild b/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
deleted file mode 100644
index 7e85ff3667ca6..0000000000000
--- a/dev-python/oslo-utils/oslo-utils-2.4.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Utility library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${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/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-2.1.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-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.3[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-# Note: Tests fail due to requiring installation
-#
-# Installation appears to fail due to the use of namespace packages but root
-# cause was never truly established.
-#
-# Tests fail with:
-# ImportError: No module named 'oslo.utils
-
-#RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	cd "${TEST_DIR}"/lib || die
-
-	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/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index c6ec62eedccf0..aaf58e349854b 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,3 +1 @@
-DIST oslo.versionedobjects-0.10.0.tar.gz 124396 SHA256 4207562d99965ec703d753e38878cc536e27930f09a6accfcc36ea2715db273d SHA512 82fd38c02facb55ab2d0cb028ca6fd9bbd8413f5a3dd671bf7086d6522c148b01c500bf3d01fed90ed8e61df33074327d9b5ef1a923187fa7020d7906c11c8fe WHIRLPOOL fbad489e2d7e8f4a3a7cbd35a8bbdf8b94e8664cd2bbb7e31f21798a8700794f2eb5d8393b0ea19e7d659b04e2cb56a799969ccfa851e2137ed6e6f2755b2dde
-DIST oslo.versionedobjects-0.11.0.tar.gz 126752 SHA256 c703c4a8c4cdadb80734021d172cb8e757a20010bc6be2152165a8e3be58acb5 SHA512 957610eae70ee35a40a5dc98ddf6f83740e0cabf142be2ac69c457ad98f9a8f28f8e41dfae08b7b1ec0e2777dccfba664b5e4c5d795feae94654a35f3d5c9ab3 WHIRLPOOL a0d0e7cad5ae3c585b55fcbe2aa497b7461ef37a83481913161265424132dddccf7beacb4255a8bd46095a795488a8db4b76b74358021b2c6238a66d674bc300
 DIST oslo.versionedobjects-1.8.0.tar.gz 132949 SHA256 e727d969a5a89190783bcfa10d2c0d0bfd68d2344be3eb2f1a61ff6f63d6fd59 SHA512 913cf8bfda0dcd24941e4aefff3ec76ace0e4699fc538eee38417f547374484d4916f64fee1c77425ea60d479c732da919077c243d51b51320b2bbfcd3e40422 WHIRLPOOL 9dfaec3590ee729a8be65e6cec98b9d6af5db16de1d615a4932636dab7969b57407b1f68a372c38835ff76c30e4ec0e01214b18edda7c1accc40b5c5cb82b53a
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild
deleted file mode 100644
index 8df969bbf586a..0000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
-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 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
deleted file mode 100644
index 70817dc788f39..0000000000000
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-0.11.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="The oslo.versionedobjects library provides a generic versioned object model that is RPC-friendly."
-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"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-vmware/Manifest b/dev-python/oslo-vmware/Manifest
index 87a1437bbf7de..6ff2d9315e21f 100644
--- a/dev-python/oslo-vmware/Manifest
+++ b/dev-python/oslo-vmware/Manifest
@@ -1,3 +1 @@
-DIST oslo.vmware-0.11.2.tar.gz 102933 SHA256 036cf0ad6ab0d4defd743678999851d570c2ca1ff34eba916920ce54d9a5d348 SHA512 632635adcc09749d0fe8bd204e1b06374e9790cec4d53cbaa06b2afa6745460cd417d60df26cb1e287d6e9de98eaa09788c6797993a06d8649b765a9298d0f39 WHIRLPOOL dd77312f307e5f65a969bae52e52dbab175e4a25f627d3ccf35435ac64c551093b8b67b707388d46175d93f344e2731ebdfa2ba6062ac3b562a00877cc98b880
-DIST oslo.vmware-1.21.0.tar.gz 83619 SHA256 afea2361aa1447efd2bc10d34636beadb718ecb4698d06fc3776ede498bff86a SHA512 2ca607de95d33ec175e09fa07438db8844c10da5929f2fa8d35ef8d63f628508f9c2de62e11ebc496e89c76d93c533413a973ab8b29219431d72770e19dd2d04 WHIRLPOOL 14fc58a01e94468b4eacd78d2d47fff623525edf5a9035957392b4ae5b1179798b3d6c667e87c266d698c861971eee2f24b2b2530ce9b8fc0ccbf2ad59f6c6aa
 DIST oslo.vmware-2.5.0.tar.gz 81830 SHA256 cb1685acf7cb11be4cb72412c078d7b21350c4d34fd36e9a57361a4a51df018c SHA512 f5cc084e235fa48931744a30f6d8e1c42a95bf34b97a9adeeb79d29939b8feb76994de96e8e78b323436fd43846be5a0d2d1b140472ecfe99d33e77a2e28261a WHIRLPOOL f57db75ddb55c5a012dce85dbe86f03308e4f8ea577d9ad7937b7c3ab2f9e57ea6712de4d540480da1b8038ca3242383421d1c13300093fedfd8c4caf6cd62cc
diff --git a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild b/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
deleted file mode 100644
index 27e11249ebfcd..0000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-0.11.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo VMware library for OpenStack projects"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.vmware"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.vmware/oslo.vmware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.vmware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/suds-jurko/d' requirements-py3.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild b/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
deleted file mode 100644
index 847dabdf9bb8b..0000000000000
--- a/dev-python/oslo-vmware/oslo-vmware-1.21.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="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.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${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/coverage-3.6[${PYTHON_USEDEP}]
-		>=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}]
-		>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-"
-python_prepare() {
-	sed -i '/^suds-jurko/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 0de7a8e3e4632..4458c5ba15c45 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,7 +1,2 @@
-DIST oslotest-1.10.0.tar.gz 26092 SHA256 da198416f07df43a1b5c9e02bf05b3f1b7057dd81264b2815bbdfcd610f17650 SHA512 34b017b5adc56578b8893b3858b00c7c59bf6d915cc89e3db00c60cb92ae83af88cfee350c9fc14e477d34b3534d3ea1c08254bd0851e7e99f7e19cca2a85f09 WHIRLPOOL 2a17a69bc4f5148b1b386f664b9f3f5d78a1faba36916c418cf1fdc8397963da715530c9203e66ab541d3cce70e89901f264a26d612298b111f75ade116eca8a
 DIST oslotest-1.12.0.tar.gz 26452 SHA256 c6180413e92379ba4ebe010393580da28baa9ea8206d5f56adbc055e3d14299e SHA512 ee24864d3fa9563580423249b48ec6dc4fb1c559a52b621bc8324a5ffe47152caf8ca4dc21f6b767f3868dc5782b56cb8480d859452629d37c2b5005bb4d3790 WHIRLPOOL 412709c36880610155e497eaf84d8bb499850de2ac45cd170bb3e6f53ae03f0b3a60af40fdd6959636e4807ff1e996bb93ceb8d488d5e6f2ab762374369ca90d
-DIST oslotest-1.3.0.tar.gz 18084 SHA256 7c29dcf2289b4de8b3a64764ae617626e86bda948746aced80c49452df9e038a SHA512 f2db5ba6eedebc5937cbee94aa18e3b5ea9933d833ceb1e3906a18d7bc2bc9b423c7608ecad4ab4f8e9099a57ace1b610259a8b1dd7e8ad7f1d60a46ba717bcb WHIRLPOOL 2a4bd1e55ef379a0c7fd413a79af35e208ec3ff90b90fcc84bf36bb2e1a17bc3954545d81e32de4adf410872832b763e470dc3c99ce1893cea5dc1339df9d4ae
-DIST oslotest-1.5.0.tar.gz 20622 SHA256 df732f8bd4b6b5d6869e4b570624c4a0ee3f906bee9b4cd70e8933b0dcef5586 SHA512 9e4f335d8eaa9b4c22f127b43ae5a96cf036ea0238b557a549a2b3b465e5f06e7b4c58a72e752e6d1be40a9dc6cee6c331bca4635679eb80c0a36d858c195ae4 WHIRLPOOL 552cd5c5e96634d39fd334619807645eb8258879c1048771b64c618bca3497a1c9449b5b51111a86c7b231e9721a4982b6679fbbb22bf08d546fdbe219814498
-DIST oslotest-1.5.1.tar.gz 20723 SHA256 8123fb3471d82b141614728e66beecedecdd33c2844d1ef0c14c89b833339981 SHA512 b69770d260060bfec4185a3d1484d304be0e48c4dfa6ab2613eb3a73fd046eb3b0ad90ed061d8c6cca65bd3e76d7fdbe8832a73ea6674e5c9aa92d7a3978322f WHIRLPOOL 777c6c8a93502e795b3c61ddab62d8b3dffdaed62b65f73b6c63180721a00b4a64fef48a631919ef75c3c2b7e42237d71be78548ef62198113e27ffead4c1ef9
-DIST oslotest-1.6.0.tar.gz 21226 SHA256 cb65b53b753375b669dcdb4717c362a205d19e3d16ca26310c0916cfd359354c SHA512 e7eb97dfde919b523c302d7dc495d835791c646b98ce579a6056e2412b93c1791d6d7e2c8333d142b89f1e7a414f1d5c61a321b41d8ad0ba4592227f9e3073a7 WHIRLPOOL 3b8f984f9adccf9abfdd70f5b593a16a0061bac0705c3331d0065a1ad6bc4a97b402e7f4e757a22f01e203980865510bf7741baffc9ede77ad1f652e15b6dfb1
 DIST oslotest-2.4.0.tar.gz 26392 SHA256 cad9a20b4c26a691e947b826c37ea393c35384ff3d9091ac83c8ad4201795b0d SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886 WHIRLPOOL e8a5b8dc30bf2aa68e58c07d3a9e2067aa8d037022d22bdc9351950d70f922b61ec7e907652ae04886cd918bccf84ec4f409dc0604cb2a34af87780f1912fba2
diff --git a/dev-python/oslotest/oslotest-1.10.0.ebuild b/dev-python/oslotest/oslotest-1.10.0.ebuild
deleted file mode 100644
index 4e04566a0743a..0000000000000
--- a/dev-python/oslotest/oslotest-1.10.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-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.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	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="
-	>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.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}]
-"
-
-python_prepare() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	else
-		esetup.py build_sphinx -b man
-	fi
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/build/man/oslotest.1
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslotest/oslotest-1.3.0.ebuild b/dev-python/oslotest/oslotest-1.3.0.ebuild
deleted file mode 100644
index 31caf8acb008d..0000000000000
--- a/dev-python/oslotest/oslotest-1.3.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-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-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-1.5.0.ebuild b/dev-python/oslotest/oslotest-1.5.0.ebuild
deleted file mode 100644
index 98d82ab06aed1..0000000000000
--- a/dev-python/oslotest/oslotest-1.5.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-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-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-1.5.1.ebuild b/dev-python/oslotest/oslotest-1.5.1.ebuild
deleted file mode 100644
index 44c548dd08177..0000000000000
--- a/dev-python/oslotest/oslotest-1.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-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-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-1.6.0.ebuild b/dev-python/oslotest/oslotest-1.6.0.ebuild
deleted file mode 100644
index 54cf71575854d..0000000000000
--- a/dev-python/oslotest/oslotest-1.6.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Oslo test framework"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc test"
-
-CDEPEND="
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10.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="
-	>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-	>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-	!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "coudln't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use doc && doman doc/build/man/oslotest.1
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "man page installation requires USE=doc"
-}
diff --git a/dev-python/oslotest/oslotest-2.4.0.ebuild b/dev-python/oslotest/oslotest-2.4.0.ebuild
index f04938d5300e5..13f3b9350f8d0 100644
--- a/dev-python/oslotest/oslotest-2.4.0.ebuild
+++ b/dev-python/oslotest/oslotest-2.4.0.ebuild
@@ -14,7 +14,7 @@ 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 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-barbicanclient/Manifest b/dev-python/python-barbicanclient/Manifest
index bdacbf66722a2..ad400f2f5dd54 100644
--- a/dev-python/python-barbicanclient/Manifest
+++ b/dev-python/python-barbicanclient/Manifest
@@ -1,3 +1 @@
-DIST python-barbicanclient-3.0.1.tar.gz 38349 SHA256 d298ee0fc9e785d44148d4590ac0d9eef05d560e379e98f75a7cb35ed6bfc7c8 SHA512 354d46e85d15af1b91ed4ded55918329d843b7b9d8374bb82a9fde771ca5e71336ecd2bcde65217338f85ffcf8910abb686e0e8853cb8bd0e0022c5298f8392a WHIRLPOOL b68f792f89df005bd1c14cebb44d6b4ba4aa3d391d66daf9714c74bbadd103f40785e8c9ebb8585a64608b3ff7e47ed102284efeffb1f30d49c2a6d5c9886446
-DIST python-barbicanclient-3.0.3.tar.gz 62286 SHA256 959aca2ce3af2eed0f57e2fa9f0f9a484e40adc6b371e2c0fcc588aae9ca2b18 SHA512 0974af19781029b75e9432005fd1a50a3026531927f3718bf42b999e20877cc126a0bdd37c2de311978c132a0bfa7dbe186eb4f2cc022b8aaf2b7dc3e5c9c794 WHIRLPOOL 36635ebb89a22c898a70ce77f3dee4a88fa6969e432a63b3d554ae5d0d53cf7d5cbc29d6e63300a7acc543a9cfb0428c1ecd71c1c13994138b5c3d490f5a1d9f
 DIST python-barbicanclient-3.3.0.tar.gz 82210 SHA256 d5c68354fb5d18a6fcdcd0a0788b3f502dd6ffa57a2e47a1426cce2d63ecb6cf SHA512 9c9ea055a375cb631f081ac0dc54ff20f60e6f6c3340b0f0a92a91eed4858202d9f85e00b662a8b3b7b5183633d8f5500f6925df5a182b20046d66be48b34e37 WHIRLPOOL 94a1d91a2bb8c8aaddfe775e7a5e955eace20e75e6c75707bd56aa62a1538193161d14534c1cd9d91ece5fb57a03f0fa7e71370531c576d1f5c35a0ed113830b
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.0.1.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.0.1.ebuild
deleted file mode 100644
index cdda7da27b5ee..0000000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-3.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-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 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.11.2[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild b/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild
deleted file mode 100644
index 063d5be387be4..0000000000000
--- a/dev-python/python-barbicanclient/python-barbicanclient-3.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="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 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-	<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-ceilometerclient/Manifest b/dev-python/python-ceilometerclient/Manifest
index aeb8f20231aba..9a29a65fb708a 100644
--- a/dev-python/python-ceilometerclient/Manifest
+++ b/dev-python/python-ceilometerclient/Manifest
@@ -1,2 +1 @@
-DIST python-ceilometerclient-1.0.10.tar.gz 77469 SHA256 bbe29a6c85af3ec0bcbb7df1863bb3c3c620fa0423c67f25bd089e0ab7b33059 SHA512 23c9419ffb7610965fb0950e2c60d3f78724b23116a457c36b822c986988aee48c2b3d967f179b68769288f425c0a2ca17c25e90a41bdd487122f03ca42962dd WHIRLPOOL 798e0a0d516bf08f8be904fdba462dc2825de728a7bcca1a5e7056b035ddb992751cd9652968c5ec43dd0938b18cbbf387507b45c5f6b5c54181977609c8c54a
 DIST python-ceilometerclient-1.1.1.tar.gz 87597 SHA256 f48e2d9ecef25ab784510fa0b299d0d73aa8f41652abf9f28393a93612416a29 SHA512 ce4768e67c6a5871ec52de433292c6328d387d94860f808f63ab9102f96ba3ca2397116792a5b907d9037290a31c2780149481f1f12581e0a9dd585f4e8d0909 WHIRLPOOL 6ec0fba808036620729e984ce66ae90a9a45a4a1167ad25dc11e2da549406cfea12758e80574a7cbcb0dc56c99138918c834eb57ad486821c050a6812e425e03
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-1.0.10.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-1.0.10.ebuild
deleted file mode 100644
index cbb994b2d5c82..0000000000000
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-1.0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client library for Ceilometer built on the Ceilometer API"
-HOMEPAGE="https://github.com/openstack/python-ceilometerclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	)"
-RDEPEND=">=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run || die "tests failed under python2.7"
-	flake8 ceilometerclient/tests/ || die "run over tests folder by flake8 yielded error"
-}
diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild
index 36ef774a76739..e7c4f26bddf64 100644
--- a/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild
+++ b/dev-python/python-ceilometerclient/python-ceilometerclient-1.1.1.ebuild
@@ -29,7 +29,6 @@ DEPEND="
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 		<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 		!~dev-python/sphinx-1.2[${PYTHON_USEDEP}]
@@ -42,15 +41,11 @@ RDEPEND="
 	${CDEPEND}
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index 0a5711b2ddc69..b99d4893220bb 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,5 +1 @@
-DIST python-cinderclient-1.0.9.tar.gz 136309 SHA256 e146e370c9a6e4aa44e8f0662fd33aec532f3965bae9fd564360c279bee03f97 SHA512 102e0ffec8aab143349f51e29b1265ea564b4cb8eeb9a546e353d6a9ee1ce08f8c258776ea96975be1d55f53ebaaa1b0fc01d7b7a12cde7baf5df8142368ed43 WHIRLPOOL 2360f4efcee62286cc1e45ca28013ded25b473d9a13e6e19ac53d811c2285e0031732077fae60d83b59a6abbe637406bd5a539348168f1884739381379b44bdf
-DIST python-cinderclient-1.1.2.tar.gz 153104 SHA256 d364b627fbcbd049b2cedf125fb6aa06e2ca6213208f92b7ea393a7e1d7ecbe2 SHA512 84dc5bc89c547b05b9f305f6779ea2a47f2f964f985580d1555d0183da89c7e617433bacb11f2af23a1791a549de045e55d021bdb65f06def01062349a8cbc7e WHIRLPOOL 12082f19db2a583f9576396f20bf81f44b9769e9e9dd8e07ba54fb3cfce70a061f2e657949cf082abfd2a7f091387463e4e29065b9457d02051f27eb20cb173b
-DIST python-cinderclient-1.2.1.tar.gz 176466 SHA256 c9ccb89960b936ee261a9d6aac3895fde9b5c68e8c8e87d66ad3298a13bfd460 SHA512 ad27a7e32fc9da3c38abd5ca9f72f771229b00ab8a9f9f52c4001997afec194bda5270307ed2506747070f07e804952fef374fdb14ac75b646fb3dc6548aaea7 WHIRLPOOL afc4e2a6f5fa2917be408752f56215e5ee1c47dc6a952d5f6d294505a3c0843254136e5afd5370b9554bf6dfb97a47855e7b42122bdef0528d80a08f2feca6f6
-DIST python-cinderclient-1.3.1.tar.gz 178094 SHA256 59ae1fbeeda7a12ac8635a7cce9bdc5e8bd080707e2dc12d858857713db1d233 SHA512 01b090e782318a6971f73ca0e6b5b8056d038db3073e93fdcb81c35c876d039782361b1ab1048b0ae51dbf0fdabc3b7a3b655241b8cd46418f0aff900c33f5bf WHIRLPOOL e35fbd323ef5be8dfc9bda1863c7521319517df5b57abb2492e6b06bf7248b940f9f62107e044737ab179bb69553d6bb464718cb55e8fa773e76f0207b887710
 DIST python-cinderclient-1.6.0.tar.gz 194134 SHA256 b00b7ffc3394b7ae3f8804a10877f7c980ff65f66d7b0d4b51bf4526933951b2 SHA512 421c665be2d410f511c751687df438dc268c4d2ae5ca83d8ee2d37d3b61cd08f718851c65338e14c8cbb8304703b5f9acf98611246ca6866c5a31cc3dd86e39b WHIRLPOOL 5e3f3326ce1ccd1cb555303b0d9f5ede0cfd4c329a490f79f88ad04e2dc9d6123d294b09d393a2fd7274f5b7a3696efeabdade9b39bd93da5b7e9d421b0e0fba
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.0.9.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.0.9.ebuild
deleted file mode 100644
index 6afee41c7dce3..0000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.0.9.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
deleted file mode 100644
index 265f9139402e8..0000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-# waiting on hacking 0.8 to have py34
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-				<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-				!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i '/^argparse/d' requirements.txt || die
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild
deleted file mode 100644
index b906e7fafdce8..0000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^argparse/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.2.1.ebuild
deleted file mode 100644
index 5f29420ee3ff5..0000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-				>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
deleted file mode 100644
index fda73cd602218..0000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-1.3.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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="test"
-
-CDEPEND="
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "tests failed under python2.7"
-	flake8 cinderclient/tests || die "run by flake8 over tests folder yielded error"
-}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 72793e3d25f4e..d60f0d6d3baec 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,3 +1 @@
-DIST python-glanceclient-1.1.1.tar.gz 149875 SHA256 285f59e3e9d0ab887bb747f5c5c58c4ef87330bc99ea947ce649e3edd308a9e8 SHA512 7b2dd86014f78e5d0e2222842d4dd29da9922b0aea7a4097e88a013eee9849805170e2825426d611806edaec89c27ea055a699137faeb51e85a2cfb8d1729c0c WHIRLPOOL 80bb25c9338dc9e10065c8f8330b09e6d0f1fd85aff984d790c3b7c38fd87f8224a2d68ae6a04a6fe147641bfacff343f4e91e60cbc16dfdf4b3b9a30bbeed4e
-DIST python-glanceclient-2.0.0.tar.gz 156008 SHA256 c4e791ef80e1b60997fa612e7f6ec506969bc6247b53d66988c2829c16b3617b SHA512 c7846b86b8d02cf34cf53bba646ef93aee909fb6dfc4a6791780bfd25cd13f2d2fcf49c2cab50ae9a96c8743404386b32ec3e0127c990fbbf7d41c8319e679b2 WHIRLPOOL 07e0307d516fce7195d26b038814ff4edece5cb9497a4b8bb78c3e1a0adee8b60a5a59207574da9be82e225eec75dadc4570b275741334560d014b15171c5fb8
 DIST python-glanceclient-2.0.1.tar.gz 159091 SHA256 77e92a256679ebc76101198482ca34dd0b636f12313c4aa92132b831064b3968 SHA512 48253d70c50ad5b671e0d662612217f76e79b2e15ec1714d578c85ffae3d6b18e019f90946d11cc90e41b981c6bb24c7f47094c046892fdee33034689631af53 WHIRLPOOL 55ba594d226a9dc9bc7d007b7f3bdabed5be084f0c204b93ad604e854ed9db27f180817b8ec0510c06586bcbfc8b7998b20f7777f61ac23fd56550ef08d91abb
diff --git a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
deleted file mode 100644
index de48ad893c1a1..0000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-1.1.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python{3_3,3_4} )
-
-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}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.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-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.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-1.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^argparse/d' requirements.txt || 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-glanceclient/python-glanceclient-2.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild
deleted file mode 100644
index 946babc4723bf..0000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.0.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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_3,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-1.2[${PYTHON_USEDEP}]
-		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${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-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.14.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-1.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.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 '/^argparse/d' requirements.txt || 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 fd119ff283f20..13e7bb52be525 100644
--- a/dev-python/python-heatclient/Manifest
+++ b/dev-python/python-heatclient/Manifest
@@ -1,3 +1 @@
-DIST python-heatclient-0.6.0.tar.gz 109553 SHA256 fe293e11d145d86b92649063eb50d1f599dab88a327707d76a72b12022b77bbb SHA512 04b8836c212a8825b6ffb839715df881189a08e3c587762a661744bdd730d6aaf99c9e3497642011b0696692c856e12131bc8d1ff6a69cb88ae5b48aa3872b39 WHIRLPOOL 683497a0363ce636499af5866838242ef1fc2769c54d5ddf32e8dcfd5d0d2f3b648d46c0bb59c14bf1043875bf65ec99b090add1a289c9c95d383ce5ba918e3f
-DIST python-heatclient-0.7.0.tar.gz 119131 SHA256 6f58a3c759056dbcbf071e1707d6649e6d15cfc710daa1b98e9703b83a4a01c2 SHA512 5c9f12b08abaa9ff07a0dd72ceef7b205ae2afeb4d8900b2e1c3f709fc6df63f56f9d31b45acc17cfb51a1ec849bd3cd271877d9489c40d665488346531c97f0 WHIRLPOOL 0c911dca2dd48229c83ff83bcfa699d07e0ea39b3bbfff5bd3e3e7fbe62fa747ade252bb7ad320334c4bc9fd481c2c528058368d8828e56c20c0254105559035
 DIST python-heatclient-0.8.0.tar.gz 121399 SHA256 5cd1c855ee21f18bfffbc7269e40c417b953d0855aa3cc8b56d778b8612467d5 SHA512 c17d445e646c3fc2f10bb622ba2a38299182e0a7841e0dae0e7c4482bc4d8868569b2204c18dc98456507d6f5abbf64db0b8e06c21bacf360883b24bfb01efc1 WHIRLPOOL 9c0b41d01458bcb3b26be163fb1e9e557b37fafc26d9698df73cfe722f8e02b991f36731e42bb5de88f2c7c3c0d86ee7154e1da76c99755cf9b7dcea0d79718e
diff --git a/dev-python/python-heatclient/python-heatclient-0.6.0.ebuild b/dev-python/python-heatclient/python-heatclient-0.6.0.ebuild
deleted file mode 100644
index 04018403e4d9d..0000000000000
--- a/dev-python/python-heatclient/python-heatclient-0.6.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.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/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
-	ebegin 'patching heatclient/tests/test_common_http.py'
-	sed \
-		-e '645,/def/ d' \
-		-i heatclient/tests/test_common_http.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
-	ebegin 'patching heatclient/tests/test_shell.py'
-	sed \
-		-e '2116,/def|@/ d' \
-		-i heatclient/tests/test_shell.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	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-heatclient/python-heatclient-0.7.0.ebuild b/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
deleted file mode 100644
index 12ac0613605ee..0000000000000
--- a/dev-python/python-heatclient/python-heatclient-0.7.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${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-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || 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() {
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1313257
-	ebegin 'patching heatclient/tests/test_common_http.py'
-	sed \
-		-e '645,/def/ d' \
-		-i heatclient/tests/test_common_http.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# BUG: https://bugs.launchpad.net/python-heatclient/+bug/1375035
-	ebegin 'patching heatclient/tests/test_shell.py'
-	sed \
-		-e '2116,/def|@/ d' \
-		-i heatclient/tests/test_shell.py
-	STATUS=${?}
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	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-ironicclient/Manifest b/dev-python/python-ironicclient/Manifest
index b25371c57c48f..0f188534ddb53 100644
--- a/dev-python/python-ironicclient/Manifest
+++ b/dev-python/python-ironicclient/Manifest
@@ -1,3 +1 @@
-DIST python-ironicclient-0.5.1.tar.gz 85524 SHA256 91dca5039ca06d6dcd74a132a261db1d85ebf6dcdfb9d7cee4efff657f6729d6 SHA512 787052c79341f44df1520c1f94a59574cb2a6dd5ecbcd23c5ced6dcec75decb310f082fdc5dc6d0ac7c86a8007fcd72ebeb0c25ca940e4e4a4eb635b661c10b8 WHIRLPOOL 4e00b4733814ce415a5dbe551f48e0367f5fd18733c3ecb171b06321c4145330949df2627b51797a2c4f8eaf094379d58e7c329bd322925c752a46394e89cc2f
-DIST python-ironicclient-0.8.1.tar.gz 88622 SHA256 db140db02f0c61f349b9cfc9aa07e01c05b8288c9bd1f844c1752e6947588aa8 SHA512 516924ff0dc4792fcc70f5733b76baa54a5e8e5a69a0d902ccce16c71ba7749b124a6892b03f45bafb2ba50a1f267c0242b00ddc4139693b230f6c380e52de39 WHIRLPOOL 83bd8977d313dbbbb6c627a6e5a25298c437d30b3e3fbef2710dff00c80a48af2b2602735c6e9aedb6517bc2d9850f0b9dc50982ee58ac7c32ac18150516c24b
 DIST python-ironicclient-0.9.0.tar.gz 95562 SHA256 8de88260f30625c6eb8c38fa3401945b510485e00189edaa18ca745b738f6a9a SHA512 324aec8ed9861ce2df4b7783b7bd8b98e30efbc8775ddcb4668f760d8916248df0d32def5cb2d30e9e743ff30e5b6717c653ca6e5cb9ea25b536a369ac45be5d WHIRLPOOL 8d992fff69724706b0a2becf84fd2312bba9be59e7b7103f39a0d5905553d9926510ae6dedd28c4f8ed51c179ddfa2cee97f78c7d2cdc59bb86b8b2fd9cb75de
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.5.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.5.1.ebuild
deleted file mode 100644
index 9022be3be0a5c..0000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-0.5.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-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="test"
-
-CDEPEND="
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		!~dev-python/httpretty-0.8.8[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${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}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-python_test() {
-	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild b/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild
deleted file mode 100644
index dbeeabc20027c..0000000000000
--- a/dev-python/python-ironicclient/python-ironicclient-0.8.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Ironic API"
-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="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-"
-CRDEPEND="
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.8.4[${PYTHON_USEDEP}]
-		<dev-python/httpretty-0.8.7[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${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}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	#rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 01b3620fe36bb..e0a9174a4311e 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1 @@
-DIST python-keystoneclient-1.3.1.tar.gz 338187 SHA256 8a421dbdf01251119164bf6baa0ef78b261e5dd4d3508748e47b77d7652e7e92 SHA512 d11825b717d0aeec67d4dfb0382173ee834fe3dea2097b8ff9505b86bb08a5579d6fe87509d65022d4436a3a1b4d20f2a877ece3160b53979999495b77df0f08 WHIRLPOOL 9aa0af722f56eb4d98d7efb8a35b1db95207970fba0b32496a9ae4593a16471f976efe1e9bb3690106ec0f5a76b5a744e9177cc7c03d9ffe9ed54111e3bb138c
-DIST python-keystoneclient-1.3.2.tar.gz 342434 SHA256 1b2fd5ceeefd8d75ee749acd2c3dd8805c833c89828075b814392069cd5ae1eb SHA512 4cd986c42256fbc366b81c07ab637fe81358dde530a8e9a5b3f59f4deef5d56fb1799fc82d35a3f04d3e3b810c94bfc21235e93a77c925d235322aeaa20e420c WHIRLPOOL 65b776c928126f92108c1585658a10b89e6563ff8e71f8f249fdb86e11b29811de12b17ddddb39845d66ff9533ae44d93148bd811d1e31577092c3b598348c03
-DIST python-keystoneclient-1.7.3.tar.gz 355578 SHA256 805a317c92cd8700a4733ee80f383b2187de75aeb8e9895015799628df97c68f SHA512 36682247de6c6afee2e0cdf35115b4e6adc4bafef05311337e3299f97a8608a967ca537e8aeaea2e030344a7a8a103c627ff7d118c96c75ac1d169e1bc53d1af WHIRLPOOL 91f6744ea96f8343f1e6665e6db4159fa7d48e9cbc891a8c14aa5bd2165437f9d242f3ee9c960502fda0e26ab1669abec4b32f12be1c79626fe67f6bf25c2137
-DIST python-keystoneclient-1.7.4.tar.gz 356596 SHA256 0bcf562831c4552851f1fa5562f068efd339186a746baae1786498917dc78803 SHA512 c5190e874804baa41f7a4f816eaf974dea943dfbf008a0c66893113168747ffd3910a87dc63edce7f6d4b52ceb5f6f255383a2d88d79a50f4d75d337b3421b46 WHIRLPOOL 172193536486edac34c709355e09e0a1eba9e794f483134c4fa1c33d965f26c573012bc60006dbe707f4267b4f807fade509d67ab56cde3d0285e0cf5a9e0831
 DIST python-keystoneclient-2.3.1.tar.gz 322240 SHA256 89e93551071cf29780eeafe7a61114cd36b1c2192813d3c2a58a348a6a3ac6ff SHA512 555ad57332ea677242057c34313df0d02a16f5738c584db82611db3e3636e792d30b9dc5ea371ba56a4c3b9a158ba879ca38ff5fd40ae842f8be98e52ea856d8 WHIRLPOOL 095ae83ea61f356a46fc2f8e135ffcb46db205a8bfd9b5b3acd0e7b4baacfa97d315c1b1ae3c422769e683911591d67bdbb5ec21728af91fd4eb709c0f6c3df1
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
deleted file mode 100644
index f18e2c985ded9..0000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-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 examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		${TCDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.1.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.3.2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.3.2.ebuild
deleted file mode 100644
index acb6632369f96..0000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.3.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-HOMEPAGE="http://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-	>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-	<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		${TCDEPEND}
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
deleted file mode 100644
index 4a835e59f997a..0000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-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 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=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-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-1.7.4.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-1.7.4.ebuild
deleted file mode 100644
index 4a835e59f997a..0000000000000
--- a/dev-python/python-keystoneclient/python-keystoneclient-1.7.4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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_{3,4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Client Library for OpenStack Identity"
-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 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-# Note: blacklist version not in portage:
-#doc? ( !~dev-python/sphinx-1.3_preb1[${PYTHON_USEDEP}] )
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-TCDEPEND="
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/bandit-0.13.2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${TCDEPEND}
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/oauthlib-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${TCDEPEND}
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=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-1.3[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-"
-PATCHES=(
-)
-
-python_prepare_all() {
-	use doc && esetup.py build_sphinx
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	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/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 55e2201ace3c9..880344fc51d9b 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,6 +1 @@
-DIST python-neutronclient-2.3.6.tar.gz 123143 SHA256 f2ae938654497e12218ca3105872a1d55c5ce06e19ed0baa8471ee024e494b1f SHA512 0d894ca7cbafe3c4f12a45e27953abdeedfeff009d96bc6852465089f64ee57f065d87067e79665a401e574100115eec8ae7bb7a220005955be4535c7a44bcb7 WHIRLPOOL d2f3aeda0894bb2f262b7761af6f64ecb80a3c15ef68fd4a6eb257446bf647e96eee5d51f692071ac776ee8c3f26ecb7314d825826070e2ddfbfcd84257e466d
-DIST python-neutronclient-2.4.0.tar.gz 137923 SHA256 4c5c3a79216c682926f75ffd8db5f4338525a643ea02de37df7bf82a1e486b28 SHA512 ce3407ec101ca0fe04da5fbb3d68e3e331824190ed6e93308e56a471b9bf1b0d873f6e7b733d205bccaba6567d87a0a829e442efb6a3b0d96ecee5a1abb5a071 WHIRLPOOL 28b798ed7605264ec6d1e69f4a98ba7eb7e825594dc0ca9d5941d5293810c4f7cd32c680d09be44077ee269f8bd0c8644543c477223d5b55f078f81a0993460f
-DIST python-neutronclient-2.6.0.tar.gz 141675 SHA256 ce72506c0720825edcb0e93b643340e044f1de9235d398fe1c45d851971020df SHA512 a14503ec5374f0edd647a4da5e75f5d6820388b73792a9c944537815e980e87890fea227b2d21e34207958350f6e08a002e6f09af5567e1b4d709e698ea040cb WHIRLPOOL 7d3e6b0baded7de81f2c010376e8b528a73715382a230ffc6790eaae58b54e9cb5765002d2a508953b22a498d5a60947decd0d2884254cb2cc12f7ae1550596f
-DIST python-neutronclient-3.0.0.tar.gz 147616 SHA256 f6dc2e514e99df4f7eaf9f983a19344a5f38adf323d71f2908c872f8eba88e2f SHA512 f985c054f614d8ec2102d5323e7320c578dd11685f34d5e3f791c0ea3efea3780731da0f777a1544250029cd6dda8484af623c1f4537b45e49386e1ae1e9820b WHIRLPOOL f3323f28c36461b2b64897bd69d9453cf0f91c6497126e3e0d539652711f653e20ca340dfcce429f5342cb9a9397ccd42783a79d1c4baabf108aed569d50b521
-DIST python-neutronclient-3.1.1.tar.gz 148206 SHA256 ac3b695f55e30e17e7f27554780adf413cb7b878be5b922712d7f8357a6dbcc5 SHA512 9b125befd971f3892388d2ded378500889525641918b53588e353503c75f4ef8005c2ece50b2df87c416b258de770b91b73b143f84a4901bdd7d804a07444b08 WHIRLPOOL 0e05430f5d1ddfb0f769624d648f2f6414b141a6d635941b1b416f98d01cbdb18a0d7643196547ae15bcf475ff1c946162ddd3c3547e2a162eef6eadb25a5926
 DIST python-neutronclient-4.1.1.tar.gz 187794 SHA256 4d5c60358272174afb019d68940f67ddad09367b2e6210e3206d19566777c293 SHA512 654a7e8d98b1b6c3fbd1a183196982ea8bb9a0a97707e7a4ddb4cde47a97e93c3356961193c305b3ab33cb8ee2273b1a941c2655e1f56a3e2a8131deaed54922 WHIRLPOOL ead87cb41f57f285a03583ca91e843a0f9c4edaefaa7020d38c949dbd56d46611f44e36c087a9684d2e87c0d236ff8124022b2afacd9b8438b6b8b6716ec9c81
diff --git a/dev-python/python-neutronclient/python-neutronclient-2.3.6.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.3.6.ebuild
deleted file mode 100644
index 8e6f5853d3f87..0000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-2.3.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack 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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		dev-python/oslotest[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${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=">=dev-python/cliff-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_:#&:' -i doc/source/conf.py || 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-neutronclient/python-neutronclient-2.4.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.4.0.ebuild
deleted file mode 100644
index 9c7100c30c879..0000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-2.4.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.4.0[${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="
-	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-	<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	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-neutronclient/python-neutronclient-2.6.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-2.6.0.ebuild
deleted file mode 100644
index 05247692cb2dc..0000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-2.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		<dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.5.0[${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="
-	>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	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-neutronclient/python-neutronclient-3.0.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
deleted file mode 100644
index 8989eee94760b..0000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-3.0.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${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.14.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	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-neutronclient/python-neutronclient-3.1.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-3.1.1.ebuild
deleted file mode 100644
index 8d54f9cd1ae17..0000000000000
--- a/dev-python/python-neutronclient/python-neutronclient-3.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.0[${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.14.0[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	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 8b6b6fea3dbd0..ce595740d12d5 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,8 +1 @@
-DIST python-novaclient-2.17.0.tar.gz 230712 SHA256 af6f46890715eb5f4e0d25a714effbbac8da020715f81b1572a301c5e9887197 SHA512 6493aadab5589fb2a02c4a1440cd3f71e6918688ba634a89101c7c7b10aaa6600d8511097b07679f5927746c3463584287a0d7602a47397f169697a944b6a731 WHIRLPOOL d7523bee3ad59e40e021177cd98dff5a91136ea3ee56e2844857dced5b9af7a2bb47c5880d9fe0d35e4de9a022864c88e009b71ca762dea84eb139ff5b99cad1
-DIST python-novaclient-2.20.0.tar.gz 267956 SHA256 73fc8169d58e910340aae1ac5370c3b63a9943f748e2a20e4a1dfd7277525c86 SHA512 a1ff87b46d1520346380bf5396383d84e036892f1568d2eb201eb667837919e1cd8db3267a1ea9f6dfc616de0714374c81465de76b8a9bfec32c4742eeee3807 WHIRLPOOL 1fb3052d3fa457524c65b3de087a7cf7377d274b7a9d924529289e2e2b02992c5182cd1ec5aeef443a81c8e1d08fa1202caf6c5e12e3df40b5011f75df0837f8
-DIST python-novaclient-2.23.2.tar.gz 224170 SHA256 730cb006395b2df336bbfd75aa2f459375594726a50fe3b9126212ed487fcf98 SHA512 a207afcdb14e811980c6f3962342e3aa4da52f2e9663f94dbbac78b9d5e1e5a555d657b61948acf07cf238eaf04e32b9e440e9495adf80e19e8877e5e6510bcb WHIRLPOOL 8bd7c7f3431ec9dc78ed023e15227c5c5d40becbb9ef06d6fee65d177732af8d98154b27a39da722716ff9fffab7bc0c9790306d5ae184c4335361ac990666a4
-DIST python-novaclient-2.25.0.tar.gz 228156 SHA256 433e314223218031e7ea6e71baa54c1b13485d47fbb128ed3752e2a72ad7cb83 SHA512 b65495e94da9d42aa6eb51090ea7c2af6784e74121ea96c7021d013b8570af1df90d993df332b92274d5f92bc634149ad14616804e68e93fb4529b6b15dbb5c4 WHIRLPOOL 7401147c278a23768e18998b90842c6c17fe2c9dfb28cd320dfe0dc6ce7afd2e0481d6275deb82a4ce5c3ac826b8303390a8d80c011a242c4bed0fff2e446615
-DIST python-novaclient-2.27.0.tar.gz 242744 SHA256 d1279d5c2857cf8c56cb953639b36225bc1fec7fa30ee632940823506a7638ef SHA512 f3594f6ee1edb431881e0ccd4cb97b4e631fee5cd6ce6874514bb09079837e038c60dd1bbba2807fc10271a8b8a96304c8aedcc18e7c40811a99d97594cc1414 WHIRLPOOL e79c23ce7ae5ef20e40ed1ab3fa01d8ba2be3b85c1c19fe2fed0c2425849cb62c4ab67464d771306c630b9406127196b5820a642b3b9c7c1664d2ca229da5a47
-DIST python-novaclient-2.30.1.tar.gz 258139 SHA256 e46564255c5a66dcd1c16a0a96fca7bfdf3cb4720830599b08447e174cd7f7f4 SHA512 0deeca5c48e31063d0d8bf5e86f85869c42f4d9806a8b0420e1e419773ef4a5784c8a4295a48b83c9cd4311aea60155bd489fd916f2e290b029b83fd856ad938 WHIRLPOOL 9d8a098fefa1bf400c6d26aa9d26d12dfdf4aa56c89b4552748cefca1eaf0f90af3d19f10a1e39d11c459a4580cfdc82e2fead1401ade8634d01af18db97ce30
-DIST python-novaclient-2.30.2.tar.gz 261535 SHA256 463af33360dab3c6f8676e2005331739be12da566095e6ea69e04466c52248f6 SHA512 cc37dd11e8772bc6f060cd1fb1750b5fc98b7353059bd17b50aeb81277a54292fc96d6533a2c3008c6ed2ce08e10a84efe4ac52aca4c2585a24da29bdfd7becb WHIRLPOOL 8741aabf9df0fdb9fbdf57f2ce36de9aa8b455bc4ce1abdc0c296021013a78283c7d3b07c3cce707ae706f09d39f9aad8fbcc6b4988624a0e5a313f033e8ddaf
 DIST python-novaclient-3.3.0.tar.gz 270526 SHA256 3674e9a9e3d2d9cff4a7e625e299780195e04df52361a58d94e7db4fda88739c SHA512 218e176f105211c77e34ade6ab88012d880f836afcb60628eb470d07f36cba4f051fee92f9068e41cb07124a36d4ca4db48b96ac52edd36963489ded5e974741 WHIRLPOOL d719debd25151b19b7b308dc498faea247c51dcea3ba79f0d803be5114f888dd412ab10d49c5c34018890df7b51a7eba8c15b1c59ac831f6bf80a33a87b120e3
diff --git a/dev-python/python-novaclient/python-novaclient-2.17.0-r1.ebuild b/dev-python/python-novaclient/python-novaclient-2.17.0-r1.ebuild
deleted file mode 100644
index 7ba674032db39..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.17.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.17.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.17.0.ebuild
deleted file mode 100644
index 27b173ec68304..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.17.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND="!dev-python/rax-default-network-flags-python-novaclient-ext[${PYTHON_USEDEP}]
-		!dev-python/os-networksv2-python-novaclient-ext[${PYTHON_USEDEP}]
-		!dev-python/os-diskconfig-python-novaclient-ext[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.20.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.20.0.ebuild
deleted file mode 100644
index f6f394a8bee6c..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.20.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-				>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-				!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				>=dev-python/requests-mock-0.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.2.0[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.23.2.ebuild b/dev-python/python-novaclient/python-novaclient-2.23.2.ebuild
deleted file mode 100644
index aab64def27f45..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.23.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-			<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.25.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.25.0.ebuild
deleted file mode 100644
index 37f6aebce7fc3..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.25.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
-		<dev-python/pbr-2.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
-		)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-2.27.0.ebuild b/dev-python/python-novaclient/python-novaclient-2.27.0.ebuild
deleted file mode 100644
index d4bc009050d92..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.27.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	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-novaclient/python-novaclient-2.30.1.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
deleted file mode 100644
index 5342ebe956900..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.30.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.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/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	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-novaclient/python-novaclient-2.30.2.ebuild b/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
deleted file mode 100644
index 869304ee1b29f..0000000000000
--- a/dev-python/python-novaclient/python-novaclient-2.30.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.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/tempest-lib-0.8.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^argparse/d' requirements.txt || die
-	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 18bbb1916bc8f..c79c4b3a42f3e 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,4 +1 @@
-DIST python-openstackclient-1.6.0.tar.gz 256666 SHA256 7400b86fc57032bfd7d4fed317ad2311bfb35ee192200c437b23c2ab85d49b24 SHA512 e62f9265566def5c43dc4fe6d4aeb7c61be802cd7f53db78bb3db681a97b140364afedff07a9e0bcc0622d39d9341150dab3ca7fa230b2c64a6c820d713acc89 WHIRLPOOL 6b7cd39f26fcd106f4e5819af8a54b4fb79e3a1dbb5aff79e7601392e25f6b7a80f94b1ff299e6d80d3afb7a064f03acfa202779f36677098f4b612dfc174d9c
-DIST python-openstackclient-1.7.1.tar.gz 265368 SHA256 c9a379d5688cf63e5ff9634929bac06204b562d2afe00fca14831ad0799e3240 SHA512 137d6bf2b6a2bd09073ca1ee63f3f6b38568baa3bc93796938e18dc694a6401353598369d8c7028d054cf31eed84bc38869375fa38649d4657b46907ba379b2c WHIRLPOOL afc99ef30eaba71059a3141eb4fe9c5f094e41cf35af12a44cf2209c3244747573651c7cbd722b750c48cc8c6897db574f3af8f1993892e953238e96d1f2f1e0
-DIST python-openstackclient-1.7.2.tar.gz 265828 SHA256 f5b25c175dc9a4fc4a6170a229b178ed5d033ff28e1f34b15af6553c4e6ba95e SHA512 8bc13d3618079aef9beeb3c7d5ca15bab3242d39f04a97844486cc2bf139e3189da21db912a5edc5e03c985374f921e46501dd211c10b2e13a2eee80a560207f WHIRLPOOL 1ceca9e37e01a0eee4d246608f2cacce9ce94b45ca4baad340ecd6b4e5132f530e61bf38723c3474615dd5973ef4b88a2492b9dee46e75a5722f40d22e2db815
 DIST python-openstackclient-2.3.0.tar.gz 329808 SHA256 5cd301fd11ed271175b2a656c0da4148332257b52d994891e61d3535870b4ca1 SHA512 efc58927c109ea227322371f6a6ef165be2878a8559f32b315b73a2d70c1f0aeb96f7dd2fa91b765ab85462a566569d412b13411aa859fef3b8ae5e73d2eceab WHIRLPOOL 92fb3d2834bbb54f16e0f7760f223e5e94e3b933ca016c7b80eb6562af25a9fe1d3428b02fe2c7e1cf413cef6a8eb1abaaae2814acd8914b1bf1f7f8793b403e
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
deleted file mode 100644
index 087466adaf5c7..0000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-1.6.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.4[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.6.1[${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/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.26.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.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() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
deleted file mode 100644
index 048cb2b84acdd..0000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-1.7.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.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/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.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() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-openstackclient/python-openstackclient-1.7.2.ebuild b/dev-python/python-openstackclient/python-openstackclient-1.7.2.ebuild
deleted file mode 100644
index 766dca2531f24..0000000000000
--- a/dev-python/python-openstackclient/python-openstackclient-1.7.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND="
-	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
-	<dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.8.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/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/cliff-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cliff-tablib-1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-client-config-1.4[${PYTHON_USEDEP}]
-	!~dev-python/os-client-config-1.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-1.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.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() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index fa87443d7054e..39b25ffc5b8b5 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,3 +1 @@
 DIST python-saharaclient-0.11.0.tar.gz 101842 SHA256 0c08bcc7d490a9133ecc261bc8b270f3a4187952b19aa375e59a460491dc40bd SHA512 de30918d23b5b8191b2e49f0f7116510533da15be412d87c9018af2e4144082e9cb127713a4aff3ac03d72867a9855d73cbd56b83db24a9bad9b7b422c451018 WHIRLPOOL 97cd3f7b90f96d010d2f267c7ae593ea9c492a4b75c048596b53f1083dd57027dd79b3f0acb3708536ce1bba2ef3ae1afe4eada22355c7c8792164652a7fbc79
-DIST python-saharaclient-0.7.0.tar.gz 72542 SHA256 7c83fb7709a870101539bd25d76225dc7a65e3848e2d698403e0a410c67fe388 SHA512 788d6a0586b00dc6d367f34ede74109d787c4cf4abd8dd2d7ef11bebe7440add42da54c3c9aaa8bdf201444d1c5fd38e5da41b327cc166b396978e85608120e9 WHIRLPOOL f5e4ab52eda75b626c8d8a722869eb9914f6a8e29ea9c6815e510e42c93f912dda8e7887fe0342faac4fdf0baf4ce727fb7fbc133281b98d2586b258a65e3799
-DIST python-saharaclient-0.9.0.tar.gz 92694 SHA256 3a268992bc7383fecbfe067b497f28c16d6577cc87646a4e88d32a954c744885 SHA512 626e99077e3d7e676be82fd0ad3e9a67d1a471dd947951a22e4402e38d5b9f4db9a35a4b7cd7f4a3bb48a2f1d0927a025115fc3f2325e64d3bc06f0839fb5c3d WHIRLPOOL 308af2a580eb27b9452413a343de3e832250a28c86fbabcf0fd320aebb2cc3aa8f750de805ea8d4757a20713c4076b7aac5996680546ea51535080120ff1173a
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
index c14fac76676f8..092fb87004c3b 100644
--- a/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-0.11.0.ebuild
@@ -27,7 +27,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
 		>=dev-python/python-neutronclient-2.6.0[${PYTHON_USEDEP}]
-		<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
 		>=dev-python/python-novaclient-2.26.0[${PYTHON_USEDEP}]
 		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild
deleted file mode 100644
index d9976095cbc23..0000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-0.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-				dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild
deleted file mode 100644
index 8566ca7220eae..0000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-0.9.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			>=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
-			<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
-			>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
-			>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		)"
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-		>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/argparse/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index 7eee7426cd6fb..a7d7501ff85de 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -1,4 +1 @@
-DIST python-swiftclient-2.0.3.tar.gz 55405 SHA256 b8c0b11ff0397b2f2ba2145cd8de7b86a61d34d6f1af78fee536cb9ba5dee315 SHA512 fe52e49c67edae20cd9db65adbc3b54bd1b9b40b09e2c07c65eaae80d96266134fe55d86d7cfd919453077c6c08b06a51278f93a973ec6b4279295bd6e0f9d64 WHIRLPOOL 3b80a78c8d67254f94e58acb4d758d439e79ca0cb8633d7d12cceeed817d8c9f7297f2e9a2a82642cedc4def6b15d3ccd8bab922c3a7f230d151f414f0bbca15
-DIST python-swiftclient-2.1.0.tar.gz 62692 SHA256 e5304cc2fc58e5f9fec87c0910109b524b3634f49a6dd82a35a28cbdf1515de8 SHA512 a49b60124093df9b1fb9ea87a356aafd21ded0a7826b04786dddc94fc1d494c38c2e99d1bd43ba23579ff595c7fabd74bc29e852349852b0bbbfa0cd95f0cac2 WHIRLPOOL 9830329cd08047c943bf8cbd41a41eaecd20ef17a886f72b2504f1568969e08d8282ec4b4b23ea9368284b027ef320a615ce4614852105768fa6c7b004732f65
-DIST python-swiftclient-2.2.0.tar.gz 67374 SHA256 f41f6650150367fc2641e1536d36a68b9664db1f4cfe3e8d1de2e2b5aa41a3cb SHA512 bd60e96525a3c879e94fbb99da1d4813cb181982b753934efd32f4a8310c8ef3237a36dc8c80a78e285ace285eae7bb72b5869863f0067dec4efc713851af7fc WHIRLPOOL f0a7eb00e3d7861e79a07cb6a366aa205fdf141dcdc54519cbade576868550049c335ed9fb3f8e05cf263ac22b85f040ff7a73364a78dc4ab786c7867c7fbf87
 DIST python-swiftclient-3.0.0.tar.gz 134376 SHA256 824b8f204c5a7764de51795256e4175fdcd655ae4df85b8ae6e6ea9ec0b41f68 SHA512 4e81504876fb81bf74c3a3e034958c4783a4a9c2c426b7ae849e1968f98d9886c2299c2e67a2b366d6d4721b4635cef90ff49201ba9a4c86da9d61bfb96fa350 WHIRLPOOL d48902f331d04b3250dc6a90aa44f31d403012e10e1617a2fa52cb05b3d615293efc65a4f35872ec019254c096e44a79544d314cd1d4e6065e8e093febb3b3b7
diff --git a/dev-python/python-swiftclient/python-swiftclient-2.0.3.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.0.3.ebuild
deleted file mode 100644
index 9292f0f8c6a64..0000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-2.0.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-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 ~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.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.4.2[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}] ) )"
-RDEPEND=">=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]"
-
-#PATCHES=( "${FILESDIR}/CVE-2013-6396.patch" )
-
-python_prepare() {
-	sed -i '/discover/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/python-swiftclient/python-swiftclient-2.1.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.1.0.ebuild
deleted file mode 100644
index be5b65b04b951..0000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-2.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-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 ~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.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}] ) )"
-RDEPEND=">=dev-python/simplejson-2.0.9[${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 '/discover/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/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild b/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
deleted file mode 100644
index fc7f86dc0bd91..0000000000000
--- a/dev-python/python-swiftclient/python-swiftclient-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-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.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-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/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.10[${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=">=dev-python/simplejson-2.0.9[${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 '/discover/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/python-swiftclient/python-swiftclient-3.0.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
index 8e185200fd5cc..66a50925a7591 100644
--- a/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-3.0.0.ebuild
@@ -13,7 +13,7 @@ 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 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/python-troveclient/Manifest b/dev-python/python-troveclient/Manifest
index 01392b9d060d8..de90926dfb595 100644
--- a/dev-python/python-troveclient/Manifest
+++ b/dev-python/python-troveclient/Manifest
@@ -1,2 +1 @@
-DIST python-troveclient-1.0.5.tar.gz 97125 SHA256 f758c01ae770ec9e58b71ebc78c6e3f975a9d37d09820b512df77c827b2b921e SHA512 0912e93879cf59b41f461d59e85c421be61491cc7c58dd65a3474e479fd6b1bca016ac188938ac186bd6d005a5415c8f1cf00c88a3390d6fc8e1da4d3e0c3997 WHIRLPOOL b73db090e9b6bf5d64404cc8ec13b88a3e564a5b1a74512b95daea09190308026ac87db888d6160272eda3719e10a573104801dddbf2085cde483f64a9499d64
 DIST python-troveclient-1.3.0.tar.gz 130542 SHA256 abb0a5bf2442bd396322c65ea7b386d043e3fcffdaeed6a61d63d8be1a8452f2 SHA512 aa26b587d8e2bd15bb65ff760b89354638f6a77a4e73ec5f37ab6dc3c374d6b8c238391c09347e7fc897138fc0bdc375f69ab479f57e14f21d0882b74cc7c978 WHIRLPOOL 02490089bfea489b51e07f4da5b3ea5bbe2e839c2751c5e98ae384195465fca861a7d156e5ea179a6879d3b44c318e30f560314619705a3d8a3ac7b0f0606752
diff --git a/dev-python/python-troveclient/python-troveclient-1.0.5.ebuild b/dev-python/python-troveclient/python-troveclient-1.0.5.ebuild
deleted file mode 100644
index 1efd0e551b353..0000000000000
--- a/dev-python/python-troveclient/python-troveclient-1.0.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a client for the OpenStack Trove API, a scalable relational database service"
-HOMEPAGE="https://github.com/openstack/python-troveclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
-				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-				dev-python/httplib2[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]"
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}