gentoo resync : 03.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-03 16:17:22 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-03 16:17:22 +0000
commit: 4cd2370bed609c118b6edfde5d3f116e5c35b897 (patch)
tree: ec58f2c41f49754e41521d5ebc9dce4597ddd0a5 /dev-python
parent: f443475c824b4b5c086e6d040961cb35ad81bc60 (diff)
127 files changed, 590 insertions, 777 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4b9b9106c904..0020904943aa 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 25a7f38e4d44..1a531955cae3 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,4 +1,3 @@
 DIST blessings-1.6.tar.gz 19974 SHA256 edc5713061f10966048bf6b40d9a514b381e0ba849c64e034c4ef6c1847d3007 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2 WHIRLPOOL 44dc96c1da174465b5dc3dd38c4d7ccc17408d072d290819c52d33e7e249bbbf428c7ee217faf3ec6acbe1e620b5e0cb2627c4dc3f0162cb21a810ce50e8b1c6
-EBUILD blessings-1.6-r1.ebuild 805 BLAKE2B 16376e9d825e08c14eb80a543c91752e925e9df70f3886859f3454a79e360ce6715a353aa3b6a53dcfee5845aed48461e432e70abbcfa2f29337cbbc3522a98e SHA512 c9a905932af36d50bd12d957a0d01d457bb6efce2ecf60547800d17da7c910984391ea10d0e041f0ab01e41f3d5ffd4acd1d1d052b456f4cca53e9c895243405
-EBUILD blessings-1.6.ebuild 758 BLAKE2B a41ea083711e3d15ea331a3ade0abd7d2ed1f7ec5f455ef27fb04618c880577e9757f0f261ae90bf28fe055b0f8d5a4e19c1224df4f9e99cd4512f8359f95805 SHA512 28a4985262effff9489e7d22a2ae54949d5db3e718bcfaa866a921ade80451205346f09f367ede77bb68ad6bb38135636b73d6edd1bf5d32724cb975ea300bd1
+EBUILD blessings-1.6-r1.ebuild 804 BLAKE2B 9c8d23f25e93320a88b760f761aaa97952945caed89509087b67931ae7bd1ad9b7be9c9d4f795ae5c86aa71216e876243e92a2a954e19f635c8965cc4c077a98 SHA512 d6bd4de7efd581467fa307275ec4fb23292393781e25104408abdd8d71dbda5056eb6d3f31005e7143ed9fdbff684cbd3b34d5733d763123a8a6fa6c9b8c9ad1
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
index 8878932d42f4..835c26c5e4ab 100644
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ b/dev-python/blessings/blessings-1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/blessings/blessings-1.6.ebuild b/dev-python/blessings/blessings-1.6.ebuild
deleted file mode 100644
index ac8948b45395..000000000000
--- a/dev-python/blessings/blessings-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.python.org/pypi/blessings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# The tests need an interactive terminal
-	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 8c18264666f4..7c46f1dc3a9d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,12 +2,14 @@ DIST boto3-1.3.1.tar.gz 176717 SHA256 b3dbde6445ab04c3d0de9b962a3cc8ed9bc22ccce5
 DIST boto3-1.4.0.tar.gz 183263 SHA256 8fdd3743e34a32e5cb8636fb33dafe7336b7a341583653f52c6c20f7fe764472 SHA512 9e678b26993f48f156a5acdb33aec3488d263230517e6b5e1e608cb007fbf4f29a3c33290e460eb7cf1031f87894f3daca03bf80048139435979f23dd2fd61b8 WHIRLPOOL 5eb3703b11b4a0b3a4c873aed78f9c8b6588b5a83cacbd673f27cc4460822772745abcbc6698f680968ed37318d76bd812a491a83caa7b04b1e4a663def4a271
 DIST boto3-1.4.1.tar.gz 188341 SHA256 a7f10245b3ff947019963963b73911c515debed89709740586503ac22f5dfb97 SHA512 525f2db50d0a9d6f452c0261e934ecd9f06b576154b128d209a729b0fe96190e641369c00e13700f2aba5fe4a0c02f80248e25bc3d716cb72752d645e880eb23 WHIRLPOOL 195e5dcd59152ef09ae1f32aa9f321ea1f57c2ac20f7a233673c4f2a4529c062f78af0641efe8ac0632188e8e85e1e687eeb7c6932de89d3c49e110df2958eb4
 DIST boto3-1.4.4.tar.gz 194721 SHA256 c760ca47a34fb54e44b90fc28d87a50353df527b39e815f399c481bab7d351c6 SHA512 948d753809e41bad39fdf3da9646b62ff2fbc9d23966cdd0e46b2df18b07ff8c8af11bb777aa0cd1fea5bcdbc2d43f3f3d06012e30327e3c55b36f7bba815a61 WHIRLPOOL e650e194d507dd405034ffb7907ab4a7e22765f290bf0bd8d866bbd0f94afb5fb64a6395aef24ea2196700be3d893bcf6cc86223a5073577875e451aed75724e
-DIST boto3-1.4.6.tar.gz 217110 SHA256 457ac301b28addece2914da6fc4207146a0f4393f8e94888315b1611a4f43270 SHA512 194be548af8b11fa14721a23934a811717c6e8a70178682c392626aaf97fd5738c7aeb83366d7951c2b69d63acc83f26059e3f0cb0b26f5d412ba606e02315e7 WHIRLPOOL 842a3f65f4a733f3e66cf66fdf45d4ca0a83d9d01164a5ed784f2a3328229471487f1ec67c82a7732d9196907859046b7246586fae64ecec4e2ec4565fe70fa9
-DIST boto3-1.4.7.tar.gz 217171 SHA256 b4952103bb0a1e0d9c1d3a06f51674bb2f1b3914cd667070fede5662ff5f381f SHA512 db87ce873ba3d7d12c9e77ce329db3fab25328407ec5ba7fa1e7c94351285a84a3baf0f71721ee6858761743736497ec35b03e8d5e9a59da8daa176596f1a1a3 WHIRLPOOL 2e2a79aaf5cb5525c1b15348baeb8001795ca08f1a932cc8f9874eda41e3527c4887e0e1a67d42e9e30cb703eff468d380d921fadf514d91983629854158f32c
+DIST boto3-1.4.6.tar.gz 217110 BLAKE2B b666011953702f475696cbd4ca730326a5c75f9ec88777681c44f2e4df8d73b5afd6e9899c0aa0bacdb8a56325c9bc1107a66c7184dd6df8a4b91914d8f32558 SHA512 194be548af8b11fa14721a23934a811717c6e8a70178682c392626aaf97fd5738c7aeb83366d7951c2b69d63acc83f26059e3f0cb0b26f5d412ba606e02315e7
+DIST boto3-1.4.7.tar.gz 217171 BLAKE2B 900c5c4249df9d0c3b5d157835f66be5e7cd3e2f4b934047340614ef729d30a5952f2996f1638626a10f9e5e55cb05d4792241b6f7da9c5157da9caeb464acac SHA512 db87ce873ba3d7d12c9e77ce329db3fab25328407ec5ba7fa1e7c94351285a84a3baf0f71721ee6858761743736497ec35b03e8d5e9a59da8daa176596f1a1a3
+DIST boto3-1.4.8.tar.gz 217204 BLAKE2B d402c34608f86c8a337f39b816bf5202f3a231f8a15cb16da64fe2443d7ee9b3703eac7e57e4929cf07c4387f0eb4d029749e3d3368a23dfeb531da291b72e62 SHA512 91985508b02eb24e5770c51b17faca2e0cf194a1ca4cfc8313d296fee25001be729d9a5d5f9960bc3d756c6eefbb8694cbb931cb0109704401c4255f0486cb53
 EBUILD boto3-1.3.1.ebuild 1440 BLAKE2B 68cac9e93ae9077e2a2dad682f3d8fc3bcd2735a555b5812d06af5100d49a295e60775eadfe8075e5b6528c1b7b59a44cd3fd41c73d9f98ac9e0d8eef203769a SHA512 db1347d961624cb0ad838d7bf23f1d54ad9b7743c0e75b203c0d32c25689eeedbef9c400f04d5b7e1759ffebdc9d3304cdbf479b5ef3be947f819173ae8154e8
 EBUILD boto3-1.4.0.ebuild 1372 BLAKE2B 8665c888aa8f9e9141daf398f0ed44b59209b416660a54c4c1a68e35e727657fb751824c162c33d26c3ccb10abfcdfdd280607670b95b5c736872382f8bdd92d SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9
 EBUILD boto3-1.4.1.ebuild 1372 BLAKE2B 8665c888aa8f9e9141daf398f0ed44b59209b416660a54c4c1a68e35e727657fb751824c162c33d26c3ccb10abfcdfdd280607670b95b5c736872382f8bdd92d SHA512 8cb149b97b7acf75c8543ef8969b8d82fec5a4b4b2cc624e179fd5fd0f08bb2db6084ff78bb945137a9fe3a7580f4d42305786fabca9454472f5926548e6c1c9
 EBUILD boto3-1.4.4.ebuild 1413 BLAKE2B b7ddeb840227c5e870462e34e5612dc327d7f43e0b5e25cd7753f6892d9220ffecebef01caba16ae341b5587e57c5a2c446d538dc0b9b2c2a5bbc4e00f94efa3 SHA512 4dfd9bffdc5e5be744fc636748be1f67f0ca75931960f4f23217f2fe0e96976573a24d3d8fb7dbb043e549f27c42a4a3d08fd879dd6af5707e1fa5ec184f6881
 EBUILD boto3-1.4.6.ebuild 1415 BLAKE2B 95c84a2fac3e2ef0c1aed0e2aecc2a3926f8276d96f54c9d8f75ac603d8f600390dc7fd5c006b4d3fb865195827d3023c6134013510da9944f5ae6b72fd8f2fd SHA512 e68589c48a61e2a27a3ce83aaf6daa1707585f4846cbef34381be505b26ae8c63eef8c4574f8de5c2cf78161b7f19c704a03a382ca167b360403fde6cf43bdc3
 EBUILD boto3-1.4.7.ebuild 1415 BLAKE2B 2574a5f98da96d4a25589a6a9c59081ad5394874110d4ba12ec5fd9dcc0d2384703b9d9487ee9b90d5145feed7c9ddad21f7bca52a47a502341a070c1eb344cb SHA512 5251623dc50e535c84ca8c764371e2990fe005739ef0bf07327b660e819939e1086b2f8afd115e9d21289f0d770ff4e0b7cb787eb192cbcb35704a5762704b68
+EBUILD boto3-1.4.8.ebuild 1394 BLAKE2B f5b5b1540c46762133f45f8a039fc283af082abed65a7ddc6a872429a2d5e667f8b2d1ebd19a4902d4ba388a7253d70b9830376f26f01a5b0a2d367a688e133d SHA512 30b3cb04310eb8f09c6f7b0025b1ed7c0dcb27c3b55b6fafee86c80b4473b08eb4a6102a22abdca5ad667255e6a71a0a9e57001ea4c3a48b390a1a039f152570
 MISC metadata.xml 433 BLAKE2B a94a845e402ed0f6d4e9756babc64f07bd3d1c8600198f6fb77a6fc36a593904baa5cfbb833607cfdc74551b6429c05ad6e7b9947373b05a9fef43df6abb55f5 SHA512 b85e30e557a6bc3432c4bfb53e882f6652de9a68ec1e2ca157bfe27234e2c79f9a68195234e0dc631e3ee19a5331e547af40d09ea1d3acd095bf35eb108af3d5
diff --git a/dev-python/boto3/boto3-1.4.8.ebuild b/dev-python/boto3/boto3-1.4.8.ebuild
new file mode 100644
index 000000000000..887a8afe96a2
--- /dev/null
+++ b/dev-python/boto3/boto3-1.4.8.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 python3_5 python3_6 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/botocore-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/botocore-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.10[${PYTHON_USEDEP}]
+	<dev-python/s3transfer-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+		<dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.7[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index c7ad31086932..aac7360b4255 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,10 +3,11 @@ DIST botocore-1.4.62.tar.gz 2912358 SHA256 9286305627019c6ecba580085046ed9ad5b26
 DIST botocore-1.4.65.tar.gz 2946032 SHA256 9b4e2d54ad89294e3866888b9711b58ad9923a7850e2ad3245a96e5bf5ec9e6d SHA512 ee3cf9c8b6fd0d6adb7f423c2a72a2d5ac2e7efd314c07c2d5014580b700f26bacb6bc09a75a295b5d508234446640cfed641d39515a8d658ba8c35df3240358 WHIRLPOOL b49274619ec8f06d94e07592e4ba21a83f39241d4aa28c61ef514ec95993ec9769661470ace44778738fd72644fb96954fd3f67077e2ff467643352a5598e311
 DIST botocore-1.4.93.tar.gz 3306809 SHA256 3954b0c3bf67473181e9f6e3347154ba8ac6e66fab9bc07a25bb9e4e165d9726 SHA512 ce4ac735e5413932d5545b6319f63e6080cee8f4e511e3886bd47a6785bf1986236eb8ed48248836b29fc433a015807fae8dfbc3b6dc1f7e94088e380c7b0332 WHIRLPOOL fd29a6ad15ddd8a7dfe6cffafc72b2a83b7b45304bd122d7ddde26f4bb529805396bad3dd261fefc977fac4c004991b03553792a11fa78dc1197107a1892182e
 DIST botocore-1.5.52.tar.gz 3606403 SHA256 bd232581d8720f87d49d14c134b2f563dbb7c4fa887467720bff76e08858a01b SHA512 f8a1ed1b768cbe26e9fc75a81b08dbb012b37576342452acde21f48e9c314093ce1dd7ec8eabcc8c8a14e2209d809450bd4798eddb55215dcc387130243d8bf4 WHIRLPOOL 0c719fb1e7be68f59a76e7394615b836df9ebcf9ac1dda7c2fee1ff468437f6e33d34f5fd2b809680158bf32f0eebf63c8a90a10ed90883354347a8cc758280b
-DIST botocore-1.5.90.tar.gz 3707524 SHA256 675f894c0ba91c8bb94be6954a40272e8c9d1ac9ddab2bee33acb1576fcaaedd SHA512 2a241c29c4874f632932f453954ca15469087b467ed36453db05fa219e81b6aa924aca672f01747de071091ffe6d55fa731ec124f7b47783176c79cf141dc82d WHIRLPOOL d42ec9a4d167d31edd9e65ee6a2cfa65c1ed80d8260f3fbe2fafe2e66f28d0d28f363f0b311e275589b065d2d43151381090b16d61e13aba1d4f4dac487cca35
-DIST botocore-1.5.95.tar.gz 3712795 SHA256 26917b37fe993dc23dd1eb69c3208500fd057dc8b2e18b7c97bb26ae08ce7aa8 SHA512 872fac30476e3f05fa065ea2963b2221046d0eb7cd91267b0f9209fcd05b81b29eba99c439ad220a81c98a880b4087d961667d8a27c560cd9ba4481b8bc703c9 WHIRLPOOL cff1d6eb9c8a1d42c639da312500d1c23fae2c4c90afbd06c96345a20d6b3ef3f439f9d13f56962d208c4f6ae52fc27e3b48dcf276475e1933209ac5c9b8c0c4
-DIST botocore-1.6.8.tar.gz 3769332 SHA256 2e679f2327b1064dc74b5a62ce71a725add031b8e539668ce666da3a857a1b63 SHA512 2565127620793eb94ef817a4295af3484aa7f30268fa915d37b82c5dc240ae2d74eea60bf68bdaf3d180648ff4225455e9453d75454d5a6d5ffadd19f2a2bd05 WHIRLPOOL 28f10e78fe29e6cec7e40ab837b4b49ce2b53d2d40788877da37a0f31ca89401e04a31d9341a8a48993634f413ebcf8d7655a34faf67f63984767cca172c245c
-DIST botocore-1.7.39.tar.gz 3838231 SHA256 28168c86cdb8847eaa0d53551ce9cbcac83f0d59d225c4281f43515b7dd1980d SHA512 0a6031315356f43e00ba5661020890478a589f0524bacd22fd24a9f8da147761f70d7b7fae9aab887301e78a392bc12dc7067174af9a07aac346d11a4cec9a22 WHIRLPOOL f3fc9a47b413e869b6cdba94cbf2ce99f2d39259a23e7aada6b2cbbe4a1f95e1136cd4cbf27b3d541c9edd383b53a88d44aeea6b92f9bedaefb71287b75a0754
+DIST botocore-1.5.90.tar.gz 3707524 BLAKE2B 8509594072f0c220a388b97641726a8e2a693322898f4c924a90e8d6fc4f15c797d53cd241389305178d01a5e8c5944e80dd4e24d9c321ed2dd8f9d62f58e738 SHA512 2a241c29c4874f632932f453954ca15469087b467ed36453db05fa219e81b6aa924aca672f01747de071091ffe6d55fa731ec124f7b47783176c79cf141dc82d
+DIST botocore-1.5.95.tar.gz 3712795 BLAKE2B 1c9b88e144aabea907919dbf1387f46b1a1a45db57c1f8cb5a7c48c23c43927afb517ccefb70da1b18465bc407332a775452cbade0d7fd5fbfb38103bc4070d0 SHA512 872fac30476e3f05fa065ea2963b2221046d0eb7cd91267b0f9209fcd05b81b29eba99c439ad220a81c98a880b4087d961667d8a27c560cd9ba4481b8bc703c9
+DIST botocore-1.6.8.tar.gz 3769332 BLAKE2B 21623cf7d8fe3dba1a87698b89f3bfcbed161f7d06e3ef02a2bbf117280945a860ce5cd309987ef3eab24441facb8952c8bf7e7e9f2eddf1697791b95c0e6e59 SHA512 2565127620793eb94ef817a4295af3484aa7f30268fa915d37b82c5dc240ae2d74eea60bf68bdaf3d180648ff4225455e9453d75454d5a6d5ffadd19f2a2bd05
+DIST botocore-1.7.39.tar.gz 3838231 BLAKE2B 53355a6f0fca131db8ae41ff7e0b5405dc2a4c1a0630743ec34e0fabe60468d27ea9d36b67dc3b8757c3f524eabf3fef1e55d3eb0df1f4c5bd229448f8dfc3d4 SHA512 0a6031315356f43e00ba5661020890478a589f0524bacd22fd24a9f8da147761f70d7b7fae9aab887301e78a392bc12dc7067174af9a07aac346d11a4cec9a22
+DIST botocore-1.8.6.tar.gz 4142560 BLAKE2B 2350f448b9e11ef1f65aa6b9dea3cdd57fd2ad74e2d73e716a5b77478fec925b69cf283f64c37226d11b8e91486a523ed4bf2c68c886b97b5e9129fbdbc1ba42 SHA512 5d91033aa81dee1d3115f4db32c1d8f892324f96ef5233f29d35f43a9a9d2ea4adc58d1a2d66eeeb0bb7332904a29398e31b91a486bea71552ed1d0246e8f804
 EBUILD botocore-1.4.60.ebuild 1297 BLAKE2B c73684904c025da66c7a20cbaca53a0b6e5420f7febc1e1b56fcdcaf41c2c1fd4a07fceaeb1d38a5e6dd5789bad0b6a3d2862482bfa1c5122658c888046e0bae SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85
 EBUILD botocore-1.4.62.ebuild 1297 BLAKE2B c73684904c025da66c7a20cbaca53a0b6e5420f7febc1e1b56fcdcaf41c2c1fd4a07fceaeb1d38a5e6dd5789bad0b6a3d2862482bfa1c5122658c888046e0bae SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85
 EBUILD botocore-1.4.65.ebuild 1297 BLAKE2B c73684904c025da66c7a20cbaca53a0b6e5420f7febc1e1b56fcdcaf41c2c1fd4a07fceaeb1d38a5e6dd5789bad0b6a3d2862482bfa1c5122658c888046e0bae SHA512 d5594eb19f14c93b9abe323629c0f1befe84e51070f46e311ec7c7fe9f71d1f44b24d07766f959d04dc997890c93648925e07043e3ee3481ef29089f628c4f85
@@ -16,4 +17,5 @@ EBUILD botocore-1.5.90.ebuild 1344 BLAKE2B d7760bdbaac7915c853133c85683d73585d5e
 EBUILD botocore-1.5.95.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
 EBUILD botocore-1.6.8.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
 EBUILD botocore-1.7.39.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
+EBUILD botocore-1.8.6.ebuild 1346 BLAKE2B defe2c6da1933772f8d25c5618671867e4548e2a86f1c42cd6d257ad14d06f566e04d09a2bb1295821e7c9b5a2463c34ec6f99e5ebaf93b8ad3b4a7d2597adfb SHA512 1957322e6cc847171a101ab2fdc90464e7197e720b649b6b408d15eac44a5b03a24b8ff1ff43da50d526e438f3846d029a210c53a05c32dd84d5d9ad3c3bf03f
 MISC metadata.xml 482 BLAKE2B 32f49cb53c6116989ba95b90ce5e6967b870e6fbce0125597f81a97d119b0d0206458e9683f3714f8708bad8b8e3a17bdfae49ed737ce9e8ddab37cedb19ad74 SHA512 bd927bf8ede2a9746b2d91f84e98d9678641662a23a7d43fbc804b4b54fe4adde8efe742d129cbc35e7d33f05dbc5e66d9d03b4268b11902c74aff8be6da9a59
diff --git a/dev-python/botocore/botocore-1.8.6.ebuild b/dev-python/botocore/botocore-1.8.6.ebuild
new file mode 100644
index 000000000000..f4df2f35b9af
--- /dev/null
+++ b/dev-python/botocore/botocore-1.8.6.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 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+CDEPEND="
+	>=dev-python/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? (
+		${CDEPEND}
+		~dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	nosetests -v tests/unit || die "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/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index c483ff638e57..8acf2a3dc7f5 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
-DIST bsddb3-6.1.1.tar.gz 450571 SHA256 6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01 WHIRLPOOL c8552008d8de272ef665ca54ec134a8bf64e31c41b4738c9ff461d5d2f6c045f20bc9604bff2acbb86222d838649297d8e96060ec060f2da342ce0314e0b2211
-DIST bsddb3-6.2.4.tar.gz 242397 SHA256 4866aa32ad6ec6d5ff401d9aec8da07c4e84502298dc27f7c758545e243550e6 SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0 WHIRLPOOL e835c62753bed8fb26a82452b0b1946be169ea863c3fa532e05e1cbeab21eae34291175fdcc73fa376924cdd577606dcddb5b560b560735cb39a81b3d3e01bb2
+DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
+DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 EBUILD bsddb3-6.1.1.ebuild 1949 BLAKE2B 5b06cd8a78f99f8f78d45d1d27d9d0f23e860982257c3000983a1fc90973abcfb0f4a19edb773da660fe405912a6159c3353394572c1ab6aaf7c434ab3182b22 SHA512 4288d31c4c38a8f4d8e2319b6a8a81712fb6fe77f8b4baa87a3d65459abacad1fa8c28b437c9fde8035404c518949f65229e0a545a37f35f21d3ffac2c40febf
-EBUILD bsddb3-6.2.4.ebuild 1937 BLAKE2B 5d72a068ac3a01735d857ab02dad69d09c88310be110a929dd0e07253e410602b01d6096abfc55aec03b1e964a4580b87c07bc1dbc21d9cf4cbea5be29aec92f SHA512 c7e1cb47c16c951446f38620e9e9e8e61fb890c86e3906280edcd64cf7d4ef96137b1a068a6619b118db0cc5b8ae8973ffc75874e4c34eb6da34dd53c0d28a45
+EBUILD bsddb3-6.2.4.ebuild 1936 BLAKE2B 7bbbce52e9ba8bc3d29977698140a0d0ef6edf5bd97873dc121c6b61ff1bd368c1c7cdef0cae0f44a7cd70dffc486dc92cb5c7bd6633f0f8aa8897f3e5d59f0d SHA512 aba5c8cf3999fe4546d939e83022db85f2babd95f0e3971bd8da4da85d42bfb4a926cb44984e4aa7267ee4a1f9f03be388186efcb3854518f541ef556d37de99
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index a98ca0bd1a92..ae7de068272c 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 743514b130de..19abc124a11a 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,7 +1,9 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 SHA256 61738a735852c23c3bdbe52d035488cdb2083013f384d67c1ba36fabebd8769b SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964 WHIRLPOOL 1cb56b36e21eab8004eec43d9c0f7377588cdbcd1d654cd0e6d836d43bc68dc0759993215439c1607e09ed3fa1f68b80504a222f73c1b76d3841cdf638dcbef2
 DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f8e0c484b403476d2611dd20970 SHA512 14acdd622310122b544c952ee5b932b7006d9d8424319f0e3974f2503d40a0cec4200fdd3d813a32ce0d877bcfbb9a5bd5c36f6142b4330e6c814f113ca2efe8 WHIRLPOOL 9d2fff35324621be191cc69b45db472681c9ebdf05aead09510f3178853ac8a179f2c454c2e6513e57f84a99980052671cd9a23d38d6d14b42dfda1853a7844a
+DIST cfe-5.0.1rc2.src.tar.xz 11512960 BLAKE2B f6f53a985abfc07869984a8b6461549df80d8511645ff0ba46c035b04f247d9f56a63a178da7496b60064aed059518175d2d34aa661b72877f3e62b27c9eed13 SHA512 069fa3dc549ed046a004ca31a1e571fe83fca986635b5515e9eab3f91e3a962af99022e927d15fa2482969c64fa9b33c9c7e79a8cd9dd8fa77b554ba3f08d1ea
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
-EBUILD clang-python-5.0.0.ebuild 1028 BLAKE2B b271ad931b089143e58cd1b24965ca58e0190b33c8a555690d7a6a193ffbae436f3e8c175e645f774f30ca830e7487d845cd1f13c881ee213d36d14f589e9055 SHA512 7c5a20034ae0deb3820692f651a8a3a69741b00b71f8465656a59fc2ad17009555420dddb8105d2353ffbfdd1a32f4f377ca412fbe3c4f15a0e9b0e1d90b29eb
-EBUILD clang-python-5.0.9999.ebuild 974 BLAKE2B fe803b942f556308676907dbf3e7879c77b5b32d011c150f397cdca32fc9c7b19cb7abd37e7f36c4e7d926654de62938ff69e5ec3e6eab296f298686bfa76c95 SHA512 2ecff7dada9b6f5ac99093ddd0bc7d6782dddc73fe1b073bd32f9a654cb6b782a1a23600985384ed215a054e25820f13950156fda6b42100af4e1009a1bf6d8e
+EBUILD clang-python-5.0.0.ebuild 1042 BLAKE2B 088a4a42d710bd352214cc9d214955c8fba03adcdaefe139650cecd98152e1811b9370ce96a1add8157c3a51cc7ea3556d7783367a4c5929c3b9bfff53992fee SHA512 bde63d6e9c8abb61fd9f2cf5382cdec7eb28529169e3153e8a4611c4af59ea2fae148a872ee090131816276c4bbd139f018e10d0431408ca7f335707ca7c2d53
+EBUILD clang-python-5.0.1_rc2.ebuild 1002 BLAKE2B 2204d9cd8e02251d2e4c79a9aceeda66d30fc6cfa9a639204df90a2030890fe399b6323b783cabe83f914bbfb2259b364b52765d2c1e9e1e17dc19dbbb27d832 SHA512 a277b75ff0f99b0774a62c6d23710919ac12e3d77236119929cafc9de8a052fc741eac7d86f8a1afadca3b24fb8bb01992b0fe0c66cd938a54538abb70255e64
+EBUILD clang-python-5.0.9999.ebuild 988 BLAKE2B 10319b9e1051169cf044c8ae50e74c071901476befe59d900bf81182b204415230c11f2e1915238d21d87523595c861381847f6515ef27eb02dbe4dea3170759 SHA512 87add8c3411107b266269dd1dde38199ce37a6d9c77efee7333e5484aaf785ffb4131fc3faeeb47d5418d1ed30fdfd30fcab270ede45ea69b5c4ba05eebf5e1d
 EBUILD clang-python-9999.ebuild 936 BLAKE2B 2032abda96b9540750f47e26314b8efa027f591c55317ff9f1a8c138de95cba967f5a5031f80e6a93b33e3faaa29cfea97354b2d4cc7265b8fb86759e2ed829d SHA512 defe9f500c577fb6f4d06fcb5725ce9c58b4d872ca614d7513e36f8ac29f42874b27c418754741f29a524e4794adf5acf8b83509dfb6cb6c348043d011c259ec
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-5.0.0.ebuild b/dev-python/clang-python/clang-python-5.0.0.ebuild
index 20a45b1a0c78..d652274a033e 100644
--- a/dev-python/clang-python/clang-python-5.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-5.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
diff --git a/dev-python/clang-python/clang-python-5.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..0857843349ff
--- /dev/null
+++ b/dev-python/clang-python/clang-python-5.0.1_rc2.ebuild
@@ -0,0 +1,43 @@
+# 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,3_6} )
+inherit python-r1
+
+MY_P=cfe-${PV/_/}.src
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+}
+
+src_test() {
+	python_foreach_impl nosetests -v || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/clang-python/clang-python-5.0.9999.ebuild b/dev-python/clang-python/clang-python-5.0.9999.ebuild
index 6741f9636801..4e4190e443d9 100644
--- a/dev-python/clang-python/clang-python-5.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-5.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit git-r3 python-r1
 
 DESCRIPTION="Python bindings for sys-devel/clang"
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index c4d8a8d903e0..9abd16d8b492 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,7 +1,7 @@
 DIST cloudpickle-0.2.1.tar.gz 15514 SHA256 eea4b655e6aed3dba39b104ad1872226e3f9e23d8d202fc003f3e65f2d125c3b SHA512 ab098186c04db1947fb6c4c92bb4708b0c45122adf0435f5da70a0cb24c08cf6d36ce627ea112a8ad8d0107a28b12259435c3e1aa2ab7a6f8f4122e5ca756e2c WHIRLPOOL 66c3b735e592b05bdacb8fecc75a0d4e81751670f06eac2049a5d02b2a8dc1e1fbb66ef039d7de6f85175ff6dd7f6f635290f25937af02d6d640894a959778dc
 DIST cloudpickle-0.2.2.tar.gz 17020 SHA256 9da26af07a25431d8a3c412d4c8e78823c1298655d354f4f570ece1b995f8e74 SHA512 798b745d4059c34026a785fa32e6ac68aea689b3f4f8fa08d625eebe65651eca55211d104e9eab315c7c22dc720cbbad88cb1a444dac51ff457bff8d26c43756 WHIRLPOOL 05dd06818f6d53a2abbd936244ce6efdeaac49df0caa9a6dcabaacacd11157126f09f6432263d8eca94b913b6ff1a510c5310d56241e8ced32a4fefcf2329c1c
-DIST cloudpickle-0.3.1.tar.gz 18927 SHA256 c93a2684080011bb72fb59210c48b7259da8241bdcc6fa3f425ecca090e8c17e SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d WHIRLPOOL caa3462abe4b131aed016918525674bd3831910dffcf435f96163573ab19d71b6d0fd671a94e9b24fa1acd97cb7c8a98f2fbc2f9a9c5f16b009d4963d08c1572
+DIST cloudpickle-0.3.1.tar.gz 18927 BLAKE2B fab03106f91d475c83c25d0259fcf4e70baa96422bad84e7393967ea480ebe36412b32792a4e334f6a495c795139accaed739a3e3f3d7058352dac2f0f55974d SHA512 81ea17181710f3428bc9c80e2e4b1fa57eadd6781528ed92ce5854ce86cded0b754d98afccd322408786ce4e3a77a1c758be73f197d809dad07c24e9dbb7c68d
 EBUILD cloudpickle-0.2.1.ebuild 652 BLAKE2B d52a8644bc337b2d5e8ab370669b276bfd282b5dd10014bcf66596f99c98c702575bb07c5a0554af5b483946d1e0a639f40ca00b91072a7fcc38a50f344c2bb0 SHA512 26ea3a68f21cdf9c179d1feb96417968e85d4994e52cc361557d736577f67fad65cfc69dcb5619f250170842a5f692f6a5222066be0314cb5f3081203b48859b
 EBUILD cloudpickle-0.2.2.ebuild 658 BLAKE2B 15502a95c26d7a60d1ca3f3c034bfd3f9f7b2a91f02af46a9f67f48eb61265e0058e8fa7424b8de738aaee1392b280c15753b6b304e86ada590a0a4f8a2a6fd8 SHA512 6b1a3466b80b75e801fd08421327933b1b402de789e66ff0b07b8f47c2c69bf76986e5594107fcec3cfabb0f9b9544611cbfa7e8b74ae4449eded5b3c34ac6da
-EBUILD cloudpickle-0.3.1.ebuild 657 BLAKE2B d1f9a279874075b28845fc9ffdd02334e8efc5e9d09a18dba5eb9729935ce4877a8701b96f58574834756651b66c463ecca2a4b22a8e801a2d5f8ac16fc6f9f6 SHA512 5ab8654a03c202a9bcff94c538569a40c10b836fb7359951ed481b767712a4cb19991a019d9c0e96e3caef26c6c6986d2291d0932f70728df1c2ab9fa03ff689
+EBUILD cloudpickle-0.3.1.ebuild 656 BLAKE2B 3e5f30052c96f5bd6f3e12b7dd478665173a4ea22c35548ab5828ac875d6728cea34b5ca16e6a6ce827c38f0d4f7642a43ddc56abc276dcc297741b095431329 SHA512 86a4c1f76e6fcc295cd4533915f61a370f891f3633ac7564eab903ab2219a449199c2f874dede26fbed8b31fb3544964533c80efd14288c18a5dbef14d9af125
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
index 5eaff6b8bb69..0ec8ddf62270 100644
--- a/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="test"
 RDEPEND=""
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 8084bdd4486a..5676a37112a4 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
-DIST defusedxml-0.4.1.tar.gz 48889 SHA256 cd551d5a518b745407635bb85116eb813818ecaf182e773c35b36239fc3f2478 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783 WHIRLPOOL 9f3f51af296e3fd16b2cd94029481fbabb687c986f39810dcba331c9d3e5e30e0b294f9f1f5ce031ea28053f33be1a13e89d65ef7d0c6a3333e81dc764868d7e
+DIST defusedxml-0.4.1.tar.gz 48889 BLAKE2B 4b4225c126a4d8997e7a78a5257991da4a767b3ca8b0ffa7e1414a1342995c02a389271579329990b786f71919f17a81f093a2e4f14d10a50f88563ae4acb6e5 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
 EBUILD defusedxml-0.4.1-r1.ebuild 634 BLAKE2B bfa607f44a3a403141d6c1edec56c4c0f8274bbed35f1f7d4b92eb900eb2769e2ea5d3b84beb9556feed9023ebf4d7f89dec1040e7d6f0fb92dba1adbd007796 SHA512 c9fe185beac58bccab22be9c73c8a3afc5dfb74572092e89b6947faa16eff6780e304ad83cf885eac9dd4c5f1c31b14112b55590b608d5e1c0a7caf789cbf892
-EBUILD defusedxml-0.5.0.ebuild 706 BLAKE2B 1d9ec08c6f1c79ce9d1317065eab75f160e35bdabe9734937d8b39f20a00ca41f535dca2a05dfa8e6a6af54be53c4f73497b04c6fc5ac75bf2c18cd6913286f7 SHA512 fec3686658f227711b2be2c7290e8c999f01a3442b3eaf50c0e620e16d6d07403241da7b0e6eec41ca58cce619e1e95d3cfc5d05ce66bf029e6f4c83efe907f9
+EBUILD defusedxml-0.5.0.ebuild 705 BLAKE2B da0d98d2f7ea0b2a84c7e0ee9920215585df0e42fdceb417caee9867573609bbce124f43b6d248ff4fc1cbb0335e5b6eb907743b08ff0beb729341e07ce8a3ef SHA512 0832146ac79021494e8f706390a4a6e679e0ee0434a5aa3c8477a479eccc14f6eef4fb979ac84c0002c3dfb45b6cc64f8020cfd908d29e750b6461359c38f823
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index 45b7b8362987..f4669e0c9e7c 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 85061ec97156..5ece87ee7d8f 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,5 +1,5 @@
 AUX dill-0.2.5-avoid-installation-binaries.patch 784 BLAKE2B 74f3c8ac45a1ab97dbbcff9965c7acc0357bd8253cdaf317ccfe54294c35ef08cf328a3be0586b123365811b56546a2190eda4d76702efe7f8e5289333de093a SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4
 AUX dill-0.2.5-remove-install_requires.patch 906 BLAKE2B b8d38d701448930cf8596be8ccc3fd81f85e4f72dc2a6b64c3003ba3a21f86d41dd16ffda86c89e2e2f2714a96d6b92ebd19d05a40676e01efcf656fefcdae42 SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e
-DIST dill-0.2.5.tgz 60572 SHA256 431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc WHIRLPOOL b0af3e279ad937f36450f25711412b7e48928515e4721fee3d91663c4ec629357b6d8f3c661f1ac56d3f7343a3bef717a368386bd8983991e06a4ce0f78ae1f9
-EBUILD dill-0.2.5.ebuild 538 BLAKE2B a6b5836897287eaa0a56b19c0fc4e945b5dd4e6cca5aa90c888ec0bd3c41220ede36c303789c7a05cc6b47979924f0810f780b0988097ba8335f8f0826375542 SHA512 c2c7165d0290a89e26961c99191addf678716e7a3a7ee1235e4c5374c76b12fb20f089525fb52b9b2258e10e5aaa61922ea218ae7a11751aa1f5d659f79e96f8
+DIST dill-0.2.5.tgz 60572 BLAKE2B 43877e36cb62406b486f5619a54db0a4983f70b0a1712e39bcd77aa892fd17dc9ea774b85faa48441beaf993296a877249ff321fd0977a1317eeb25d0b020d80 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc
+EBUILD dill-0.2.5.ebuild 537 BLAKE2B c8609ba8188431be38c3f6dbb052198da721b35fb199dc26902d99f9cc1dccb5212cb30e9ee8848e1fddab2679ded5a423e5fc00ad2dadecf71754f75d40e18a SHA512 3e203cc880faf8bf69a30cdd980c0ce9e9fe057a250ebb0332d0dd931db0fbd998adcf84cdd31ee1be92a6ff7bafacba7203554c469da6471796c270c3190232
 MISC metadata.xml 971 BLAKE2B b81903b1c1e32c039f956d6bbbbd8286edc4a80432ae473d6967c16b397aead0df3746d892ed29e94c55d2e555a14e81b068c1a95bef3e87c4248f8809e736d5 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index 86628e8b42fd..069b1230225b 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
new file mode 100644
index 000000000000..ce1d805eb36c
--- /dev/null
+++ b/dev-python/dkimpy/Manifest
@@ -0,0 +1,3 @@
+DIST dkimpy-0.6.2.tar.gz 39197 BLAKE2B e52df97b03075461935e82d2acd17c6eaff8f9fb0b8217b1803dc54434ce2c002e1aa419b0293bdb130045be4edacceaf447dcfc566bef4a5e16e0651ac7365c SHA512 7592153270ea11f59dc67e31a10c91345389d4391f3a9dc9fbd1224410edab4743935763ad5b1016b321bfa7b1c4c0255f26323bd5556f359b0b743bda4e515b
+EBUILD dkimpy-0.6.2.ebuild 455 BLAKE2B 1409b88e859675a64322c6acfca9abc8709173e627c9fbf4045546fa65088b3e97df379a0d510c7a2c310f5e32e90a8f7184b4a08d01da2f83983a2a2700296b SHA512 5e3e6adf1a6744e6b01216603d47fb95797f06e091a28c5e65386a34ccef72edd29cd2cd69cdd6fd8014ff418b73f633cd2400a4df0a1ffb7025134cf76344a0
+MISC metadata.xml 1249 BLAKE2B 736b664d21c016a962c592ce53a86eb3b5de462f6d0ace935bd4b58bd241f961a8b36e652e34fd879d17142ada4772ee583cf776591413ab48f6129f1b18e956 SHA512 b26ef946ab562ed51c8437d66566bc25920428b8c87b27674d48b7e048bb28acae53e14d1b28d780bf8cd85f6cbe34021e80fdae1d76e29107e825cc0fc575a2
diff --git a/dev-python/dkimpy/dkimpy-0.6.2.ebuild b/dev-python/dkimpy/dkimpy-0.6.2.ebuild
new file mode 100644
index 000000000000..fa70db8aa23b
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-0.6.2.ebuild
@@ -0,0 +1,20 @@
+# 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,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="https://launchpad.net/dkimpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/dkimpy/metadata.xml b/dev-python/dkimpy/metadata.xml
new file mode 100644
index 000000000000..0c13f3889997
--- /dev/null
+++ b/dev-python/dkimpy/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python module that implements DKIM (DomainKeys Identified Mail) email
+		signing and verification. It also provides helper scripts for command
+		line signing and verification. As of version 0.6.0, it also supports
+		the experimental Authenticated Received Chain (ARC) protocol.
+
+		Originally developed by Greg Hewgill http://hewgill.com/pydkim/ - The
+		code in this project has been modified and development work continued.
+		This is now a fork of pydkim and we've renamed it dkimpy to avoid
+		confusion. The original author of pydkim has confirmed he no longer
+		intends to maintain it and supports this as its continuation.
+
+		Current documentation is available online at
+		https://gathman.org/pydkim/
+
+		ARC is still in development. dkimpy 0.6.0 supports draft
+		https://tools.ietf.org/html/draft-ietf-dmarc-arc-protocol-01 with the
+		exception of requiring 1024 bit minimum key size (this matches the
+		planned changes in the next update).
+	</longdescription>
+</pkgmetadata>
+
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 07f5a40915e1..d80503fc61d2 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -2,5 +2,5 @@ AUX future-0.15.2-fix-py35-test-failures.patch 2339 BLAKE2B 737ba57bc09a141ee2fb
 DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
 DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
-EBUILD future-0.16.0.ebuild 567 BLAKE2B 6122fe2a57fc8875abd46ff94312fe791c2748dd6fa64d38a112f38456fb037eb99d3e7031ad818cd193fc00994de76955161b526e66fdcb4f312498a438a6fb SHA512 25a068c71e5b3d5fad9862b2f1327a94d1b0d97cee23d9cc9a00e6e810f2509111a12718bb912feefd557e1b76c31550cb4b097b83e64cf18ebc8200a18397b6
+EBUILD future-0.16.0.ebuild 566 BLAKE2B 9c897d2c55797fb3964b4e117adcd2589209d31801103bd5e41835e6a10c202a236435e607497e11e700c3d7cd2010b8b500a0aa0c8f1da3cb4f839a9ac1bc04 SHA512 38ee962fef6da832b7b50e9c6ec87d0155d95e25cab97677e10d81d962b6e7c26d775839a6630db2c2925c7b0225103d27fa2019cfd8a094dee0c168bc999632
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index 27f85e700738..5b09cfb9baf9 100644
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest
index c7ab64efce7c..a7ce8d98435c 100644
--- a/dev-python/ipdb/Manifest
+++ b/dev-python/ipdb/Manifest
@@ -1,7 +1,7 @@
 DIST ipdb-0.10.1.tar.gz 8595 SHA256 bb2948e726dbfb2687f4a582088b3f170b2556ba8e54ae1231c783c97e99ec87 SHA512 81dcc80651f7aab54287c2b6b7a4d7af1afa6962382dbf0dfa4d436fa0002522bb3c87c82133fd2d9cbb83a4e471b611afb6f7e7c6bd6db8b0685d94d651bce2 WHIRLPOOL 3c11655ad445c0c4f985b110ecbcfe75cda84ceb2fb3aa7a4133467bae7171181a451a45c24f061f89bd41340618a4bef41e583a98160503228cd877dba760b8
 DIST ipdb-0.10.2.tar.gz 8827 SHA256 fffc45b615e46eb75becbd88a30c69c75e7164ecd0122f2c78579b4dfa41b8c9 SHA512 5bae921cf7eb8beefd26a0b3ed0969b3435d86bbff7289dd874d0a011c63c36c50683a2a15191c3d6f5ddc1d41d4ae812bbdd831c972cfbbc54258085765acbd WHIRLPOOL a0a19a56afcbe12c0910dd0b58e234b757717848b5b1f9bb6368c2620aa5e03833530959701816924fb86f90b64f6da1162c5d964f838f5b87255158ef5506a8
-DIST ipdb-0.10.3.tar.gz 9356 SHA256 9ea256b4280fbe12840fb9dfc3ce498c6c6de03352eca293e4400b0dfbed2b28 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3 WHIRLPOOL d627ca29f75a2779ff1923e88dd8b558948781e6df52b727df085fc2c6868ef481a2f77afc5d464c12339d464c79249ba806a17337ede214f9a4df3344ed41e6
+DIST ipdb-0.10.3.tar.gz 9356 BLAKE2B 50afece454d55ce3df13251afb625d93e11f7ae8d0e563ca7007e7abe0ad46b59f2e93318578992c5c7d2d25fc815d53ebed8801530d74c4fb30cc150246f415 SHA512 5f704222ea4d6877bbf6a83cb528e0e975ceebd7ee0838cd7a01f167381b80c48d3c8fc06d13a718a08ec619bfe984fd258e86ce93dba571ebdec2539db543f3
 EBUILD ipdb-0.10.1.ebuild 651 BLAKE2B d953767f3c0bd5985915a17c916e0ac12a7a8ca34c9bf3c2214871cdbe00eae511e38915a3cdbe6e35d1a0b2549a07b34729898bf56da20f922797c0f40fcf45 SHA512 a32c3f0f1f5c332da3526f28c6a09798d30b04628ec937e914a48a5d695212c9d9a77d185db4dde7d3247af7ffe1029264f819e07774e3773f7543c04ba77bb4
 EBUILD ipdb-0.10.2.ebuild 673 BLAKE2B e636b867ea4999da2c73c70b99cc702fcbad76660cd30ac33fbdb3f8e843bf0f670aec755a638291422eaea9dbd6b891326223e3df91b2cae6ac90deb11f2ab0 SHA512 b75d622cb243649d7657aa0beb918e73045d5f223b744c2faa79f37706db67b62e4822257efaf6181f57e41ff09a8657382d09c2c70fe9b7a31734ee9539de90
-EBUILD ipdb-0.10.3.ebuild 673 BLAKE2B c8035e4465135bdbd36e6d61361f329ff5e8454edd3c74c80c5ec7d2b3f94ff2dd22ed1a5d7217a6a09b3aa6c6051762d6f90998cad4cafaa27d6c13b5f75f84 SHA512 4f7160e9063581b2d7046d7e68abca4458afaf99d13180b7f8dc292fb96a7ccc2c6d29f9c79322d927a2cdeec262279aba2466276c94c0e53ab65a570f1132b5
+EBUILD ipdb-0.10.3.ebuild 672 BLAKE2B 95f1de6709121fe3ea97abc938ba22e8c16fd226c19006df150467da86285ca4b49cb539549d78a9f7708baf39ddf9cb53a91646540ad56612a7853911026f11 SHA512 dc05856526c80ef360c10c9d47bbe5b5686dce553fa0566d480d0a94bd3438a78720d5e3f49c704484c0e1f5c4843336240c45579b5191f90bdb92e55372d03a
 MISC metadata.xml 307 BLAKE2B ec524a1b59512e5f70c0d7138fb3d5ec9f8116cec0c22a3b37c335c99766c3ee338949c4dfca60f78249610cac48f4d40bc80da68ba0b5efbcb3c2d8eca3f5f8 SHA512 debb6af292a4b01925b248df604776ec21fafc3d3dca20373399a1481061392aa8e5313b07b586af6a9c2f429474d2b07fc1115e9c337c19fe0c38c489e774c9
diff --git a/dev-python/ipdb/ipdb-0.10.3.ebuild b/dev-python/ipdb/ipdb-0.10.3.ebuild
index 54268005b6cf..4441d92bf1d4 100644
--- a/dev-python/ipdb/ipdb-0.10.3.ebuild
+++ b/dev-python/ipdb/ipdb-0.10.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
diff --git a/dev-python/kitchen/Manifest b/dev-python/kitchen/Manifest
index 98eb366afd1d..38b670290cdc 100644
--- a/dev-python/kitchen/Manifest
+++ b/dev-python/kitchen/Manifest
@@ -1,3 +1,3 @@
-DIST kitchen-1.2.4.tar.gz 187149 SHA256 38f73d844532dba7b8cce170e6eb032fc07d0d04a07670e1af754bd4c91dfb3d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d WHIRLPOOL d9864ac07bb391df82049ffcd98f82a2013f6f28056ab19a7d17c59c8c345b64a0090eeac197313930391547f12412a68d1c794690798b4c434a840c5fb685a0
-EBUILD kitchen-1.2.4.ebuild 415 BLAKE2B 41835b3cf731db39c154e6d0269f27d6f516c69faf02194e2db67978e9d5d00965f8fc61540b158c021dbf5b86fb75f856b29cafaee1e57c3a832e106d53da9d SHA512 dc425a044c4097312a3988f39b0822aabae8ea0bbd65fb28414838617aacdc281853e9de1896be96134accff8b8d0a3140b4419991a550d552884961cf287953
+DIST kitchen-1.2.4.tar.gz 187149 BLAKE2B 5ea3fa593ee22680998cf9ea08b66faacc2f7e20d70ec5823a6c29d8358991e98fe79cd4bd761b04b895dd1d87b1a21e2dc31ef33c0c47a05973ea4e9b884d7d SHA512 790f7eaa16820d3b12f740d2ac7c9d849d40eea91527b7fc011270bd46af5038e987cc1b170c75c2175dc627f99a52bde52b9f276db8dac5d9d7df59ef9a505d
+EBUILD kitchen-1.2.4.ebuild 465 BLAKE2B c64f5213092e6488547e941636cc417972a81df55c27a0a429c8415685b854757bdbfa86edbdb6ae11290826847590814c6b1ca481fdbc803ff093f8535fb456 SHA512 80f102bc25825bdae53f5805270d4b9ec7e66a40171d20526fe3d3c7eed66b65b2f0140cc71e8e400e38cb739e32940bc71f66485c14fc69571fb4e55ad33d96
 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 6d8e86f8775f..8420a55ca661 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-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,3 +14,5 @@ LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 478cf8f8ea8d..0b1283413240 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,9 +1,4 @@
-AUX line_profiler-1.0-fix-name-from-copypasta.patch 862 BLAKE2B da7b481a288cd91d473763d67a7c1f9f8a995a97d03e978c256d176830a07da80f183289c15982f9565201abb36b69692a7419da739fd128cdc03eec4c3c2ab5 SHA512 6c36b574d6c031fe9c8d6dd7c59a033c5ec3dca25d675c52cea4d990e6044b5a413a347e2bd220f7912ce06e066c36839cec70af36e5153aad6c086a1d30eae6
-AUX line_profiler-1.0-ipython-5.0-compatibility.patch 11633 BLAKE2B 8a35ab5da202b306e918b68773ea3557f4c89010b11262c95ad21e36334274f2265f687a0e80ce2efd32c62a54603449ddce0b87b98cca1fb93e4c604249de15 SHA512 23019c545e348bc794dbb3c251e2f53c245723814c8439e5f00356494c9260a51fbe41efeebb97448bc206b1e1b0e6d8748318c261a5a6ffaee427fbce22bd8f
-DIST line_profiler-1.0.tar.gz 65862 SHA256 a9e0c9ffa814f1215107c86c890afa8e63bec5a37d951f6f9d3668c1df2b1900 SHA512 15dd7ee10951287a5030eaff28e729e82094ec41d8e8dec803d5e44c6b9036ecbf1198365ef43c1fdd28451dec260c6491d118f1762d99fe037bb85eb7908dda WHIRLPOOL 1fd56ea4777a3c569807a124c708018fc77e68521d1f1ecdb13c343ddad3fcd881353cd71a0af36d06a12f1dd17be0f2731040fca5e827a4936298057dabf917
 DIST line_profiler-2.0.tar.gz 68478 SHA256 739f8ad0e4bcd0cb82e99afc09e00a0351234f6b3f0b1f7f0090a8a2fbbf8381 SHA512 c0335fc69fb47c150fa5555af4f7fdf4b172ca12ee6512e04ba854c4a81f3e6ee5594e484d11c8ea7e9e8048e3f3b8661db52332d4ac645195a0e050acea4ecb WHIRLPOOL 6f4a3816fb22c86fe1c691a3e949be41da7680055db5c0909dbfb9af4052cfa50640eca43e0e918e903c23c9e6b8858ebff76e4fa21d8648084ade74f45a2915
-EBUILD line_profiler-1.0-r1.ebuild 683 BLAKE2B aeb5208e59249c514f29c738fa0cca5f3956b985db44d181016bd4bc8f4b91bdbdac215a369ec06bb2679e38578069cd767f4e7cdce2283da82988d3688409d4 SHA512 48263a069ecb191cec782f78ab1056094ee79fd951fc4a3a1cad7355f6595f39bf2f89189f953c7855a8d510be0a9c6aad41c1132e646973d643506df7a20f40
-EBUILD line_profiler-1.0.ebuild 568 BLAKE2B 9569dba79d334f72e31dc22438a40ead01a29d9480338835fa8d00c738850bb79f00d8e70aa399b129d9a000fd212d80461289db568f4c48d58a2512cb7fb713 SHA512 226f5ffc8cd8e12208d3e909504bb9cce15e9f809aaa927cefb7e16bb7ecb63d3c6318cf2ac342b1b84c6a1b5d90e842dbcc39a7acc6a02c5ea5f723ecbe8ebf
-EBUILD line_profiler-2.0.ebuild 626 BLAKE2B 0df12b44ba418979d9842ffb11aee14afd861ac3202166aa06b16ca14d3245ab1461f58680de57e71a23d5782a30f653b695b02d0c84be1c57214968820aff37 SHA512 8e93760d55b381eec44ed1f9a2f48850380fc5ca7553def3daca7df9b61d30bde61ce77e64f26029cb42b09ef4ec9e3795b7bd7a3d59682b0bd48f6336561426
+EBUILD line_profiler-2.0.ebuild 674 BLAKE2B f3223c39f2d1c22b71adff9073156b59301bd96a34f9826707344a7a6e012ed07616642808061bf8cc7b85054041268b5ae69eb8adb77de0c413b702f027ed88 SHA512 cba4c9e90871b52c89c5654dde6cdfe9a24910d9613938f69af54101afd48eff7059c34a36a47be367a97c6a4f46aab6a5d3693633b931b31ddae06d42387a60
 EBUILD line_profiler-9999.ebuild 582 BLAKE2B 5faee1ec552d26cb8f329f63785bf09239766282ea120fa4e73b51aeb24ab9bc7c4770fd74fbb34306448f2f41a1db491ffdbf5ecb716bcdda3fc1b9b3719683 SHA512 4f50a2bf39ceb6d132c74705358d396ed5ff341fd8cda88f29c8cd5427a32e65c37c5c358ea620c3ca8fa85fa52c974bfd711df465c51f1bb778a196ae923662
 MISC metadata.xml 810 BLAKE2B c33c34783a48453f89533d8b65966034b7a88e99ac45d1cd6e2bfc9732f6181dde1661fdfae9fa913440aa6e1ec168a4386b9f7d7c5a127ba6cf33cf3fdf4a35 SHA512 6369d88b7412ba45e4d38bce909c198dc35db0e163e751f35b17b38739283fbb5b6d7da23e5cf147c4fcc08ebde39c394a8cef1e32d02de273fed1ad55552cea
diff --git a/dev-python/line_profiler/files/line_profiler-1.0-fix-name-from-copypasta.patch b/dev-python/line_profiler/files/line_profiler-1.0-fix-name-from-copypasta.patch
deleted file mode 100644
index e51a24f86171..000000000000
--- a/dev-python/line_profiler/files/line_profiler-1.0-fix-name-from-copypasta.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 717df8c2088087ea4bce870400a2c99b36b0e53d Mon Sep 17 00:00:00 2001
-From: Robert Kern <rkern@enthought.com>
-Date: Mon, 21 Dec 2015 19:25:51 +0000
-Subject: [PATCH] BUG: fix name from copypasta.
-
-Fixes #43
-
-Thanks, @anntzer!
----
- line_profiler.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/line_profiler.py b/line_profiler.py
-index 4480c7b..aac01c8 100755
---- a/line_profiler.py
-+++ b/line_profiler.py
-@@ -303,7 +303,7 @@ def magic_lprun(self, parameter_s=''):
-             mod = __import__(modname, fromlist=[''])
-             profile.add_module(mod)
-         except Exception as e:
--            raise UsageError('Could not find module %r.\n%s: %s' % (name,
-+            raise UsageError('Could not find module %r.\n%s: %s' % (modname,
-                 e.__class__.__name__, e))
- 
-     # Add the profiler to the builtins for @profile.
diff --git a/dev-python/line_profiler/files/line_profiler-1.0-ipython-5.0-compatibility.patch b/dev-python/line_profiler/files/line_profiler-1.0-ipython-5.0-compatibility.patch
deleted file mode 100644
index 04caa8c6987c..000000000000
--- a/dev-python/line_profiler/files/line_profiler-1.0-ipython-5.0-compatibility.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-https://github.com/rkern/line_profiler/pull/65
-
-From 677a43104dd537b515c06eaeffa77f8dcfa5a76e Mon Sep 17 00:00:00 2001
-From: Brett Olsen <brett.olsen@invitae.com>
-Date: Tue, 12 Jul 2016 10:18:28 -0700
-Subject: [PATCH 1] Update for compatibility with IPython 5.0
-
-Also tested with IPython 4.1.1.  Replaces the depreciated ip.define_magic() method with ip.register_magics() and some modifications to handle the different API required.
----
- line_profiler.py | 245 ++++++++++++++++++++++++++++---------------------------
- 1 file changed, 125 insertions(+), 120 deletions(-)
-
-diff --git a/line_profiler.py b/line_profiler.py
-index aac01c8..7645997 100755
---- a/line_profiler.py
-+++ b/line_profiler.py
-@@ -17,6 +17,8 @@
- import os
- import sys
- 
-+from IPython.core.magic import (Magics, magics_class, line_magic)
-+
- from _line_profiler import LineProfiler as CLineProfiler
- 
- # Python 2/3 compatibility utils
-@@ -226,150 +228,153 @@ def show_text(stats, unit, stream=None, stripzeros=False):
-     for (fn, lineno, name), timings in sorted(stats.items()):
-         show_func(fn, lineno, name, stats[fn, lineno, name], unit, stream=stream, stripzeros=stripzeros)
- 
--# A %lprun magic for IPython.
--def magic_lprun(self, parameter_s=''):
--    """ Execute a statement under the line-by-line profiler from the
--    line_profiler module.
-+@magics_class
-+class LineProfilerMagics(Magics):
- 
--    Usage:
--      %lprun -f func1 -f func2 <statement>
-+    @line_magic
-+    def lprun(self, parameter_s=''):
-+        """ Execute a statement under the line-by-line profiler from the
-+        line_profiler module.
- 
--    The given statement (which doesn't require quote marks) is run via the
--    LineProfiler. Profiling is enabled for the functions specified by the -f
--    options. The statistics will be shown side-by-side with the code through the
--    pager once the statement has completed.
-+        Usage:
-+          %lprun -f func1 -f func2 <statement>
- 
--    Options:
-+        The given statement (which doesn't require quote marks) is run via the
-+        LineProfiler. Profiling is enabled for the functions specified by the -f
-+        options. The statistics will be shown side-by-side with the code through the
-+        pager once the statement has completed.
- 
--    -f <function>: LineProfiler only profiles functions and methods it is told
--    to profile.  This option tells the profiler about these functions. Multiple
--    -f options may be used. The argument may be any expression that gives
--    a Python function or method object. However, one must be careful to avoid
--    spaces that may confuse the option parser. Additionally, functions defined
--    in the interpreter at the In[] prompt or via %run currently cannot be
--    displayed.  Write these functions out to a separate file and import them.
-+        Options:
- 
--    -m <module>: Get all the functions/methods in a module
-+        -f <function>: LineProfiler only profiles functions and methods it is told
-+        to profile.  This option tells the profiler about these functions. Multiple
-+        -f options may be used. The argument may be any expression that gives
-+        a Python function or method object. However, one must be careful to avoid
-+        spaces that may confuse the option parser. Additionally, functions defined
-+        in the interpreter at the In[] prompt or via %run currently cannot be
-+        displayed.  Write these functions out to a separate file and import them.
- 
--    One or more -f or -m options are required to get any useful results.
-+        -m <module>: Get all the functions/methods in a module
- 
--    -D <filename>: dump the raw statistics out to a pickle file on disk. The
--    usual extension for this is ".lprof". These statistics may be viewed later
--    by running line_profiler.py as a script.
-+        One or more -f or -m options are required to get any useful results.
- 
--    -T <filename>: dump the text-formatted statistics with the code side-by-side
--    out to a text file.
-+        -D <filename>: dump the raw statistics out to a pickle file on disk. The
-+        usual extension for this is ".lprof". These statistics may be viewed later
-+        by running line_profiler.py as a script.
- 
--    -r: return the LineProfiler object after it has completed profiling.
-+        -T <filename>: dump the text-formatted statistics with the code side-by-side
-+        out to a text file.
- 
--    -s: strip out all entries from the print-out that have zeros.
--    """
--    # Local imports to avoid hard dependency.
--    from distutils.version import LooseVersion
--    import IPython
--    ipython_version = LooseVersion(IPython.__version__)
--    if ipython_version < '0.11':
--        from IPython.genutils import page
--        from IPython.ipstruct import Struct
--        from IPython.ipapi import UsageError
--    else:
--        from IPython.core.page import page
--        from IPython.utils.ipstruct import Struct
--        from IPython.core.error import UsageError
--
--    # Escape quote markers.
--    opts_def = Struct(D=[''], T=[''], f=[], m=[])
--    parameter_s = parameter_s.replace('"', r'\"').replace("'", r"\'")
--    opts, arg_str = self.parse_options(parameter_s, 'rsf:m:D:T:', list_all=True)
--    opts.merge(opts_def)
--
--    global_ns = self.shell.user_global_ns
--    local_ns = self.shell.user_ns
--
--    # Get the requested functions.
--    funcs = []
--    for name in opts.f:
--        try:
--            funcs.append(eval(name, global_ns, local_ns))
--        except Exception as e:
--            raise UsageError('Could not find function %r.\n%s: %s' % (name,
--                e.__class__.__name__, e))
-+        -r: return the LineProfiler object after it has completed profiling.
- 
--    profile = LineProfiler(*funcs)
-+        -s: strip out all entries from the print-out that have zeros.
-+        """
-+        # Local imports to avoid hard dependency.
-+        from distutils.version import LooseVersion
-+        import IPython
-+        ipython_version = LooseVersion(IPython.__version__)
-+        if ipython_version < '0.11':
-+            from IPython.genutils import page
-+            from IPython.ipstruct import Struct
-+            from IPython.ipapi import UsageError
-+        else:
-+            from IPython.core.page import page
-+            from IPython.utils.ipstruct import Struct
-+            from IPython.core.error import UsageError
-+
-+        # Escape quote markers.
-+        opts_def = Struct(D=[''], T=[''], f=[], m=[])
-+        parameter_s = parameter_s.replace('"', r'\"').replace("'", r"\'")
-+        opts, arg_str = self.parse_options(parameter_s, 'rsf:m:D:T:', list_all=True)
-+        opts.merge(opts_def)
-+
-+        global_ns = self.shell.user_global_ns
-+        local_ns = self.shell.user_ns
-+
-+        # Get the requested functions.
-+        funcs = []
-+        for name in opts.f:
-+            try:
-+                funcs.append(eval(name, global_ns, local_ns))
-+            except Exception as e:
-+                raise UsageError('Could not find function %r.\n%s: %s' % (name,
-+                    e.__class__.__name__, e))
- 
--    # Get the modules, too
--    for modname in opts.m:
--        try:
--            mod = __import__(modname, fromlist=[''])
--            profile.add_module(mod)
--        except Exception as e:
--            raise UsageError('Could not find module %r.\n%s: %s' % (modname,
--                e.__class__.__name__, e))
--
--    # Add the profiler to the builtins for @profile.
--    if PY3:
--        import builtins
--    else:
--        import __builtin__ as builtins
-+        profile = LineProfiler(*funcs)
- 
--    if 'profile' in builtins.__dict__:
--        had_profile = True
--        old_profile = builtins.__dict__['profile']
--    else:
--        had_profile = False
--        old_profile = None
--    builtins.__dict__['profile'] = profile
-+        # Get the modules, too
-+        for modname in opts.m:
-+            try:
-+                mod = __import__(modname, fromlist=[''])
-+                profile.add_module(mod)
-+            except Exception as e:
-+                raise UsageError('Could not find module %r.\n%s: %s' % (modname,
-+                    e.__class__.__name__, e))
-+
-+        # Add the profiler to the builtins for @profile.
-+        if PY3:
-+            import builtins
-+        else:
-+            import __builtin__ as builtins
-+
-+        if 'profile' in builtins.__dict__:
-+            had_profile = True
-+            old_profile = builtins.__dict__['profile']
-+        else:
-+            had_profile = False
-+            old_profile = None
-+        builtins.__dict__['profile'] = profile
- 
--    try:
-         try:
--            profile.runctx(arg_str, global_ns, local_ns)
--            message = ''
--        except SystemExit:
--            message = """*** SystemExit exception caught in code being profiled."""
--        except KeyboardInterrupt:
--            message = ("*** KeyboardInterrupt exception caught in code being "
--                "profiled.")
--    finally:
--        if had_profile:
--            builtins.__dict__['profile'] = old_profile
--
--    # Trap text output.
--    stdout_trap = StringIO()
--    profile.print_stats(stdout_trap, stripzeros='s' in opts)
--    output = stdout_trap.getvalue()
--    output = output.rstrip()
--
--    if ipython_version < '0.11':
--        page(output, screen_lines=self.shell.rc.screen_length)
--    else:
--        page(output)
--    print(message, end="")
-+            try:
-+                profile.runctx(arg_str, global_ns, local_ns)
-+                message = ''
-+            except SystemExit:
-+                message = """*** SystemExit exception caught in code being profiled."""
-+            except KeyboardInterrupt:
-+                message = ("*** KeyboardInterrupt exception caught in code being "
-+                    "profiled.")
-+        finally:
-+            if had_profile:
-+                builtins.__dict__['profile'] = old_profile
-+
-+        # Trap text output.
-+        stdout_trap = StringIO()
-+        profile.print_stats(stdout_trap, stripzeros='s' in opts)
-+        output = stdout_trap.getvalue()
-+        output = output.rstrip()
-+
-+        if ipython_version < '0.11':
-+            page(output, screen_lines=self.shell.rc.screen_length)
-+        else:
-+            page(output)
-+        print(message, end="")
- 
--    dump_file = opts.D[0]
--    if dump_file:
--        profile.dump_stats(dump_file)
--        print('\n*** Profile stats pickled to file %r. %s' % (
--            dump_file, message))
-+        dump_file = opts.D[0]
-+        if dump_file:
-+            profile.dump_stats(dump_file)
-+            print('\n*** Profile stats pickled to file %r. %s' % (
-+                dump_file, message))
- 
--    text_file = opts.T[0]
--    if text_file:
--        pfile = open(text_file, 'w')
--        pfile.write(output)
--        pfile.close()
--        print('\n*** Profile printout saved to text file %r. %s' % (
--            text_file, message))
-+        text_file = opts.T[0]
-+        if text_file:
-+            pfile = open(text_file, 'w')
-+            pfile.write(output)
-+            pfile.close()
-+            print('\n*** Profile printout saved to text file %r. %s' % (
-+                text_file, message))
- 
--    return_value = None
--    if 'r' in opts:
--        return_value = profile
-+        return_value = None
-+        if 'r' in opts:
-+            return_value = profile
- 
--    return return_value
-+        return return_value
- 
- 
- def load_ipython_extension(ip):
-     """ API for IPython to recognize this module as an IPython extension.
-     """
--    ip.define_magic('lprun', magic_lprun)
-+    ip.register_magics(LineProfilerMagics)
- 
- 
- def load_stats(filename):
diff --git a/dev-python/line_profiler/line_profiler-1.0-r1.ebuild b/dev-python/line_profiler/line_profiler-1.0-r1.ebuild
deleted file mode 100644
index 6dbe4b315ca2..000000000000
--- a/dev-python/line_profiler/line_profiler-1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 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="Line-by-line profiler"
-HOMEPAGE="https://github.com/rkern/line_profiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-name-from-copypasta.patch"
-	"${FILESDIR}/${P}-ipython-5.0-compatibility.patch"
-)
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/line_profiler-1.0.ebuild b/dev-python/line_profiler/line_profiler-1.0.ebuild
deleted file mode 100644
index 802d85e74204..000000000000
--- a/dev-python/line_profiler/line_profiler-1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/rkern/line_profiler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	"
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v "${S}"/tests/ \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/line_profiler/line_profiler-2.0.ebuild b/dev-python/line_profiler/line_profiler-2.0.ebuild
index 81d586184a05..48e524a993c3 100644
--- a/dev-python/line_profiler/line_profiler-2.0.ebuild
+++ b/dev-python/line_profiler/line_profiler-2.0.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
 inherit distutils-r1
 
 DESCRIPTION="Line-by-line profiler"
-HOMEPAGE="https://github.com/rkern/line_profiler"
+HOMEPAGE="
+	https://github.com/rkern/line_profiler
+	https://pypi.python.org/pypi/line_profiler"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 KEYWORDS="~amd64"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 0f1f87c7fa37..cb9e9d42dc85 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,9 +1,11 @@
 DIST llvm-3.9.0.src.tar.xz 18235716 SHA256 66c73179da42cee1386371641241f79ded250e117a79f571bbd69e56daa48948 SHA512 f18ae32531218ab156c3e56c11826be0fd05f0799c82eaf2e6a043b38e1277560b4d921987513b88b11d97ea2619feaf277eec72181dd2ae4f4108c2836bf7b2 WHIRLPOOL a36c1bcee6e7995067a9a7a51e3fdb0f10d51d0239250eefab92ed2e46b024a203fa10a17a25a5aca69046bcb413628e288427f1a6690d0862e07cd95694c8a8
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
 EBUILD lit-3.9.0.ebuild 778 BLAKE2B 7f9d3a51fc7fb8a55a240cb1eced1e7ba92c4624e91098b7585cec9bad86c81bbe9b0c325bab0963b1bb3fa5e0df1e9f6e60c8efc1fb0e74f99bd17ed3cfe197 SHA512 016f2dd37dc1d09e7ab480a9e6c0373a3c76266c5d68ccb9f98f249f82ba1b3d3f9a86359f9bcb41e9dc71f3ba82a4b81b9103d33bb07b16acb825ad71d3a3c6
 EBUILD lit-4.0.1.ebuild 813 BLAKE2B f7abe7a9c89456e829bcf6f623397c67f844fbcd983121e86ca428861b00277c316de49d42311a22ed10fb8379274d5e36758e1d196ee5498e58e4361576f0f7 SHA512 c4c218edcc07d56913d8db443f03cce7192bcbbd695837c16b7c1570aa0a4f8be2c777b964e03207ed3cf7021bc0ff10fe2bf6e73a91d2c682f41be85b5963cf
 EBUILD lit-5.0.0.ebuild 762 BLAKE2B 8e101bd1c8987452fdc9f77fc03c61188076e70c3fad22f2cc9adc4874c7072e5a3c964c66365c61adef6336a52865d4dd4a30aecc57d9b335b18c6629f63ee4 SHA512 47e1442c6ec4005737145556d900fe0bb4e763c1042cc3014c7374b6dc9fd88b5ffacb50211f0a833de5b0dd7d2b869cb293d8da72405a4f827dfe59663c1fec
+EBUILD lit-5.0.1_rc2.ebuild 867 BLAKE2B 559173b1e98ed5c0522dd894585fa8f4480d7713f26fad6df1dbe183501e2a8ae6c37d6bbdaf738d8f7d140d8711318dedd1441e1d1e67ebe9fdaf7f846307d5 SHA512 93173ea3b6b28af06b0753de25574ccb52ea2dcce4405a6bcb6d8aed17466540fcdaf2b257cadbd19ed4265e21fa81672842837ea3bf80e4c39949ca0f5203fb
 EBUILD lit-5.0.9999.ebuild 850 BLAKE2B f0246f716ba99660e500f296de9d66f049fdc80b4953a37739a72d8f3ad0cb5b734db2905f43b9b5c2c646cbcd2c7c0b1083266a3279a5039fec3af1adae1019 SHA512 283f04a823667461300591b23bd53910b5908493c8ab2143a13118068e19e6c76dd681aa892a0da1107843867555609fbe65ee6441c4d1a56012b79ece82b88a
 EBUILD lit-9999.ebuild 825 BLAKE2B 3230ba990c48b6248d105cc686f61732f016faeff0d60b51b6fd2c17230a36fff985be2f7cb841bf05d618f2e4b690e526d858f6c28a2a5365bc2e18c1eeaed8 SHA512 a577f9ad3ec2f639fe05c14a5bfe4d132df4b5257ddb07eea15719dcd66a29cb7460af644a6e838249f32337565dc17c1ce0c8370f8c7bc559051360dfb53353
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-5.0.1_rc2.ebuild b/dev-python/lit/lit-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..786386f1e7fd
--- /dev/null
+++ b/dev-python/lit/lit-5.0.1_rc2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+inherit distutils-r1
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+}
+
+python_test() {
+	./lit.py -sv tests || die
+}
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 5b36670df6e9..63830f60058c 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,8 +1,8 @@
 AUX markdown-2.6.8-dont-build-docs-default.patch 387 BLAKE2B d3ecf07d57d8aae13ecb686ac289d4938ec8e50d643020ccac13b147a5b018a75b32f10ead2dc2bedba309ab6ae3107346ff43155959fdf3e1053e0a9fa13cb8 SHA512 71f7534ce557e061c4f09b9a78aa05fd1e3f16f44c55d5597fa4901c0349f7ec7d0093eab655950812e2cab6d607377d2a15a6583009cb90ae32659c6949cfff
-DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6
-DIST Markdown-2.6.5.tar.gz 301781 SHA256 8d94cf6273606f76753fcb1324623792b3738c7612c2b180c85cc5e88642e560 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3 WHIRLPOOL 752414989f7b3ba04f4f4d8b9f855c9d64f816c61b4d6333e1b3c15b2aadf6579f1b1f0a686ca3eccfc3fcdaac8007c6655a0f331d795a8a0b07ef83dda2465c
+DIST Markdown-2.6.1.tar.gz 298074 BLAKE2B a02c80d34793d480a6872e304ade7436738bfdbb675f46225a6b6807a5e584b7132070ccc4617bce23106b53315acf1f2d933005b402fe6735179fec97d13f0b SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78
+DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376386c27355f386de8a0dd89e2bf0c1d6cadb0ff937fa3825655ab6220901f7b17ea2d184f3b3d178cbb54af58b8 SHA512 d966136a7184ada4eec70af661aba441694a8c4f59e57d59a28dfbc1649ca1e90cc1e4a29b354b3caf35362e1e0c96eeb3f46c68f82d7a898b76c08866d459d3
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 EBUILD markdown-2.6.1.ebuild 1262 BLAKE2B 00d62a618cca711ddeb1979dd00c5d486382d16c46d213d23fd8e9f764e75294bc4a04667dd16ecfdf25aa7a7adccbada7adb8623e7a7ebf6b8aaeacacef4bbf SHA512 ddaac99dd6fc3f2dcf1f2cfd14d8401058fe729fea31bc82f949cfe168fca6d093634b98eef3868f80bdb7a5386e2b6b1e87eccab17f969c60dcf365398ac41a
 EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca
-EBUILD markdown-2.6.8.ebuild 1455 BLAKE2B 4326c9b9d3e9acbd528d82ec37f1f81eaec307f9639ae215246e3ae0253976a251d458407e60360652dbfcdc7b76c8e2fdfbcd5e52c3f8f8f1fb5416f3a3171c SHA512 aaaa73a8dbb1ddf8b17f50919714ee932d346ae0397d7459153aeb32a1d3618cb65c169075150bbc2fa5b05c26092bcaf0ca0b65879571a0591e577a795c8429
+EBUILD markdown-2.6.8.ebuild 1454 BLAKE2B b4661f0594179ebdaf3111853cf05b9677d6f7b5076c3e3f71f9102854b3e7c1a726e9f3aeffc813f7c27963ce61f2a98131f37cdd6a368149ace6899500b42e SHA512 f9da0aa4780f1ed3ff90855209c85baebe89a6f8726e6de5216fe40562dc19d411e3c144f2e319e0140c2c8ce2ff88ab988ad90bc3e8a413166bfba40f3f5409
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index bc09e02e4591..8730c07cfabc 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
 DEPEND="
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 7087597f4185..83f9f08a5849 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,6 +1,6 @@
 DIST more-itertools-2.2.tar.gz 19807 SHA256 93e62e05c7ad3da1a233def6731e8285156701e3419a5fe279017c429ec67ce0 SHA512 579a778b91607800c4000a30c7509e9fc44ad1d35598ab9041b547aca9d94b811d3fc0abf5c84413fb70be87eb20177685a8a30dc7146a005fa1eb82986294f8 WHIRLPOOL 75ad77394757b30709700957f20136029100eb0e6a42ca7a031a54f0bc71fc926eb552c1b29b0b92af175a618ae826c6380c2919ae3e74d60fa3423e352a9c37
-DIST more-itertools-3.0.0.tar.gz 37622 SHA256 8b791474073fbaef17fdcd148e33a62fa80ad6edd6eb3f61470e1ccdd30fa182 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c WHIRLPOOL b420ef8fffa4751a811eedf456e83812016d16f3f30ca63073bfb3f602b5f8caadc8f556105b63abe057252952b938f6db1e6dbef89b008d61c4c45b8a063941
+DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
 EBUILD more-itertools-2.2-r1.ebuild 847 BLAKE2B 7e930048017e959f7c560d1c5c06d63624752dc140d191ea2704e3d7eb8f50cf78c6f14bb7355af26ec788198082024773345ef5cc9028a7140c339b78934a3e SHA512 c67d4cbfc5ae1a47108ec059f1889bd051b9234b8403ab1a98ed61423e7e6312733fc3398c4039d75775295e682e8e212f887943395016ecfbfa9fd844a06845
 EBUILD more-itertools-2.2.ebuild 435 BLAKE2B ce5021e3d905d6ed1a1c61f2a3f75a47952eee45c9114476be79ff6f94fe4795f0872cb1cc396315c50d0be946b6499a3682117b2cab7291edf978a545389e33 SHA512 c7fd58b1a94f6fbe85f94ce955b07dae86f8310d22d9307728cb6cb7c812b821a57735e409722c4aab2c7cf79b16433691f08e3d86ec1353ada87c2cc3dc04ed
-EBUILD more-itertools-3.0.0.ebuild 928 BLAKE2B 801f2ae31e48d7eea8b2f226a3859deb661dc81d2a3ff7fa832647d87db3d60463f2e2ac3dbdfe4fb02f77917be868cabd606f93478c9dabdaad952cc2214bd4 SHA512 b4ac506b68698e1f6177823a0be9b7a359f0ba0872ea69a6760d0ac8225de9c9e5b129fa7196eb791c0021e60358432ac53f313893f41d96bdffd50c43d39bdf
+EBUILD more-itertools-3.0.0.ebuild 927 BLAKE2B ff00c65dbe228df221be9e8b3473ef9b18ff076ae4799dd054896a3abfe04633cd371040fe555c45862cabf4cec8c098fc3e8eeb0b936e4e76fad98d04fb4f78 SHA512 17f7d60010f0be40b8ed8b1b5d4643f1b9790444e5f3fd75a01e3195dab2e43233429862680a63c0d505d74b3019f125eb7ac540d35d82a751b6d15557df10d5
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 2c99e4fdc761..056b7f100063 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index baeaf6276cff..465281a48d27 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,8 +1,8 @@
 AUX mpmath-1.0.0.patch 422 BLAKE2B b79a223fb3d6c712a11e225c4f617d68cfda595ad314fb33ba02333eedcf39909f9bf76c98f004619f62cfb4516172615b8e79017362807980b1c61724423543 SHA512 a5c7c8816d7e4ba2dc481480a887d94ca158fee804a01e86f91fcea037372217ed8b029f85f6a0c15558b44aaf56f6fadf36b4f7476713a04a66f18b6f1ab997
 AUX mpmath.patch 434 BLAKE2B 1d7c2a6d8d99efc75fd4e6ab5900ee88c8b75a809a8776c3dd9fd390200e5d184423625f8a9549345892ae985e4237727d39d821ecb2503d29a2d78b6417f967 SHA512 2ffc7ffa375f5c25d044974a8b1fac145a00d9b1f190d12e1ade6cadad44dae11098617de5ee0a523931f046b4cd0e785552a3de6f66f438052955b6987bda39
-DIST mpmath-1.0.0.tar.gz 511349 SHA256 d32ba7afffbae688229a15f54fbc37c11f4989e4fac628c99b3c5b6889aee03d SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7 WHIRLPOOL 5dc18ab6f81a529c06bcc968dd3e9da0a5123740b2a5b2829e98b303b5e3d8208956122a7fd7698ad275d4246aafcbd1756bc0922801d32a535b809cf749b3ac
+DIST mpmath-1.0.0.tar.gz 511349 BLAKE2B 62c6275f76c412043cdafef51815e4b5d055a63ca36f3f63b33957351b19e03419ca27f7d59641c580cf8e47c1ca45240b68b3040e2749b3de679eb45b15a28e SHA512 b225f237008e1cfee52b2f0dca0dce1445b932b6eaef92879d7feca30d728e3f88810bfa80882ad8776ba846a636807e59bebe0b9f690cd878c089e9418bd8b7
 DIST mpmath-all-0.19.tar.gz 2123129 SHA256 21a824db176799f42843e4510da4bc6db36ef92b5a43fff70fad7e29bffb9c86 SHA512 5a6ed0b5fad84c1e8399467ea7a1295f9b77c8e673b821c11e3298e88df6c48d9967eed84e2979bf12868e2f9b42bffba01a0c1836a6d82ac42d5f423fed6580 WHIRLPOOL 360fedc4d6942a138b33c63867f8a5e4ce4c101a8f7221c61503933e75073807676cbb240c9bddea765159cb134efd608256c9b921b7d282763b57d2897eefdb
 EBUILD mpmath-0.19-r1.ebuild 1384 BLAKE2B 6aadcbff6fd2a2907c345a6d2e1025a3f6669b416e19ba06f355df8ab65cd71b2ed3f316a87295ce50a3b38f8974153634d83adeac8033b33bf4473df0e22c4c SHA512 a250ca3659c948dd59a4f3151ee06fb5e0f4b9c9e51ef3edb757ab9f743d4f2ab28865531bc2db486333ddfda0fe0e69184c58af8a33bd8352327849ff0824ef
 EBUILD mpmath-0.19-r2.ebuild 1390 BLAKE2B f820b249bae5761a167af070fe0a3255698ddbccc47eef896db7666aba22f606c7ac975e88bccaa853ebd5bd63a31a12fc08f2089f48fd03f65d43b23aef3015 SHA512 a4128b69fea1a8f4d936645fe9bee6d19e5c9077b088cd377c32c1541d140f1f2da42051fe194abaa914c2d1cf68cdb0e36df71ed09a0b56e6ad42f8ffc2c6a7
-EBUILD mpmath-1.0.0.ebuild 950 BLAKE2B 04ccbe11aef942a46a988b12ca0f98d55dbdb102248be56fa467e8c8fffdad515388283d352991953551013b63c9dd8a0286d2fc32064085b15022897f2de09f SHA512 aa8ab23422f1112237157e92364838c580469abe4a6f4d7a61aacbb0ba38928f5abd700955449cd586104500d3fa6d26d59f62e89e86c6ff018281105c1d8501
+EBUILD mpmath-1.0.0.ebuild 949 BLAKE2B 754a1b4fe71fd30363daa59304106e4887f7fbb8567872d2eff73bd3651516d9b74f664014521580f2696a717e9472301321114ff60d5f4e80032834fed6cfd0 SHA512 1f66dacb4c67b2a132a45727bc2df816760537f69fb3acd109f601c3e0108d793c237546dec4f9bcd26e87b2a2e2817b72436941c473438670491d79482ff08f
 MISC metadata.xml 650 BLAKE2B 520b0399fbbae4307a4b3979202b4d5c8d1b06f739e0c0460a9a0be63b78152b50ab3f7fdc9b46623cf7afaeabbc57cd35f3865462f3b16ce2beeb0b8f8659a5 SHA512 0f999aeb354c73658f916cb8d3a80dcd216f50f77839c0c854e9235566cb197a7d047ad51045996fc0b9e1c47f55e934be9dd52597fee16fcce6360bfcbe8f08
diff --git a/dev-python/mpmath/mpmath-1.0.0.ebuild b/dev-python/mpmath/mpmath-1.0.0.ebuild
index 5188ea6aca99..2b17f2bde3ad 100644
--- a/dev-python/mpmath/mpmath-1.0.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://mpmath.org/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="gmp matplotlib test"
 
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index fd5566fa90f4..bed65c373fdb 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,5 +1,5 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
 DIST oslotest-2.4.0.tar.gz 26392 BLAKE2B b34d478f9d18cf6582544499555c6daae5cd47e47731b17c835833b7cbbb65c652602c6642c0c682b0690dde495f5014b454a3c9e0a56b2f69b278935ebadd7c SHA512 20dfbf555741e72cd9ba41c0432e8c8af01ae7c07a9a740f71055f900a994790b420aa062313a59cdfddf4c80b7ca2aa0ee9ae2ee645ad525cbafeae3db68886
-EBUILD oslotest-2.17.1.ebuild 1843 BLAKE2B 6bf2f9e54eba4cca61ca56b52349235c1af84f3b7347cffbd2ed1830fe9b47af27ea9eb7c47a6b4d45a734181716eb525c7a23d260c1300c1d02c30cd78752be SHA512 e50284b6546017119d3c8b53063de09f90ef244916ff457c23f9b87e0ee5d3a5c8b2694cf6a37deed4e313698b4d069a63d6b93f68dc588bafb6526c00166bc2
+EBUILD oslotest-2.17.1.ebuild 1812 BLAKE2B 93311c5c47231e120c2818c3436ff22604166f1d874f4f9c3ce35053a0894a2400e80e3dc35e9e7befd57ffc0b31e995f8e515bcd90e86721084a52ec3c680ac SHA512 5f1919d1df7bb7a1ca2d175dac76aa2d5c3fdf6a6eed281dc688098c67027380398870157be6e524cb033c6ad983c68b043a22064fdd2d09689f4c886f06858f
 EBUILD oslotest-2.4.0.ebuild 1720 BLAKE2B 7d9c6693e8e416509829a3e670bddaf35437f3a7534e4dfd955a3bcb80ecc002154c92cf813f5a5c8a3b2794799de82fad7cfa950010016cafd6793f7d5b25d5 SHA512 aca409a3cfff3da8358de290b7bd119a2a13a9b0e4c142cefd8ecd29230dacf4e84fe70f196bd0e4e415f8e263b300210d56c0dae057b2ea68ff030549fe86f1
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-2.17.1.ebuild b/dev-python/oslotest/oslotest-2.17.1.ebuild
index b030faf9630f..c77840476418 100644
--- a/dev-python/oslotest/oslotest-2.17.1.ebuild
+++ b/dev-python/oslotest/oslotest-2.17.1.ebuild
@@ -47,8 +47,6 @@ RDEPEND="
 
 python_compile_all() {
 	if use doc; then
-		esetup.py build_sphinx
-	else
 		esetup.py build_sphinx -b man
 	fi
 }
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index 8a4d8663d200..ac7efe11d0a2 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,3 +1,3 @@
-DIST path-and-address-1.1.0.zip 7652 SHA256 c9cbea6919464ff2bbe441b996341e97d112ef876d8eeaa7ab127fe9fb811471 SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062 WHIRLPOOL adc380044564ae44390e9a9c882cbb0a0afb1f8d111480eef57a65c3cde611f415f2220d36d8dbfe0d76871e50643dd99fca87e88266864388c5eeb3a3f8c1ec
-EBUILD path-and-address-1.1.0.ebuild 407 BLAKE2B 0731d1b6614674ab2e2f32b54dea4c911ffc4c429782e7afa1815a1361f6109d95d86364f71a2b4dc650be302083b6fe63421b2ce1b0398e2b0dfcb4f3dd5a7f SHA512 3641394fe3711ddda8837af77fd738e8a2f66583f865c1cced43b3c7735d211874df30842d6a02ce4a920867c729b52ccde14957446f64999aba519702d5d478
+DIST path-and-address-1.1.0.zip 7652 BLAKE2B fcf80494a2969d4b59a96ca6cd6f9dbc03a56b11e4374e64ea59fba18859b50eb8621d506b28472713bce8aaec6e8d9f26ba763b82b726df439967aa3c8a75be SHA512 eb60fabce6a71401b4681bcc1db5253c2043c33bd25f9bc8bf678d45aa459e2398ed482166fa0f85a0365ba8762a46e75c6c497ea25b6c1ba5c91d6a37618062
+EBUILD path-and-address-1.1.0.ebuild 457 BLAKE2B ee4a99deb3c0ec3791825a63c64f3ca813dd31efcef8911e7e6fc0ed0f8a68f2389f1a0b1fa66552158e8024d6e1a4a61ca14d368f1c88236b21f0bc80c552fe SHA512 5253f2dfe86a3f51a4e26d6cfaa6759dcf3e54eb2665cb6e6fcd6064a3d889aeeaaa099259d9517279fe62e3c43b221a0d4772ce6eda3f70e938011e0723e982
 MISC metadata.xml 372 BLAKE2B 9f9a9049c7217b83000616bcfaea1057a2395b6599ab5c0ea6a0da8fc9eb817d16995c29c51c901bc329b5b649a091c5422b2d4ee412f314f9692e4e884aa149 SHA512 4d300dd69614b1ecb51799e501301294daae24819f7c7fbdeeae73cc9bd9fca49cf96a12441828ec67f7c80ce6f7b0bd8cbc0e32a178673b2053e93afa8cfeb4
diff --git a/dev-python/path-and-address/path-and-address-1.1.0.ebuild b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
index 174f3ca7f76c..e752aa3869f5 100644
--- a/dev-python/path-and-address/path-and-address-1.1.0.ebuild
+++ b/dev-python/path-and-address/path-and-address-1.1.0.ebuild
@@ -15,3 +15,5 @@ SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pew/Manifest b/dev-python/pew/Manifest
new file mode 100644
index 000000000000..1f800ea905f8
--- /dev/null
+++ b/dev-python/pew/Manifest
@@ -0,0 +1,3 @@
+DIST pew-1.1.1.tar.gz 19629 BLAKE2B 9db83eeee873c1a9a542372562cbadda37d6d5d52ed220c7018390291a96ae1adf7e168c4213cbcadad04a6cadb7115aed53eb7a8561a0ee0e58dc9137ac5257 SHA512 9b59ab51d4685b6203a944338d8fc5ab0ac65b442adb7861fb3f2ed7437ef8a02f1f87e234fc70124245625ac7992500c11e51902a98511015e90f1ac5e56b46
+EBUILD pew-1.1.1.ebuild 696 BLAKE2B 55ce7ed6f1295f206b4ca23098c0138c68e6cd18052509a9b316ff150998a921d66d55d23903c67b1887b7394a10f059d5a5b8fe6275eea8c78ef339fa953305 SHA512 df304a3dba6f87aabf0e81e28cd6b726fc87d876f76190b5257b7e56f46093ca221ec1cc4425490e6b55baac5ab6fe424c71dcdd5ef3d620e7d66cb27774c845
+MISC metadata.xml 446 BLAKE2B d4be59a9c95d607bc67b12d4fe5a5310dfcfa5a251e022fb9fb0ffb0a57aaf51c47331d735b76eb651718adfd627d72ae9afa315c9703fe639dbf67ddfe411b7 SHA512 81ea90c5b887670e5a5d1f6933c503fdbcbfe1b59034bc8656a5ecdd5aa954a35edf3aa46b3c5d591194d2f964d4fdf30ede9270d9dc06ca7676b0f864bae20b
diff --git a/dev-python/pew/metadata.xml b/dev-python/pew/metadata.xml
new file mode 100644
index 000000000000..ad399639de19
--- /dev/null
+++ b/dev-python/pew/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+  <upstream>
+    <remote-id type="pypi">pew</remote-id>
+    <maintainer status="unknown">
+      <email>berdario+pypi@gmail.com</email>
+      <name>Dario Bertini</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pew/pew-1.1.1.ebuild b/dev-python/pew/pew-1.1.1.ebuild
new file mode 100644
index 000000000000..72bd343b1730
--- /dev/null
+++ b/dev-python/pew/pew-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="tool to manage multiple virtualenvs written in pure python"
+HOMEPAGE="
+	https://github.com/berdario/pew
+	https://pypi.python.org/pypi/pew"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-1.11.6[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-clone-0.2.5[${PYTHON_USEDEP}]
+	>=dev-python/pythonz-bd-1.11.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pipenv/Manifest b/dev-python/pipenv/Manifest
new file mode 100644
index 000000000000..96e82b5a58ca
--- /dev/null
+++ b/dev-python/pipenv/Manifest
@@ -0,0 +1,3 @@
+DIST pipenv-8.3.2.tar.gz 3843733 BLAKE2B 81e154b65a0024eb2587c70adc37e5419c112f737c58f4ae53fa1249092a52a6ee762784e4691a3a847026a955a9bbd2df4ccf949694da74db18915609c667c9 SHA512 bd2d1cf4a7a171fe94147064baf5dc73b7a7cce81d13078f214d4cc586541f241a8d174b99ed2009fca5607c46c42dd9839aa172848af63f708d922ca88c3138
+EBUILD pipenv-8.3.2.ebuild 916 BLAKE2B 5d1061042016a5ae5642f0f29820c02d333713ec39bae99a4c0a05c9f92015a864d995175ecc0a1362464d96f8508dbac8a0a9db1e0f6d493a4994ca1169a775 SHA512 041a15a0f303ff7d1d00cf00ddc2c1f9b83d89a06e6af5dba5b5d0e45f256833f0f62881a4b8fb9eaa4321df87e18728f74797eb267b93f9fb4440bed953c6b9
+MISC metadata.xml 445 BLAKE2B 71ce759695adf862ea00805dc1865487ae2b4bccd94af567240463b8935463010c4c8945fe3ba58a216afae1066de9b8659ea0ec216128c9017ec42e52bed3c9 SHA512 15d259d0f38fbee2fb0d9765934eddc46c8bb1a6da7fc656f3b2b006c74aa1b0ffd8211e9d9c23f241113a8ae3a333708acbf351fa1a150084b127b4eab88795
diff --git a/dev-python/pipenv/metadata.xml b/dev-python/pipenv/metadata.xml
new file mode 100644
index 000000000000..b87f6d34740c
--- /dev/null
+++ b/dev-python/pipenv/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+  <upstream>
+    <remote-id type="pypi">pipenv</remote-id>
+    <maintainer status="unknown">
+      <email>me@kennethreitz.org</email>
+      <name>Kenneth Reitz</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pipenv/pipenv-8.3.2.ebuild b/dev-python/pipenv/pipenv-8.3.2.ebuild
new file mode 100644
index 000000000000..ad3b06ecf502
--- /dev/null
+++ b/dev-python/pipenv/pipenv-8.3.2.ebuild
@@ -0,0 +1,38 @@
+# 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,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Development Workflow for Humans."
+HOMEPAGE="https://github.com/kennethreitz/pipenv https://pypi.python.org/pypi/pipenv"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/flake8
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pew-0.1.26[${PYTHON_USEDEP}]
+	>=dev-python/pip-9.0.1[${PYTHON_USEDEP}]
+	>dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+# not completely packed
+# requires networking
+RESTRICT="test"
+
+python_test() {
+	py.test -v -v || die
+}
diff --git a/dev-python/pretty-yaml/Manifest b/dev-python/pretty-yaml/Manifest
index 11a6c068ab4a..8480f773d648 100644
--- a/dev-python/pretty-yaml/Manifest
+++ b/dev-python/pretty-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST pyaml-15.6.3.tar.gz 14459 SHA256 2df761472d0974205b779dab469903cc9ddf257dcd126acc4a97b9d4c970e662 SHA512 9d0789342f59adfc415bef54cdc52b75cbcf1fa71940e1b9534ea0c141c5737449104e45fb0feea968e58d0886a74d9a5bbec0ba05b7d72cf5d93d3a674b5868 WHIRLPOOL 7c2e06dedf40c7c13474824090bf1f5a0453d2d955d446053479be93388c55b30480dc41eaec32a31a2303ae1971de5902922776a48c6d54cdb107a2356a1786
-DIST pyaml-15.8.2.tar.gz 16544 SHA256 9c54fb5f17b58572c4cef50affea60bb73f445ab153580dac07a12383712b5b8 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64 WHIRLPOOL 8f443fe904e1da77a78a3a2b8591cd5526b4bd7a07e736d959ad842aede43d31c96391389f666796ec4497b03cd79e72582b5f4b4bc6385c5627ab65ba8df09f
+DIST pyaml-15.8.2.tar.gz 16544 BLAKE2B 1e9820c172bb0c2e05c78f5dee3299c6bb0d83e2c658f3cd45322abac3404af1c9dd1f3b00e2c7b285cbd00c17d382c82cbb16b96bbac10021a0ca1a008d0287 SHA512 74f1fdacdd601f0b6f710457627e4dcbc42e7301fe5faa061d3e8d593842d6e5dd85041625aba576bba9cda2a713ee07ca3067221a720cbddc6dcd417fccee64
 EBUILD pretty-yaml-15.6.3.ebuild 742 BLAKE2B 048510603225c8cd10a58a9abfd808928b4da56276fc598bd3cf142c327a44efe433400065fa309658ff9505be937d7f360e5d614295217720a2c8676f5eee36 SHA512 8dd9b33127109b69e409eda665707a7a78a79ab03a0fdbcbd9ea18c976441102ad4c41a0d0a854db74409d9df305f10808c014eec1c7893766c8bfa0d2d9575e
-EBUILD pretty-yaml-15.8.2.ebuild 762 BLAKE2B 7c8f755a7365e64732138697da20be2bf54822df8ea120aa2014979476418952c0087b09b47a09e23dd90b5a7e42b4ec15816a800bb010d19cf383ce24db00aa SHA512 2f2ecc6e9060767b47fb2077c287978016cd1bb5a81685baba6f01cfb1ac62725bebc5d6aefa472f9cd43ab4954ebd5a5959b69013ff3b53306b73d75af4cc09
+EBUILD pretty-yaml-15.8.2.ebuild 761 BLAKE2B 193e8630477157339d5126d8e58ea93a08163d59e157018c85c8228c3d0417bdf7c40a899e8fa1f53ee4cb654cf672d00bb8931eb66ec1f838f55fdb6ae01a98 SHA512 14d2a7a8710a63aba7db70e204ff0ce916c5ee622b622b7946a18e549b6859a5befb8944e8b4f9c943a45c199340f736616d57de8a95bfb3d179865bb37f4bc1
 MISC metadata.xml 444 BLAKE2B 522c0c3698f3c35b698b255504afbcda02c321e542ba7013fb0e3de4f57334b31ee014dbfdc8914dd2760a621ab1724a9142029d506d8fa44831726ae7c2b6a9 SHA512 70aee75c33eaa54fc003d6879ada0d4fc772d00619273c7b0e7c5829dcffb8ba23171c563e6e922504d9256f53ee207b36b98240bec3d084a8e6de15e0013732
diff --git a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
index b0fe54c3d392..d70f5c6f9e98 100644
--- a/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
+++ b/dev-python/pretty-yaml/pretty-yaml-15.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index ffe2ec52398b..199accd7cf8e 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,3 +1,3 @@
-DIST priority-1.3.0.tar.gz 13827 SHA256 6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a WHIRLPOOL 45fe643b70a4c3cb9e3600e73475384a5b339acbb0a801be8c0e6c190bc2e3894443b28c3b691b3c555250175d6d313808c6bf7a0fed3b586c9fe7beb3b4a843
-EBUILD priority-1.3.0.ebuild 880 BLAKE2B 3a9d2bd7e7f92460f0d77bb7f85b08b1f766b38119059127b8fa62b9e06d309c6df13f74d921e06bd43686e1d45b020d6a4de4c8d34cf8d5507f21f9e5dc750c SHA512 c345547014321276fa00b090e9635d88bc49336721e89c4ae497bda7cb9044e25a86307ebf209bce5e2aa777bc8488f81296274803b720b3dcd997f7f39ad8b2
+DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
+EBUILD priority-1.3.0.ebuild 921 BLAKE2B becf0c75505e129927a874b3d88e25509a1874c07250d39768ae26adf24854df77ad3162832b07ad45d5dfea4e1a780fe8d0dc35d32588f246900034a269c406 SHA512 806d3dc6408ebb7fa102decc753f14a7500795e9c2504f5add2ef587299eea4bbb5048f25279c1766abd8e2e7afb8dd7d1166ac84e8b4b9291868c27764db81f
 MISC metadata.xml 965 BLAKE2B 995ba35e35f65373d880ad299082ea6f3c18f9b434400ea20f3132a7ac6097b5161a536351f2d7abd1d39ba198b77ab5018fd175a30784094c01365c43b8d890 SHA512 bddf7fe4153c705edcf710ccca4cf44875bd8192f80ef0811cad7028e605983f1a8c5b219c82cd2911e77150fb9e1b729450b9e12ba7dd5dbd2f23c89a4028a5
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index ed2cf6f6c385..09f46e5a9e33 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -18,6 +18,7 @@ IUSE="test"
 RDEPEND=""
 
 DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pycollada/Manifest b/dev-python/pycollada/Manifest
index 4c34f6111f99..b2ad4c7b4187 100644
--- a/dev-python/pycollada/Manifest
+++ b/dev-python/pycollada/Manifest
@@ -1,4 +1,3 @@
-DIST pycollada-0.4.tar.gz 519732 SHA256 62a69cce29759900cce0400dac8796d7210de1910dad4c60d4094248c7738121 SHA512 6e9569b858f2014aa08764d0bf328c8317b94edc91e99c2a7c97bf2355983555ea103012d6e6f197862cb3df113ca9263de18fc47edb3c60e74fa8e58b5ca8b0 WHIRLPOOL ce54dcb29cab7e1d97ac8c2eaa3718182373dfa79c7647c7c46f5a2afde88bf7832f98db4a89bdfb58964ccbab041787ac17a25dabc148e963e0739bac27780e
-EBUILD pycollada-0.4.ebuild 1222 BLAKE2B c16fc8a5a92d240c71df7a5546349ae97ce35125eb6de5da678e2bc5dae7b3f0a5008a04faa08317f0b695e557ee65415864b0105e306928f762a09f1d952e60 SHA512 2052333ded6165cda96290846334b38b0c34714a79eff0fe0bc42b450eb6c7259ab5788ecf1416bae55b3fa936cfcf4b5b2273b62305507cd32a1a1a36c839b6
-EBUILD pycollada-9999.ebuild 1190 BLAKE2B 50b768f6243d1f3b088a58089c76fb5bd45171d8e317e99b07babe4380c6afda18826ed5187cb43a70f6dbc165d00ba8c55e6b6147ef2143cedc56dedd711b63 SHA512 b0b3142eb3117f4e0db3a6606eae1768ef623c25886f5a23f0b5172a5798718f8697df94be2646a89e6e530951c1c22d549c3904954f5f7b95f193ce5d0a8ed8
+DIST pycollada-0.4.tar.gz 519732 BLAKE2B 9fd9b7ca369943cb6b2d9960b343ed39a9e578bb2e94c06d5e7c027a814220b13ff66d6137371edab150befd4b4301e9cf5420385f7dd3ad72dc11a38c38afa9 SHA512 6e9569b858f2014aa08764d0bf328c8317b94edc91e99c2a7c97bf2355983555ea103012d6e6f197862cb3df113ca9263de18fc47edb3c60e74fa8e58b5ca8b0
+EBUILD pycollada-0.4.ebuild 1263 BLAKE2B 5ec572af9cf78ad57a863e26f0f5e60cfb84db0404b284efc45ba85c03fae3f896840a82bcd3a8e3e25c1e2e939c93847b33c9675f08a14e9876e1c4ddab29d1 SHA512 f220da283c4bfca03b0c22c14f9a7a9693e8f50dd271392252f435cbf4e8eb3a813d7928807e57a3c572912cda156c7e27b18d4e1e5f7c335b9a392baddf1834
 MISC metadata.xml 327 BLAKE2B f1ea87e797a3f8379e6f5cc0b84b7fff48f28b56b71ba4b17fa1a12cc8148dd2a09176ae5fb1f727f1cb0a260cb395f184c2a1bb4109f5450e8bc77124531f12 SHA512 a413c6d76aa3a80cf2f32c4cc75760c0574019eff6d381c1f46aefe4bc7924e59f28d593691b2ac7bb0a7afa7fcdb11a264f3bbc600bfab61148634282307886
diff --git a/dev-python/pycollada/pycollada-0.4.ebuild b/dev-python/pycollada/pycollada-0.4.ebuild
index 2f8bf9700865..91e85d338acd 100644
--- a/dev-python/pycollada/pycollada-0.4.ebuild
+++ b/dev-python/pycollada/pycollada-0.4.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
 
-DEPEND="doc? ( dev-python/sphinx )
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx )
 	test? ( dev-python/python-dateutil )"
 RDEPEND="dev-python/numpy
 	dev-python/lxml
diff --git a/dev-python/pycollada/pycollada-9999.ebuild b/dev-python/pycollada/pycollada-9999.ebuild
deleted file mode 100644
index f0b16d863454..000000000000
--- a/dev-python/pycollada/pycollada-9999.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 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} )
-PYTHON_MULTIPLE_ABI=1
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="python library for reading and writing collada documents"
-HOMEPAGE="https://pycollada.github.com/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/python-dateutil )"
-RDEPEND="dev-python/numpy
-	dev-python/lxml
-	>=dev-python/python-dateutil-2.0"
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc ; then
-		pushd docs
-		emake html
-		popd
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		pushd docs/_build/html
-		dohtml -r *
-		popd
-	fi
-
-	if use examples ; then
-		insinto /usr/share/${P}/
-		doins -r examples
-	fi
-
-	install_test_data() {
-		insinto $(python_get_sitedir)/collada/tests/
-		doins -r collada/tests/data
-	}
-	python_foreach_impl install_test_data
-}
-
-src_test() {
-	test_collada() {
-		for script in "${S}"/collada/tests/*.py ; do
-			PYTHONPATH="${S}" $EPYTHON "${script}"
-		done
-	}
-	python_foreach_impl test_collada
-}
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 51d5dd2d3d0b..1bc0be033f2e 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,4 @@
-DIST pydecomp-0.1.tar.gz 8793 SHA256 4abff74b3d8814bb48be523d3d3ae91eb28e9d8e7fc887d909dcab09f857d6d6 SHA512 027925589da745bc34f87bf7845dd34f1feb61221bc48b3490e56145f3aef5856dbbce16ea36cc0a65e913b7fa8c042a914fbf9e1e3d82e26f98f8a6fbc6da5c WHIRLPOOL 7f5469291f9c19557adafe14d1dac894d5066391d759c2053f0c600b1bf2fae7543575586fda197af77be2c282a370814331ca07d376ca6d6b7495fdec234321
-EBUILD pydecomp-0.1.ebuild 1244 BLAKE2B e81747b4fea5219fb1b552f45e6b53bc763985ab23a15ac8f6fb43b1faf398eb71eb9b20ca70bc9f4d7134ae7d011b02c515dec6a0d73e46bfc43d689107a2b1 SHA512 0c0d9f2817f008363e7fc54f00f75edf448c190bbf09b56f1547ff8da85ff26408d00245917e95460921fae248ca376470915f2496fbca36ba8e1dac444bfbba
-EBUILD pydecomp-9999.ebuild 1244 BLAKE2B e89d836bdb5611f01b0cb3ad12f8f0e2812b72b0812c0fad25d1fe04cf168046c9e3b8c6df9cc1a957b187451c0b04c687af183d8d7c718a043816e5a1f95538 SHA512 4ed7f64bb6c18f9172f466f2f59be654b1a05c144526036456a8dcfb88f947da72311a280349a23853283bb8eb4461bfcea2946be9b8e5f7bb616dce5cd22348
+DIST pydecomp-0.2.tar.gz 9819 BLAKE2B fc2078b00f152e598599b1fc4b1239035d1d21789689fb49605a4c3afb6d9201a1b1635d6f1971edf98fef8de02caeb6ea5e6bae1fe2b21f546e8a712ca94949 SHA512 1cec8ba501cf6223740c50751508a83f474a9acbce811c82f6d8beb5536ea8ce9c1d04a218503acd13b6eec8d9a68ef4b712049a7e0ae94ff34ba05c6f50ebc9
+EBUILD pydecomp-0.2.ebuild 973 BLAKE2B a83d018c4cce344da3aebe2510497435f779ec19dea46693a87cd881d1232a20b70cae241bedf279ed9fac89332e1b7b0f6d7f8cd4c34d56060d7c452568673a SHA512 e936a0480345bcf53574250c1c6854d70a288c59f97d0d9ac136fc61d3377cf1899852db8fe2791758b50d45ea6a534a92c60befeded03a987ef7b92a2b5a6cd
+EBUILD pydecomp-9999.ebuild 1245 BLAKE2B 43296d7b9f499162f48989d2eb61f090fe94fdfeb4fa5b2ca82da9f31c406ccf681bbba9ce1d2a976a2e9bd6b68f44d3afb48d2c53c45377a600365980cf7ceb SHA512 4d7a54d420c9151150380a71b35c5995f838ff2eeebeeb7120933a6cb270d4381fa9e5af1a27d96da0f3b5a6c730312971cb9a61360c3fca4becf2ef8e6e9e9a
 MISC metadata.xml 796 BLAKE2B e83d6be3e1700f9be8b80c72d0d30868757a53d225df068d58991f945d7089a0769efe1fc7984f1a8a218e54d4a25b81c4a9ce7d2fbe28f2d65f9419b49a0d64 SHA512 ec96d316559404d556dee6f64807d44a4b201028000d4ba527743b2f6f18fbd3354e4dd5cf811512edf9bfc7cd1ea176bdb7c6ce1e04efc154b0f8f564c675c7
diff --git a/dev-python/pydecomp/pydecomp-0.1.ebuild b/dev-python/pydecomp/pydecomp-0.2.ebuild
index c53046276087..2a4799a2e0f3 100644
--- a/dev-python/pydecomp/pydecomp-0.1.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.2.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 python-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
@@ -30,14 +30,7 @@ python_install_all() {
 
 pkg_postinst() {
 	einfo
-	einfo "This is new software."
-	einfo "The API's it installs should be considered unstable"
-	einfo "and are subject to change."
-	einfo
 	einfo "Please file any enhancement requests, or bugs"
 	einfo "at https://github.com/dol-sen/pyDeComp/issues"
 	einfo "I am also on IRC @ #gentoo-releng of the freenode network"
-	einfo
-	ewarn "There may be some python 3 compatibility issues still."
-	ewarn "Please help debug/fix/report them in github or bugzilla."
 }
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index 0f094d46e1c6..c25e7e24119c 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1 python-r1
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	EGIT_REPO_URI="https://github.com/dol-sen/pyDeComp.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 4bfadbb0e276..6199c3bf34cb 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,5 @@
-DIST pyglet-1.1.4.tar.gz 2946835 SHA256 63a7936dffe4fc0475617a4d804a4b63ab13949cb30afd3c62ab98d8384f7ff3 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64 WHIRLPOOL f31dc562b940454766a188d0ce9ac8a462a9c24e995d28cacafe1437c1f1dc609410b748d9a31f2fe8c85aac7fbfa4bc54ec2c5470560f31251af64dda258c6c
-DIST pyglet-1.2.4.tar.gz 2122017 SHA256 9f62ffbbcf2b202d084bf158685e77d28b8f4f5f2738f4c5e63a947a07503445 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d WHIRLPOOL 24aa15be5819d659274a65eb39a3dcc44c74ddab3d48f8755d1a927427ce4bf05e07b6ebc3a92e1b06e8a1de97f599cb52c506732d3ec6a8a76346c9efd241c9
+DIST pyglet-1.1.4.tar.gz 2946835 BLAKE2B e6dacb162b0fc16440edaec8340ea2d99f59db85e3cacb9fc52aa406eafa595a78c91ec0c1d30091928d9a6090163d799dc75aa5d570017aa010b8a48f2e1d91 SHA512 e1acd2e145bddbed2da1e8d66222b7057ecfcc97f93f4972741e87ec8584a944e2cc0c972aa985cb1f51e0dd2e4bbf1332201e8eb66f29945cfdac1b9ac63b64
+DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1af7af0176c6f75409c76981fa16752bbe14c9b5ec871438f5468b3587e7ce12194241d94ab3731d46cbbe395f1 SHA512 70cd781936db8c8c156499e524ee73520bc90c19461074264abd62a4854307ef090af5faba521686f247fb4cbee552a428892f59a5b382429acfc000f4c2e22d
 EBUILD pyglet-1.1.4-r2.ebuild 760 BLAKE2B 281cd44370ee0b5d8808c32c94d679e660ed86962efdf2969ac5525a47dfc006de5ab73c4200c1559d40f85c53a2104f30dc0b712821fc06b02909b1fdacdef6 SHA512 3c2f9f55d6e0fed6b19fb804487cb2a4f0d33e3d9174333b2bab5405b2b9e145e1fee6fff59f350241f2ad3c7c9879d99da85c76d12cee21e7bca8228a7dcdfb
-EBUILD pyglet-1.2.4.ebuild 944 BLAKE2B e57799ff6659855e2bb561f29ab1b4f31bf39d3fbc0ee6f54c39d0506e095c0d46924293e33d45bd9714f7009c1f72b218235dcfc04e7f9fa182e48636891bd7 SHA512 c5f8a593c2c60172bdea8e7ddfa3400cceae8c44f7c4a51d0d22a7445563433163a191190aa2d8ef7d408ff39eae85f1a18dd7b8f62e55e087f0c3a5243182de
+EBUILD pyglet-1.2.4.ebuild 985 BLAKE2B c6369cca35efe851bc175c1122340ef29535d5358c2224632c882567b0ebfe6aa1d059de7b9f47ea72b810ef96f0aedf4e05feec8a88c7c03f04e347902c8cd5 SHA512 b6c2267d1b9c83dca92aa7b20a631756ccbda51e9ac79dda8de98ba2f9e2db923d54ccf8e063e61222c0f90232f31c4b3583427a45b9b367fa7f41eee7b93341
 MISC metadata.xml 893 BLAKE2B b2c9d0381d98ba205738e1fee69cb1a8952060c5d0095d134d84136af35fd38da8f81cca964a1ad748e615cb9c443b18f53a31f436a8356c83725423e16e8b64 SHA512 2bf1d8f350103309d98bda2834337acf488726e3ee141509f3423c46695c87d2a61557dec3d3c0e523815e09fd3d02eb3411779b4ce2fac05b83425401480269
diff --git a/dev-python/pyglet/pyglet-1.2.4.ebuild b/dev-python/pyglet/pyglet-1.2.4.ebuild
index bfe61697a4ae..28a91921aa95 100644
--- a/dev-python/pyglet/pyglet-1.2.4.ebuild
+++ b/dev-python/pyglet/pyglet-1.2.4.ebuild
@@ -21,7 +21,8 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib[alisp] )
 	gtk? ( x11-libs/gtk+:2 )
 	openal? ( media-libs/openal )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 #	ffmpeg? ( media-libs/avbin-bin )
 
 # pyglet.gl.glx_info.GLXInfoException: pyglet requires an X server with GLX
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 7cfac54a0373..785e64c2b313 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,7 +1,3 @@
-DIST pylast-1.6.0.tar.gz 41307 SHA256 6bf325ee0fdeb35780554843cf64df99304abb98c5ce2e451c0df7e95e08b42e SHA512 2e47eca2282da8637d5fc79b8fc6784f6f7e9c88975f10e5f162be1445f81dbce0a01c6d7e8ff14162bc3b48a8a4171bf4c81239b17fb08ea5c6b1eaf432f18f WHIRLPOOL f76dbae7326c2b973c8ac1e68e4f31145e449a37d5a342f7ab551cdc737fe529bf9839b05f74d67805bd97aa66f7808a56abea6f57bf0e74390a33d59aa07179
-DIST pylast-1.7.0.tar.gz 42433 SHA256 a482a769b6a037e2e9b78433de91a287eaf6aacff60bbb2f4562c3c7ece10430 SHA512 c5f983f651b4d76a004d5521ae3a76d05dc3b424523be365679b7a35f11a5a83894e2bc18365b058b254935fa804575631eacbde4b37d1e2f3d7eb325eeabab4 WHIRLPOOL 04caefd6a7aa11dda40f270587c0a9cfe393c9262411f802a429e5ba893e7320200ba2e8942047f7d583b0e76e4f7edfc2b5671b223c98084287c7a2b255a4b9
 DIST pylast-1.9.0.tar.gz 42584 SHA256 ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4 SHA512 ff3929583d88466738c9a1e964676652717c9f5bd4631f1a0a7855903e77cd394a612b0e2e8fc2f698ac84a34a135f4e940ff7760c2c88bf388ae56fc9c3da65 WHIRLPOOL 701e11a314c60eec50196103c916c107729f5f233d9a00173813f7f33393818a7a4a7b860bdeaec8c680072ca25604acc13d30ace0575623ffa5159da32b14d7
-EBUILD pylast-1.6.0.ebuild 520 BLAKE2B e2b6c3b7640f607ecb13bb77a0027f7d3e24178e3dd93a1eb24caf1292350819d36650421576d1f8e1707766c01cda6f2a8615a2e2e739340c6deb9285a36e03 SHA512 88526859c67c2fad9f07ce6895b6cc8b5397b371e07797721ab3781c56b390fee333efbf1d69e2532658e666a916ae3a12b793fca21e73cc3c3a600b6751eb7d
-EBUILD pylast-1.7.0.ebuild 522 BLAKE2B 122c5ae60af16602dafae26e06c036835d715c683dc355c222b553991bc43102a0f98811d5f6914390cc5a89503898887852ad77e310f25f55afc763d1904681 SHA512 2cb54583b888efbc2a64bb82e5ff03071ab18dac797461882b8e2793ccb1fda5bb8c9aafa627418385d04670f5b83b24830f547f556f30204494929526fa1eab
-EBUILD pylast-1.9.0.ebuild 615 BLAKE2B 17d2db8d17ae106eb4287362f70de64e41d75d7283e063368a42fde5035bde8e7474c89ac34a31c558435d0a2b99b126b938243e41864df1ec63f3be42649c75 SHA512 44addfd9e7d1476edf84d7e491ac55173d53da9d729da632bc879f61301ab098beae67856c74aee86bdd572b63fb83194c62625ea516a64fcf2a6a5840121c59
+EBUILD pylast-1.9.0.ebuild 613 BLAKE2B f36e3672132549f7a181239fb124eed87f21b8b33e2c9834c6181a533db06cd6958f7e8d70ad8f90fb5b568615e6624461049857c034c59da83e53e406859859 SHA512 22333b033b80fc8df60748c0498fed4d9e8320113a62fcc7e41a76f4773899be00ef1a9531e4068119b8b314ec3e9aae0bb9f575d835475eb341b11f7a349ed3
 MISC metadata.xml 894 BLAKE2B 95fd1131de748819af98fcb484c6db7d90d9cf78794dbd9d1d06ebe755020bb09b9ca1d1a232323f4afb409c58a85098fec00994307939ba22fd07fd5de9ea73 SHA512 c5eba42bd263c572e7c73a6df8daa3aad56407d4f26eb1560e1a2fd21fff6a4228522d2c4493481ed7e767e24818cf82b6076ff00937d4214ef25b91986f42a9
diff --git a/dev-python/pylast/pylast-1.6.0.ebuild b/dev-python/pylast/pylast-1.6.0.ebuild
deleted file mode 100644
index 65641f2e94df..000000000000
--- a/dev-python/pylast/pylast-1.6.0.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=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pylast/pylast-1.7.0.ebuild b/dev-python/pylast/pylast-1.7.0.ebuild
deleted file mode 100644
index 4a99492062fb..000000000000
--- a/dev-python/pylast/pylast-1.7.0.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=( python2_7 python3_{4,5} pypy pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface to last.fm and other api-compatible websites"
-HOMEPAGE="https://github.com/pylast/pylast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# As the testing requires a last.fm account and online access it is restricted
-RESTRICT="test"
diff --git a/dev-python/pylast/pylast-1.9.0.ebuild b/dev-python/pylast/pylast-1.9.0.ebuild
index dce10b85fb36..27338bb36722 100644
--- a/dev-python/pylast/pylast-1.9.0.ebuild
+++ b/dev-python/pylast/pylast-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 3a19620bd15f..4e88d5c844b5 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,3 +1,3 @@
-DIST pyproj-1.9.5.1.tar.gz 4424543 SHA256 53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324 WHIRLPOOL 5ddb28a2ee6bbc3e50a0d76355f51b93c50c078459a6bc582f6a1538abbe349b45b0fe3bbc195e751b575ef5096a47ee6e88cf8e5dd4c69b9e917589da29ac05
-EBUILD pyproj-1.9.5.1.ebuild 922 BLAKE2B c9eac149084fae7386bea81b8d1cf119a6abcc99a35872ae0912ed7693358d4127ff43e82ea2d6dad11ac1ca8949aa68f88a1fe4e1ca8a091cb76d69605b8aa9 SHA512 cfff518e73bd3d75a10e018d6bc56ff1fee5f3820c8c80fd77bdc6233994123ed335339f475cf3c4c5bb50a4027c711d8701324a7dc4838259b2e399dcdb3df5
+DIST pyproj-1.9.5.1.tar.gz 4424543 BLAKE2B cdf954ec0fe794f354b246fcd5afeac01b796f84cc2456efce3e289fcfb12074d7352c9fa7e9d74356199135dfa9814c07da9379f85771dbb7130b8b9b7ecc34 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324
+EBUILD pyproj-1.9.5.1.ebuild 972 BLAKE2B bf7e670aac0f20db59428c4251e326fd23c13eea9f59851fc8ece78bab690b2fc3b04729a0a1010845137fd4d2f4af2a112ca76aedbb043bd419aa06b07247af SHA512 63c0b8c12255dda0d300ad6f4264801f626b5030accbee651faaccd29b8991036a6de03c3925749ecdd9e611098ef46d386f7bb923b03a0fbcb2f9c66796198b
 MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
diff --git a/dev-python/pyproj/pyproj-1.9.5.1.ebuild b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
index 1f67541befb1..a39b855d09fa 100644
--- a/dev-python/pyproj/pyproj-1.9.5.1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="doc"
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 	append-cflags -fno-strict-aliasing
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index 24df81ab6f54..b6df3f76feed 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,7 +1,7 @@
 DIST Pyro-3.16.tar.gz 298769 SHA256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 SHA512 d0e4ae93120a6566a2b06fa52b66e20daa972324a9d57d639ca68171e1e6e5c412250f7e6af3fc307631d2270be3731ea5898ad35819dc0369e6a2d8341d5965 WHIRLPOOL 0d7efcead6bc7a31a690c012a4213c835d43ca932e461ab25ddb2e12636970de2c3da6feb4915385bdadaf2261558d2041d5e6dad9899f11e450aa0a065460da
 DIST Pyro4-4.41.tar.gz 502294 SHA256 3af4749140e9d4032632277ac19e7fd4761856d2df0f0643c574d1e7174a9703 SHA512 01c3f16448b39cd7a83c845eec86013315ee183a3e50c6caee1d327308e67ff63732833b413b189ebcb77cdb3fc65bbd7417ecbfc8575775ff79550678bce020 WHIRLPOOL 4ff63737b01eca22bc1dcd7e61a81ad3285c90ac1e03764edffe85b003eade780a936bbd74773f8d58d2a34dbe562bdfe332c5dd8ddd052f5a3928caa736d882
-DIST Pyro4-4.56.tar.gz 455253 SHA256 a80c27e1debbd8d8725ee4a8f0d30cf831dde5e80b04bfa9c912932c4c13d6aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef WHIRLPOOL 0e82a13c2bf5e23c5fcbf844417888fd2e02270a12d465c6388397c913bbb06ebdc770d3744593d66b9b30ffc30aeda03a50dd934db38840ba1baeeb80961ff7
+DIST Pyro4-4.56.tar.gz 455253 BLAKE2B 3c63963bc2e248706727324078898c3e2cc9b8b32d228c0f2b87aab776a0e3437f72096031b8658c756988814fd823fa2dc1c8df0b971cfd0174b437f25bd0aa SHA512 88805f5d7108432f98d38267a7a881e35fc1e34ae32cc7a1640f4b6e0d69718a86bf195fb4e4eecbd53075667521585b7006cd5c5736e5ff1ed39b5212b91bef
 EBUILD pyro-3.16-r1.ebuild 742 BLAKE2B d17dc38fda6791964780cbafdf563e6c57a17cece50be875cf1458f4683ef69c2589784a71257ed78d6e149bfeb3c78ff6db09d3fcf88806b8505f697c338985 SHA512 5bde2f3ac26eeb775f29a368f1ff5dcb19d12a82a6f627041aba861bc20125c64c0fb483a9e5c158ac7f6b3544eae029a77961aac5a3c00b13f0c23aa89e80dd
 EBUILD pyro-4.41.ebuild 1915 BLAKE2B ba21ddef6f94dbf5b10460e734302c96e2fbab47a7fbacd1bc270ff2fb31ab364b513576f8b0a771888abb9ddfd7c89805d661ad1cab1b1a6db72f458ff4e297 SHA512 92ca5686041d64ec368ec7f8d31b6560f04c55d4f2ccc8e1f462469e1c44fb8a0850b9c7f33af29c67740da03687a59153933548bfc4cf5c116b789ea0b19a9d
-EBUILD pyro-4.56.ebuild 1916 BLAKE2B e7497ccf2248c3ce733c817886cb9baadaca67a4957db733108df817dcb7f56bb8f29b883b5eb88e98d745cf38d44cd48d7141659c2a7c0ff1a4eac4a45ffa56 SHA512 906cfbbe2f4524a5ec626dd4d6dc8d7cbb902862a19d1599b82da1a420dc20f0326c4779ffc5e92b8deafd2e3e04450cc42f473717a88c6bec4255fdc16d967a
+EBUILD pyro-4.56.ebuild 1915 BLAKE2B 220cef9d3664bfd96d95b0a454a5e4dcac30fe363383febaf2ee3af1ccf27a7105f373d2b03a8a57c6c1803221fef4f84b56c6a2c4b06beddd1a87e3f1730ff4 SHA512 6d45d8716dc121b741b209e8ce1ccd0616c1d9b2e726264bdc20d37a91310a623fcd45741b0bd9bf34c0eeb286cfbf988cf64f2ce7287de46c0b50bbb44f46b8
 MISC metadata.xml 370 BLAKE2B bf0ecf2b63d7e544a1193349f0d171d107d23e66a067012cdd0ecbc4b736631e3c78fabc0745e88efe711219e8c3ce187da3ac67f4477f8bcf4996546a56a94d SHA512 59ce12c791648049dcaac68c75f9d8af472635442b25c4ba81b37e89d913b5b1954dbc40eac44694e5093008cbc41256ef2a177de1906598bb876ab0ab17d544
diff --git a/dev-python/pyro/pyro-4.56.ebuild b/dev-python/pyro/pyro-4.56.ebuild
index 20fa5b7ebec2..e7aeb8d27b90 100644
--- a/dev-python/pyro/pyro-4.56.ebuild
+++ b/dev-python/pyro/pyro-4.56.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index af1a68a7281f..e3b32a8466ac 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,3 +1,3 @@
-DIST pytest-salt-0.1_pre20170731.tar.xz 30084 SHA256 9c3a0b2a82e5ff22301ba5e6321319345b37de88c32d91d51c559e68b86fee11 SHA512 700072c9afef3c78ea4fc5cdbc54e28fb9d0635744cea07fa187cf21665f211eda05318d6a945c1dd6cc7a944bdf608ae2d8f78448d0667cba4984fc2fa2c75e WHIRLPOOL f8dd3a2033eac5c2f74638e76bae1869fd1e5b0969a0a98c100908ee78ff6f26d53955b589819215c731a4161c0ce0fa83dcbcbaa5d535bb4f5813ef10ebbb10
-EBUILD pytest-salt-0.1_pre20170731.ebuild 359 BLAKE2B afe99c53f290d43cd2cdeea0e2a935cfec9fb2ed555bb0f37f78259cb3ab7ca6985846cefb5e8441a1e842bfb18a86340e479ed18324668dd37a26e1bbe90c33 SHA512 8cdbd3d54b3c7480c12b225a38977456ce172d94225e02235b69e8425227ce7568b2e37170f8958b460185ecef12d85e7ccb0015694e94264e88c096f19e9c56
+DIST pytest-salt-0.1_pre20170731.tar.xz 30084 BLAKE2B a86159900aa4710d261e117aa745010ac2d977d852cd97ee366e2871d4c6a3e12c9769481d1de697d8df10f4c8b1f3366b93807de05257ffec590b5028ab2dcb SHA512 700072c9afef3c78ea4fc5cdbc54e28fb9d0635744cea07fa187cf21665f211eda05318d6a945c1dd6cc7a944bdf608ae2d8f78448d0667cba4984fc2fa2c75e
+EBUILD pytest-salt-0.1_pre20170731.ebuild 429 BLAKE2B 417d4a8f0e2301081a2100758c40e23ae402ac013f13596bf28a23eb1a5606060719b8183d6876906ac61c1a6f9cd3f2cb50c053876592e488063735e05ea486 SHA512 9ebfba1d505366c8af3bea215ec4c25d3d630553c4fdefb0d5569c3c6a861cef177831ef6f0a3630472504a8ae4d94f6df3f19f5c8cb763d3120c02b24ac540f
 MISC metadata.xml 328 BLAKE2B fab884918d24353a3281a69d6ce042faa916c0fa3b8e33d6acac90e85b487f31d97388d64ab59257b0e9cb1aaa8891c7934f87e4b5a2f36a5f0cb621e937f264 SHA512 7cbdc338820fd09b283ef5686c59a1a7138a3b1e0b315daa0d6e4e4e0cf1f87b1802128ab03939ce24fa1b97954de7fd34096f9d734bf20e1ee8e99276e95941
diff --git a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
index ad6ebfdf36dd..6e5e664f9a1b 100644
--- a/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
+++ b/dev-python/pytest-salt/pytest-salt-0.1_pre20170731.ebuild
@@ -13,3 +13,6 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 16a8645a5b05..ea52d3cedfac 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,7 +1,3 @@
-DIST pytest-virtualenv-1.2.11.tar.gz 9528 SHA256 4d3fe63133bb9c8a191a7d5388ca51b6938e6d1388d04f650dccbde5790dabb0 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41 WHIRLPOOL a3b48cc848be1fec76e7fb7980e0c0faa2ef1749e3097c6956e7b83b8cf7a69eba9f1be8d2c4846495c2ab9efd29415c4961061e0206896744328c62c98b1f69
-DIST pytest-virtualenv-1.2.5.tar.gz 9480 SHA256 ecd883d6bc9cd70f66b4297dfb0d04415b013cdc3efb8b8a0b917a516b50d22e SHA512 7d437346c3b4aa96078cc4fa8f0b6c83b173572209e71a74c77098ab4e8ad0c571c0932c2b413123cd73f47a4eda36d0c0ae3ece2866afc2d1f5092357c7593a WHIRLPOOL f3fb869b85a5d582afbd297c3dedee6f864e53efcbc11cd5d199649fb0df048ac42f17a25ac2aff1c0c876ccb664361cb6b57865a143899a3d6c75cf6817fbb5
-DIST pytest-virtualenv-1.2.7.tar.gz 9836 SHA256 51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755 SHA512 046bfe20a08f6081c21a01bb4137b0bb481fddb61ac2cbf1a764dfec1eccf7393236e4358fdfdb5e982aba01cf3ac457c4320c2f56fa542542dd9721403bf9ec WHIRLPOOL 183fe45480c84dadbd34006c92c3d72220ff3e0321781013ff829ad2392963be5d17316a17719bcdd92f51407d7433f73380d3300f631f75fcd354a7b58b2411
-EBUILD pytest-virtualenv-1.2.11.ebuild 803 BLAKE2B f0e6a17108b797eb254f9f4fb9717e88c6173f3bb028a3c7c344daa84b9bd6fdba7706c6d98f99d0e42564a79a6e36c7f73a9fb5999cf5183fa573be08bd8a8c SHA512 411863ceb48f03e5e93612e2706ed01af2e594d57938e580840cd5ef53c9cb49a062f298f85fff37ef32547bb657f0899877f8d86f544a35f05694529342076a
-EBUILD pytest-virtualenv-1.2.5.ebuild 752 BLAKE2B e10acc260a05dbce5df60da6754b7eb410215786acaf71d3e30bd130d3a381d5d91e72a1e372eb7ec3dd7c363ae480dda7c2a3a3790d3be729122e88b74b3e2f SHA512 9a0396df7b3c190bc6b1f48afbbe2666f6a2fbcb57391a3d73c1c73a977eb472f5477a354ddb223917830574b0a811aa29e1ea4b75d604a24efa1c8c13bdbb46
-EBUILD pytest-virtualenv-1.2.7.ebuild 798 BLAKE2B c3eac4a5d8a5a3fe66972775b0ce4f124c1136f386787081a9535fee4f22923f3874c6e02ee03c46bdf4152539c4e9459f07f77ecb6fc4b8460cfe60a458bd11 SHA512 0b93b74e7e84d0d9811cc0fb8bd5945465160d5e9e09238a96c9ebcdab65efceb546bd43128962e57da129d60587574c2d4b028a94527cde1813756641471ef5
+DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
+EBUILD pytest-virtualenv-1.2.11.ebuild 844 BLAKE2B be0f14a637df8957fd2edc1fed7f76609d91421a2efd81033e37b8b82b897c2734eb0e33fdb24b5e3a3dbae3af0581c45243d5eb28125d0c504dfdbb25460eb1 SHA512 842d3d7858e7e169f160eac702efdb2ce4634906ac2bb3d4b3f8f25b9ddbc42287a0d76290bf8e1832389b8aaef38027a03d52aacc8fc84867827940a31434b2
 MISC metadata.xml 704 BLAKE2B 5def8fc368efcb89f29107dead2b04bbae8f868d94f7d95396292e35933e556f1f0cdaace88e9063beb890999d2db384da85ba44e61fe5d48fb660f9f0f220fa SHA512 856c8ea08f2f1f4f2e1be19e2a2cb2aaad2a143f270417a2632685b44432c36a947d7d98b51bb87cd6f32943e814a39790943e0c4799dac97d84b92103b759d9
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index 851e7acce7de..dedd83bb30ab 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -19,6 +19,7 @@ RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 	dev-python/pytest-shutil[${PYTHON_USEDEP}]
 	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
 "
 
 DEPEND="
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.5.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.5.ebuild
deleted file mode 100644
index eae249fb9446..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-	dev-python/pytest-shutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.7.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.7.ebuild
deleted file mode 100644
index 3cb43868cace..000000000000
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Virtualenv fixture for py.test"
-HOMEPAGE="https://github.com/manahl/pytest-plugins https://pypi.python.org/pypi/pytest-virtualenv"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-	dev-python/pytest-shutil[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/setuptools-git[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	distutils_install_for_testing
-
-	esetup.py test || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index bca2f0d2bd4f..8baf23970e51 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,5 +1,5 @@
 DIST python-editor-0.4.tar.gz 6516 SHA256 4421a7116bf3af957266f225bc79ad25b92839cc7974c8335bba5a6582edd3bf SHA512 f1fd4660e67e8299a6f9183e85a1e213e1156542d84eae6644e4f42e5e2804f813857ee50bd8833728b320415ee6f2be5df4ca69acb10a709f20d2306eb5e7ad WHIRLPOOL 2c68e5749bf7955315888a3bed45d3f3b68ef575804342e1391269a9f6f05ddce43242dc988dd29e805f9c165e06731b857238bdebd94e2e5c1f2f7181da24d9
-DIST python-editor-1.0.3.tar.gz 6975 SHA256 a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565 SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab WHIRLPOOL e0bddecfe9c818916b306aab9c4acaf4efa5c1b2e405b221203939d3c01ef5bcc3ed8c2109a45dedbbe447ebeff02c3d17fe23dc8e40698e5206b19dd3ee5337
+DIST python-editor-1.0.3.tar.gz 6975 BLAKE2B 23a4b0990f8715eb0b0ce538f1fbf47d61cf7209588c8be31ae3fb047c706eaf2628c04b29dff517a221676566241f066053680749ab864d067334f875796eba SHA512 258d1ea17ea1c09d8ef52d3b624cc17710559f4a8db3c64696f72aecfcc0830d3509dcdcc9d1ac272155b2aaab432edb7142b0a37f2c3263a2505bff940a3cab
 EBUILD python-editor-0.4.ebuild 514 BLAKE2B 0f72425b8debd774f375cfbc524d1ff25fb8b019774e7831b2b1fce8630720efb6cd64640814f86388667e81f9bbaf6139a770ccb1fe48e3bace7791b7eb3e37 SHA512 b2bd4956d1dbddcba3d4ee673488aa92a2023b297d2399d83ac92077819b487d79059fda255d6d70acb378424e049c36607aaf018fb61204e02664b265000fae
-EBUILD python-editor-1.0.3.ebuild 514 BLAKE2B 8d1a6574a3d1d1a334511c9ebda00ae0bbec3fa35dfdee1df1296577d3fea3ed0cdb2e5636bb684d69a033aeec6c6e9253a558ec0ace05aee4f1fb6dd43cf028 SHA512 f16ecc1e683f06461aeda9f26f6b20b4c160e6a73a35090ef25d89d298e2d8450a15cde8cc21cd9fbd07193ea36d06e1d24cd587a4896ad17d564607dc72a6a6
+EBUILD python-editor-1.0.3.ebuild 513 BLAKE2B 04576dac61c2f883d416838d3d927fa35de0b0ffd8fefb4bb310ce3a15a4c566c7a3450890b80505039df3d752ed8cdef7f176d641cce5cf84c9f5ea888bcee4 SHA512 8c1dc212ff40d40a2cfa5d49eab584e096500ff633cc668fc21d23774321b398b85dafa4dcb2f9c1ebeb25374b4b4373a44cc6701fa180d41ebf0be2154b4e5f
 MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
diff --git a/dev-python/python-editor/python-editor-1.0.3.ebuild b/dev-python/python-editor/python-editor-1.0.3.ebuild
index 69eee823a7fe..2e7d9ef1f6e0 100644
--- a/dev-python/python-editor/python-editor-1.0.3.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-iptables/Manifest b/dev-python/python-iptables/Manifest
index 4cb30bea6418..8307a6d7a55e 100644
--- a/dev-python/python-iptables/Manifest
+++ b/dev-python/python-iptables/Manifest
@@ -1,5 +1,3 @@
-DIST python-iptables-0.11.0.tar.gz 73582 SHA256 55bdd0d8e3d0b4c27e4d61bf6f21ada1e19146c0adf65e5093e254a126abcce9 SHA512 5bbaeb09dc256738e3a168fa5941f39e50074eb1ac3ce18545a48c55eb06ef70fd974ad3153dc07ca67b1ef88a2a2c537a9f8d3ac85add990f6d15e9d37aa0a4 WHIRLPOOL 5ecc28a1f65389e63c962408f058ac0795a5ebd846320f4d9de4ad35e6bb7a8ee7dff4555af0c4c9c42d303b7b0f6de372c042d4219141446680ba45b8216ac4
-DIST python-iptables-0.12.0.tar.gz 40831 SHA256 9815fd5ba780fd14b5f8cf8a93e007c0e603019738813a806e37553cd72e4c33 SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2 WHIRLPOOL 360c3dec7c1122ba53cf7f158ff463937a119fbc818ac879403ac943c0f0d04043c89559468274332e3050e4fd84a8d95f8a30b7a783aaa0c023420278c3422c
-EBUILD python-iptables-0.11.0.ebuild 888 BLAKE2B 8da5cfd9abf9623847b66d6e0cc2928d7511f20a234649bab25dcf9a9fefabd7deb4e9364b64e90ceadf5c5af2bc1304f913fa8e9c8df943df371df1af32ba69 SHA512 5a9b8dfc069f8024ea1ecffa631453a44a6ac0c932ce5c3fab7d9974aeb9bfd17f4f8cab2948efd87083e91dd0c35b3ec2e7ce7284b78364abe0de6d80ffdc20
-EBUILD python-iptables-0.12.0.ebuild 888 BLAKE2B 8da5cfd9abf9623847b66d6e0cc2928d7511f20a234649bab25dcf9a9fefabd7deb4e9364b64e90ceadf5c5af2bc1304f913fa8e9c8df943df371df1af32ba69 SHA512 5a9b8dfc069f8024ea1ecffa631453a44a6ac0c932ce5c3fab7d9974aeb9bfd17f4f8cab2948efd87083e91dd0c35b3ec2e7ce7284b78364abe0de6d80ffdc20
+DIST python-iptables-0.12.0.tar.gz 40831 BLAKE2B ea53605a5dd581cad7e05059c1534376a53b3b3da89b8c172cbb38ae7482ca3972fdf786badf3328960847c12c96ce32278657c32c857a1682650621a3add47a SHA512 bf79288fac53542e523c8ed0e4e0711792cf524100e39f57f10d3581d1b958712875a765f690b3d5ec6e28af9de48d2f3dd0a787c7037ebfc6f8bf87b5e321b2
+EBUILD python-iptables-0.12.0.ebuild 930 BLAKE2B fd4701dfbab5e7348088e3a686c02bcfac8fb809d9270568a839fc0dc6147665345433799352e2ec8b48bb686c6293241c520433f3c4977116c9adbc9276ff16 SHA512 0658bda1fa29b4f61af9ea99c4624d8afd2a9cd6c20767b90bc897628a74110a3d366e92c2582d8f4fa7909a59294ff4ffbc25bf92baee11ba0a37992914926c
 MISC metadata.xml 1340 BLAKE2B d7f6bd56d29a11e19dc402343c03007866bfa0e33415317d866bdc9e7b76bd2cc35238270db24299cb31986166044f5bbc84d90efa37e9fad36fe8b16ffc3e03 SHA512 90c875cee0c4ea9e2f34d509152cdd4d83a41010b8a858515fa3bc766bb0ba11e047957f4c005fdaf2e49b088df78cb3b4414a5ecfdb1b6ded550eb6c9dd01d9
diff --git a/dev-python/python-iptables/python-iptables-0.11.0.ebuild b/dev-python/python-iptables/python-iptables-0.11.0.ebuild
deleted file mode 100644
index e294f95ec8fc..000000000000
--- a/dev-python/python-iptables/python-iptables-0.11.0.ebuild
+++ /dev/null
@@ -1,36 +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,5,6}} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for iptables"
-HOMEPAGE="https://github.com/ldx/python-iptables"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="net-firewall/iptables
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-# tests manipulate live iptables rules, so disable them by default
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-iptables/python-iptables-0.12.0.ebuild b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
index e294f95ec8fc..360518b2f5ca 100644
--- a/dev-python/python-iptables/python-iptables-0.12.0.ebuild
+++ b/dev-python/python-iptables/python-iptables-0.12.0.ebuild
@@ -14,9 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-DEPEND="net-firewall/iptables
+RDEPEND="net-firewall/iptables"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
 
 # tests manipulate live iptables rules, so disable them by default
 
diff --git a/dev-python/pythonz-bd/Manifest b/dev-python/pythonz-bd/Manifest
new file mode 100644
index 000000000000..3c591fb061a8
--- /dev/null
+++ b/dev-python/pythonz-bd/Manifest
@@ -0,0 +1,3 @@
+DIST pythonz-bd-1.11.4.tar.gz 86065 BLAKE2B 1b7710129a6c764693cf3092725e78a7f6321ecf1bd0323644f421ee4f1c3c1a1b6defb805fbb137e58001c9869d9fe9d124978d60127a6672bb54903fd2027b SHA512 de945a1a49094eb6f4f1d0a2dbab4d5e73b60eb4a5d5461c4368fd46e05bf97df7177f7bcecfe963600016f9641e4233ace15a2c231f658ed8eeb771ddb51ab7
+EBUILD pythonz-bd-1.11.4.ebuild 661 BLAKE2B 942efa4ffd8bba78b976fa5c364e658375b3cccde591094e74dadc37ecd795a18207c6789d3d12362527bfcab5cc3bff6664a4c8d7c434fa66cc55fa76bfe821 SHA512 a108f6b9122c408fbf252b0a6b6381c769d5f351ccadd08f31e9da303956df8c44c657b1b4b9f9d6309acd8c23cff989bcbcd06fe6bf7d3b4b630108dea2ed9a
+MISC metadata.xml 439 BLAKE2B e9935c2cf2df4194b736a7d1a8ebaf53780289ccc7ebe2d02c0128e0b298c78f920602f25cddf052af016dba1c9218acd98576fe87874c2fc73241ed5f3c036f SHA512 e3d98902122dd0d5f99e139d58ed62f1291a606eb399c0531936d69e72b855a51bc1475998b7910b5773621ff7fd366253ed7e911ffa40ad61fc18c945f006d9
diff --git a/dev-python/pythonz-bd/metadata.xml b/dev-python/pythonz-bd/metadata.xml
new file mode 100644
index 000000000000..2d6e2eed10d6
--- /dev/null
+++ b/dev-python/pythonz-bd/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+  <upstream>
+    <remote-id type="pypi">pythonz-bd</remote-id>
+    <maintainer status="unknown">
+      <email>saghul@gmail.com</email>
+      <name>saghul</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
new file mode 100644
index 000000000000..c0305e3b77c5
--- /dev/null
+++ b/dev-python/pythonz-bd/pythonz-bd-1.11.4.ebuild
@@ -0,0 +1,24 @@
+# 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,5,6}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage python installations in your system, berdario's shallow fork"
+HOMEPAGE="
+	https://github.com/berdario/pythonz/tree/bd
+	https://pypi.python.org/pypi/pythonz-bd"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/resumable-urlretrieve[${PYTHON_USEDEP}]' 'python3*')"
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 273f6ef65eac..c0e1422b202a 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,5 @@
-DIST QtAwesome-0.3.3.tar.gz 150081 SHA256 c3c98ee4df0133ae42d202fea20253f8746266b4541c5df4269ca4131792ce0f SHA512 2b89a0c2119ff98a5aa1ecd6a60dabc36feafbb8029a39a578376307bdcff7f0a4bed2395dd6aa13b8540671b9deb1dd14b6ef9144a3bfb3640ae78288a6d7eb WHIRLPOOL dc28ccc34ba4391eb90c91da6987f2800ba505ab22aeb05c0be1288079156b5ff7475dc0c052f4f00e6315254c651f854f8c36056a7ffb3de1d2a61d315725de
-DIST QtAwesome-0.4.4.tar.gz 159621 SHA256 50f9c1d9ce34e57f5b13ef76d5c87e06de9804b8dfe1c34c4ba73197200f878a SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c WHIRLPOOL c106df987a0b19b4e6d35bcdcf2a98810e678c2b5cbaf33f9c47fa026d2209f83f652b1a85c1a88b0e275dfc1e6c8016d6591153590616f81cb2a712533cf2b5
+DIST QtAwesome-0.3.3.tar.gz 150081 BLAKE2B 27675af275a7e6a1731652a54394f4afadea3f8ae1fb2b16ca5dc1377c9af9b4f6429d9ea290ef1422c4c115bf135ac4a88069933bef1871578570b81764830b SHA512 2b89a0c2119ff98a5aa1ecd6a60dabc36feafbb8029a39a578376307bdcff7f0a4bed2395dd6aa13b8540671b9deb1dd14b6ef9144a3bfb3640ae78288a6d7eb
+DIST QtAwesome-0.4.4.tar.gz 159621 BLAKE2B 468f927b537eeada0926fc989498e6b1e2a5fc05a67f9f2286063c1feb0479798e95f07a05d8afaf51b07fb25b9717116cf4819b7830c0daa6e5807afdd6e756 SHA512 9dc8659993b8d61757865a1ec76f76e76db1232c6801f8216688c0578f612897fe189313c27107be264ac61c6ee2a866056acae51241be73a4fc5e9e5825008c
 EBUILD qtawesome-0.3.3.ebuild 567 BLAKE2B 3e46ef30b355dda4c3e486042f77f5cb05a3127d26865db3f0c9b7a4e621733b182c24225978e1629d5f7082c2110973e4e18951dcca9f92a7f764fd6838e1b6 SHA512 b3f2afbf2ceadf3776328fe2bfc8389be53ebffbc26f559cc572c5059a332bfe115d1ea7f89d1c554e810b5effa5e44c80809e3d7bd567212141f37aa3c9b7fd
-EBUILD qtawesome-0.4.4.ebuild 567 BLAKE2B 3e46ef30b355dda4c3e486042f77f5cb05a3127d26865db3f0c9b7a4e621733b182c24225978e1629d5f7082c2110973e4e18951dcca9f92a7f764fd6838e1b6 SHA512 b3f2afbf2ceadf3776328fe2bfc8389be53ebffbc26f559cc572c5059a332bfe115d1ea7f89d1c554e810b5effa5e44c80809e3d7bd567212141f37aa3c9b7fd
+EBUILD qtawesome-0.4.4.ebuild 606 BLAKE2B 4fe6612e75b03fd342640533517291473b586318bc9e05d5bf8e574846dff285ec7ab212b705d0bfae65f539e180d309cce86861add108389519a89aeeff5521 SHA512 ff5d415a4719d9dff29885bdccd79830c4d74665876e363945c84b9ab6d83c51b3ffd0aa2d7eb52902620f02d47dbaf7d5d802d953fc0747ac844195ff22cfde
 MISC metadata.xml 659 BLAKE2B 7b2b8a66c287c10e194f54a52cf3fbf0ee9b23a3bf8d04b036a368e08b5c5962acd9240cbf50146e34636589d3fdc50a4f0a36cca71ad78863aae622665fc99a SHA512 0e0b4b1ba22fde6a3f2bb78a57575ace1d8761cb3cbe352e5c2de606be7eddb1864f526b51766de3f5194b5eaf7152f1cf7020b1ebc8b785fb76f76ef71c9718
diff --git a/dev-python/qtawesome/qtawesome-0.4.4.ebuild b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
index 732768428d88..0e71b8cd6a42 100644
--- a/dev-python/qtawesome/qtawesome-0.4.4.ebuild
+++ b/dev-python/qtawesome/qtawesome-0.4.4.ebuild
@@ -17,6 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="media-fonts/fontawesome"
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 03b42093ee79..84645424807e 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
-DIST rdflib-4.2.1.tar.gz 889467 SHA256 eb02bd235606ef3b26e213da3e576557a6392ce103efd8c6c8ff1e08321608c8 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016 WHIRLPOOL 010bb4cf7c544b9a3f28636182b6c1821f390066bfe3de59f58fb7cfd8d809d8b0b5f256134b9c5091327c7ba6319be02135d6ea8a6d8b37772e212f000c3ba7
-DIST rdflib-4.2.2.tar.gz 905094 SHA256 da1df14552555c5c7715d8ce71c08f404c988c58a1ecd38552d0da4fc261280d SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c WHIRLPOOL f270e89354e601b17a91fb415a01f44ddaf90fec71e71997007f72db15275cae17bb4f2e45e2aacc852d748beda2907e5dc48c930c12632bf5846af335d7ac09
+DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8b44b5b495cdc9bb83df16d425214bb681f8f841e053a3cb4d52edd30988afcf2c301a96f699a70d9c129cca5 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016
+DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 EBUILD rdflib-4.2.1.ebuild 2687 BLAKE2B 28a7f358ea1c1ce4785f9d374aff553021147376a05c62a99600263a10df6159b3a5814bcc9d8bdf0909e45d727244088da219974fd3c9e1f7844e620d19f393 SHA512 86091ab53bc5103f5a673678504e8b99520e314c0b290240595f34df13740a4fca2e580082f9cf8fa18c517a220d87eb87c87e8edca97e2d4373ac177a2147dd
-EBUILD rdflib-4.2.2.ebuild 2717 BLAKE2B 9d87eb483a2b49128afe8773c87ab2ab8e69e6ac81eabf4286a7185cef357178bab531c73e15157ffcbaefd5e94518ce9ea15e47c6fd4d8072ef7d707f4d9b45 SHA512 5b4479ae6312393f3919a38f2038ac0e499cb27332480487b17e5abf2d2d8730f38f86a68eb27375de03f3b5efe65fc826014c6ba8817e26fbd0db2e11c3f79b
+EBUILD rdflib-4.2.2.ebuild 2716 BLAKE2B e679a9f150670801fae101e7a7f62b4d322423a619f2ba857a1def8b1966f863b614f96e52f24f1a4af8b12d92ec4c3621eb9bc7dbf7e99a455ccde01c82eb47 SHA512 db4a25adc3a060302264b2358854db45e87787681055cd611723abbea014da091f6d88c872be6c2398f0b8e88b4e07ad531c562767ff88e898a83f895afa48da
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 2f6c4963189c..6c6f845513a8 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index a7aa8ef5e642..37083c251efb 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,5 +1,5 @@
 DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0
-DIST regex-2017.04.05.tar.gz 601638 SHA256 d811874ed669165fe1059a54f860db5c6ab5f48100bf4945d915fd2f877b2531 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49 WHIRLPOOL 52f9f16312efb2f9a7c3d8995590fc240e4a4c8326db04eea4d45cfcf49e255d273ed78013f1736d35366e97adbdc8388816d24c955935a1ca941a09680f4435
+DIST regex-2017.04.05.tar.gz 601638 BLAKE2B a7c094887b602f24e68c51c92098604c462d506b13f064beaebdec081fd28d39dac9934fface0de0444dc6145af5f4c0e8ab2cd3b65ecfc2c1ca522682b3bf95 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49
 EBUILD regex-2016.01.10.ebuild 1154 BLAKE2B 4f4270fd08b90a31de9186fcb448f822db9ff5635f88b514e3368bce6e4f81c06254137e30ea512c9db6eec580fe26bc4a9b18dd79b9853d845d84a52798c107 SHA512 aebd29d84c8a237ef3d544ef777be950232aedcb9b9a6c48482eb03cb4c991e56dc911f75c1da1849cc42239eea06f2e968573aaf03f405f60a50daea11e0d39
-EBUILD regex-2017.04.05.ebuild 1201 BLAKE2B 8197b5cfcaff8fd95c0dbaf4c5fc87ec20a5c2a473d546ef13110cce840dfafce30bed21187b9c9488919ec566a823915bd40367d3ea61613c34e36207633e63 SHA512 873d6ab81fa380071c130e68fc1732366571a3cf1c1c1a2a7122b81497705471a3e0a168a585a39fcab5e08e8a9b687359f0dacd428692d1c909321c64445f6d
+EBUILD regex-2017.04.05.ebuild 1200 BLAKE2B 3a845714b0e18aeeba8b4b89c17d50c43dc5baa9ca17bbf9f671544a9534f2fddc8c21b2fc27a6bd7b324ca0787b7c11794524003ada965b0983c691d70b0fac SHA512 5f0195cd92838305d8c75de035b6ecd04b712639259fe2fea78355ef8be5a81a8fb69de1e322380cb69ef3b50abf3c19878e2d273bb8720ba89cebf31bce812a
 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 21344a7e622f..442e2e6e0aba 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -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/requests-oauthlib/Manifest b/dev-python/requests-oauthlib/Manifest
index 7c4ccaf36818..8c57d2a73d7d 100644
--- a/dev-python/requests-oauthlib/Manifest
+++ b/dev-python/requests-oauthlib/Manifest
@@ -1,5 +1,5 @@
 DIST requests-oauthlib-0.6.2.tar.gz 40307 SHA256 29ad3c4cb1e880713a54bee17c6345ccf8be047544429ee62237843f5ec73323 SHA512 da188c6a6449ffa201fae6e2f0a0e5474b140efc55a00dfc31483726cfd860fc22cad654c4af0a4b81144100678ddf4c082f54fc9098a6a99e0a4857f22aae62 WHIRLPOOL 7d2cba69eb5be9205fb0f18fdc696e26cc223e09765dd31f6ba402e498471678baafde067c2f1d709b4d38b90e4957549c714752d658e00abe9f2203ab7d189c
-DIST requests-oauthlib-0.7.0.tar.gz 40641 SHA256 525c56e6cf42e7388e8657b78ceb860f3ab6d2bca966a020c740517c6621b631 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2 WHIRLPOOL 71f3840a5a61154f38595204701fe3bb3ecd5c556f6f75ec237b4308f2220731096e42822bc32c0765a0c69168a9dc0ecade0cca03fbbab59533473b9fc5ea77
+DIST requests-oauthlib-0.7.0.tar.gz 40641 BLAKE2B 3c8e498652df706223dc74404185c14c8f131e0578b1bd2671986507e9f09f7328af7193b0779615499240f67cf6a0c395c103afa63bd6d7c674f2672f64a471 SHA512 9de7f3e2f67507acbd6a711d7c3bc4d598214ab658e7e331f2c56d7a6d084e11df8bfc2449c3ec5e985016404a5e7920e26081bcc3af52d6c91b28d1a69f6ed2
 EBUILD requests-oauthlib-0.6.2.ebuild 798 BLAKE2B a401db0b74659e6fcdac8d14f0a0184e7d047004014a5a03d498b64a4c35e9f7f8f9be09984168c2dfd76aacef41650c1e77a6547df1245ed1554a5311f98e7d SHA512 2b667d3f8df4189756ee6e4b1981adc4c2fea38641dd7a9aed066b88b1d4c206729952a18c5380bbda46b2e866acd97740c1d12c2a5821495d734daa8ec689bc
-EBUILD requests-oauthlib-0.7.0.ebuild 801 BLAKE2B 50563744015b9e6132cf51f30d6b72526eb4363b160dbfc87d5e6a00e26c6458bfbc21f54c5f0adb62ecb1b44b7c42bafb3de4cb79e12b5d5edca2904f929b53 SHA512 a2b9c9973901367ce761b9598ed3161efbba9638fe35d1fe99fdc2334813e25f61b6403a38f5fdb5f671916d45582b9a57f6055b7d6f02701fed78d44420a37e
+EBUILD requests-oauthlib-0.7.0.ebuild 800 BLAKE2B 2ac6d61e071621ee7e6491a62a03ac8bd9a19ad8bbe3c65601c915471121a442eb40dd359ad73e0cc9bc23ffefa6242104fdfdf8af822f855a0ca5679ef89098 SHA512 ea28f62d03a95e6d475a19b1b364d761d1116b11030857221114762cfa76de2274ff9cc94c14ba065977a91a9fa062edeb706fbbb2a86af9d8eb9b23bb531f9b
 MISC metadata.xml 438 BLAKE2B 899572e284dc1b2082630b305e207c6bd3c9a4416da0ea77564c033fdba8f69f53ee05bbb4e3a8c753bdec208b0c0871126df9d2d174122fcb360f3e019c288b SHA512 f78e511b9b5cc184a02ccb68db830f2cbf086e58ecace1adc58fce46c4c324aeadf736026596b6c9596f429b03badbbe1e206f61d8f7aef60e952366680e3217
diff --git a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
index 01ba330d72c0..d0ce442a11bb 100644
--- a/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
+++ b/dev-python/requests-oauthlib/requests-oauthlib-0.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="test? (
diff --git a/dev-python/resumable-urlretrieve/Manifest b/dev-python/resumable-urlretrieve/Manifest
new file mode 100644
index 000000000000..aac43f5a635b
--- /dev/null
+++ b/dev-python/resumable-urlretrieve/Manifest
@@ -0,0 +1,3 @@
+DIST resumable-urlretrieve-0.1.5.tar.gz 320035 BLAKE2B 1cffa81020c120b289145d52a7d3dfae1d4868545242cae583350c9d9e3acc7f923af7e1d8b9349a781b2d2eba4f28a8d27220bdc1cc64ab07d079039be9ba87 SHA512 d9af75ac3301aefa0773731539075ff3ecd0614ba48ac7de4a84817b676dfcdcc68e67cf02329d4adc62629b173cd2b8efc525c0f48fa686b267a75c29143aec
+EBUILD resumable-urlretrieve-0.1.5.ebuild 572 BLAKE2B b9ae979cb4557c324b5992f02e5b4a46bc50169737614a42fe61fdc0ce011bc2296cae803bd2c32a95da8061de633927bd07bf763df16a0e7df082efd37c9e76 SHA512 3097c1460079c2a882e48765e43effb8fdf7a7d0a7358158babbbdface134a19ea8f118492dd99d5d60b6ef09dcad4e91899123e6f74c47e40db3fd85371c8b3
+MISC metadata.xml 464 BLAKE2B 84bc493686b2688bdbdd4591acac96f0ea9b0f16d8e91fa7d6ec7ea225cb537842626106f598c44030f085d7a1502ce290289b7f7eaf5964f079be390fcaf311 SHA512 e8af70f36f05efac61eb6c378f93e5cd05fe7a80abd8f09c0f05ba4cbbfb0f9bb59859b96eed3b6137cde85c83d16c180681dfd4f079042b4e92dc6d426e60bf
diff --git a/dev-python/resumable-urlretrieve/metadata.xml b/dev-python/resumable-urlretrieve/metadata.xml
new file mode 100644
index 000000000000..d1c3ada71a43
--- /dev/null
+++ b/dev-python/resumable-urlretrieve/metadata.xml
@@ -0,0 +1,15 @@
+<?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>
+  <upstream>
+    <remote-id type="pypi">resumable-urlretrieve</remote-id>
+    <maintainer status="unknown">
+      <email>berdario+pypi@gmail.com</email>
+      <name>Dario Bertini</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
new file mode 100644
index 000000000000..b62bd2f2ab4c
--- /dev/null
+++ b/dev-python/resumable-urlretrieve/resumable-urlretrieve-0.1.5.ebuild
@@ -0,0 +1,23 @@
+# 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="Small library to fetch files over HTTP and resuming their download"
+HOMEPAGE="
+	https://github.com/berdario/resumable-urlretrieve
+	https://pypi.python.org/pypi/resumable-urlretrieve"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
index c754f98c08e8..35a82a16a2d7 100644
--- a/dev-python/selectors34/Manifest
+++ b/dev-python/selectors34/Manifest
@@ -1,5 +1,5 @@
 DIST selectors34-1.1.tar.gz 10525 SHA256 84b3743b9046461aebbcd13c15e79ab91e79acfb6e030b54a0ec6360ae0bbc52 SHA512 3c9cae461d7bc629a5ac2f17e7a5967d4a2865528b34e94e1164521e9d720381cca2c395ba62c0f67a4b9db34644dd031c2576a5017282bf4791c805c467408a WHIRLPOOL 67d07956c9c35e3a43e41033254b4ddff86271376f9d72a2503d9bc5e1f8ee5900384a5a71472a77c5c51e9025d7873d57c8f4797ab2035d7cd22e7ba99c0af8
-DIST selectors34-1.2.tar.gz 10145 SHA256 09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c SHA512 66fd545d5163ee3cf7e160e428a36f70d43c5a6a8a5adcd6a3028fe67ca818911bc3de934d862d06806dcf051516856baf34b99d9e2a062c214eca667fdff65d WHIRLPOOL 22f8eb70e2fb5d2ae7fb6abea45faa7e41a6d2f9f2a2f98754c7415831b7d8becf08c6c06d45497bde4c0dc07951e14745c0b5b5b74f40a19248c6d5a2aa7ada
+DIST selectors34-1.2.tar.gz 10145 BLAKE2B 6cf47acd1175de7b46dbf06d4358973740b84115bcb62bca695358ab761476f4ec527f4fe3afeae3c3129e4a68c7034b50ee4b317e7d85cc43e0125de81f5d16 SHA512 66fd545d5163ee3cf7e160e428a36f70d43c5a6a8a5adcd6a3028fe67ca818911bc3de934d862d06806dcf051516856baf34b99d9e2a062c214eca667fdff65d
 EBUILD selectors34-1.1.ebuild 496 BLAKE2B 206b20de5795f5580d581261fa66c92d2ae40c7be8c7c385d2520dc72871f78890204d501f03740328496bf4115ffbe1943246b6ab667b5c75827706ba643ce0 SHA512 c0f0bf429a01bb9f90a8b99ffbdc606649b7ab569645791fd77e8719cadefbee28a13ecc7eda1672e8f208e99c9acaa0e075ae48a8baaac3ddc79e715b68aed6
-EBUILD selectors34-1.2.ebuild 495 BLAKE2B e91cd21437135967627211e80e222eb91a8847b117320166253b047c1ee0898d13570a1d74586394d85d01a55ff8bd265ee37ff2660bd5cf1bab21b148292bd6 SHA512 e1f47c0ace2b2274afb42d4627ef5136dc759330a6b8a7f5b1b0b3b054165ebaad8bae645779da0128efeae0bbf4cdeaaee3fa1df332aa2e58605b50a3bb43b8
+EBUILD selectors34-1.2.ebuild 494 BLAKE2B 64b8b7be06d8bb5c884b7872e719ff85d29b0d65eb098950a2657b12b4c7b74a9276376c12a401d62e4239899048c7c3b4050af5298de46eec46d709599de552 SHA512 9aef4108b6ff6cc1145d16a52d48f52c79b6b65edd6496d1d06c319a264fdc9782d6b38e31a1e30597129020812cb28e1a4190fbdbca081f75ff1c33ec902ded
 MISC metadata.xml 378 BLAKE2B bdc18fbcccd0582723bd2806e6f749aad2735cf55d6a82b88d2141b92de24c0c63a0bd55e2b49613fe91406c4fe7d35c1e7cc7e23ca0064ba0edb797b59e4fc5 SHA512 3aa7b7ec03e37413a17323a3db7633f05044d958b1547c3dd420588ee3056c8b938d30f23b69fb7584cffa9c59d7ee69689be9c5d0d4f248fc9b3a093191d297
diff --git a/dev-python/selectors34/selectors34-1.2.ebuild b/dev-python/selectors34/selectors34-1.2.ebuild
index 1d51c9fcc7de..b55f4a5080e6 100644
--- a/dev-python/selectors34/selectors34-1.2.ebuild
+++ b/dev-python/selectors34/selectors34-1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/serpent/Manifest b/dev-python/serpent/Manifest
index 1a35ecb30f82..9218eaedfc27 100644
--- a/dev-python/serpent/Manifest
+++ b/dev-python/serpent/Manifest
@@ -1,7 +1,7 @@
 DIST serpent-1.12.tar.gz 11003 SHA256 1221fc402ab7aa3c3bac85a27e30df2c08658c7bf7a20e8d0025a10edc1788c0 SHA512 af4be554f6bd6f4f4437cdf28c3a34719969896ccf7ad40a42b94dfd666724fde239db17de96003eba78bc51f432c551d80b19dc5064f4d7f8ad9fe060dd2039 WHIRLPOOL 0b29ca2c7008e247914439a95892953b7a25535f66c033436727b9c81ca70f9a17ec23c172a0a28e911d5b3720ea2d46ada130df69d74dfac9bc11278bde374e
-DIST serpent-1.19.tar.gz 12055 SHA256 946b2c837f889971df3575af9dadd8f09bfe48549ebc1b9f6434263b653707ce SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd WHIRLPOOL 61e064006ea9f4f09dd4bced3b494cad8ca243cd7bed76ba25308809e962c8072cfff3b6371fd727fb6ddd5473a52775b41f85dd02e70d7d3b1ca8d824e2cb0e
+DIST serpent-1.19.tar.gz 12055 BLAKE2B 1adf86abf58b4afb82a9d2ee3b8fff4107f3e1cd383a33359687b80b2b917ec1af8f15cb5b849c0979035daecf2aaaf1230553a478e59480f160d8df456b5fd2 SHA512 9adac06bb63dfa73ca0043a3ddf868e0afebc81ff7d637e41667314cbe8e0ecb2af807db6c60f5a5a6a6ff8fa11ac42063d83a7376c7e8bcac22abfd3ba5b1dd
 DIST serpent-1.7.tar.gz 8799 SHA256 5345587dff787431df668c19de56b74ada02fb893c2d9687572ffecc63d4d33a SHA512 2e885fb06404915506665b2ba6c7fa6dd7a74e31f814fe88f21c847eade5c307f932d45371252d7b690bf95677031a5b5128d9cc5974733dba127e0eab222fa3 WHIRLPOOL 4c3a10fd2519be1ee2d60ae204d949b899e8d77627084ad3ea2eb5b23002a6529cf490ff0503cd5479261ea2fe617b3056518bb6fe838ebc84c008225b9ff10f
 EBUILD serpent-1.12.ebuild 551 BLAKE2B e4af0b2b0ad655f0b8cd54ee628ca50e372bcde12d81816c4af6fe16395cbdd2499586b2f056fecaf23baddda154dcbb31c4c2d15f7a4bf76e23c2fe9476b05c SHA512 87d7c6415cf79d7bd550260cd67a19569d69788fd7c35228f88e6585d6ed4cc066f51548d76043a4a6190fa2dda7f928a992fbb9ff9f8ae901b56af76099bb8c
-EBUILD serpent-1.19.ebuild 615 BLAKE2B 8611ca644f613d5b398ffaf6364d2d986ae54383ecf4cd84058d9c98b2d30475ab6c4623a6de5472ff0beadd6f0d8adfab2341637ff156e855e9618300768f73 SHA512 e42845e9cbe5e032c90606cde744c35773945b4beb4dcda4d391085ec9c3c4787fca0d0b39b4c1d768a2bfd224c30ece2dd0be6106655ab88e2328f68c1901c1
+EBUILD serpent-1.19.ebuild 614 BLAKE2B 07868a1d2c15c376d7ffddf1ace4f579031e25c140995273d1b20a318bba6f432a97a668a772d0c3bc02dd9cbfbac5fa48f0a6b5ab7ab01d01850dd31b9520ec SHA512 401fcba6b19f75164c5338d31905fdffe71e186d18c36c2c09e24df1cdd562ed391901fb9233a1c490629e2a803e5a49d90111595c89af5114bfdba4837e59d9
 EBUILD serpent-1.7.ebuild 444 BLAKE2B c2a69335d1671fb30fc20b4ca98fe42cbb865016d84df55f7e4db9fc66b42e2280cae10abb9666f4b6f70e32bbbe2844d82a00bfda7abeb9c6a88478f7fea430 SHA512 70ee391f6b8ddda30bd93a43302121ae589a8892b0358b36782214a7498afcc0039e0f35b35c4e21f2c351d12aa46ed1ed35089bd760e294dc1bdc3acae4dacd
 MISC metadata.xml 363 BLAKE2B f40df45db2fe2c0b0a35e6a9554ea3d39f25575e6e83dce3fb235a72bd1cfc3bd07bb106661470fe3f01f79bcae06d0e70ac8213cffbc9119bdbf4a3c4475eda SHA512 c0ecbe2e072730e43679dd09334c4fa300c1660a740cdb7071d6d87f112c25493b169f0ca7c5a99fe4a978a8d81f87a409519170cbb69430994f16a8bb193500
diff --git a/dev-python/serpent/serpent-1.19.ebuild b/dev-python/serpent/serpent-1.19.ebuild
index ac5161ade565..93c791d43f3a 100644
--- a/dev-python/serpent/serpent-1.19.ebuild
+++ b/dev-python/serpent/serpent-1.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 # not bundled
diff --git a/dev-python/shutilwhich/Manifest b/dev-python/shutilwhich/Manifest
index 99fbddc9dbba..470d822a1f4e 100644
--- a/dev-python/shutilwhich/Manifest
+++ b/dev-python/shutilwhich/Manifest
@@ -1,3 +1,3 @@
-DIST shutilwhich-1.1.0.tar.gz 2300 SHA256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21 WHIRLPOOL 31fbd1cfaacd52d271fbd7751ee2ba9ac41a310d410975fa425a1763ffcdc50be0ebec89aa9a817bf06a93152a6cae48cc343946eda118400dc865e98c217cd1
-EBUILD shutilwhich-1.1.0.ebuild 472 BLAKE2B 76129ae6033625c46c1e99756b38c7209d062a28bf74030dc87e97c4d492c4be601b32c12bce2138afda4a7c63783465f14ba87d119867fe623f610dfb5d9940 SHA512 310a0426a75029e48076c388f892c9eed126d8fb8e87f87d782482b63c287f70299aa8f682b282b0c6d2ce0dd4757d209734daba3e7ac822cf92f3001bff1898
+DIST shutilwhich-1.1.0.tar.gz 2300 BLAKE2B 0b510fe364991bcb1b2a627368e0aba23550a60dd0c8f892dbf25b5f23696f49ceedec487d91cc6a5acaffe28c29f635bacc633cc3c3377799fa8c75bd8bcd4d SHA512 94001875c428ce1ad1c92e5f5be1ed497630ac0e2221dbb93fde8438f128f4f2663a0a13e17b94852e4813aadec694fa21c24f647500e8053c89ec610eb7fe21
+EBUILD shutilwhich-1.1.0.ebuild 511 BLAKE2B 6837063cb74c9e0df7f6ebbb0cd35b38dc6b3bf38b3046b965a3c4c88c77ce641607b0db0e70d085e25b0ea39c5536ac8714fab376b203478d790013dd7adb54 SHA512 52d23bc17e7a40d0275f988988da34e6a172c98ad4b2f6451eb6478465a3f612922883d08ec8dc57a3d73f7c2a9763b86153c61fab8750d930fe5d5367989370
 MISC metadata.xml 759 BLAKE2B f9c728fe30465f4c450b6091c0bc8ff51dddc93f9616c1b8bb68a9abbee3bae63eb00da7b4e5c0a5029b4924bf6ddabfddc84c7e9badeee8a1a99a2dcc8a76e6 SHA512 e0cafde29e32a4596bd881c35f1c1dd7137f971e37efa38a24c86d9e3b377befb1355bac5a7ba6513833c9852f94ee5c44a911af9223eec4f93f90eb936fc2bd
diff --git a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
index a831a85242ba..714baa4474e6 100644
--- a/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
+++ b/dev-python/shutilwhich/shutilwhich-1.1.0.ebuild
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index cfca6fb23448..1b24de176773 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,3 +1,3 @@
-DIST simplebayes-1.5.7.tar.gz 19260 SHA256 71cb029768bd25c172bdb3bd37174d42f872da92c33329ec736c3748ffa3b4a7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc WHIRLPOOL 826617d920c45411a138bc405f760229e79959b25f4cd7e3d6b4525cdd2e9fec43b88f0df011dd820a72484df5bf988e3a18b357fe2966e15a8349c686eba308
-EBUILD simplebayes-1.5.7.ebuild 643 BLAKE2B 26b6a9db9864eda2a2d572e4c0464d92fe18b98d36fd6b2598ea9e6cd5c1aa9a55eaa23d5d150390320b7756dd1c181ff30d2ea04c43e383d3284a7654915d79 SHA512 34f56f96cc21a458a301140ec818ed86f55433795fd9f4bc71d56d2284c48b508f7d1112ec1f936f55eb5e5b08bdc924c244eb25de7589f948ae9d07345629db
+DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
+EBUILD simplebayes-1.5.7.ebuild 684 BLAKE2B e463905a8c9050e1bd28144616987c5b7b36542c35a6e38515c01b09b2deebb7b4df7ce0ea62b81684bb919391442cffed1b9cc21198a431359aad6074ca9b15 SHA512 27983f035b72303d39668e8c8779cf8795dd465e58116f31419e0e7ec430d18dc9b0442f9315ab531eea6e6115d7771759cecae0180377216606d8a8d50d7fc2
 MISC metadata.xml 617 BLAKE2B e7c001bab17b8c28c23779c6804baa93e9d22bf63f919a8f2b466aabbdd930e811f64e90279e2b4f21fd600632758bae7af578484998e8fd9f7516744759b570 SHA512 2a9daf6f53869780724a8083bbe250e29d1ec4ffe380885e44ebb13e749bb5e3ef8e340d178e50d7775069bfc01ee98b7a1b784813601b91ec4fbc685217b454
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
index b7c3fc7c6d22..803dcc401434 100644
--- a/dev-python/simplebayes/simplebayes-1.5.7.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
@@ -17,6 +17,7 @@ IUSE="test"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 1b7108a79e91..0a100813050a 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST SPARQLWrapper-1.7.6.tar.gz 26597 SHA256 dccabec900eb9c97cb47834bd4b66ceaeb4d9ea11bae24a24fe734e9f48522f8 SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb WHIRLPOOL 818cd215224a1d362c1e03286190e5ec8b7f465cbc837b136963e70948272450fc99dbcf22b065101546664dd5a7c1088703a578a2b8e0fb378dbb74630ef254
-DIST SPARQLWrapper-1.8.0.tar.gz 28775 SHA256 3b46d0f18ca0b65b8b965d6d1ae257b229388400b06e7dc19f0a51614dc1abde SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907 WHIRLPOOL bb925f312aa94c081eb3129348bc79b3bf7a3cabadfee8ad0929e8aa0b9e7d1a21679411f5043464b26ef32a65ddb258d8d5d3e96347740a1d3dc2620828e30b
+DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 EBUILD sparql-wrapper-1.7.6.ebuild 607 BLAKE2B 8b2f8eea948b345e3246d41a30e50edf3c2576eb6983da169fe00cfccce538c17b7cc1982d23153211ad7f2ba2cbfbde8e7ccdb8bc303092cc25d0d2aa6c1e41 SHA512 cbe8508cfdc3eaac33ba07cee40fe8410aeac49d192e854854dc865af61cadc6a9b93bad42d12458b283638c2eea074ce3617db5bf4aac4de47a654d09711016
-EBUILD sparql-wrapper-1.8.0.ebuild 617 BLAKE2B f829c09f2e4e7f5b56249e079cef4144dea4187b966701686c89576b5d3ef317a5a4c59665eea79949b2b24456d4cf19a1abe62f0d2e2a43184258658b74f585 SHA512 7fae0836ecc422388d1302f260d5483fdd471a06f020e6fe58f6a957e1869c3ac8438ca333c9e6f14c51fa6fc8e069a0d6642bfa581a4b1ddd1befabcb9a44be
+EBUILD sparql-wrapper-1.8.0.ebuild 616 BLAKE2B 73f54417d991cd2b5d9685d5206e8e522582cdd25617ae8aed006dd6a91d4a905eadf5e4bd58116775c3ffe5f39c5f9aa88118694532a4bb60ca71a60752233f SHA512 95bad76443eb87e3652b9fdc3a1eb92c3e47faadd6f83ea6de21c313ac15ec001f388b3d7c2620348f31ca4fe46f6259f66364a511cd1525010a24fe25bc4ca8
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 364fc9c676fd..e0a6b4c587b3 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index edc70bf8d72f..70926da08902 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,8 +1,8 @@
-DIST sure-1.2.24.tar.gz 28089 SHA256 5c0456a0bfec40ffe57bf9f1f1d4f6cfd4b92848b8c97b5b4165afb933c0d2d3 SHA512 875d2cb220d8915737909df372bedc2266c5c948c6f5ea23f3de5ee57b0f1179d2a0ae3455228d71a4f0f4279c098bb4c142a862b55462d67fd425c0def49a8b WHIRLPOOL 6cc102e2aabb143af0ae8104a4ce7d2fe44c00facf2d27d43b5d9e44f9f9b81ba888d6e2df91f2c14b3d50c5502450dc4c353e802a17c176353f284cd84db9a2
+DIST sure-1.2.24.tar.gz 28089 BLAKE2B 2de015513f36fe101ea1d23a8499bbb06cf54d733bb55d99afc0eea274d1579a155d4d81e62616e655254d885d9fae55c6897560b2a845beca2c90a835d1c037 SHA512 875d2cb220d8915737909df372bedc2266c5c948c6f5ea23f3de5ee57b0f1179d2a0ae3455228d71a4f0f4279c098bb4c142a862b55462d67fd425c0def49a8b
 DIST sure-1.2.3.tar.gz 16921 SHA256 f6200277de5b63094f2d1d384967e19a95be53ba664bb7a748b3b183e5cfadf7 SHA512 79f9e7639e468e61858d70cb3184c44e9de30d1ecefb4701e3a305b9fc231b9a4df27e795f8b31da6ddc221ba002bc83dd59621e7f364598c80b831a4bcc9fa9 WHIRLPOOL 1c2d5d58b2765e1ea89bb27d079083479f4460a01ae735268fbc82148643348a8796ec6142b39e4a188fb6bad16a130578b66ae52bd2ebe112bd2972cd6cc54a
 DIST sure-1.2.5-r1.tar.gz 52128 SHA256 8a77c1372f3bf9784310b3cf0ab66e86190b531a2b68e47616bce0e4e4983fbe SHA512 733df3a9482cc23e5f078b554a80a726ed87f4ac307b00166d5ad7d8d40de47fe7d77a7373b213d75fc78849a2ba0dbea89f71c6f29449f52eab448fdf847c45 WHIRLPOOL d466c9a6016f636f2b388ed001c12f7e050184b2b54507e1ef5ead4899b2ab8433022254645bd7a989f15105d768902e18289c8f23cff82277d422811f1b7cfb
 DIST sure-1.2.5.tar.gz 19048 SHA256 63f9861f607c5a27d090edaf91e6c93421a11ae1c011171f7394f44ccc391cdc SHA512 41f097318093b7e1683c38cae7aad3551bcc4e82918d3005388ce660c81a014b0939d3ad9dc12905c50892c82282c3e90aadb01ca7600b593d09afa2549c7135 WHIRLPOOL ea3bb51d9f0b375656b248c80c0a381fc026347efb0a94c856fb319c1e6f1e7d9e6e5a665f57e835a4fdb50060f3b2fa4c9168e8f61ae01af5a05bfc337a9481
-EBUILD sure-1.2.24.ebuild 905 BLAKE2B 2a07e7c9721893aba10c0c45f0700ccbce39adec021f3f8f977a6ec744cebe6afd4bc0cbeef09bdcdd128866988c72dd67a18da7264fd6c0f97a9159c7c0cf73 SHA512 6f2a1ecef4d787855dc7e1f2c733a8a7b6c1059bc7dd68e599a33db4af1c5a2022a3d1f8ffe2a00421cb1e87d237d7c2d57f69242b99563481b50cd9fa08d49f
+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.ebuild 462 BLAKE2B 742545bb12249769c4ce0b2a247739bcd07d6a108d993abee31bc7344e8283d01a9447b2484986ea17569ce04816b46b10a5b26fc39c4d544f0a9f67d240ace7 SHA512 20aa3671374141221a822ce12bce5dec56b8b5bfefab1e15ccd9b85c33dfddcc89c43fd87078c5c0ea9597e7f33c382ac04b4aaa5aa3fc04f6d8f19174678116
diff --git a/dev-python/sure/sure-1.2.24.ebuild b/dev-python/sure/sure-1.2.24.ebuild
index 3bedf40c6b13..6d8a8203f72f 100644
--- a/dev-python/sure/sure-1.2.24.ebuild
+++ b/dev-python/sure/sure-1.2.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/dev-python/tinycss/Manifest b/dev-python/tinycss/Manifest
index 20d043d76859..2ad5b12d9610 100644
--- a/dev-python/tinycss/Manifest
+++ b/dev-python/tinycss/Manifest
@@ -1,5 +1,5 @@
 DIST tinycss-0.3.tar.gz 72860 SHA256 a4adabd1c417080372c789220f7f9985995e74f2fb612848306872a232862cde SHA512 1fdf29777ee7b3ef39cf2169d8f464a7e5aea850de8a7976acf3ed9e73e831ea0d7ee52b4c8c9979b2263509cbffe1bde85cf6da178ddeaac9009ace7a2b4441 WHIRLPOOL 2fc7433e2410e8641f2c939f2d22ba3ab423908e20213559b34e8fb5002776a9ddfe7640c8a68c59af05b1c0e1493481c315011bef8055afd858e7a4c66ebdd4
-DIST tinycss-0.4.tar.gz 87759 SHA256 12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a WHIRLPOOL 4770396bdc4798ff06252cd11f2723211a1cdf7789c735b270af4bd00d96c5d1d71b4d42d3ad7f597f92575bc6ed26d7c6238186afb655e6b30d85f61e82af40
+DIST tinycss-0.4.tar.gz 87759 BLAKE2B 9b7691f5d5fcfb5580a9f2a0f1f50caea3dba74853917e5e46ca93cab6f35f2f8c4f5babf01d25661d05ef1b26ccc35914750917fb92b394b0ca6530a19f3514 SHA512 13a50332cddc28026fd7ecc007e14085976284e69de6ea93d1013502fd9791694092c010947b13dcd23f3a2df65f277f62410abd90d03eac16fa5af913673b0a
 EBUILD tinycss-0.3.ebuild 650 BLAKE2B c3c4f42436a3c714ed90f10a7f32c3931dd6cac79f521994597725b551dbc33002532b7e24b3f997fd73aeb87de93d43b458facbbe98d6964eeab652a7ce1c93 SHA512 3643d2c38c0b308d5d2d8eff65700f5fbeffe3d5f9b47fbdb1c04f22656862e04deeb5b5bd919d8c4b34ee3e4fb6eb56127259e7dda7b14bae26b90f815249bc
-EBUILD tinycss-0.4.ebuild 810 BLAKE2B ad9ebbb5d15d8cfc1f194c67c6a2bd9f8a4e33529ebfb0ee721c5a701b764f52b2e2023e9d5e270dc97b9a50f916acf00482c87d10988dcd1d8320ac19dd53db SHA512 e4722180287b4d4e4ec7a6a7fdfa510fd63a6b8c2203f0700308e88a04481c89dd3edfded27aaa0eb716ad5a1e24c747ca753c33f3a484458ab047361becbb30
+EBUILD tinycss-0.4.ebuild 809 BLAKE2B bd88841501a9d79d09b0d3daf98c44e536185843eeef436bcb12e6eefd3591d306e1d3649f8795b29c2538adfdbcf15fb2c384017b2a280720f9dc672b9b911c SHA512 4444decfcca05004275eaa04d7bdbc38b94a84fbaa76b6e05b1ae44a659888d72ca41d75dc88954d28f14fe961aea76af37fa25f3eaa58695ce065e9566bad1f
 MISC metadata.xml 380 BLAKE2B f32bbbd80838a147ab80701c03462b8949aa987f47fc7bb8cb2127720937888f484b7f1ceb9cb490901d07782c2c0c261e42277b55e39d78c44a05173391282a SHA512 b5e7005f5f93ebe86cac3643711928d83456e5ccbfcccbc3dc008daca1e341285342240cc032f69042bc5a19739679ec0ae5e2e2d83c46dd57395ab9e1c12bb1
diff --git a/dev-python/tinycss/tinycss-0.4.ebuild b/dev-python/tinycss/tinycss-0.4.ebuild
index bafc7eadc439..b81e7108c2b5 100644
--- a/dev-python/tinycss/tinycss-0.4.ebuild
+++ b/dev-python/tinycss/tinycss-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 4556c0bcd3d9..9757761486ef 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -8,5 +8,5 @@ AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f
 DIST ujson-1.33.zip 197034 SHA256 68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b SHA512 0f1f66212fbf94c03e048ba64c3bd817c50443d1a29b87f6a3a38f697a050f38821be4ba36a3b17a96930c69ee92973ac31bdd41851dea071af14cd4bbaf8480 WHIRLPOOL d3080fcf3e979b43deb8fe099427a8311c55e7e54105626bf12b3b6fe9e8567f70501884bd24b7a26d53ddfcd98f535de4aa708801106aa4a1b76e543217835c
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 EBUILD ujson-1.33.ebuild 1144 BLAKE2B e703deae7eb92e1b7c06c6180c29197ac4b8da8c02457f2c5c0ca7200a32ff6056cebc182c5c1953bcb756e81439ea4ae835fd944be2e4d1f0ba50828aa181d3 SHA512 c36504fe05d23c5b17278fbf0056e7aaa07ef66cd589693e81d1df0c83af3ad5b142fed7b2e15ec33853b8046992354a54adebd94a1443ee6503ecd2e6263eb9
-EBUILD ujson-1.35.ebuild 935 BLAKE2B f45d9b803b43b53247befe6a9cf1a1bb50fa61b865f55da989aed70bae96d3a7025d64c62d7e5c24dced1af367a1afda3dac95c5e9f2fb27993909e5dc91b765 SHA512 69224d45121d8ecf7020e6880f52eaf395a92e3ba9ed5024089147a9aaad37fb9db72d29869bbdd795393af27c3f13d0d046b40536870ab9b2029d6fd83766ba
+EBUILD ujson-1.35.ebuild 970 BLAKE2B 3c47a3592a530d1094fe6aa6f8df4a5dccf277240e497353c3a3a752ea6b25111ab84204aa865c9d0bd3b4e9b94c2ebb33cee9fe4b07dcb52730cdd4ef0f33c3 SHA512 1515d2591f4874334bf34377c128cf2bfcaf08d0f15c48ff839a276c83aaade69de8766386df49bddae7e6de6942d64b21db07dbebd4b5adc440ef78e97ea59c
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-1.35.ebuild b/dev-python/ujson/ujson-1.35.ebuild
index d4bc42da494b..fc5eda6636a1 100644
--- a/dev-python/ujson/ujson-1.35.ebuild
+++ b/dev-python/ujson/ujson-1.35.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -20,6 +20,7 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+		dev-python/pytz[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index 5e82c66dbbb3..15a5d319eb28 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 SHA256 018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9 WHIRLPOOL 2f1927af9c2f1818d88f6e4fd3894e58d920f7d549f151db4281ace879fb4a27cb3bb34388d7bc15e6105639ed8a74ea4274aca4bcca45bdb178d29d2b8311cc
-EBUILD unicodecsv-0.14.1.ebuild 528 BLAKE2B c9d43e19fa6d1d67cda380d1b74ec9b36059d909eb708b7e54ff2e7fbcf4c2f9475d037d88a0bd3a9b0caa97247dda3f2b52794620dfcf2219b4862ce4349905 SHA512 cfe0ee2b149dbc37e88a6338f7d1555e7e9f2d7ca66e6eff53fd489ca2382727a7f2054ba28f4ab8fcdb0845a76c24424bd7ccc8230437b56b2875eec13baa66
+EBUILD unicodecsv-0.14.1.ebuild 578 BLAKE2B 94bfd3361fe6e92b6f9939288b8b4a51bf1641c72137f44b02e71cf4dbdbcd9e753795fb597a281729e9b02ccab790aec5b55e488de6ea5696f79902c04b3de8 SHA512 ea2dd1943725162abba2c2d991f3e4119b6e0aaf66ebf7821d09ab0ebda6232e8af0b6b77665a4bacc7fbfc7bc16da614c8fab45b2e66abb8f6bbe4e26dd3c34
 MISC metadata.xml 377 BLAKE2B e3a9bd3feb345bb487881810f332f1caa566eca8ba8279876eb6936dc98c47ddb5008623357b82a715d1459f3c50cd5e9b0e00433e678705b433a832d0f7a268 SHA512 6178e2b0559b35fd95211f26a7c7108469c62fea031b5698ee65209832a0aec87cab9f3f9890f051527350ee585eff18b83a270a4e55f68c88360836d29475b2
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
index 42d302a16328..6656408e855f 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc x86"
 IUSE=""
 
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
 python_test() {
 	python -m unittest discover
 }
diff --git a/dev-python/utidylib/Manifest b/dev-python/utidylib/Manifest
index 79e16319a613..209e91e68eea 100644
--- a/dev-python/utidylib/Manifest
+++ b/dev-python/utidylib/Manifest
@@ -2,6 +2,6 @@ AUX utidylib-0.2-fix_tests.patch 2084 BLAKE2B e17a306a25f14806c33b05a350028ae4f2
 AUX utidylib-0.2-no-docs-in-site-packages.patch 475 BLAKE2B c909872b10b569b879d65eb7a886953e0b2d1b180704a616da6816604414b9f4a16cce90170e93264e7528fb1ff9100f7a76088ecfd136c51f6ad2278d2668ff SHA512 ffa0d4c261adfa9d49b5b0a3e559d80a627098a07667f935528a41b18a11ef18dbd86d6b48f99a8f10ff3c0ed91b966c00c5a78b9400b9caf7c9c57036b6d1f7
 DIST uTidylib-0.2.zip 17575 SHA256 0385b29b0e636fa1cc6eb86ecb5428cf399f9474c8f343af038afce59720a333 SHA512 02f6611f1c7dd42db96012f7067ada8ccd841532744a569492a2f1c0524a3f1777b8f997a716b9bb18f69f31cb922dc89328d0bd284830620a930a038b303893 WHIRLPOOL 7d1509c36dccf8d7bd22f82d5a6cd95e8b7e422fb6aeab49e7316aaa98e18f771d9c7140897086da61d03b0df5fb3d4291c0b49acfbf8a8633498a837fbc2c2d
 DIST uTidylib-0.3.tar.bz2 13809 SHA256 9f902713bf5d6b8254ca99dccc8729cbe833b1377cfcca67b466c661e5e3f57b SHA512 4503f2a6366e5110740b312df2300d62bb68e1e1032184e9b56dee75995309c76d4f8e5851c73e7c8e08cca7bba9c74436d8dfc0524f115f3abb2bdf5529cc35 WHIRLPOOL 3157558b2674e60ae231ba0ae38523a84659ad375ea2ca1b75e29e118c7cc67d7b66b91733ad68f2b6c3c93d72a0d209e36b576ce52bb33242e20810ec992ab2
-EBUILD utidylib-0.2-r2.ebuild 1033 BLAKE2B 1947f69414a1ed5ea2e4fa630782eb85ca3c73d55edb77cfe6b47d4473f549f9db0c8dad8a52076a3a10c659636f00c2a8e4fce84ceb9c2c3c3762f03f7d1e1f SHA512 850b021e1fb12ef120e5dc7a66ca94fa48b05aafa1aaf143e4b56b1c050eb2b638951a4ef15c66e166138b6072f52e6dcc550cbfce27636f106a3495c4f5c687
-EBUILD utidylib-0.3.ebuild 927 BLAKE2B a42edcbc69c8c9f42bd767da7021a3e021d8468266582407e4162946c1899f61b281317446000379c50c9b91cadb740143dc04f1b0143a4f0a4c0216a2ccd276 SHA512 b0a6006678c3d3148ce5586605f3b419d352452dbd27bf82250712a94a442ccc243b9b48201b111b05735c34e896ef87bf464498f9b045b689b81738931ea7b1
+EBUILD utidylib-0.2-r2.ebuild 1074 BLAKE2B e932e1a56825dd6897dc32503d30a776d936a58b9100184e64a6721de30313f42ef80ec67826d304eecd391601ea20f1d368424b2d9f2ebe9c5783f4b805dc68 SHA512 105a3114c8541c6d6377a03a3ecceb1e8aa38e3154b941c8936a5c9adeaceb2c0dc8f8b47fdae4932f455f719fc4568831200dbac50cdba90f6098b139f506d7
+EBUILD utidylib-0.3.ebuild 968 BLAKE2B 4abb04af906eb0d4c1a5fe381cbd4043f13f87bdf83e436ae380f70d0aaff090f5fa189668ac8a7e153ff17d4107d8cd64438504792d92df3cdec98ee5158739 SHA512 8ab4a0ee4b7953250bb049c06bc8bc1ac2a787f6faab73bd714bab4aa087d5b435a833e7efd382de1e53c52091adbe4687c25bade1f23cf464c0726b42b85637
 MISC metadata.xml 372 BLAKE2B 58932a89c0765511f1231a3ea43ac6509792a03b345655f7d15ec306a33a0264d49b32352c57e8d3cc73294c8cfcbd679289011312bdbed55459f6751dabffa0 SHA512 d6602ff98aa2ae6a69cad590ab014cbe5b3f1fc1b28c64e91025140fbecaa78c49d6e45bc8b8b5432b0cfe4c91402db3d3954db92905ddc42c13540a9c1e2ab5
diff --git a/dev-python/utidylib/utidylib-0.2-r2.ebuild b/dev-python/utidylib/utidylib-0.2-r2.ebuild
index 76d37d0e30b8..e71c0277816b 100644
--- a/dev-python/utidylib/utidylib-0.2-r2.ebuild
+++ b/dev-python/utidylib/utidylib-0.2-r2.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
@@ -22,6 +22,7 @@ IUSE="doc test"
 RDEPEND="app-text/htmltidy"
 DEPEND="${RDEPEND}
 	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )
 	test? ( dev-python/twisted-core[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/utidylib/utidylib-0.3.ebuild b/dev-python/utidylib/utidylib-0.3.ebuild
index 3551da313538..177e0d3644c2 100644
--- a/dev-python/utidylib/utidylib-0.3.ebuild
+++ b/dev-python/utidylib/utidylib-0.3.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index e63d3f7667ec..715f74b9784e 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,3 @@
-DIST virtualenv-clone-0.2.6.tar.gz 5691 SHA256 6b3be5cab59e455f08c9eda573d23006b7d6fb41fae974ddaa2b275c93cc4405 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256 WHIRLPOOL 317737e6c38bf0a55280371b9001e55409990814161b7433df78d1017b50264927946d51eb26dea5e1ae8d2aab7ec5325ef9e04d29a64acba7d91060ebeebea8
-EBUILD virtualenv-clone-0.2.6.ebuild 441 BLAKE2B 170e8024122b995a09f4910bfeb8a6ed3899a52f9e1f67333150c2c26b3d56bbbce8d3f2cf2757356e37942699855c7465537de4b3f22359ab497217c828d8f6 SHA512 17b166776e18041a24e8361cd212a195a43d037b16242d2000839a0454217b7d15168690a525831777e7d7c9b6ec6e4219d91c4094031ace4edffb63ec198201
+DIST virtualenv-clone-0.2.6.tar.gz 5691 BLAKE2B e049f7661939d0cc9b5b85d4bb49c34d62c1f7dc388b974b55e0ef5899c4f44006ad1d2b0df2c50aee3047b54d8645666684df8ddac4f1f006c7e7fdc98e6f40 SHA512 e4963532a8f954ab9840f9f950ccb9c5a8c2bb863c6b0bc72576e5f464b321ef098f199192dbdbb342a232223be9d47b170ea6222d3ecb5848f965cb5ddf8256
+EBUILD virtualenv-clone-0.2.6.ebuild 480 BLAKE2B 5ddcab46155a037a0c69dee8de4b20adb1336b0c5dcbec4609f0ad05529460b6170923a77761756a3bee2f1887cc53aea62c3c4372de7752be86c24cc23d0982 SHA512 0516c8f8f3fc598db07d615cdf3b1ec85a5cd047d36ed8ab38bfd2782bfb6d7e163f3ffe9548bd445587f825b19221a23c35d16a5d814944912551bbe2dea2f6
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
index c86ecc743a56..21e8667c3e40 100644
--- a/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.2.6.ebuild
@@ -16,5 +16,5 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 02c6a183c185..a213a2817612 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,5 @@
-DIST waitress-1.0.1.tar.gz 123934 SHA256 2daacaece189ede6a23440afe03bda58089a6207f1d80a1e9497f979dfb741fc SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21 WHIRLPOOL 0eca4eec79b894fb561a894f26de1adbe45c70335c66f589d66b26d9c68a708c443eaacded46099d23401390ee45743b8fa2bc39e744f61a988f6695e8c83ea4
-DIST waitress-1.0.2.tar.gz 124685 SHA256 c74fa1b92cb183d5a3684210b1bf0a0845fe8eb378fa816f17199111bbf7865f SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0 WHIRLPOOL cb8f6c3602540e5978c10218eef52c88a711855097f2ea646c8ccdc12c89b9df642dce994b17b1e8bbd9bbf8b18d6be2da506eebe3201e63b895207c1af9407b
+DIST waitress-1.0.1.tar.gz 123934 BLAKE2B 1e7d2a2d0850096b6b0d5654208ebe23d4e78360d8eedf3bce98276b8710eac0f544158f9efe5fa72abbab27d3ca5c4f3ed9afed43144d4d06f88f8068b2f19a SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21
+DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0
 EBUILD waitress-1.0.1.ebuild 797 BLAKE2B 67eb57070f777a7bd54d72b92578970f88f28d0eda42e8790628328a9a82e4f9e9f6c3bde9bfc0359a0260a2fac5ec058fe22db12a2916c562ccfe6781276e67 SHA512 a9b6288942450bafe1f52f8e368d19492feb50db0f29df91853498e4836450b5feec1db4c390d5265752bb0b76bbac5f1f7388a0e7007ed2b267a722d7599060
-EBUILD waitress-1.0.2.ebuild 792 BLAKE2B 82607e0fbb41336b835211fc020be62e135686ec408c418a95221a5178b653538e68613ca9726b742a4570ef39ed989426fe3a340ee76e15be9e3537c7414377 SHA512 de120146ccc9d4082c7e9cf55618416cab664b42388bd3929dbc1a264b8dad7212a6585cbce56d23545b2755f3288c700957b3155a1a924635a07125b3a6ebf0
+EBUILD waitress-1.0.2.ebuild 791 BLAKE2B 12a40648cd559936a4660452d5a201bd3693a4498569f49454cae74fd30dd65a9f2548e9283ea90fd3aa3e2053ad47ce3598df08c6a40ac31c4b7d7be1915dcc SHA512 0e98267a3dd45e493e2dbc90355a3990684d855f1d01208085ab16e9a3713306e633ea8ed96796f901c4068d48738cf7a5f6a2e9f63b7e6eea1c5e55c4c6305e
 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index 550e02402a9c..9cfb4701a294 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index df4daa0c0557..5c225bc050b9 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,4 +1,4 @@
-DIST wcwidth-0.1.7.tar.gz 22884 SHA256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368 WHIRLPOOL 3e45d689500952b69fdd78190454bae95b0f124206ad43d3bad9aa1e41d54885c326de60b67290e8ffe60dd4330a65b286f534d0bbb52572da30c958a9dfe10a
-EBUILD wcwidth-0.1.7-r1.ebuild 672 BLAKE2B 90c9cdccd6312a307008fac347980b367de31b55defa1b08a1ec6140cb5e1f80332941cb124a65ff9a872f4ff06e7050cbc9ad7bf25bbe0d66b336cfec8ddf3c SHA512 741b557a20e706c79afd7691b1f449a8c670356795bbf31ab1bb336e0466ef75a57c113aed6b5c79d6a3fe63a00bf86a7f29f16305e53487bbe89f1369e05906
+DIST wcwidth-0.1.7.tar.gz 22884 BLAKE2B 6d51be31c6cf11a23de48bfecd00d8b95e15c80b83559f67689611ac0d8406c18e3a761dc57a868e8c991ee07e286aed66fe77d905483f63ee998ca431fd35f2 SHA512 5bc9625fbd10721a50a3ac7d7f91012cca8e4f83533f265cf56890498bc52a53b155c82e67d6bc5523a5593c8d7992a1dec2a0f590318170eddf987c56f9c368
+EBUILD wcwidth-0.1.7-r1.ebuild 671 BLAKE2B 6f87dcb276149e7263d5e0b072e93cb84c49c33b3a414d2445d06c55828d9e09f7a36717dceddc0992593f7a722f22c0952b35f3c49076c26ec4299cbfac9148 SHA512 f2abc12252cca4bb3cf449bd70f0c2dabb1a4f3b5d39fd46c827d6b2390f8307af4a6e217a68641689664edb59f7ed328f01882efc8d5cbce259a80093bc940b
 EBUILD wcwidth-0.1.7.ebuild 662 BLAKE2B c41fdd3d6a40de1fac02aa149ca315e5e19f5feb4d673c788f85f050a7a4cd5e288e057a4746c31b1cadd2bcbb30b828a9dbb952756923a968098984dba167bd SHA512 8d261e73fa8a4082ae43b5b30dcfc3902fc94d2672b79a10a765e4e05bae28d96c4ae1d80d512baf6fee60e5f4acfd70fadfaf59f38810ac14526e239694daa7
 MISC metadata.xml 376 BLAKE2B 94917ec41c518ca9b328d9be7afbcba198376b1c28c3f24e24e3e994aecd877db745b07377bbba0a1c7d7b00e21cd53de31ca9ee4a0f08696d11b922cdc98771 SHA512 9f797fb27ebf7f1fd99d2c9a8c61ccffe1cc40f46991d9437dae121366da1edb31ee6ada3c202ced30fde0a90766453e72bcbb43a48919519f3de0b31681e213
diff --git a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
index 867250748498..a0359fe2f967 100644
--- a/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.1.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index a60658bd17e3..8f23e12d9469 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,6 +1,6 @@
 AUX docbuild.patch 568 BLAKE2B 372adc29b0f7c8f8cb840979f49c555b87ba1e5f7801d5c5f65f6127b78c0480d3bfe6517e71bc05085c7e4226be29f45fdec80f826241f785656b5639f05372 SHA512 588a3cdfe582f449b7bd75df5d6f29e327a20bf472317bfd839013f40a406c19529ad2ec3d0f258aced22e3d18e80bc25f1b8a398ab1b6ffbafbe1e36ee66f65
 DIST xlwt-1.0.0.tar.gz 129588 SHA256 ac432939eec8daa9f88af994ff53f009e607a4e1102772ec0be0b2a86b2c1cf9 SHA512 45788a506635f1ef6380d46aa0af724e511e401e8347dcf48dbf4e2d90e7f4c7f66838cd9616cf58807ffb939daba1f47b0d2cf449f8cb528db41fba84cc8866 WHIRLPOOL d3d344faae89fad012f05fe5b19e5ce16dd144016abf7ea15123a9725c77a732e85d93131c692dbcaf306cdc8d1b06efcaf39227265c612200107d2c20541132
-DIST xlwt-1.2.0.tar.gz 153909 SHA256 505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9 SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8 WHIRLPOOL 645746c311d8d2b55022368fd8d5baedf4771d66000baaf0f3eda57241c8c1c1d51bed9fb33e85398d9b79803b8a6a350a10d3abb74bdafc8de0e4408771a38f
+DIST xlwt-1.2.0.tar.gz 153909 BLAKE2B 553315b6f6ba822122c18cfabaf5a30f25a6ccdc1c507bf7fbf293df42e380520ef647d3501b51443a90f77c59497b87c70f6a71d3b3ce53658d3a6cf2356f6a SHA512 e0be61f6a54ac39c91cf03a1a7535c464045539f6a040f000921815e3280bd341770d72f4353891a10dde7c1b51eab4ccb1ae1c10bbf779108346fba8484eef8
 EBUILD xlwt-1.0.0.ebuild 1211 BLAKE2B 61c36564af78d4170de883dc283c51ac7e2e4d6f325a515c866421b6e416a3523900080b1ffc6e976f53f0a76a0046695562e9df9d1dc15dbbbaf5eabc175453 SHA512 0d88f97ada93c26eec18880f9e6bf43e22f33b6545a934d550da3719ac9ff2e84f0279d4a3eccfce44a88d30201360777549a2cbf99e724eea66faaf5cd411c4
-EBUILD xlwt-1.2.0.ebuild 1261 BLAKE2B c17d11c88f4b197a518a35f46656b0fe9037f3c6693b002b94d1c1416fb643a27c4bb11f3bb7ae9fdbaf9ff8c974989134a05049d882d563b143e889962738ed SHA512 d8fc3f213a98f57b2fa7c66d073bd4ed235670ee2ea567c8cef359dee7feee10c48b70f9afc2ce78f1dc40fc5ef6ab13af67c06f51d2d5cf29a1b3ad4e0f3cf7
+EBUILD xlwt-1.2.0.ebuild 1260 BLAKE2B a19075fb921f23cf80cedd3a583021340aebb63d2956759b71cffe605aca6433ff5ea559ed7d62b8db7847d90453dbefefd08fef263386e6f3256c12fd76f6b6 SHA512 e4e5e39c10fe92968d9c6e9148e3d1c4e2babcaf8a59d1d2599e7150dd8e8503dc3cd81beabf8587e1fdaed29e78bb8b2d77bc9609e4ada9fc546792dcc2c789
 MISC metadata.xml 659 BLAKE2B e2b6dbf5e4f15d1c105a7d4e6d6e9014feaa235b203818d0d6bad64e9156bbad060e02d3e7e54bebc44e5e6a85d6c10e516e0793dcc0dbd48738ffa4e63ef069 SHA512 eb8056746b86c2e29196ab25a01cdb899716b4a76f6dab5134e863d43882df8b68ad1374a6c81733560612c187beeeda5106bfbb3aef3881c3b7a476db91921c
diff --git a/dev-python/xlwt/xlwt-1.2.0.ebuild b/dev-python/xlwt/xlwt-1.2.0.ebuild
index 1142f09ecf41..d0178c0d85ca 100644
--- a/dev-python/xlwt/xlwt-1.2.0.ebuild
+++ b/dev-python/xlwt/xlwt-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-03 16:17:22 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-03 16:17:22 +0000
commit	4cd2370bed609c118b6edfde5d3f116e5c35b897 (patch)
tree	ec58f2c41f49754e41521d5ebc9dce4597ddd0a5 /dev-python
parent	f443475c824b4b5c086e6d040961cb35ad81bc60 (diff)