gentoo resync : 17.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-17 20:03:52 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-17 20:03:52 +0000
commit: 4935506e9a5cbfabd37c64093eac5f36c2ff0017 (patch)
tree: af9dd93ea349eacaf28286c7c45c7a083b0b7c31 /dev-python
parent: 434d713861b70f6c6563d6ee50a8e64f14c970d9 (diff)
123 files changed, 2375 insertions, 446 deletions
diff --git a/dev-python/Babel/Babel-2.5.3.ebuild b/dev-python/Babel/Babel-2.5.3.ebuild
new file mode 100644
index 000000000000..002805adb211
--- /dev/null
+++ b/dev-python/Babel/Babel-2.5.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# Make the tests use implementation-specific datadir,
+	# because they try to write in it.
+	sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+		-i tests/messages/test_frontend.py || die
+	sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Create implementation-specific datadir for tests.
+	cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+	py.test || die
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index 5add97696bbb..1f527e3ff2b5 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,5 @@
 DIST Babel-2.5.0.tar.gz 6612353 BLAKE2B 85268f0226f1db019fb906da0dfbbc6b6aa199ab491e9d767c932fb5ca77cb6d86328ebaa9c6eb61fb8d28c8e566babd435cdcee9b900c3c680d0dfb49c2bcac SHA512 b24b74121695e0068fb28a6294d4b5b2065e94dcd62ca0d70c8fde3a00cb5ff111480505594460989c6f67a75935f55e153b1b493f917317d2c5ee0f0d7921fc
+DIST Babel-2.5.3.tar.gz 6611941 BLAKE2B 99b71642b00a853fea844220c0ce5ef2fe425906cbdd1618e31f39b60d16382d54ff5e00c493153eee2be8894edc8c96e57fc2703620db5bafcf7b7a4f1b72ef SHA512 1a41f69141da9f66e27110e7a1a5955f76d8ae9353ff7e54182c5bb6ca16e8b4799031e4df1049af54de513da9f101e171e4312b2e7775f2cab9116d5b50c0fb
 EBUILD Babel-2.5.0.ebuild 1478 BLAKE2B da47fe484e7ba77accc70eeb238fe0fa4a6b019c5492fa38cfc1748e5bac99a4c2b5d5ccb523247bac9135e3239eb102465c702959d63c07504e558ea61adfc4 SHA512 ba5ca1a1b6f0d2c4fcb9cd99c2b884e1b2538e6da545cc3d7b5d20c2ae7b2e4aedcfd910ba128401a970215d21851a6919765008e37e38e4ad1e1fa38160abc4
+EBUILD Babel-2.5.3.ebuild 1487 BLAKE2B ffd8a2cdfd82d92ab25e1a7ef30df724c8f29f0ec51c2088c65124f31e8c6b884150e9c9984c4ee97810a9b7a2cce7200e9ebf394b026729e89b1f60232abf17 SHA512 3c5303a56021da4d371d0c7faba9c0c24a3311d50c152074bd212a48f947fa31c07e2c8c7990029da06d849ac9aba78e412ae7fb65e7330399ac8ce273e156bd
 MISC metadata.xml 691 BLAKE2B 9e0ec2fb9848f2994ed990ba0e9de14963eac7f1847fe7918e64030af2c3189ed194775a9ae7c506cb923ca7421f309fda970a8c97cf3bf8d7feab55ac15045a SHA512 91b4f1fa5ceebae1ded51ef3bee9a5c47380709eb3ededd83f8cbb20a85c45acd0603fb8c7244910c15037036056047b074b79c5d6668f68c44d29cb507e76e7
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 34fca316363a..7f3be174874b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/basemap/Manifest b/dev-python/basemap/Manifest
index d4c91f31d082..0a1dcd97eca5 100644
--- a/dev-python/basemap/Manifest
+++ b/dev-python/basemap/Manifest
@@ -1,3 +1,4 @@
 DIST basemap-1.0.7.tar.gz 129694711 BLAKE2B ec2159b01711584384d472205f8d3cadd06cfca07202421be534d7778f94000ccc9ae4b8e07a9fd595b7c06c335ec7af7ac2e9d84f7418bb0db1aeab67125559 SHA512 dc8ef8f02127813c9460c6a9c22c593616bbe8ff39f6507abb786d344c710b296bf4f21759b5c1e6fc8ccf3f478d8fb6f546429528575d13f732c4233aaf9c20
 EBUILD basemap-1.0.7-r1.ebuild 2111 BLAKE2B 39b7307f5a2193331a5e2ea4846a09675aa2b0a2abbfcdc5f9f4d7aba5ad88cdc425f8ce7a5c484e8d65506859c151983dc0e8b20a9d7b9ba885aa07757b4a62 SHA512 c0e07fea6e6270dfcd92aedf2a7c639788f564dae1a789c3b1860d7d202eb9bbc992d71b50f75f362065a887d0fa363ba4328f4f7936a37b6731a939c52f6f4a
+EBUILD basemap-1.0.7-r2.ebuild 2150 BLAKE2B 0054ffdea249e2ff5f11cd383b9f61b3540f1370193e3375a3cfb298b76b6aa3289c08a8ac7e331753f4647fc72e8bffabfd7a40e6cf6dff5733a10ce4151640 SHA512 8cddb366bc3fe683442ac053f9a1dacd16a6738e730d3cb334ff677d09665d94fa1449fa9c8cb36ee0daeeb26fc4f7c82451b002f6a99fa8470c72c1bc613487
 MISC metadata.xml 613 BLAKE2B 899d7032acf24b4d5a03efe56d537172d6b10105a71636afbaa63762f4669afb7116cceec9e1be1ef7c8ed23f03d9066b2ace57876770bc49450020e57121cae SHA512 f00ec05a0bf306703627b8a4846a20dcc4503646df4c38ae75f360c452e4e824db537cde0f93d037840583f3c245453387a665ca9ebf5356be45be84588893ee
diff --git a/dev-python/basemap/basemap-1.0.7-r2.ebuild b/dev-python/basemap/basemap-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..3b90867698e7
--- /dev/null
+++ b/dev-python/basemap/basemap-1.0.7-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="matplotlib toolkit to plot map projections"
+HOMEPAGE="http://matplotlib.org/basemap/ https://pypi.python.org/pypi/basemap"
+SRC_URI="mirror://sourceforge/matplotlib/${P}.tar.gz"
+
+IUSE="examples test"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="MIT GPL-2"
+
+CDEPEND="sci-libs/shapelib
+	>=dev-python/matplotlib-0.98[${PYTHON_USEDEP}]
+	>=sci-libs/geos-3.3.1[python,${PYTHON_USEDEP}]"
+
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${CDEPEND}
+	>=dev-python/pupynere-1.0.8[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/dap[${PYTHON_USEDEP}]"
+
+DOCS="FAQ API_CHANGES"
+#REQUIRED_USE="test? ( examples )"
+# The test phase ought never have been onvoked according to the above.
+# The test phase appears to require the package to fist be emerged, which ...
+# Until the distutils_install_for_testing func refrains from failing with
+# mkdir: cannot create directory ‘/test’: Permission denied
+# reluctantly this phase is assigned
+RESTRICT="test"
+
+src_prepare() {
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		setup.py || die
+	# use /usr/share/data
+	sed -i \
+		-e "/_datadir.*=.*join/s|\(.*datadir.*=\).*|\1'${EROOT}usr/share/${PN}'|g" \
+		"${S}"/lib/mpl_toolkits/basemap/*.py || die
+	distutils-r1_src_prepare
+	append-flags -fno-strict-aliasing
+}
+
+#src_test() {
+#	distutils_install_for_testing
+#}
+
+python_install() {
+	# mpl_toolkits namespace provided by dev-python/matplotlib
+	rm "${BUILD_DIR}/lib/mpl_toolkits/__init__.py" || die
+	distutils-r1_python_install --skip-build
+	#  --install-data="${EPREFIX}/usr/share/${PN}" on testing is found not to work;
+	# setup.py is a mess. Someone care to patch setup.py please proceed; substitute with
+	insinto /usr/share/basemap/
+	doins  lib/mpl_toolkits/basemap/data/*
+
+	# respect FHS
+	rm -r "${D}$(python_get_sitedir)/mpl_toolkits/basemap/data" || die
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index 5d62535aa1ce..e52441b88de5 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,6 @@
 DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
 EBUILD configparser-3.3.0.2.ebuild 500 BLAKE2B 7a2d3c01e3f256c953e6d5609572e3aded6f23d0d8420b9e7a701aef341833822345fca08e4d2ddd417bd56f593fe4deee2677bddb912c36ddb46f2051cbde60 SHA512 16602bb08b32942017d65476aea2599975e1aae9cdef2cf883d4e7be1521ab9cf2d6a92c4e4e556893d9c10fb5ee9a1df40d3e45e1f6e77aa1d0550f77589d95
-EBUILD configparser-3.5.0-r1.ebuild 684 BLAKE2B 7a3644a9276746a2879eb38c1caa27a08884d2a646afa099c5930129729f67ae33b49094645fc308cf3a2cf2836d7cadd0c365624e2b67fc55d57de5617ed076 SHA512 bea819784cb7d9b89c3d7d8c662fc73afc5a19a36b764b091c1220c0a9b1fd2b5d43e3f3b0e467299822ba9ceb56e4952512860699f46a532b330bce25b42b8f
+EBUILD configparser-3.5.0-r1.ebuild 691 BLAKE2B d6fccd60ba0ffefe59e8544b607b84ede6bf7db841c1f4c4b5bc9cbca6cd51c787a5290f9cc5ac4441a1f4391916c76bae6371c1824b56c2f144ea277125c752 SHA512 3c2a954e3f23584b6fc1fce873e75c47e33c88f22ff6ae89a95af717361431e52a0e3e551554109351758771b738c8ea0f158dfee52203d81313abeb4f593984
 EBUILD configparser-3.5.0.ebuild 480 BLAKE2B 1df85570e677a345ef4b97a1d16f4c32e56e0f6bf78512b8291c95a48a60237f3ea6ec224045cac8d7e34aefd4bcfb12b3547bac7c4328c1f75eef6eeea4325c SHA512 0615d9e1b734c60f996b8e0c800e3b0434497e7f3def8e2a48c5126bd1716e724e8c7681d1a5bf16c9d373f063d2edaba50b6d9b1325e6e4ad809fda3fc8b384
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index 7e15dbc28dfd..b9fbae6f49f1 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 5a9dabc14cb0..9eeeeb37b325 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,5 +1,7 @@
 DIST debtcollector-1.11.0.tar.gz 26266 BLAKE2B e94c8754d730417638542229c0c47d798efeb2f55f203c51b337f516e356f930f476881bfba7e51824e0fcdda84a2aea4cfe238fa3251a35a9bf395942de7563 SHA512 9dcbfdaec5d16714d17eca2bfce7049c0a042b2370b1be5a4a0c0057dc28bf060ba570639581ceb5e5c27f2117f9001e4b2bb350899bdab0c0c7cdc3098a9bb2
 DIST debtcollector-1.17.1.tar.gz 28805 BLAKE2B 25d965359ba815e182cddb2a8c82d7360e43ec549185380e759cb993dc44dae88bf1e6e21a67b6929862389f80450dc2f07eff7b2f7a5af58f1d8b64a2716255 SHA512 751ac56695369a36c4baa7fd60b3c0d2c027fb23f7b71cf4103acb70362af4455ebe50b73ca0ba4f946b318c38e67f3477ae937afd697d505a6f2455f932faa3
+DIST debtcollector-1.19.0.tar.gz 26176 BLAKE2B be471b8ccb8cc3df3ade1af544f6326073f65cb1a6c64a8a864ee437692508fe21d7a117f47ab9f0c8cfb74502a7cf1c68e5e9dc26d8da3cd2ac0519c93be93b SHA512 f2bd1eeb9f402853e57ef6bd31d9961acc45617c50be36192b8761454869b3b9fc7709dbd14c36be469e6dbf3532f5d75a9fb863c7ea95c276f82d06f69a2164
 EBUILD debtcollector-1.11.0.ebuild 1856 BLAKE2B a9486fc09e19b4fa0ab9b66c11bca51d03c5ef483bf82f9f79d815c157f3775009abbbc3800faff05a9782f317785281ddef17f321475e414d894bdd1170b6f2 SHA512 df6e094e314ae712d6ccf9a622f6a8141cb1aa972edc6386ce632f64e0ba368cd6477c66d24444fe71ecde640ecaa9f9fa0a79b0543e8d17e99e2c67fc0c6233
 EBUILD debtcollector-1.17.1.ebuild 1996 BLAKE2B b5c8733f2e99508878a70b62fe060c4a140961e5e75aa6124ad0e8ad036f44ff81e97b0b5d891cdff58640a5e7a5e27595498d1a3aa0256a8e07188918f8270c SHA512 f20840d293cbea4ca6c6be39d297608610776bec1f890a479fb45e651b1f2424dcf09be5a00ec03a283d275feb937b2e870e39353067e0bdf3cf5e5b3e50d8d3
+EBUILD debtcollector-1.19.0.ebuild 1870 BLAKE2B c6e42d41378e3710726192d1296bf89f7e39a83fcda5111db37324dc4182ada64929b557718a7d6eb0bd195173c5c94b3ae59a5ab9ec8c4c96b5bea501403339 SHA512 d433ec8a542f425450a9e39a089fcb8043b3bff090a7fedfd0e734c054bc6c5a37456143e175cbe6da9c0fad5bf3331a37c3edebe8cc64e7cddb2dd384f4b461
 MISC metadata.xml 330 BLAKE2B f67815c96ec5d1c50e57e80edcf471c38482eab644d201f4f1d4afa9a44941aa26cf5151d74ab2be666514454a3cb041cb1cf31ab22b4c4efe01a4a57ab5aa75 SHA512 b7a055d8cce134695b3443f4c361636ec4b6741080671b65b47cb7823384370caefb825ab3851cd8cb4852a696d2ded714087917cb565e381aac7ce53e537268
diff --git a/dev-python/debtcollector/debtcollector-1.19.0.ebuild b/dev-python/debtcollector/debtcollector-1.19.0.ebuild
new file mode 100644
index 000000000000..d499f8f46a5b
--- /dev/null
+++ b/dev-python/debtcollector/debtcollector-1.19.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python deprecation patterns and strategies that collect technical debt"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		!~dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || di
+	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 ${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/dulwich/Manifest b/dev-python/dulwich/Manifest
index 14dfee58c594..719ad4f318cc 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,4 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca752008a317afc41defceee2db47e50efb69b9a21b3d50c241b3b51c32222c1e9cf35eedaf2811f66cec2330ce7865a SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035
+DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
 EBUILD dulwich-0.18.5.ebuild 1330 BLAKE2B af0949771ce43dd58c5933d9c97dbf5333a3c21ae2aaf2eb3be2c43bed90d86e791282a1dd1d5769dec5e4a6d7b63174e4a4c3cdb2cf9cf786cbe83285b892e4 SHA512 b02557f172bbaabaaf85833df73157d93b20123d50592d600edf8f0aa94881a95bdcdcb8838301bfeb43ac2209b8b51cf1660bd78921955c07302c3d8670d359
+EBUILD dulwich-0.18.6.ebuild 1332 BLAKE2B 6f3d39bbf883be1399ab9459e25612348ca031671a771ae25a0595aa10d3de80537906dd895bc46196fa5d7ebe62a4aababa846921a325c109d28af5a6291b3b SHA512 937e977c3c85bd9de34f1717608a67f67ec1df1126fda2f74213e02a6f03c0a0a5fdd3d9e8591d5b5c635f654dd859023358254da3b2ea292eb8f48fda665a8f
 MISC metadata.xml 555 BLAKE2B 4487eec512ac72ee6be5bc357b6eca9a51046d8ca108611fa0160ee84e433232b96547b161fdf1469cc726030e490fde677561c63deba754fe62bede1f96efeb SHA512 1f48222049a8ada15172ca0868c6b3f2eda4f465409cd1058ab6b9e498a521ac52d14f1bc2f2265c588f0afb9d874f4a45e6effef40e022f9bf8f6c7e4e38353
diff --git a/dev-python/dulwich/dulwich-0.18.6.ebuild b/dev-python/dulwich/dulwich-0.18.6.ebuild
new file mode 100644
index 000000000000..d15c71b6f2cc
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.18.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.python.org/pypi/dulwich"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# One test sometimes fails
+# https://github.com/jelmer/dulwich/issues/541
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake check
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/examples"
+		doins -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 50a4919e83a8..a89fe3086560 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -2,8 +2,10 @@ DIST ebuildtester-0.1.2.tar.gz 5598 BLAKE2B 5ee20592858758d769106f67558ac233a4ac
 DIST ebuildtester-0.1.3.tar.gz 8969 BLAKE2B a5da5ea9bf951e6aff6ec084812c97ecc4674f81a134764f923a221a8527f8ffa84aff0dc311d25ac09e4eee56c9e956b55bf68347fd3da42f7a10cb84793100 SHA512 bb272b764f08fe282fd3b0b4e26ee359a82b0f12e5b0f6b15d8da40c70535ab0550279fdec40983eb02d1fc3457b8b432bc3ecc3cc630e8df4aa0fabdf90d8da
 DIST ebuildtester-0.1.4.tar.gz 4606 BLAKE2B 6fb02af5a6aea9a1c4c707686abe643c39e620e8be1ae99c3654a32a49908b64eb4dc85a02374a3cb96159b00814791405ca82c7e2009feb57018b820cf8bb73 SHA512 7067483eee04b63da2c716c317a44268d30f5ed28cb0b43ad76a15d49405495f54788ea5401449543e797325b16f1b70fba80f0243066b083729abc35383a7b5
 DIST ebuildtester-0.1.5.tar.gz 4602 BLAKE2B da79f568be9abdfe6758db8edbf4252730ce25786500a524559613f5c83f32d972b04887b01b9e00f24310f663e9a91a9cbbdc9a9b6d3c588dee3cf57fa13ac8 SHA512 a610bcdbcb4387fa71ed0a38cbccf117e3db4879e8cee4f307fa4f528664e35972c9d3698609c1cfe284db01795047cf13572f0cfb947cd3ca4adea291f100c3
+DIST ebuildtester-0.1.6.tar.gz 11350 BLAKE2B 2dbc73a080cb0e6334e1e852f67dbf04e646030714f706e2ac355aac30679bab4e8420d31072d6c6de85a6dda5c2d4d412643f15cc2692f19b1715b22350c259 SHA512 68c877d9eb5dcd0ec21781e92225b3e360ef4fce8aca18b166f1589ba57eaf26e8d9af859e325e1c7c0f80640389a6da137e1fe5920b9be4aa9d35e215d7b80d
 EBUILD ebuildtester-0.1.2.ebuild 510 BLAKE2B 3c113737b936f191be833436b9574f98c1983465515d574bc2d68ae86e19428fe072353a2eca937f495c4f49ddfbf2f079d0f83f5287859f17d466fe81594b66 SHA512 829b62c014a5bc172b97f26d5144f8023ae83de0ad24062e3d0829589fd6fc8e7d101272d2f1cd0f3b7f966399377a67ce934c2045b0e9b73de182e1f08fd0ad
 EBUILD ebuildtester-0.1.3.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
 EBUILD ebuildtester-0.1.4.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
 EBUILD ebuildtester-0.1.5.ebuild 506 BLAKE2B 65aef70c13fcb1704c89585e7a9f50c6d2b4280d814c68727da997da3b08d436f90cdd8207b05cc5c702dad450e5dae173e8691e9b0fb5a25be2333b7e838219 SHA512 3ca9aa5e2a1622726d97320d7763881f0f1abf30024cce158eddc353ac7455a129d97820e1fc7028d0c39dbaff48b10bfafb8d271419768af808f6da920cf633
+EBUILD ebuildtester-0.1.6.ebuild 508 BLAKE2B e079d1f3db025e13346638417bf27f4f4afa870d70bac21667a918af9320038db9d32369da2b55fbef4c849dfccb172e18bd59aa7797107fe564038dc75b621b SHA512 b7afffaef484458f18db0fad6016a838b6ad0653492e3f9daa22c4d0213eeeb73c7a5bf884ed3373326f3564ae02bf619258ea5b101ef58b161198a84b026ecd
 MISC metadata.xml 351 BLAKE2B 680dd90aef25bbb5e5f6d038b321c40d41f0f47f7bd9fd912ee074ea436cf934b5ba1a14908a27eaa895712462a5ff657b49702ba83686b82bc3a4fe74d372d3 SHA512 116b97de3d96c37eb2b2bb5ca22d67ba5d52659530905cb129335e1f4142cdb041de39b9391b5d29bc506f6dcbf06b32fb66b5ac9a5cda919953b2ec06a6b15c
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild
new file mode 100644
index 000000000000..0eec6d900f30
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	app-emulation/docker
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/futurist/Manifest b/dev-python/futurist/Manifest
index 207dc9f7a2ba..1df3cbce1985 100644
--- a/dev-python/futurist/Manifest
+++ b/dev-python/futurist/Manifest
@@ -1,3 +1,5 @@
 DIST futurist-1.3.1.tar.gz 40927 BLAKE2B 7a746bc7dbdfe1ac9ff2fcdd02a0f4f6e0caccadb52b46439620bc5daf736545de906d0a8d159d39fe7d0ab8eda05767aff4723607dc777ec5c1b43a1670c277 SHA512 88b3af8922542d0bcc3e3e1ba8c456adb6233a616c1e14b3b49b11162be5b65855e7088ae6ce573d42bc80675f51070270533fea65e70935304954a3889db3e3
+DIST futurist-1.6.0.tar.gz 40372 BLAKE2B 295a2a274de8a613025c6c46f6abd048cc6d988e9f4c5dc2de9559d295d88f2d93e5afc017dbd8c9c20a6bb50a63567d42f3ac46c61fd9b0d08a028dbdb2c5bf SHA512 fdbd93e3ffa61661218e4a3f180a448b1d8c75126847c50a36264543bac02f50984d4e493031c0ce3257d16661f7b4a4463b5b3dfd7ae7e2f974410e0d1234a1
 EBUILD futurist-1.3.1.ebuild 911 BLAKE2B 8892be731215a067aba62e498b91dbd23fa297e62119893dea3069d352c7d4b0bbbe9619be59d6d9880d12fd14ed4eb4d27b8ba9a44a2303f7c757bac3cffd94 SHA512 6595e2e5075f9581545316ca5a698664e5f0abd2ef6f0de9146bfb730bcbebf4a08ee2704266a332aba763c6c36da4ec563fbeefd72a94253d3ad8c1d83afb8f
+EBUILD futurist-1.6.0.ebuild 867 BLAKE2B 28dff76298a8bc801f1b532355e3c297c65facf9583e95ffdf02d93c5c1a6bb5625bb86db64dc8db2ac903ffcf9171513d454ff0c15120c99382f6d8493ddba7 SHA512 058919224a305990a4c93f82c4e974a1a5a643d5ef1c1441f6883678b5b2ba26f0df992f115ef3778a6e3a9b16eef8f3f1fd04805c683e6616108d8e2d40be63
 MISC metadata.xml 325 BLAKE2B fd30488beae3d9648ca9812b6b719c85c4b8aa98bd1209400fcfbc729955ffd8d3690a145b26fe5404737d2b2df346a73547abf3b519e0f8d6200686a4bcb62f SHA512 4d4d42c2821349f1a2144c297cf80c572482eff31cd1fb4f43f43c503d1533a1ea53627528cfac417ab0d1c174f7924f951f823c9577ebea86ce7cdd88195bed
diff --git a/dev-python/futurist/futurist-1.6.0.ebuild b/dev-python/futurist/futurist-1.6.0.ebuild
new file mode 100644
index 000000000000..3882f6c3262e
--- /dev/null
+++ b/dev-python/futurist/futurist-1.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful additions to futures, from the future"
+HOMEPAGE="https://pypi.python.org/pypi/futurist http://docs.openstack.org/developer/futurist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/contextlib2-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index 47f235891237..61f02542e80a 100644
--- a/dev-python/git-python/Manifest
+++ b/dev-python/git-python/Manifest
@@ -1,5 +1,5 @@
 DIST GitPython-1.0.2.tar.gz 387615 BLAKE2B 50915f5ea98a47eeaf086f57ecc0847592721390b7eb38bc3d03e8258c74b4708cb3043142c160139d399337180300037db874d126abb5e54bbae855cd4e8039 SHA512 faff50d5272158f1d05d932e7827c05272f9a28772aabbcabd631b735bb4d8306d2861d13c327d02a4c554bd9a9902c473fb282318036405497dd8bf0fcc51a8
 DIST GitPython-2.1.7.tar.gz 426362 BLAKE2B 1d543b760bc0dbfdf95b120876c1f3454442a2e2bca69529229316fe5345129b852f4f6195066bc4750ac650083750c5ae0f842aeae871cba969aaf4c6563899 SHA512 3081fcf4944d49042fa95b55f1f0a152b405830fa592fbe546710798388e2bd7422bd2c62f5a7545f0820693fe1948ef31e1485d7b6bc2b37f2b807962e7da83
 EBUILD git-python-1.0.2.ebuild 1076 BLAKE2B bacb27cbf0c73d8fbcd64bd068c448c37ce03324445f192478a0100d97866401c64a3b2655cc6ec5dfdbbb4030abf878d22f43af577f9bf7812b80158f81bfde SHA512 bb2712caa805494c2fb755c651abc50ad4063055bbd46347a7330980473f322ea1eebcd4327c3f07240bdbef9dcb8493ba7e173c7c93dcf0bc86f0220525d2c9
-EBUILD git-python-2.1.7.ebuild 885 BLAKE2B 2b76aaa1d075a64da66dfd4efaf43da6e16ed8f93a763a6968bd37a7155e97743f4a738e9863467a6e6ac3f1d0c36bf20339c890aa5ac632eed373fb5cb88c2b SHA512 25c45a7292274ece19b6950b619e232b6de241f90c4085ba2a40e389241b5581bcd38cee32b03d95a65cf6ddd72c9738e08191fcae3a24e898a6bf50f93501c4
+EBUILD git-python-2.1.7.ebuild 895 BLAKE2B 179b5486d5715bce263bf7aabbed9e394986b8d68531872098e2ca1d255cfc915203cc447dbb7261cd40076baaadd7bb41c0d1465b6cc52fd8541941dd9dede5 SHA512 9c2debe29c37301ecfc8250ee3545d969b32bfff7e79ef69169906c198d588ea360e27245ec8f3aa05e9b6fceccad18c7aa0d634d2ee04b3a8796ddfc2ed99c2
 MISC metadata.xml 382 BLAKE2B 9853412552202bb0134ea88f7eae6b36c5c17920cd2834bec4a487cd6e1e6a5421db13a5b5ca7de1bc366ca057c17e2d89f3ea0973023de76a0a0783065d6dc6 SHA512 3f31be6d8a7fc5622f56141778f1779ff092a7e50f6ee162edc7854eb84b896206382edacf678e3f53f513727ca67e3cce0b6b6f50be7cbc93533201533ebe85
diff --git a/dev-python/git-python/git-python-2.1.7.ebuild b/dev-python/git-python/git-python-2.1.7.ebuild
index ff2076d95fa5..d06e0a764c32 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 5e56d9448c9b..0c44251802ca 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,13 +1,5 @@
-DIST keystoneauth1-2.12.3.tar.gz 176768 BLAKE2B 8f464fd8d0faa604d93bea85aefc216de3d4756afdcb9fb7fb2e1532c1a16fd176021b029377d450c561b2e9a5b085835a627a7541ff8009519d6822faee7d33 SHA512 85c35f6c39135176a5a0393fe56d006f5929fbec6a08f8ba03ea39ce458a8d9dde6ffdbce724bcbedfb72e7a895c9ad003d46b23884692eefa773ca9a085446a
-DIST keystoneauth1-2.18.0.tar.gz 184966 BLAKE2B 7cc3fed32441a950af1ebd143a1aef47b2cbe937ff879d2c9a54a2d1e4d130297b323ea121fc99a97f2a011f0be13e83742731b36d7da7a315a701065c18670b SHA512 71c584de03f89c7e469368221847a8d32cc0ceed5afbc4eafcf886ccbbbad225587e073a7d7f36c8f3768f391e7a3b9d54454f587018b8dbf385dc676a5fee6b
-DIST keystoneauth1-2.20.0.tar.gz 187746 BLAKE2B c47608115ce31bac39d7f410c9153feb37832d12c4eba536c94839aae39154047055baaff782bfb04f0ccfcb37b9a09a5a471970bab87eb64c0c0ee37a756eac SHA512 43d949e46f743905e6987df9f923f222bf4b5622fd395c66da4dbed626d3ba80787a9e77340caf53018c7e277366851ffbfac0812c0f75f6c9c4755eebd852fb
-DIST keystoneauth1-2.4.1.tar.gz 150586 BLAKE2B 78d3b5c99bf1d11573a7aba317aca669caee9b5a843eb7d25e3a51e315398617530c5beb9e067500d06922024cb9b5705cff1e9c9f25328e68d0e8155df26971 SHA512 f9e8fcea7b23001b907d643d5bf67fc4779c8729cca213b3240ef988eda9de1212b15c2031f6fd8b431aafac85e773346eda71e0b414fe967728611b6817fb05
-DIST keystoneauth1-2.4.2.tar.gz 151213 BLAKE2B aacdee83231982e919925aef9d305d517a00a4db323d407176296d8349d5afe01229429a00949ee2fc6adb49f655de840c90c1ab7d8b5dc5420a67f869522241 SHA512 dd3b0907c554606489081b970ad248efe52aa6593cb8584ac1d4e3b05075b6a60b8c5f159c00f5668eb0938dbed655e7135ac9b7d3d6017f2f280f69b9080122
 DIST keystoneauth1-3.1.0.tar.gz 217744 BLAKE2B 4e07c7f4dd6fc097c6838b2a18105656b16f8e45dd553d2908c55fa7aeb5c8dcd2968ca0c3954be0b66044880eec7c33fd9c42413a1ae6c93258a902666bb896 SHA512 3214e08cf449a0eff35eff0400542cbb9e46051095d7955593fec89c4ba31062677f434c70c40037db213fa0e0db15c66d1058e0eca35b1d214967f7fa3fcf14
-EBUILD keystoneauth-2.12.3.ebuild 848 BLAKE2B 62511533cbde2105b9a4ef977bd71842e9cf42b5261344524df27e4757d850d688e70cf4b86563788a74ab2ec8192165e489c779a2b95ae8d2f7379a09addd96 SHA512 99c8d8a2b72a0aaca243845cbf66662ba31c428160b2ce427262f0b1ddf6614f5ae54c53cf40b9a3b5e13bd8eee7deed53ac121bbc98fc437f6360ff4d650a98
-EBUILD keystoneauth-2.18.0.ebuild 896 BLAKE2B 98fdca6ab094375561ec7c82adfbf7fa4759727c7433916010a885a0168dd76422c1845a57b3a81c374e00b9681ac6298a74f82ff1f5b8ca1260175e8a7aa4ea SHA512 021403bec263dcb0bee342db779fe6130b7a06b8b54e068dd0fea474f52af6cbf149b531e9f7071a42231829ac1c25eb357555d04e72c0124a511ad49ce94640
-EBUILD keystoneauth-2.20.0.ebuild 916 BLAKE2B e50be07de5e63a16fb505364a72c7f354420ee2d69f3b341cd5c8fc3f932e1cb584fc6a2ca10e02236a769b076bbeb8446b788819675326cc51046f8934173be SHA512 23f901af40eebf9d0278581a0a53922b5228de94ec41e15e22dfb2cd73456799f7f0a34dda8a58f15847be033dcbc4c51dcbad0d34240fc484903c11b8415e7c
-EBUILD keystoneauth-2.4.1.ebuild 896 BLAKE2B 19a290e32eb08387ef599a3f63735c535de38ecdb001bb6fe13dbbb8678ec4b553af9b9487ab9628b07b119bd82053a214baeb93915601dbe97f735011297160 SHA512 bca2f973d67e58f558e8e8f338e001e735f58fdb0bb88ae3d0e9d93fbbd25a3f59a38704b17224a4102939ab3f463443159089299fe3cac87ccc4fb694f72025
-EBUILD keystoneauth-2.4.2.ebuild 896 BLAKE2B 19a290e32eb08387ef599a3f63735c535de38ecdb001bb6fe13dbbb8678ec4b553af9b9487ab9628b07b119bd82053a214baeb93915601dbe97f735011297160 SHA512 bca2f973d67e58f558e8e8f338e001e735f58fdb0bb88ae3d0e9d93fbbd25a3f59a38704b17224a4102939ab3f463443159089299fe3cac87ccc4fb694f72025
+DIST keystoneauth1-3.4.0.tar.gz 227170 BLAKE2B 57f28ce5a36362f34fcfb2f456a19332df6851a4d372fe890286b4d48469ff69a3ad7281b55d4aa338f61d437f5e07908fc55210e2085a6d9a974cf0bf451c81 SHA512 aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
 EBUILD keystoneauth-3.1.0.ebuild 888 BLAKE2B 503f687fb600920941bc826c1a157b310797942135ad5b45fb94657fb409d6e8f8d301d8b2cd272e3c0f211d4fe8af0069a9ea1900142bdd6d898dfd03a28a51 SHA512 dadadd0754f365119b68199e92e6d7d63a2ab169f69d49c237321e8d2503df4359f46cd1d11f734a187b3142729de49c857458ab0d439a9a967306057f6e23a4
+EBUILD keystoneauth-3.4.0.ebuild 842 BLAKE2B b9b1a044ac8d8801b23cf1982832e2695ca7be2d2788466fce20c536d43d02c4b224b8b16c9a0fab97bf93ece9f85a57ba171e6ae7717831e2a5cae7f736c65f SHA512 e7b4bb92a807c5dd48ba69fe300c1596dc357482285f72fae861a8a685925f1b397fdfb8bc43c0b62ff18a494da1bb58ee6f52fee27d19073f5e8c77e36e7ce2
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
deleted file mode 100644
index 261777960416..000000000000
--- a/dev-python/keystoneauth/keystoneauth-2.18.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${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/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild
deleted file mode 100644
index 472260f11c93..000000000000
--- a/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Authenticating to an OpenStack-based cloud"
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.13.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}1-${PV}"
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
deleted file mode 100644
index 2bdf823431d9..000000000000
--- a/dev-python/keystoneauth/keystoneauth-2.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${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}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.4.2.ebuild b/dev-python/keystoneauth/keystoneauth-2.4.2.ebuild
deleted file mode 100644
index 2bdf823431d9..000000000000
--- a/dev-python/keystoneauth/keystoneauth-2.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${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}]"
diff --git a/dev-python/keystoneauth/keystoneauth-2.12.3.ebuild b/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
index 1a36a64ad01e..e636a0e9f388 100644
--- a/dev-python/keystoneauth/keystoneauth-2.12.3.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
 inherit distutils-r1
 
@@ -13,15 +13,15 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}"
 RDEPEND="${CDEPEND}
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 324464b65e7a..bc6354d8297d 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,9 +1,5 @@
-DIST keystonemiddleware-4.14.0.tar.gz 203369 BLAKE2B 888b4d13864bed4d67e874962536697596d7f67a2f94171a1fafbf7662b67b49954c706e799506ae6f5e3b0cc0c8eba3d7a09779c0df85820f87e6a811970a30 SHA512 c221c59a865fb8d958ddf2f6b112465f6a66d499f7598becf7bf1dde6ad00675dc118ee353502452c640cfb5fa8d1029125ea912f69c1da3bc6f894387fed8af
 DIST keystonemiddleware-4.17.0.tar.gz 204603 BLAKE2B 37c3de6b5151b8e6d6e53ae70836f2d8a068472822cf8fdb71f38bea58099281a4e2648b11605d5952e65baf1722ca539e06a337d6854136e84bfdeea149e309 SHA512 ead2eb829a2189efddb6cf0052d86d32eaca0ae7474cf0444640c0c976df66bc1cf61971891639b798ffb6745fb510fe6499e42e94cc60f2c2084ad7f06c7ab7
-DIST keystonemiddleware-4.4.1.tar.gz 194711 BLAKE2B 731f295efd6b4e5d0d4af1956939221228eb59398ee883b2b68fef404c743398ab0ac9cc6c975a3bc569a913f539f0745605b18dd09ca3dfb59ae0559a6e023b SHA512 c04383836740222d49324cb5f25f8b156424abaa74ac9482a2deb2e1d54cc6d990a864451a075bc12c3d7d38da7235f236e8a8cfb4c3748953c14a4505eeb99f
-DIST keystonemiddleware-4.9.1.tar.gz 196430 BLAKE2B 0653bc3521b8d5599a67239a8f46431f54b6c58efea12ed5d45151ec4fa956bd06a2e115b9c25f8ae586ab64ceee60931b2bccb1cdf0985bf0f6da80be77caf5 SHA512 baff23d86e8157a465646a23fba873739fe019319873d7385ba5ef843c4546d14919913648075122e56a3805f03b91b2a1b03c3206bcbd05a3540a58925a1d01
-EBUILD keystonemiddleware-4.14.0.ebuild 2720 BLAKE2B c6b422b2470dc9437aa0a39f762af6365961cf5f5e3f66bc4c0155bced83f74465b8eee6b6daa1ec6dedae629f35b4350304621a07c243a00c29ebd2870be0c4 SHA512 970a1d4b94fbac85a5b62074849f2e85591ca8c82613bce9cf21144fde09bc4649e42879e48c20ac255dd99ab7327cdda155a6f3c1b1e2b252a52527f01ead5a
+DIST keystonemiddleware-4.21.0.tar.gz 207164 BLAKE2B da9e55170c4af189661b518c596caa216d44df4caf139992ddd3cb9de0f14799cb08fb02e9bb6472df1a68aff7971687109002e6308009afbd2532e32eebebb4 SHA512 2746c2524559d6de18433d3718c7caf887fc92499466c04c65bef38467e9d16f80b1907c663b47c148dc18c2aae6192a79b4d5b2387f575a69cc837971eddf76
 EBUILD keystonemiddleware-4.17.0.ebuild 2863 BLAKE2B 7ece1f2dd56dbc80e230d40144adcb93f4f5a1cb85e9f8ccffcdcfa74abaa60c3a54bcce9b75aeb197b66bf2831fb8487766cd4296be93b76369b69fa9ee467e SHA512 d0188b3155628486cf3d1dffd34f5a767e678b63ba4b936c3c5dc538b48ecdfef124c1529c1ef453139bd4c1a157510e427d1df23a90e15468006faa9fd52001
-EBUILD keystonemiddleware-4.4.1.ebuild 2947 BLAKE2B 7a2c80de54828df1d508b16ded0fc620f67e89f8857d5a4e4841b380a74343684cb19623416c89935f60d817fc3ce9d0fc63d170c3ad302211a47f56ee2486eb SHA512 7db72db355dfac4af795b2b71924a6bd8a282ff3e24636177f49c2db3569b958600507083265783515d4ab42afe4f22dfd8bd2416b52c14fbfafdc1b1bc6da95
-EBUILD keystonemiddleware-4.9.1.ebuild 2633 BLAKE2B 6329890ee212be455a97e7930d0d3b926ab2010c7d10929dea8d757e43bcf03a3ce8f39dee940806df45c9b4297174e2ac1acab2c10e2f3eb36759896e3d1e41 SHA512 4e581d44f4d162ad8a56063a7f00506a321ea2d4f2a5e4c9e19e90129e6fc8dc72ecad1bd26d8b4d4c48bbb96ffcb79549634552caa4d7168a6d82c4f0650eec
+EBUILD keystonemiddleware-4.21.0.ebuild 2668 BLAKE2B 76cbed12c40717c9ea7dff97a11a2a69395bb24620054c39efb38cd33680b24917598f5759aa9870e4076e0763fa34460066152db53bad935aa5bfeb829420c9 SHA512 829d092dcca6556307eda65618ab6cbebc98257a72f089ee4e1628771c39ff708cd02e94a1a0b682c8ce5b81b502eb2d365e8d4347551bc82ab5b820b80fa072
 MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
index 8d99ab92d5af..355182ce4da4 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.14.0.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,52 +12,51 @@ 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.6[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]
+		!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
 		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
 	)"
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/keystoneauth-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
 	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
 	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]"
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
 
 PATCHES=(
 )
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
deleted file mode 100644
index 3fe65cc40548..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.4.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-0.17.3[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-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-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-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/keystonemiddleware/keystonemiddleware-4.9.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
deleted file mode 100644
index c83c413ca605..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.9.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index a84389fad1cd..6140951cbb1b 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,4 +1,6 @@
 DIST line_profiler-2.0.tar.gz 68478 BLAKE2B fb814b251e8f18a51e65297e57523b85c55b4060444c42d99801aa88c8ee0279abf14def6ecd5a9b09550e46e2d27b3ec809b1333725b00de64b58f117c76ed7 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb
+DIST line_profiler-2.1.2.tar.gz 83131 BLAKE2B 0f61d7dbab24988a50c1c0a9dce528cf792ca53b5f4c60f00fd9dabfd3d3e109f2d245867bc1ebb8294fb84343907e3593c416341ea1b0d7ae626cda8a3218d3 SHA512 625a585915d338fe8ef2f37c5b5bc024f769a623380b85725bcf33686e4cc62a211c2e91552e093dee940367b0d2ad306c5cbe7f1e8f1574eb731d128b8e22bd
 EBUILD line_profiler-2.0.ebuild 674 BLAKE2B f3223c39f2d1c22b71adff9073156b59301bd96a34f9826707344a7a6e012ed07616642808061bf8cc7b85054041268b5ae69eb8adb77de0c413b702f027ed88 SHA512 cba4c9e90871b52c89c5654dde6cdfe9a24910d9613938f69af54101afd48eff7059c34a36a47be367a97c6a4f46aab6a5d3693633b931b31ddae06d42387a60
+EBUILD line_profiler-2.1.2.ebuild 668 BLAKE2B 5f7e53da28d326dc6cf69861129902fd45971fa784631ed643bc0417c70e102f5d7e3c284f915174dcfe704b945203df8679731248f509a181a3ac1e56957d7c SHA512 0fd8d10dd9e1fb364e6c79149377f54e343c2c18c36a471c1274854ae3fb5146cff5d04e4ed5715744d8031b4d42d96fefa27bf5144fc320f7ceff11c2c8e3d3
 EBUILD line_profiler-9999.ebuild 582 BLAKE2B 5faee1ec552d26cb8f329f63785bf09239766282ea120fa4e73b51aeb24ab9bc7c4770fd74fbb34306448f2f41a1db491ffdbf5ecb716bcdda3fc1b9b3719683 SHA512 4f50a2bf39ceb6d132c74705358d396ed5ff341fd8cda88f29c8cd5427a32e65c37c5c358ea620c3ca8fa85fa52c974bfd711df465c51f1bb778a196ae923662
-MISC metadata.xml 810 BLAKE2B c33c34783a48453f89533d8b65966034b7a88e99ac45d1cd6e2bfc9732f6181dde1661fdfae9fa913440aa6e1ec168a4386b9f7d7c5a127ba6cf33cf3fdf4a35 SHA512 6369d88b7412ba45e4d38bce909c198dc35db0e163e751f35b17b38739283fbb5b6d7da23e5cf147c4fcc08ebde39c394a8cef1e32d02de273fed1ad55552cea
+MISC metadata.xml 948 BLAKE2B 98a4791e0201690c210cd9460be2c17378a360c9dce1502f3293e26468f94aa0c20b28844e41e6e43acd049152057726b4e12f4f7b2a99e0ad38a73296d12403 SHA512 bc38bde3c69ae03dc884b60a55eaaa0b039119d31a552083d22baca047f102f7519606ca2219578b3a9ed3dcf40a68f6aa0dc8508e7258f0a6a993b2ab7a0461
diff --git a/dev-python/line_profiler/line_profiler-2.1.2.ebuild b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
new file mode 100644
index 000000000000..e1ffa748f501
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-2.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="
+	https://github.com/rkern/line_profiler
+	https://pypi.python.org/pypi/line_profiler"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v "${S}"/tests/ \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/line_profiler/metadata.xml b/dev-python/line_profiler/metadata.xml
index a5ab15f42671..646d50c3d2b7 100644
--- a/dev-python/line_profiler/metadata.xml
+++ b/dev-python/line_profiler/metadata.xml
@@ -9,6 +9,10 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers Project</name>
+  </maintainer>
   <longdescription>
     line_profiler is a module for doing line-by-line profiling of
     functions. kernprof is a convenient script for running either
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index 9139d0de0e1e..710f2a9429ae 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -4,9 +4,11 @@ DIST llvmlite-0.16.0.tar.gz 95284 BLAKE2B 6a970e5ad8fcf23e4ed774b83144474c2b3094
 DIST llvmlite-0.19.0.tar.gz 97109 BLAKE2B c4d22d130d12d7e61e9ddc177e28c6d8c3d0a1bffa0fcd672dd237260d80929c9ae0da428165f379c53276ed464b80f7cb9aec4abc4f66e105c7415db150edb0 SHA512 93551bbab519021abdc66ca099b9090b3af54b048adbce8d16f3700c066bbc4f5c24e5234a8a1ac4bfcdf8bf74d0ac52bb7023251ac948af6ef99fbd5a5324c8
 DIST llvmlite-0.20.0.tar.gz 96753 BLAKE2B ec9cfa554f44162c0d6e755628603c9afd85642998f56ed49c2ff29c3ef975ef4ce14c6555382ca282b70d71a1ff7347c0b773b339b14345e10d3b9ac96ac55e SHA512 c2e0918e7acfba68922f60889180ec660da13ea199c9e8dfb3ac075c295baeb8c90784a6acc3c463cdd696f8f61c42226548d38db5bd8c4397a23cfa7c7ff764
 DIST llvmlite-0.21.0.tar.gz 96462 BLAKE2B 8458037ca49c2c7035cc65539c1dc933f26c694e07502bfb0f37adfa389c56d715b53310fa977461fa75d7f826384a9c408682bee942e7cda6a299b16192c183 SHA512 25fb0986faf558995e6405a77d675d1dfcda2f79f8e6f5183d66a16f7b1f323df7eefb54455d9a15412c4eb88cd2e160d9f45038b7d97da6fffe78d7adc0e296
+DIST llvmlite-0.22.0.gh.tar.gz 156077 BLAKE2B 1b95a0636807fcf38955b32bd5c7c19784df2cc6708f23624c047f0e9caf4eb2fc26c7a1cb778d7cc7e42b8aeaee1ed43c92bcdaf7eb2e798c25f692b96b786a SHA512 633ec4d294dc246ebff5c7931e9bea86efa28323242411f3f54bc34c99085ebaef477b5bfd8224080790a12b188308ff9662c284b360e1a2939f4fe9b84a9458
 EBUILD llvmlite-0.12.1.ebuild 1083 BLAKE2B f1758cd7dc79ed61fa8d21011fe78e8caa3a81cb562c124031e07665a15a19ecb18f342c39f4ded973c555aa6130b94a50c7bf32c6c75598b79c59c8c167f2f5 SHA512 304d08d1a6842102692a288fc0cdb47a88f94ef07a05e1903d6acc07950eb2a936a206355c244bd9628c564a9da6bb8d42f2fefe9472782cae9022a08f37a660
 EBUILD llvmlite-0.16.0.ebuild 1198 BLAKE2B ffb0a83bb6605d3fbdee9d320007b9b7184e9dba38a423129585ebbbb71e6a205d6b2497f1733cff782df9f032392f72f3ba286ab8728c68c050a065ef5106aa SHA512 79b761d1c155eaa10b123575908b66d78797e7265c78a8bfdd81963fc53396f6e47ffdb39d57f64b781ab2d6e55a3fd628093bc68827ea2845a107f9262ef40d
 EBUILD llvmlite-0.19.0.ebuild 1288 BLAKE2B 27924c47e881063a44db3fce338e5240ad739d8e0283791a623f5ab91fa788e1ae5bf9526adf89153bbefc368166f78aecffbfeee8ba0ccc74c6f43d812b7a49 SHA512 81f241338e6d2e249b8ee7a9b9dbc184f47ed6c461259437f664400f49b2ebcd45c5434dffbd8781f0f6b34e93a8ceaf1394353df5ccb67a19158c72ff5d0db4
 EBUILD llvmlite-0.20.0.ebuild 1286 BLAKE2B ba74befabce5dbf8a93148349e230788702f1372788f99f388c827700a2209c77b7a0ff80a0c728da14f11e6170658b0d87b6ed5ce28a1500c33f8a42adc8af5 SHA512 afeeea625207aaa2ed0a60ac07fb8546e513c21bd8f864d5b0e29570016b5a7431b21d4ba4beb23822cc6be38bce5d5c34604e544b900edba1b6b1cf57f7d600
 EBUILD llvmlite-0.21.0.ebuild 1286 BLAKE2B b182d554d988f63beddc4afee57d32047ec362beab482d1f51e69722563e2608e3668ee3b87050674446fa6d6a5c4a7853b0e6410a670934fa46a76f3e957ce1 SHA512 488fad8be499311fb676ae86194f5571d22ccc97ff397f240b232e13258f6cba15b0422e1b5df5e5ae2df8482382447bbac3ddec6ddf1f0bb90d3fcf1e3dd165
+EBUILD llvmlite-0.22.0.ebuild 1362 BLAKE2B 2fee95bea5f4516ceb3f36afc5f5109e96372c472387f2d450ef64e42e7392269e3fc94c83be04f3c803d476ada0037383d397d41048b707779d1d0f6506577e SHA512 eecbd4cfbced2f8191b669211ab8a64f0657cd891877615b1c2805362a39ce4c5f5b1ba60c672e5cd6f7091a21528ee365f5d5bf809ba12a46e367fd14d16dff
 MISC metadata.xml 792 BLAKE2B 8247c0ac546df47bc70b8e525d776dd391fa553d75d7bb0507986ac2f7efe1d023db7259f8938c13b383ef719a10acb3e1357bca4dc398a42b68ba756c0c351a SHA512 8dab7bc4b6d33f9a3c458dde08e07fe22680238185e8f144ada7ce7374ecb3fbd38149f67d2a11cba7a816384c556edf618e45ec331e6054b97aee60c529a35a
diff --git a/dev-python/llvmlite/llvmlite-0.22.0.ebuild b/dev-python/llvmlite/llvmlite-0.22.0.ebuild
new file mode 100644
index 000000000000..676fef4c0843
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.22.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="http://llvmlite.pydata.org/"
+# upstream slacks in making pypi releases
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=5
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-libs/zlib:0=
+	virtual/python-enum34[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+PATCHES=(
+	"${FILESDIR}"/llvmlite-0.15.0-use-system-six.patch
+)
+
+python_prepare_all() {
+	# disable -flto, we do not force it against user's wishes
+	# add -fPIC, needed to link against shared libraries
+	# plus use those vars to force our CXXFLAGS/LDFLAGS in...
+	export CXX_FLTO_FLAGS="${CXXFLAGS} -fPIC"
+	export LD_FLTO_FLAGS="${LDFLAGS} -fPIC"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${EPYTHON}" runtests.py -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/matplotlib2tikz/Manifest b/dev-python/matplotlib2tikz/Manifest
index 1bf8df91d401..53382a72abc1 100644
--- a/dev-python/matplotlib2tikz/Manifest
+++ b/dev-python/matplotlib2tikz/Manifest
@@ -1,3 +1,3 @@
-DIST matplotlib2tikz-0.6.14.tar.gz 525576 BLAKE2B e8190eca79b1b8fd1ae2852984ff2e5740b945fe541a39449906fb9da7cfa3a8be0a5ad8e22a6a35ce9e687e0c9a091a776a1e2534836b35ef48aa980eb46ccb SHA512 d69b5bbb3e5aa298fe38ca0599436e12a8cf7628936fc24a641fff38b4429e1117f2f239fc41338e8459f8be1be55d7607808ad171bc256eff1f76a69079ac1a
-EBUILD matplotlib2tikz-0.6.14.ebuild 919 BLAKE2B b2033a49a42078d1abfbdb2660bb8b969cd85576c69928978d4b88ad496a53f487f2744554ea3e44d20722df57fec8c287a59b5eacc1f9693f03690fb31f1b66 SHA512 d4a49f83027820c8346b3c63506702ba5dcc960f76550e698df5c286b9526b607b92ac738367b382f23b2b7a9115edbf4f6364920a502f8d17d204b3599674d0
-MISC metadata.xml 976 BLAKE2B fc101fd34db6fd97a733b462276e1da2076bd7fecb8b36c39502828dc0a4ef3e725f2bc00ec3ada9319820dece4a1ebdc1453f847edb1f91b6cec8768f998b94 SHA512 5ce41d4236c17a50a9a9949974c8c9fbaa5ca0c46cd628b34a8266227982b780c5fa5f2fe5667d51961f64c19c73d377363558f28756d2bbb8a88f1c4ced19b1
+DIST matplotlib2tikz-0.6.15.tar.gz 526046 BLAKE2B 4cc3585fe1a83c563fd00928843a16b4ba1ab2fecf8b662beaf40cd9e0211fb4fdb09c4bc4c1f110452621cf5d92f86bb492d0838be20693b86c3b4e9bd73566 SHA512 1f5b05319090d74fbd7ec99ad0e3f236f44107de2381d69e423f5878ba4c7666caca46ab87ae187f52f3ffa907cc4d75018b2ce6c9bcef44062e369f9a26be11
+EBUILD matplotlib2tikz-0.6.15.ebuild 953 BLAKE2B 050308f095cd2e9487d24137ce711c8c2a2648557caeb0457415ec7893936f1e432febc06c766a9ef5e2e4acaddea9fd3c66dd3ed233a7168afff61084f7a3a6 SHA512 b77e444ba539474f79378a25cf8bd4936fbee6a789c3c7ab4bd8c70e1e9714d437cadf60a33e5989586bd7d560ad5ecf16adaecb892ed97be53212e082a162f1
+MISC metadata.xml 1108 BLAKE2B e2f8648c239f0f117db6f046e0a8fbb006ad25530e791987f974fed0ea105d626bbb867ddcbfba05b1fe041be751c7737fefe241ea31cb6acce89f9d0fc0c115 SHA512 ffd5556daf5c3903437775b6da6bda2623fe8a9d8d6d8a8ce2f3537c3c50bc57353fbb0151a40c1a7ed113fc0732b64b231a38b69f10a785f4e089d94c1507e1
diff --git a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.14.ebuild b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.15.ebuild
index 28505b0459e4..6aaaf8cd6d9e 100644
--- a/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.14.ebuild
+++ b/dev-python/matplotlib2tikz/matplotlib2tikz-0.6.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,8 @@ IUSE="test"
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
diff --git a/dev-python/matplotlib2tikz/metadata.xml b/dev-python/matplotlib2tikz/metadata.xml
index 9c08eac0171c..a4fca97ba72e 100644
--- a/dev-python/matplotlib2tikz/metadata.xml
+++ b/dev-python/matplotlib2tikz/metadata.xml
@@ -9,6 +9,10 @@
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 	<longdescription>matplotlib2tikz is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of matplotlib2tikz is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of matplotlib2tikz retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
 		<remote-id type="github">nschloe/matplotlib2tikz</remote-id>
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 96bdc2f845c5..d010ba8af9a8 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -5,6 +5,7 @@ DIST monotonic-1.0.tar.gz 7082 BLAKE2B 76d90375b4e71efa98a5e993498b0789aa04b5c48
 DIST monotonic-1.1.tar.gz 7139 BLAKE2B bfef57e5b578f6ca9b7d586e992cb584ccb0b815f391a73d1eb042011b89e4437629ee7b60d815a16e896860b3bd684c400a829d707f6f62aca312af69c6b4ad SHA512 50a33ea7459c46e5a901912056976ed6ee8d006d71f96c8b13e462a40d90455aae3d5e50d96ff2ab426b94c4aefa1701b44ea04edd3823860f8adc4e99d2b71c
 DIST monotonic-1.2.tar.gz 7173 BLAKE2B 0cb2e86fcb866efd879cc3ea3aa92e106695a0be0a97eb2246d2a4718b3e83123e5098097d038ffc15b77694ed31b1631c7ec996e911ede2f44d16aff538ad7e SHA512 fe35cb2c23a9d8a6cac712fb0de2ec5bcff177f2f5af6e4d468090444f8c9a6adeca204071d9fc88bc4776e7b3fc30e15f00e77887925a7a39d9886dda412a82
 DIST monotonic-1.3.tar.gz 7211 BLAKE2B ee05b43f8734099c3d7472ff98bc815cb33cd45d33cd780f33703429773cb3f7cccbf97c3e476247b749616f16ee4493cf300ea137b6da89068c912e4689f72c SHA512 870b9530235715eda099cc332c94935ebb80f52a30523dca90639b9f8b3391dd706a9a8f3aac402ebd8c008672e84cd09b5397e954160751e71940b3a9120bd9
+DIST monotonic-1.4.tar.gz 7463 BLAKE2B c9123bb5ed5ece16014c9467c7e25dfaee8d0f30096a73f5d001b0bfc965c0c1f2b501ae39f5b490edd61f179c4e688ce4b794bdb6a842ba350d499eccd8335f SHA512 f9fa079cc325592b0bff799fabe7f9e87922cfe351776ed08be7a0060d27f81ae2c23aa7a1fac2ac2203ec26547e05fe3a918e68e6a474768b431ce860522eca
 EBUILD monotonic-0.3.ebuild 472 BLAKE2B 9fb58a13c69e47f59a6cc64223a6840a35dfc55ade4b001f4baa3de29b965c13f3ed9fdbb7524cc1bfd1ca75cd252738822b44e512768fd070d7d5945124a4a6 SHA512 1c89f246f260203eb41d1e0243dc73abb5fedcd9c5620a4f56c85249488725e8ac5dfd5c9ea257cbf6122f6d9f9f3279158183db488f0a3d3ee168717c7e3b05
 EBUILD monotonic-0.4.ebuild 472 BLAKE2B 9fb58a13c69e47f59a6cc64223a6840a35dfc55ade4b001f4baa3de29b965c13f3ed9fdbb7524cc1bfd1ca75cd252738822b44e512768fd070d7d5945124a4a6 SHA512 1c89f246f260203eb41d1e0243dc73abb5fedcd9c5620a4f56c85249488725e8ac5dfd5c9ea257cbf6122f6d9f9f3279158183db488f0a3d3ee168717c7e3b05
 EBUILD monotonic-0.5.ebuild 477 BLAKE2B e668daacc6ccf67393fcb0858afe627a3fcca1c0f37f07a0a497512504433b98ed9c06cce6fdb1dff753c6630ac91938f8de7c8f1141f581deca58d89c614224 SHA512 16c72e903e35f82a9cac1076f241719d0d3f08d442af12f99a27840546e27bf5713a45ccc4de66be6c6cfd9b9ed742f19b5d706a02c706424821d212a41fa95d
@@ -12,4 +13,5 @@ EBUILD monotonic-1.0.ebuild 485 BLAKE2B 260a18bd71b5219dc858737b101ebd13209edeaf
 EBUILD monotonic-1.1.ebuild 487 BLAKE2B 2babd6290bdee3d440c9c1c412ffb261c94e463a00ac26f57e8e0842725ad88180e58c099c44c8eabc0d17551099eacecf3ffc6595a691832193c77a4caab7f7 SHA512 39438513bf3a01ae9fa6f3a94e1dca27b65156f838e8a77bc8596b59bc3a9d96d803a6d63a60c70cb74838216cb494ab7a218f5f30a671663f742532c2ce5ca0
 EBUILD monotonic-1.2.ebuild 485 BLAKE2B 260a18bd71b5219dc858737b101ebd13209edeaffeb64be09138bd476902d500d8304fee42b72b259359f406c31412fa7d24d615a99d1a07a727bf2bb8b016b7 SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea
 EBUILD monotonic-1.3.ebuild 485 BLAKE2B 260a18bd71b5219dc858737b101ebd13209edeaffeb64be09138bd476902d500d8304fee42b72b259359f406c31412fa7d24d615a99d1a07a727bf2bb8b016b7 SHA512 e536452af47fbd12dfe47a5d8a637f031ca736e171f4b39d3f0f41a8b131f653e9174ddc1b3eb8f564861cf8df5d61d154b800f9d6277a4ca9741e6990f8daea
+EBUILD monotonic-1.4.ebuild 487 BLAKE2B 03f2a54065fa27c334b2f32ef76565845b970d4618e9b9088f482c2340254d1d96207210e8508b6199b66abd562f1ce6ccac812b05e5570c5d4b2354baaade78 SHA512 cd188b552dba47983b592b986704aad9902088ba8b4c5c42ded22a1f03f110ad7ea38970a8d3464d8e8aa1e1cc7a228608a380e0befe8db93b3a8a7a5091c770
 MISC metadata.xml 372 BLAKE2B e0ac746a47fe4a4c23d0bd8ea80fb34889d1cd7ea8c8b5eeea5d09c48e71ec3b3c047080f1000419dfc39f8c5cefc0fd4254842f3ca94d0d4acb153dee29e0df SHA512 32a26fff9f0d74fa026eed01cbf274198ce2da20ab63f57af7b9767910c6eab6c1a19022ee05e0499429d696576ddeffe2a891ebb867886d9690a51ac468feac
diff --git a/dev-python/monotonic/monotonic-1.4.ebuild b/dev-python/monotonic/monotonic-1.4.ebuild
new file mode 100644
index 000000000000..867855f20bff
--- /dev/null
+++ b/dev-python/monotonic/monotonic-1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
index 56d52e702272..fe4d7762cd45 100644
--- a/dev-python/mox3/Manifest
+++ b/dev-python/mox3/Manifest
@@ -1,6 +1,8 @@
 AUX mox3-0.12.0-RegexTest-python3.6.patch 652 BLAKE2B c7a53ec43accd137c100c6cab6e208a5e88ff784a59b01b2c71316654f9fe7f39273eae7be8a8810548b25636864b32176997a19020c878ba7861b3e86d74c77 SHA512 bdb5b27c151a2b2fc0351575fb7f8413a7667b738624991255882c1908df3677f2d8bbc984f8c4179325450f0a5837a750adeef3afc1738090879b70a2b135b6
 DIST mox3-0.10.0.tar.gz 42424 BLAKE2B 124bb4525ed6d24ebf75037c1f049fc851d64bdf8eed29c26fcdabcfe5f6211aec7f16f5038b397978383bd11a81588b44aa790608bfdf5b8596daccf3230542 SHA512 1f56e17ae150339cb2f33dca065c246cf0ff2f633f182336a576e9ab0bd4512ec8f42a4cb128f38ede33fe7e796552768465cfc626abe4f734b7a06b4625710a
 DIST mox3-0.12.0.tar.gz 42377 BLAKE2B d6a841c8b28d47f21ae8e6f65abb7e2079762d45ccf670decf5815c5a2638af615804e711534ddb0ebbafdae6609f30e50ea20f224a7ccc5a02148f1ab0d23b6 SHA512 73e0215bf127589f791721a0cb9b8e3dcc379a23199339e370d641850a0a14c264eb9db94fbb37c99f9925ee3ebd302de14ec12fe1c8809dd3ca9c10cfd75468
+DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
 EBUILD mox3-0.10.0.ebuild 2093 BLAKE2B 23078bba6c6a1a04627b8c1c9d90fb4936742d061d14fe86a74934da28deeddc7a43003c3306353d6870ce15b404edd895b0cb120e35fe01de2ca80e835f816d SHA512 65dafacb31908c9e8291ebb5e3be9c8010894b882ca0f3ffec2db33da5635f3782894712ed491ef95e337411e7c6e52db4c374511e79d3d5c517daf3a77021a2
 EBUILD mox3-0.12.0.ebuild 1464 BLAKE2B f4cbc1508ddd3d3a29680e9db11d8d8a7bda44b489247599ee54befb9e2e5acc0b2a425800d952136bbdf7e1c144b9c2fb823044511e5e3eca91a3be9838b04f SHA512 07d475bbe8181819ab03d648930274ea47ef4213f41c11e08fa6958f29cd74c36e6582ce2fc21564082dae51112c48fea5add532cc5985f51d12350482148cdb
+EBUILD mox3-0.24.0.ebuild 1442 BLAKE2B d4a7064a348337c1f15bd803c7daf966791388f8a4763e3add5b09b257163f53e05dfdb9d7f44ad9485716c1e99f6ddcb2a147834131604bff6fa58a715e6e3b SHA512 9f3d082a9afd08f52154b6a64789d04a40621b18b4227f08d52f2fe8b3d49af04ac1434e3e672b65116f7afd3c5e59359caf996356ac5c809a1c6dfe2a067dcd
 MISC metadata.xml 323 BLAKE2B 880203c04d889c65278f42730f465e61463109e5e8e71ffacf21d3ad98eb804d36ff66886349eec536aef71a7741a1df9496f1c8073ce1421aed9863593a9ebd SHA512 cb4be23a6eabcd2f0c9761234006bdba088200a94c23087fd3e09ac054c785bfcbe2c35ac060843cc0de2d4774298ac4c94ba8bd3e16eac9a8a4d08fa342e4f3
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
new file mode 100644
index 000000000000..6a213ae74bd4
--- /dev/null
+++ b/dev-python/mox3/mox3-0.24.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock object framework for Python"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+CRDEPEND=">=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${CRDEPEND}
+		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	${CRDEPEND}
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.0-RegexTest-python3.6.patch )
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "could not 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/msgpack/Manifest b/dev-python/msgpack/Manifest
index 74f2f834483b..ba4b2aa40f20 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,3 +1,5 @@
 DIST msgpack-python-0.4.8.tar.gz 113641 BLAKE2B d22efe13302e28d0701b95b2dc4cf4792f9e045efdf77b31ac5c6170b503c885c265ff63387fe76a1aa67b1624963aa26d76dffb15fc2cb10cfe672b59e71b99 SHA512 59e9c43be6b92e6d10f40999e0902c350137e67a83c43bb15b273eca856a6eb39f24b625b02b40188a9365ce3101f03bfa9aa3dfff56c5c3b551533942183481
+DIST msgpack-python-0.5.1.tar.gz 138953 BLAKE2B 1fb7e5be33992808319e1444ff7f84cc13f034e60ce0ef2f72161bd4ccd0cd1ede27382bc1f365f268557c8ffe503fd12de66eb5840e79760d818e7e2f67fdcd SHA512 e5172e20bb25d2e12ba34ad2805ba4ea0776397986e8bf8e26d21353f57a2dba59a9c6669c817e4e91d5801558a50f95d81e02343f8f0292a01ec5d822fba61c
 EBUILD msgpack-0.4.8.ebuild 770 BLAKE2B 5572e7ad6442ba346ad3e1d9288ae6721b3587424e843474aabe0b806778e8b34719b1bb8f716f4e679234641028090ba4cd73c9d9f5e121e2189d7be4622853 SHA512 96b0e59f74fb4d05d4c88572e74a0a87d8bf7db4e4945aa125b60521b7f74857acba19ace64fc759e65a1295ed63b319c3d3046511f234f4a0bf4517d4c15df9
+EBUILD msgpack-0.5.1.ebuild 771 BLAKE2B 5b9c60a88b72bd5bd238e4474cb7662cd07d2f24df53edddf17967a856ee25a170f50f6ec23738ce205d12b1a6cf65a4bac9c3075389d731a2743f0a86a58647 SHA512 3aedcb271f0699ceda59908af275aeb9b72b68e1d8122512a96872bb92c91b5e0dafb3d63447957488ce4c9b1df677a6bc99784dd976a830d1f082ba3f807442
 MISC metadata.xml 391 BLAKE2B ff92d277a83506f36ed8cfe23dde10d044925d5e92d35e1ab09283d6ae2d259886982434d96898b570ad83abdf9ed3c02e695998464b9bed596ad95aed6f7daa SHA512 3001105274f7bcc446a3ea5d0e278073a51b1c480a78127574dbdb427e656719673f7a9543c8bf9b3d8181e414612f3f186e7ab192fa0fa9333a988f17593f79
diff --git a/dev-python/msgpack/msgpack-0.5.1.ebuild b/dev-python/msgpack/msgpack-0.5.1.ebuild
new file mode 100644
index 000000000000..2fbeb83213b5
--- /dev/null
+++ b/dev-python/msgpack/msgpack-0.5.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="${PN}-python"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="MessagePack (de)serializer for Python"
+HOMEPAGE="http://msgpack.org https://github.com/msgpack/msgpack-python/ https://pypi.python.org/pypi/msgpack-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	py.test test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/natgrid/Manifest b/dev-python/natgrid/Manifest
index 23bd9136f72d..76a7c5149ae8 100644
--- a/dev-python/natgrid/Manifest
+++ b/dev-python/natgrid/Manifest
@@ -1,3 +1,3 @@
 DIST natgrid-0.2.1.tar.gz 35205 BLAKE2B 6ca1108ffc1b30dc8e4c570405817a73dc7b2c0e0b865978d2918bf8d1e9d503904c3eea704f7c5310ae947c558e284d7ce8bd70ff2add6d876c4894bdccedb4 SHA512 489e8454f05ff994bad23d88bb423fd0bc17e838193865d3dbb6be0d01221203dcd1644c133827421ba4acf354295f07533ff838b138056064e1bee73d43c922
-EBUILD natgrid-0.2.1-r2.ebuild 813 BLAKE2B b29dc4732d5bdc187ef5ac45cc346d8a58ed9fa4cac435c2774138af2f59668cb76fba333afac29844a348e9a63ff6d07d4331a6f151848fea2081492d2b01d7 SHA512 78f7892cf967a0a74a9511782041925360ab3c4b089e3f48b1585d605f02f66ed93a8c431a9cfe58dba1fe2606196e57a64e5f54535ed017d245e61bc8ca7c19
+EBUILD natgrid-0.2.1-r3.ebuild 820 BLAKE2B 7108928d3c933d9a7e54018c296796241f3917db2c5ca2b47f18b85c0d190d4f826175bfbdc8a9f89d5eb1ffca69392ef2daceaacb5ae222e811a2534c66daae SHA512 52dab7a4deb0f6eddd6ab764f9fe198b18e73d01478db30a37b556f6d24c064d42e91fe4b2d30734af67a701a6957b301da845958c9e72eb46d98bfe4cc3ef8a
 MISC metadata.xml 615 BLAKE2B 09a4d0ef38af543f9ac7d34760ce60ef9b493523d70261c1c62c1d3fb531378438f66ac8c948501b889a8c6ef762fc36cf07aed98369ec4be5a7da1dbdbc6b61 SHA512 2ec5784f8f6a083852e1c19b41cc0209bd4799820a91002aa4e024a269fcff4c7cf503decec42d634ff8355aeb5b70e85f85d174cd0fea419098c7b1d1d08dec
diff --git a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
index 52464d9027dd..692c19f46d7d 100644
--- a/dev-python/natgrid/natgrid-0.2.1-r2.ebuild
+++ b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -26,7 +26,7 @@ python_install_all() {
 }
 
 python_install() {
-	distutils-r1_python_install
-	# Fix collision with dev-python/matplotlib.
-	rm "${D}$(python_get_sitedir)/mpl_toolkits/__init__.py" || die
+	# namespace installed by dev-python/matplotlib
+	rm "${BUILD_DIR}/lib/mpl_toolkits/__init__.py" || die
+	distutils-r1_python_install --skip-build
 }
diff --git a/dev-python/oauthlib/Manifest b/dev-python/oauthlib/Manifest
index 22a903b55e14..e43c5e25e96b 100644
--- a/dev-python/oauthlib/Manifest
+++ b/dev-python/oauthlib/Manifest
@@ -1,7 +1,9 @@
 DIST oauthlib-1.0.3.tar.gz 109095 BLAKE2B a95915eec5bc5aa8ad8800c06ad2c05ec0e362c186647fed0da8036e763c04860120da6c2646562894b376b24a9895c05aac1cdf189f457101dfe40b74e5dde4 SHA512 b5df82729edc025f262a18c012f6036f52e97a8a846eeb75e4e205928acfd6e971a58194c4a06853d6743329d397e69b94fb431047b2a17a2cb2472c889c4d4c
 DIST oauthlib-2.0.2.tar.gz 125631 BLAKE2B d9d6efd396dd320573a4c95ce94f5465ca67e716ddcdb789560be5e29fc32071318a523bcb60e0d24ad93c407971b561b260dfd4ce0ec5b8cc915a24f53b0bc5 SHA512 ff2a720faf8a649b1e29f34fd4b5b0838937cc1ebef3fa4828aeccb781097d02b9578717de48ddee49e43c86840e38147664a87b81601616792765541cbf18e4
 DIST oauthlib-2.0.3.tar.gz 127155 BLAKE2B c3c69fe8e1f2a1672ad78755b35ef285be9e6d61ff5ba1792493d475eea1d47d38acfbc29ab150eddee83b3d41f60b14ba91074c213e5e92186842c25bdbc7ce SHA512 40eed9aacd6c239745523bf056afce8d76615ef9dcda8ee8a46e2900f940674f4178daf70c18c2bdef9f607db3fba84cc10b2306c608116ef2eb08414268125d
+DIST oauthlib-2.0.6.tar.gz 127675 BLAKE2B fb9db14e06007d575fc099381b9aea8f337666716ff8a6f7331febe9f41f38e5c5abceccbbac41da993a389ce2f171dcfb6fa7d75b09eb70d08e09d56b5e8a80 SHA512 3d966a540e3aeb2c4e72ecf60c28a596de1e11b986b68f2a2aa8b56efef12fd1a0181d64e083850843f38e329d9a6a401c244c02ae61f06af428d8188ea0864c
 EBUILD oauthlib-1.0.3.ebuild 1036 BLAKE2B f0eeff3327bdb91898f3cc58c795eab1dcc722a22cf1540f078652da64dbfb86c94064ec1decc062c258e8ab1ab3d1e71676a8a38b214df7f2b0d421edfa2878 SHA512 143732f61737e44b5f1e35847cb64c3e16e190a466ec952697b95f7231157df0356eea7b734ac6e2cf5c250d8834009b53bbd1518c63ec8194ee34cf9fac1e2e
 EBUILD oauthlib-2.0.2.ebuild 997 BLAKE2B 76290de7d96e3baa7dd27e1c8ea7671d97abe57d3d2463c9f17d1cfa1c8a8e3e5f18c64b6337bff5a49ef29b9c57cb16a5c4a09904efa3ee7a597416185f1dd7 SHA512 f5adfd7136d19aa45fa52127e5f3175059ccf5bc9b8a3b8f79aa21a24f8e8a2d3b1f079e304fd1a774d7fc67bf2cd0afc00cacdf014cd8620f68a9348c9c1726
 EBUILD oauthlib-2.0.3.ebuild 1002 BLAKE2B bd98cf786a007a421dc4c52b4cf95b4a98a25ebf3a4733e63609406a2dfcddb8ce44145b25a87838821134971d4d17bf501404e084ed390211732ef0cbbfa24a SHA512 240a5187a0a24a9f4513caa8c55030b32967dc30e3ac2ec28afcf58eca385a921eba43e6807f72f6302427d2ee5c5b0ae40b97376ee27ae6383f02b187cb2593
+EBUILD oauthlib-2.0.6.ebuild 1002 BLAKE2B ff422978a20ffa71770d1bd710cdcc95f95b3999693579d4bff162a795d3923ed27c9bfc13b18fcc5a120cdce6e8bbbf4bf42d3eb4cc19050fcfc2fdd59e963a SHA512 4f60faa872fc18bb78d6b2bb67da1b923f4931f9ebb7688dfa7376fd9ecb117251b4009646ad75dc4d43f147965cfd41a10c816b74595a1aba304598d5880503
 MISC metadata.xml 376 BLAKE2B cc62cffdc76d014f0c43c3cd9495942d08f592f6a3d241d8147dc907e233d7b3ed394c52e8b7767570768a50bc4b76fcfd64fb90f2860b4f7ed65f016eb69a68 SHA512 ec1f35a21ea68091f6fe901d7c05c711f891f7edcf48496dbf57312cf331e7df9465309ca90789b795efa024e3ba3ede3d0416c7d9362823cffab8fbb23fd3fe
diff --git a/dev-python/oauthlib/oauthlib-2.0.6.ebuild b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
new file mode 100644
index 000000000000..75343c46ee84
--- /dev/null
+++ b/dev-python/oauthlib/oauthlib-2.0.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spec-compliant and thorough implementation of the OAuth request-signing logic"
+HOMEPAGE="https://github.com/idan/oauthlib https://pypi.python.org/pypi/oauthlib"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND="
+	>=dev-python/pyjwt-1.0.0[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7) )
+	"
+
+python_test() {
+	nosetests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index b71292a1e9a3..33b5eddb1fd1 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,5 @@
 DIST openstackdocstheme-1.16.1.tar.gz 1179830 BLAKE2B 9f30e0206e0f7cf0e74bed486b6c4c0ee5fd8aaaf8118a4cac2da99f0cf8ffad2c1d14440177d4db232e29abfa38116a8a395b28b3efc883a22803757c0875bd SHA512 fb5c6e8d9945603dd2f09799520eaac8586784cbb1a9fa5f5c5f53e04905150646159f1d0fe4ff0e9da0e04a4df348a931272a59dd3893b5ee2cb10b4a271dd7
+DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
 EBUILD openstackdocstheme-1.16.1.ebuild 594 BLAKE2B bdb509052f8f419b5a12ad99fd8fdab59f4e3985caabccfd00c9713b6e0561c3656ba68f08e1d10606ad355464d68c9a589a074ba5d49c0bc91c61cc92f1c53d SHA512 20e9b5b59e160e98bdcd2dd9dc536a805a37670ce55f81b6413c4de5bb8d0d5ffdab7b213b4f6aef63fe57092f998a9baab1bf8add9c67a034f676f441646feb
+EBUILD openstackdocstheme-1.18.1.ebuild 596 BLAKE2B 2541b118cba478508d6190cfc18dc358095acc45a57e620589e8581a3a4df9efa4ca14df192d6c612a95d32e14c662f20d29ff3367edd2dd72322dd9c186a175 SHA512 cd9d49add835eeb5c0ba567cd94a8fd471fec663d47a9056279162636af6c13bace9c1336b15211c98e1dd7b391e0525d9e0d430c1150c1e0745f795f5db8628
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
new file mode 100644
index 000000000000..06f5782a4fea
--- /dev/null
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Theme and extension support for Sphinx documentation"
+HOMEPAGE="https://docs.openstack.org/openstackdocstheme/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 3d1ceade27ad..2bee0ecc643b 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,6 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-1.28.0.tar.gz 64102 BLAKE2B 955f3e4387d38ef99805c9fa53032c974b68d2128c89b9525570f1736f74d4a757e43ec50957bd5fbc7c6c1bf9a9b97577058f44aa9abc77d58e917cb2670151 SHA512 80cea066eeb8dce03afa91a720b2e3449676f019f33c8ab0a3c0ecd5cfd49cd5a061abde1a4f0eb1ff947e505de74d94ba3ce71e763d2e2e4fbd1c72b313d1d9
+DIST os-client-config-1.29.0.tar.gz 65974 BLAKE2B f8632f4f4ae95941e81b039ea928bb1013d4208b93a3cf67abcb689aeb8f2f128ad309b4c86ead98ede98c2a9c44a5e0db49a32bd6e73490ce50a357f1f37bba SHA512 1b50777fb1476a58ff0b6ca9fe3015d4002eee312bc970d23284f2a05c5b27a96204c3e892b8262c8d830b1681fb7376387cc4a032736e31a3c353a0a348e752
 EBUILD os-client-config-1.28.0.ebuild 2283 BLAKE2B 9ddafe2421558c8d6af8e2ed744603e7cd98c05b7833cd5b81ae4e32f9037bf30f0f648a96d0ee44166be9a9dd381a39478101c0dd295fcbbd419927f8ac8a10 SHA512 ebdab2b24800e9467de664c7384ceb0f7878d3ab85a5f987f7b490638a32e98fae1ac0b4985dd03835c2286f6530660aff9cfa425517368039b8a13d4978d995
+EBUILD os-client-config-1.29.0.ebuild 896 BLAKE2B 65779e0aec76a037b5d24ca06c8b3d065217abff3f89d9dcc4a1eeb531fb5b6b3a6740afc588681d07ef8676f897bd0b28065f687c882831f8680776f62943da SHA512 5b4deeee2260abfcbe64647795eefdd0389f5bfbd4e39e7d847d88756ee4648612ce0cdbef96f2bbc4628168b9fe81a2556e44106939876c7175c1d651ac794a
 MISC metadata.xml 325 BLAKE2B 84942ea4670c4ac35c2c6a4c9662f84b6eb16bcb59c9063640b08271bb2e05de08e1ff9972389e44522bd3f0575673a1d3cf4e6d2105cd636e0d5cb52daaa727 SHA512 6abe49192f78b02ad3079ccdc0dc58558f2fad7c14163addd865efd8835ffeee5a6d5d33da2296d6a14b4d87a54b647157f27ca0c603d9154b89422ea8a65933
diff --git a/dev-python/os-client-config/os-client-config-1.29.0.ebuild b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
new file mode 100644
index 000000000000..befab13b638f
--- /dev/null
+++ b/dev-python/os-client-config/os-client-config-1.29.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack Client Configuation Library"
+HOMEPAGE="http://www.openstack.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requestsexceptions-1.1.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}"/test_get_all_clouds.patch
+)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/os-testr/Manifest b/dev-python/os-testr/Manifest
index 309acff1520f..f1da568781ff 100644
--- a/dev-python/os-testr/Manifest
+++ b/dev-python/os-testr/Manifest
@@ -1,3 +1,5 @@
 DIST os-testr-0.8.0.tar.gz 42102 BLAKE2B 030ee587bc6465e414f09d177abd4f75d869da7e8339e1b396da31165212cec221d156b4cb095b1466b19f8baf2dc01087559b1d6b73fbfbfd41dced3df033c1 SHA512 62b5fbb859c1a3b44bc0d57cf4b2cd0a5e6eeff540f5507efd079a73e0f9ee70813e47537b456f1bc600c87da55d05fd23aee0c215b8558cc0b5e71a55950af4
+DIST os-testr-1.0.0.tar.gz 43382 BLAKE2B c5a9b22700ce40acff8ceeb796d9fa0b840038cd285d80630b16c3399e8c188d87dc54de653d06a2c0918185e9ffd4695747f59d4d42eb158f9ea18bc361963d SHA512 2189abc76840d935d63635874ebdae7c325b392bc24a52e07e1046b47a17be6fd97ba17dc5593ae7a1e2bff9c5b0dbbfd8ade8a2382dce2223ee4047b3483cec
 EBUILD os-testr-0.8.0.ebuild 1257 BLAKE2B ecaba70b32a4021d40cb4e277c00c682dd5ef307a8bb42b592219d0d7ce93c9599479990e9cf88cf97facdb3cbe72cf50475898282534065c49ff3661e0ef3eb SHA512 9470c28f42726c1df298ba5b2e5d1cca1cec13fc9ccaf70966fd4fa59cbe4a2b6cd6046035ff1e7d2fde63fb5c802175802252456b2675788d4d902517b0bf70
+EBUILD os-testr-1.0.0.ebuild 1228 BLAKE2B 2bdcbb92ec84951b0c94a7cf02f02d02fc085cc94ba783428f9f41f22a99f6d6c638a1f246a8eb8245f648fb223119230d711cec8ee6c8c0448923e6b77d53f6 SHA512 25f737c2d6fad3a26a40d3c2aa3ed6f63d40dcc667ea6a32ed530276d6620b4462439dfff9293749e017b9ac0ac44ec327dde4a589b440f4599557438de49f9a
 MISC metadata.xml 383 BLAKE2B 1d861bbcd12c0cd7c1d3798cf03163ae3a114349b3efc600179c47d71a275c211d65e8e542dc9b5c22b3b4690af4048ba85a573c7a40b8373f2783d154c050b9 SHA512 6e205857c3d2b3d94baceef580f343bee82210bf3003106ac58ad48d0403aa32c38332aee7b030eacd7d0bd272d7bcb34054e5852bd8b4870cebd0af74eb2577
diff --git a/dev-python/os-testr/os-testr-1.0.0.ebuild b/dev-python/os-testr/os-testr-1.0.0.ebuild
new file mode 100644
index 000000000000..a5a6ce424f55
--- /dev/null
+++ b/dev-python/os-testr/os-testr-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A testr wrapper to provide functionality for OpenStack projects"
+HOMEPAGE="https://pypi.python.org/pypi/os-testr https://github.com/openstack/os-testr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.1[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index ad9d3d64cc0c..73ca7ad9f073 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-cache-1.25.1.tar.gz 51049 BLAKE2B 24e229d7c7a03fc244fe257394fcff1dc55509c6ed6a60ef8eef49c1a7660972a8412188ca96902b61463dd452bc63fed890ba27235d93dd620a93a52de706a2 SHA512 bc5b6502c6f310670ffae9b70b232ff90f0d0c04b75ba14aa4d528634f912efb243b89e229b8277e86ef3d7cbe2e81e69996c80f011d8ea4e1050646f074b297
+DIST oslo-cache-1.28.0.tar.gz 52015 BLAKE2B 897e54008ea99f367f373291d874736287dfd3d480046bdee0ab2b54969e8681144677713794ff32682b1ef65547618d5fcf403e9ae24b57768905daf7ae7f5e SHA512 44deabf9dbe3c24afd04d09f91f95d902221995130559e7895045eed98356ed9e085f5ee9b7e2bd0b4581df563a67707121b7571b0b7f822f0bb5a55b6dedafe
 EBUILD oslo-cache-1.25.1.ebuild 1190 BLAKE2B 97e324d523d406a006a66c30afe34673b7e38f8032ca070e2ffe65f8e3de794debc745d78f71fb600f324ceb2c62586e282c89f5e2c8897f2b93a307f741de75 SHA512 bb2a6e3313fb504275a7a3ec56dc60f8f94b03db0e20b11248e89464bf38502cfbc125528c8f42fb096dffb2965fe9ac16edb392ee3761f0946d01b9481e3a6d
+EBUILD oslo-cache-1.28.0.ebuild 1045 BLAKE2B a47f79ccdc2cfeaefebbe565d0d32a3a1900a0ad0c698fbafeb1bebdf8d3c64693c0894880cb484fcbae4e18eca2b6e0ce282db1f4b0ce135d88d37508b750cd SHA512 a0605886a36d3489538495e76cc53814896c2f273b57b1044e0c8cf74f0374e7ecbb3fd1e6843b8b1eac251287bddabfdc1f23289ce4f44503576e3537bb36f3
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
new file mode 100644
index 000000000000..6c06bff91981
--- /dev/null
+++ b/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Caching around dogpile.cache"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.31.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-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 5068c0943db9..d39d2d6266bc 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.concurrency-3.21.1.tar.gz 48866 BLAKE2B b621548173e30e7a7f3683d1f5ef3821574e780d1df99c91d8bb77d4e3d3280da395066be7c9ec95b3d3e640da694aae81943e126c8c4e6cd5f18c2db99efba6 SHA512 6d165ebf952b29d96d2d1a8b938b2ef4746c77b99a62ca596ee93e6fb6d919f183eede380763b6167cb7d372e03803556715523b7a63ad1dbadff4eede7c0bcd
+DIST oslo.concurrency-3.25.0.tar.gz 48736 BLAKE2B fe8506599d175d22c44fd52bb2c4e5f238687ba7eeb926d3f042be14e6ef8cecb3c13b010c1540c835d9bc7e587560ea391ea00b99f05553d6bfd46d2bbe3d9c SHA512 0273112cdc0a1de45ec231b672f2ed8f8fe5842dea756bc062a18247036b2fdbfbce392f3edbfbb871a2bda94412f6c82f3a634fd98a77c1df5a243babcbd4de
 EBUILD oslo-concurrency-3.21.1.ebuild 1952 BLAKE2B a9ff0a2a4c8dc730335ff225bed5221e7f17dd824234f19b10a49598edea40a2a0f75e954d4338f24fc7848e7d40f2f7d0be41968cb4707ae094aaaa6b996d3e SHA512 f5ed1e768fa298959da1c2d46db9d919ae0d52f09e1b1181dc1969136213a6b7d3a450ac04363ea837801c8e1b2bdccecf901a3927796bc7a32802d7086acfd3
+EBUILD oslo-concurrency-3.25.0.ebuild 1811 BLAKE2B 278c63067ef0cc6e40888760d0908d583e70d884874c0c3f342869a40fa79c595165ce65bfb192ca576b84532cc693bef0fd809083e86699c985247cc1e9f493 SHA512 75f1539af522616fd430c3178d06af3eb0382412da73d6ef41dd35cdc8ec1eae00668e38d918a32dd48a210ff94729862b3e9727a144006746cb551ac092e2a6
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
new file mode 100644
index 000000000000..b0254407070b
--- /dev/null
+++ b/dev-python/oslo-concurrency/oslo-concurrency-3.25.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		virtual/python-futures[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.7.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 ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index d254b5f0ebd4..e0f3014e65d9 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-config-4.11.1.tar.gz 130922 BLAKE2B ab3f142c54a09a3f512614452966f61032ae4f1a0163ac4ffd1aba13b4e2d0c52f597c401a7a0894276aa7a05879a4bfdc1d0a5f0f8fafc6e61b2770d34a6d7d SHA512 c7087080ef336d8aaf262a968495afd599f83528a7eefe6d9d13a819ca4d198964550d516abf4bb674eb4bb95c42e278b65cc9bb8e90ef3d6010e24959d393be
+DIST oslo-config-5.2.0.tar.gz 130627 BLAKE2B 7d5e78a7486ea5b24d9eaa488c70c3222da137d230912551e98fdd4a433b3979c2d8841aa4cff3d763ca356ea1f80f2cba13716569ee41e8ff7c4e6511a3d91e SHA512 fa3323926f7f7b1a79e4823dfc102027cb466728500980d9f079c2098c93006b4fdeebb2f09bda41512dc854f5dfe080b727fa2d63910e6fc609d69fab87596c
 EBUILD oslo-config-4.11.1.ebuild 2287 BLAKE2B 8195369bfe88ba2c33840cd6ac9e744d6f31bcb84048bb054d61d3928979c725ff02352023e3d103506bcb8055c15dbf00e09dde4a3adfc7e6d951dce2285117 SHA512 82404fe61a991735ba3601725986bad53a66efe4fe04abc2b357cecaf48d04e5368dcf45556b231d0ff2244710d7fdac35dd226f24ef33162083101270f31aca
+EBUILD oslo-config-5.2.0.ebuild 2061 BLAKE2B 6d5118a65f91bee40d8cadcbfaf4ad13be223c572c73976a1dd5a41235530103b6d86ba1dad9b75300056071bd6a83385e23e1009e4c3cce6937ce19cb3beafd SHA512 8c51770dcbccbb5a3d39d41f7c2250951daeb42d2dad42e2bfdd9a98a585df313b8c352edc164ca8d253430dc6dfdff19682d24dba73e9e425432f26102aa6ff
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-5.2.0.ebuild b/dev-python/oslo-config/oslo-config-5.2.0.ebuild
new file mode 100644
index 000000000000..373c353d1b24
--- /dev/null
+++ b/dev-python/oslo-config/oslo-config-5.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-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 92baa8879582..75a05baaab36 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.context-2.17.1.tar.gz 27266 BLAKE2B 6d539af2d191103a411db0a7671d0ea4a9bb21d0a33e4e306ceac8455c4b0aafe594541b3cf7e565372dee66c3a7c6685b86c96256046e108ee21f74633d01a5 SHA512 f75d9cececaa095cab3b87b05ab0c4bf9f115b96ab7feb5607edd00a33440a4418692f4f6cf8a3dffbbc302758e734c4184f271e3860e65d9da95f0a97ae633f
+DIST oslo.context-2.20.0.tar.gz 28203 BLAKE2B cbb3cb6f30b1b16011caa6fdec36c19aae571125b88f642bfc52c5a8a63a2b17eb308628d9a5f19b8a0c3bd28fb0db54e5485abd10c90c9495de05263ac25709 SHA512 ce7bd92c7e22e02e91bdc86e9b697f746233a41081b4f3ebb9fe30fec8000c69f732f55de0d333b349b8e01e638ddc835fd3cf0d8f7a11aa3454466a1e87ad08
 EBUILD oslo-context-2.17.1.ebuild 1407 BLAKE2B e506841756253ffc5bf45fcc1830f216a88a66cf8a13894da49acb5ab75f11ca727a11d9f3dcd0e0fa867bbc98ffd29a1b606a49fe399861c6384656b437f076 SHA512 c156fc6f1d63f2459a321313812d596d5adceca14a83b0cd0fdeb53d3e8b240d17d0f1da6b129bad2852be00506c9b90e1bd80d8a7c6216ed5f2f192f9d80b9b
+EBUILD oslo-context-2.20.0.ebuild 1213 BLAKE2B 57c4dacc16f9e38b1c7aac2e96be4443c204ed1b2ac0300ba94f79788a6237217aa507846e7a824943281f2731f001cdfa114f08f6c51c26d6a0693cc53ec22b SHA512 b43ffb0ecd5c7f24cda55e264dc6ec728b88c7651227df19324eca9b6dd9436982db5e62dc8329489df0918a06b68e2c0dc33467ed20faf6ced2ebd8cfffb987
 MISC metadata.xml 700 BLAKE2B d0e048afd7e2d85b6cbadc1927d2cf83469e0c8bf31d6aa6516e8d9f6af5d07e387c975c54c2bd877a22f2a964ab6b99d7f2c70130efcb80af68368d2f4c769c SHA512 2ff5f7f1e4a65feee089f19c189a30668f09000ffe03e852d084d65f4db245e94086dea053620cfbde5a793f3c1014f84e3e3e192deb5e16e94bd46017e88bcb
diff --git a/dev-python/oslo-context/oslo-context-2.20.0.ebuild b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
new file mode 100644
index 000000000000..9f56c6954add
--- /dev/null
+++ b/dev-python/oslo-context/oslo-context-2.20.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${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 7d9d45d1ac17..de06fe51fdb9 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
+DIST oslo.db-4.33.0.tar.gz 167982 BLAKE2B a6bde0df966333048c59786971f9785c6272dae92b84877243f91945e5d72eb52e1a64b01b57fde5d7995aad7bf02075ca1dae7e4715f8d05a901535d98580fd SHA512 5886e60845afe89855ac6b990aa0bc2a3984cc860ef05c76ff751c2b4053112f89583b470765819c7cb3fb91d51110f53cbe6c9ddc5cfafb1d11dfe38a3c07ef
 EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
+EBUILD oslo-db-4.33.0.ebuild 2053 BLAKE2B 05b85c303e78e1d9dd5354045769188ca9540a3c1d47d980e62d312c9935d2ccc1b92292ef5328f6ca6e860d2a55d64363aa9721cfcc63b313345460dcfe166c SHA512 78d70216bd686f5aec087916d96b9e9680ab65cc3d23394b8a9f55f6abdb2fae4910ffe26903779e47542e882493abf97775d2375bc53d5ed47ba4ac8e941c5e
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.33.0.ebuild b/dev-python/oslo-db/oslo-db-4.33.0.ebuild
new file mode 100644
index 000000000000..15fd3d5ac288
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.33.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 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 )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		|| (
+			dev-python/pymysql[${PYTHON_USEDEP}]
+			dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
+		)
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index d8cf20704e59..f502741f5f39 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-i18n-3.17.1.tar.gz 42660 BLAKE2B 645a8341cf2bedf18932fbfa092b608da4169993a2a62aef36b869e975dfd662b7d52008aedf046b09ac10e4641e810902904b16e450a728b0f075fdee654977 SHA512 86d244eba7a887d4b8c3327487c9dd67c8e4baa52afdc05f94a229d6c1c951b8a25fc628f490320501773bb808afb8fb3b450a8d26e11b9a36a3c22baaa64544
+DIST oslo-i18n-3.19.0.tar.gz 41888 BLAKE2B 651b6e1ee2d2d6c11bd1b86b78eadf70b33338f5495fb93d58747635961df20fbf74fb2a949ef81b82efce582410f05c88806e678f688bb686b500378c77ff6e SHA512 2c12fc5ec24fbebd2624b3bf9d3043a62da84304e73a995c49b395e792bd9bd7d38a13f5e3086abe59bbb9ef43729a47eaee78ea0701ed05c15f5070af232a69
 EBUILD oslo-i18n-3.17.1.ebuild 1944 BLAKE2B f50bccee49fa6c4182b8012918efa1c905e22716ccb9e7385043da9c10ecd2fd53c5c09e2530f1088a96283e8053b91ce74e457338da3412b0d8dacf371a3ac4 SHA512 f1a189771d993733f56b44985664bafe4f0db4a53d60c7c51b143f53aa8ff5b6f375e624a3860145945575975b465cfcd3adf412ad1635baba6e30464f54f0cc
+EBUILD oslo-i18n-3.19.0.ebuild 1757 BLAKE2B 48d70d025711cc2d8376395b2412e6608cad06029714b0a0849ddb6b9548ff49c43960a4a4d7e2e0317833a2bdd80a650ad21ac9c56a1a643ea9bde75e13c6d1 SHA512 d6247e4011e46ef3a7ac4bec529546de6d5a02f2e1a1dc30ae7b262aac05a9ec239ed6ee954d2f3bb5e882ff19517e16867c8b7804b8dbcdea402a1be85df785
 MISC metadata.xml 472 BLAKE2B 98f7913442dadb92834bbc027d458b5abaeeac785c881d6a4c51cef401126795a70254373901b626908b2b513867e6b6f9c2254417473c48229bedadc572bf8c SHA512 cd798ff83761c7409f07974012b11443e52cff35588e610d0d047438834198e9a3e35c69a6f6e1f724e8b7a118dd4cc4eb8df38e6017caa22bc061d697c0e97f
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
new file mode 100644
index 000000000000..b5bcdc237653
--- /dev/null
+++ b/dev-python/oslo-i18n/oslo-i18n-3.19.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
+
+	testr init || 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 d214951151d2..480a52ce11b8 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.log-3.30.2.tar.gz 78807 BLAKE2B d2042a185daed8aedd2f3ff7ef1a5a47b730b1a79c05e73aba60a635a459f1f683d27e422568f1798713e0d095863bbdb0580a4a6f8263c1f47a6055aa1f81ab SHA512 c4e7b9f5c7a3d813ea816b06cea58cc1d8908f4914bf3221f564c65bb8998e4fed7df96faa54d69782e5ce43258339f32330b12f51b4a4cdb9bfdd5aa092e7a6
+DIST oslo.log-3.36.0.tar.gz 81964 BLAKE2B f08a5cc5160da123e7a0acef96f94a20b4051c415056e639b4eb20a10ca725da2527a5c6c25cbce8e532606ab390bd273be54b691d52e6e93a1a51b59f8ba909 SHA512 47234c4bef09e105709b765fe0d5b297312ac73169a438f2759cbff335f059afdefc323c290a32bb587dbb6d2095de536ae7111a31e6c5b280e760b9b6b971c6
 EBUILD oslo-log-3.30.2.ebuild 2209 BLAKE2B cea9ee93a7b895c83e5fa743a9654a3a6c37b7058365199ec18767113527c37d1f2719b5d6b106c64e459a11f9a4e27d9be1585a07af0c0d8424f9c022e43fdb SHA512 116bc9e67636a9fe6dc04c46e8adeecc54725512458b395339cb6d2cda0660256f5bf5300e4916aa1b94aa57b9aba1db2e19bc2bf8d98187255ea6c848303486
+EBUILD oslo-log-3.36.0.ebuild 1972 BLAKE2B f987f6af011aae92e8007fe47cb0d6e1675fcdd83b8640f7d05b65caf28ccea6be4d99174d0bdc82ac4903c5a9a2481c234ffff7f4ff476b64780830788a4f27 SHA512 ab4c997a089545700d8e7823b8a76f046ef1edd5b2828094bf383f08cd766f532e16b25355e00cec63ab59930571166bec5924833206e42386022ce995533a83
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.36.0.ebuild b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
new file mode 100644
index 000000000000..757cfe037db4
--- /dev/null
+++ b/dev-python/oslo-log/oslo-log-3.36.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenStack logging config library, configuration for all openstack projects."
+HOMEPAGE="https://pypi.python.org/pypi/oslo.log https://github.com/openstack/oslo.log"
+SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
+S="${WORKDIR}/oslo.log-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]"
+DEPEND="
+	${CDEPEND}
+	test? ( ${RDEPEND}
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+
+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 b906420f8954..e00e04788e42 100644
--- a/dev-python/oslo-messaging/Manifest
+++ b/dev-python/oslo-messaging/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.messaging-5.30.2.tar.gz 317883 BLAKE2B 4003de476db2636eae2462cd3aef7bacb911e321c2cb228263482eda7a82361ec4c731872dbaa8394cfdb42759a8c5e200a03b919c0941f74da32498831394b2 SHA512 b4715c73c158414d1b65fd56c6697ff67ce24499e96ca076f8c3d5d93d0b06ca1f9f80fa0de43c5ee0d5e8de221f20b95e077738b026bac6671d1a2ec6128b08
+DIST oslo.messaging-5.35.0.tar.gz 325918 BLAKE2B d219a630b0958930bdd84693f43030c34c7beddce42f017f7f5ffddf5a6530c59b3eb29c5110a468a4606715f766a62abe3bd2d77c79ce025beafee6f322321e SHA512 30989d9418d30570ce212110b263ac7227acc3d6cd05305f7df23844253a81265c76e3fd93228e13a25399f5188431fa2f959a2c15639162abb5297a6fb7d4a1
 EBUILD oslo-messaging-5.30.2.ebuild 2145 BLAKE2B d27a718e90755170492a47c25701e55f73332037e52a0463dd3a528521c284ef3ba01600e29f9f72b8416e21ec1b1e9a4049d5c50df54f3b07749606470c9c9a SHA512 5e6d85a3f10b78d37a0d77e4dc943ac0c4400682330bf90aed803c8a30349bb9d18fa67af0de5df12519b0d096759638a79b5fd69e248d7eed889d1e9bc7c1be
+EBUILD oslo-messaging-5.35.0.ebuild 2003 BLAKE2B 5c0f4972381f55a2a061517758f681b263300afeabd60aa85d728bbac0dd078ba9c8f407bcc4054c73e0cfc5a2be975efccb8b6df7109e1954615d47867e139a SHA512 0bc7d31f67a8c7d127335c13e6450f6c24f2a8c51b050c5ceb77fd1b9f2e9ba4d4482f027d84f5d1b1fd92aae3d906a7917419fc8f036f1cea73b679e4301dd5
 MISC metadata.xml 606 BLAKE2B 8ec973e563bc5efc9566d127aed486c8ebb7e71183c845f87d9c073971800868e7c2eda9056dd05da0310f82a121aedfa73204709f34477e75df34937202830e SHA512 c59bfd0c40ee7623a4194afa2848759b968c81955986f5b6a692d9ec59cbf11a14734466383da626535f9fb795193ba4994f8e57ff6c6cb732a9748abdccfd35
diff --git a/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
new file mode 100644
index 000000000000..f50bc20b0b96
--- /dev/null
+++ b/dev-python/oslo-messaging/oslo-messaging-5.35.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over 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"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-2.1.1[${PYTHON_USEDEP}]
+	!~dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/kombu-4.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pika-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pika-pool-0.1.3[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.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-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index 2b6aa2faf512..06f926112b7d 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.middleware-3.30.1.tar.gz 56811 BLAKE2B e32cfb91a813883b8f50aa72484f679758efe1f1a0faf9fb3df25c77bc3e0c53464bc77fad95482ec002ca013e17d6f20e4318cd46373decb6ce7ce28f933884 SHA512 ec70d1a5e932c8da7bc4febce8be6b63ec8fb581e2b30051ab655a2a98689467d8e824d073cd19c8dd320d02a975ce22845ca5ea73f1c4e3b5ac9f725452a9db
+DIST oslo.middleware-3.34.0.tar.gz 55582 BLAKE2B 0e1af09d016cd5b81c5e0e719d40665ce24e0caaf28a4aae0043f99eee4e74a36669fdaa39330d0ffa13b588892480ee5081e1ffa41b431687c85964c7f30460 SHA512 ba8b418eb11f25ca929db32eb0451fdba757197e1bdba90dd56665e08daaa6f0a4dc6cc07788db4f14ebf2625312d3db69b73acc5cb425fa9e35299f22b6d451
 EBUILD oslo-middleware-3.30.1.ebuild 2265 BLAKE2B 9fec3d7aa36fdd950281046c661df5d1826763a49d3c08215a0dc45ba151b6f019440f689fa34acdff22a01311946aea09f916259dbea15fddb7583350c90e75 SHA512 d1809bdc071a0187b4177b3088605b3a7ca66c8b50c23dc0a4ff3eb5bca33b7e374b65e2d660ae99d9088597c4c397815ca484e356c0ae7947f787c2667d035a
+EBUILD oslo-middleware-3.34.0.ebuild 2189 BLAKE2B c46ca81aad3c0fab09c3a7717ddb02adedefb6a3b93c5ea95ac6bc7b625217dce9b9a89144233f1b226d965367e6b715c46c85b8c97d7ec3b9f697987c3361c8 SHA512 615235b3e93f9aba67b554f25dbcb2bf67f1c0eb163ba1d69e0709ad9f31759e650f468c90a9a536f7600d5fbb384ee73f2163977e6f68c4cf15b2fe7f0ee0a7
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
new file mode 100644
index 000000000000..5d1d13467205
--- /dev/null
+++ b/dev-python/oslo-middleware/oslo-middleware-3.34.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Components 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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+		!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
+	!~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/statsd-3.2.1[${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 1bf4679a5050..f01349c1cfbc 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.policy-1.25.2.tar.gz 72984 BLAKE2B 7f2e4d48309082c1069ffcb561502c71b86e0c5508bb07cff943a1fc32fbbec8a232451937b678842909779e94b7eecdd5f2991152e0c8ca557a58b1ce137fc7 SHA512 8d66fe73d7b9d381c54997d980833e4e5d429a9ca28343adf777af20042694bf5dd878f9c1a9ed7168c075816e4b37263f9b520274bbdccbe0c6649b7cd7d213
+DIST oslo.policy-1.33.1.tar.gz 74314 BLAKE2B dda781284b77a6677f9a5dd55473bc239a5b482e635a8e0e808f918ad7aa6f2a8178676f9584a15c418cad373e9f34f6a24bfc462c053f06d0993786fb5ede0d SHA512 50d2c146afe04f669c0d7f3e7309a9d03883ca72fece4135e20f7d8a75b71a5a69b9b5b26e36b6afb0fd162c4ddcc5566c08cdf26dbf3bd9679f5ff75c27d722
 EBUILD oslo-policy-1.25.2.ebuild 1322 BLAKE2B d2bce22aab9c3dd8dbabb2c7fa089baa3f4a4bd8f0148fd53d9b049e36eb2ad9d1603f7f3643d5c2c1d91de605f3e6605b116b670797d6e368c02f0a9a8213c6 SHA512 1e661429bb1e19c495a7f8b945e5762abc69b0293205761a5f4919749af44f5c3d32654ceb6ad31558dc8161ca1b17309130f98c737e91c71e86e889c8d30756
+EBUILD oslo-policy-1.33.1.ebuild 1177 BLAKE2B ea0ef8623404ea29963c3af942a036af3f090f1a8ef48a63c1304ba690703a4cf442a13941396fb686dbca08bbb33743da21b10975178d0c85704461c9ea9555 SHA512 b4bb872a792437b535046e33221933d19636af64bf0497d37f01a80fdde6e0b6bdbaaa47bbdc359ed503cc01c046bba1946e6cc9d92c3dda52af209491a8ab6f
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
new file mode 100644
index 000000000000..16797b7c55cf
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-1.33.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="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"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/oslo.policy-${PV}"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 12b7d2547a8b..751a9c66ab29 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-serialization-2.20.2.tar.gz 29486 BLAKE2B 73fda86ced11c7c6dfb1a15c761645583cee463521285dc194cc1aebd5ef100832190bb0b07f825472286dab8ffc4dbed5cf6183fd86128bd74d51c5d15996a8 SHA512 1bcf50a090a0ec74d1aca7de6cc83f7451778eae7335427d11f732120ec99163441ee0bde13df6e660574c7ac5fcafe746cdbcb421e57f02d782f2405d5e33c7
+DIST oslo-serialization-2.24.0.tar.gz 28948 BLAKE2B 8e57d14b21deefd8058f4dd677493072b0bfdc08bfb18faae2f6a09c4ab4e29ce544e479427a6c6557e0ca78fd7b525aa6a8ab3443a01c3d856ee3556f5f3f5e SHA512 8c2103409d9ec2ebfd45eefb56ed42b1ca52c0f8eaf5deff1020a67f813c8524d1bffd81d97a1ad28c80b4a5afeaebca829c4580e635f514900fd0835782990c
 EBUILD oslo-serialization-2.20.2.ebuild 2040 BLAKE2B 9d0d544c9bf305c8a6481dd9b376c69a90a94309b6739566ffa2fcb02a8d1ec5d50e83ae9bf5bbf7aba3f980f7652675cfd6c21c2d905b0263b166fd2bde4312 SHA512 770ba0ee01c2522ffdbc24e6df3f2b6c3325174cc529a54b8347cba53109712e2e4949a0e55f12babf5c9f5a0e142ffba7b18ef9cff47a791c417d2b1805162b
+EBUILD oslo-serialization-2.24.0.ebuild 1948 BLAKE2B 85a1c7e90c1b951c9943ee1ea0cecd24f340e214b1f78813f67d1959d101cff5ae1a1af0aa869b529c8c915b4429739529a5ee8e0c6978e8462d38653cd3603f SHA512 07d012e03348640b872bbf7695cdb5ffa05c8fe45eff8579a62cd4f4f98721c697253beaa7db6121d8eed7e1399cde96d46f1eca4fdf777e2afebbadfcbcc30e
 MISC metadata.xml 481 BLAKE2B 90f53fcdeb1a61f964745333fd7edd154ee61b05382b6c0a1aa54e78d7486cdce6757fc54c01a1ba2c7d9362f0ddf1045bf77dcc76036b995b1e0f0ed8e9b7c7 SHA512 41eb0d120210769caf9bc59d2ca53d136ec6dafb8e4eeb0dff126eacee1029d49ce18d85b6b19749a590579f63ffffe4c9d69919443c59c36b133d60629a6815
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.24.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.24.0.ebuild
new file mode 100644
index 000000000000..ef5eba506886
--- /dev/null
+++ b/dev-python/oslo-serialization/oslo-serialization-2.24.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+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 -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		virtual/python-ipaddress[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	use doc && esetup.py build_sphinx
+	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 c039925cd26e..f44c63fc097b 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,3 +1,5 @@
 DIST oslo.service-1.25.1.tar.gz 76864 BLAKE2B fe4c8ac0f52ad7dcdd5240716030cd807d7755bf6f39d949331d18c1d0ce30563609f15db0db10824712b0a22cbd5ee9d6985fa5c9a51e734b000382d0ca7501 SHA512 2632ff6ce079916e44d6250487e202a7e1590cb0ba094868bd9d8e01cea9f89f22a5336edeb74aff2fa0f6aa017aefd454159511134670cceff5112b9957ce81
+DIST oslo.service-1.29.0.tar.gz 74957 BLAKE2B b56869cb28704718952c5e151eaf0442b1a4295b8e25a422d91baa241a990d031cd408474e44bd5ea2af2b7451e0c13ec491ed4c2ccf0b07c78b65a81bec4527 SHA512 84f1b8e6abc7c8c95433da53b1a1992570695b80e182f5cb7d87ab394857d8d47c0ef0528b7a45221c897eb4c5c13112d86b8a929efc2988d22844a4c712a340
 EBUILD oslo-service-1.25.1.ebuild 2207 BLAKE2B f0b267507fa5a90770ec57cc24debd421ae9ea7949f0e590b42869717f5c5553d169507f2cbe056bf32af7a7696fc299dab858ad1493d528540e81b03a73f5ac SHA512 84d67ce2b71608204676112d4c8618210edc6d309e0edd9ac49ed583321c782118ba226a22a81fbe3dc8881302d269762fe9f64fadc0992d3fc412dec334fe26
+EBUILD oslo-service-1.29.0.ebuild 2036 BLAKE2B 2986bd96894d63e5a53345295b2d0e1e532dec1b25dc2dece721d62fc25bb75b2691166e92afae0fbce2bbbfee77d5cbb3f73a93c22037a1f3a983118404de44 SHA512 07246329763b4d206aa74bb68b46da3b9d432f5714c050c9dbff3fbf1af98dd9c4a312646249cbcd8aca5cbe88cd8a6eb60cdb7bd0cf9e5c44a96cc89d9a6e1b
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.29.0.ebuild b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
new file mode 100644
index 000000000000..cd089d344b57
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${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 3ae6be72d584..8246c303ea9e 100644
--- a/dev-python/oslo-sphinx/Manifest
+++ b/dev-python/oslo-sphinx/Manifest
@@ -1,3 +1,5 @@
 DIST oslosphinx-4.15.2.tar.gz 33362 BLAKE2B 4eacd7da4eecd25836920063c2c05f205f5c8d29cf6253257e9e56f35e1f9cbd39fb120fd69b075670bb6be334fcc50dbff6f52cb928e556f334720a51eed590 SHA512 cf8fce033f97c0334fc076568720fe3b7903e780d4b839c452f33d02378470263891d01e553e4f2463484895c689532f95f4aa81ac3dcb0d6137b463bcc7e08a
+DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
 EBUILD oslo-sphinx-4.15.2.ebuild 1087 BLAKE2B 717950bae6490ec30eb71bc05606c0821e4501e793bf13fdb57c54ccf85772e5be1af46a185d8a702442d99155c1547e68bb00afa5920ffeee0724276e96ccc3 SHA512 1bf99b65045cd1b0ff09bdc40ea00fb968664a6e83589f8aa9e2ea14d4fec1ac8ff664f139e61df43695a85d5c7941d2b917ef4e455c77a307dbb52ae4b40e66
+EBUILD oslo-sphinx-4.18.0.ebuild 1047 BLAKE2B 42c3728581ee70cdd029e1769b2cafad1c23b0c579a2f80a2b7eedf60b149f6823d58135824225f45c9fa85d48644c88cd1ef878ebf9b773cc0b3978cdef4386 SHA512 7240872d8b82daf2957803bb3f3c22eb7e0d353d07ebae93ab753a2fcf4decc26c277cbaac69a931e64cb87c3d1e57d1b240b2f6b3daa38cb4850c6daccba73a
 MISC metadata.xml 586 BLAKE2B b78b49fc66eaa7ca4a79da676895e28b397359cc8579a3e9b91dca1d933779d3ec7f9153d0789b7f44dd75c8fa8f9d866cd916911a4dfe3bd6d89435a0330960 SHA512 ebd5d188edde4955081fa7cb073daeace8c9580dab828d4fd12f10f27bb562ca7736ec77f816e243a02e808b83dc712ab53f40f70e1865cec014413514ffa000
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
new file mode 100644
index 000000000000..fdb87b6aed39
--- /dev/null
+++ b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN//-/}"
+
+DESCRIPTION="OpenStack Sphinx Extensions and Theme"
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 61cf4c3b31f1..90b5e4ff0442 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,5 @@
 DIST oslo-utils-3.28.1.tar.gz 85889 BLAKE2B b789bcee79f30a59a178c51997b42bc63bc67b998aedf2972b7f01c098992236eb2535a4e7fc43cbde5888340b0b14930093b49142fc9434fa7ea0069733b7d7 SHA512 f46c097378af27b8b1e7c9ff0908e3077c19c819ca02a9c181a54fd77a62506668ca22b42d5127a9e49f62244d034b5cef0b7c8c751b55a651a6f46fff0b4c02
+DIST oslo-utils-3.35.0.tar.gz 86107 BLAKE2B 2b4e00af5993799e43b40d63c667fb582984f8abbdd768203e0c95d2ecaf0f8ea10ba70ed520c116ed0da841dcac479d81881b4061ffe3529d8fe26917bb264f SHA512 dee75fd36b1c3fbccbb432408769c15d17b7dfdeef3b6f7056218670ca2c7e97a1e98acae3e06810f842a8e20fab1cf419b23153cde94c93e6b60e498ae2f527
 EBUILD oslo-utils-3.28.1.ebuild 2891 BLAKE2B 567b649091be48e947dc0c92e7880ed9182cf6c180d74b67597089e7d2eb621d28609db80130fa26c2ac67e403fb69e0206d497fba33fc572ea03c181f96fa34 SHA512 129aa2f0e3c5b65a69adb16a7518a264c9a24f516efa641e8cd9cbb1619b7119f1f8d6bedb8c9c547c9649bda705920d292b9c71293dedd6097c32eb58f4c224
+EBUILD oslo-utils-3.35.0.ebuild 2698 BLAKE2B a70f94293b3f1d15f4573b6011e628b396dd59f238a18cb738e6e2c9c1ce163f924881aab511470ba834393f6afc1e9d3686a6f25ac36b6be791cb30e7768501 SHA512 cfd13a60a0f3ce9ed12961a5dd7e2fbf333e111bee591220b61b22c5d7c916fb6cd0ea02b6cb974594c6405ccfcab6e302fa432ad4b21520b312e9660d89b900
 MISC metadata.xml 473 BLAKE2B e3b911c3e0e8d488eb537223f3423338abb8f8206f1d2e8c5a5260674f7815aad6ac497f519d1c3870b979c8ceb415df6882b55c5c13e5f28474e9ecba52a961 SHA512 17ac5a7dca516e43af1409f5800b112c829edb6550cbb7d91eb394e15cebceeff3c895a0250126cfc869f4ce0e1b05dd494ba614934ac06ed91402e3af048634
diff --git a/dev-python/oslo-utils/oslo-utils-3.35.0.ebuild b/dev-python/oslo-utils/oslo-utils-3.35.0.ebuild
new file mode 100644
index 000000000000..90b8d63dc81b
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-3.35.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	virtual/python-funcsigs[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.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
+}
+
+# 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/oslotest/Manifest b/dev-python/oslotest/Manifest
index d0e25f261abd..d9393246a2ae 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,5 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
+DIST oslotest-3.2.0.tar.gz 35445 BLAKE2B d33c70e760fc595586c2d7b0ce6ed1f63b73c89ba078f85b70d3b6b1af1c4d115e6eb7b431f9ef52abf50290eb47a1d3adb2d014c2ba5cf7b93ecf0e46401a26 SHA512 4513291e2bec939f9734255cb0fe3f85b9eb8a8cadce58873ad4e85365a0ec27bc2084085f5b95b681b5e811b62458e18fe63aff1e022b2d8ace0ca48bd6a527
 EBUILD oslotest-2.17.1.ebuild 1784 BLAKE2B 4d590b29a50b018bbde9e0e7b92a6b0721ca1200447a9b72c03b377626e795bc74ed808d540c4efea36a11649a55cdd99f76b38cec8eef25713b03668a28857e SHA512 25acabf2fdad54fa764e3bb3911fe479f975bc73786b86e3ec01f2ebda342c385a53add740f557e8913d592dcdb2d6452d947d6b1db86d95ac7278c99b4a50d5
+EBUILD oslotest-3.2.0.ebuild 1547 BLAKE2B 39154afcfe26fe7fa061ad744cada8a7f08e0d99fcf280c08156d382cf0e9a4b97751deade6e99e4b2bed086195612788a96022f15a5c5a0fba3e267e8a8bc95 SHA512 30580b8c15facddeed10616b728d2de4aeb54da41652d9b0f6c112d88f05fa78f247f041706185b0091159e2558b9c48efc7751d2f54dbd7727fde1451aa180f
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-3.2.0.ebuild b/dev-python/oslotest/oslotest-3.2.0.ebuild
new file mode 100644
index 000000000000..310558b286fc
--- /dev/null
+++ b/dev-python/oslotest/oslotest-3.2.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+	if use doc; then
+		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() {
+	if use doc; then
+		doman doc/build/man/oslotest.1
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/osprofiler/Manifest b/dev-python/osprofiler/Manifest
index 3b49ea2f19ec..bcfdca781bb3 100644
--- a/dev-python/osprofiler/Manifest
+++ b/dev-python/osprofiler/Manifest
@@ -1,9 +1,5 @@
 DIST osprofiler-1.11.0.tar.gz 75301 BLAKE2B abad6752d9779c9f0244ef4ef279ac4236ea765ec3903bdeade771c2c41d31eb78cd4596c57120b8558200fb0fdff1b6aa0e00a76eb6d634ccd9552e755e03cd SHA512 41697a9d3bfb81f0c193bd1bd82cb470f1e7e410192e982c076877026457c9b7eb3d17b72c3d02ba4e1bda6ff4a7006798210f37c67d75ff600e41fa047ca59e
-DIST osprofiler-1.2.0.tar.gz 53375 BLAKE2B a48a6a5a5b022e7d7977364f8db8e5bb69be2696d47c9a38b60beb6a4a09d27dc329ba5dd4d4565f1cc4c0f16025a5b827e29914725ac63577df62f54061d541 SHA512 4c7d9ac8ed447e5b6bf8dabd37a144dad21c176e42abd20348a6f3fe2eccc9f05fa88aa04e63ea730bc9acd52c69a2949b39535363ba47e5b6ad96804fb3c0c5
-DIST osprofiler-1.4.0.tar.gz 59906 BLAKE2B 89115f5c76f160a0c0655ef656eeb1ac3c7d18dde965be81b36d750bb48f297804258bcaeb8e02b8185297fa0839ffeb8ec458cd24a3ccccb57a36e452046205 SHA512 541f51b949158d7ce5ff31c8d5632a57ce557469e3277d9aae1c589377388e9f57a7abcd436c4452af544ba3d4dd3332e43b8e3594e7aa13a526f0d24360c176
-DIST osprofiler-1.5.0.tar.gz 72539 BLAKE2B 34cea91e45aa9f45cd4f94155f9ddf332689ebd8d4e589916eb1744cc26527d815680ab33639d0f4f514094900a3bfc57ca58938f0190f7348e4adef1fa964b3 SHA512 a4adaf39e4680d5d7d729b27c578919b335209671f911138e135c7554f0af33dce25e46863e65f98a2022a534e0f93c77acbc3bc69d304a28aa846fb5dbf469c
+DIST osprofiler-1.15.2.tar.gz 80503 BLAKE2B 280f96ece13ba0973692c6ab29b0ee783465b05721eaf2914eb9bd58615c0c7ece91aa3118d03a5fd57296318626d34e9c8b88f80ac6d8b1914b3a9c5d24ad49 SHA512 16deacf3163eb2bbb616ce2e7381feb0174812fff526eb18fd5a9436912b70ff331587bfd4dda1aefdcf75ed7ec21a88e04d8ec9e65771b466fa083a7a33b782
 EBUILD osprofiler-1.11.0.ebuild 925 BLAKE2B b9d5d61fbaab26d9e1d93d272bf88e5ec08c8433a385d206d8c90501d3054d148628490fdeabe582e4c4262bbc985a3d20e42638ab769e1c8e2593e935cc89d6 SHA512 f555fb16240a8ba868bf605adddfeee9d44dab4a4d9e933818d560e8f54a8b1db181234ac3bb374a15f012f7159e0180d7471a94f020d6e1bee4bac85c69618f
-EBUILD osprofiler-1.2.0.ebuild 674 BLAKE2B c4514fd9fb87efbbbb54b7eae022e4498e745f06c5e4fa627d0a03f75d3ed7c468e3bc7f2c0d169a8bc6f59fd4b26009db42df92f68c4cc1df9727fdad37b03b SHA512 0b486513e2d91d276536330da63e14f1baaab1b18568e60c8ad7f568e2489ca005f056b17c469af6dee5abc4ffec5aaa188ee0c334022dd8700d6746997f03dd
-EBUILD osprofiler-1.4.0.ebuild 727 BLAKE2B 47c1b51b9eccf446898a0f0aed9780de8bd7a0b3f75659a753b88927b8032975f69e553977fcb516e959c5c22f7e110cd9697364ba7b8d38176497ad41948dfa SHA512 02c8fa98e5fb03fcb2f001d3c543d982f75421218f46fd24ef915900aa5d6a60272d672140846815862fc078a87136927e1d58a978f2f57186a78ce60662055a
-EBUILD osprofiler-1.5.0.ebuild 925 BLAKE2B b9d5d61fbaab26d9e1d93d272bf88e5ec08c8433a385d206d8c90501d3054d148628490fdeabe582e4c4262bbc985a3d20e42638ab769e1c8e2593e935cc89d6 SHA512 f555fb16240a8ba868bf605adddfeee9d44dab4a4d9e933818d560e8f54a8b1db181234ac3bb374a15f012f7159e0180d7471a94f020d6e1bee4bac85c69618f
+EBUILD osprofiler-1.15.2.ebuild 832 BLAKE2B f23b59fbc39915e2432be9c7ec43dcede37204b2bd6411938b844a3dd59071f24d75ea121d2b27caa69b33d597cacba4d252074fc45d862a433b79c8f0e6f36a SHA512 d461accdc81ab3480ff728ab3f09a3fdd1d3a1013688d4d57c3e33a7dd224ab293f16505cf21211b21ed1f057f6f232bb5ed80196a1323ff078ccdb5c1a62b4e
 MISC metadata.xml 564 BLAKE2B 7af0039638bc73eb560dfaee133f1990851111a2f3ab51e270cc5418bce6c044fa0b15355823fd37b54f73b84d2187096a1e29918b1e0fa073138d901654232c SHA512 2a8070a290ebecb271dec1bb576fd361c937191f69390e1477bac368eb6c9b91ddb3c9eb78af9aa4e4f6e3982a8a83f3ad2c8d5675b1278d6e7191aa3bd36589
diff --git a/dev-python/osprofiler/osprofiler-1.5.0.ebuild b/dev-python/osprofiler/osprofiler-1.15.2.ebuild
index edb368df8464..b671a8e68e34 100644
--- a/dev-python/osprofiler/osprofiler-1.5.0.ebuild
+++ b/dev-python/osprofiler/osprofiler-1.15.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
@@ -20,9 +20,7 @@ DEPEND="
 	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/osprofiler/osprofiler-1.2.0.ebuild b/dev-python/osprofiler/osprofiler-1.2.0.ebuild
deleted file mode 100644
index 9bf3f9601395..000000000000
--- a/dev-python/osprofiler/osprofiler-1.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Profiler Library"
-HOMEPAGE="https://launchpad.net/osprofiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/osprofiler/osprofiler-1.4.0.ebuild b/dev-python/osprofiler/osprofiler-1.4.0.ebuild
deleted file mode 100644
index a4c9141c2754..000000000000
--- a/dev-python/osprofiler/osprofiler-1.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Profiler Library"
-HOMEPAGE="https://launchpad.net/osprofiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/plyr/Manifest b/dev-python/plyr/Manifest
index 04bf484adb8c..d04c96adccef 100644
--- a/dev-python/plyr/Manifest
+++ b/dev-python/plyr/Manifest
@@ -1,3 +1,3 @@
 DIST python-glyr-1.0.6.tar.gz 42952 BLAKE2B fd95ef9fd01788c6f6526eabb77cc2c93bd28324066cfb1a4be70a5990bb1599e57e40d607f926a7216c582389e9763bdc92fbd411cdeef52aa86e1ba6138c83 SHA512 c4b04b1379116048f78c3ce5f9d30c92fd0d7198bfda456891d3012d115b86a5970595d9b4bc1d43028e87c9d467c35a7d02c7f3a9f4670dae8a17c22d1ab58a
 EBUILD plyr-1.0.6.ebuild 1337 BLAKE2B 8287aa016e0f2c13a1a6c73cac9fd9cb311f8836fd88766f9f4c266dba8281587ac6737bcc9686d49ca9c623fb584e298c1774fa1edfedf2d18f3a54a219269e SHA512 83028d3ef8afbef92c0c021b313cd7dd729687ea7a800b4e54c50af6fb1828d0ec66b9afd12939a901ea3251f1eaf10d1e2ad150a1f36d0d0056ebdaf5a9f789
-MISC metadata.xml 552 BLAKE2B 52ae184013b3117f3eae545689e04a59eff9ecd71e0f59f2ae9639443b6525352b0bee4abca9a26d50d058af8380f9803eb5bde633f416d983c09f110be71079 SHA512 a6c73c93a9a1b4056e49d0c5ad7debf79b15845c926d4557be5a43d5900634ef13b90ffdbb71466421a0dd9b4fd15eca11403fbed648b774b17cf649e0b6aa46
+MISC metadata.xml 323 BLAKE2B 6697ca93abe56cb6d2a14920f307f123527cbf570ccae070632877253ffb1dc5dfbfa013f4618b8cc5f22a3c76f5e70654808825ec31d991e704303fa5014f6b SHA512 11f94ab00c03b6a45166db720c0fa897e03fa0f5ecc85a3b824ce51309b672212053b9d7ea703e7f3400501289324b9c4ff6680668c1b6dafe0d009d6265d451
diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
index 3fb68eedfbec..1a1144b87cb3 100644
--- a/dev-python/plyr/metadata.xml
+++ b/dev-python/plyr/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>witold.pilat@gmail.com</email>
-		<name>Witold Piłat</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 		</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">sahib/python-glyr</remote-id>
 	</upstream>
diff --git a/dev-python/py-amqp/Manifest b/dev-python/py-amqp/Manifest
index 11cba3beb2ad..ebac79dec890 100644
--- a/dev-python/py-amqp/Manifest
+++ b/dev-python/py-amqp/Manifest
@@ -1,6 +1,8 @@
 AUX py-amqp-1.3.3-disable_socket_tests.patch 405 BLAKE2B 9d1c75d6499ba8fdd172d022a6f876f5b8eb66de1e0b7c2f685ea6856afd5db316b70e950ee3af1c6fc686b6bbef97dc6f220abddab746adebf6f01f7fff7120 SHA512 7d801f7392edce5bb0f2b04a974f6005b58cd0e288bdf52fd76a7d63de985e7e8a2696972fdbdbf3e39fba339a3213437d490dffb573b5b52f2f67ed6dfb9e32
 DIST amqp-1.4.9.tar.gz 79392 BLAKE2B 03c37db7341705c05d8a1087d8e2911f5d89676b0dd00381677f09d1541b76bf6881688a8897202534e57f7dec0d4341e76138f4eb81b9cef3653f98a7c334b5 SHA512 9c2fecb3c9e1d24333895031a9ae255a858146d498b169a89c3ca8061428c622d85dcee8d2ca45d63a3ecdda34a1efc917aabf42c7c35b579143caf81494a079
 DIST amqp-2.2.1.tar.gz 103599 BLAKE2B 2f0f5573bea19a8dcd609cbadf664ad8835b83f470d0ac24214f3cebcf174e9838fd2f1e4dde029ee9511a1e55ff4b7e2a6368902fdc22035272cc01b8c2f96b SHA512 dcb6297917d4528cfe3ebc446e97be6fed3c100ea77c68923c923cac466fa2d85ed8afaf19582b281ee6e05d699e8ed3fd6cdcbb0cb4de0451becaf16711af29
+DIST amqp-2.2.2.tar.gz 103128 BLAKE2B ee1513e12e1695ce2d16f72fc09dce713a5c9e7e630f8e8d2d39b580b15e254287ff49039db6a43f808f1d2c26239195c003648f360169abfbdcdab9aa700604 SHA512 8ebb8f2b0942e9b88b12cf35b8861da392190dd200d843bf3bba7b98e325afa53f52fe3f8250af1d2c1c14ffe8a071df5494d1eedc1bff974cd62fe88bc3e1e7
 EBUILD py-amqp-1.4.9.ebuild 1619 BLAKE2B 123a7ee8d0d3cb20e765d346d77e95f48aeefd4292da1349db208138891b479f12481ae79998e31ac4653c54025a244691790affd5cb1aa5c37bdfb6d45a8c3c SHA512 65b7b4a67f1122a9052a74f34fa5c5b8fc80feec372bfb906a956923bd9b37c51c49fdf0d964f637dc9b050477ceda6f714b0830732a638bb7285ab4d4d1ab81
 EBUILD py-amqp-2.2.1.ebuild 1188 BLAKE2B 2324b04a09cb652ba006792387784671280f1cf966e03db4d01a35b0ec7b00a1595a2a7823e3db15f5f480ea8a5e9a33f7d28ab1872cc90bc590b3ff0a452702 SHA512 c76b684c232a913452b43e2afa1717ebf16babea4f37270b8a4d83960bfe3ab80e42963208e5ffec76db7741f69c98be81a7d156207559feddd5bb38003f0eba
+EBUILD py-amqp-2.2.2.ebuild 1190 BLAKE2B 2d2ad44853287d084e582bda40db56169175c175a10b97c4b908e1cf06efcaa6bb8d3b2ffec50f8b48f187be55708da0ad9f89efdfb7f6d6145fb24c3f47235a SHA512 fcc9445c37e648b91b894a779964dde1ab9a9a0f3b8b4a1e0887c0da18873b7743a5fb1b24e600032543da7cb80461accc72cefd508cbcc9b02cdd9846722050
 MISC metadata.xml 480 BLAKE2B 43fb5084b74b3c2162cfe63a41aa8e115ca9da87aa9cd32ba135371ed1236a443b96804d5593c69b8e8189affeddafb8bebe7733369548150ce525f4d0f71d84 SHA512 d386da72715c929924505be0c50dbbb0b24fe8087f4b4e47ddf5f6d868dd6c42ac63676364837490eedd7ab32053d360e95cac9416954d9225bd110f3d1df9fd
diff --git a/dev-python/py-amqp/py-amqp-2.2.2.ebuild b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
new file mode 100644
index 000000000000..e2f94d4dc876
--- /dev/null
+++ b/dev-python/py-amqp/py-amqp-2.2.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PN="amqp"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Low-level AMQP client for Python (fork of amqplib)"
+HOMEPAGE="https://github.com/celery/py-amqp https://pypi.python.org/pypi/amqp/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc extras test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/vine-1.1.3[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_celery[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/case-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use extras; then
+		insinto /usr/share/${PF}/extras
+		doins -r extra
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index f59bc5d47c05..1ed423f21188 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,3 +1,5 @@
 DIST pycadf-2.6.0.tar.gz 249411 BLAKE2B 7ddbbcb9355502910ba023589181cbf2d6a104454ca408b604eee031ce79c547213961d10bec4d891e8ddfb00ccacaf1dff1f5bb2646913e9c0bb79abfd4ae72 SHA512 a581b54a8dae088e015d639f14eb46b3c41bdbfdd55b671e79f34b7392af49e3e8dbb2fd85a43e5f8e010cbcdba1d9a330972b5cb6f7f2c5179c00b6f135b4ec
+DIST pycadf-2.7.0.tar.gz 248233 BLAKE2B b2258e0f2027811c35cfcf7063821bd41cc83291d5ace7969fcd48d2e76b4f1a24e8a09b60f996f2edc7e9c37c1578cda40bd2bbd0a1ecbfc889a1d9bbab6ca4 SHA512 093c633c82345154c45c7b8b3dd38ef8101fc6a6aa980a44fc69887409a8facd987a960f403150401a64f2186113bdf5e8c05a3996f3ca4c55f9dc40ab8bfa8d
 EBUILD pycadf-2.6.0.ebuild 1837 BLAKE2B 6bbdb8b2d15aae831a175f78a2b5ed25570b104cc4f7f1602e68a9d507403c591442628e6d7ed9fd4324f1979b508fd9fc8f0c96894592568a343b1fe8a32241 SHA512 011383ccc23ec4009d3317d2139e6fd17ff15517bec8a7ad98312b092c82169fb3e2e5eec15e66c262a78d93f504a77e892f6b3d720a0cdbe8fe2ff02e027de7
+EBUILD pycadf-2.7.0.ebuild 1861 BLAKE2B 2ac5acb06cbd02f45743d77be2599079f00eab3eaf09c9247f9c845cd634c7b356e8a250b7bdcc9752722add7f7e83c8710649126d09ad86631f54d2c4b6c771 SHA512 cb54a1e55fb9b186631dea347f335c8891438a6bdce9ee64ed84ce40425dae40c3052c4f72e092a680d930f6e1ed7ed05c3d5f272efa9e3cda688c82323cca5b
 MISC metadata.xml 555 BLAKE2B 87869fe50262ccda3c9f08312ba7d4017e655da6e4e18e31bf8dd99cfb552ea2a1a13cd71793bc00feb6d6d362c19bbc6fcff9779ffa7334db96833548b567dc SHA512 370b97a8a71e49aa553cd6d56b5060074fbfcf366e84672527e8ce49e086c3393198a6afc7d675ce7db71fb8c2abf7bbd4921140da3180f78eee687a2edadf0d
diff --git a/dev-python/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild
new file mode 100644
index 000000000000..6b43be8f645a
--- /dev/null
+++ b/dev-python/pycadf/pycadf-2.7.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	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 || 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/pygobject/Manifest b/dev-python/pygobject/Manifest
index 43cf5295c301..07d17f167c1f 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.22.0.tar.xz 756820 BLAKE2B 2030b9106c082bbec4418c97945df68e20f4
 DIST pygobject-3.24.1.tar.xz 758648 BLAKE2B 95e3bc6d022b70053549f8a780aa372d8964477e881b825299ca82a7328bbdab58b037a92d36578915ac622b7c223d47cc1c35fccd3ea70d7840841eaec6860d SHA512 f35968ab12b872c85af6b2410cadedcf9fa7e17352a40f3dc557c86203aa1c38753710aab9ce55e986ee2c98b64e14123c65083655445e993d0b53431db6dc93
 EBUILD pygobject-2.28.6-r55.ebuild 3541 BLAKE2B 7d20bfad727c2f1e56b28a2d01ac354c3becd1529019eaaaeccb35083c74b8932ee14f061b249d8c02f601f880a8455c3064cd89e2be137e9eeb0bcd3f2a2799 SHA512 d4c7e7a96b5151472b20bb1663b94383acaa526c5df4d545289ca9fe0cc18889238df8b1aeaddf19a1a46cd046b43c46268a65b0e820dc7ebe403d05d664b64b
 EBUILD pygobject-3.22.0.ebuild 2940 BLAKE2B 3a5281e9483d976dec0854b885695e6b612782a4f0c1766ce416b0d1ea8d0c27b00853e71d9ae87c7c96d4ee82f94e3d9c657932f1f87231b3768f5a1c9e28f9 SHA512 999d60141ed662a29b0a8f28c57b4bf3e2dbb2770cb82d573553ab18cc7e45587989b99d740bcba4908724f9c2095fc8665b3a24c1bc1185a20b334cb431bf48
-EBUILD pygobject-3.24.1.ebuild 3164 BLAKE2B e09c6b4f844f4dc53adadade8fcf60ea18e720c37c8777d87a991304384f2678415b542de77315be0de517a86a088852f7c0621d84187463244dc338f3516beb SHA512 fde0fc51da7b1886c85e76422dc5c4428d24006c983cc58587488e443447e887899a7c5247ed470626e30976443fd91f9e06c57301b0a53be19795972cd54b5c
+EBUILD pygobject-3.24.1.ebuild 3163 BLAKE2B d59c93b6b2d559818b07c5564c2f00b5ea30ed4f7a5ec9014a3da97827d995af08db64f84795ad30a06bafd1eed63804bb1654a5f2d7d27738ef037753f3d4b7 SHA512 6ff9d844d2bc7aaeb120617b7f8d8b76a5036a0335d61bf6bbb4613b9a26703bcb159c957b3e6fdda77a9c311a9a673c08535339c64857a68782de99d2f4354c
 MISC metadata.xml 353 BLAKE2B 20a18942138d7ceab468b01a639f92248bf94f0e6a015a0c6c34872cf60ab56ef91d9b36eebc74b3d3133ecbc6cfbf2aedbc24369165d0fe9a4e832394beb022 SHA512 abcb7bb015ebb246584f60f388837ed0638040f730111831b52716cbc5a9c4ab0c422397702e1d87e56b2947108d5cfa5aeac7489bcd6f89db480c68c572bcdc
diff --git a/dev-python/pygobject/pygobject-3.24.1.ebuild b/dev-python/pygobject/pygobject-3.24.1.ebuild
index 95b3f2c04ce7..38ffb321ce51 100644
--- a/dev-python/pygobject/pygobject-3.24.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.24.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test +threads"
 
 REQUIRED_USE="
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index 3c02501b45e2..c0cbad8a20e9 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -5,5 +5,5 @@ DIST pymongo-3.5.1.tar.gz 1332463 BLAKE2B d581409a4b6cdede3e126e31747d34ed0e2389
 EBUILD pymongo-2.7.2.ebuild 2786 BLAKE2B 279e6c0f5c60d8cece7a7b2b25ccc2b76ba8e9879f40bb5fab95e3044f0344ba780611ea9e9b6ef6e98e80688d23a8614b94d5a87e5d7a06669cbbe94703aa3e SHA512 b15aaf5a063d4525c5c7039fd875336aeb86d9a859ad71de2a95b65c73e572218aac9b1967c0cb6b8e7f6bc6a56f53c12c62abd669a5705b960ba2bec89a3c71
 EBUILD pymongo-2.9.3.ebuild 2982 BLAKE2B fb41373466049625d26913a571366ddc1f8b314360b4fd7d9e1b47032dc84e5b3b617fc94aa584cf673f12fc6fd3881b59502b311db2da9e404c626d806bde51 SHA512 d10266fcc7e39e55f1bfccb913cee46c4ecf71a36669b4716c7d776786b27d6574fb101a027546f5996abb8238f4a2ad98ae7d21fb02d729e77678434ad50457
 EBUILD pymongo-3.4.0.ebuild 2786 BLAKE2B ef2ca220e2884f88b51151028fd4cc0a30a6351d3aa16b2f7b40c027f171c91810d6bd02c08a9a5324e47d4e1ed50a98b377a84de42c5a966e1d70b5e01dfbf0 SHA512 de374b5dcf5e511f45afb4d47ec6953702e0c19fae4636b0760d327ed24e9c03dd02f25af0f6125d666ba8d492875e3ecd98067f4b14a58716e72b4f3bb9f27e
-EBUILD pymongo-3.5.1.ebuild 2788 BLAKE2B 9447e241d0711e62adb8447bc3a2a19efbe303247253c9ee2faca66d556f46af48e0221ab370c39f21bab29f5edc76ef2cfbee07dfdd59278d9465eeac8e2676 SHA512 0fa45a241bcd7662e90df0e77c97adfc7b301e6193f64a33a37eebc723fda8aefe6b484118627ae5b98fbe4fa514a9000ccdf6e04da70c921ed653364da1d4c9
+EBUILD pymongo-3.5.1.ebuild 2795 BLAKE2B d346fca965baddf219080c4101845f900d30314022aaa939fd50421ac6631ac1cf0537c367fa4507cea583b29eeda5945ce47e1478dcd15af1d2c82801d0d73f SHA512 e25d81eac1fffcc9b9bf0df249a37a9bb1851ed78676e7ccd5e6921a916e1f67675c19001769ace50dea6ab10a64f3a3ec92933833a70b935834a073a59f0391
 MISC metadata.xml 890 BLAKE2B 74f3efc00408cdb34ffe6f5c87fbe3639efe3943d62ead2035cab877fd229d6eb9d5a9b8b1086da46df077925fe6c2f75c5d21fd56dd17dd2ffd7b3abb525a00 SHA512 719bb6618d0fce78dba2270ffb288c6962b1f4d48645ca4596c7d4e879dba9de78cd008e0220f31c1f3cc86cb520ccccfacb0aaf03bf56c9198b1fb123c73da1
diff --git a/dev-python/pymongo/pymongo-3.5.1.ebuild b/dev-python/pymongo/pymongo-3.5.1.ebuild
index 01c003201d56..fd2f7a98cfc8 100644
--- a/dev-python/pymongo/pymongo-3.5.1.ebuild
+++ b/dev-python/pymongo/pymongo-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
 IUSE="doc kerberos test"
 
 RDEPEND="
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 5518c7572e73..2fc01742c3f7 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,9 +1,11 @@
 DIST python-keystoneclient-2.3.1.tar.gz 322240 BLAKE2B abf6bff9f318c4497c8241ab45921d8d5373da3753fe1f3313cd0c075c7e9625f27cad6f91b3452713ec286e5697d2a8211aaf276f313470b7476c646a591469 SHA512 555ad57332ea677242057c34313df0d02a16f5738c584db82611db3e3636e792d30b9dc5ea371ba56a4c3b9a158ba879ca38ff5fd40ae842f8be98e52ea856d8
 DIST python-keystoneclient-3.10.0.tar.gz 300635 BLAKE2B 7493e7d193a10f49ad5129b82f6a8402e0a82dbe2ef6f9b82922d41e029286108dd9351d6e17f66f59afafa8dffd1f32abac0d59478d9417ee5ba0bf91899bb7 SHA512 606143ed7e1187098e6e0c4168bc0ee19204e1782b3fd1db4bd2fbca1cea193fd924b01a5fb5bc1de592fa961f737788108ac384899d81f747fed2853f5f18bb
 DIST python-keystoneclient-3.13.0.tar.gz 303828 BLAKE2B eb6167c171d043fad4af61b3167d5f7069300c2a7b056ec5b2e78a31f9a9d11e225a0df3be6bbdbd37cee024b7c675aa3699bc81b0509b3296a9ebddba063268 SHA512 0b4b9297c1661d8ed84c6019ccf93eab495c4ac5d098af456deb244c6db7bd1d40e874ef65c170c6fa9ff4814ac1e714baa9fda0f40dbd4e043ffdbcc9310718
+DIST python-keystoneclient-3.15.0.tar.gz 306850 BLAKE2B 5101f0854d3c9cc2ac2165e66df4fe28f9da64d6a96de2e4c1eb9bac26228d7a987f8149fc32a99a3015f43982f0d664555bc1361ca22c86ab68c2d36776605f SHA512 f02d6efe1563a92c5ae1a374568a7b47e281f3df026168eb8cc8e0b31e5029af6534341738b07423713705df845c63708a8f0f845e9a929c107a3f13dd5f9578
 DIST python-keystoneclient-3.5.1.tar.gz 300839 BLAKE2B 7ec1f354b016c79abdc54de531e9cf3cb7a63d8adc9d96a92940ad135cdb233622e8aa338e3f27223175ec9fe35a69b1ab7718c636acba5cde514b5a3f0f1895 SHA512 b9328de923b5a579d093b02c05edb1d01cb6d319414f515016528e1e05db11eb8844d836a85d67ce7c3e802ac1ba60f807ded3dad7a0e98479f82b7076c9e589
 EBUILD python-keystoneclient-2.3.1.ebuild 1840 BLAKE2B 85b84aa1312481290cb3eeccb5e649530ad46c52ebda91ce9ae7af15d032bd886c0bb761e4f292065194a1321832ead750ba6fec6b1afa101bc9393fe2bfa4c6 SHA512 12b9f16ddd0e0ea590431e717a94b99edf7dbcf7cf1bb50225360f876bf6aafc0b064a31580289d3a2aa1f2e5396d2cb4c07a3c0587e5dfff888018700f49de4
 EBUILD python-keystoneclient-3.10.0.ebuild 1289 BLAKE2B af2a9ce96b2e6e7d1c5b8c13f81b6a8856764f0dd0de6cc1888c27e082fc26f5fbd2c582efb8e25de82398bf70891133f56dfb2ebbc44ade698247398487a14f SHA512 2d686e5839d57eb5a0a871ec309cf1f15aeafd01cd5d731337f44d1e46020dc79ec5b0e324b2c0dead8f919106312e25f77741ba60c67457cbd48b7389647de0
 EBUILD python-keystoneclient-3.13.0.ebuild 1421 BLAKE2B 1a765586638fa85c65fd6a978152faacc04d7487d0469f98222ab49ed1fbd2ff634f50af3da175ca3d7e438a7dead571ffb8e9575d8b132caaf5920090cd7947 SHA512 0bab532fd59cf853fea2cd109bb0bd79d13102d287a8e3162d840371a4bac7fe0d9213c272989a67570d220a23bf4e30352d3144d6037c5255fa8488a9c28fe6
+EBUILD python-keystoneclient-3.15.0.ebuild 1227 BLAKE2B 864a315f71a6d3e78f16b394c5933baf64706c40f368a1ef7b87b15b6896b9950548ec7e1dfc48944c7f6258398a32c4deec200c06e4b8dce2088d040eac04f8 SHA512 2171d192ab6a66b3b8aeaf2ff4292277bba5ff7f03e9f8ef17c365496de631a6c4070e4f187c89f7f3c47ef574b3abbd6173e07d871bf3d3f71bc0abbc02a1b2
 EBUILD python-keystoneclient-3.5.1.ebuild 1539 BLAKE2B afe70703f7971158510f6605948ba9b78f632e2acbacf7bbd32be41fdb8322b3e68d812682e67f3c3c25b90c0ba9253355a8a6f06ee10e0cc154dbfc5699e5d8 SHA512 9f5ba985987ed6e23f13a2f4a78fb0cab20033910d4b54192715c57511bccd32a81fd355ef2950ef1acb52ce97b47bc729ce7e9a7dfa64252be2500f6854a8cb
 MISC metadata.xml 557 BLAKE2B 83a915231d68ba03af636bfafe7a052f567bacf3d746e37093855c78ee1a2bcb11e919924f9aa4a721df0da9b22463ba732de9f9f105cc1ced03bc19ea1fe980 SHA512 5ec4344a761069fd31f8d86351548d0316c421e9a6795b604ece495883587cd8f579f535076cf43eba2114a4cf62eba77a6f96f49bca3a51acbcee6e3d24a718
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
new file mode 100644
index 000000000000..39fb0010e1d6
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-3.15.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+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=""
+RESTRICT="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+#PATCHES=(
+#)
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index c4f8ce452b9a..67071e14e424 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,7 @@
 DIST reno-2.2.1.tar.gz 56013 BLAKE2B db1966cf542e74e6842be64ee6a1a13cefcedab261bab951c9e39082ab0c0bf278e0b88bf3e876250f141c627a3625fb8038d190a6d58ee8d87054a86da38172 SHA512 278a7a43168f9467342f25c3eb8692e119cac285940b5d3f5a13f8f45acaffde962d2eeac720f2e5d824d085446fe5d660ef7082f95dd3c0360d594de5a65fb1
 DIST reno-2.5.0.tar.gz 62819 BLAKE2B 1446d1289749df74d09c123af69dc6cacedb539b8387c73a1b0f0425651679e1332427afc482ba352e5176a76fcd6bfb65b31f731e0cfb2d137e23b739110b56 SHA512 ee7c44235dd1c3c253b426abbafd490658d642d56ebac5688dd1e3fca45451f26855f421b252c64f9e143bd67c8b08a9e4c6b79edc9c7341b26150a576458570
+DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
 EBUILD reno-2.2.1.ebuild 749 BLAKE2B 1005de7b1e8ee9688722577dbfc0931950861aba0c32cd7f4e56173b1fc595708da272018cab6a2962378fbc3cfbfd840d6dd54aabac5a3301e62779729b14ea SHA512 ab28318780ee62037b394c1e979a63c1fd54d1c14e071bd300ffa8156903c381c73ac6fe3edb7d734060257771dae8b3f9b29fba8d8ea4f79ed1e7cdec086761
 EBUILD reno-2.5.0.ebuild 707 BLAKE2B f3d67f73b0bc43d074e11c2fe69ee391335dda0a347578a805395cfdea5fb57da9c8e5badd8b7c31e8926f4188e74640f34fc9dff84c7078dfea79fd4527b869 SHA512 0fa946149cce8b25a45770d18cc4950a3746403bd517cc5d487a80a73a14e4cf2f163bb23895c2527f7d697c01b2e9bfb32c33917f70f0410704e28462250d78
+EBUILD reno-2.7.0.ebuild 710 BLAKE2B e5b7a5769812175493c07cab1ad0efeab9e85572c51cafe3abaf746695e7a06e9b1e95210a1c33168d76a5ca6bc42c670e5fdf09f35931e2daf2216f7c3916c1 SHA512 fd9fc7a5141037325a4cfb01e4c348f0fc2acb29e67410822cc566466a1d2953a1208aa4bd41a39f706aeab2be5c60588ec62c1cd8e3b4c428b7a29f4e897d94
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.7.0.ebuild b/dev-python/reno/reno-2.7.0.ebuild
new file mode 100644
index 000000000000..3eb182c0edb0
--- /dev/null
+++ b/dev-python/reno/reno-2.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.python.org/pypi/reno"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 0fdf4157f26a..4ab2bf3eccc6 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,5 @@
 DIST requestsexceptions-1.1.3.tar.gz 6606 BLAKE2B 7dbbdc095ba1ec20b41a3c7a0dcef5f10fbcd8d9f6bfc9082bde09a23a9d75f1be96f79b74551691d038b758a7d7bd1568842be9fd139a4c4d3279e63376db9d SHA512 33a848b04db500b3481b7df2553e244e1967e5124de1606f73fb38f0b2681253ca2bd921386ce50f1144a8dc8d6f8e07be058a3d9f13c7831f77cade0a42fd38
+DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
 EBUILD requestsexceptions-1.1.3.ebuild 571 BLAKE2B d510b5432921c280df576dab2938c677e4e8a2cab2761ec500bd8711eb1e208cd4c6d5078e20a9dd64ca365f6c068555298dbac2f2513aa107e5e6852c8643b0 SHA512 c64495bf3a1f3f344b5d436e18b65449177db3ed08f417ac5328e4018c7b57474d981783e0ce53c509999cb98b4e0cef3607ee94f46b1aeed7f70308e2e1d164
+EBUILD requestsexceptions-1.4.0.ebuild 573 BLAKE2B ffd63370382875a70571e7d3ccb0f534ffb761d3091d83d9ffa068f82913847c3b08e8bb2cbb9c5eb2f87a207afa366fe12c9f3305827d2b70d593253849e7a4 SHA512 cc4b936f9573a2c3a040642e11bf7e7d4b79c70e2e16d4704deb3f18f1380bbbcbfea7a542232df54ec3cf01f9b3e33e84afae1e1c937358fd356db3b7501735
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
new file mode 100644
index 000000000000..8161b92f7bcb
--- /dev/null
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Finds the correct path to exceptions in the requests library."
+HOMEPAGE="https://github.com/openstack-infra/requestsexceptions"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="${CDEPEND}"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index c338023d239d..9268fa7252f2 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -4,9 +4,11 @@ DIST Sphinx-1.2.3.tar.gz 3200548 BLAKE2B 42033c59e6e38247af12c78cb4f69c73b1dfa88
 DIST Sphinx-1.3.1.tar.gz 3469782 BLAKE2B ae2fa602a7873e6ef735decc2dcdd5a2632b848bb8394ee80b4215e21bfe625645fbf905a6661c333ad062e17f15b6f2c39027b44ad827f66c6467a78e8c4490 SHA512 8b92b69c4ced242c5e608ea03a7a061b0d2908f34f3150048ff4ce08b5d56be4a642a6aec13fa249ff8208fa8dd2d38d8a10d37ebbcc68385ee51f527ede0b94
 DIST Sphinx-1.3.5.tar.gz 3679978 BLAKE2B 2a88859bfd4a3de75a7b56fce65086e1239c3c58730280df078b3f76d368028a124aa6d4ca65c40773efa4c1a83dd047ea0d647582057c63bf82dadb5f2549e9 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc
 DIST Sphinx-1.6.3.tar.gz 4674251 BLAKE2B ba13de3d72fbc5cbc3632a1062001ed287798efe5f04064d241b645d6e4c52c9d9c115aaae4ae7b94213bbddf595a93480788d66b3a54eac3c9fb415d007d4ca SHA512 d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae
+DIST Sphinx-1.6.5.tar.gz 4680974 BLAKE2B 97b0cff21985de071d29651824f2954ca4d12c5095fb8049597235c8071bccb00344e89fc4a90ca010fe79a76faf0e5ae2b09ed698f1c5bcfd8f06de64169107 SHA512 c6ba7ba639f9814867d9abaaac48d58daa9d0ea9ceae4495bdbd311856833314eade2d9df7213c0357d5eea53d525c5a1235bc977a07cc7ef82e1ff0ecb51f3d
 EBUILD sphinx-1.2.2-r1.ebuild 3048 BLAKE2B c99dbf2cecddf74cba0f091250d2bc0a517168225a2d1df9213475fdc9996286c03f4abcc668d51ee885b571b9baf830f9f76ab29816a357464fe12132f555de SHA512 ae2a68a69515191020e983ce10ce740d09d472e5bf665be6bff02c9ff959d7a9fe09a346b3b51afb3b360995d24eaa277f233e336d4e15aaf0bcd764bef1050d
 EBUILD sphinx-1.2.3-r1.ebuild 3110 BLAKE2B 29121955619c85d730603480ad19f92e5f17bcf76ff5830840f58136b4ca804e848a3266fc566799752bd09a3f25b096c88a243389ced75accb0ef4a3e92f258 SHA512 98a43b62068f49cdb1f8bc998836c2b65bc83a92ea0833a7971711ca4d5fef557d93d4e1d1d9b58757ca3567e2a65fbd35fe5a4409f3d5ec0d464ff0c106cf0a
 EBUILD sphinx-1.3.1-r2.ebuild 3466 BLAKE2B 760757384a5eaa95142b7013a5badffe9c7f729b49e0f2eefa1bf39c069bb8dd83ba9c96e7ade1c72991683d771bb068af46140c0c5135dfdbf6d41fad5ed403 SHA512 0705fa10d01ec6a215e25416d65c96e407f7230c33c1e2f81ab87f55f0a162bd6c3ceb6ad5bba343eaa3cf407f97d1b570b2f7dadcec0bce2f1870f03a739eb0
 EBUILD sphinx-1.3.5-r1.ebuild 3580 BLAKE2B ce19b68c70a1a739e31c3e9dda9afe612df66a8f98f77d8bbdc22a8682cf1c1bdc2374a0a42f6bb06fba437b9f4e9f75f5f15350c34df2ab3fd49f0f322b9288 SHA512 5d7a9b3e083b0f28e4774c5a51895cace0287cc581984ce5b8d4403670663b6bb79cffe1c0d516dcbf57fee8752e3723b1e18c80e5a495a7add224c2835957e9
 EBUILD sphinx-1.6.3-r3.ebuild 3422 BLAKE2B 8aca39ff63500a156c87677f94a205fcce22eb6e42a1a75db9cd994ec150165b34e40c85ec7eceec395916a7dffb932ac57833a4e4f196b6ddef35b48b6602ca SHA512 bfa29c4f9b17c4b2f18ad9c85d40d3f19dbdb974c5d056347ab992d476e16b9f685c9efe4060f2ff5d8547bc71a8321904984b9438c4b5250c76a98591c01343
+EBUILD sphinx-1.6.5.ebuild 3432 BLAKE2B da1662cfd6d3072378e9eece75c35a30cc81d4fcd45fca661802c21986734abf8e61b9870b9f57eb451a80a50f1abf1893ff86834eca9f98e060b003f26a8c34 SHA512 8d31055c016880e2cefec8be7bb19f77b6c9f8aa1dfcba20aa7354188191497e02e3829e54c49127c8c81e63b3791e69c67d2a97852c37c1cef3845e54b14a8e
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5.ebuild
new file mode 100644
index 000000000000..782af85c275e
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://www.sphinx-doc.org/"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
+	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}
diff --git a/dev-python/sphinxcontrib-asyncio/Manifest b/dev-python/sphinxcontrib-asyncio/Manifest
index a54b073ae480..de75236fddc1 100644
--- a/dev-python/sphinxcontrib-asyncio/Manifest
+++ b/dev-python/sphinxcontrib-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-asyncio-0.2.0.tar.gz 10689 BLAKE2B 9e03989a1ed22d7d467bdb7626e2e908407a0de15a943a432ff9707340f0cefe7caf1684380c25764637798b585b32287c4bcfc0f2014a78b7019547405e7ded SHA512 2ca25717c03385ae9bf879b8efeab8d508292d07f96d941032720d755d3db2e7bbc3c9a33c6103af9d83849ed8878bea1048d349bd0873288ee2addfee9756b7
-EBUILD sphinxcontrib-asyncio-0.2.0-r1.ebuild 1050 BLAKE2B 24f667c0a5b95384d7e97f5c8168f1a3600e6c910acc53f249ab9856337cc93f1fde0448a2f7d0177889ff4db0ae45263f2ff0baf7c4ecf86df24a8084df40ae SHA512 c9545013ef9c8060ca3607659d5f5231009e746ef05d42093e6688813442ea17e0992820f62134de2518ea2e80987241bc1eb87b24afc653e3c2e3d0acfa5119
+EBUILD sphinxcontrib-asyncio-0.2.0-r2.ebuild 1010 BLAKE2B d2a0731729f305c6b8962531fa197266cd5579f54ffd606eb7ec0b6be49b9a2b1663f837d18468097f475a64b3d0ae60d39defafdcd718f8bc5f6cd0b095806e SHA512 cc67f66d60e132b77a70cd016cf685aa09d56d0a9aece980f5095c4e3e2e90300070b68f9733b53a728a79715eb344b05b63eac8d18e8af1311c26bfddc363e9
 MISC metadata.xml 479 BLAKE2B 71c78e4a7069091b9e6030f37e85bacb777bd9c23e560c4b76adb48ebf4cf0e1097ffc96fabe01c61dd82e9a19558076e8758717833dfea63c050a756ba81a5c SHA512 ea288acf888e29a1213e200599e7cc9528c99899edb613b6b77c80aa761cd0b0630837a9c1529fa8ca5e36935f263c8a37978b3afc0ea32cd8b5e3c1671dfaf5
diff --git a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
index fe969fc8bbac..ef4858611d7d 100644
--- a/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r1.ebuild
+++ b/dev-python/sphinxcontrib-asyncio/sphinxcontrib-asyncio-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,14 +26,14 @@ python_compile_all() {
 	use doc && emake -C docs html
 }
 
+python_install() {
+	rm "${BUILD_DIR}"/lib/sphinxcontrib/__init__.py || die
+	distutils-r1_python_install --skip-build
+}
+
 python_install_all() {
 	use doc && local HTML_DOCS=( docs/_build/html/. )
 	distutils-r1_python_install_all
 	# clean up pth files bug #623852
 	find "${ED}" -name '*.pth' -delete || die
-	# collision bug #625872
-	_namespace_cleanup() {
-		rm "${D%/}"$(python_get_sitedir)/sphinxcontrib/__init__.py || die
-	}
-	python_foreach_impl _namespace_cleanup
 }
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 9152edcb6ed2..1280e3109698 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,10 +5,12 @@ DIST SQLAlchemy-1.0.17.tar.gz 4787165 BLAKE2B b00ead35149cfd7eab3476e29aa2b2b79e
 DIST SQLAlchemy-1.0.19.tar.gz 4788659 BLAKE2B 813bc2148fd080762ea7748d9878500afac4148dc186a34172321fd97333eb6c8632ae3b05b2e8b187a3660ae34a426062ade56297b693d367eeea2c3966b249 SHA512 57d51fecb40e349b05da027bf39375a81c1d98e6d47f4dd076b9c7e2e3c8b6bdf8317e7b3e88c015cbd0d7858324ba0499a21a8ac39568c9ec95326e02af97bb
 DIST SQLAlchemy-1.1.12.tar.gz 5178158 BLAKE2B 92455943f3e5ce8c87fc9dd21da7c5ea54a9292fe2a3a319a8a9c8d54cd103193935d567326b8632d2fcd94664ef91cd1a3d621008bec684ba35ff73691ff01e SHA512 f9d14b3d4eab049e9d7377008cf11678c1413e204baad898093282d1812d242a544bbb6606b4e9a83b37d5c17bcec3c115ffe402dda8b6a84d0d5186415645e3
 DIST SQLAlchemy-1.2.0.tar.gz 5451303 BLAKE2B 273edad173583d47d6ebdb4d3efddddb6e8e6c1e333667d71a1befb0aabc7ff8231f926c18d5463e1d4b815d2b2f39b7c9bca03ab3bf0f91f039b7ea55071e28 SHA512 0d9e57147b022955ad20da5b280e8734ba4be9585301b6e8fb9b96797d87d8707f95cb58afbaf310ec8033defffc4d794bec1d5089ca016b8dd9497e292881e3
+DIST SQLAlchemy-1.2.2.tar.gz 5460157 BLAKE2B 60c5066a2993d9878f5d3abec1a6a9a4d0a3dc5878df71baee895e5278b95696b775e16000da0ba4c2c358b0a90e70faff0b5733a4f00255b0ec0d605cdd07c6 SHA512 060ce803b8b621d51aa69100c598c424c36f051bdce1e2df3f4d837815f91cb55c4e089db5375b01832ec28bf42332311009c51c1b5e7aae92aea001ee880db5
 EBUILD sqlalchemy-0.7.10.ebuild 1583 BLAKE2B 44736d61974494649a33d3d764dfc5a4ed21a7b10292debc0f791f8f57cc3049e3c6bd51e783a487c350a328556b511ee08b7db22868383e15e7dfcb9685461a SHA512 a080a72f9596945ec353b10ceda491cf35de92ddb1068ae0949a247547c0d864fe08774887b665f91a02f4536fc4a250d8ae01891e7ebe957c946d08a9584cff
 EBUILD sqlalchemy-0.9.8.ebuild 2459 BLAKE2B 05d43f366785259ae6cb3c95a452ebfb009e217622c78054d2f4edc1654fd8a31fd8ba9bae51edc86e791040e878c8f13e91080a55bae55c497c209bae07de18 SHA512 319800805e7b97f12e9da7ceadb5e8a39f413184890431e79fceade338a19cc34a0e78b9df12623f12eb736c3c97031ec065f90bcb62e9acad233a30377f6ab4
 EBUILD sqlalchemy-1.0.17.ebuild 2139 BLAKE2B 6414661b9d6fc86d9efbbf8708c6fee34a17dc73ad254ba4ddd5e29705030da10b4c5100f986659b229e367bc79b2561fb1aadaba858d8636966f786bf120273 SHA512 dda12647bc92fb67a6416d6506708b4918cd300de177a0c073a38ed2fde3fdf5e79c2a1d773a5f2819de17a6eb3d7f07c1e84c556b4a145c5251996a896e754e
 EBUILD sqlalchemy-1.0.19.ebuild 2141 BLAKE2B d741d95f4cbe6c9f0f1f9db89400618db154d63a6e0306d9394eeb35add72314943ee791b1a059d670eb63234f8ed8e329e3dfaead173e65a6a7e2f1ef1bf8c1 SHA512 b0898a2d08a532bbcad7cabe097f0b6ba020e4513ceb0a4513614c5eb73f46e135554946f5a8394d8b89f2b81ec83f9ef22d1171d25782c923592c7f36c1545f
 EBUILD sqlalchemy-1.1.12.ebuild 2132 BLAKE2B ae129735af5e63d77c9f1f5651588893aeb6e36293b411e718f0a5f90c8a3252d1f0ab64fdb6470e652f00c98a73871d8cbf13a1d13bf184965d76327c3b70d7 SHA512 9a8322c01756d6c3f567364c1f17f80de03e4e9cc21ce2169ae6e2ec212957a07efe1e3c9794344a8a348fb7ca88d6795724c9842e56952ed6a6197fd1f66f68
 EBUILD sqlalchemy-1.2.0.ebuild 2158 BLAKE2B 1a243d220617b48749029673f95cfcc7580df1e9933dfa6a7e619d4606e66713123ed182d2823dcca73abafc85474d5b9e456e8f71ffffe9042c455f5c5d2b10 SHA512 b10f9d3bade8f408fabbd1173343162394762af7341fbf4f28682a4e051bd504159fe880a7538a1b68c1bccac563cdf17b78d307f5a579a4f91c873d02f3a2ce
+EBUILD sqlalchemy-1.2.2.ebuild 2158 BLAKE2B 00bc0b499ee1af04da426f4d2d708d29791b120039f1122c9ca0c45d4bc2e5fa9e1356d02a9ae14dc339de6ca7fa839fd2439baad090a9849606ab23283fee17 SHA512 254e8c8e5a235cfb5df1cc620c187c2826c33781b181f5f7912b597f4be3d2a7f9c859a94fec0b400a045953594bd60dd1b10bf957e9a76f8e12c8b0944f80eb
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
new file mode 100644
index 000000000000..3c3f17ea7ae4
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.2.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 eutils flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ https://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc examples +sqlite test"
+
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null || die
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test || die
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test --verbose test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysql-python dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
new file mode 100644
index 000000000000..47487ad5bb7d
--- /dev/null
+++ b/dev-python/stestr/Manifest
@@ -0,0 +1,3 @@
+DIST stestr-1.1.0.tar.gz 95353 BLAKE2B 70435cec22d56f38fb9d87484b261fd73d79f8ea719ffd67861e2504580d6e2932b762839e44dc4c9e348e448693a80e8173850d800374643bbce15374137c37 SHA512 7490f0982c77190adf97daae965a957fc40d0e418a64fc38ccb50817a7266b06224e61f17ae9c84edfe200417eaab726cf834646bfa2efbac67ea029dea54df1
+EBUILD stestr-1.1.0.ebuild 835 BLAKE2B 15d74fd4adf26c344bc309b9be0ccf3bec760a83886e9195dbde5b769d901431e24d7fcc3371d7756fc423904c377684a4fc717f65574231e40f3cc46b38fbcb SHA512 e204b2e1dc4747c48e2b41a01734411372eacb1dfff3d98c6a8eb04691a3848bcadb6ba7b252f64d8e55af62073bacf591693e625ff5fb88b82dae561f9b8338
+MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/metadata.xml b/dev-python/stestr/metadata.xml
new file mode 100644
index 000000000000..9eb8d3adbf9f
--- /dev/null
+++ b/dev-python/stestr/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+		stestr is a fork of testrepository that concentrates on being a dedicated test runner for python projects
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">stestr</remote-id>
+		<remote-id type="github">mtreinish/stestr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/stestr/stestr-1.1.0.ebuild b/dev-python/stestr/stestr-1.1.0.ebuild
new file mode 100644
index 000000000000..6199497da749
--- /dev/null
+++ b/dev-python/stestr/stestr-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="A parallel Python test runner built around subunit"
+HOMEPAGE="https://github.com/mtreinish/stestr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/subunit-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index d1ad6da97d8e..1a736224ebcd 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,3 +1,5 @@
 DIST stevedore-1.25.1.tar.gz 509014 BLAKE2B 22580ac0e5af56eadd81e7521888e3b2458a1c03a3bdac69df1f2eeef20248f1ddc1748447e3e961b61cbe62ebc939e36c04ff011b7845b3278e18a5fdc9e14e SHA512 f3d2a7360e783c800c3c2488f6adf6f9f76e34e4a4e6f3fc53d2f1114b889c443c13fdf217ddce65a41922dda2c782f19b2077847807c70e732a522fd2166ff0
+DIST stevedore-1.28.0.tar.gz 504872 BLAKE2B 6a9ba88ab950f17898d2dd76d75cd7bc7031cbcf441523863520e15916bc5c255fe6a62444f46b6d9967ec1f5f716420b36cb114995907ec8e2c39110ae7918a SHA512 e148560e255a362a51ce91e8bc2380828ba9a41e1988138bcff2d5b270097cadffdee30f3c98e123d8ced9f6f0ff350b52e793fd400ce6b45095860788bd6b86
 EBUILD stevedore-1.25.1.ebuild 1639 BLAKE2B 2f6c27753ce64eca38fbf2366221083cc5ba769e6710c4c5eecb26857840a7f053755dcd71a0171189e0e290da03609d7357cade71faff7e0a41b43c742d5805 SHA512 b59f45b9ee53a0b7c994af7b3f2bce12f1cab17a66b4570b77ecfbb702bdb1b722fa7d3c034f9bd1c716c7ff94fe4ccdc22510d9d989910c21ad9daf4318e610
+EBUILD stevedore-1.28.0.ebuild 1642 BLAKE2B 27ba8720ddbbb041d12eea354feeeb175d8b8677c9d3035c3910184e925a9bf0bcf383c9917f6c7d83a2008544904865d93b80df8e59ef98a7a6279b37ba5ea0 SHA512 bb71cbdada1584ae2f1143bc66bd94b2248be50205d3456383ea4d743e077e405e9cda6e457040a589b2b5cb38ba6fb54f19772a5718fe11bd939f3fd19205f0
 MISC metadata.xml 496 BLAKE2B 4de4391203bfd30055b9b6399abeb5b53c2a363779c895d4e0efb1de2d929510a0d7e02541290000a63526d44d32d50ea7c41728a4ec1e5d6ab41a7ab57414b4 SHA512 569ee9efc45e2445b71ffe7201ea92a7bdae048de528664d2a908b94c3fb23f6632e2457623c5b0d961dcf7aac2d96c6385d225628a3c5234363159f56961f00
diff --git a/dev-python/stevedore/stevedore-1.28.0.ebuild b/dev-python/stevedore/stevedore-1.28.0.ebuild
new file mode 100644
index 000000000000..60311256947d
--- /dev/null
+++ b/dev-python/stevedore/stevedore-1.28.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage dynamic plugins for Python applications"
+HOMEPAGE="https://github.com/openstack/stevedore https://pypi.python.org/pypi/stevedore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/pillow-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# Delete spurious data in requirements.txt
+	sed -e '/^pbr/d' -i requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_sphinx
+}
+
+python_test() {
+	nosetests --verbosity=3 stevedore || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index be85a86552ab..d6407a37f608 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,5 +1,7 @@
 DIST terminado-0.5.tar.gz 10491 BLAKE2B 8beb4784c13ceeea47966efbf56e62b259adac533d2ff72f287984aa100837d8123be3109761c9c282fc081e26d0d26224a8d1bab6263d3abed00839cc576c9b SHA512 8c53e2c8fa837c171a8790744770f41d4fc8fe15fe8abd28af17317950c615e4c75c22ab896fd98984fd9c2bbbc7798e5ffe319827d84eb77889bca63660e421
 DIST terminado-0.6.tar.gz 10334 BLAKE2B 02ae2135da982cfe12ea0b3219a67a6b327bd3f4f45539f79629cb33ec0882586094b7084e4ca64567f55fbe6f0194a10934c558fd836f825ef81319920caf5f SHA512 9b9521917d4000aa45e61a1b88705e715f11686890671607cca81d4518f1e17feefdc2ad3de64dd0e053a6849956efbbd838c7b98d570dcc98a936c0a4cfce9c
-EBUILD terminado-0.5.ebuild 698 BLAKE2B 4840722347e6dfb299e2315b51e3bee442742f030a51a33e5c03200cc4975a68496fd671d2b73a453f41121b4e6ea2f3176cd82aa05f81ef8780deb714f4ef26 SHA512 13507b2d30a95c93c9ff41d27e8b33b5da1759f29516ff09b97dbc034e5fccc6c731de4b512aa7e00e1bd2f034af72a1851c446124023798d4e49e1d06b51ac3
-EBUILD terminado-0.6.ebuild 714 BLAKE2B 7bc12d5a4c72164bb24b93e37b4a71f654593996d1a1d511c797d4a07ac2d71a0af45d6b9f837c50b0c90a37f2b0b0d8cc39979cc7f56cbf306e46f65f0708af SHA512 0f6be413aeb68c5b9faa8cb1a2aaccbfaf52c17e6c62b5952b14ca6bbee43d9d134c03113429dc64c8489e57e90e180b334283a7ec302d6f44d40d25bd46ac78
-MISC metadata.xml 383 BLAKE2B c66a5b924a3d9fc6a74561e70b3aeadc60526a435e479675c797ee386a74c4b7ed1c57d95a009bb767ddc37f7beb86c774d24c4ad15dc1cabcc8c68f4772daba SHA512 928437f5650b4970891cf3391ca12a69059e588e334031b0985e6453cc529c709878cf2a326e3cb90e27bd717f1c7c79c1b45d2f644ceb2ecaa3dcc77327d381
+DIST terminado-0.8.1.tar.gz 21134 BLAKE2B 504fd13ab5efde77b38fbd79e4bbe4b08fb9bc1cf0f4aa8ca6cd90b4dbd20083088d6cc287f78ca159bf5f72a371c146dc0c648e310a0c892f283f2d9fd23199 SHA512 5cf5259954339d567c41b8ef3b4d77de4f69fe41fd371e63775c9d8d5870ee801795462654f16978f4c86e381fcd26437e307458db9ee4e575d31d5377f2a749
+EBUILD terminado-0.5.ebuild 696 BLAKE2B 6785ef31c6621f3f248a17b37c5093c6d4b40e9f41a8bb99a346f88ad0719066e040b27ab26e17e324349f5a706007853de73e7d82bd4397013a9686af3dc462 SHA512 2b4e08b77e04ce01a60d0e834167588bf19209a5995bd3ed9e9ffc2d43038777c7d051e64dae369479012c7887993637c03d414d51742e68dad3bf44c3eabc81
+EBUILD terminado-0.6.ebuild 712 BLAKE2B 7846ea4e1ac52bee4aaf8b669959d1a55ae6727206f716f9d18fc9513bb15ce1b8dfd68bb71884ac270f5710d7147bf64982f750c1580956a254aeded1539351 SHA512 7324ea5c81339a21f4146db12b556f3ba69cd632619d01209df97e915ba3b5414ded5efbac3525b8fa3cd2fccf17ef80c95f5078cb4f930be3a36e60c460cbfd
+EBUILD terminado-0.8.1.ebuild 701 BLAKE2B 7ba3a7abe97535230f3aefbc9df5eaac503b4efadab7c795106a8f1452d08709118ca9b5e1d14ccf75b45f4ceeca74e0d5bb63905b17db7f9837291336716b5b SHA512 d6181f827be9c98ec6b902ad43e9da06254017e5935a7d81c0fbbab852d052599e3a112330b7ba27b86ee0e2557a2ef63d05eb38ccfb533975648067fe399e1b
+MISC metadata.xml 381 BLAKE2B 4daeebe708d2d0a70a215899420ee4e218258279629c0a5d2f11cd00c961900e7fc81706eb443899c4e9f6d25aa204b24718c09f5c0929f5dbb2273c04bc3f99 SHA512 22d6d48e2bed0de91f468bed90ad2f41c164f84cd89eb99e87cb1b0f528a0c79f632cdd4dc5cad919de9fbc166edf539fbeddad06ab9a864b8a46efc023b5fae
diff --git a/dev-python/terminado/metadata.xml b/dev-python/terminado/metadata.xml
index 9daf5d8f4ffd..4744584f2da2 100644
--- a/dev-python/terminado/metadata.xml
+++ b/dev-python/terminado/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">terminado</remote-id>
-    <remote-id type="github">takluyver/terminado</remote-id>
+    <remote-id type="github">jupyter/terminado</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/terminado/terminado-0.5.ebuild b/dev-python/terminado/terminado-0.5.ebuild
index 8f8f52e93db8..2be6a8d64833 100644
--- a/dev-python/terminado/terminado-0.5.ebuild
+++ b/dev-python/terminado/terminado-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/takluyver/terminado"
+HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/jupyter/terminado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/terminado/terminado-0.6.ebuild b/dev-python/terminado/terminado-0.6.ebuild
index cd3c4c796d6d..c92961f85e53 100644
--- a/dev-python/terminado/terminado-0.6.ebuild
+++ b/dev-python/terminado/terminado-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Terminals served to term.js using Tornado websockets"
-HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/takluyver/terminado"
+HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/jupyter/terminado"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
diff --git a/dev-python/terminado/terminado-0.8.1.ebuild b/dev-python/terminado/terminado-0.8.1.ebuild
new file mode 100644
index 000000000000..4ee0e36a539d
--- /dev/null
+++ b/dev-python/terminado/terminado-0.8.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.python.org/pypi/terminado https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	>=www-servers/tornado-0.4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die
+}
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 2e289bd27020..7a1c7bc98077 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,5 +1,7 @@
 DIST testresources-0.2.7.tar.gz 32050 BLAKE2B 9ff16d2e33d7b528598d2f5b903e57625018ecbfd9484dab0d8a7d922429cc8d35dada91d84c897c426e06e01b7bd0befe23814996f4aa7b0651148edaa6f246 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7
 DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664db7569d3459548d4a9042ab8dffd0d715c16616ffe08ec86ad4a0b4940e0c09b83b57f7bea86b35b6f728e55384fe3 SHA512 7c9f9cbcc62066ab4a75d68780d88925484eeee23e2e0ef0395b63ec2a92968a6969d1bd6f483945e32ff5566e686b426f2f37daf4f803d2ef779032ea97cc6b
+DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
 EBUILD testresources-0.2.7-r2.ebuild 954 BLAKE2B 68f44e4a075a0a4590bf8103e8b3f39be78beaad78620b04572f9f5760f2147597b38c4322c371d267e167ccaba72e33aedfdb9caf4de176ec4fb47a13b6c20f SHA512 3de787fc7370be231f24129457eb4bbec638daa164cf5cf38b9f1515b333537735c43904ff06ebd70d04c5fc1600450d35aa910e84e235480eb618d39cbc7b98
 EBUILD testresources-1.0.0.ebuild 960 BLAKE2B 12ad5929eabe11a02960f152101a92f4569d7eb59f20caa6f574f96291d8e4e1b32918f8eae36c8b1ba9bec16b93c5b7bf60fc31903efb43f8b60c5499cb1009 SHA512 4d28c3846a1b5146c9ba2402e28b1605b407d42fbdbb7b24f9061e69560039fbc7ab1c9f96fcf5b5ad1217e2a98d66621a9d258a9ed73234dd71a316b962be4c
+EBUILD testresources-2.0.1.ebuild 960 BLAKE2B ac34f57f6765aa8606f26c956bff01bd68b9de0de3729c2a9f194b30c6db49fc059f71a7dc41a3139c1d4bdd8694a8b4df6d568674c07ddb54d1f16de7ea49dc SHA512 f1932e4eb965cbef0f9152713ce7c0f7ba72406da2308fe9ae64126c269df7cedc7c4c367c5519842a4c9f8940a73a474e4acbc1061a681d9ea21cac97e6fbc2
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
new file mode 100644
index 000000000000..4a1ae5d86e36
--- /dev/null
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for managing expensive test resources"
+HOMEPAGE="https://launchpad.net/testresources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+python_prepare_all() {
+	sed \
+		-e 's:testBasicSortTests:_&:g' \
+		-i testresources/tests/test_optimising_test_suite.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 4e4fbc6243ee..511288b25d77 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,3 +1,5 @@
 DIST WebOb-1.7.3.tar.gz 216028 BLAKE2B 66af12ab34dc9a18555c6e480099a2c9b9f0ba8eb8f1e1066d501dea9ed2ff541c064bc40bfc74c284fef5f06281178d4d631b33f29c04d43da9c8e3bd138d0a SHA512 23a51f184754c525dc293b8b71855d40f52445c0df5434af7ec091219e0ea81be162623157b6ec67214cd151b25014bf86991246785816ebcb5a0d1eec9479a1
+DIST WebOb-1.7.4.tar.gz 219331 BLAKE2B fe046905bf127dc8fedbf2b993e83b3614cd62ef614add939d54e241ecfc9a9ed77cfa5b961b436105c72cab36e885f94d604cd90909cc4ada9283c7a098a8ca SHA512 43685daf6dbba5daa99e4fabfb930495b8c2bc976e968d93af7681284cc127d7012f8423b2986dd7daa10cbf7b3803aec442c1ef88102e16cadf07efe6714d1a
 EBUILD webob-1.7.3.ebuild 1076 BLAKE2B 85d5055183df69b1a16dd298821509fbf9a0bf9e2f1c5ef423c7b8d858f73ace54f30e2328068160cd3441b8d66fe2706bb18f69fd3d88d34f77726644fe3b67 SHA512 0ae3edf2b0898fa0c6f1cdd214f87d8414ccfbaad5522b870bc7e2a8a5322028c0b72dbe30566133a817a1cbbbb9951da2e978d8c12987594c5acbb4223401da
+EBUILD webob-1.7.4.ebuild 1085 BLAKE2B 85bb58437465dc1790fca6a7af0e511092a79f15e801c5af6fe66b6863f8e84ac4605e880748a948c35a5b8cd233c2eccc0ee00e853df1fe721d4aa8ab6967f4 SHA512 a6aaf407f3c68615401549dc95fa4172fd0e9f9d1588025d2ca5ebac6487b1373971dd0bcef86e84f16cbc2e6883746257a63f1b07a98a0d56612fa380b53768
 MISC metadata.xml 308 BLAKE2B b14e4d8d46fb386647015b3ba5028f737f440f53e8a13d3afb4b9f418fccdb902f81728c825f65969577d765140230ea623ff66814b12789d45f22e53ae48534 SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234
diff --git a/dev-python/webob/webob-1.7.4.ebuild b/dev-python/webob/webob-1.7.4.ebuild
new file mode 100644
index 000000000000..41ff9c6ff0ea
--- /dev/null
+++ b/dev-python/webob/webob-1.7.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1 versionator
+
+MY_PN=WebOb
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="WSGI request and response object"
+HOMEPAGE="http://webob.org/ https://pypi.python.org/pypi/WebOb"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+	fi
+}
+
+python_test() {
+	nosetests --verbose -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index b90fa5c6ce61..41016bb19a3a 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,3 +1,5 @@
 DIST WebTest-2.0.21.tar.gz 66866 BLAKE2B d2830fcce7fb4b91029838806952e3e9c6916c3b292c7142138f30486d936b4a1f0c2d28a5973b0c351c64e499f343f3711296c6e37c38548e3a81b108163a17 SHA512 21f58ee9192fd0eb0eb2d88179ffc015aa5cf04c8004db251bd65d13d54c34b9e6b5fc9fdd8e9fcbbc18fcfb2be714c0691b2ef034318861262f8705b4a44610
+DIST WebTest-2.0.29.tar.gz 74620 BLAKE2B 7fc68f1178b1abb0a0f126112b846853762ad78cb060718bc340f5ba17517180b7283f384503ff77a2c7396645ebe2d5528dbc0f027c5d44beb002c4204bf894 SHA512 319700d1444f6a681f8ed8a4ee8661ba0462b3f4bfeb7510232f58be92e017066da3bac494ebe1a3c5b9f2d06c025e08e6193277e13c6113e9485108d4ccd2d2
 EBUILD webtest-2.0.21.ebuild 1841 BLAKE2B b38938e9aa5ffbcff77672e6aa1ea357fcdcbcf70c889e8130bd3d0fd9d8beed272968744b3b3a05b6000b87f668831b8e073ee2af6ed852a24da3ab766e4f62 SHA512 1c0201d485c7cc3a00e3f2f6c3ed7c54f3eccba4c3404365139699a432fe751e94dd070ebb2fd3de7de52b6e2cd5c102aa7f5d297dfaa92c922b5b15b015299f
+EBUILD webtest-2.0.29.ebuild 1813 BLAKE2B ebb2ec45046fcc92f49f263278dbcc038a7533d54e167005774b0e7a544b5a0b575c9108ded4b1b08ebe839a6d957d5dfc83085cc1dac2a56cdcc96a9f157ef8 SHA512 f20fc44c398302565efd52a0b26717063d2eca18a2e0fa292a0d82ad8138c4417f036af7bf9a93169c4ca4da672f86801e2bc967c5f90bff15eecd8e3196cc49
 MISC metadata.xml 310 BLAKE2B 34f814fb04671947a228986ee91f8eaafec5a2931cdb87c63b8e135130dc60eff1a2fc2d15f0aba767fac07d853ffcdc339dfdd02495ccc40830b5452b6173d1 SHA512 0fb6e471cf00fcbea309bdb63d23c5917250f2de2e3e245a91d6ccf1258123ee6f0a8c3f311c526b7f9062c6ed93df1c89f44abf16879440dd1dc81c7fba2743
diff --git a/dev-python/webtest/webtest-2.0.29.ebuild b/dev-python/webtest/webtest-2.0.29.ebuild
new file mode 100644
index 000000000000..b30ffa8e4a34
--- /dev/null
+++ b/dev-python/webtest/webtest-2.0.29.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="http://pythonpaste.org/webtest/ https://pypi.python.org/pypi/WebTest"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc test"
+
+# nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
+	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pyquery[${PYTHON_USEDEP}]
+		dev-python/pastedeploy[${PYTHON_USEDEP}]
+		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# Makes testing easier; otherwise we get errors from pkg_resources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Prevent un-needed d'loading during doc build
+	sed -s 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die
+	fi
+}
+
+python_test() {
+	# Tests raise ImportErrors with our default PYTHONPATH.
+	local -x PYTHONPATH=
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( html/. )
+	distutils-r1_python_install_all
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-17 20:03:52 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-17 20:03:52 +0000
commit	4935506e9a5cbfabd37c64093eac5f36c2ff0017 (patch)
tree	af9dd93ea349eacaf28286c7c45c7a083b0b7c31 /dev-python
parent	434d713861b70f6c6563d6ee50a8e64f14c970d9 (diff)