gentoo resync : 15.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-15 16:58:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-15 16:58:00 +0000
commit: 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch)
tree: b72c523c72e764420f835ba9d63d43ffef687dcf /dev-python
parent: f78108598211053d41752a83e0345441bb9014ae (diff)
95 files changed, 989 insertions, 293 deletions
diff --git a/dev-python/ImageHash/ImageHash-4.0.ebuild b/dev-python/ImageHash/ImageHash-4.0.ebuild
new file mode 100644
index 000000000000..b3fefa3afbfa
--- /dev/null
+++ b/dev-python/ImageHash/ImageHash-4.0.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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Image Hashing library"
+HOMEPAGE="https://github.com/JohannesBuchner/imagehash"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pywavelets[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/ImageHash/Manifest b/dev-python/ImageHash/Manifest
index 3d933c141f28..da0ff0aaad7f 100644
--- a/dev-python/ImageHash/Manifest
+++ b/dev-python/ImageHash/Manifest
@@ -1,5 +1,7 @@
 DIST ImageHash-3.4.tar.gz 290881 BLAKE2B d5c7ccb997ded4fb4927906bb52464140d1a175d4dee9d4ef6981b8c0f5cd092535dd796ccccb5ca28ad168273c34b19c12fbc09e7c90a2a853f9fbcebec7d03 SHA512 a4ba260988d81135f073bfc9a1b1253a69e8736da61e09ac93f8403ca237bfe85c3f0b4791546af601d62a306dd3346ecccf8ebd00d5cd8f4c6ca717b9d89dba
 DIST ImageHash-3.7.tar.gz 294629 BLAKE2B bf2fa6cd102c24d82a83b61b6d648013eaa1a78d99df37c9b918dbcc070136bac8edcead016bee831d34b0f35ff51eeebf0cbdbe45e6ac8e5783b93d766b4d94 SHA512 e0da65d9d2a42ffce5c8b95017fd79bd002f48a963b956836695118e89bbb2ff936629a743248b4189439de155a0ec5f54a34d7cf7b803ae581b45f7bc02b500
+DIST ImageHash-4.0.tar.gz 296405 BLAKE2B 1623d679c0f10eb18d20f7cccb0a87c2584535e0afbb4e35b147f9be3e95cb0aea81eaa42fcce989427d99d8ebdcc143ce04f432520f54958d64c731042d22e8 SHA512 31265e85574cf330339d10c789d06ed0a0ff25aaa30c8ad5f2d39db3d3b40bf5b2001ff78f1e1622058d03f3a7203d2043d2a553adf6d8fe3337c44a4f605d2e
 EBUILD ImageHash-3.4.ebuild 681 BLAKE2B 7af31a04e155f3437c54b135c55f09fb97e4e62d75c0b8c317357e2006cc46f3c1dc1a152d1982b28943a0fd444d6abbf71c0a65d55a50470b2a8e043058288d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4
 EBUILD ImageHash-3.7.ebuild 681 BLAKE2B 7af31a04e155f3437c54b135c55f09fb97e4e62d75c0b8c317357e2006cc46f3c1dc1a152d1982b28943a0fd444d6abbf71c0a65d55a50470b2a8e043058288d SHA512 0212aae2cd9aa0c45bbcd0993acd4a90101a51f4392ef7f1cbc36bf99f98db11f069a6cd41dddcd5cf01e36eaa0cbf7caa3797ec07404cf22ab7feaa8f8a67a4
+EBUILD ImageHash-4.0.ebuild 681 BLAKE2B 5bab586e088313993f5e0e98eca0efae3a9db150331d5c24a7f3aa4f1e054cec66f35a4c0a9748cc26e57c94e245bad3b85c8479eb0444c2edc76015e50bd13e SHA512 2adcd962c15b911943f615d1db2b93e0a473d1cbf59423902343a4547640ebfead00c39e9b113d8baf278d93d92558db029ea2fed446c18845891808d4d9afc7
 MISC metadata.xml 706 BLAKE2B ab0d81756c67a0937dc22a79c3bcb3ccbd0f90362ba3dd3a41c96ad92ba3861cd8b08dea737781be5aba843928018cc8853f45580a1d8385e771f38146bb0d0a SHA512 289175e72c831818e13e1011c2a4908b6bb60ae5f2cdb91b81765f4386215283648694a7ef1f293dd91f11f9b5177156de9617cb081f1e31d42e6c1ff3f5ddf5
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e95ba7f763bb..34fca316363a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index adb51b08a9ba..5deb69972fbe 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +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
 EBUILD boto3-1.4.7.ebuild 1413 BLAKE2B b9305754545fc6818476a70e19ea68883c01f9ff56613616836d5950b96ed2c15cdfb84657a4e38e6d168c3f3704bbbc8d58eded87d673ae3075d97527cbc047 SHA512 57902ff38cc3bc44cbcbcd83a9265fe360bed5992a27367f3e5ab00fce7ce0e469fb41db6c65d593ab070c57d3f86f56338adca5a04d4febd81927fa57c26b07
-EBUILD boto3-1.5.6.ebuild 1455 BLAKE2B a4445778c823e61281bace7993541b87ec67fdd5231db189bcff104387f767cda5463a677af612d5fedbabae5d14f38a4651d012338aeefa58ac9798b25a2a49 SHA512 7f7a357e5715d36430390de0cab4ba204a11356cc41c7f10c55cec19444f9eb72b5623672546cd663d027fff61acbad7d958cbc4ea16e781a8091440526fc8af
-EBUILD boto3-9999.ebuild 1455 BLAKE2B a4445778c823e61281bace7993541b87ec67fdd5231db189bcff104387f767cda5463a677af612d5fedbabae5d14f38a4651d012338aeefa58ac9798b25a2a49 SHA512 7f7a357e5715d36430390de0cab4ba204a11356cc41c7f10c55cec19444f9eb72b5623672546cd663d027fff61acbad7d958cbc4ea16e781a8091440526fc8af
+EBUILD boto3-1.5.27.ebuild 1455 BLAKE2B 71c83536723d8a49bf281b785930b1e46604f24bf685ae7d3949732043378e3348f33cdda1660829770a8d6453851d98da44dc6103ee4858874a32113506d6f7 SHA512 0c07862026f373fc7378d92347a80e2130807cafa05e0d60fc2fbcb22761b7fe6dd96e7a187085a687ce79a2e5c4a6fb9afe8ffbea7e49b88510904a9d30cb9b
+EBUILD boto3-1.5.6.ebuild 1462 BLAKE2B b8d8823f63c92d74f94dd291eff7a321c66fc66fe5394138916819799274c10938397f39b1a2ba128ae5b85e940fe11ed0a8926768602217a3b6b4610ca6edb8 SHA512 7b7825edacd6f96522f8a93a924cec93ec56312b863b062cdcefb146f0f742d4ca0f46bcd9d274e01ad140ec6262de64789bc7ca5e3c51a4f96c587ffe70a368
+EBUILD boto3-9999.ebuild 1455 BLAKE2B 71c83536723d8a49bf281b785930b1e46604f24bf685ae7d3949732043378e3348f33cdda1660829770a8d6453851d98da44dc6103ee4858874a32113506d6f7 SHA512 0c07862026f373fc7378d92347a80e2130807cafa05e0d60fc2fbcb22761b7fe6dd96e7a187085a687ce79a2e5c4a6fb9afe8ffbea7e49b88510904a9d30cb9b
 MISC metadata.xml 433 BLAKE2B a94a845e402ed0f6d4e9756babc64f07bd3d1c8600198f6fb77a6fc36a593904baa5cfbb833607cfdc74551b6429c05ad6e7b9947373b05a9fef43df6abb55f5 SHA512 b85e30e557a6bc3432c4bfb53e882f6652de9a68ec1e2ca157bfe27234e2c79f9a68195234e0dc631e3ee19a5331e547af40d09ea1d3acd095bf35eb108af3d5
diff --git a/dev-python/boto3/boto3-1.5.27.ebuild b/dev-python/boto3/boto3-1.5.27.ebuild
new file mode 100644
index 000000000000..76025bdf9594
--- /dev/null
+++ b/dev-python/boto3/boto3-1.5.27.ebuild
@@ -0,0 +1,57 @@
+# 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[${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.5.6.ebuild b/dev-python/boto3/boto3-1.5.6.ebuild
index 837af95fa1ea..26a90923fb50 100644
--- a/dev-python/boto3/boto3-1.5.6.ebuild
+++ b/dev-python/boto3/boto3-1.5.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=6
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/boto3/boto3-9999.ebuild b/dev-python/boto3/boto3-9999.ebuild
index 837af95fa1ea..76025bdf9594 100644
--- a/dev-python/boto3/boto3-9999.ebuild
+++ b/dev-python/boto3/boto3-9999.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
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
@@ -37,7 +37,7 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5787b2388bd8..beb3685a48f2 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,7 +1,9 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 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
 EBUILD botocore-1.7.39.ebuild 1344 BLAKE2B 1f0cfff06a615aa3abb56213721dba88a548bb336715e21b67f1d4f367b2bfbcc7c1a5415123fc8b392a9828cb49d1f97defb7f89620e89aef0088845223b425 SHA512 d6b49f170d12c9611f292cd1370d7506bd95eb1f88d0ae0a44111c81619393e00456eebe7de733de1bf988bd43eeced819554fcaac5f89cedad14d6a55cdc40f
 EBUILD botocore-1.8.20.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
-EBUILD botocore-9999.ebuild 1657 BLAKE2B 49261ffee6158f3190bd20d082d7ede51c7de729e356fe53006dc45b052f9af96af9bbc3e7bac4ca043d893bf09fce1c96992c455ed0c328e0aa754ad0110450 SHA512 14b32b5eeb5a9fb83533079ab544a7826f39dc094b2d4ac692ab53d063aa50ca1c42a24a84598f7f80c39f4d0757d5470d849666bf361fd7adb40df0553c4b5e
+EBUILD botocore-1.8.41.ebuild 1692 BLAKE2B a7cda1633d5c83f637419604d5b3ee9c9da56663640ca79f99f65da19b271b5747ccaddc919c3799847c66458edbffb06329a65f2281640a2ae6f419bcf29745 SHA512 a02b119bd798d24b5b5f2f0e376145883f8926d086a1ed96e615445913cfbce5724458cb67d2263414fd68793218ed5e628ea7d394c54615ea611adbca3c5f75
+EBUILD botocore-9999.ebuild 1692 BLAKE2B a7cda1633d5c83f637419604d5b3ee9c9da56663640ca79f99f65da19b271b5747ccaddc919c3799847c66458edbffb06329a65f2281640a2ae6f419bcf29745 SHA512 a02b119bd798d24b5b5f2f0e376145883f8926d086a1ed96e615445913cfbce5724458cb67d2263414fd68793218ed5e628ea7d394c54615ea611adbca3c5f75
 MISC metadata.xml 482 BLAKE2B 32f49cb53c6116989ba95b90ce5e6967b870e6fbce0125597f81a97d119b0d0206458e9683f3714f8708bad8b8e3a17bdfae49ed737ce9e8ddab37cedb19ad74 SHA512 bd927bf8ede2a9746b2d91f84e98d9678641662a23a7d43fbc804b4b54fe4adde8efe742d129cbc35e7d33f05dbc5e66d9d03b4268b11902c74aff8be6da9a59
diff --git a/dev-python/botocore/botocore-1.8.41.ebuild b/dev-python/botocore/botocore-1.8.41.ebuild
new file mode 100644
index 000000000000..89ab97de7bc5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.8.41.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 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[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${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 7f976cb95e55..89ab97de7bc5 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.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
@@ -37,8 +37,9 @@ DEPEND="
 	)
 	test? (
 		${RDEPEND}
-		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/bpython/Manifest b/dev-python/bpython/Manifest
index 71bf220f8ffc..1f2a36bd5c9b 100644
--- a/dev-python/bpython/Manifest
+++ b/dev-python/bpython/Manifest
@@ -1,6 +1,8 @@
 DIST bpython-0.16.tar.gz 201898 BLAKE2B 907f6a506d2b52db01e7b84c615574a7daad36f630646a345c963e432cc394330339390b6afc2585845b19d6c00d9c0b95e06b9d3b0fe85fe20daad3f5cf208a SHA512 1173d720aa679e4a6079c7febd36abbffa901604c99c6d1ce1e940a8fbcf8a4ba7bc526de0ef5290e3859a4384d1cd5cbef62fd9f056ddcb545b64d69d103a5b
+DIST bpython-0.17.1.tar.gz 213638 BLAKE2B 42530a38f8cf714a0415957a46374b83ad14dfab89a76317507763c2f83b3dbc8f71c7cc967ec353fabd38b6631130d34df99c0d53f3728fa2390d4a6f64b25d SHA512 5b5e861646df90510db75520dff9533b71501d35b7af1d152adf2c929b171fa6a2b1c0a6b7eda0311f9315703db161c6a78698a6cd434e5321464d6d1c033e4e
 DIST bpython-0.17.tar.gz 214230 BLAKE2B dc26de037eb5698c04afb74472fe9483e1398f4f40b7da21520f2e7e2ba6e510bcbf200938d520d95b976a6fbeb31af7b1b1f828a022835edbe40d381c82797d SHA512 17c25f4ed69eb7cff27ba0a488434623a7105c60bbf1e6f608c91babf240741ab7a7097ad347f897cd5f39f2fedb944fd69d8dbfbc66da6b910e1a14ace6fd1f
 EBUILD bpython-0.16-r1.ebuild 1487 BLAKE2B 0f53fba5e2f027ebda8071aaab20bee2ee93d40630d57d591f6b4a6479bb2475b57664e99a8a7c87849400a303260b9aeb7ebd7ec0342a3d847e2e0675b695d4 SHA512 21e61a4b6d34837c71b40b3248d48c37a547f966d28f429ae6742c173589808afc27b28441287e0c40312bab5a3a56fec25223de70ceb9d949f49c544bed0563
 EBUILD bpython-0.16.ebuild 1483 BLAKE2B 25d5ab30d26946e42d2cf2345af7b37a9dc8d63267fe23d6fcdb977c3fce5d714eb7665f438c001b2bcfa877effda64d2f33179c20b7144570fe5ee83b8e4f13 SHA512 cd22c5d6ad08bc534255b5a58d9593fa75505b4b05064b520cb6653ff224a56e76e0e2bf37f55de4ea2254d2dbbf744a90b40f02c82978393feece634217bcab
+EBUILD bpython-0.17.1.ebuild 1487 BLAKE2B 8033a7c64ed187d0324d9f50452d1941c69a8b839b20b310412cbff7d9cec6c4a9e226d9f9023e85decdfcabb4f3788d242b8bd6836f1e33e3389616bcbdfd81 SHA512 e78faad5793a9f8b9aaa1be1ef27bc4ca94aa1d88dc727087edc59e3e7083c3a52948902b5c6c97784a0841fa115366c0d73e41fa729eca07c5ad5aebff18cb9
 EBUILD bpython-0.17.ebuild 1487 BLAKE2B 8033a7c64ed187d0324d9f50452d1941c69a8b839b20b310412cbff7d9cec6c4a9e226d9f9023e85decdfcabb4f3788d242b8bd6836f1e33e3389616bcbdfd81 SHA512 e78faad5793a9f8b9aaa1be1ef27bc4ca94aa1d88dc727087edc59e3e7083c3a52948902b5c6c97784a0841fa115366c0d73e41fa729eca07c5ad5aebff18cb9
 MISC metadata.xml 636 BLAKE2B 8a0306ee698c4f53a67ea4662791444115ba8e0cd14294614b7ff1dc6ddc28023897e3e3c4d4f0e8f8920c8fe6298ef8b866ead41df4871d2461f9c999e6c498 SHA512 84dc3ce1791ba626a1920d6ee3e5501ad6eb49528b7ba055811e1eda46a354d8e704a31b5c4ca7be5b4512f641098311ebb1c6651d889cedb6071a97a0aff9ba
diff --git a/dev-python/bpython/bpython-0.17.1.ebuild b/dev-python/bpython/bpython-0.17.1.ebuild
new file mode 100644
index 000000000000..6905eb544957
--- /dev/null
+++ b/dev-python/bpython/bpython-0.17.1.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
+
+DESCRIPTION="Syntax highlighting and autocompletion for the Python interpreter"
+HOMEPAGE="http://www.bpython-interpreter.org/ https://github.com/bpython/bpython https://pypi.python.org/pypi/bpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/curtsies-0.2.11[${PYTHON_USEDEP}]
+	dev-python/greenlet[${PYTHON_USEDEP}]
+	dev-python/jedi[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+DOCS=( AUTHORS CHANGELOG sample.theme light.theme )
+
+# Req'd for clean build by each impl
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build -b html -c doc/sphinx/source/ \
+			doc/sphinx/source/ doc/sphinx/source/html || die "docs build failed"
+	fi
+}
+
+python_test() {
+	pushd build/lib > /dev/null
+	"${PYTHON}" -m unittest discover || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/sphinx/source/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
index db9b0342cbad..27b84bf3b1d3 100644
--- a/dev-python/configshell-fb/Manifest
+++ b/dev-python/configshell-fb/Manifest
@@ -1,5 +1,3 @@
-DIST configshell-fb-1.1.22.tar.gz 34383 BLAKE2B 2b2f09308552fddc381a931e5e6e6989c8418c99df534ba9ae6ff2631c8953a6ab817a71feb0d1bfc1644fb88f115a413794e88549fe3255828696deef46a340 SHA512 be6fa988ec42014da7e33c5610c2075c04ac7024e64f1c5665a0178d1390356505d69f93d58cc43b602bd26cb4ca28d085b55feafbce90a5dfb57ab26438eea8
-DIST configshell-fb-1.1.23.tar.gz 56112 BLAKE2B 7873d5a7ac856aa3c268595063af14db312a1506abe9cd64e69745dba4cf1ebaa0bb098228100c76bed649921e0d5ec614e56631f288eb56f786eba367e3366a SHA512 f657c885889d8714817e6b726aabe13909bc74410d00cdd5aa6c6fba773da3eddfeb7c08699292406d0c1f58bb0417da41fdfeadeff8de5107c52d953bb9e468
-EBUILD configshell-fb-1.1.22.ebuild 731 BLAKE2B b0b4c52ee93046eb8bec88d8365c8580e9c828f3674dbafc461e68e1e83352ca56b383f26d8fc85522206114b3bd0cf3efc19d1ea2c8d0f68c46d8c60eff29ac SHA512 5ea64151bdde030d5704022ad73c08143642d22bd6a79326fff14e7af28ed3f5be5c381276f2a86eebb127a5d761872d5aa59a815118bf14835ca3be45018e26
-EBUILD configshell-fb-1.1.23.ebuild 604 BLAKE2B fc39bc40628d41c3c096f54cbae2b79d768d2fd9af1718b1054d9f61e187a5f2573f93c80a2653383565b7d4e9a8003a0f3edfa16c5cfb8e25751c9e2a9f1e37 SHA512 20ef1369e9c4eeae235c552fb654acfd3506c536b4bc1772c88332a36a12dd7f122f0da2caa9ba24880824e664d0f19fedd35c8715338ce3a5cbf4713edef6c0
+DIST configshell-fb-1.1.24.tar.gz 56946 BLAKE2B ddda3313bb41a346d08006f1d3c1cdc708a940ab9fb2e0042896947b89e32cca872fc8a19a392eeebbc6403f042aadcef2c78962c069e9c1ed10a2f5d4bb102f SHA512 34aabe6fa5c2f00112748e35fe3859fae09baac5ef13b9aa80e6f00908290a0d724119aa3b2ce86da8bb171c60860304e650aeb16bc678354a7464bd0b5c9b48
+EBUILD configshell-fb-1.1.24.ebuild 604 BLAKE2B 5382789cd15282e826bd891d87ddacb7619b997683a6ad78350b5bc47333695e9db2b6ac707ed15968f2d02a082250845834c09ec46996a8f3f76fecb77c9a01 SHA512 6783a060de90a9e85f6985c89f600ecb38df5022d2d0cb987c3e16cec3c50ca056e3a955d8ff2f715ef4dcdab92440ce0e5340d8c821069df4c2094ab8e02fba
 MISC metadata.xml 838 BLAKE2B c01894aaf7273e4cc585fe62e73598d371ce2b924259928afe1a0ae2c955250413150a41e2f857fd75c92e9b7106cf557f7320d8af59b5767a1382f46d619b4f SHA512 426228139c7da514e5debf7e6b393af66c78b38d3cc36135866e05e0751aed60c44ffd230e1d8a2c06cce44b173444c9f88f0a2175c6a5a96636ec730a53a5de
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild
deleted file mode 100644
index a9d5765390a5..000000000000
--- a/dev-python/configshell-fb/configshell-fb-1.1.22.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_version_separator 2 '.fb' ${PV})
-
-DESCRIPTION="A Python library for building configuration shells"
-HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
-SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	!dev-python/configshell"
-
-S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.24.ebuild
index 818f1a60a00b..16152005bc40 100644
--- a/dev-python/configshell-fb/configshell-fb-1.1.23.ebuild
+++ b/dev-python/configshell-fb/configshell-fb-1.1.24.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
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index ddac156c42c3..257d89ebbe45 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,5 +1,7 @@
 DIST dbus-python-1.2.0.tar.gz 602426 BLAKE2B 86f5ba9283256b83d268ff7c27368e587896d58f87b15aefe9d29a90530ced591a2c6814dd37b91274910ed131fe031846071311bc6cc07c11d1f9cdda9e4602 SHA512 013b23e08fa1ed43f53a756587fefbc9770f7c51e93510e555acbd77230b7200693419bba9a69680d790bbaf123f4a195afa38b3eee1143da950fee0b5130bce
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
+DIST dbus-python-1.2.6.tar.gz 778893 BLAKE2B 1587bc9b1795e5c416397468b2061c869d923aea0983e604862342b27d37b946b1fcdd3bf07a612dba30087bdc6a5fa734906188c55756edf38d50eb67b7eef6 SHA512 6f2aec81defd2528d9876ec9a83843f8767275a5d6cf1b2b7b7a094f892f552f9a7b3d7b5006465254d410e503108e10138d7dd4cb3f1a4035d7f8d58c4d0684
 EBUILD dbus-python-1.2.0-r1.ebuild 2210 BLAKE2B 0f475f5ebe65b9880a5a9807f01914f3dc366597b21d528c1642d251400710a9dcd45f0bac1cd7e1faafa4506b358bc4d723d5c87d1db05dddec74eede59fa3a SHA512 a7bd731d00b142fdd0dcc90c8c2b3e87ad4766ca4725cf10d2418b13de82e87df1931cb76fa40e1808fe0a8d1be3012e855e126f0b398f5aaa308118a67a9c0a
 EBUILD dbus-python-1.2.4.ebuild 2229 BLAKE2B 306760812025ff7684666d7d585b6c72391ac3f5bf0b3562784b0b90394950fba905033bfc12d68f09136aa98178c65a704e9e125df0491a0d2fc98fe90cb3e1 SHA512 591ea483d5f3ba0dcd818b04bd2f8a6282e98e84a83e7631f75b38b06249e6b4820d40affb4990940a6d5c968dd94bb155c232fca47e65ceb63545027d467b3f
+EBUILD dbus-python-1.2.6.ebuild 2259 BLAKE2B 0a844ba8e2215dde83e8ea7286c619981aac5dbf43ce710c4832e8a99f691efc15e13c9587ce4f3166f7aa0e0916fbf199d556b87f62f063eb679b2032981c7b SHA512 65c46dae5970b6883897d8dc56ba6bd939abbb1af581dd7b9d93b9ee58ae4193ee01a294958c017a59bea6c182006220f7241e72df0455f41b39418834a7e1e5
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.6.ebuild b/dev-python/dbus-python/dbus-python-1.2.6.ebuild
new file mode 100644
index 000000000000..169ee6c62d28
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.6.ebuild
@@ -0,0 +1,90 @@
+# 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_REQ_USE="threads(+)"
+
+inherit autotools eutils python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="doc examples test"
+# API docs generated with epydoc, which is python2-only
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	doc? ( python_targets_python2_7 )"
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.108:=
+	>=sys-apps/dbus-1.8:=
+	>=dev-libs/glib-2.40
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		dev-python/docutils[python_targets_python2_7?]
+		=dev-python/epydoc-3*[python_targets_python2_7?] )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	configuring() {
+		local PYTHON_CONFIG
+		python_export PYTHON_CONFIG
+
+		# epydoc is python2-only, bug #447642
+		local apidocs=--disable-api-docs
+		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
+
+		econf \
+			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+			--disable-html-docs \
+			${apidocs} \
+			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
+			PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
+		# configure assumes that ${PYTHON}-config executable exists :/
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		default
+		[[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
+	}
+	python_foreach_impl run_in_build_dir installing
+	prune_libtool_files --modules
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3ba027ac1834..c518754bebb3 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,5 +1,7 @@
 DIST docker-py-2.4.2.tar.gz 180890 BLAKE2B 57518a0c8481fde0198100354225cd8a2908af6d3ca2690d98ad80b386ca4c688c7ccd6a34634ce04fb5ab1553b6c0dfbc75d28333a10f28de7188fe2ee7ffde SHA512 3367066b2acd96b85bef28aef00c91d752dc25b3055575b4f2f9c0b981eb4bca81a742bc6da5f97cf039cd9c7d818e3f80101997fe3a2e2c6f3a9c42fd3111c2
 DIST docker-py-2.7.0.tar.gz 196369 BLAKE2B dd181dbf32f5afda06e748cb49f15d5fc6ff4a579c64b505308ad0d96913ddc8065d165090ec2b20e1f17a4519988a5665dd7a8c7643ca53aaa4385ceecb1341 SHA512 15cf1d8949d71e472f7636ff975cbc4c5f3e18e2d193cb603ade1397a56d0c1ec239167b71be325af99105bc36590a0f0faa1ab010f36fe8baca7807ddfa191b
-EBUILD docker-py-2.4.2.ebuild 1585 BLAKE2B bc50c495e887bded0ad49dff9d3cf315eb463986811bf970dc5f1700f090c94507082596348fdd65a16e3bdbe411606f80841f504c82cfd8fbf36002afbaab7d SHA512 c9b91f286226af040062ec2be6d30e2960460b3fcf7d06ab0ce38d6364166477b638d29a3fdbf6f99ccd8085627c7fab318689d74b378c9b6acf45c9bf9071a7
-EBUILD docker-py-2.7.0.ebuild 1539 BLAKE2B 3b21eaf5ea0aabce9827d91557f387f45607a483102b2a10b9694d3718cfe7eb5ba8d31698bded9463d2875bc7afe6f8065e97e66023af8dc3036489d1cff068 SHA512 bb20cdf4d7a9111b3f12e45888084c189a632a360c71fe36865d50e6f57b1901f6a86d46b19e978e101fad92495d36dadfb1037819a90fce680a61fe07723603
+DIST docker-py-3.0.1.tar.gz 199081 BLAKE2B cb0c6a56da33b43c3f2c50bd16fb7306d08c770aee42c626a36d8fc5a0a4ff6d1851ef452e6585a587ed72ef27c4c6f45c7452ab3f0f994c959795721ef8aae1 SHA512 2d4f362c1a93b004f41d8338e801280827d646cbbd98d87c6fbab3fd443a3aa7ab43e9db7ad8197d50ee735d7d264e17991f5af7d5a2483c3630ca139ae21e19
+EBUILD docker-py-2.4.2.ebuild 1578 BLAKE2B f09a649f8ef49dbecddfdc8fa74dcb2e03bbb1aa72ec90488ec0da4f5c320c2872dda32838ba237e9c5df52cd8384a51b8f20286929b9a76511a09fdd9de3615 SHA512 98bdc785eac2b65557f3079c51d46d44ac47e1d3007bca99b4fd26d7d03b8e7826fa49646039cf659c75b7c660922af290def904bedc554b485471e78eded83e
+EBUILD docker-py-2.7.0.ebuild 1531 BLAKE2B d2d1ae4449c2379b07a0e3dd6eaee69f303d035a9d1b234359eff53bcd4ad2a40f271aff3e7e13e7e66ad49b8f7d6bd788076ece3896a8b06f5580af1f82554f SHA512 807b2a01920c4efc9ca29699ed05cc4018bc76faa343d729f627886412248e702c48e630a0fcca134f0c3c1a7b7eeb61ef8b132f920bc8260702c2ac40b7aca6
+EBUILD docker-py-3.0.1.ebuild 1539 BLAKE2B 657219c2cb376e7c78e7ee5baf47a53df484afc9c913caeec55f7f593f2036010bda43cc1b4d56893807dbcde3b1d13f02de050c20c28185cbe6f8a05117f13f SHA512 457e8b341448c5d27b6788314489acb0236be60c59916eefe5db1adc13b78c9aea7625fe7f0d3062ea51f3239e08c8399c2d14b96b44d18573257c7f22efbd4a
 MISC metadata.xml 515 BLAKE2B 4283ac75c4a68d8704d1368b1f6c953beb6cd271cca4620944e6d254e00fddb130efc1b02a707a05b17d927da792a0544d9f9c834789b334beb516a7bba2e1ac SHA512 5bd90d9576f2e9995f6c69c931236ed41deaf9f817137c29c3a7c476d12a68350e8df5f36a4021a1d6f41c534cf737575f462fc09af90ad2cba47fdb4ff0bb8c
diff --git a/dev-python/docker-py/docker-py-2.4.2.ebuild b/dev-python/docker-py/docker-py-2.4.2.ebuild
index be34ebbd5bbe..da2a393fa746 100644
--- a/dev-python/docker-py/docker-py-2.4.2.ebuild
+++ b/dev-python/docker-py/docker-py-2.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/docker-py/docker-py-2.7.0.ebuild b/dev-python/docker-py/docker-py-2.7.0.ebuild
index 009498461e88..df541cde5208 100644
--- a/dev-python/docker-py/docker-py-2.7.0.ebuild
+++ b/dev-python/docker-py/docker-py-2.7.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,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/docker-py/docker-py-3.0.1.ebuild b/dev-python/docker-py/docker-py-3.0.1.ebuild
new file mode 100644
index 000000000000..faef0a4c69fc
--- /dev/null
+++ b/dev-python/docker-py/docker-py-3.0.1.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
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/docker-pycreds-0.2.1[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/backports-ssl-match-hostname-3.5[${PYTHON_USEDEP}]' 'python2_7' 'python3_4' )
+	$(python_gen_cond_dep '>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/pytest-runner[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.1[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.4.6[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	sed -i -e "s/import pip//" -e "s/if 'docker-py'.*/if False:/" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs html || die "docs failed to build"
+		HTML_DOCS=( html/. )
+	fi
+}
+
+python_test() {
+	py.test tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest
index 56ec466d252c..416a37b70f88 100644
--- a/dev-python/dugong/Manifest
+++ b/dev-python/dugong/Manifest
@@ -1,4 +1,3 @@
-AUX dugong-3.7-test-html-escape.patch 1765 BLAKE2B b0fda0d85a1978e351e83b235d3f6866dc8193364d6ff5a77b0555a6952324d21e008af27953fb57b01cefac375b734aa0c4a88796f60588a4e1e9dda3cd727c SHA512 8a341199805baef25e4d8316e7a5f290b5e33c97b53a53f19da03eb55035feed2ba7709e3429ac69c906af86c63dbc21835c3ccef4aa713ffd09b3d1643b7f3d
 DIST dugong-3.7.1.tar.bz2 194243 BLAKE2B a7514f4b515fcd519f5c11b834d44d16cd395d9eada659dd1913bd07a9a072e19f6737a3d702d9ef2a63160eb5452f146a4b04e744610b8f51c9403a648aef9b SHA512 85c276bba85d650bf0baa6257bf0872cb2da546a23d19e0c94cc15c95721a8d9f6392db0e64b38ab2e801803e3ab7908e6a931d18736d33c87138eca35b4f27c
 EBUILD dugong-3.7.1.ebuild 778 BLAKE2B 6009fb01fa66fd5cc61370abba8decddb266daa4cc3b46e3c462bad1ddee1e952a1e7a2465f8b83c543676e184019b113a4c9fed8d8ac2ac0d820ff876422d92 SHA512 be73a4ab89970d3fcfe2b651950eadab8ca3c7fc3652acdad632bb71874cb0faa3f673678c5f6f62a9175a5c73c391635ddadf2082371bc24b4429b09caeec73
 MISC metadata.xml 386 BLAKE2B 8a2dc259255a5fe345b1f1e04b1708bc34f7c31351b01b90a856b93604fef92be88bc75f7120dac1fb4f86f9aace962729a2d91e13094e5ee59b9c464280628f SHA512 9ac2081eb11077d2d9d7318410053fca1855abc8fe288bc18de829c1874e38c649620c56e2a7eb9fe29e41bed8dcb7c3327a2203c60511ab233a58d93f542db2
diff --git a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch b/dev-python/dugong/files/dugong-3.7-test-html-escape.patch
deleted file mode 100644
index ba2ee587d0c9..000000000000
--- a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Zac Medico <zmedico@gentoo.org>
-# Date 1494468556 25200
-# Branch test-quote-html
-# Node ID b8a28438442ec12cd4067fd3240d9afc8e6998da
-# Parent  a986296769f3fc4daa0f29fe28b857f43d05634d
-Use html.escape for python3.6 compat
-
-https://bitbucket.org/nikratio/python-dugong/pull-requests/3
-
-diff --git a/test/test_dugong.py b/test/test_dugong.py
---- a/test/test_dugong.py
-+++ b/test/test_dugong.py
-@@ -24,7 +24,7 @@
- from dugong import (HTTPConnection, BodyFollowing, CaseInsensitiveDict, _join,
-                     ConnectionClosed)
- import dugong
--from http.server import BaseHTTPRequestHandler, _quote_html
-+from http.server import BaseHTTPRequestHandler
- from io import TextIOWrapper
- from base64 import b64encode
- import http.client
-@@ -34,6 +34,7 @@
- import ssl
- import re
- import os
-+import html
- import hashlib
- import threading
- import socketserver
-@@ -1163,9 +1164,12 @@
-             message = shortmsg
-         explain = longmsg
-         self.log_error("code %d, message %s", code, message)
--        # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201)
--        content = (self.error_message_format % {'code': code, 'message': _quote_html(message),
--                                               'explain': explain}).encode('utf-8', 'replace')
-+        # HTML encode to prevent Cross Site Scripting attacks (see bug #1100201)
-+        content = (self.error_message_format % {
-+            'code': code,
-+            'message': html.escape(message, quote=False),
-+            'explain': explain
-+        }).encode('utf-8', 'replace')
-         self.send_response(code, message)
-         self.send_header("Content-Type", self.error_content_type)
-         self.send_header("Content-Length", str(len(content)))
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 9f04e01ac1af..50a4919e83a8 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,5 +1,9 @@
 DIST ebuildtester-0.1.2.tar.gz 5598 BLAKE2B 5ee20592858758d769106f67558ac233a4ac2577dfb2d5ea7b892d6eb03ca00728e8f77a751d942270820235909537a987459875879d5b04fe98b816a436331a SHA512 0c2ac0547fc5b318023fc4e7cc85169f93d834433538d201c25a220c936b5315132bc0e53b76defd1082678a26da959b152f6a27172cf343d6c45811e3fd15a0
 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
 EBUILD ebuildtester-0.1.2.ebuild 510 BLAKE2B 3c113737b936f191be833436b9574f98c1983465515d574bc2d68ae86e19428fe072353a2eca937f495c4f49ddfbf2f079d0f83f5287859f17d466fe81594b66 SHA512 829b62c014a5bc172b97f26d5144f8023ae83de0ad24062e3d0829589fd6fc8e7d101272d2f1cd0f3b7f966399377a67ce934c2045b0e9b73de182e1f08fd0ad
-EBUILD ebuildtester-0.1.3.ebuild 514 BLAKE2B 07f2a2fa17fb9c4f982155b5511995e7e6e2fa671c03c58840132f9fe3d68b6f59ae4b7c06baf24aeb1595262edd1d40ed1d77e935157bb41e94f7c757f4ba55 SHA512 fbb8c7b7a4a5f4bcb0b48317cac8c9452335c04fd34fee4c2530971d4b4e4bf8be700a4d9566a4fdf04ade428b207841c8f8c36bf2dab21b6da251b667ade559
+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
 MISC metadata.xml 351 BLAKE2B 680dd90aef25bbb5e5f6d038b321c40d41f0f47f7bd9fd912ee074ea436cf934b5ba1a14908a27eaa895712462a5ff657b49702ba83686b82bc3a4fe74d372d3 SHA512 116b97de3d96c37eb2b2bb5ca22d67ba5d52659530905cb129335e1f4142cdb041de39b9391b5d29bc506f6dcbf06b32fb66b5ac9a5cda919953b2ec06a6b15c
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
index c36bac753991..7c7636b4b92d 100644
--- a/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
+++ b/dev-python/ebuildtester/ebuildtester-0.1.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3"
-HOMEPAGE="https://github.com/nicolasbock/ebuildtester"
+HOMEPAGE="http://ebuildtester.readthedocs.io/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.4.ebuild
new file mode 100644
index 000000000000..7c7636b4b92d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.4.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_{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/ebuildtester/ebuildtester-0.1.5.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.5.ebuild
new file mode 100644
index 000000000000..7c7636b4b92d
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.5.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_{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/elasticsearch-py/Manifest b/dev-python/elasticsearch-py/Manifest
index 24cb3e620dbe..246cf8f28539 100644
--- a/dev-python/elasticsearch-py/Manifest
+++ b/dev-python/elasticsearch-py/Manifest
@@ -1,10 +1,13 @@
 DIST elasticsearch-5.3.2.tar.gz 33704368 BLAKE2B 861ca6b37ee71b2a7d3b988287df88620fc88ec6961267c440d1083feadadcf036832f41446135ecb1066c51c3ddd259934562de53b2dad69220a1e4962c3e7c SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00
-DIST elasticsearch-5.6.4.tar.gz 33776770 BLAKE2B c74df8a496c30be315abfd7d1a71f7f8eb75de1a64a7ddd22ff742bd547ec38d417c1ce4002ed6c90b2716837ee0425cf87c910d9f810999e837d118268dcd66 SHA512 37730f39cf1711b6a20861370ef7aff4b48e7f90ad82cb1c8c92643179194c4dcdf0180691d8065304bf61e7f5a2fb1ed5c84c384e0b2ff7ad0dc58ac7352f47
-DIST elasticsearch-6.0.0.tar.gz 28017602 BLAKE2B cea47a17109eb5d46b1d94c3763f19923d97392c4a39a8dffb157b8ce60cf959e4680c2a54c5a9d204db64393f3f22dc52c0de94888753e817d808575ff352fd SHA512 25bb622d2fc557d8b8eded634a9b333766f7b58e701359e1bcfafee390776eb323cb7ea7a5e02e8803e25d8b1d3aabec0ec1b0cf492d0bab5689686fe440181c
+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-py-5.4.0.tar.gz 81286 BLAKE2B d15ef79ee9720b4ed67c5538c66301aba2c7a4baf9a48faef0153b76dbf780749975d664c8e9d52599077738e543d6c5113bde3748e86f239f1b92a272ea934f SHA512 9d30ffa810f495662769e6d2f2627f9ef6aa3849bc2eecd09df28c05a036b8fb15ae465914c38eeb3d854683bc150a3c56425388312bcd112bd5cc7b33ad41ae
-DIST elasticsearch-py-5.5.1.tar.gz 83543 BLAKE2B 067fbc15db359c7b58ee9b2a850ac6418415b90cd1847020a5f2379030e87e20bfdc7f90c6c062bf91fe89fa72b81385133dd03bed531fc3b03e4f7bb5ad9f97 SHA512 ac6dbbedaacc1bf3653edeab7c87885cc11682753ed8c51d82109cf24ba0b7ffb36b809eac7cfddd8c5bf37647c2d7c30a129f65748d5795459850e6fa0dd3dd
+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
 EBUILD elasticsearch-py-5.4.0.ebuild 2656 BLAKE2B ff39bd1fa8148c07781624d47b1c27765b9f8f19ced76bf6815edcc2e8be9ad4ce43d0da49e850e70d246e56f1eddd7ebff3e3e075fd0d7893c12cc9e46a4868 SHA512 5b757f21244c74c522ef2cc6533f788c031d4de915c1658645bcc87020089c196822ba6d5918ca90063f98de9d037abfcbbd737093dc436620e64ad90e4cd03f
-EBUILD elasticsearch-py-5.5.1.ebuild 2654 BLAKE2B 409849cec594d97e2da84196ef1b16f11c05beea137e533c34f0baba9ea31b7b4dd015b106ec2c739e0213bf72ab48407a3d50b55f3afe7efd0c00924e09ac15 SHA512 330d2ebd23ed98ea7f6f1eb8ec748edfc2082bd0adccf151045ee357352597661643deec454517b9074ac4b70ace527a06f70b29537fb52af8e3f6486e4de95e
-EBUILD elasticsearch-py-6.0.0.ebuild 2650 BLAKE2B 8d445beda4af18ebda5dd45a0e395d7d8f51514de8b3f8dd5e386c2652a50b78f3b418b32fa558db4f5445576175ab1292c75489839ef4d0aeb09905a5d66d18 SHA512 d02a0719265c1eade6be53321be073330ec2cd5ce9f6b6b2c6f8863e175de570ae1fc59a025c4363529a9173fde6ee79e903fc7838900cbf4ed60008fb014b87
+EBUILD elasticsearch-py-5.5.2.ebuild 2756 BLAKE2B 88cc27ab8953f922699d4109c925b05b99718ce0e496aa6277ff50cffb6c02bb8da198ceb815ad8accde3dac7f079fcefbd4c2e36a7aec3129ec2b7a6a2159fb SHA512 c9d5ee7aa70ea951f37827d3b92ff44a918e734a3a78b184c71f43175793510575fdfe46113b0293b9d7a8932ced532ce008d5e6807dea2a5ad4e6c31ebcfe00
+EBUILD elasticsearch-py-6.0.0.ebuild 2756 BLAKE2B 6dac845f2db9b7204fcbf17e70a357b0a8939d24b3fa779eb9978f1fc3edfbeafb039ed75da87d216271c161452e46780807d899403c6d3519bd30772db8290b SHA512 b8fe212ef1a44e79f4aa712118b664a80385068cb847d23970eccbacf171cd98e899da148833f434a790d55ee9dcda5ab7cb119bb581e152d79c029de2fd6a32
+EBUILD elasticsearch-py-6.1.1.ebuild 2756 BLAKE2B 4ea4b1ed0c26ac25915a281e755dc21f803b75c60798326c6e5a46b7a6277dcc32e35ff3164eaae2fd67c28ff978a7a8733fa49c5b71a099630cd180ad42b770 SHA512 37321c3206723abbeea13904bed0ce8c03524c2a404c7d6101df2b8485cc787231fb6fe67a5491dd5997f74a154a7b5fd267d873aac0e6ee7202c9b941f27b98
 MISC metadata.xml 592 BLAKE2B 3535c37456da9c7904e88e5921c6fd27bf6790178a0f847d0a302aae76e4c68889d31337383ac1d0a1dbb55d7f37bc056bced2f2de29c4d85864b881feeb3405 SHA512 752265ff356d02b2825ac2ef5e5177649cdcdd31b5a3738e3638af89a7bfef8b16fef8332e67c3ac03285318b22e455795c75d408a1abfc99068a1d4015eade0
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild
index e6383930c480..faeeca4a8d32 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-5.5.1.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-5.5.2.ebuild
@@ -1,20 +1,14 @@
-# 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} pypy )
-
-ES_VERSION="5.6.4"
+ES_VERSION="5.6.7"
 
 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
@@ -25,8 +19,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples doc test"
 
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
 RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
-	<dev-python/urllib3-1.22[${PYTHON_USEDEP}]"
+	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
@@ -40,6 +38,17 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/nosexcover[${PYTHON_USEDEP}]
 		virtual/jre:1.8 )"
 
+python_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
 # FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
@@ -85,11 +94,6 @@ python_test() {
 	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
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
index 3010af4f0e28..db922834ad26 100644
--- a/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.0.0.ebuild
@@ -4,17 +4,11 @@
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-
-ES_VERSION="6.0.0"
+ES_VERSION="6.0.1"
 
 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
@@ -25,6 +19,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples doc test"
 
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
 RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
 	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
 
@@ -40,6 +38,17 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/nosexcover[${PYTHON_USEDEP}]
 		virtual/jre:1.8 )"
 
+python_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
 # FEATURES="test -usersandbox" emerge dev-python/elasticsearch-py
 python_test() {
 	ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
@@ -85,10 +94,6 @@ python_test() {
 	pkill -F ${PID}
 }
 
-python_compile_all() {
-	emake -C docs -j1 man $(usex doc html "")
-}
-
 python_install_all() {
 	use doc && HTML_DOCS=( docs/_build/html/. )
 	use examples && dodoc -r example
diff --git a/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild b/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild
new file mode 100644
index 000000000000..cddd568301b9
--- /dev/null
+++ b/dev-python/elasticsearch-py/elasticsearch-py-6.1.1.ebuild
@@ -0,0 +1,102 @@
+# 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 )
+ES_VERSION="6.1.3"
+
+inherit distutils-r1
+
+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"
+
+# tests fail in chroot
+# https://github.com/elastic/elasticsearch/issues/12018
+RESTRICT="test"
+
+RDEPEND=">=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.23[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1-r1[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		>=dev-python/requests-2.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 )"
+
+python_prepare_all() {
+	# 643684
+	sed -i -e /urllib3/d setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C docs -j1 man $(usex doc html "")
+}
+
+# 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}" -Epath.repo=/ || die
+
+	local i
+	local es_started=0
+	for i in {1..20}; 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_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/fixtures/Manifest b/dev-python/fixtures/Manifest
index e218e18d774e..5a8381a3d55e 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,5 +1,5 @@
 DIST fixtures-1.4.0.tar.gz 50411 BLAKE2B 2dddd3ea21a4b7cf62d58563b67a99a9ead0c32b62b818818567133b72bd85d73df4399173e262683f02ee892842b6444e06896592e1968f219cffd39e6aec0e SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-1.4.0.ebuild 949 BLAKE2B 0e13a933937d9b6094ec30cf555d51aa083db4282bc879f3b89a9a9a8b0934dc00a4372cb58ff4eac3b42d5047d3302822adac2ca39fae4375b66c42f9a83f91 SHA512 481967dfa1f4b684f207c6d6d7297cf0bc41c7fad304841e3bb469c75dc68e02f2ffd90f4a439e1050adb8a41b3330358539262026a177d7e380a765d4fbc954
+EBUILD fixtures-1.4.0.ebuild 948 BLAKE2B b0859c09e359584b56648ed1afc87336fc7ffbdae910b8c59414dbf07d735056139f3869b9ecac049fcd560564d0e5dcc76217075a58eac2cb1454f00efdcaab SHA512 a6a97842f799e9c90b423e85d02d1f68f52b94f275b49fc93f395371d85bd725a3a77091f53e5df81ba778a1aa3b16dc6125ffd7ce3a0e485238b11620023e3c
 EBUILD fixtures-3.0.0.ebuild 952 BLAKE2B 29cd5be0e5c2ff27251f10a353ad68eeb7d68ad04b91e55a80a5287e7be6d838ca3d3abda32a4503c80a71e8bf5ac454f8d2abdbc06aaf136fe4fdbfb144fbe0 SHA512 28ea049e38ec7d76f41f31671676891c6c60394994579730cd0a96ed353ee78e93232a5a5ffd3b4f430f923bebedd97e43850d2c1ae59146215a31c84767c248
 MISC metadata.xml 889 BLAKE2B 4cabcada61b38bd01f30fe3f5f637abeab381b4dbac5c1f4999040afc02f22fb9ecc92930f724a26de040e1437b09a0cdcc67fc0964f92296061e0cc43b6decc SHA512 8887064dea4084b58983b19ff033b543fddaab24ee29e6b52dc4cde0941eac612fd5c7054bda842d69b900555e308f0b9bea388ee2af3ffb3eb04cf8f76a4232
diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild
index 7fa418f9b964..23ac41378893 100644
--- a/dev-python/fixtures/fixtures-1.4.0.ebuild
+++ b/dev-python/fixtures/fixtures-1.4.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=5
@@ -13,7 +13,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-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # nose not listed but provides coverage output of tests
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 925f604d1228..acb93f5dfa45 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,7 @@
 DIST fonttools-3.0.tar.gz 298992 BLAKE2B 74adad38ea49e95b19a306d7a37cdff60f9983d32f4cce0685135153f1cd9adaf1b344edff57cdb060ec085dfde41d9f096e4eb49d5789494e19e54343c55316 SHA512 d0793d4c17e077e2cd308f37680d8b2ac34502542fda5a4a20e9567dff3667c8fc3f73aff8605e2e86d5486bf9a61f3f25f1f8d20d6de610477f7f8b0c7be40e
 DIST fonttools-3.20.1.tar.gz 998249 BLAKE2B e6949d421d317cf2ddfe5d77f59b770b6a7ae97d6b3fca319ef36b81291478e66389043e1482d7685ab01a1fea31fa0d2eebb9310e7628f65dbdaf177fd0bbd7 SHA512 62945c6bb38f53d986f5637dc41273aabda53726eea9d0ae558768aab129bd4dd2c8d1632c16059b09f41a7c957a5ad310fac8669e37fa342259ccd290408cb9
 DIST fonttools-3.21.1.tar.gz 1002962 BLAKE2B c60d95b769abda7c973b5226d6ed5f23fe4ef159f7ddbdef8fcb4bda27f173f6a1856c596ef845954d4d555e3c475242bd03abfd37cfd0553ee87f86f733d1d3 SHA512 db06d84e7a2998b317a4166be328bf3e8ed1e168e623993f120c94df1e8ee35e6836b906cb53b15d3abbda7ca84ca4924b708d03b6e2fe96414d4f4007777f4f
-EBUILD fonttools-3.0.ebuild 715 BLAKE2B d975c56505f0e4259687a0a3de8b4d98d9e2d47ac732db0e7127545a73e1748bbca9a48888da2c1cd9a70d223b3a2574d8aa8b4b2e40e6e47249d95e54bfde10 SHA512 5ff43c81e6109df1cab0d27c059c85e20e6fb268b4bad6168fcd88b7a2f317b3ffd3f20ee4634e43e0deadd2cbfdf24936c0099cf4114d8944ac846ca2604822
-EBUILD fonttools-3.20.1.ebuild 789 BLAKE2B eaa309b24d56dbd3e54f4f556e9bbf5c8c9da75ff1c7f1f6c8aa7593be6c8327b819061788638de1205718dcea29633a59c10909581cb9a28156fc3163be0871 SHA512 c80dea2aa866c7bbc86e2b2577d3c7266449f73e69fa4e1ed15fbc3ff278440e88250a1aa2564902d7ec7c2309b9fee787bf6d171fbd9d304fab68fbdc61e357
-EBUILD fonttools-3.21.1.ebuild 789 BLAKE2B eaa309b24d56dbd3e54f4f556e9bbf5c8c9da75ff1c7f1f6c8aa7593be6c8327b819061788638de1205718dcea29633a59c10909581cb9a28156fc3163be0871 SHA512 c80dea2aa866c7bbc86e2b2577d3c7266449f73e69fa4e1ed15fbc3ff278440e88250a1aa2564902d7ec7c2309b9fee787bf6d171fbd9d304fab68fbdc61e357
+EBUILD fonttools-3.0.ebuild 721 BLAKE2B 795ed9214f81cb968350bddaa894c8c614faa5745531797ed6564eaf2591022e920a0773f95db80ce0896b3413e6685df8a84179da95bb7af7a94fdde2e0f97e SHA512 25263d4a9a2dc606e62e68425708ae4ba4c9b4c37f3f7c3f4a8950adb5145342ab594c5fce718797d2d4aaf56e240eb76fa8ffd3ca24281f4943030a176f3aed
+EBUILD fonttools-3.20.1.ebuild 795 BLAKE2B 16231c6206e9c0d0105607c509de4f680d3d67b78dbd6ae1b4b6a8aed7b0f0f1be2415c5e77277eceae8b5cbccbaf4866791991a519cf03c4f386b13205c5960 SHA512 6657e2931c11ffec069c4c0fc1fb0bbf11c740068639fff39125dfc77c0d531d7bea6ea8ec66f785775332a03c2bbfae8916a6db3c9e33fbcc56895f0d1c1a00
+EBUILD fonttools-3.21.1.ebuild 795 BLAKE2B 16231c6206e9c0d0105607c509de4f680d3d67b78dbd6ae1b4b6a8aed7b0f0f1be2415c5e77277eceae8b5cbccbaf4866791991a519cf03c4f386b13205c5960 SHA512 6657e2931c11ffec069c4c0fc1fb0bbf11c740068639fff39125dfc77c0d531d7bea6ea8ec66f785775332a03c2bbfae8916a6db3c9e33fbcc56895f0d1c1a00
 MISC metadata.xml 474 BLAKE2B 54300181cb1e91d9754d3a0ab96f3ef8ecf4dbfb2d57ac6d2fb2cf9727acd07fa39b45155e1109e570b498be6cc3c1c98919593620f050482a41490c6a219af3 SHA512 f683da73b5db5e132fa4eacd6de94e50e434f12a88e14b1d97585492c4c4bbe3dda1791eb7855e6b4111ecd61601da4da22c6b77305d9affdd8f9e478c140ed4
diff --git a/dev-python/fonttools/fonttools-3.0.ebuild b/dev-python/fonttools/fonttools-3.0.ebuild
index 453400fdf8d9..baa1f1be41d2 100644
--- a/dev-python/fonttools/fonttools-3.0.ebuild
+++ b/dev-python/fonttools/fonttools-3.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=5
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/behdad/fonttools/"
-SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/fonttools/fonttools-3.20.1.ebuild b/dev-python/fonttools/fonttools-3.20.1.ebuild
index 1585a70af801..f7f3da947a6c 100644
--- a/dev-python/fonttools/fonttools-3.20.1.ebuild
+++ b/dev-python/fonttools/fonttools-3.20.1.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/behdad/fonttools/"
-SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/fonttools/fonttools-3.21.1.ebuild b/dev-python/fonttools/fonttools-3.21.1.ebuild
index 1585a70af801..f7f3da947a6c 100644
--- a/dev-python/fonttools/fonttools-3.21.1.ebuild
+++ b/dev-python/fonttools/fonttools-3.21.1.ebuild
@@ -9,8 +9,8 @@ PYTHON_REQ_USE="xml(+)"
 inherit distutils-r1
 
 DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="https://github.com/behdad/fonttools/"
-SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/git-python/Manifest b/dev-python/git-python/Manifest
index db8ee54cd7bc..47f235891237 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 878 BLAKE2B 5f70d5b758456cacb9b14ccdd61247983d55d3fbd209b2bc81d41c57f8b12609c32a9d88e5dcab161feae526c94667629e9ccd39f970705418993b7e5a849314 SHA512 da8191a957788003e50595392c91c68479cdde5c6022dbf6d038f078eb532849ecb25781bdebeff283fc1e3ab2244d84ddd698bf668a282413bb5272a37b211e
+EBUILD git-python-2.1.7.ebuild 885 BLAKE2B 2b76aaa1d075a64da66dfd4efaf43da6e16ed8f93a763a6968bd37a7155e97743f4a738e9863467a6e6ac3f1d0c36bf20339c890aa5ac632eed373fb5cb88c2b SHA512 25c45a7292274ece19b6950b619e232b6de241f90c4085ba2a40e389241b5581bcd38cee32b03d95a65cf6ddd72c9738e08191fcae3a24e898a6bf50f93501c4
 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 bfa1722cf7ed..ff2076d95fa5 100644
--- a/dev-python/git-python/git-python-2.1.7.ebuild
+++ b/dev-python/git-python/git-python-2.1.7.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
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 # Tests only work with the GitPython repo
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
index 543d65f152b9..a7cc3c03d159 100644
--- a/dev-python/gitdb2/Manifest
+++ b/dev-python/gitdb2/Manifest
@@ -1,3 +1,3 @@
-DIST gitdb2-2.0.2.tar.gz 393188 BLAKE2B ccd57931b6483bc4d1f142644619f6ac0e4fb852a9a2f58f261513d10f2ed1124e4bf7413190809ede95e79c8b667edbbb084ea8d4df56574310a3c14582b4c3 SHA512 685af97dcb1f352255024b8a382255dacea00aa6312f71d2a16eab00d0204ebf6d46c90d804a4778ea0ef35eae7e5a2f5ae71c16851206fdaf27be8af59499d9
-EBUILD gitdb2-2.0.2.ebuild 1232 BLAKE2B d46119ef2bdef29e69e1c2d9839f06168238caf75a1d732b8851e5cabeaddeffdac3ae50ee7e10737423d0a43c80405a1215b6635b3940ac85e1237f6c12b9fc SHA512 a175742c8e932e8303a1e7410a9d73f616b243b12b8c360a14ec58235faec98cd3b6cac66a5a5415e91babf10251245895045ff9aa6784f2f20f1fac3c4e105e
+DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
+EBUILD gitdb2-2.0.3.ebuild 1239 BLAKE2B 53ae11be8ad5e08ea5652fa80852c778f263477704c524c30f5c8ca5a91867f7e873ce9d4882cc2a26696ede9096a01afeb59237f60b13e52f4f92d9016a4650 SHA512 959c301b90c7bd518da6d3f0ae48595fe675bd24b6451cb38de6e37fa5c9366fba7c753ecfd89dbae85b2000209f3905cccf3646be4d45db46001b6542471a45
 MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.2.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
index 4aa4893fc037..9e2c2a240f58 100644
--- a/dev-python/gitdb2/gitdb2-2.0.2.ebuild
+++ b/dev-python/gitdb2/gitdb2-2.0.3.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/grafanalib/Manifest b/dev-python/grafanalib/Manifest
new file mode 100644
index 000000000000..3ea0c943d596
--- /dev/null
+++ b/dev-python/grafanalib/Manifest
@@ -0,0 +1,3 @@
+DIST grafanalib-0.4.0.tar.gz 19957 BLAKE2B 27c7a597020ab465d2a7536676d1021472cde25a669135b1efa8b18061e3c932a0262e826f4ab05dd5f5902c620167a82c56e4f534d185d4b330dc3a7f8c0619 SHA512 f061512f89375326d0c44854a123fe4335a6265be0f71b7df4310b21031ca4cc691e5cbe21a5fe32d2e56d72e7c8075e7369674a19887b7b03c0739a39898975
+EBUILD grafanalib-0.4.0.ebuild 602 BLAKE2B 086e3922bca840afd4a36a96dec2ba067fbb148ab916f7a676d417b7da97aa357f452f9fd0af5d2f4f6b4355cebf622d0103f1388243a2c07b8a66bcd81e19dc SHA512 71884f77613c91bc85d8ba586c5f727b40a0c13d6a1a102c2a8084ae8fec3f2d4f7bca322a42b5498a6d2443da63b5d86226250c53ad285128324da027cf8d17
+MISC metadata.xml 341 BLAKE2B a737067da5bc892cd48440b2e6f53be66deb9f6c6310cb2056bbe40f39d35e1c11539d94d1b9291503a5faa60699d1cfb0797c0559f05f2de1c32f79736702f0 SHA512 d2b8ed64cbeec22f532938aa17c94e379b6a97aff993e02872b5eac578b06d877f536bdea7af553fc8d3dfc1041d98e244cfdbd407413ba03c4ec49eafe43a62
diff --git a/dev-python/grafanalib/grafanalib-0.4.0.ebuild b/dev-python/grafanalib/grafanalib-0.4.0.ebuild
new file mode 100644
index 000000000000..a5cdef174422
--- /dev/null
+++ b/dev-python/grafanalib/grafanalib-0.4.0.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=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Library for building Grafana dashboards"
+HOMEPAGE="https://github.com/weaveworks/grafanalib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	py.test || die
+}
diff --git a/dev-python/grafanalib/metadata.xml b/dev-python/grafanalib/metadata.xml
new file mode 100644
index 000000000000..bd87ee4fb98f
--- /dev/null
+++ b/dev-python/grafanalib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">weaveworks/grafanalib</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index e5b857a547fc..c238547aba4f 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -12,6 +12,6 @@ EBUILD httpretty-0.8.0-r1.ebuild 2309 BLAKE2B b10b7c394adb6c2f3a575ca5d73cced907
 EBUILD httpretty-0.8.0.ebuild 1223 BLAKE2B b868e9f107eab4720ddc9b5bf18823691f04c79492cf08534e080553657e6365911efcad3e6f5f506690f9e1bf14bdcb8aac021b802f80b586ff886405b51db7 SHA512 8f3eef3205c7ed4d1165d6c0e389a4c9aad75260330f26828cdb69de83ac4f9db0441a70801b32064c63678ebc1f20aff9863e3714c161a2e7ff5f943d605e91
 EBUILD httpretty-0.8.10.ebuild 2307 BLAKE2B fdceb19536f36f4cd51c923a4b35a6e0905221090faccbd07b95fb54471e7111adbb8e68d45572aee3c7f853959a02eaa1a7c064ce5c5e728ebc563f4869f940 SHA512 ba89125cdbd1c277ae523e6052b9cf4e94cc8c879e755c5d01e30cf074cbe612626b74f07dab7814b0f6bd0f92b625a32526b28e23ecccc05805d3ad1fe94092
 EBUILD httpretty-0.8.12.ebuild 2321 BLAKE2B 48c363fd10a9ad49081276a23490a7869c5b8faa531340af5fa58c9720a9490cd923a71f5a3fa8ac0a4e8f6e635518dbc69c0ddb76d9695f306f2a2c4ac22a53 SHA512 b283fcb17cfc8468035ab28acb5b6cb117634ea14f8557c06f3a0cc6485f87b89f17ca0bae3db6eb019a82583299f2d5c0a65b67e26b9b44964671e25ca36bfe
-EBUILD httpretty-0.8.14.ebuild 2313 BLAKE2B 72c4679d6833c273516dbceb5d5fd839e516d2f43ef0d54c49f7127ef880732c679bb5678d7a002d1217e393c3d712cf9eb8f78f973504b9f3925a23a533680f SHA512 28c889079832baac7452bb4e85f86a87f812a0c5b822c32aa882c792210a4cda06a0361113b7a37113bebdb02f79cd5f5df5d8619f500b1dd8fb2181ba6ca70d
+EBUILD httpretty-0.8.14.ebuild 2320 BLAKE2B 531224d633c62cf995a3fa3be258b96375287af3544df16bc165d8f29d92c7021ced7e026a0f358900f5450cbad3e6bbb964d998b2bd8ebfee9083b5ab3a8bd7 SHA512 3980892e50376218d848940e22b594146e1d6d2ac46d5131ecb5f39fd42cd6c788d5dcf4fd7274ee9ab3656f35ffc6b1551ad4521313cf7bf46ff929a4cafc68
 EBUILD httpretty-0.8.6.ebuild 2330 BLAKE2B ba780538d7ea4656ad5442ce0466e2dde7d1d86c532169b74f1a86f20cf4258fc141ddfac87e16fb4619352b923f52f77dbe82828a873b142fd6d50e7babde3d SHA512 fb4ea0ef4bddd1fbafde0126f91c8efc4024c267a633f0f378143e93ec3b054f93f65ec689713674351b35b43fd3b26e570d3196023c57a5a142100eed258293
 MISC metadata.xml 393 BLAKE2B 904c5889a4cb7ee65cd6e400dd7484aa3e05ff66f5fe8c4822d13aa67be4573a70dc1188304cc1f93821deb98f41fd84218d7fcac2a7fa5b29346bce51303eab SHA512 79c7b3c101043ed36490f7b543f191d79e8fc3b2d9830ea44999e7e8018e6d1fcbe73915fb2f1adff9e6110404467bb98786aa6091fdf751021a995f0ef6f483
diff --git a/dev-python/httpretty/httpretty-0.8.14.ebuild b/dev-python/httpretty/httpretty-0.8.14.ebuild
index 9c545c3eee1c..2645a4b1820d 100644
--- a/dev-python/httpretty/httpretty-0.8.14.ebuild
+++ b/dev-python/httpretty/httpretty-0.8.14.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"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
index 38b670290cdc..629ba8c0b19f 100644
--- a/dev-python/kitchen/Manifest
+++ b/dev-python/kitchen/Manifest
@@ -1,3 +1,3 @@
 DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
-EBUILD kitchen-1.2.4.ebuild 465 BLAKE2B c64f5213092e6488547e941636cc417972a81df55c27a0a429c8415685b854757bdbfa86edbdb6ae11290826847590814c6b1ca481fdbc803ff093f8535fb456 SHA512 80f102bc25825bdae53f5805270d4b9ec7e66a40171d20526fe3d3c7eed66b65b2f0140cc71e8e400e38cb739e32940bc71f66485c14fc69571fb4e55ad33d96
+EBUILD kitchen-1.2.4.ebuild 431 BLAKE2B 350d77e735a27b147e2c24bc164c34fda172be9b4c299b75b063ed00ebb815dae23ed6b328b92030cf35e6ccf45310e7650fa0ea2603465002bf72ce039d3384 SHA512 af5cfc91b6029e36a1af5d15fe5f480e05ab8413d0a03e509ad2693d95fcefe51f2c2d88bfdd9d841a3542059907b253473a56f81565e893e164dfe3f5cb7a97
 MISC metadata.xml 394 BLAKE2B 7dc512534576658b0235d756ef866ec734882a11ed3c976751b0c724cf01c9a4ac1fe828bdd63f98ea91d240eeb478f9dcba07ad3017af16cc7e53a7fb7b381a SHA512 3ed7d0541ef7bfe4a14a04c54ce9ccabc08d47c29e2cf821848f53e3d3efefdb577e8dca99e6fd063d222864312bc8f1cae627037ad6abefd5c195276872429e
diff --git a/dev-python/kitchen/kitchen-1.2.4.ebuild b/dev-python/kitchen/kitchen-1.2.4.ebuild
index 8420a55ca661..fdf3cb4498c8 100644
--- a/dev-python/kitchen/kitchen-1.2.4.ebuild
+++ b/dev-python/kitchen/kitchen-1.2.4.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A cornucopia of useful code"
-HOMEPAGE="https://fedorahosted.org/kitchen/ https://pypi.python.org/pypi/kitchen"
+HOMEPAGE="https://pypi.python.org/pypi/kitchen"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2+"
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index 7d4fb1f9e5c5..491a823e0336 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -2,5 +2,6 @@ AUX kombu-NA-tests-fix.patch 495 BLAKE2B 08c35788e488b2ae94f643850b649df379bff7c
 DIST kombu-3.0.37.tar.gz 411790 BLAKE2B 437e99beba410bd0e42b47e91b42fb8881443c8ccba454cb092adee94a94e93cb2104259b62652c423657c58f95a9969e0e966037040cc99e996e6daa7a8e2b7 SHA512 ba9bb00e23ce2d3da87eb07aacff8d63ef9879e6ca9f3fe82653cc2ee91610199fe8fc778d7c2e00df05b46130ecda0bdeceda48192b8af1fb0eca41fbb44712
 DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
 EBUILD kombu-3.0.37.ebuild 3727 BLAKE2B 5a74030b0df42b993eb11940eaeadca125802f2aa15b3958228fa40ba73080ab370ee4e0c2ca58da1ad51e311edf588e6fcf68fbee1050aa528e00294c148b57 SHA512 4d82688457a71ad8606b499a21a662495b049cba0561ca4647f730d67fe9c57e768350af90f9dd5d3e395d17d0ba52c9396c7f8f1053e3cbce17a8eb1231420a
+EBUILD kombu-4.1.0-r1.ebuild 2241 BLAKE2B 5ff47a44d0d6a623325a51728b60d8593c396660f294ea71a3396144ab0dbd9e9dc7fdf7d1b6d8e40a24387c406ac86892327078f8066d9eea62c406cbe8e0a5 SHA512 5ee7fcea8dfe8cfbdc54943d9ce3be1e67193a9ee4c9e274d89b0fd02ae51a3f863fbcf21d72bb5ecf8d48bc4cc031b3e2257bad6dc42249859386762bfcf304
 EBUILD kombu-4.1.0.ebuild 2148 BLAKE2B 36c0c8ae345ccfff8db38b2f4d4be1c0f5d64a012263ce87f45c6ddd2818d9ab1fc075f2a491cb878093976b1a33b7f89ce8da9fb5eaecba7090149655d08749 SHA512 d1ae7cc79599172007b374d324476cb52bca0e143808c637020d8f9eec1cb6d86c9ce77ed555fd499e44d010a9ead284fd100bb5112e07fb1a9bf50ce193ecb3
-MISC metadata.xml 576 BLAKE2B 05dc771ac713703f5d403483255e64d7f8df363b81856af7019c954a819d4b4fb051c5250a588d714d755e9785cfd0bd55502c9355aecb99171539b672072087 SHA512 9d5fccd7c511196d4c98b80dd668e4f683d52335d3eee7fa372558091d131f1305aedd4bbcaaa895fe25679bb8912a4452f3f69fbd37ea45a5780c621cc1ae9b
+MISC metadata.xml 728 BLAKE2B 4da0d6e3a26ef9e1c091806f4c57c783456e7bd45e1119e8909e4deed6bb0206e2f6f84c53eb437542a593b6f3697cdc30a741016d2c0ae47815bdd56e8c23d9 SHA512 fa21e5537b57b55de995577fcbccd530cf505b9bc37422e7caf6f471a50027100856bca0a9a132ca42dfabd26b42e16306a03e0f3c117fadd51fd28766723201
diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..08cdcdd61cc1
--- /dev/null
+++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild
@@ -0,0 +1,77 @@
+# 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="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.python.org/pypi/kombu https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples mongodb msgpack redis sqs test yaml"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1)
+RDEPEND="
+	>=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+	<dev-python/py-amqp-3.0[${PYTHON_USEDEP}]
+	dev-python/pyro:4[${PYTHON_USEDEP}]
+	sqs? ( >=dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
+	msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
+	mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
+	redis? ( >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] )
+	yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}] )
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/couchdb-python[${PYTHON_USEDEP}]
+		>=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
+
+# kazoo is optional for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	# AttributeError: test_Etcd instance has no attribute 'patch'
+	rm t/unit/transport/test_etcd.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# Doc build misses and skips only content re librabbitmq which is not in portage
+	if use doc; then
+		emake -C docs html || die "kombu docs failed installation"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/kombu/metadata.xml b/dev-python/kombu/metadata.xml
index 7c51adae3ca3..b487c812a554 100644
--- a/dev-python/kombu/metadata.xml
+++ b/dev-python/kombu/metadata.xml
@@ -12,6 +12,9 @@
 	<use>
 		<flag name="amqplib">Enable amqplib support</flag>
 		<flag name="sqs">Enables Amazon SQS transport module for Kombu</flag>
+		<flag name="mongodb">Enables MongoDB backend</flag>
 		<flag name="msgpack">Enables MessagePack (de)serializer for Python</flag>
+		<flag name="redis">Enables Redis backend</flag>
+		<flag name="yaml">Enables yaml backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index e140841f694e..d7c9da9d7edf 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,8 +1,4 @@
-DIST libvirt-python-3.10.0.tar.gz 184402 BLAKE2B f3ae1626dc6fe2afc2eb7754f6872a6696389bc13a3e8f557c6487e83e3ef66104251910fb4841a2f8b1667cec0418b87ad5a7e9ababf76a39a0f4adaec23bc4 SHA512 bbab01d43b1d9e682c5590c1ea1454c8891f2c545b49f48220f4e79ec4b5b01ab1736242a96653256e26fdf644389c4021747117978a9ec4e1084001de9f23f9
-DIST libvirt-python-3.8.0.tar.gz 184346 BLAKE2B 453051621c0e43eb73e0734a2a2651357f363c4f61c1cd6b883841a55e6c2338721b3e116e841a47386e12c8bdb1d36aecf9b8948876256effffd5396584a555 SHA512 40fcc67bf793b298016171751f207d65d98c8fe3e04d72bf4a815aab3c2f91a624fde1e0f1a420a67f4cf330874d7dd91ae46c3118e75067030ee551957a8178
 DIST libvirt-python-4.0.0.tar.gz 185533 BLAKE2B 3f9e3483265b18025bbfc0955c2b0b8276448c41e2d85a49ebc2d42f8dcd77af25a0a11ba04fbe02dba282a946ac3f583866c5d9fcda0d56e7a5f20dc63e7f94 SHA512 3eca33bb04265323ad47a6c8cb04a6848ab2b06bf656a188c7c0a39419e6dcc5c21f16682f6c64647da432c1d7e3ddc4699d848766987baccf806d68b5937d9a
-EBUILD libvirt-python-3.10.0.ebuild 964 BLAKE2B 71ac33288178ce6dce1440f94dd11dc67e8a98aa567af9b230a62bc2936f49525a6893ff007366fdae962d106f7b4403b9f555a7134708be2d4d4b7982121f5d SHA512 5067c0583c8f3042ed13b6afb53d9aacca76305650223d318b5d82013b22bf0320069ac26efee4713376d01a75b9e2b797588d2bb5696b3815a74218c651072b
-EBUILD libvirt-python-3.8.0.ebuild 971 BLAKE2B a39cfbaf5c4d4f07ca0c0ad31963119305c21bb03588672716ee6c382ee501c45593ea0942364d7980efade1e2ac4f12badef737e02988ba566637fdce0ffaac SHA512 be12b7ea11f13b9ca7554d4c577cb82aec98008781868a8ab0f4a7d6632d48f47bc89b4702c349dd7d968a00fb647b515eb4606af35c21a5d1be6f839d25f648
-EBUILD libvirt-python-4.0.0.ebuild 964 BLAKE2B 28b03bf2c512a12d539b1e1cb15793821dd1763ff142e12bb6fece94b41f8bb29f1897c2c88479356f5de8d44ef81c3237730a1736ddfc4e3c243140c523f685 SHA512 dd0e54bab5b1a3cdd5dac84c1b9fe7f0191c9a1b388b0a2495992c798553ef10830b2a168906f9fadbab1a39e8749f486085b535fae981209214080205f2be42
+EBUILD libvirt-python-4.0.0.ebuild 971 BLAKE2B caf77d87ce352223c8c169ed840374c61109b1737c1a7d670d8246bf7d74b5577a90568769d1abfa50511293d3c4f3c3edc6b4497e4df230394adc5267031c5c SHA512 15c3b85fe89d593d0e4438fdc537bde2143fea5bae099293241ff78974df6141a730d6f9e3735593ac7b8a91301efd599a42d07699b81e166fec45e89a265690
 EBUILD libvirt-python-9999.ebuild 965 BLAKE2B 4a1ddf017be6ce4999a1c15edbfe3361e2561ada9845cd5b82e3174a7c2ec3b16de29f6e0bd572fbb251bf06ede220e3b4e1e6496e3d2e49e7bac3d1b4c4c193 SHA512 031a6875c7685b942cc444faa1a175cf44ac2700de9611920eeef03ba771c87be449b4dbdb71fbad7348cf69ba3c475516d41bed874b7f672b14b7c7d56a0156
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild
deleted file mode 100644
index c16440985c37..000000000000
--- a/dev-python/libvirt-python/libvirt-python-3.10.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 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
-}
diff --git a/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
deleted file mode 100644
index f0a6aba3d07a..000000000000
--- a/dev-python/libvirt-python/libvirt-python-3.8.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 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="amd64 x86"
-	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
-}
diff --git a/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
index 172f3dc38862..5839b78806d7 100644
--- a/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index bd0ae6cbaa4b..ccef16926128 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,4 +1,5 @@
 AUX 1.11-sphinx-pngmath.patch 361 BLAKE2B 1cc9c5d7ac8cf426656565df9afba6e4c75459550daafbaf98f4dbaa0814deb711963a3c7fee33537143e3f45bf7367b6a7c5213f72873f9ec5a47e7ebfa2807 SHA512 2db58b8f6067ccbe66bcdb3f39a80d126bd549c6838a34907b01360b5441f8b122632f1863b51142cba8688f4705697b9cd15d8fb6534ded8a9613e374edea4e
 DIST networkx-1.11.tar.gz 1315737 BLAKE2B 9f6556af1a4e23bf7fcf51fcbc753a08f2616dfe63c7b05fbe20ad7532580bf566c44ddc5db0c0d89626a17fd2029485583b513f44688e8033ca83cb36f28315 SHA512 622c93330bb5ba93a2be087f7f19963a1bb9a50dc72b6500ea8321c36aa9da19af379c5cd4bbee8bba3cb6e68a28f11ee24bbe333047f5c7d0ce0b755fd57253
+EBUILD networkx-1.11-r1.ebuild 1931 BLAKE2B 20597ec1e3661beefaff41d089f2ad720403651543b2cfc8c90f5e1a174f590f07a7147f5e7068e0fdb71c7719767ac6e5f40a5e2f471549e4a5d8c88acdbb38 SHA512 15d2d1450b10ef2429f658d5d94464f1c71ea33e0134e75dd3e9650094571abaca44ad3eeb141aa8aea1f2db3fd06f063f6d9f2e5e96a7b917476eb4aa21d8ca
 EBUILD networkx-1.11.ebuild 1912 BLAKE2B ec8ab770f6d9a19e0196a59e5fc0081333766e3db81d004a0bf9f9378e962a986d33e44170b9b1a51e52e7723c9411e1355ce68e7a6322f7cd058f61e62e4f88 SHA512 c88bdf91975f6e192eb557d1b492ba92f768e191aadfd36f1dda73ef5f420fbe9dfe91c07c0c187134a6019cfe364031670068aaac182de6f9b60e2245715a63
-MISC metadata.xml 1062 BLAKE2B 03559c285540641325a657e55b75d147085ed64c92a9f65709ac0158e662a28468892d6af1b17b286f1f2e51251f2a3462e8eacf3fd05a6b0dc3479d41ac2a06 SHA512 1db48def6b8009291d6d5235323b88f42b865e009a6cb8d9b09c6519f9a55ce71ee61904c95558ad719e35161daa15fc253f0fdad2942a6ba1ac44000ab80a30
+MISC metadata.xml 1131 BLAKE2B 59e8dfa70e76d2084bc9bf4cdaeaeee7844ed7cd58b096d840ca266b10ca5213899717f60e416f336a288ae5fcdfc764c28e3a0376388c290c42f2ca924c9f34 SHA512 d91220a26181e850a8ddb2a4cc31105bc01cac62e88ab9d76757cf0732cd680aa1568a671902790893f08508072fac160093457f3d09b670ea704d38afe49e1c
diff --git a/dev-python/networkx/metadata.xml b/dev-python/networkx/metadata.xml
index 10664d364e8f..dff6872815b0 100644
--- a/dev-python/networkx/metadata.xml
+++ b/dev-python/networkx/metadata.xml
@@ -20,4 +20,7 @@
     <remote-id type="pypi">networkx</remote-id>
     <remote-id type="github">networkx/networkx</remote-id>
   </upstream>
+  <use>
+    <flag name="scipy">Enables scipy backend</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/networkx/networkx-1.11-r1.ebuild b/dev-python/networkx/networkx-1.11-r1.ebuild
new file mode 100644
index 000000000000..e94f2e4f4840
--- /dev/null
+++ b/dev-python/networkx/networkx-1.11-r1.ebuild
@@ -0,0 +1,75 @@
+# 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 virtualx
+
+DESCRIPTION="Python tools to manipulate graphs and complex networks"
+HOMEPAGE="http://networkx.github.io/ https://github.com/networkx/networkx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples scipy test"
+
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
+
+COMMON_DEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	scipy? ( sci-libs/scipy[${PYTHON_USEDEP}] )"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' python2_7)
+		$(python_gen_cond_dep 'dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4})
+	)
+	test? (
+		${COMMON_DEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pydot[${PYTHON_USEDEP}]' -2)
+	)"
+RDEPEND="
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	examples? (
+		${COMMON_DEPEND}
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/1.11-sphinx-pngmath.patch
+)
+
+python_prepare_all() {
+	# Avoid d'loading of file objects.inv from 2 sites of python docs
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/source/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		python_setup -2
+		emake -C doc html
+	fi
+}
+
+python_test() {
+	virtx nosetests -vv || die
+}
+
+python_install_all() {
+	# Oh my.
+	rm -r "${ED}"usr/share/doc/${P} || die
+
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index 3cf22c035c5b..13d0e57fa0ad 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,4 +1,6 @@
 AUX py3.patch 699 BLAKE2B f445fb6ee3756f29aed8591583938fdd64eb192c0942e5d5373fd40e725c0316406bcf9187ca128057e11dda1da2594e7b252afd1cfabf6fc8d3429576269da3 SHA512 45072f0fdb3e95b4e7301ccaa9168dbfd11dd0dda651eb6f9dff0352010ec6619e9af3de38d03fe89c93c5794883c4f9d6dcf6bda3a21db64449f0d15b65c336
 DIST nnpy-1.4.1.tar.gz 4826 BLAKE2B 28e976fdde6580e5f0e828f4e68858ca74459899092b448f0f54f89d88cb1dc7e9df9583de76d2e9ee824909c834404cfca92d0a477bfa58573c57e9ddac0cda SHA512 26e1393fdca77cc9385eff0622f9a5b4987eeca533c57478ba873a1ea96f312a2d535fd3eaa883c47746157a9d692b4b0f6c52d51ea5b4fea5fb885cfdadc2a2
+DIST nnpy-1.4.2.tar.gz 4830 BLAKE2B 7e1e3d3ade400e96e43504e490f22e5595850d54e80d4591fa0a519a47a492aaf569d9937c4ee05fc9504c4beb5cb2ef8496a65874e64b6162087eade6762906 SHA512 b0908e3b53ac62d8a41ecadd412b2c4bff69773d5eeecc2eb72cad2667c3a14405dc1dfa6f2cdf4f81cf76b9eadbcdca5bdfa1499a2f0c3beddbacbd3e21b7d7
 EBUILD nnpy-1.4.1.ebuild 628 BLAKE2B 143dfa4c7a6e0c7304f9c02f4b89f27408b0bfdcb2bbde8b07073a155c7e1802abac9aea0a20baa29227fc994818e18e5a47699a3699da75b09d33537e2e833d SHA512 b9cabcca60b2fb5ce3de656ba9788da050b00c747a41ff63d49355e982ff4b8e70478cbac45feff219e13d1c610a145d49d3c42812be02eb2df6f572c29266b9
+EBUILD nnpy-1.4.2.ebuild 591 BLAKE2B 51257af61fbb502ee3e072761a1de5b97dba9f4d863b41eef8493518ae3461837dbd97678852ab5dab2220fca589ac8810a2cff07a264a301d0b34aa3b395683 SHA512 a42f9530e247c52be75edd734f96265255282d191190ba49506368de8ee4fc8563ab2a27b73546cbf474b6a9327779a2ae09cefe3da05b38f25cb8fcc6d6f64a
 MISC metadata.xml 432 BLAKE2B 3fa5f82774cdc03df8a39db591bc688e25401a58c302aad0230074916a7e0c97e838552f50569f0f5278d570bf8ae810d242893bf704bb10273890d1def55e5d SHA512 4831a2c1564e14be4136a2e6431a0bc5d8964fd644f13e63633090b8d962fca501bde23407cfb69672db93fcc27c14c19fbfb19fb9e2a5de8e460f014551070b
diff --git a/dev-python/nnpy/nnpy-1.4.2.ebuild b/dev-python/nnpy/nnpy-1.4.2.ebuild
new file mode 100644
index 000000000000..03f745b7b9fc
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.4.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+	dev-python/cffi:=[${PYTHON_USEDEP}]
+	dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
+}
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 04469b2fd974..7d9d45d1ac17 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.db-4.25.1.tar.gz 165509 BLAKE2B ef4994857328123cfe28fb0f0e01756901c1cdb47d54ec5db40d922c8476a934511f2d387548f8da4627a4e2f8cb89f02df5f1431ff1e97a503eae4a70ae2400 SHA512 35d648466f89b14157d269d29f88ba34e51e9afacd04c27cc651e3e5fe77d94b27bc3e02ec832e0b87650ece6308f6c7a2d3ce8f7862173b545c9146eacb5b8d
-EBUILD oslo-db-4.25.1.ebuild 2094 BLAKE2B 5c8e44685dfcca15423e5a36396902c8fbf80c52ab4f914c74b96e5eba158ea4549ffd857a2b52122dcb350d278bcce886884b917ca838c79b4689430c277272 SHA512 a178cb8805eac1a73fbf6e258d3861fedcba16a5207a875e0f840bdd3462845ffffcce482979af4730b508b0a8be3e4fe0c5f117eb1456ba612bc0d6f303d476
+EBUILD oslo-db-4.25.1-r1.ebuild 2198 BLAKE2B 769049043547e9509fd2480485ee4c0f9caeaf8aed823dde9d1498c0efb04cbdf3cb2b2ec3148eb5cc3fd0e5472293c3964b18d89062fd20f72418197c6faaae SHA512 076ba50c4a0d0e2e5420cf84418521b0fe8892bd66edeee1dc1923097864f8c6fa410574d50743e9fec884d183c33532030d02c535cac6471b96fa8c912d4ee3
 MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
diff --git a/dev-python/oslo-db/oslo-db-4.25.1.ebuild b/dev-python/oslo-db/oslo-db-4.25.1-r1.ebuild
index baf4e552024a..58f1aae1ef23 100644
--- a/dev-python/oslo-db/oslo-db-4.25.1.ebuild
+++ b/dev-python/oslo-db/oslo-db-4.25.1-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
@@ -41,7 +41,10 @@ RDEPEND="
 		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
-		dev-python/mysql-python
+		|| (
+			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}]
@@ -49,7 +52,7 @@ RDEPEND="
 		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
 	)
 	postgres? (
-		dev-python/psycopg:2
+		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}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 9c370abf6bb5..44db7e2ef59d 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -5,6 +5,6 @@ DIST paramiko-2.4.0.tar.gz 283484 BLAKE2B b0f7c99d8083aae5f70605cead265c060af299
 EBUILD paramiko-2.1.2.ebuild 1141 BLAKE2B 52ec975ac82f1921d19aa7264583a90bb081da736bafb0e0bb75e14e4b84df19d9759d10716375f659cfcf73c1a0e7a20e90d2cae240988713e215966a482cbc SHA512 db85d4e8c14a284c8f82c58a805362fb85c0bc15da075dd86e456ed4e439b35cee278574de5c8ef0496685c1d769dd103e4772f82bcecd2a8d7c691d5416101d
 EBUILD paramiko-2.2.1.ebuild 1092 BLAKE2B 8e157c06cd2964dfcebf1b01203d2f2db544a4043e5dacb94397d6259b5fc7e287142e764c7f062337d94568b91ef3276425f3348fa7db2eed597d9eb0a940f3 SHA512 697f81342eaee5a53ce0dc9dd49900c0ee8c9fa5d1a01a8b2d33165ea2b1dcaf7e429f049a586738f30b5e121e6d36471b011612e33244e77b7729dbb0a848ca
 EBUILD paramiko-2.3.1.ebuild 1333 BLAKE2B 2d9c2ae810042c06ee2eb0bc1bb1014c50e2889be8095d8a3b4f9938c66c49021f1a8acd5dbcc35e10f42ac2e760e8e994338f11feccfe0d8dd69f67919246c6 SHA512 6b1e269c54e59c653fdcb42a62e3d4f3631186d6efdfab6c807acbc5d3d8c969971a5a53b88aa154d96d6488d9edc85ae33bb65fb4cc192258d92091464625be
-EBUILD paramiko-2.4.0.ebuild 1371 BLAKE2B 2d740ba8958f161d936e476f1fbdfcd95af06830655e4407e040ebf0f747de8abeac0eea5271f39fffb53be80ff6c6d5cc2655c1c676e81df8b62052dcdb56a4 SHA512 3d8a2dd3a9f49b0163358dc9fbb1f5329a2195f4b226b5cdd7866b248c08fd957284cb76dcb8d7fe88d8cfb3592045898278bb304a434f5970531c05091e596d
+EBUILD paramiko-2.4.0.ebuild 1378 BLAKE2B fc864a94c0dc5f3f2abad4c2c8e8ed312d42e0b80b7c32a9108af1bfa62e0684216c5a5717f22cc1b15b09e7e160fbb3f513b98eee46b00c13081a20e4193d74 SHA512 143e260f4d028a030d86d08a84ff9cc591c30fd43a88c0ca9ac3f2182c618e84d1cd2252f1f2532afc743318545b61174f48e7d0e91f2e0c2a2525bdacffe95e
 EBUILD paramiko-9999.ebuild 973 BLAKE2B 8699c5195a985d92b6c00a6c5197e08926fe19dc6328b1a819ea40c0729bbaac0fd6910429ee4e214e253fe2a007af0eb66f2e86cb872ab73dfa084c17e14e79 SHA512 7cfa47309ea9696805adf419c835fcdcd45e1b4c1f8b4d2c7570eb35245060c411c84ec7db7f86486b84b2ad430f4549eb6dc171553af308d8c445784df54daa
 MISC metadata.xml 1236 BLAKE2B 5b1a6c8a5694722970f07206173fd1dec4a69d0be780ab408493c5c5ac96a058cd28ffcd3308390870244792b951e8fa76430fa3b2b081902e204055aadf4b2b SHA512 5cffe7297feb05b75be333fac0259655f6992baaa04248ccdb23f82790a0a807ecf328357207507a3b35944b7062d8a1aecb2daf5353d733646bb58d7a151529
diff --git a/dev-python/paramiko/paramiko-2.4.0.ebuild b/dev-python/paramiko/paramiko-2.4.0.ebuild
index 121705cbb58e..7e1445da7c4e 100644
--- a/dev-python/paramiko/paramiko-2.4.0.ebuild
+++ b/dev-python/paramiko/paramiko-2.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index b419d1d5519b..f0420df4741e 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -4,5 +4,5 @@ DIST protobuf-3.4.1.tar.gz 4490100 BLAKE2B e2bc1ef2ee1a0af44830b3c65a6c9e73883fe
 DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dccede417c1757828b0108fbe8c67034301f3a9cb87517430acd9838ae71bb677f4edd8b59b2418f99c15d8ea3d33591 SHA512 f25ecf772facc8efd196b7c06012ce9ec24152b2c0cde38ed2e29ecded8f534221b008e649f4cbd991436ad3436130cd2e31d51e75019d08240d518111fb4496
 EBUILD protobuf-python-3.1.0.ebuild 1299 BLAKE2B bd2effe2b42ca7613e7b205ba330a5bcd4aa2834486884d481d5c85e81d1d6d119090a5f215a97d5539a4277b8eb6513128a76533de30104c3592d0f3e8c9543 SHA512 762debb1a599e1fd75f61d17cac6afcd3813b56c543cca50c4a6c63b44c962f9aca3cda7a02b94de2bc21a130245eda91a346d2631c508aba15575347e33bfe8
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
-EBUILD protobuf-python-3.5.1.1.ebuild 1250 BLAKE2B fbf23cf9f8bb98c9d9d094e8828411457ce706f28cde10bb80ecbb4959a10e368c88af3fe585dfdb3700b374caa0bb9f46e1d3ec37877774583ce4cc6575afb2 SHA512 f5a213cbd5fcbc33479b8a77279ff56309399dcb34a58a16ae5e1e78e7c7526885a64a5df10ab05630f2554df3e56d4ce23c68719630ef4e7c89f10c3f283a8b
-MISC metadata.xml 609 BLAKE2B 788caedfdc3ee2ae24ab9f650d5bb0e0a61a3c49bc10fae0c2a4229a99eab9188ae949128c815bf40f9ea2306379dd9f76b1a72ceba06cbf5bb9481d05ffb61c SHA512 8766a0489a3233173a980c7b49b2a8024c582c06f4366f188264ba032d4df5171b14b9b68b98d911dea30e5188a6b80f04cc17cb6d074fdc46eb5588e5ce0f29
+EBUILD protobuf-python-3.5.1.1.ebuild 1249 BLAKE2B cf8be74d8b48d62ea402e5693be48928fcbdc562a3ff0360218a63854a80b995830af2b000f378b78920a75da7e003525934847d92733fc401dd48ffba1867c6 SHA512 460a92a00b948a5048db917ac706d376de759028aa90f0a914a392088369123d544a4b96a58384b7d0416d8e5734c9008ca7d6c3698e3274efab57fe56593109
+MISC metadata.xml 739 BLAKE2B 9bd0e34ef3e26c186b8d78dca05fc1ece8e2b04c3aede5a8d8cedf6f74b2993a280044307ba3e10d169bde5058eb4c01e01e217f417830825f14ad4f3615cdc0 SHA512 3b1fd88b5c06c07e200025243957851dd4512eccf8a0f5c52580d55e5e03088d4c9e478bfc13475a91e8b6eb90b0899a8479f6c94e5ed87f325f3910f0c8cadd
diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml
index 133ac2d04ea6..b9347a6d8340 100644
--- a/dev-python/protobuf-python/metadata.xml
+++ b/dev-python/protobuf-python/metadata.xml
@@ -4,6 +4,10 @@
 <maintainer type="person">
 	<email>tomboy64@sina.cn</email>
 </maintainer>
+<maintainer type="person">
+	<email>arfrever.fta@gmail.com</email>
+	<name>Arfrever Frehtes Taifersar Arahesis</name>
+</maintainer>
 <maintainer type="project">
 	<email>python@gentoo.org</email>
 	<name>Gentoo Python Project</name>
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
index cb4653d2f74b..7a50d4bb552f 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.1.1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.1.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="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index da07dc9a5294..a8700ec7db60 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -3,5 +3,5 @@ DIST PyICU-1.9.8.tar.gz 183432 BLAKE2B c2e28a123e56ea99ed90160c1bf91f6e779481929
 DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
 EBUILD pyicu-1.9.5.ebuild 1257 BLAKE2B 72b335e3842b3bf99c397f3aea2e9e4a9c84d61c9aefd82648a74a6cea3e779f92384c74ae9a62d1351cf54cea06fd628996dbdd9bdbc4143eaabb1f2b657116 SHA512 3a90ca2a55c0a0c9dc2f6de4b03b146604a3cf2343f258101c28801498215abc274807851ca6da52b21b8b5d899096c02cbc3ecc83582d3721ced65561bebee5
 EBUILD pyicu-1.9.8.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
-EBUILD pyicu-2.0.2.ebuild 807 BLAKE2B 2f934c2d50eb185e37ef969978dd34deb4f52b79874d26774c67e800c8819587c56d5409a0a02a776a1dcf48ff74a7f5cfaeaf90eaf8a602bbed488df72ae873 SHA512 61687a7c54d95143770b31b4c14e2728dc820e3a2880c25c0f9a4be0fbe60d9cbde1826148c5412e5b8941013d49bdef9c8bd5970d0cbd3fd70a63dbb9097ab0
+EBUILD pyicu-2.0.2.ebuild 805 BLAKE2B 50c8cc5a9eb124140f9a8bce4c545f512901aa52259bd110197f9575a3c440f0c10efbbef20f395851bc1268b08ca014e3a7a50148b7ab20a08da403f5928ae7 SHA512 a2a39ed9d33840ebf2db72847623ce2fc0b74909e1741c3f0cbe8a145e0989202db2b0a7f0727c82841a1f76ed0d353fb496b402226b57973d15e6981d2b6df5
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.0.2.ebuild b/dev-python/pyicu/pyicu-2.0.2.ebuild
index 4dc247fee2d4..05b6f75cebe0 100644
--- a/dev-python/pyicu/pyicu-2.0.2.ebuild
+++ b/dev-python/pyicu/pyicu-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pytest-relaxed/Manifest b/dev-python/pytest-relaxed/Manifest
index 3269c4100a1f..53a623f2565f 100644
--- a/dev-python/pytest-relaxed/Manifest
+++ b/dev-python/pytest-relaxed/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-relaxed-1.1.0.tar.gz 25942 BLAKE2B 6dd34044ec3ae0b5c85f0a76102aaeafe3dad8748c0cf34666dd3550162a2968191efb8415467259a4f072905af062aeabaaaeb475ab68d47aa8d79e3cadd3d0 SHA512 010e37c4d0c63bd00af8851bb50e52af7f8f17769be042e4941e8d8ba451920c24dfa6cdf74cd1b3ca4b3e1c71cd5e1ac34ffae855fc261cf431c212f98cbfff
-EBUILD pytest-relaxed-1.1.0.ebuild 760 BLAKE2B 8d548b7a50f5d7bfbaa7095d01a3ee2554d2155bf2314f637d3e85b206db663b108e450646a83386d83b933b7d6b7947e65fb631619b2e17238ab6b33172e8ee SHA512 243c98d5c32c02075df21aa57828d33308fa447460a66c017257bbb72465e0ecc6b95b1fa190a89426dcf427ab33c57d52cf764e1408d167ad4b35b41f471a3d
+EBUILD pytest-relaxed-1.1.0.ebuild 767 BLAKE2B fdd2f626fd53fbb31c7af11f04da808d9368a757f8f00da4732aa0aaba577b198c9982d709a3e7411636a5d21faad54e4f77c5c6bef86fdade5771729644b15e SHA512 cf21b2b43af7f102fbcfb73ce78f3f5fbe29e83502748314b3c0e95ad5d66278aec55da241ebd59ea6e784acb8d35c93e42e9367f1f7bb45f2c9e44eaa60b85e
 MISC metadata.xml 382 BLAKE2B 858b2e05190a45c6842f93638cc598f3b97b3481a361438789a2f1e4aabfd474da056d5a3396927e555d4395cd1ac13393fbb0682aa3fdc6c734b718c0451ebc SHA512 9a59cb814efe45123a5d8fc8fe8b81d068013c58fb6f4e04bd9c0267c4c5ec1f1b254770ba6f5e43a645093c84a477d903e5d981c89532732c840e2026ba40a0
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
index 5264bf4fb7f5..027870280e59 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index c7f978096d5f..54044022f37e 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,3 +1,3 @@
 DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
-EBUILD regex-2017.04.05.ebuild 1197 BLAKE2B 4cfb5d4e54f6d16805a3ba8faaa3b7dbfce58546bfbbf641bdcdea9285c97fdb11d190f389ad5691e994bcc4c84fe044787ebab89f021938b9d2370ac08ab2dd SHA512 c7839519a38b08bdfe53502befacda7c352c5c9b9bf032145b65d3c922d9d390d0c1b6afc7795068f12fb74b8ee167c40e819e930f990b11a310de1da76269ee
+EBUILD regex-2017.04.05.ebuild 1196 BLAKE2B 4e3a2d77927356ffe5b537606b35aeaa70a3ecd8cb90ae4126dac11515ff2997212dad53a40c3904da1d003d9600d93dc928b9faa8c812d05a9bbeb8815c3eb3 SHA512 7f8b73ba04b2db68fb6be1c61c2b5fb1f724605275ad963a5589af0850da6c3b21d650431d17edaea21441f3b0c9e17aecb6cf80f5bd19409486b6d13a8a86b2
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index 2d5b915acfe0..a18b33918a45 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc"
 
 DOCS=( README docs/UnicodeProperties.txt )
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 078d2260d860..2feccc4ecf4a 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.7.tar.gz 20701 BLAKE2B 234f3dc60d83e5615ae9fbbc14d063f9a993a532f5e7042144a8f5e995d44a27d88c284f7e12ff1f3f92d2440333438b3e1a0804ab43ca229305ce20ec4cb4f2 SHA512 c5fa8eb36358f7f42d12adc305031bfff7bd77e83316ad4458ed07acc6094c7d9109b95848b9296dcbc6677ce34aa59b1be8fd57dfcdc6be47eb92aeda51c518
-EBUILD rfc3987-1.3.7.ebuild 783 BLAKE2B f39116ebd0e221510531c2b9f2410105e08f2b6ad6fa3e3e9f5ba62e5422af66306e8220ca34b16dfd08e748b9fe7131e40ba8cfb66101a5572a5938ce164ee5 SHA512 b7570d2a6a6bf2ed427a48cb212398b5516e2fe809f766b57fe27de31f788941f2789ab41f334015bb8df078bc1282d987691738af40f1a749971cb84e162cf3
+EBUILD rfc3987-1.3.7.ebuild 782 BLAKE2B b7a6fecf8ed2cfec46ac337f22f57989c2154ecdbc5efc7f573d48e426170fb8077de54768883843c0464a842a792944763ccd6ca6ff1f74ce6115b6cb60a174 SHA512 1adf243c48b8f8eb5e01b62737d8c29d3aedadc8155dfdf105727841a5bd6e518505d446c91b3044af5c5419921ff9cc28d7218a6aa1e92fd22f9a4018c9ecae
 MISC metadata.xml 571 BLAKE2B c366d3c4f3cb52d43bf469e77610cb6cfdd57b82ef0f46e8f1dbc739637bae6805edf5086deb4779738be7d29c4c73f7d658050112e9f5be62debc22a735f61c SHA512 2ced33f8245fc320ca1795072d9e63b5cc910b90f368306112316dcb444ee24f292e39ff76dfb027edcaf2c7a6dbfa636414ab8f9cfe777b0a2aeed17143e8c0
diff --git a/dev-python/rfc3987/rfc3987-1.3.7.ebuild b/dev-python/rfc3987/rfc3987-1.3.7.ebuild
index c290f019fa75..b13a89e89433 100644
--- a/dev-python/rfc3987/rfc3987-1.3.7.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.7.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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="$(python_gen_cond_dep \
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index a3fce916c796..9f7ad49e0046 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,5 +1,5 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 DIST rospkg-1.1.4.tar.gz 89554 BLAKE2B b307482cc3df0f2a178dd427a37160cfdc3c407b2135a28854f3df0ff964ed57c17a8ee358a1aa90b3d735e0913bc6c3c8ea1084efdef5fd01933166e21ebac8 SHA512 1758dcbe28c18c834a60bbda2e5e6be34629b3dd4f6519f24dfa1324ff9fc59fb7d0ae9d324c002eee06ff672309627e48f97119b36601390b24a24ae196d5c5
-EBUILD rospkg-1.1.4.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e
-EBUILD rospkg-9999.ebuild 1047 BLAKE2B 5b922d621b25f784306647865bbf7eac12b03c4684c656a69a884efec91bc72f127d8faf23eb3f3c87b86aff5c61759a30a3766ad847f290a955d12cb2ddbca5 SHA512 d01620d22f53394000cffd74a8df24338b51c1c8356efc02dae3ac26e595e76a23614b2fd50f9b918e6730f1ba03072a421de47e15cb9c44c04f4c4dd5c5686e
+EBUILD rospkg-1.1.4.ebuild 1083 BLAKE2B b4348d3a98c80a9ae1b2f41f0744c3eed3351049fbea366b3d61db65dabedb98cbee69daa7703113e54dbef8f0d70bcc5f92266b7184594173e3f4abe6c9372b SHA512 0275770022f4fb93ca1d58e196f6de84ad257f51bab066753539e1fd4f1738e4551585d83ed73546db48a631d5fddae4e50be604f7c0264049c48f8deac94929
+EBUILD rospkg-9999.ebuild 1083 BLAKE2B b4348d3a98c80a9ae1b2f41f0744c3eed3351049fbea366b3d61db65dabedb98cbee69daa7703113e54dbef8f0d70bcc5f92266b7184594173e3f4abe6c9372b SHA512 0275770022f4fb93ca1d58e196f6de84ad257f51bab066753539e1fd4f1738e4551585d83ed73546db48a631d5fddae4e50be604f7c0264049c48f8deac94929
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.1.4.ebuild b/dev-python/rospkg/rospkg-1.1.4.ebuild
index a7dae07958a5..bf7619313e02 100644
--- a/dev-python/rospkg/rospkg-1.1.4.ebuild
+++ b/dev-python/rospkg/rospkg-1.1.4.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
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index a7dae07958a5..bf7619313e02 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.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
@@ -35,6 +35,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 PATCHES=( "${FILESDIR}/gentoo.patch" )
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index ddaefe776ca0..35a5606dbde4 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -3,5 +3,5 @@ DIST s3transfer-0.1.11.tar.gz 95555 BLAKE2B 404a058ad371161d2f7d44b3fdf835b6641e
 DIST s3transfer-0.1.12.tar.gz 102902 BLAKE2B d0a211985753893b714863268d41f23f9deeb6ab4e31e24ad9bac4e4e522a03d11ad4bdbb6cb4dca9eba06b63144e9e7425f852c16273d27673c9c25a195521f SHA512 1e7ce8db26bd1e9cf94f0754739b2a8caaed9b21c759627dd6ee6c265823c27534e0dc7bfe55aeacfd5fd42eb5999259bf3917d873b49cc25aea42e3095a9f9f
 EBUILD s3transfer-0.1.10.ebuild 1030 BLAKE2B 1d5fc2cee9433164f63c29ad5e2859f2ad7d49abb52540eecfdec10dc24aab9d2b6ca3ee54b89b5bbb9f192bbe37f00aec177212d46d8ca1fc4031c1fe8b28fd SHA512 adec1d6c1623fbf35dabf2080a2d48c9ed7fb5313fb7f949c85970a3594774898eba1fb87d9f329f6ded843904fa39c4d6524cfbf227a556ce956ab33e7bd81e
 EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
-EBUILD s3transfer-0.1.12.ebuild 984 BLAKE2B 6eca49d9eb2c4465836f6533e61f93679cd8b97efde3931b3d1477c706384a1edacff5390b3c1c85036720af544f279fec93e2d2770ffa4c69b8840d89510006 SHA512 15b183016f59cae94e43e01a405c91e26989e943b5a8f92064fae0fb95630928fa36432b315d56bb01a764b7782b94b2c07c860ef2da3329238099ec86a3004e
+EBUILD s3transfer-0.1.12.ebuild 991 BLAKE2B df84ae436a68c1e0c84a9b7f86f415ed75035f3221cb951b88522f82622f132d391dda88220637402aafd1c522dc7a19de9b351440e4a5e48a505154dd917513 SHA512 575dc8e1e46dbaf1f1166edd258dc38c18d39f559e32a3e7001bd5e3ccec0f6f849b2591d08132946e8c16c5decbf648502f164a53f59c017ce326bd9b105dae
 MISC metadata.xml 486 BLAKE2B cabac3d47e4bf8335754747586f4cbec0503c7d8b88925e64ea3a9d051306f2c260ae05ce7430aec3fffe7785cb5a35711199f8df8aed84903d73c52d211b528 SHA512 55132b451c617da889d3c24f7c40e41692d4a1829c3ba8f7d008cde59bd664d069788e373bb93ab668b60254054a8454cdeba2f579dc86b3b713a0762c567f06
diff --git a/dev-python/s3transfer/s3transfer-0.1.12.ebuild b/dev-python/s3transfer/s3transfer-0.1.12.ebuild
index 4e349d9a1584..fe60b291ed8a 100644
--- a/dev-python/s3transfer/s3transfer-0.1.12.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.12.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 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 29904bc4d7d6..036d6052667b 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,5 +1,5 @@
 DIST scandir-1.5.tar.gz 29351 BLAKE2B 12cd7d18515ed597d0dc68ff435a442397a23691a0ad2d11d700f28b8abba58517859808190466fb799bb51a4757c4223fad0b1426c1be19bc1cd8f4ffd2601b SHA512 e6535e92011cc2c5f888ddd083a9dc48921609fd59d9bf9a4bcd596c055dc0510d48f6d3571605bbade3bd0e232e8bae94b44b20ba935e7ffdeec268ba3d2ee4
 DIST scandir-1.6.tar.gz 29670 BLAKE2B ad8c231783c14246341cd23bd79185ee10894bb29107ba7c0bfdf51982bda99fd8ce45ea52ff42687371d56b3e6d43cf1d6cc65bdaecf43da9059e524a801e6d SHA512 d01e0551696787caded787a430eea787a69a27c725505277420fd607b3fcc892218377bb340651fd906bdeb3a57e99879df3c86aeadd2399fcbe45cb2118b9db
 EBUILD scandir-1.5.ebuild 545 BLAKE2B ca19e8deaf84cc3c3b98e8addaf02a1d025008e6d0855a01f107b0f8c87998a954e4e243e5bc9bf9d40886dda014876fb5eb8ddc38b6c178d1c33adbb5c8f47a SHA512 9900677ca6b68ce43222ba4b24eb50db03e012cc247d3f17326e73784e2de770ed079f51072aac89a342dd524009454d099122626d4694c4d7eca18a4fd67799
-EBUILD scandir-1.6.ebuild 547 BLAKE2B 1087365709587ef84c8cd7d614d71176c98e161aeec83a138a7f27b6fc380fab371dcd88b04253493c4827739043608a9004943a4c61a5aba61f185760e30dd5 SHA512 cc758553369532297087e3cbdf700d66603dfa4aabc20efb91ba282cad3da88732f4f155c470fdcbaecc612d3f4e0d4459265838c8868e57a48acee14c255db9
+EBUILD scandir-1.6.ebuild 554 BLAKE2B c0c69bbf0d16f995bc29f50fc88dc2c620076397940344d88b93c65e44c86744c5df8fa658573dca8a88e5cc7ebea787aef9eea790c6bdda972714c77dde42e0 SHA512 91a40929cc6f258bfbc7d900e32009ea5b9774ecc353494f03600a9b4a19d0a03f330c97e1e2b6db3cda4493c1e37a16e2a05fae27e91181debc93046413e701
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.6.ebuild b/dev-python/scandir/scandir-1.6.ebuild
index 536cb8ec1db7..dc46e4b8dd2a 100644
--- a/dev-python/scandir/scandir-1.6.ebuild
+++ b/dev-python/scandir/scandir-1.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=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index a64c2c0508b7..d1b23d42c7e1 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,3 +1,5 @@
 DIST scrypt-0.8.0.tar.gz 39042 BLAKE2B 305973f0093fd3f9f132c448a5155c58f7306df31912c909401cccb224b89a7458fa72a4f659c37bfb81f31daae92797624fbabf7de723bf2869eb92af333853 SHA512 2619b6af84b1bb5b9586af3a0a903baf606985357ff7db34612b032aba65e002998a727882657f19bff6c7a987125d9b2d8daebbe0ba3717f3dfa6650975e52b
+DIST scrypt-0.8.6.tar.gz 52986 BLAKE2B dbf9f28e03dbe8f37696c6d227dfc719d3952d3182ddba49fd6c2aaf34e53db4a84a412ccec1ac8c83abaa5c12c6d6bb36107cf90a60a5776b1a9f596d1f85f3 SHA512 f0f3bd61a5fcb55a1d6af5b7062202446c2c0595e88617f1e53c4ded6a9b1ab857fda9e8d153c0b3bbceee49a818dd428776522c6b0919b15096fd230b13ef60
 EBUILD scrypt-0.8.0.ebuild 613 BLAKE2B 3238d5824f5faac5741abcfc88d3b04e7a35e8f9ec3211a16af24b5bd03b2d1d59d9ae9949b7a7314ab53792a5a898acb9dcc67c125884003b61d7b78c9e90d8 SHA512 94827254f58aa4649b01ff46a8ee2266e7bc462324b06a06627e8cfa68cd317d939ad2a173a5f98faa151fc5dad2f418a3ef3376c84ad3c2953e2ba465685501
+EBUILD scrypt-0.8.6.ebuild 553 BLAKE2B ed66ad16c07f6fa054c1c224a702e256e1097734c1561d7523e215bc7a6fee34be029a1d0ec217125d5f67e4560a352bc1945b40f7447bc3d13a953c8bc8c473 SHA512 70718f0674da03f7c323b4039798b57b0af5400b8a15665449a3ce166470d3ecd4f2855bd2229158b911ab4c37e04a67575bcd7524c6dc172527438c64259d8c
 MISC metadata.xml 586 BLAKE2B a5f49db551f2768d1474c483127fb555d0015d59896d3016c4036cf19d719c4f996c31f2f3bea9bf92c0e4d8d21979dfeb917974727944c16eab40a3bd15e82f SHA512 67277df1509df252e7366080edf19500697aad8ffe6192839f61fea76391803525ca05c377e8d1f1b67d606e47fc7047b4714f55a2cc9166642329a4af4cb92c
diff --git a/dev-python/scrypt/scrypt-0.8.6.ebuild b/dev-python/scrypt/scrypt-0.8.6.ebuild
new file mode 100644
index 000000000000..97ae828ae6b8
--- /dev/null
+++ b/dev-python/scrypt/scrypt-0.8.6.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=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Bindings for the scrypt key derivation function library"
+HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+IUSE="test doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 70d3e241e427..b089e2426b98 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,6 @@
 DIST setuptools_scm-1.15.0.tar.gz 23677 BLAKE2B 72d1bb9e3bfd15157ded9a46804dc8a18bdb529268d014e5a4ba9d4a32e48cbc124cdb65ab93136a7a1b6b62a3d24e4c5775f4738db8e3e75c9c149ae9c61f9a SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 EBUILD setuptools_scm-1.15.0.ebuild 772 BLAKE2B 9bafd5038719360380e14ebc8c3b2039ba572898955047c25988cceb1817196656b4b97a79afe13eb8e49578b4c0673f6b916195a3b73e7cf1b520ad77eae099 SHA512 b41121afba5603f74e4f791620a388d228ac8b827eb7b6cfd71da714fe3ad1ae35088f718c004509aaf710c7a79251d300e8711a034bdfafb396e7fc48c1d4e7
+EBUILD setuptools_scm-1.15.6-r1.ebuild 1366 BLAKE2B 444b81e15a6360557a1d7b44a41a121970d9ed2eb60c01f809422e026e995568b192f9428404586ac402943825f486a1390ce9ae64036fbfce9d56f4a33113ad SHA512 4befbf9ca06b734a655dacc5e7976e2792711af126250632fc7707eae39e9b582d227d4a30ea2163d64e9e26dfa46d78cf67ce16b99b828da793ff5655a8c697
 EBUILD setuptools_scm-1.15.6.ebuild 828 BLAKE2B de7fb849b2fae93c8ff9d9d1a5189027520a08770d01f88e6dd59d6511abcaf23241914d91f229a288d981ad6141626e1b8d3e4a655513cde28a0d734730802b SHA512 fe5f8586a7894266f1a09df5883e5f2d80abd04a5fa7e399a324f8ab44bce5861f003211857d2b2c6b68dce28c63ba269d9517f0151ac1737c625f9af1d248a7
-MISC metadata.xml 438 BLAKE2B 10b56535d3839fec5a07d9cabc381dcc94f9ef5dc956cca1f74d29f567f5b99f0cfd068b53bb92792e4b55ec4af3109489e00d35695c6165dc4ae3af167f654b SHA512 cd0e323a85bb13cfe7ee6b3102e605e800aa93a4d4452c20b85e7f48541f5ebec23140ef7f2e3f282cf3c3e7bc6764c0efbe34eef48ad1fd722d57803d668b01
+MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/metadata.xml b/dev-python/setuptools_scm/metadata.xml
index 3aabcf579918..36c2a8fbd06e 100644
--- a/dev-python/setuptools_scm/metadata.xml
+++ b/dev-python/setuptools_scm/metadata.xml
@@ -10,4 +10,7 @@
 		<remote-id type="bitbucket">pypa/setuptools_scm</remote-id>
 		<remote-id type="github">pypa/setuptools_scm</remote-id>
 	</upstream>
+	<use>
+		<flag name="mercurial">Enables mercurial backend</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.ebuild
new file mode 100644
index 000000000000..006c5a9012f6
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6-r1.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=( python2_7 python3_{4,5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="git mercurial test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	distutils_install_for_testing
+	py.test -v -v -x -k testing/test_basic_api.py || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x -k testing/test_functions.py || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x -k testing/test_main.py || die "tests failed under ${EPYTHON}"
+	py.test -v -v -x -k testing/test_regressions.py || die "tests failed under ${EPYTHON}"
+	if use git; then
+		py.test -v -v -x -k testing/test_git.py || die "tests failed under ${EPYTHON}"
+	fi
+	if use mercurial; then
+		py.test -v -v -x -k testing/test_mercurial.py || die "tests failed under ${EPYTHON}"
+	fi
+}
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
index 29b2c0f5a2f4..193bd79c77ab 100644
--- a/dev-python/smmap2/Manifest
+++ b/dev-python/smmap2/Manifest
@@ -1,3 +1,3 @@
 DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 692 BLAKE2B f13fe44b07ec27b28c95d6d3092fd0e8c32628673a9fc7e6058b73aebfc9ee8b0f4e1efc75ec88cdd734514ce89b7e3b0de12371f5f9dce316e425965f648706 SHA512 1bdabd1ff85c4760d31b2ad567e5eb2a537f82001d59ceb283ba799d915ef3b60272667339f547ac0f2e4d376168f2d9a460e4b87d14b452f989096d39cb88f9
+EBUILD smmap2-2.0.3.ebuild 699 BLAKE2B 18dc78dd8139265cefff6e45fc907fb9dc113a9de9751547893bc62c28e6612d69469c05a293d8342b1ee83e696200f60270b8ac3b26517e46ae6dbf9bd01d2a SHA512 fdcb15408791bad791d59bb7a8f97c05a771af9351a44bfeeeb43d6a4de821be860dea528c90aa33b222ff7fd307535396894796e38bb2563d243baa7caa928f
 MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
index 27eb3c7208c4..c525924ac6d9 100644
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ b/dev-python/smmap2/smmap2-2.0.3.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
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 8473ebb3604b..af7bfc190e15 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -4,6 +4,6 @@ DIST sure-1.2.5-r1.tar.gz 52128 BLAKE2B 8370bccba9e9345030dbacd91758dc1be8d122a9
 DIST sure-1.2.5.tar.gz 19048 BLAKE2B 1bc23ec9695103e05c2ec0d8598a8f5014d41b7afbebc94e29d159bfaeb4896bdd84905cb43a4044417198a0fe41f8ec0bd0fd488c5de6dc966cc6125416079e SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135
 EBUILD sure-1.2.24.ebuild 904 BLAKE2B f774321cdf5943334e1f74786e6c0d05aa092452c10311b57d9c748a28b648f554cbf8070315122070d1c1593243056d646ebc4926e7d8aceeb90fff8b832379 SHA512 e3a8a0171dfc4730cd165356907761dc87f043c7888cb374117fd02b23a528d5df3d4dd6b49db63e912ac3a41d90476591a5b28a3387894c2a047f8018cd7d26
 EBUILD sure-1.2.3.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
-EBUILD sure-1.2.5-r1.ebuild 904 BLAKE2B 5b3f02d28199cedaecc74d96610f8619149be60c61c9086bf39c9492a37a522e703b1ccbabd62a72a12f732f02b601b0e377e874fb9a0ece8f560de6ffb68faa SHA512 ee29b6d960a543ca83f959e7f6943f14272dbcb5a5934b993c7bd532bbf6022c897aad282e30cc444604c4511f9eee7eaa57c82800c27e504acb298c8edec064
+EBUILD sure-1.2.5-r1.ebuild 906 BLAKE2B ef1734c01497ff28b23641814e9a1bc1f2ff316c2b4d8df87cb175c0d0ee21232810bf4edb7facb918bef41dc8e8fcb1040fe2082aef2becdee60e905e368e62 SHA512 21c7294cab81f0c7aa45e5ecfaab59213a397a7003c191d9ba7111e2bc980d4b26cc229af7b1bde7918f517b1e92b990a2f0cef16b760dbea6d33ac36eee4bd6
 EBUILD sure-1.2.5.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
 MISC metadata.xml 383 BLAKE2B f3ab99c675ef61738a7751379023bfc1bf11ceac4d4051385a123f89329c9ac454ee9f892d1cd61a1d8228daaa48bf7f6e1460854c7f5427c3e751b4734e52e2 SHA512 278e14f9355806a47bf91640662512576e153074ff4620cd765dc583cf0cf68e0192722d466114ab3b4e24a5f3796b41227477dfcc784c86749daa3c07b2be15
diff --git a/dev-python/sure/sure-1.2.5-r1.ebuild b/dev-python/sure/sure-1.2.5-r1.ebuild
index 68514254ce81..fa76a8a27c7e 100644
--- a/dev-python/sure/sure-1.2.5-r1.ebuild
+++ b/dev-python/sure/sure-1.2.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index a3080941fe03..4ad3ec3862b7 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,8 +1,10 @@
 DIST thunarx-python-0.3.0.tar.bz2 303035 BLAKE2B af0193a3bc97c859ba98f52c612d5af81c5b7a0d8142a8283cf2b308fa183ac57ac1a2163cd882749b6fd33e0529f20f1f9e2db2dcc1aed26cb40cd5995780fb SHA512 9be3e8b50cd668e0b63fbf54da5dec3685dde40528067b35bd1cfa87db7e037962baafce3059818a7de76101472a2b07ae209c590f2f143dbc71646e8addb28f
 DIST thunarx-python-0.4.0.tar.bz2 332620 BLAKE2B 768a2a236e12d298efb3abc86f4a339548248f5f88366ec7d956249c028474612b15c340976ac2c2ced806a89517278c70b50069d76b2eee6af6dd097789e275 SHA512 fb54f83c11857ec2236a249895954efc29446120c192b8d19794b7e8145836969f87d1efa524bfaa4c9d31ee08a2c17a57d7210ce4a3a4982780d128839d02b1
 DIST thunarx-python-0.5.0.tar.bz2 334305 BLAKE2B f62e2e7c1faf9c218398d920c1079e82c72253e9ee547892e064f85a2ddb01ac84007ef0fbf4fd7e2bd39a80f74273a96604618f0ec4238f1cb292c97a550a8d SHA512 69350fb76e972fdbf63217e7a200642088816b803e637d3d7a1a909632115f5664cfe6e6bb90b640ed947416e0a0ab2761932a0c0219ccb7bcad767e6e07e7fe
+DIST thunarx-python-0.5.1.tar.bz2 334426 BLAKE2B 59f8e625b10ceeaefffa4b6dde150c32023365e76854c6e77ae2f222b509856353c8d62de26ba4e7b967cfcce1219205923938389fd1714a420bc9e1ac2b12b2 SHA512 0c1d8f20b74a3eb87b3c2c181c6438bc059dff75afdc26cfea19dffb7efe1f14e6a880689f73afcbbcb5922312741df72018e3b9980c4a45426e7a7d4651177f
 EBUILD thunarx-python-0.3.0-r1.ebuild 945 BLAKE2B 6e21b84d4696ef1a37125ffe6faf0a99747d4a86a4e8632fd46c567240dba91500d7dfe1fc2248e454f0451cda3de091efd5551b3be7115facab3cbf5d4d9ab0 SHA512 aedb93000543f01385a0044f5c1af7b95240bb7131c6239e1297f31ef3a8d8b23c271d1011371c603c260f26b5c46eb4eb519377441f646cbbd4a187b1201781
 EBUILD thunarx-python-0.3.0-r2.ebuild 770 BLAKE2B 9fea60857af9d2a66dbfdd4ef55af839aba770f05e204a9b5aec7e8639310dda1e5a3bb8d15bfa4b3c1373b072ec05202606fa4de1e23ea9a6733f37f3e7d835 SHA512 d7127dfaa7180fedcc64734c987555d6e01ece467ab998ec472ff0d66a5e46cc83b10d3c3b85b9ce710a28ac2b7ef87f4fdd5fc92a4c054f1d868030f87f2b42
 EBUILD thunarx-python-0.4.0.ebuild 753 BLAKE2B 271f58f98f3b0487625d72e037cd5fd6470ca5fc282ad510e89e75e9fbb970101faf830c0801be1b3113e0bc7cc6b99eb07fd0d6195a267d45029e79727bc403 SHA512 c054426c2f48de127413768a92774c8da2ead3a66c111863e71b7a14853190b3af7bae4d33db26aac18e0d935bfc86c78c05392e4834f5f9ad6fee19b7997f72
 EBUILD thunarx-python-0.5.0.ebuild 725 BLAKE2B e79c7d63dafd5dead64a3f09c122a0834fd3d839cb2d31585ed166d1dea15f46c03d46aac2796c8e3ed9f39ce16bb7d51c2d8899512d9bc20932d9af110a02c0 SHA512 815c6b5b061a19b1cca054343a115644ba60736eaef2c5ff01cbdacb071c30c9b58b74422db443ef49bd30b3d6dadbd508317db32e94cf778130b9462842fe0a
+EBUILD thunarx-python-0.5.1.ebuild 725 BLAKE2B b9f2c25fafb17f96bc28a4ed02a2fae489433b0f62868a458da814c0f1c689b89e05027c7681648546e9724fd0d003484e11a0f38a4252df2b099af2eeb958b3 SHA512 e04e2170128b53c6d2ee43cc2ad46b0a3725cb164457b8197beb427a27e9c7843d4ae7c64b949525e8d53acbbe17338aa942968cd26768770d00e4fcf2a62ced
 MISC metadata.xml 357 BLAKE2B 48cf41f710ba774f8adaea9825d2b72803e19e55a76afea97cec934449c0723d7ca411ee20297652179abd621bd6bbf533aaed3ebe0d6601b13ad26840d225c9 SHA512 f707818cf1217c314e8c0a18c990f4b1e65b358e7fefe68490d59956c97aa40a2f2b0130d89a54a658dc2caea11e0c5a01f04553faab53dd32513bc299e90b58
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
new file mode 100644
index 000000000000..cd7f101ea881
--- /dev/null
+++ b/dev-python/thunarx-python/thunarx-python-0.5.1.ebuild
@@ -0,0 +1,31 @@
+# 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 python-single-r1
+
+DESCRIPTION="Python bindings for the Thunar file manager"
+HOMEPAGE="https://goodies.xfce.org/projects/bindings/thunarx-python"
+SRC_URI="mirror://xfce/src/bindings/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.20:3
+	>=dev-libs/glib-2.30:2
+	>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
+	>=xfce-base/thunar-1.7.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index f16b3af2d101..2d74da9fa722 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,3 +1,3 @@
 DIST websocket-client-0.37.0.tar.gz 194246 BLAKE2B 805482524b603fbfeb1039bcd99d761d125504a0f8d1a69766d4f586da241efd9d07ade030152fc51228a7333c97313fb98483de95808f81cfa23e7c3b0ff1d4 SHA512 b72f18c91d9a51a1943fc798601bcd9eac8b1ce807a2abb72b7cf897da30de808160645d9c7f3eaf2430e739cd0c6c01046c452f43c61af63afe7d31d801f9f7
-EBUILD websocket-client-0.37.0.ebuild 806 BLAKE2B f8673435122f802ef8287f60bea63edb7e3aedb2f40f634bdb1dd0da67743e22bbad1ab3c87337f0aff9a38349ff3930fcb0e430b20d547ee30488429f61b2ff SHA512 5812162495a2d109131b20eff43b45df754cc5a29dfa0eca1063d21056b672179ab268f0f507c12c4de80eec4fc98edd6a0af091f8938c08dd3626a845c8e3b1
+EBUILD websocket-client-0.37.0.ebuild 813 BLAKE2B 8d81381517db67bdda79dfe57ceba323705d919e4bb3ca261d678a76e30c628ae3ec818e6b43e31c36634c80c7b9b07c5bd9e9f4baa0d1eba442d6df3c21be74 SHA512 f3e7b1d8105ff0100dc27ff772cd08659714bd62f737e0dd9824e10e534b4bfe193acfc1970c3bb235a5a5cd7cf0a72884862a5fa043ade1ea33f8f7d7f561cb
 MISC metadata.xml 488 BLAKE2B 79dd23e10d557b8b6c343db7b47249d8659bfab16d8a11d8668af75a1af0f87891be3c80bba944ddc63aa986dc30a0b7d49c99341ab043c1d084a32f216e62dc SHA512 0aa0c529ae74d6fa9b95bcbc66165c283ddfffacc773d93653f6720dd744da54ad7428dca4fac2b165acd84540f56d7f0f37ed8a1486700d72fdb7716053ab20
diff --git a/dev-python/websocket-client/websocket-client-0.37.0.ebuild b/dev-python/websocket-client/websocket-client-0.37.0.ebuild
index 2d0419808c3e..112cd5b33c35 100644
--- a/dev-python/websocket-client/websocket-client-0.37.0.ebuild
+++ b/dev-python/websocket-client/websocket-client-0.37.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=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-15 16:58:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-15 16:58:00 +0000
commit	434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch)
tree	b72c523c72e764420f835ba9d63d43ffef687dcf /dev-python
parent	f78108598211053d41752a83e0345441bb9014ae (diff)