gentoo resync : 13.05.2018

21 files changed, 126 insertions, 271 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f9d692c73c1b..074c93d425da 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 7937fc251390..751e5f833a95 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,10 +1,8 @@
 DIST boto3-1.4.7.tar.gz 217171 BLAKE2B 900c5c4249df9d0c3b5d157835f66be5e7cd3e2f4b934047340614ef729d30a5952f2996f1638626a10f9e5e55cb05d4792241b6f7da9c5157da9caeb464acac SHA512 db87ce873ba3d7d12c9e77ce329db3fab25328407ec5ba7fa1e7c94351285a84a3baf0f71721ee6858761743736497ec35b03e8d5e9a59da8daa176596f1a1a3
 DIST boto3-1.5.27.tar.gz 221841 BLAKE2B b604bb3f20f6ea5d6fd9de8ea63258cd4fdb36fb7cdbd6ca2e194f177dd37da3609928be47fc620ab42db6955aff373c757ea0f80896be947aa714bd6da487f8 SHA512 c38d11fc1e1d65cfaf9bbe00da210c4713fec9232320387efc11663470fc333a622877eddd1c60216496cb6fb399f0964cf51bed67209c4c7ec17af03972350f
-DIST boto3-1.5.6.tar.gz 218891 BLAKE2B e2f9b567d8c4daad21895a6e8eff7e004229d96715e648c0f62705d5b3db1520e98e1b93d88650e8be98517e971258c0fae92ba09622f86081bb1a1665937645 SHA512 15eacfdf059634ad86a5c41b0ca237e24a6602b0cf9c897fc3d89b02dbebc93043c338d0e1d89d47bb619521943807829f67a384f450987ad5c85b34d1c76d81
-DIST boto3-1.6.6.tar.gz 223075 BLAKE2B a865126d1a3ccb38794f2f65ab9ce1d9ea36555b13d48515d221c3d9245e89a3145d79b7eb405e9c74df9b73c49d38770caa1864f0cd610d533b61d8ff54e7f1 SHA512 a7ae94dd7fdd96214129e889a99e950a90edba23952eec7a45047cb1e6173a827dc45013a78c4fd083a5e6b4524f362b44a72f758b32f4e05e00215b38b7643c
+DIST boto3-1.7.19.tar.gz 226568 BLAKE2B 3f56b738d49cd8da02621b5f00160e8a6bc06fa785b870cf0a413c0c9ba2e04dd772f4246fe943dc9fd7dc14f1c587377e3ffba77c2b1a092247958dbc573fdb SHA512 80975e234caabb0f9c0166cc00a3bf88d61ff1df386fa4df83599245a04d323d10b770e1f4171e7f856ea91edd325d1207caf023a2f43e5dca23236fc48bcb6d
 EBUILD boto3-1.4.7.ebuild 1413 BLAKE2B b9305754545fc6818476a70e19ea68883c01f9ff56613616836d5950b96ed2c15cdfb84657a4e38e6d168c3f3704bbbc8d58eded87d673ae3075d97527cbc047 SHA512 57902ff38cc3bc44cbcbcd83a9265fe360bed5992a27367f3e5ab00fce7ce0e469fb41db6c65d593ab070c57d3f86f56338adca5a04d4febd81927fa57c26b07
 EBUILD boto3-1.5.27.ebuild 1454 BLAKE2B b83f4592fed82de75241559d77448b8f62cfce4130c28d60b109fa738686e2b44d2261e7099ed8486eaa0ada40daa311eea4789868ab8cf5115afe4868aebfbf SHA512 f4f5f5c3f829dfa2328d6859d046aec5dd0fb4e583cc09217e9d0b1eed37570c601fae36b37935c97532da2edf04932b94ba263d5875c3350033ab640ba4fd9d
-EBUILD boto3-1.5.6.ebuild 1462 BLAKE2B b8d8823f63c92d74f94dd291eff7a321c66fc66fe5394138916819799274c10938397f39b1a2ba128ae5b85e940fe11ed0a8926768602217a3b6b4610ca6edb8 SHA512 7b7825edacd6f96522f8a93a924cec93ec56312b863b062cdcefb146f0f742d4ca0f46bcd9d274e01ad140ec6262de64789bc7ca5e3c51a4f96c587ffe70a368
-EBUILD boto3-1.6.6.ebuild 1455 BLAKE2B 71c83536723d8a49bf281b785930b1e46604f24bf685ae7d3949732043378e3348f33cdda1660829770a8d6453851d98da44dc6103ee4858874a32113506d6f7 SHA512 0c07862026f373fc7378d92347a80e2130807cafa05e0d60fc2fbcb22761b7fe6dd96e7a187085a687ce79a2e5c4a6fb9afe8ffbea7e49b88510904a9d30cb9b
-EBUILD boto3-9999.ebuild 1455 BLAKE2B 71c83536723d8a49bf281b785930b1e46604f24bf685ae7d3949732043378e3348f33cdda1660829770a8d6453851d98da44dc6103ee4858874a32113506d6f7 SHA512 0c07862026f373fc7378d92347a80e2130807cafa05e0d60fc2fbcb22761b7fe6dd96e7a187085a687ce79a2e5c4a6fb9afe8ffbea7e49b88510904a9d30cb9b
+EBUILD boto3-1.7.19.ebuild 1229 BLAKE2B 30d30ee53ed94f3fda459f364bba25e33bb751ebe076d3ecd15af3dc0e2ff21ad4a87b37ef4df67aef2273b63366bbba9af306fd24229f5420e0e64507b3a23c SHA512 7e9a93023be3b952a5d02c7e1d1a8c7a69552984cb5797680dd464f2df0ccf074efa7f59d3f79607f827c3bed6a0fce90fcc0e74803c962fc1298192000bedcf
+EBUILD boto3-9999.ebuild 1229 BLAKE2B 30d30ee53ed94f3fda459f364bba25e33bb751ebe076d3ecd15af3dc0e2ff21ad4a87b37ef4df67aef2273b63366bbba9af306fd24229f5420e0e64507b3a23c SHA512 7e9a93023be3b952a5d02c7e1d1a8c7a69552984cb5797680dd464f2df0ccf074efa7f59d3f79607f827c3bed6a0fce90fcc0e74803c962fc1298192000bedcf
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109
diff --git a/dev-python/boto3/boto3-1.5.6.ebuild b/dev-python/boto3/boto3-1.5.6.ebuild
deleted file mode 100644
index 26a90923fb50..000000000000
--- a/dev-python/boto3/boto3-1.5.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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 vcs-snapshot
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="https://github.com/boto/boto3"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/boto3/boto3-1.6.6.ebuild b/dev-python/boto3/boto3-1.7.19.ebuild
index 76025bdf9594..d34a08a45c25 100644
--- a/dev-python/boto3/boto3-1.6.6.ebuild
+++ b/dev-python/boto3/boto3-1.7.19.ebuild
@@ -21,19 +21,15 @@ else
 fi
 
 RDEPEND="
-	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.10.19[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/s3transfer[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 76025bdf9594..d34a08a45c25 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.ebuild
@@ -21,19 +21,15 @@ else
 fi
 
 RDEPEND="
-	>=dev-python/botocore-1.8.20[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
-	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.10.19[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/s3transfer[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index f6dc2e7fd38d..af797b104785 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,11 +1,9 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
+DIST botocore-1.10.19.tar.gz 4372030 BLAKE2B cf4782e603c3483583edc2bd0a310781a00678524b4966b504e34db24b0f177d2d63cc76a5b2f1efa2d831c8ca3bc93f6bbbb628344da944a59b784cbd2e3062 SHA512 450f66d182f0262ae5fe040fc45c640c13fc2b9b1e4331e3be18ebd7b52b0008cb39f7293e243b101797a84b390399c09952f82880d925ebc076672282334577
 DIST botocore-1.7.39.tar.gz 3838231 BLAKE2B 53355a6f0fca131db8ae41ff7e0b5405dc2a4c1a0630743ec34e0fabe60468d27ea9d36b67dc3b8757c3f524eabf3fef1e55d3eb0df1f4c5bd229448f8dfc3d4 SHA512 0a6031315356f43e00ba5661020890478a589f0524bacd22fd24a9f8da147761f70d7b7fae9aab887301e78a392bc12dc7067174af9a07aac346d11a4cec9a22
-DIST botocore-1.8.20.tar.gz 4173990 BLAKE2B ce9813c77b440fdfd123593aeb9f5c47bec877981dad5089b83633deebab3bf4aed76c13ac73f571eeb8349406b3f04e6c33634a865e076ffdca266cf418b80c SHA512 0b822bff75ef26c7e996e354a5c06cb50eb13d7e58f65297adcf023a81084c8b98500c08b906dcfd346e2dadcdde33d472d6d51c3e081af8667c5adcdd2deffd
 DIST botocore-1.8.41.tar.gz 4196554 BLAKE2B 8f74b8f53fb98ea0fbadebb1739799eb30fb52748377175e0682292f4868910a5fab187c9065434e67d783eee0bb119555daa55020f1b909370749dfdf1dbc87 SHA512 d8bb3eb704268410646c0290fde829a3f69fc9c587b31afb43649efe345f626dc902be0ba7939239bb93871138aeb7587671dcb91ac40f4241c90b2238219d30
-DIST botocore-1.9.6.tar.gz 4214248 BLAKE2B 7d15cafd899a3b0ed139ebcc603a2eb2157b64369744620aff6d80a6186ce89d26315af7d40ca71e1b3bb2b258854f6335586ae635aba37ee2a8b8b0ab45aaea SHA512 bd69eaae4b4fdbf161e30191b1b715adca0316ab5c55c73a845291e42279a23110ff942a72997126a8dea47e0fe15516eddc42b6c08bd2bb9e86e8ecfcb73270
+EBUILD botocore-1.10.19.ebuild 1456 BLAKE2B 27d13171ffeb862a0412c1d46d25312b7f0eef4525c2caeccbe4f2f5bbc003f99e0caa49adb33b3c35a5f3ece93f8b55d6917c9535be6eece68ee33e389dee79 SHA512 3d97c0cdfa7565e563603568500a14a71f0581b5cc965e9bf83888cd3f34e664c244130866a675a0f26b693923cba7bc6e16025ead0ea3633966c7cd765d1e00
 EBUILD botocore-1.7.39.ebuild 1344 BLAKE2B 1f0cfff06a615aa3abb56213721dba88a548bb336715e21b67f1d4f367b2bfbcc7c1a5415123fc8b392a9828cb49d1f97defb7f89620e89aef0088845223b425 SHA512 d6b49f170d12c9611f292cd1370d7506bd95eb1f88d0ae0a44111c81619393e00456eebe7de733de1bf988bd43eeced819554fcaac5f89cedad14d6a55cdc40f
-EBUILD botocore-1.8.20.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
 EBUILD botocore-1.8.41.ebuild 1691 BLAKE2B 011f9673e3fcad26a661d7148fba3b4b03c77c641c07668367c32460644b54abe6efc250dd50efba18f0fc6d62a6fca953fe308c9448678078c25592d4a19fe8 SHA512 0a664208653aa25b25ddba471e5b08529451cd6d831c9711a6cb0ae0e3459828b228b3eee067c2f06c8274a438f347d8e9a1bf8b8c59ea552f8617e984a4a9b8
-EBUILD botocore-1.9.6.ebuild 1692 BLAKE2B a7cda1633d5c83f637419604d5b3ee9c9da56663640ca79f99f65da19b271b5747ccaddc919c3799847c66458edbffb06329a65f2281640a2ae6f419bcf29745 SHA512 a02b119bd798d24b5b5f2f0e376145883f8926d086a1ed96e615445913cfbce5724458cb67d2263414fd68793218ed5e628ea7d394c54615ea611adbca3c5f75
-EBUILD botocore-9999.ebuild 1692 BLAKE2B a7cda1633d5c83f637419604d5b3ee9c9da56663640ca79f99f65da19b271b5747ccaddc919c3799847c66458edbffb06329a65f2281640a2ae6f419bcf29745 SHA512 a02b119bd798d24b5b5f2f0e376145883f8926d086a1ed96e615445913cfbce5724458cb67d2263414fd68793218ed5e628ea7d394c54615ea611adbca3c5f75
+EBUILD botocore-9999.ebuild 1456 BLAKE2B 27d13171ffeb862a0412c1d46d25312b7f0eef4525c2caeccbe4f2f5bbc003f99e0caa49adb33b3c35a5f3ece93f8b55d6917c9535be6eece68ee33e389dee79 SHA512 3d97c0cdfa7565e563603568500a14a71f0581b5cc965e9bf83888cd3f34e664c244130866a675a0f26b693923cba7bc6e16025ead0ea3633966c7cd765d1e00
 MISC metadata.xml 375 BLAKE2B 562696aff0128b74dc4c2c0767fe03d53ae116cbc4fdb3a8649e36a8c689dcbd2a90bb5f46dcfa6a3cd71c9150f923281100ec098fe2212dfffa96d74e472d3f SHA512 c369567feea497a744245642a9a307b2a2ec06035fffc3b9b72d9f7ee9fe2f342d62cd1d06a668b47ac1b3187fc28845bcf3c220d942cfb2ac89f72809fc4a86
diff --git a/dev-python/botocore/botocore-1.9.6.ebuild b/dev-python/botocore/botocore-1.10.19.ebuild
index 89ab97de7bc5..5771ab5e96d5 100644
--- a/dev-python/botocore/botocore-1.9.6.ebuild
+++ b/dev-python/botocore/botocore-1.10.19.ebuild
@@ -21,19 +21,15 @@ else
 fi
 
 RDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
diff --git a/dev-python/botocore/botocore-1.8.20.ebuild b/dev-python/botocore/botocore-1.8.20.ebuild
deleted file mode 100644
index 7f976cb95e55..000000000000
--- a/dev-python/botocore/botocore-1.8.20.ebuild
+++ /dev/null
@@ -1,60 +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 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Low-level, data-driven core of boto 3."
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
-	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 89ab97de7bc5..5771ab5e96d5 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -21,19 +21,15 @@ else
 fi
 
 RDEPEND="
-	>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
-		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
-		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	)
 	test? (
 		${RDEPEND}
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index c912f1d2a052..ae963526ac23 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,6 +7,6 @@ DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a
 EBUILD cryptography-1.7.1-r1.ebuild 1725 BLAKE2B 3327c2607caa9f5fe09f617091dcb21ec637cc5621aa10dcfdb07c82af71a7663a603ae2b7a1597ede0895221c2cf57fb5eacb8883ceb10f89fc36e9c1ef2900 SHA512 9e31689524057c73cf174c8ec4621b57777f20e75295748c91c58eeec8a058ac5067d996aaeb5508d87b07b58c3484e8a5a09c9f4585cadd10009cdc7899e79d
 EBUILD cryptography-1.7.1.ebuild 1662 BLAKE2B e93ee9089ba409dcc50f7a09aed35fe63706c0c08feda1413c1127fccdbedbe5de857b9f4980d2348125bfab11879b71b48e12c2d187f0ed8db6f5b083466e90 SHA512 33688e944e9b4a46f8a49b643fb5f8203716aca424ae6fb84d0b9351310efe4f7941eb2c329a8b4f11c159511aca7e8ee94bcbd25d89d3da919f943a591eda34
 EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B 7bc96039e6e97bb471124fbc1d1a669a94b6b95a1066fc3a06e5adf84514efcb5651fb9a8c837942ed649e910fdb86ea86b4d92c4dca2177d81bc41ebc6800de SHA512 a65cda871f652ff1e903226396c238185e01a666b84bf1fd15a41707989b5848e4b442bce23c3bbc78a49bd64bfd27eb4d75274b2cb99be6c6ec5710d82df896
-EBUILD cryptography-2.1.4-r1.ebuild 2172 BLAKE2B 4c0d38bdbdb6fb5dd27c9bfce113ceeb5f26bbdc59b3014564b1fa29d552c53487645f5579154b02e4cda318d809c8892e0fed1e1b55686968192c4cabe3e850 SHA512 2bd4e4a2c6bab3c295cb634b1ac4d020f2e504f314ce8ca007158ba4dabe511a9557184ddc22dfef2523a68514b78faf3424427b39c4220881cbecc7b3e33224
+EBUILD cryptography-2.1.4-r1.ebuild 2171 BLAKE2B 7a287dceb41ce20882b35a7fd996ac598fd87cafca208896411aa06e2df4c6e4ec03ebdab88fff7fe944e418dc377d0c89bffe456188603723f573df8b07b9d4 SHA512 6894317b9206be6d3a576b48171f6ee11e17b838c7bc1b12958aba5087e4d0c3a8037fb7a28273bb6f128d24b208113a3d61fba2e88682043dd0865093186870
 EBUILD cryptography-2.1.4.ebuild 2044 BLAKE2B 2dd3ba08232364b585e92ed6fd83a204f9d1192ca016a796275a200b995c9e3244c687c042600be62a7245f327813ac6d95f6fb8fd1682c0b861cd106a5d2e72 SHA512 43cb90a1de0f0501cbff6385bff0e80eb1fe412479dbfca2bf8ac3d15e93b2c4621b80ca45c7482852620de97eab249cca0e7d2a050856cf4147c22d0523b2bb
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
index 1b05104be694..29d1f950ff4a 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 3d2a08dcd93d..7e0a496d58e8 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,14 +1,11 @@
-DIST elasticsearch-5.3.2.tar.gz 33704368 BLAKE2B 861ca6b37ee71b2a7d3b988287df88620fc88ec6961267c440d1083feadadcf036832f41446135ecb1066c51c3ddd259934562de53b2dad69220a1e4962c3e7c SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00
 DIST elasticsearch-5.6.7.tar.gz 33789994 BLAKE2B 4e5f4e55cb3875adee7528e26187659b5bac7b2def9d22d438f888fb33ce116654b54859d8430b203c14939bd3821240f8ed209ce120388256e9389ab9acd11c SHA512 2c9fbe8d3ccdced6242b5d876cb9a25a3ef1b94f9de0720aa438458b0235082220621afffe7976664bf08b13b4aee157c28a5d519b5594e6d9d7855c24e93056
 DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
 DIST elasticsearch-6.1.3.tar.gz 28454781 BLAKE2B 80c42a64fb533a5b2f0a2c6ea154b129e327acc0d2addc6f1dd5fd949573459ec87118e12b98791642fdfa8e92927d749dd60119adcb398fca56e6e00b0811e2 SHA512 af10cc571ab55f52ab73a86373fa8359214a7866fbb6d2910669e6be897bae30c41c007c3be5803a7f07736041f32cf36425c182a18fab39499321ed9eb4b349
 DIST elasticsearch-6.2.3.tar.gz 29050159 BLAKE2B 32a722e3861abf024a4b82ffe97877896cf3ffc76aac34fd942eeb9ca490ac41f3bf530b6313104fdf2c4900ea377d57837c465c6de6f983afac99802586b1c7 SHA512 8103c2b817cd5e14057c28372f379bb9c2b7833698818882c649d349904163d0c69d147836d03428619535652902532f7e5abc1e23214ad735c54b1d914acabf
-DIST elasticsearch-py-5.4.0.tar.gz 81286 BLAKE2B d15ef79ee9720b4ed67c5538c66301aba2c7a4baf9a48faef0153b76dbf780749975d664c8e9d52599077738e543d6c5113bde3748e86f239f1b92a272ea934f SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae
 DIST elasticsearch-py-5.5.2.tar.gz 83415 BLAKE2B 6adf9d5e05c2d097590bc78df9c9a7a948194a4106d718464c04e705380984b51d8f7e04fe9d0eaa6518d6d8767aa064c99512cf827a31e993178ee3c28a8815 SHA512 c5c9583179e87b13c7edf14baeb5a360369f37a953049c3c7e101c379cf895c8fe743d5edaaee6aa0fa4ee6cdab9364c0177097ad780ed3d85ede754088520a3
 DIST elasticsearch-py-6.0.0.tar.gz 83197 BLAKE2B 5ca16c9b881fe6f8c4944e8eec69be0532fe472564b12dbaa40225b29b8a2b88974e35ed2ab733722023da3ed877a2934bb545387ffdcf307d519950a8971880 SHA512 1d6c27654f9470837e9cb9866cb6f5305d63cac9dc6bddc06309e378a5e7b7fe3d21cae5ffd115685fe8ddcfd8cbbe1457d74799dde0fc7427f90fc870f1c444
 DIST elasticsearch-py-6.1.1.tar.gz 83575 BLAKE2B fc7cd690208a401b83fd1b86957dc49b2bd686248f2d78901551c26e67e06f4c7f6175346fd0374ff509477f571a8074ac30aa0e2cca1c73b11b6cdce67bfe33 SHA512 f593865de8879ac42cbbd35dd6bcc1da9513124556dcd3f1d8240e9d2818682136bfac09387c50797f4daada33699a7f5c1591172a7d89c3bd865595a5706c18
 DIST elasticsearch-py-6.2.0.tar.gz 89784 BLAKE2B 150668b378d50ea2d62f75a71127b524d44e5d69bc96905f70b38162598a11ab77aa34814788e4177f668a1109191bdbb4c28698da608a35c70a45026ad9c22b SHA512 f7205db8b8608ce52657a114a38f59b95ed0ea5acb0a5f18197be6baebde80fd88210a5f88fb5d2770f82f1dc7212d038d801f96c7d18cfe1e77c16ee0fa5208
-EBUILD elasticsearch-py-5.4.0.ebuild 2656 BLAKE2B ff39bd1fa8148c07781624d47b1c27765b9f8f19ced76bf6815edcc2e8be9ad4ce43d0da49e850e70d246e56f1eddd7ebff3e3e075fd0d7893c12cc9e46a4868 SHA512 5b757f21244c74c522ef2cc6533f788c031d4de915c1658645bcc87020089c196822ba6d5918ca90063f98de9d037abfcbbd737093dc436620e64ad90e4cd03f
 EBUILD elasticsearch-py-5.5.2.ebuild 2754 BLAKE2B 3e1a4b2bbb16168127f1be66014ea5282b0b58667cef11222eeed324043c503d7bb289523f482dbd019c15d4fe973a9c382aa1a07cd1eb64c9c8040494dd3f1c SHA512 bbab061e078d7ff3f75f7d722158762cee4e6912118a2499fdcb8f2be51c56802009b622f37f834f5b46a02a0d69f539d545d6d4f309a0f00a38486bab389dcf
 EBUILD elasticsearch-py-6.0.0.ebuild 2756 BLAKE2B 6dac845f2db9b7204fcbf17e70a357b0a8939d24b3fa779eb9978f1fc3edfbeafb039ed75da87d216271c161452e46780807d899403c6d3519bd30772db8290b SHA512 b8fe212ef1a44e79f4aa712118b664a80385068cb847d23970eccbacf171cd98e899da148833f434a790d55ee9dcda5ab7cb119bb581e152d79c029de2fd6a32
 EBUILD elasticsearch-py-6.1.1.ebuild 2756 BLAKE2B 4ea4b1ed0c26ac25915a281e755dc21f803b75c60798326c6e5a46b7a6277dcc32e35ff3164eaae2fd67c28ff978a7a8733fa49c5b71a099630cd180ad42b770 SHA512 37321c3206723abbeea13904bed0ce8c03524c2a404c7d6101df2b8485cc787231fb6fe67a5491dd5997f74a154a7b5fd267d873aac0e6ee7202c9b941f27b98
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
deleted file mode 100644
index b0206130984c..000000000000
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.4.0.ebuild
+++ /dev/null
@@ -1,98 +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} pypy )
-
-ES_VERSION="5.3.2"
-
-inherit distutils-r1
-
-# tests fail in chroot
-# https://github.com/elastic/elasticsearch/issues/12018
-RESTRICT="test"
-
-MY_PN=${PN/-py/}
-
-DESCRIPTION="official Python low-level client for Elasticsearch"
-HOMEPAGE="https://github.com/elastic/elasticsearch-py"
-SRC_URI="https://github.com/elasticsearch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? ( https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples doc test"
-
-RDEPEND=">=dev-python/urllib3-1.8[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-		<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretty-yaml[${PYTHON_USEDEP}]
-		dev-python/nosexcover[${PYTHON_USEDEP}]
-		virtual/jre:1.8 )"
-
-# FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
-python_test() {
-	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
-	ES_PORT="25124"
-	ES_INSTANCE="gentoo-es-py-test"
-	ES_LOG="${ES}/logs/${ES_INSTANCE}.log"
-	PID="${ES}/elasticsearch.pid"
-
-	# run Elasticsearch instance on custom port
-	sed -i "s/#http.port: 9200/http.port: ${ES_PORT}/g; \
-		s/#cluster.name: my-application/cluster.name: ${ES_INSTANCE}/g" \
-		"${ES}/config/elasticsearch.yml" || die
-
-	# start local instance of elasticsearch
-	"${ES}"/bin/elasticsearch -d -p "${PID}" -Edefault.path.repo=/ || die
-
-	local i
-	local es_started=0
-	for i in {1..15}; do
-		grep -q "started" ${ES_LOG} 2> /dev/null
-		if [[ $? -eq 0 ]]; then
-			einfo "Elasticsearch started"
-			es_started=1
-			eend 0
-			break
-		elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
-			eend 1
-			eerror "Elasticsearch already running"
-			die "Cannot start Elasticsearch for tests"
-		else
-			einfo "Waiting for Elasticsearch"
-			eend 1
-			sleep 2
-			continue
-		fi
-	done
-
-	[[ $es_started -eq 0 ]] && die "Elasticsearch failed to start"
-
-	export TEST_ES_SERVER="localhost:${ES_PORT}"
-	esetup.py test || die
-
-	pkill -F ${PID}
-}
-
-python_compile_all() {
-	cd docs || die
-	emake man $(usex doc html "")
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	use examples && dodoc -r example
-	doman docs/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 6886a7330c67..302dfefcb70c 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,3 +1,5 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
-EBUILD inflect-0.2.5.ebuild 561 BLAKE2B f0d3e239903d468094fb720e17b5ebb51e3230e15ac831c4180af47a69487a5eba870a6a44f37f29627cf33c7befcbba733c997e9799f56d86d99975f8d9f44e SHA512 11a39bc8f7a6e60bff5747616e2437d57a5a3d62793d0cd46bf95565eee667944dbdaaf5d8fcd2b1d9840faea290fe84a84be201d347d92bf6e5a55d284dbeaa
-MISC metadata.xml 497 BLAKE2B a65d67645a6563de300b553b61eb9779423322937d2eaac191b9d088bd9df9f71f28608c376584e28344b8470ae8ac347a5d23a00ef33c06f63bf79e27b914b8 SHA512 1fab4c4763e60b7c1d5bfb27bbf43431ef66b9853c9c5957ee8b2daadaf1c063453455d7ab7e612c14aa6aa5f60773f1c323686b4963c410a082c69e2050c6ed
+DIST inflect-0.3.1.tar.gz 109456 BLAKE2B b57009a933f49762da315c55950ca20ad04a53559b1bd1fb7d8395bf4bfbb74b618eb1a0d0a0ca0f2b64adde93665fdf1f643f56299820ffe0c56a20f57237dc SHA512 c832f0f36b56f5f59d8c3a7c0b128c0ae00f7a90c57f303e79a2118657ee7b62ed3db7cd4c3297e41a07c4d2bdbc18d6c754c319a43004af6d35cab3701169a6
+EBUILD inflect-0.2.5.ebuild 559 BLAKE2B 7a4e165bc85aa92047d6e3560e9afb29749a75148ed254797f146405c43c8a408a5c5c01535092b04edeb313bb0ed4dd53312258651a9f88a3fc63ada7843c29 SHA512 6cd5a2a1ebe78a6449262017643e61b6353d08a9b20a582f20e92405a7d457bfb4916f0b2920925be985f0cc83d2b0472db1fbbe637b102088f6e28f7e4e282c
+EBUILD inflect-0.3.1.ebuild 576 BLAKE2B d016693a41167457c3465615d5f58e6316e96ff11fb959cbd6c09771e3e347f3dd13e638ea523e4e7768afe6618c0125967053f3732da55825bff9b5ece7056c SHA512 ad54e23d194a273482bef10f23f2ba0c563dd42982ee79def453d41f47a470113eb8d93f13a2f71ba504013d403ca1d8ab97f8146f8b49784a5456016db325f7
+MISC metadata.xml 495 BLAKE2B 4a1a617d259bf9b09528a0d7e6c20e3e2e98b181da1c051c70fabc635de1749460c64d242f99e262b87af14dc6a3dc0efcfc5f692f2a98744b039a745d00910c SHA512 d8558e7df39e1ae041b8cfb09895494d149c9acddef719d5ae9e4702ff543f146574de6ba709613cba6071c748ede60154d4ed6e139bb9f2baa2f0a3694d8541
diff --git a/dev-python/inflect/inflect-0.2.5.ebuild b/dev-python/inflect/inflect-0.2.5.ebuild
index bffa40f5d2a8..e97cf06935dc 100644
--- a/dev-python/inflect/inflect-0.2.5.ebuild
+++ b/dev-python/inflect/inflect-0.2.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=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/pwdyson/inflect.py"
+HOMEPAGE="https://github.com/jazzband/inflect"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
diff --git a/dev-python/inflect/inflect-0.3.1.ebuild b/dev-python/inflect/inflect-0.3.1.ebuild
new file mode 100644
index 000000000000..b9f89e067ea4
--- /dev/null
+++ b/dev-python/inflect/inflect-0.3.1.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=( pypy{,3} python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jazzband/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	nosetests -v tests || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/inflect/metadata.xml b/dev-python/inflect/metadata.xml
index ef112529b5b9..9c92a6c72bb7 100644
--- a/dev-python/inflect/metadata.xml
+++ b/dev-python/inflect/metadata.xml
@@ -11,6 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">inflect</remote-id>
-		<remote-id type="github">pwdyson/inflect.py</remote-id>
+		<remote-id type="github">jazzband/inflect</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 8f239f4fbf0b..30f28eeb588b 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,3 +1,5 @@
 DIST isort-4.2.5.tar.gz 36361 BLAKE2B 7133ab999200412bc880a5413de81ff0b7718383eaf7f50dd1ca12da4d7ee24f8d47af60e7416ca6898a32074779c4f293d897a0f7d62c2539b10a686484c121 SHA512 ddc8e859bb421e4179315d74896958c8279394d42a75494db5dc22c58422994aa249b63c03645626a021ccf9142941bde51ad400256ab1c6be29da8110375f40
+DIST isort-4.3.4.tar.gz 56070 BLAKE2B c0f7c3d744fcd54b0507d3e7d5963c5d9fb810552ad284206031aa979766cd2e7e1418860000f29130a000bf827696477a46c33ed5cafe4be6571a243bd6dc97 SHA512 ffe679b96223f5f41d14c61051a875233857f7ccab33211c195ed62b85cc1e9bef0af67f9960e94322fff216c1bfaaa583fbd2ef20e258f90a184a25d011213a
 EBUILD isort-4.2.5.ebuild 474 BLAKE2B 19a5fb280538866fb6767c3ba19625402dff275d32c882b0904c6cac07efe12d350384daa498d835dcfebe54b965092feaf4215fd44623fe36f24c436ec4ac9e SHA512 7d6948d6a5db96578138c2bce4953c8d4df0493d6de33830060e57eed9a0eb64e895e36341d7c7c29d918add90a5384dc2799a8b6921f53e4f9e49de511bf35c
+EBUILD isort-4.3.4.ebuild 474 BLAKE2B ad6dd4cdf7530aba34a39cea0d1eb17f303283489f395698b87eabaf35752392ece50257e7fdd29c3232c2ab2312f4baa81f1fa03c60ab867fb4c5c9af6846bf SHA512 a4f9408a1c99e54fa353d67ec8cc2bb3374c5a6eb4ded2edbff85e7e341b7b28d2631c1435df8065fb982025dba24939e8f7eca2a4c831646b20565dfc1a16c6
 MISC metadata.xml 395 BLAKE2B 2fe78f812b341093dab53962f6c02a341b9c32221d3d318ce839f38ad2280369ca242f831cff95d18120a8104bd5cadfb1e77123872228411514a993b086772a SHA512 27076ca449e7effce88a4295218f20fcf89ba36ca0df51951f50d25b4f8b76945282136b6e972c0220567df3249c2c1fe2e956acfd36a5cf249401c88c721d4a
diff --git a/dev-python/isort/isort-4.3.4.ebuild b/dev-python/isort/isort-4.3.4.ebuild
new file mode 100644
index 000000000000..acd1bcfe3fbc
--- /dev/null
+++ b/dev-python/isort/isort-4.3.4.ebuild
@@ -0,0 +1,15 @@
+# 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 )
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 71a14498544b..4d3ce384382e 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,6 +1,8 @@
 DIST libvirt-python-4.1.0.tar.gz 186312 BLAKE2B 45ba81eb738e72e2561ab597c5cc395ae2260c7d93575391d2ce14622faf706052ea5d83adf6ca6a52c35cda4a9e80348f163f48ba318f5d0056b26a33961d25 SHA512 533c46c6827b0c3397713b39a7c6486e1bad40571907aa48da7818ad15569d4e01e33ffc787beb9486fc84b361985aa1d30ea474555d55494143f71dfea26947
 DIST libvirt-python-4.2.0.tar.gz 186496 BLAKE2B a4d556a0159c338f2a3a5fc8e6072b084aab427170b66f00dce5b8c4649bfd7d821e02846de906584a454acf2f1db34718a2f48110cf5c8faf6594a72b6e8f2b SHA512 4c06d7de470ff22ee5983598e66d26a3e850998311c8061952f9f6b5be0a7a0f437e2b214d3d66bf465acec9afb925dfb6dd0cd756ed78e818d19e15e7cfdf6a
+DIST libvirt-python-4.3.0.tar.gz 187111 BLAKE2B 7266ca1b5836429e13a03dab0e2f5085521c72e2d6952d7a9de514eace286477ad7b237c5d70f86fac49ab2201c8724149af72d4c1f688ac8736257045babc6f SHA512 4b2b4a2590e968ff4401d8429319c94b1b9c08a40b089f461af5a4912acf2c504f60652c80b161c253c00e41d22c100c2e180159e45d84c352c59dca69172cfc
 EBUILD libvirt-python-4.1.0.ebuild 971 BLAKE2B caf77d87ce352223c8c169ed840374c61109b1737c1a7d670d8246bf7d74b5577a90568769d1abfa50511293d3c4f3c3edc6b4497e4df230394adc5267031c5c SHA512 15c3b85fe89d593d0e4438fdc537bde2143fea5bae099293241ff78974df6141a730d6f9e3735593ac7b8a91301efd599a42d07699b81e166fec45e89a265690
 EBUILD libvirt-python-4.2.0.ebuild 964 BLAKE2B 28b03bf2c512a12d539b1e1cb15793821dd1763ff142e12bb6fece94b41f8bb29f1897c2c88479356f5de8d44ef81c3237730a1736ddfc4e3c243140c523f685 SHA512 dd0e54bab5b1a3cdd5dac84c1b9fe7f0191c9a1b388b0a2495992c798553ef10830b2a168906f9fadbab1a39e8749f486085b535fae981209214080205f2be42
+EBUILD libvirt-python-4.3.0.ebuild 964 BLAKE2B 28b03bf2c512a12d539b1e1cb15793821dd1763ff142e12bb6fece94b41f8bb29f1897c2c88479356f5de8d44ef81c3237730a1736ddfc4e3c243140c523f685 SHA512 dd0e54bab5b1a3cdd5dac84c1b9fe7f0191c9a1b388b0a2495992c798553ef10830b2a168906f9fadbab1a39e8749f486085b535fae981209214080205f2be42
 EBUILD libvirt-python-9999.ebuild 969 BLAKE2B 7eef27fd34c2368a8fadbae51f5e76acac23f72c66935dc2fdc0c19e3ab7dbb1b05e4a87ff90a72e4972408bfb63c15efbeb2b46d31951387eb975567bd26aa3 SHA512 4de4f941bef900a032f6d3473a868070eb087dcfaf332e53bada1adb9222cab13e388caad11c6dddf2042aa4c4e266ba12150ab4652c9ef1c4b2bf4466bf5c37
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-4.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.3.0.ebuild
new file mode 100644
index 000000000000..172f3dc38862
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-4.3.0.ebuild
@@ -0,0 +1,46 @@
+# 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} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+	SRC_URI=""
+	KEYWORDS=""
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}