gentoo resync : 02.11.2017

25 files changed, 130 insertions, 129 deletions

diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index a2d790f65368..53e00b0530d4 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,8 +1,8 @@
 AUX bottle-0.12.8-py3.5-backport.patch 1720 SHA256 6555279b83b8dae80b38fc0c45549c1dc8e2fb367a7f6efc8e6b6dde99dd2bc8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b WHIRLPOOL 42ce896786b4f16736fc0e0ae96a7cd5a4b7ea86c5257f6bbcee1db7051d60aacb8f735e4472a1192f8b4fbf75b23f477e42187cbb252b9180296e0c68b876a8
 DIST bottle-0.12.12.tar.gz 71554 SHA256 3d4b6b0e22f67b421c273105b30d9a21fd147eaf0c1576172378ee034fbf5313 SHA512 cdba3859129680f08b8c641708fd884ccf46d404786cbf48435d752fece998a446f49799e4e05e979b967843866f3e966a35a6cac7aed3270df55fae508bae31 WHIRLPOOL 68bd9399c55409139bd93b588240a3569ff9773b30949d86b5a9bba7882dd6d824cb22883c922f3f910764c9655e0e91fb40b3c9675790a67e1b6330122ab741
 DIST bottle-0.12.13.tar.gz 70870 SHA256 39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355 SHA512 86d106eb08e0b736a85aa69871f2d1e23c1d6f71948b85718daf131002c53c000e092ffdfe5b36c60460473467a2ca2b5af19767344689ffe638245e6859a80b WHIRLPOOL 4193ca33071e0d87a430f24bf2adaf2a0b02bb576bba4483ce6ef848f91a0202d028f8982e60d3c8946abdc2230ddf63a737346e006b8880c0c5a436b67bb01a
-EBUILD bottle-0.12.12.ebuild 1398 SHA256 12856a543a7af1467d241a991850e5c1ce8400abee806d3165c92a5af078cf9c SHA512 2f188388a75f910aa83e6ca4f92629bf5dad50fc5c6354fbfb925e237345423a277d912fd72470e32ecd3bfe890b051410a637c2eb99c9e5e901a43b95c5ea61 WHIRLPOOL 3c4df50395837bc71c0093409967534c96ba19ac422d804373e66853f50380dbb34c35a691167fa00c3cff8150df50ee9486cc361afabc0ae4d9897135e7417f
-EBUILD bottle-0.12.13.ebuild 1407 SHA256 daa31ee8d03930633c055d0f01e720f77fd59f1ade8861265a8b91b104bd093a SHA512 62fcec603a3d971dcaff9fb0def085f714481f66bef950a0db8c4fcf1a53d5c309af4f7d304542a314949aafe172b7cec6eea649adfbae8ad7a97269f7082731 WHIRLPOOL 871002825906ac25a5941ea915ef9c8e8acee1ceb8deb0a3b36570dfc750966905d73d90bf5e27c967c3c4670602581304ed6dbde8044c3d582c2b73f65f421f
+EBUILD bottle-0.12.12.ebuild 1439 SHA256 45a886b2d1ffb8a6d355748d80b7f3f6b69314886312bb896e86fe7e787e3579 SHA512 704eb37c13ce91ef8673cdb4ff819b29ee2ade57411ef3cbca678c32ef41ea6e6bec5698e930b3774179b6fa982d0c06b8cd0fbab14cd16aa26915a6e1ab0255 WHIRLPOOL 78a0a95abcec3fbecefebe2632e1dd90edd2d3b1238e853ae1670b75fe1f6da7539bf3ec89ae32d9bfacd4783b53c3d6f258ba8f1eda60cff5bf346161e807dc
+EBUILD bottle-0.12.13.ebuild 1448 SHA256 8f1708d7131b30677424f1a286f3e4cf3664e877a39a1b08a7a71a6cd2e86d95 SHA512 6e91c9362fbf54f6d8c0455c10bc74f97c6611106e44a790ade96cfb102835e5fa52c5c9947a30b4c56964437efa9f16d9158149bd734ff10bab5525f6596d21 WHIRLPOOL 8804f679455036a72960bab13bf3c0ded6124d8f846f45dc4daf5e5f40eb4088437581630106be98353d86007f21bb296a38c7eb3cd649b85aceb44096c35f5d
 MISC ChangeLog 3544 SHA256 c812c1d2cd73c2dd37e451531be581b7d7fdd93752d5d361db7e53d9530936cf SHA512 b8aa16dd1b7728fcf8f99ed01cadc28c43c8438c4cc5dd37e81133b5866a572cb88b5f7a45aeafa1137dc425064494001ddfcc76ed95182d7eebddfa2b024cde WHIRLPOOL 7aef496b34adfc61c8d6dcc8d85e362d39b121a4205f8a1f48f04f06925bd5fff4f5ae48761b53e2e1c040a02ca7effd4a38480677e76297b61ae0f28dcb8f87
 MISC ChangeLog-2015 6764 SHA256 a7db6ab906b1c1eab6ed4a5e68661f0c7cb392efd580b7cb1437ddf985851695 SHA512 2091f57661d7fde150e89539beb0ee4a07270ae2ebc224a2411f99f7074deed8a9d8a40bd5397dabfd14611d5897015f584ecfc0ebf1006a9090d7beacd5d208 WHIRLPOOL ab95985e3d917b91eec50acea3997b949f5b1eb1c79ab98fb52c49fbf8cc156872c069801937d665315a003e608b5be2bec38a51adce73125f28f8e39f12814a
 MISC metadata.xml 319 SHA256 c68401be807c9c0b76131bd67a9e63009d04faa20d3311e43315ed1684353b70 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251 WHIRLPOOL 186df464fcb578f2fdb8ca9e9dae71fb30b5ce43283c25a1fc83c2b494fd713db8e3887f28c38f264b72a31f01d3a5c2b7405ec54bd93b15258c8d22c29b223a
diff --git a/dev-python/bottle/bottle-0.12.12.ebuild b/dev-python/bottle/bottle-0.12.12.ebuild
index fb49855fb507..89f3fdcd1003 100644
--- a/dev-python/bottle/bottle-0.12.12.ebuild
+++ b/dev-python/bottle/bottle-0.12.12.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="test"
 
-DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/bottle/bottle-0.12.13.ebuild b/dev-python/bottle/bottle-0.12.13.ebuild
index 9c67c5945c15..94b18fd43e9b 100644
--- a/dev-python/bottle/bottle-0.12.13.ebuild
+++ b/dev-python/bottle/bottle-0.12.13.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="test"
 
-DEPEND="test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mako[$(python_gen_usedep 'python*')] )"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 394f8a4d2ac5..4941afe87b48 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -15,6 +15,7 @@ EBUILD cryptography-2.0.2-r1.ebuild 1624 SHA256 45e6fd16917c624c317bdab445dedaef
 EBUILD cryptography-2.0.2.ebuild 1542 SHA256 07db5ba031dece262de146cc6a3d4f6e8bf17f2c4458e09def15a86326916374 SHA512 51a737cf880345dc75a7973870dba1971e8f35fba61b744bc4c352a643feedd9f342729e483383dbe4c0dd2b729d3564274bf57c77a35343143b70bffafdca1b WHIRLPOOL ebda0e16cf84820e8317f114277dcddc2edd3822100aa62646083c6fd0c7a725805c90f9b239dbda24a7f168a8b679dd43657be2e469cd252f96b7128741a674
 EBUILD cryptography-2.0.3.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
 EBUILD cryptography-2.1.1.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
+EBUILD cryptography-2.1.2-r1.ebuild 1748 SHA256 da5b11ed7397a0652930f6fb83cba4b9d77b7e85f975f52f20c7ae07ec56dbad SHA512 4fadc4dfdbd084efc7d375adf8e11b2b4cb429e26bda0ea9227298d30b1879d8e3609208afc7395af0370b072f334ac00ba7e172fa095636bda249e0e62441a1 WHIRLPOOL 321d50c048e7493cf9038482eb523fd4941168a30e708be480fd1a02872252ebf1b920e6947d1ce8c901c677f223bcc6bee46bf74223f7fd09c0484a68a1ea74
 EBUILD cryptography-2.1.2.ebuild 1646 SHA256 948a31ec4b78bc9d00a228eadb1ecaa06161704586292f310e70cbf23b711907 SHA512 7d11e6ddae039e21eb205d5b4f71e56bd0bbf57670166afb57bcea711adb360653e4337a83a826ea11d1a964153b767fe05c7a8b00f16798f581e9c2de7ae966 WHIRLPOOL d0d674f90374d32f515895ebc09e3db92c58b07e9ca8a083f90b0e624ac204a45cbcddb8dc673bfdfb0c9233d7aeaca5f2b942a1d9efb916ac50a9051a4b4cad
 MISC ChangeLog 18416 SHA256 1c2c81e70a455fcf401bb7c0d61cf38f3de9e7a2cc5ba5c18865038dfd43cea2 SHA512 b327d91034d2141d3c39cc406a0d74ff019994a92dd8f35e8b1715d5f0ba00930a15f42e601013dd7d14a81de0a30fd3b0dbf66a00a2c555f6015b8a6eea9943 WHIRLPOOL 5f09b6aa83487c428ced79af0f2c4d5d85db223f74298a1216b3cc248494f0c7f85ef98aa8461666420006fed1caf61f18679985b75998cfd4dd8ed82be8d1a0
 MISC ChangeLog-2015 8237 SHA256 c22eb0f4c94dd39980a8ce9b7d3b7149bc4ce59a7496f87c7e34951715c94e4a SHA512 b11fd6ecb95dd1265087e007ead9245b577ae76591343ed8f9bbf7c730344f0f31e3562edb87768a4a4dc3ab78a982b31bcbdae52b0060f805a7c4d0d64ec798 WHIRLPOOL 5e148ed158f1a68f8c1580c0ed5ccd3b50a6c88ce2a6228c80f5354eac95f8cfbf31ea6c2e2cc65633b1ef7332eb181efac8eaeb1a954a3004b081b3ed162286
diff --git a/dev-python/cryptography/cryptography-2.1.2-r1.ebuild b/dev-python/cryptography/cryptography-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..70a0e57999bc
--- /dev/null
+++ b/dev-python/cryptography/cryptography-2.1.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
+IUSE="libressl test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= ( || ( dev-libs/openssl:0[-bindist(-)]
+										=dev-libs/openssl-1.0.2l-r1:0
+										=dev-libs/openssl-1.1.0f-r1:0 ) ) )
+	libressl? ( dev-libs/libressl )
+	$(python_gen_cond_dep '>=dev-python/cffi-1.7:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 pypy{,3})
+	>=dev-python/idna-2.1[${PYTHON_USEDEP}]
+	>=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.9.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index a81ec68cfb7b..d36faeab2e21 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -4,12 +4,14 @@ DIST flake8-2.2.5.tar.gz 28333 SHA256 285e8bd730c0b6fdfbe23c32d2936bffba401f23ca
 DIST flake8-2.5.4.tar.gz 81663 SHA256 cc1e58179f6cf10524c7bfdd378f5536d0a61497688517791639a5ecc867492f SHA512 31cbec556fc41361ac464d2547275e319ab663c907a4a8644113a2288a9f349bcfbec85197b6dfa13a7db9e82419f01e0f2abc84a347e133c144ea137e0daa28 WHIRLPOOL 2547b78092b1a85edd2a0d03d9e0bc31e7d3b7cb3958cf5dea9947377851a69d5c37f64c0d65a5d7e88ab9573597729adbe07ae758b0510e455b26bf62292f47
 DIST flake8-3.3.0.tar.gz 134345 SHA256 b907a26dcf5580753d8f80f1be0ec1d5c45b719f7bac441120793d1a70b03f12 SHA512 53b3116765f9031c96a0442954f324fe3edaf63aff21f7cf340e47e724250928d6d9786473d2680b695969ef979a8bb6d4d2b39f1598b075dcace1b221a4c099 WHIRLPOOL 1a0f7e228cbfdde18957c43377fd5c07a280628ca75138e76ec295e5567c153e454543e534496ec9217e7ca0389208ae143c3396ca3798b65b0f2ce1d72bd68b
 DIST flake8-3.4.1.tar.gz 137066 SHA256 c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8 SHA512 42df8fa0cf6f4bb4f3e52143028dee14d51a645aef19a0bab05000fef577e5bea3cc29f961acb0c98d92b76e635fdd2f0d689e23663a6c14d435d0410be94c87 WHIRLPOOL 95be7a58b817d4a7b112104b6f561d3fd30837be6430582856aca6c56d3aff247ec2ae3f3dfc05e29c4ae5b4f0ef0a24a778b30e7813b90234c37c6956970a05
+DIST flake8-3.5.0.tar.gz 140608 SHA256 7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0 SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c WHIRLPOOL 865a76f752683c9deb1ec0470a15f1031f7ace7ab24e1f8dd54fe608607a1c3916dffb8c7c156d3478272f70f846aa51da8c395730a54c2d6810514b4ae053a4
 EBUILD flake8-2.0-r1.ebuild 711 SHA256 1a772d529b67099c41711788860a3aa2f126b746f3fd599fef5ef8beae6da92e SHA512 61c3050c3dae972cef22d5fd5a5350614eda2316c8b4fd6ddcc2f6f869430decd9dd938aa63067934bc07d21275a0e3d83e91a77e476f66d7ace8b66539d8b41 WHIRLPOOL c3f15f876384d9f20c1ebec51ac0689e4bf5450be8b289596260e8a3c047258ccec57351a201d99f87def6093b5ca90098beb5ac73cb2c7d6e4d11104a456fb3
 EBUILD flake8-2.1.0.ebuild 1073 SHA256 215ddb4fae266bd401e395a18f0885d5968c3e61ead91f0ca3dfee60361382f7 SHA512 0f7cd9b30bf9b095506af3796ce2927d2b14572a9f42e34021a205c090388ef08a6ce091aaabd19441b32e18c0d43c94cc1fd274f80e104c465d1bde88b46f1a WHIRLPOOL 280a9b18a7a6899979fc0128a70d16d7ec11fdb9053e6fe5cd74ea2e74d50e725b077609fa651c5030ade0e887291d891ae4209a56469177eeb229dc0500d816
 EBUILD flake8-2.2.5.ebuild 1102 SHA256 48038fc8a22b7f81f7059c3e5f811083c7a09d791e8ac9f267f96a20cde59f80 SHA512 0cae93c37085868960eeca63c005c2c8d0d191e3deef5e223f130c2f9ed6712002815fb4da27b239f47f41fed37d82f4172e4b31842b75aa7f00666e5176c415 WHIRLPOOL 15baac98c35ab6afbf9a15e83beb706c23b0e87a52361df8120e412fb46c989f54003747e8903f6dda75d59273af69f86e84095ae5d5ee6e0cc1706c6880e599
 EBUILD flake8-2.5.4.ebuild 1608 SHA256 29b532b1ec872a8d7d97df3b4cdb5cf30ab283082e5d7def269afc273f058297 SHA512 55f6fd53f6d4525af92cdd5bde0f6baa634f4c607583e2c9b89074964ff31a71923502d0e661c6b280d34708e1fcd2edf2474edfe894211507fe54dbb1e526d6 WHIRLPOOL 2e96562f2aaf637227c349e7ffc9ee5279cd76384100eeb6cfef416ae230718d9cf3967d0fd700f877e22b8436d70b02df181921bac8f002f7023d4b3117e1b8
 EBUILD flake8-3.3.0.ebuild 1947 SHA256 1332fcb9d66b33bca4b9869dcd6fb6d7d9c3fc296009032e142b60159b6e8008 SHA512 a3d3062f8f17a71731f5447e9cfc449e9bca98748c3e9ffa5465a5258d9dd50942484210517370ad491a9a06f8e18578d393e48487de30eb91ea262ddc95fe96 WHIRLPOOL 0c188d207ad6db2f698da24c621221b6d5b790bc6f8c4875e741afc7a38ffac53079ccf9bdbbc1aad146061aa27a2c99560fb194da9c73b804ee24dd76e3b4cb
 EBUILD flake8-3.4.1.ebuild 1625 SHA256 fbe06de5be1cddcfa480644259639febeeb8f66f0074bec5f1d49a3edb4c8ee5 SHA512 8be0c1209cc063f5350e193940e52fd0aaf10d02e505fbca281d9b333e0cace571ab3a72a6ceedf449dfbc7742ce960c52ac94b706def15a13b874322c81386b WHIRLPOOL 61e1b087bc0376c88e9c6d3944fc6bab5113422b39f879bc32bd0ad48ee11c4185d6883c83fc25a73832108217a7cc1b7e2a7cc5ca0114ea95c331a938bfbe43
+EBUILD flake8-3.5.0.ebuild 1625 SHA256 94a99613fdb28738ae5a7822d2dee48e5ae6ec3e068d2763adfbb20b39559dfc SHA512 c2279f74b8acb81ac4b1b768f4447c31e011bb165c1be42e1155fdef5a523b929ab51bd5ddedb54092f1e5a5e16bdcddbd5a9cefbdbdff79231eefc71a67c757 WHIRLPOOL 472d4ac6950ff72bacf35ddffb9312018158aa549d6a89bc48c7800697f8feded022ac6f215c2171e06902cc6e118d7e7f9a677f0ff65602aed964f435f76ba5
 MISC ChangeLog 7292 SHA256 19412e55ac37afaec863a073d332b4b84d59ccf1c35ba3198db9e4f722c2d519 SHA512 a16d2bfea0f6249d73097daa72fd9d1c56b11f52643c1aee9cdc27b376c01e14b55171673914b4ce17129f72cb5abfc78627ab72ed03e7b1e5abe8e28f1234a8 WHIRLPOOL 37b3786fbbc6536c345c75e62114449ae8dbe1f0d6c4c95a1ce1bb57c66c047818ca383fee41d68cddf4d4f07032c6e65c4e1895580e834649d3984e08067afe
 MISC ChangeLog-2015 5001 SHA256 f5ab1ff406184950cc3b39b983e11aeaf9f29c1c4b6b6cee6e80c718c5a0faef SHA512 fbb10ed85bec45fb629e0a9039e5dd24cfaadd5f65eacc4760572e9c2f07933807024b41f78e2773aa3b8f6351924a3d64e3c5170a31aec3ffdaadcfea981b90 WHIRLPOOL 394ad6662ee92de0c4f4a4f8dc6fd2309fb1efd7818e06094acd31a54ee4b0410f5c62be0b7eb8657cbd98fdb8992141c5fcab08877a0ce6d39abc850760aed7
 MISC metadata.xml 373 SHA256 c1ed6f124fb019319d592ff2518e3d745e7809d49174a83f4a0a482409ea3cb3 SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646 WHIRLPOOL b17df39fbe00cbabfaf6a9dfbb1ae4084a64ec8c930a7d1983be1f4a075baf7b66b9137a4187def5d1a052d05c161844daaa7a2876d1dba8ee41779b643e86f5
diff --git a/dev-python/flake8/flake8-3.5.0.ebuild b/dev-python/flake8/flake8-3.5.0.ebuild
new file mode 100644
index 000000000000..128100fc70ea
--- /dev/null
+++ b/dev-python/flake8/flake8-3.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.python.org/pypi/flake8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+	>=dev-python/pyflakes-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' 'python2*' 'pypy*' )
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' 'python2*' pypy )
+"
+PDEPEND="
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${PDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Flake8 falsely assumes it needs pytest-runner unconditionally and will
+	# try to install it, causing sandbox violations.
+	sed -i -e "/setup_requires=\['pytest-runner'\],/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index ab3da67df034..ca9ac5c6ed21 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -6,7 +6,7 @@ DIST gst-python-1.12.3.tar.xz 388220 SHA256 c3f529dec1294633132690806703b80bad57
 EBUILD gst-python-0.10.22-r1.ebuild 2148 SHA256 ad01d5164839df14bc10de659b53c6d78d4fe00f31f4b9533141207b8a9b2183 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f WHIRLPOOL a95ae5bff61a4db977c442527d75076b8f30fd0460f6789db43d83f1261a1ca96e90ba5572f38f581dafdb463b056d9f5aa11e796034831fd0f1c9dd13a9c1bb
 EBUILD gst-python-1.10.3.ebuild 1121 SHA256 7f451ae76de262b1383f95ec700be01a3c5e8b48bfa283cd424525167bba9322 SHA512 82a9e5b7ad9811d59cfebe0772b4003822bd179bad5d00ccbcdb4c9cb1e03ba57b9c116f0827c635ee3005c0bf4326f4d57ac51c77b7d941058a2e524ede4545 WHIRLPOOL 8a92d7d87beab2e4e3977455b21b73635885661c2e4f5ece4e9cbc674648be16e4087491c7f9844b7c712d98cafd35b361f100f7bc72a6134e71dc3ccf827525
 EBUILD gst-python-1.10.5.ebuild 1126 SHA256 bc7129b274d5602c5057279b495d006379368b275add16d8856acb662750ae87 SHA512 cc95c1e419634aa8b55cae379c7d57251281c9fe65a8b2ddf4e8d17ac113173f5c71ae0e602fc287408d60a0aba7450a5c0d9ef15db9fca3acd8556c53f9c702 WHIRLPOOL 2272e84b73cb036f8fe3dd335740b34c3afbe73a65cf7a2f4c278b211bb4ff7d7500edee4ebeae4affeeb0c38abafc9754adae836268c63c6b0e2a2cf71ecc1e
-EBUILD gst-python-1.12.3.ebuild 1133 SHA256 6b0d0fde717dc0db1340d75d37d95ded7ee6b58692b072d72f12c91b462c5ab2 SHA512 f81a6bc528ebe479583e922524db39f13ec2c3dd8baf7858d99ca5743e298a488c0e3e221341880811dad6fe6736a7102a094ea1571f65baf2f822ec8b654a94 WHIRLPOOL 1779c5134cd547503c7be651d16319c2891d3536ef75605021581359e313345d85b4aa28c97363a0df17295ec153270e0cb61a71425be289bc032442b0d16142
+EBUILD gst-python-1.12.3.ebuild 1130 SHA256 bc95a81e768952cdb5424a0b8eb0600c3b409e6713bfd26215d50100cd280e52 SHA512 b87d3ac5663d0bd7c8e67ddfa776ee19fcea80da1b598331a181c6e53e1a0fa0e36b5f707b1c8a26f854ff881e65bee5605d582bd73f4ca8e1ac04a8e1512d00 WHIRLPOOL 133c7068cf6ddab4f484029d35696dd3478ba12845f67bdc7f6380aa79ce480857d685cf6e604857d927752ae350d54cad5175509ac5561f69733ec5c18fe36a
 MISC ChangeLog 8901 SHA256 5b4d606ecd7d165a41fc1fd440ecf2a4f80f098db793db1d717b8a6b805be372 SHA512 8a818af9dcdcbc2daa50ad8abda2beabed387aa301e7acd8adda9119157f82ef1754eeb7ce923fbf6c9ae0399a6114946b60938282462f28e6e8ac11f99af22d WHIRLPOOL 3c3cb3912b79fe75e2aa41b4ea6fd1bd32a991826fb5e1481ded90eac868b314e3d04973417db3030027e006dc7b4c1a6d60a4f4d1b8a5f096a64828614354ff
 MISC ChangeLog-2015 19499 SHA256 faa35ccc2dcdeaf3f92a918338451aa330a6e7e959268cbf03d8a83f11a0de77 SHA512 93fbf1c4c68e5b7212ad6d310a8ed1d13710d4f2e8b7e92715d7303b6b7bf71362b0813962268e4b7abb21c9ef8f5789e0ad5fd129e96cfc2199d52de2d271c0 WHIRLPOOL e1cba65dd70b859bd351bd0634201adfbf91d00db882d03bc7439bc964d0ce17b66f6ad3b8433dbb483ca1c0e49bc3a1209fbbb2a5a410e51d9b35e28c6b1b00
 MISC metadata.xml 272 SHA256 c359e335e2d2a52e9d3462702b8e24475e6f1e6e62673d13cc64e4b49a97a059 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea WHIRLPOOL 10927e64702cd2ed921e795e80c874379a66141393d5bcb46a86da71b47bbf9a04ecc0ff0dbd01d1d5634ae00b2f6af5c5ee17de8073a84e47b0daedde9bf618
diff --git a/dev-python/gst-python/gst-python-1.12.3.ebuild b/dev-python/gst-python/gst-python-1.12.3.ebuild
index b022282bed4c..e6bdbaf4242e 100644
--- a/dev-python/gst-python/gst-python-1.12.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/parsedatetime/Manifest b/dev-python/parsedatetime/Manifest
index d3edd76c0247..073b2400b1a4 100644
--- a/dev-python/parsedatetime/Manifest
+++ b/dev-python/parsedatetime/Manifest
@@ -1,7 +1,7 @@
 DIST parsedatetime-2.1.tar.gz 61170 SHA256 71b90acc68bee9a165b941edcb93913f8c5784370e544bb32f71938cee97d0e0 SHA512 c3447c899aa56319e09b21c117ad4036e23727346d15d8d5fc60f89d439984f032950a9c6534f763c8dd09c74f078ddfaee1c77880dab4a4845393f5145db9a1 WHIRLPOOL 2e43a2ba4d8729f76170cb0b583648370c882d10bae70caf011e36fb0db5a439df8dcd7534577035620c10af32b4926fc773f80b1526bfe2772d8d5d6881ba42
 DIST parsedatetime-2.4.tar.gz 63598 SHA256 2308286bd9c0d1fab39a95e2c1d6c46a6dde6a3cbed4334be66f58d4c11ed9b5 SHA512 0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046 WHIRLPOOL 887f99a3378a964f16df216d0d3bea967c4cbb98e08a39bdd02b19e3be0bc85fc15a5351ac959149ea96221159b1227c33eaf6013847f0e3297fa221b1424958
 EBUILD parsedatetime-2.1.ebuild 603 SHA256 891f034011c73a3cf7a7c5c98ade1958078fd1e968cf2443978b413207af9bb5 SHA512 8005692170140270a59ac3df483e9984cfea65ca50d899de3215bcbbae70609857561e9339f0f7d457b4a7b929a030c67b438176439404265da5d3fbaf6fe451 WHIRLPOOL 1b5cdc9998f85a711c0bad36a31e38c4929dd2cd2433ab1ee0eacbe7c14032a7cdd1102ee3d1d06a210d15eea89bee0fe1a9c0221631d685d66ed33927ed0190
-EBUILD parsedatetime-2.4-r1.ebuild 663 SHA256 4f96ae8f3023e2650d916fa82304d80ad4c747195f94815f8cadc40542339266 SHA512 2bbdb7fe4c72bd3bab1ade3d0b0ff705758ca078ccbbfd0fd6683e70f082da28a4878122029f5116ecc87a734b24d9578f63883dd7353c78bb1fb8db6a18f12e WHIRLPOOL 4af608f658ee78cfaa46780b735da441a72fd1beaf9d2c99a25871f6857165f180a195459773c3430fbcaa1cf9e0a1fe88ad40021cf2bb04f18c85d5260e9607
+EBUILD parsedatetime-2.4-r1.ebuild 661 SHA256 955b6ce5e94bf7a3b8fa5b84f5d9c75031ae9085ca0d3912993fc1e5d6fefbf5 SHA512 dbe79d8911708e472577821e1fb419a8ce6831c92c450fe585a0100e0f8a5c694f91b62f76eaef4ee4cf3205d401f9f248cbc0f8f16369c955e27cdbb58b31a1 WHIRLPOOL d4f5fdef86a5cc878edcbd199d53360b5e54358b5d6e0486132b64f879e0828b5ffbcc86493daa6fcfd8e931c136242a89c3cb17da7c16ab7dc960d853560a1a
 MISC ChangeLog 3080 SHA256 f8ed38c26ba9a93bd2ad7b2b019d70aeb4074d044f34ee909c7490db7cde1a07 SHA512 49a98b87e1e0153e50e2207c084be87a0e0e5f7cd039312e51b71105e147969051d75be5512c2640ad043ccd1f982210975cb1fa1e9d3256fba89e773fcde902 WHIRLPOOL 5abb6408724dc759282742c6f677d1079f223eaf02cf10a3e84e8a6258a11e52f8c1991faecd73c31ec0de5017977e5247154fb28055b604600a4e20ca64e45e
 MISC ChangeLog-2015 384 SHA256 12124d957db6b52d0e65e3a74d19ef535cfbb456a53108808f19835b1708d235 SHA512 36fb7c53b691075d598f74390a1c4c3dc1ee25ebb9cf82027b7e91cdd6eaa9a5077a9149791b1f0186c6acf942ecb2aa141c3774b7d94e5354481b29b790542d WHIRLPOOL 84a22dbe2fa3ceb471f1fc626daaf9ccbfe6c0d0b9d6a98de723fd5fd8372e306f97d08f4b3cb739d423d51788717707b30a6ba7ce0f6cd095e138b5bf00cac2
 MISC metadata.xml 323 SHA256 021a06afa4c90e15d55b83a0976d29a4fa568eb5ee7d4f82d50c0c7ce8c56df6 SHA512 496f1ae871e09c9a218454f32dc7fb1953c484d8b813324bf3a2a2f11226f5788d0a84f78641499b111571ee4487e1849b1401c611b1302e87d581c3e869fff6 WHIRLPOOL 38a0c5da1fabde838588bca5309688ca2606c165b64b977198a2517ce081571a805a6ecf72cf46d47c83649767d464e638fe62724df43b287cdba3ba2d5d06d2
diff --git a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
index 3408d557490b..899464220632 100644
--- a/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
+++ b/dev-python/parsedatetime/parsedatetime-2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bear/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyrfc3339/Manifest b/dev-python/pyrfc3339/Manifest
index a29b0c76bede..2b0e55f1ba66 100644
--- a/dev-python/pyrfc3339/Manifest
+++ b/dev-python/pyrfc3339/Manifest
@@ -1,5 +1,5 @@
 DIST pyRFC3339-1.0.tar.gz 9325 SHA256 8dfbc6c458b8daba1c0f3620a8c78008b323a268b27b7359e92a4ae41325f535 SHA512 abcfcfcf516ab60214dc11de618d37415da2177387f51f85da99ef18b8cc0d37ed55f0ea6ba3e61292ce5a319838f322e01c1c9f3c0c4edb8341b4b135e575e3 WHIRLPOOL e85e475b309c806d133cbde24508cd4e57cb9a8da31c83b8b880aac64acfe577545e48d7fc70b5d6f5a6ea85d813ae72fbb98c54faf534bad5b5750bdf573c5b
-EBUILD pyrfc3339-1.0.ebuild 671 SHA256 ecb8facac1af4957f619e043d4397afd9fc36761bff549cdbbe2515b37cbc599 SHA512 f5628a1a193e4041a9bf4803f9f1d8517a29a80e96cbd169f76c8bf0e1f48ee80bbbfb2d58c418933a0a35b7c8d92ae84b97bb268b35619b590394f8d423101f WHIRLPOOL f1f064d554803b1654b2b8cfc1b13a445b9928bd5f692099b11be0444210bfff90b98b68bf373a6c9643af0ff234d82e4caa886a974d29a4d189de6f2b0f376a
+EBUILD pyrfc3339-1.0.ebuild 669 SHA256 9d752ba2aac20f7428f456d3f09d0a3ec1e49d83e6ff8a039fcb5937e1be9001 SHA512 5b0cf854db86734f2a805537d037d7f4f6ba4fcff7f28546d7efd0486f7477194ff8251fb163f236c2a6770b18b99bada8029744b3ca77f846e0bd087fb9910e WHIRLPOOL 03fcb676ea62061e261592bacdfa4186efe86831cf45e13b37634b0543c29974c468dcdd6cede36a27662537f9a3c456c32f3560dd81347a95fbff6731b8019e
 MISC ChangeLog 3327 SHA256 9a3fc6615e28ef43590bcd4d6bd63e0921daca587d6da1c6cb8f12c643bcc7e2 SHA512 4645a8551603ea7d05f34cf182dca87b07a80cc40557fbaeec282097a6888f25b7196e9fd71a409b04530c90fb422f2b03062f76cf8d4e0c60ad93aec7ee1d23 WHIRLPOOL 64625cff4fb9ec691f1d4691d30d2123a78072dac0caefcdca3146e7a907df7de135739f7252907e2603cdabd60a091e1785985d8593abdd3201e652b16e25b2
 MISC ChangeLog-2015 471 SHA256 22f4a4f164c60b7eaf03d7d2ab3c88989b0185c723f4124c5dfbbc89e086b002 SHA512 409005c1b9fe4abb8214afe0b567e7efee537538dcdeb650772dffddf536457ae36556c696d6719dc6f15856031c27438c7841e5a422c45ac6ea69c5a0c28802 WHIRLPOOL 0bb20646f39bd549b835b1cd493e6100d5cd890afd5b8b53c87b19da219b08e97cba0d1d7c628687676a4160d134068805f6ad48d6ca5aff193ca2808a9f7474
 MISC metadata.xml 373 SHA256 0727c38e09a07d6821dd8db11ccd2d66c78e116a1acecf545da88a902659437e SHA512 0f0ef1e95f7cf557a90cbf2493f0f1ba51c29cbe10769dc40b1dd56eb24e91c7ca6579feaa3afc65c9d90724c726f6d1bb4f978d6485018e19f39ecf81782a87 WHIRLPOOL 3f1eb0b492545f3fa665391f5ab1ee9cf6b4b5895a8d44a3a9b7e13c3d7f9f65dacbf45e25689173ecbf41fb442f494785b0f52187f2c82a80b1fdb027a07478
diff --git a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
index 4d1fa1220e48..7ed925e2587d 100644
--- a/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
+++ b/dev-python/pyrfc3339/pyrfc3339-1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-augeas/Manifest b/dev-python/python-augeas/Manifest
index df294d7571e5..36c39853e39d 100644
--- a/dev-python/python-augeas/Manifest
+++ b/dev-python/python-augeas/Manifest
@@ -3,7 +3,7 @@ DIST python-augeas-0.4.2_pre131218.tar.xz 77636 SHA256 1ef4547c48e8ea155a1fd9908
 DIST python-augeas-0.5.0.tar.gz 90667 SHA256 67d59d66cdba8d624e0389b87b2a83a176f21f16a87553b50f5703b23f29bac2 SHA512 d93d9e21c720084ee3c1841a2172dd1a4cfb41e668de0f557bd214efd65e685a1e5fc713a7d34e0fed727fe908bb1e8a09a1c10587bc27f3708cbcdee575cc51 WHIRLPOOL 155417cb5c03f581101b525d1b5e89ed9f28e9e145fa548061d36a9fe23791cb38422219695d2bd177aaa78989dfb363fd2023a2ec857456e18639bfdf93ee34
 EBUILD python-augeas-0.4.1.ebuild 513 SHA256 33258002ab6733340677a004153ada6ce65083d0b23b0be1cb3b758fe4cca803 SHA512 97e9201ecf56a5a9d4b7683099c11ae81c9a3f85ab9304c97fe27ccc73066feac6978e54ed89c3e1f28f62568606ec3f8d8a90fc8007d2ceb6717413be70d201 WHIRLPOOL b1bf739cdb0065d187e8608c9aab553e3ce79a9959e104caf36e28bdfd122f5fd328e0775ef459c2c98c02f5eb05cdcbd8ba6d4277f7361b8a2bce4b1cb64663
 EBUILD python-augeas-0.4.2_pre131218.ebuild 572 SHA256 5f9ee8df74ce4849f3b36875f00639e601af0d052132c558feef7724f034b43e SHA512 3d7fdb4feeacd9a51e9a08b0e2c1be7e23733c3383b6b75acae9fb62a9bf130eeffc9551b273aea0959b96e470828947826a90fb8d89982293fde8cea59700de WHIRLPOOL 38c125ccb37a3b47cbf2dce7e565948a14ce53c038ea2eb33f26323203a7bf637a15fd2c586a278f88d98117dd3a7b482bed8eae052ce9f55281fec85459a800
-EBUILD python-augeas-0.5.0.ebuild 508 SHA256 ab155efca1052daaf9c320dd597ee4e247b113c361a369a968e063d152da21b3 SHA512 5cd42fd050a0b89af8936d3b8155b96e5682d0eb75f5d192547170ae9ead8753733be971d53b3432d13a46d6a59206d996cf92d8423c6fbdf29773970a4ee651 WHIRLPOOL 537ac521d4fd6086a1568425d1722a7717096c82e0a7433d99f3a5593bab5c49ddc6aaadcb90225f58f5679ae01bca1a5909164e018203b4b8301a03d84c0256
+EBUILD python-augeas-0.5.0.ebuild 506 SHA256 173ac4fb2821cac9edbdd3ff01b61ecd6cc7eab6ce2af3cf5c70851e2c3f9111 SHA512 14a4d69e77fbb2a2cc530d4d8ce451ac618ed774926567eaa846c64c153013e811e36bf1112cee86b00604bf812248463afbceb26aab195256b834487abe2d09 WHIRLPOOL dec9b9015ffe18e17ecef5c65ec18051183ce6b5d25c193f5c8fbd429c0b40bc7ad0b4dc411259fecf480557fcbf9112885026be5a629b9e1ce140fa0bf21246
 MISC ChangeLog 2560 SHA256 27bf4f3ff60e393dfb5ecc0b0a1291bb5e752eef7f634534237fc8113649e14d SHA512 f740b1058854a3b9234daecae9ba22e47daf01886df3d76c14ebc989f8877f855f27ff89e14f60ecf4ffc7cf1cbf06a3279cec34732db220bb9418343065fa3c WHIRLPOOL a9ac1faef55cc7d4f8799b82b47312a6029ecf8e72bc85d3ed27345c0980a735205c87f51fe1aef25e1c0bc53ad777be9fceb0a3db7b450cc7cdd0945e69847a
 MISC ChangeLog-2015 2035 SHA256 395a66764dc06e937e4b6370d3d049c43818d7e0f2f434dab600ec94ebe2be86 SHA512 23b6704edf6a72fb56488dbe76eeb2486e7e40c946b94e59203c05db273e5c55f612cbd2f915c52cc7989324a77516a58f5eaf3df7d9174a37ffee3508581888 WHIRLPOOL b3245de01f3943e319d3bd42ed487a105e4549bf5e62c29925c4034728799e1f369366a69c1c7d927a32754abba3393c356cf02694454bd10469a1d54499d3e1
 MISC metadata.xml 417 SHA256 2a451759fb050bd93d3a6e40fe3877b30eab0478eca6b7510ed15cd452f6b08f SHA512 54f17c94e464ce5dde8dfc1135ea90b95ced67eac61f39a2b9e653740463396d2a564753d488e390bcec08b3e4360e92a71ce2ef5c1e1050738e71e61d27d10f WHIRLPOOL 8dc4b3283886d99f9fe8d90f1e193d6bd1cb7a43e5db41f5ec14d24f6bd0e299fb4ef9f35c06e160276cab95ef0988cecf3f0ebba8244e870fc6fbd9c8fddb90
diff --git a/dev-python/python-augeas/python-augeas-0.5.0.ebuild b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
index a664f0120877..7b9f9903f2f4 100644
--- a/dev-python/python-augeas/python-augeas-0.5.0.ebuild
+++ b/dev-python/python-augeas/python-augeas-0.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="app-admin/augeas"
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index fec3769b855c..1df79c124561 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,11 +1,9 @@
 DIST python-novaclient-6.0.1.tar.gz 288613 SHA256 2b7d4c660f46d8d7f4eb454fa9da4e8d838a81abc45834891c756393beeb264e SHA512 20bbd40bed2328c6bceba6e0057b541e949d1ea1f7c37190d2ef07bed164a2cf20927b2e7a1b26c349038fca625873e189dad150b4a3e801f9211388ab3996c7 WHIRLPOOL 5cce33c00730cf5e3c81a3c9e3207331161650340bf5b240bfbd687cdf5f2301c81be194b0e19d62e8660b9f4b3622dd241ce4fee511e83afb1769e6a101bb52
 DIST python-novaclient-7.1.2.tar.gz 284152 SHA256 f342470514fd2ac3553e8b7b5967f0f63905bc062202926c5c3a7c87a035a18a SHA512 6b7e4bc80e07b09756f61624d2cf7b81dccd1d102f22cb9609b7e1de6f091061c513691095467e293b742c40a62c8cabc2d3ff8cbc5492d07763655de4d6c516 WHIRLPOOL 719f77ca3c341e446d46ea132ddb698945a806fa8629e20bce95ef5fa0817a2d216381907b07e7fb3e6bc980a1ef30ab6d95a3fcc047601f5cd7989868959f79
-DIST python-novaclient-9.1.0.tar.gz 278196 SHA256 0666571b72cd7a056187795c274838d1b0d2f0d80ef2f1c8ca6924e49660375c SHA512 c71b125fa4a10312ab28eb3929a749d8f3a2fa42b49921f3cd93458f3e00548542e88c25b13e36010ce8bfd68d68028bc5f076cc0081cd05c7dc9a4481d1bb02 WHIRLPOOL 8c0c7bab28c681cbb368cb0c945ee16b7ee56ab0e24b775e5e37aab5fc545998cf1ff6280baa69a201c31c6ebaea8f70ec7428d37aa7a53048a1a5622b723893
 DIST python-novaclient-9.1.1.tar.gz 277784 SHA256 ee65c0b429f4b2654416a8a1472729160523c4545315b8fded1652dfb799e428 SHA512 ceb60a1e88c6ef7b9cc9fba9a192bd781b4404e4cc500b902cc2b4a8cf2f8917f1066df5349d2e421dfaa9fd6b791452872a30440cdec604bad3bee85cd6cd82 WHIRLPOOL 6ca4030158f4b0cf93921f55056ba78e6e7dd55fb691e72e802b51c8ecba88545f84853b15ab3f989d9e53c70f2011824e544b5808539cddc4c33cfe97a6d4ac
 EBUILD python-novaclient-6.0.1.ebuild 2791 SHA256 65e2105f9f76a473abc9e82e31729603ea9811f55a5b9fafa5bac20e3b14f892 SHA512 a3a6565cc64c8ea9b05b48f435c93508cc9fd2cdd829b5c855835491513275dbb60f5f32bc8168dbca5ad7ab1a54b0c3423c480a52c36aeba25a64b02dc7195b WHIRLPOOL 3afb8ba323da0de94b41a3d431f828bc7f6949c6d4c8009b5470487f4d9b5f4fc471eff379b84221533e849a8d9220ffc342e7194f83634de707d8d517d9f6c0
 EBUILD python-novaclient-7.1.2.ebuild 2403 SHA256 087f138e7fadb2ac91934aed535ff62dd745fb196a7ef9d73d004e1505305eba SHA512 dd865239d2c2333151a0f0c7a89f48f2a91a2ce1b7539589741fbedf5cf49145e20f25c2a70ff5b6f7ee034af3a68a832f9aa792afb6a7123341cec7a7c60bf6 WHIRLPOOL ac55ca07d4c5d0dace96c1f13c33794613157ea8867540816b186640d2f2754ea7277c2f5c8f1398e19010b724181f5ff15e528c108ea8dcbccb38fc282d9b14
-EBUILD python-novaclient-9.1.0.ebuild 2576 SHA256 801289bb984428810927ce541d5adfec9d842afe70bfe7ec14313e41f9fb3d79 SHA512 d4b97b506f7404def6a7ed5a6267d326d28687d9392c959c68eece85586ecad6a712ff65430644780e7b34ceadfe6f0acee772cecec60bcdc2629a8ab01ada32 WHIRLPOOL ea57796502facec8ac7ff09f1a7718cf9ef58484b09de32191174cce15c437d0018a21abb691aa8a2ad82e95dde06b4694edc09908a04d57122577b76a92877f
-EBUILD python-novaclient-9.1.1.ebuild 2578 SHA256 19c0ed69d0bbda79b8e4a735de8ac487322d49d47ea62eaacc0587100286de45 SHA512 0f7a5eced2926ae84f94668861ae143d0d184ffd3fff3801d149a24c6037aa71197f4e8280a7954d194de8441754cb4d16929399773444d706108fd2fbc692c3 WHIRLPOOL 00c4ebe3ac5f35406e458ae298cc8566063fb4cb083d85d16db5658ecc10d9f1500fc2d69b4b3990bfa6f5b957e780704deb13664b225e7c4231830556a57a06
+EBUILD python-novaclient-9.1.1.ebuild 2576 SHA256 801289bb984428810927ce541d5adfec9d842afe70bfe7ec14313e41f9fb3d79 SHA512 d4b97b506f7404def6a7ed5a6267d326d28687d9392c959c68eece85586ecad6a712ff65430644780e7b34ceadfe6f0acee772cecec60bcdc2629a8ab01ada32 WHIRLPOOL ea57796502facec8ac7ff09f1a7718cf9ef58484b09de32191174cce15c437d0018a21abb691aa8a2ad82e95dde06b4694edc09908a04d57122577b76a92877f
 MISC ChangeLog 6541 SHA256 4b6de6bf03f205447bf5d45410bb4477d953d2251eb239f4c4a8f37ffa6c418b SHA512 48d37d364bea1570d95d0fa3548fd778b92b10f2ad41f74db7640829a8a299419fc142774b9e0af1a0479dc0f4325b9e15585b2fe56e9f2d015b0285bc9f34f1 WHIRLPOOL 130515d2352d4ae4ad290f4c778b7c46c8317f5d00549d21bfb9737fb60cfcf58d4129d9f67823141a1d8ce275ed51e4e09ce73b52b61fd7eecaf3b88655b5d5
 MISC ChangeLog-2015 5579 SHA256 5bb8603b43145e6382704748800649269b302769691517e8d0ea9b2005c7d725 SHA512 965f12ab56ccf227cdedc6b1951ae33b7b7fd0a03f14d19127ae9d46946a66a8b735bb8a89dc25656613b880a4902a25389f66c0517642953b526974d007748f WHIRLPOOL 2a51a577c26d3c719eed54b170a8a7c2dc7b2d9bc343bfcf02bb9f0331e41f2c3a8090653992171eb73506bda3cee9ed60bec2f7e10024cbba0b35f0eb696c8f
 MISC metadata.xml 760 SHA256 871ddc44a257d5adf856c4c49ed4b0e50a4de51cc8b848453f16ab8fdc2a2601 SHA512 51fd4adfa2bfeaa4f5a6507d31ad45a5d42df8fb702d629a516766bd25c6f5cc0d1eceeb1d4efe3ff21d51ef0507847f6b24828c017e9200759565be09cf66c1 WHIRLPOOL af9a5f2c6aa94609855d9e6af7dedc278a4552d8b410496ce2059a6e98c744d51ca06c08e137ebe2d162671037ecfc5eeec71dbd8554cbe8d50e6976e1b925c4
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.0.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.0.ebuild
deleted file mode 100644
index ece49317acb5..000000000000
--- a/dev-python/python-novaclient/python-novaclient-9.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Nova API"
-HOMEPAGE="https://github.com/openstack/python-novaclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/keyring-5.5.1[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	>=dev-python/keystoneauth-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild b/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
index 8e02a5636777..ece49317acb5 100644
--- a/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-9.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/rackspace-monitoring/Manifest b/dev-python/rackspace-monitoring/Manifest
index 62b6e2eac6db..698e888caaac 100644
--- a/dev-python/rackspace-monitoring/Manifest
+++ b/dev-python/rackspace-monitoring/Manifest
@@ -1,5 +1,5 @@
 DIST rackspace-monitoring-0.6.5.tar.gz 31397 SHA256 28e91f1054a9fe3b130c9d4fd65cb007e8efdaa89e9d8a8e99479aec73e298c4 SHA512 513e02eb7b823ed4287462ffe6517011c389119dbf37d90df31cc08714f93806188d07e4f8d339453b59f17c067229a3f52f1ae7aaf13a7c6504c0ef63b1f4fe WHIRLPOOL f90a4cfe2d13d4e68c9cfddaf9e6f94e3c721688d82059eeaa722e60278a040cbd87ae92e6d5c492b59fd7dc92e7ed302b690bc7fda4638e0e01ba22610903df
-EBUILD rackspace-monitoring-0.6.5.ebuild 706 SHA256 72b00ea2d51d160a5ba5e9a0b21dd145dc3bdcb141c42335d0a17723fe0ca3e1 SHA512 2bc40f605aa204c6a03851a1bf1db6ef8055b79535ffa21defcccb87dd81e295168ff7c0e8503311681facaffbff15307defc8185052dc53873d418d940fe374 WHIRLPOOL f4eb4081565baa656b7c768603d9acc408fde20432fdf4918d07743da14a2df90e8f23c0ed6c2c2503ec92ebed4ea8dd73c48430ac28721848f903f9748663ab
+EBUILD rackspace-monitoring-0.6.5.ebuild 751 SHA256 20eb2bb5d43f34a269cdfec5855e97773cce86279d12f942a36345b10108e967 SHA512 375096d9709f279ac0fd138f204f88a98bb9d45d25d2fb82b520ef17d8ec2bf7623447cb5587285ca9ce8dcc7332a3f4e7eebb2e6d75626e3f3fb46050bfcdea WHIRLPOOL 954f1f0b61ed5f7dd7724da353b2d7801b176180433533898f2c101b0c0385404f440614c45f3f6142e1f2d2a2faeb1bcfd463cb7620a4825226e3971e4d5da3
 MISC ChangeLog 2468 SHA256 325119d4a8cb7bdb528a6cbaa6e6675ea06f218e5b91945894a76e33c93c9a85 SHA512 d0fb4802b22cdff33c5221c59290a787cad1e399dd740e7b3357c78ab5c906ffaef558991e35fcec6aaf0172ee64dfe6e51c82d466984a5e0a49b6bd9ff3f981 WHIRLPOOL 7d572eca2f7a53aff3d1be5067ae1b53a1b99e2e63305bc4182a34bb056e682dda69725828d341e19abfa4c89f6d0f323f3648fe9f47537fd144124241da6805
 MISC ChangeLog-2015 1369 SHA256 aa1542c604c2ca0a18d7ed62b272bffa59e30f7e50789fcfd655ea2ec702f540 SHA512 815161f3f37020c113efea9b007112d189d10c28dec42961030defebb53144473ad7f691689c6c12dc53056fe16170292b551f1a5eaac86b661eb1c6f1e8c0e7 WHIRLPOOL 76edab4920718453529239721d6d60ef0592beb638620b2d61c31c48cefe68cf78ae72d8a94f112ecf15f1c6db3794d257f0ad6cda79d2b8fd178a252fe7592e
 MISC metadata.xml 625 SHA256 d1b335dd44e9c47e62b58b768b057f890e6d6b9ce1fff95106856b5f145b3c72 SHA512 32694d23bf7e16926d283b4cde2d1afe82dddd8da74c29f4c654173883386b54378d4d29ad2ce7bc65452b22a69c6fd582303ccda323d8be6ef6808b5404e326 WHIRLPOOL bd066a9280ac3b9bc248c1adc084af35fcdeb37b5a7e65c5776e6c241b37da73b08b57b50d6edba4af889af5ef7d1bbe0b1c62a03644b34dae6718af249f0367
diff --git a/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild b/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
index b6c4ace0c48c..e4206b2da4eb 100644
--- a/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
+++ b/dev-python/rackspace-monitoring/rackspace-monitoring-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="test"  # resrticted for bug 636106
 
 TEST_DEPENDS="dev-python/pep8[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index b65e07baef71..91157f897a51 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -4,7 +4,7 @@ DIST rope-0.10.5.tar.gz 243931 SHA256 2ff6099e65798f9e27da5026cc7136b4d9b340fc81
 DIST rope-0.10.7.tar.gz 244089 SHA256 a09edfd2034fd50099a67822f9bd851fbd0f4e98d3b87519f6267b60e50d80d1 SHA512 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95 WHIRLPOOL e002d4defc2076c9c550a8b4a27df54488a209ce8aaad769a46e25c90b73cf7263bb214f9cc0db7a577f3d81958e20f9028023d5cfd9e4a6590f3ecb40d06408
 EBUILD rope-0.10.3.ebuild 1033 SHA256 c97010e8d832ade31af1e8f3dbbd92d72cbc20fcd17fd2bc7e700504e14c6bff SHA512 78312c709aa2298027ff4a8340b5fc010d742233db9acb1715eede323c85448e96b4f65f7d506bff6374b9437fdd8fae3c8dd85264f78c4922c5ce313fcf911f WHIRLPOOL eec7cffb02385b26715102c2da7d638f8bb66ce18f3bfe9746d825acd825934e42e0a115feab3802ed21c6501ea17d416a325ed7e79eb20954914d5a9c802ff7
 EBUILD rope-0.10.5.ebuild 1043 SHA256 b7d285eebe665b5f095e9f09c3894346789cc05345f462efdf999c4a9bfa13ea SHA512 9cec94184fcbb7c65f4ccd828a4e1718f0acb5a6d769bef8723d3bec16663702ce835970b0721e230fc67a2381b02a8cd68ee6e15bd41ab4c0a0cc26fb848fc7 WHIRLPOOL 38679cbe140d4af4859e8f638978afe7f490cdc1b07ea13cf8be5664e3dd58b91b4a59ce242ef5051cbc3222d1cd7386ea6ef103f401f9988961b977c0ce1c07
-EBUILD rope-0.10.7.ebuild 1059 SHA256 4a6e3c18ee5f7903b93302d16d704960d42c09d8d6275c50baad4f4308129eb2 SHA512 c9557956594ee1b36e61ecab56155910b33e1f352431d1b6b26b653cb1593d92b975975d75089c48501b96dc4bf74ea6d89f878c495fe14b4e76bedadf533ad7 WHIRLPOOL fe184be6a2651fcae818008e4015486e1480a964d6a922dadaff4f3cc4c166ffa4d971a242097bf058390bef4f0f86686db1f749e2b11f111dfeb47c670c93f5
+EBUILD rope-0.10.7.ebuild 1132 SHA256 33dca6d4fb0d52615a3c9b4cbd82eb1ce3a6b2e90663d3d9f6fb0bb75dcb5df6 SHA512 18dc44202581a659d3972a13a967f12ccbaa5b4238ca812e088b10719b014d75014140cc12a69969d68cada7c51e53eaa1995d993cd28875802a22024d790c34 WHIRLPOOL 9694b424f425980115374793c8cbf06275ed5a41c83b7082d2100b606a9e7f2154b210a9e116a08fee4d999f4a95fa5b37d4398bb3f59b14fc32bd6c28d38f90
 MISC ChangeLog 4327 SHA256 ab6291860729e4894ffb3efbc164ef265c26182dbab150c9db572b6b7ae8ccbd SHA512 2e8c6944a4c5563bf909c4c0087e7a60be931760faf9db45841b177feb4d4fc969410af74dc64aca1cc4bb8dbdaad7e0031e761bff464adb7dfed83c69e9ac0a WHIRLPOOL 651840dd9611abb394223b7aae389df37c123fdbc43b68329dce43f88bd32555450eb76e809f6c55b4737ef8f60f582af68c3b39f76d359473bf239cbcea7124
 MISC ChangeLog-2015 3313 SHA256 20faecb2825d6d2c5fa4a4f918925be34fd2082891abebe1b596dfc7d9750ab1 SHA512 94a42d59fd0e5e6cb06f86c75e6f3f8ed981d0bcff4e7475dec0b5d3e2a08876fe407cd9428b98d8eb6484f8b5e568abf2bf6b2cb7abf7f1f4c8ad61734fe5cd WHIRLPOOL 827061a8004490ab4e352f07c4234969d4b560824f03416fb2844f13dd0ccf2c76770b4480edee35982019dfb7600d5c3b96cfeee3031438725f974ab1ee1c3c
 MISC metadata.xml 517 SHA256 c8e22cb63773abe081559391df95c6b5f23250e76fb1eaf8dfe0eef2a900ebad SHA512 6289b55677d1e26372017042042229865bad64a396952c21a7d5a1f25322c2ccfed11c0a9ea0c0896573dd1f04dc3263dc3eb28ff7b0b804c2bddf231e924630 WHIRLPOOL 046a1a34f036a4654f22d2c1ab78070fd906d05c1503afa4f190b886fcec984a8aef3a1c5e39ac7cb33bea4ed5f58f084c3b1cae8661ad02359902d645d7217b
diff --git a/dev-python/rope/rope-0.10.7.ebuild b/dev-python/rope/rope-0.10.7.ebuild
index 88eae38207d2..970ce8c70ce1 100644
--- a/dev-python/rope/rope-0.10.7.ebuild
+++ b/dev-python/rope/rope-0.10.7.ebuild
@@ -16,9 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
+RDEPEND="!dev-python/rope_py3k"
 # Dependency for docbuild documentation which is not noted in
 # setup.py, using standard docutils builds docs successfully.
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
 
 PATCHES=( "${FILESDIR}/${PN}-0.10.3-doc-syntax-errors.patch" )
 
diff --git a/dev-python/rope_py3k/Manifest b/dev-python/rope_py3k/Manifest
deleted file mode 100644
index 79560e39f63b..000000000000
--- a/dev-python/rope_py3k/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rope_py3k-0.9.4-1.tar.gz 221451 SHA256 feb95047cdb9d94e59414aefce7668920e35cba6d1e3c4d4390c2888c98207fa SHA512 288009f500a6dcf9902e2ba82f0f594a9f8e4a858e5efb9c0bf5a1f2d9948162b7bfc068fc115c126852b65681e41110f0bb03c56894cf62e77ab6da80371150 WHIRLPOOL 9beb63d3d2dbaf0e02fbdae881e5d2f2ef18c01dd01c9a5d21df69079466ccc468ca79b398a4a7f69e2d46579eb48bd35919186d1023e286ecd9b8ed3edcfacf
-EBUILD rope_py3k-0.9.4.ebuild 452 SHA256 75feb9ca828056f9195cd7c065dd578428e75f18a7a289282a9cafd55d9667c6 SHA512 5cc559e78e16746aa3fb1b93e0c849f05ef53bf680586f80577edfafc0b20e59414ea8618cf2e8f0fc8a70068f407dc22c4ee99b14a0a45683d46e2134317a1c WHIRLPOOL 954014543122c5c41552115b161b24b1218b4470b84306e7f2360299c6fc36f4624ecbcb1d753baaa445d8eb522fa3c638b3a8316c457937e6852314f5f05a1e
-MISC ChangeLog 315 SHA256 123fd2ab61b9a7b533def8f41658c8447ba0f8c634418c5e4b7664ce8411b77b SHA512 b92916ee169be23f62203d8235372cc5531c4570c312f7efae91ba69117d09d7fce00e76f3ab6d850b1ede1eb7443cf0e1d244283ef33488b04550a1aa54863e WHIRLPOOL e94aa869bb0ed3ec51c814c1d4113517a720afdbf9ae305af2c0d5d94d8fe01c9f1d46b09d4be1933ed60f61bfeb3a83d4ab07ffe16defcaf435f402e779bac6
-MISC metadata.xml 471 SHA256 c9d3568668bdaa6be78993f9d454fdf02ffe12eb101aa79d01b7267a4f621c82 SHA512 4a583cfa1e8693186e2a66fa73d8ba5da5c639986e16cacb5134c28baf907ee7440835fdfd4e05beecca136badb51c1927a8b362f8f4df683d3812aedf99a68f WHIRLPOOL 0288fa556db583a1557a709efafe7cc1fcd971bf8f98410f81ec9dbee3a1e554278aebed1a5940f3d27ce82b62d98f8fca7ddc5f60b2030bffa94986efe222f0
diff --git a/dev-python/rope_py3k/metadata.xml b/dev-python/rope_py3k/metadata.xml
deleted file mode 100644
index 370e851219ac..000000000000
--- a/dev-python/rope_py3k/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-  Rope is a python refactoring library.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">rope_py3k</remote-id>
-    <remote-id type="github">python-rope/rope</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/rope_py3k/rope_py3k-0.9.4.ebuild b/dev-python/rope_py3k/rope_py3k-0.9.4.ebuild
deleted file mode 100644
index 9b9271c7e89c..000000000000
--- a/dev-python/rope_py3k/rope_py3k-0.9.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 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="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope/ https://pypi.python.org/pypi/rope_py3k/"
-MY_P="${P}-1"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"