gentoo resync : 15.05.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-05-15 13:19:56 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-05-15 13:19:56 +0100
commit: d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree: 2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-python
parent: ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)
44 files changed, 132 insertions, 451 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 074c93d425da..4046a587ef1a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 656c6771aee4..18bcb9486d84 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,7 +1,5 @@
-DIST QtPy-1.2.1.tar.gz 29210 BLAKE2B a0b091902c7c7ccde1dbe8cc7e235de2340f3b2d9bfb5869a66d50d61cdf9cebf9ba2fa4458290a6f47c7a9c46227c5d8a8a9d7f2cac86f1528a7d6e350638b1 SHA512 7f9609b479a11daf1d8302040552f3926aa869eb775d23e32282a80ae9f5a39bf9be6b18cd62a6094a176ee8e7b4aef896fa8687eb2ce9ab9486f02aeeb756d7
 DIST QtPy-1.3.1.tar.gz 25061 BLAKE2B 5e504c9fd6182c23ec7f3160f6d2c073bb64bf3145b4336420be39dfda2d942633792abdcf2b7c0772ca7066e497d456667cbec2067a7798114929b0c9ca2d7d SHA512 3d06359b2793a57d8da715384b83e332cbc40d9f55699a2ddff0ebb04f527b9c629ea74b385103fd2ca98a79b02c8a582d16fa594048e7d56a32bda743da2008
 DIST QtPy-1.4.0.tar.gz 27019 BLAKE2B 6b90876f4801a19c98ddb8c4d678737a3b3ad61af1fe47c79b59b970ea4a895774bc554dfb9c99a4d806ad0316fb7c00e731c32a9d3f0a929a1f8bd4352851ab SHA512 7a989011114c17de29d5de6ff075935efdf9ebbae72d14580646bc81ce877f0beceaac511cade9e750dd9ee7e9f0f133c5676fa192ea906e7483feb543743379
-EBUILD QtPy-1.2.1.ebuild 944 BLAKE2B cde02e5cb515e0be44f0354ffbc802a629dba6625c17dae30c7417e9e1c6141a1a32f402e385467b0abf127d202da1b638795a7f5de936fc4f887dbaf9242b3a SHA512 c10bc35984b7db63d6dd2f5875a6d11aff9b4da13f415ad908e7351bb1a707d82565132f51ebe54d11655e3d138087c6decb5a7a39442f3edfd8ef81319433de
-EBUILD QtPy-1.3.1-r1.ebuild 959 BLAKE2B bfec246e5c256da5777fc01244413a28802b600a371dd71826ddee440f973c6f621741325ad62c94c0322672495ffcec8616b704bc1c14ea2c58d5d46bd38792 SHA512 43cbf817d76fccc1fcde055c37918260045d060ed568b7e6594f0f40c2ee438a33afb43ca3ace169dfcb20a995c0f12c0f8c87ebfe1faddca7934faf38258d17
+EBUILD QtPy-1.3.1-r1.ebuild 957 BLAKE2B afa6ce6eb0b35d063fc3bc7b0f26b79c844984553705f1e97d67089f67981a59a09477cf27baf18fb39a3b862a2468c787482ec1b6b65ac5aa490935105a50e4 SHA512 df950c18cafa27ad96f59c7f6cbb55df6d9d62b6d608d983a43cd09907f6f42e8dbb4e091a8c1e1b2c8242642a8ab43b15f23efb030552c050bcfe0fe4ae00a9
 EBUILD QtPy-1.4.0-r1.ebuild 980 BLAKE2B 8e44bc8639e870b349f81f0ccb5a11439e5f897645da1f0c99e6ce110ca412ec10072895c723920e2cfacc72a6015392f0020cde7c23783c8ce100536ea63f1f SHA512 fa31c3ab20096a44d6f7c367e2858757e9a66b77a7e991002104dd566e678cf9e3e753d8a52411be89bca7e3acb886f935c750743a33e7267220f689e7c28510
 MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
diff --git a/dev-python/QtPy/QtPy-1.2.1.ebuild b/dev-python/QtPy/QtPy-1.2.1.ebuild
deleted file mode 100644
index 51f9d64960b2..000000000000
--- a/dev-python/QtPy/QtPy-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="designer gui opengl svg testlib webkit"
-
-RDEPEND="
-	gui? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
-		dev-python/pyside[${PYTHON_USEDEP},X]
-	) )
-	testlib? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},testlib]
-		dev-python/pyside[${PYTHON_USEDEP},X]
-	) )
-	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=,webkit=] )
-	!webkit? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer=,opengl=,svg=]
-		dev-python/pyside[${PYTHON_USEDEP},designer=,opengl=,svg=]
-	) )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
index 7987c23cfe1d..80c9638f28b4 100644
--- a/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
+++ b/dev-python/QtPy/QtPy-1.3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="designer gui opengl svg testlib webkit"
 
 RDEPEND="
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 71cb34796e3f..c961a014fde5 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,7 +1,7 @@
 DIST backports.lzma-0.0.10.tar.gz 37242 BLAKE2B 42ee440437379aae9a5d4708d8766300143651f932a63b54e3c4153d48e02843cfd45ce2d60baefcda1f10465f8b982b6883a6047a146d14858f32f5ab9c9485 SHA512 72814ea262ec3916e6a44a571ffa2fb3316e7238a84649232849e378f720132157f5747dbbce659e7144e53e62a84bb41e419ae6d9b8f5daf10ced372b1bf9d5
 DIST backports.lzma-0.0.6.tar.gz 34475 BLAKE2B 9249684972b2496cfc5652d4dea5d03e0cf14fbef4a6f617111210e0125d0f455db2b80cdad5640ad71d04fe23fa292ea50a2083125daae5023512e577553683 SHA512 6196e64e81c2427d07844dab984113021ae97ba9d0c136cfd20b7213cdb8cda8b9a2643c8df21c799d338031cd49d4cbfd7f9ba9c30efd6cd28e63e8772a032b
 DIST backports.lzma-0.0.8.tar.gz 36111 BLAKE2B 1acbe9628f740f067068cc07105abe2a161bd2ebc712f1967c54d814abfa432cf5394167cc7adfcde49cc54adecb792a84e91ae810ad150ef38a22b2e79f9440 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad
-EBUILD backports-lzma-0.0.10.ebuild 1054 BLAKE2B 3f393d5abb8ae2eebfe6e19af437ea351bb4ff12335782d0c3b3179d360a13fba662dcb31067cdceaee310ae1d972a688a27a2a17879d41f5969e4d75208d367 SHA512 02f0505b875aaf5c893bec9b631cfc116d46e95b02934df97f79a511afe0b64a2b962c60e5f6cd47b1e3125d92c47ebd2e5b13d3893d1e55ae2d23a3516d43a9
+EBUILD backports-lzma-0.0.10.ebuild 1053 BLAKE2B 839afa5e11f93a5b9b7ceeecb5c1ecf0978d183149ab515fbe47357f5846417d1a45d18a084563425863603f3bb312238b0a878674dae20e68041bffafaffc2f SHA512 fa9919f1ec24b9200188e34a003a2bec47e5a8e4835f6a8a52c7f062ead6d5474a8d8ba50f3bc10e5abab093ad26de9da00007407fedd87ed5227071f313e1d2
 EBUILD backports-lzma-0.0.6.ebuild 926 BLAKE2B 3c29b59fe3f659d420639fa56aa088dd7b29db6d5b2c4d9cd08ba53e461d43d89b24b3adf2122c4d597652b969ba1761f994e1cbed002e316dc35530069fec29 SHA512 4629c3a799b952fc88514e29a914646f68fab7bd769e0388f61d83ac34c431f1697693451a6a9d5005ceeae5c0f7aae90bab626a3d2b0b5decf05df64dc0f1d3
 EBUILD backports-lzma-0.0.8.ebuild 988 BLAKE2B 83ab5fa06671e50121a0e298390a6591213373c8be7b6aa2457a92369cc7ec78d682de94e57f0adebf3ddcdeebffd4c18b7301dae9553df740884cfda29b7b47 SHA512 a1cf09b544f3ea5290469183c0786050d392139533d27ef49748a724ca7494708300d6d4f98bcc7dbbe5b5ccd8b30938c9cecf7ea27b0d3c51e4241e1821795a
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
index 628d83abbe2a..4c5216e0dce3 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.10.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 
 RDEPEND="app-arch/xz-utils:0=
diff --git a/dev-python/beaker/Manifest b/dev-python/beaker/Manifest
index d77859331cde..058ad3f8333f 100644
--- a/dev-python/beaker/Manifest
+++ b/dev-python/beaker/Manifest
@@ -1,5 +1,5 @@
 DIST Beaker-1.6.4.tar.gz 54480 BLAKE2B 809b2d23fb95a21ab442b3be20ff5372630697baaf507fd26d8aefabeed422401de890c8de165a079bde4a05230cea244a8d5bf31b8b89e60a88b840de9cdedf SHA512 5a6835d01d0b1bee57844525f1223d74edd26f07cc769df6a8cfa77f44dda4435eb96639175928a1caf7c4f927ac3a674c0fd0e7f50f1aea91da7880de3a6704
 DIST beaker-1.8.1.tar.gz 80541 BLAKE2B b60ba47a41f5f039699324dcb403d99cbf3d7e7cdbf593e275e1d41e6abc86dc829fd9a582b80e6274d6459624218585239b1b623e70636e2a1d736c584ce245 SHA512 bd9c4a4bbf21749a59c50ffff1d1dbff8bc9116394f79924efc6be637fb8c1ffef91a8363da3375bffdcb0ba291b71b57f75303f3fbe111e8670a390058e9fa5
 EBUILD beaker-1.6.4-r1.ebuild 1279 BLAKE2B 21ee7eccb3f54aa1b033b8e63168338493b605fb63760cfc0bc0f3fe6511bdd3c551cf4184f6780b3a70b0887947e6bcfc73c5fb10a2d46d5c1121b3859ba15f SHA512 08ad13c4fa1c65ce293c3dbb0d03261d5012b568d3f2bad43ac9c584b29f9f4661961074f6934468de7ca1d4015e6739f896ed912fa77d0b908f9f7020b3bd15
-EBUILD beaker-1.8.1.ebuild 1342 BLAKE2B 0c6a30e639031f2da1313993b92030a69eaa69ec3c4b3a0dd3161a3be0386000d29e6308108b8404c8aab81755e70d54b363d1cde396dd728f784186aafed325 SHA512 4fe8fcf6de018f82565de9cb5752296905018235cca602c99ba6f8a368f934c51547b89f293227ac1c694bea1f2b66df90646e1e30e412ebc14324d3d6364cc2
+EBUILD beaker-1.8.1.ebuild 1341 BLAKE2B a5f6e479cd21ecbdcaaad07ddf574b143039c18580a746dd3561631e9a9b7450b6129cd4e928d33099c029dda9edbe3b2044c1fee5887151147dce293ae22814 SHA512 ce884b58f5cba65dd63319009263640895bee34935ebdaab69dfcf4fb3197e389fc53ddc5655840d5e955d61ab272ff5f7e17fefb5443ec05c64a44f95f7a6fb
 MISC metadata.xml 376 BLAKE2B 5cb61bb094fd8e020b5e83aedd79fa283143e9156935fbb3d6666186b81a17d544634349ff10b50bd9568895eddf54dcdb2c304a4fd6fe51bb37931cbb181074 SHA512 09586c7ae4aa5259c0776ef77713538e8b8dc730da802d95b3de5501aa6c88c96c1967740ff77a124821bbd93b13e9547879f452d46325916237aeaddf58c353
diff --git a/dev-python/beaker/beaker-1.8.1.ebuild b/dev-python/beaker/beaker-1.8.1.ebuild
index c5f612a5d8d1..cca16d99a4c6 100644
--- a/dev-python/beaker/beaker-1.8.1.ebuild
+++ b/dev-python/beaker/beaker-1.8.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/bbangert/beaker/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="virtual/python-funcsigs[${PYTHON_USEDEP}]"
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index 9dc37a2cc938..940f7bc2c13f 100644
--- a/dev-python/bz2file/Manifest
+++ b/dev-python/bz2file/Manifest
@@ -1,3 +1,3 @@
 DIST bz2file-0.98.tar.gz 11333 BLAKE2B 4ec4687f609521a637c20a512b544cd99d7c334f7cffaeff71d2a893eefe131a10bd548b9f1e829c899cdcf181f5e877e092cf08d709bb3f1ba9901d3386b3e6 SHA512 2d28e71fe71b5fea4008d65a1fa91d5c6fafcacc09f891c5deaaa985661576bd97f2e33fe9f8c5943841f09c153f2079a2511329c066e57c775fb0b089b30b20
-EBUILD bz2file-0.98.ebuild 601 BLAKE2B 082809961fd3b2419504a450fa9bdc006e5fc91967e7bed3de304162b40a3671ae9d6e633ff8a826220828607c7331799345c4540a1a84b3a076e87e847eb5fc SHA512 4f9fe46a5a7499fd6de9c181a40baf671826724967fb7dd7daf3e347223f48341567f20f7383193520a18b03a118d5eabdd6dc71cfd5881c80932a578723ed67
+EBUILD bz2file-0.98.ebuild 600 BLAKE2B cefb80fc476bd021c1c0ae91da818201630f9ac7a607257f47b0bf1b2de29301774e0d50fd546bcd34d03213910348b7d00062d13c87f7b717e8f0dce4307b64 SHA512 1770d0a5893fba9e662b67142312b8bd2ce39df921e5e31631f1cdc92d2a12e8c175fc10191158dd9aab79554c9cda006c03660fa7c6ae30df52c798f42988a9
 MISC metadata.xml 342 BLAKE2B 8cd4d551724a069a3668b91bb8218576e23cec6c450baab71b70868670d673d51bc11952b7f077aeb76493cdee5ba20ee4175d091e5ccb995fe3624e3772901e SHA512 e511170e43873344d2652837b823c3207a8da885487abe5bff9a90e0807ae4a7736170759e8e9772957cfb52a9d81e436f19f4327636d411f0f9d73ab31a9d2d
diff --git a/dev-python/bz2file/bz2file-0.98.ebuild b/dev-python/bz2file/bz2file-0.98.ebuild
index ac1d7c0eb338..3f04f2d3f841 100644
--- a/dev-python/bz2file/bz2file-0.98.ebuild
+++ b/dev-python/bz2file/bz2file-0.98.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index 715a2124be83..929f8448e1b2 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,9 @@
 DIST cachetools-1.1.5.tar.gz 13378 BLAKE2B 68fadc9a3807e28a623671417bad192222120d408e204159956c31d2c285e7debea166c1298e9d6cc6f3ecc7c6a05bcf4a5270f303872925e0f5603a2da51bc3 SHA512 2565fa8666dffe5cbc349f80e719e0ae0df3ec36de3843f368fa67777b4e957c81f8c32f7d6eb704ea1fda5c2851bf57d68e563afa63ed0f7664d3615671f998
 DIST cachetools-2.0.0.tar.gz 18592 BLAKE2B edf075b10dfcd9da9416141e8341b06ab93c88d9af59df3b960dd666e305aa94cebc46bc4290f324369a8ffd81853136b9d8318f20257d234f7e0fef7784e41a SHA512 b1e7a6ed87a82a981f6c9b27bc96f26fdae241a12db85ff890538935e957d7ea88688e20a000691466bdb7db053f8c2145385dfcec6f5f4d84dd812ca419752d
 DIST cachetools-2.0.1.tar.gz 18790 BLAKE2B 48ce160117086306f5dd7fa7d74b12cd05db76089a1b98e78fa77b81e0f99516523fcef1d43c434137689b45e988ba7471469009049337f8e4a9a8aa6bb2e2b8 SHA512 4caad0676dab2a2ab922138c8305c7e40ac671aaec59ce502428608217976045af7a714c51567ff020987d3bf90f0c9c51645a59bb4f68d377e1f8dbed24bade
+DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
 EBUILD cachetools-1.1.5.ebuild 459 BLAKE2B 916faf37389cd4299ef32218aa52b1b8473068a5956621a4b13a4dc25aa25ab20b20e1dcdbe70a9afa084aabb5703137761310f19d9c7f691c4cf269a8129b8f SHA512 8e75968aeccda3c114e7b1ed78c1b577275fc3b363971aafd3464e6ac3eb9a028a419696b6ddc9ec3eedd63116a4dca9b6250c43c104763b699f846a7fc8fcf4
 EBUILD cachetools-2.0.0.ebuild 609 BLAKE2B 9b6e8950d51c08909022af77dd281ba52d7aa25e04dbd23c2bdbec2c7aa368cd1cf4849a9ef4c8bfd2e4924c2ba5db71c8a84a745d5a7a1caae4aaede31882c3 SHA512 6a6e620a075c8922e7933195b15c7dc811006b5918fa69cf81d42297091c56b297f7a684d5401b8e9d9c58c958f6096f134956f83ddd58bffde2dd2ebb277ce3
 EBUILD cachetools-2.0.1.ebuild 609 BLAKE2B 9b6e8950d51c08909022af77dd281ba52d7aa25e04dbd23c2bdbec2c7aa368cd1cf4849a9ef4c8bfd2e4924c2ba5db71c8a84a745d5a7a1caae4aaede31882c3 SHA512 6a6e620a075c8922e7933195b15c7dc811006b5918fa69cf81d42297091c56b297f7a684d5401b8e9d9c58c958f6096f134956f83ddd58bffde2dd2ebb277ce3
+EBUILD cachetools-2.1.0.ebuild 611 BLAKE2B d9b61d4319d4d74a1b7b1996b5873974d490cdf5a700579c8736f68ce951f2da40cf343cf5686cfa168b57cfa8ad31ccfd64942989a54527ea9a25152fa8127a SHA512 d2c001186b3be782d2b8ecdfac8b171e01b34f9814a0c5a5c450ce3944f8a6bbfb696891836fd4e588dfc3cb9ca5f31ba81529939076b0a0344f7f0b0110d42b
 MISC metadata.xml 327 BLAKE2B 13db1dbf3081379704678e984732303e85da30996b4ba48e58d3145ffcf3dcebce27b26a140ce121a4303980ce0c41c7b164c9d0e141f4c208d74ce27f262987 SHA512 7eb94b86c09ed93f498beb76dbdf7217a1bcf48ac817c44ae197e20285b18a336f7cae113ab48a52900eb214be133cde6b52760386d10b75ad8810921a127a7c
diff --git a/dev-python/cachetools/cachetools-2.1.0.ebuild b/dev-python/cachetools/cachetools-2.1.0.ebuild
new file mode 100644
index 000000000000..29ec2b11fd87
--- /dev/null
+++ b/dev-python/cachetools/cachetools-2.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible memoizing collections and decorators"
+HOMEPAGE="https://pypi.org/project/cachetools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	py.test -v || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index b9a9d675d443..ab4c1286d748 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,10 +1,12 @@
 AUX argparse.patch 408 BLAKE2B f0c41a7e581082e0ca8ed4dc0a0e08643dc2d144c63bfcfe4a27b1044e589e72db37d5731b236d7eb2bc2d7dc682c0b64792d2a8b22ad0d7f88d5cafb2757f3d SHA512 c5a5067d3f7477935d775f5c9c39f9b5c9636e97ab567c6b7a5d34cb06f5fac58a4dff94868f2d856d792c270bc6d727fe3ec60cf8825b7ae2b4519aed999b90
-AUX catkin_prefix.patch 1619 BLAKE2B 75e243abe00a816d79bfa9a7fd73244026350a3d233363720245dc7c01380d393c000a886955101e6c29d126de1d410b4edb3b6e99a8e9757d3d7d5a6e3c63f0 SHA512 c90f004db36fdbcc46c47fab5d800bcbc7f3b5237eaa78ceb4b47eaae0c1eba858a92d3fb673bfb9b4cd107675f8551eda4477cc419b26279bda4d55fa78f7f1
+AUX catkin_prefix.patch 1618 BLAKE2B 68d6a3bd4837d6fde4561e16a23d99037aaf4e0708e8b163e7484bc89bc0aed66c160ec1fca77324e8ea8d81524bc162b6c0eeae366c041799e612e8af25c851 SHA512 42eb43d1da82271f1b3279d5cbd8d1d0f211a3919c2329191716ff32433f57b0c279af527e79fedbcd6791746517c6938643ecdf561be7621b0605a66869c804
 AUX infinite_loop2.patch 1274 BLAKE2B 1d3bac0f73f5e568dd0e100db51a554162955ae053853bce1adbda280c9fec5fdee0dbd0cd4aefdec58bc953979ff8624fcea20be3a77e35feda1a12523c23c5 SHA512 a736242c2e42d0e3c97556f565d7ebc3b06c203a21b805fa13db789ffcc396b5f79793874418c389dd0013c36f9ba6f5674026d03d26653ea2a69fb0a95bab9a
-AUX ros_packages.patch 621 BLAKE2B a54a99ad74ad85e13beedbed0a182cc2b0f82769dd75b56787f760cee61d5100c2bd39f061731215b7aca561e4e2e7f9f95a8b056bfab41c7e256cd7ff7cab53 SHA512 446c19801306f2f0116a4bdfe228ddc192a84458fe0803bd5ce9b99d58620bf2c3bf31bcc3f078a4c18281f64f7e68cbfb711d683959e71457b05b7aa63a6ecf
+AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 DIST catkin_pkg-0.3.9-gh.tar.gz 48290 BLAKE2B fbba89008946433007f1016addeb73e44108b057609d52d693e80024460c5d77686bde241331845d36068b23e87a4ac33dcc0c6c29af95c4e86e8a30bbe52918 SHA512 39c7dbd7b3bb7d0fd7f37e6931e5de8c76c28ca329db5783d1cf0b01e9a7f58079c45434d937a8edcf29cbdebdcfb4b18480508d688dcefdf58c218838af65c8
 DIST catkin_pkg-0.4.1-gh.tar.gz 50886 BLAKE2B 03a5205271fd3f12e4a3bcd093d8e1811d3a1e3197292004e9dd4e255fa10741fdb90a754df4a1fd6705f305e524413cdb7a8dc9f5174a162a20ffa95cfc3b2e SHA512 d7802bbfd0187f1411d36fbecca2afa43dc55f54441a6e0ddc54c2153bf1c553cfa76e5a3d1d08a92fe765c530d1668a762eaaf45e1f68b61c2cf6d1ec49e4a7
+DIST catkin_pkg-0.4.2-gh.tar.gz 52930 BLAKE2B 2b8589441d241197c661975c07c60856c614c4c328e441e6fbb1cb41ea2919f57864f67198b684eba7183004671df0980ddcf0070a53099074433166b5d7db20 SHA512 cb47771172d88792bc7039f072175a6f410aa046e2611ccc75e46bda388d620ac0059e0fa9e087fbb7f2833600a7233d714c1aeeab65e264606d8ae2e64d76bb
 EBUILD catkin_pkg-0.3.9.ebuild 1106 BLAKE2B 357956270ca5aafc8e21981ee609a14af2d82fcb6e88090f4fcdee4760a4822cfd836784ef3287c5b62ff1afcbf1dde5dc9c159c32b16c4497bb0fcffc7a8576 SHA512 98685de96bb42b0c36173fb4a03d2a28709469a9d63a6923beb1caf14e07fcd6e881511e79bb5f453558975b4fbe5d284d1ed2e8c965da4ab4beb3e97c54aef6
 EBUILD catkin_pkg-0.4.1-r1.ebuild 1146 BLAKE2B e413fe7ab6984bee5bad8208d10442586d8acaa5f81a229ef0f77d670d92aae16a6429d06d6e978efbfb15deecf4b1eda726afdae94db5dfb8c491749cba398d SHA512 2c32267fead6de9e05cf74519fb87d5d846d6ad993e2bc737e48e5131590f840b515d78bfd1dda9971b50607b65b46f5c6f9bf2deead373da3fcd94ab6fa40f9
+EBUILD catkin_pkg-0.4.2.ebuild 1146 BLAKE2B e413fe7ab6984bee5bad8208d10442586d8acaa5f81a229ef0f77d670d92aae16a6429d06d6e978efbfb15deecf4b1eda726afdae94db5dfb8c491749cba398d SHA512 2c32267fead6de9e05cf74519fb87d5d846d6ad993e2bc737e48e5131590f840b515d78bfd1dda9971b50607b65b46f5c6f9bf2deead373da3fcd94ab6fa40f9
 EBUILD catkin_pkg-9999.ebuild 1146 BLAKE2B e413fe7ab6984bee5bad8208d10442586d8acaa5f81a229ef0f77d670d92aae16a6429d06d6e978efbfb15deecf4b1eda726afdae94db5dfb8c491749cba398d SHA512 2c32267fead6de9e05cf74519fb87d5d846d6ad993e2bc737e48e5131590f840b515d78bfd1dda9971b50607b65b46f5c6f9bf2deead373da3fcd94ab6fa40f9
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
new file mode 100644
index 000000000000..f74d5f891e53
--- /dev/null
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/catkin_pkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the catkin package system"
+HOMEPAGE="http://wiki.ros.org/catkin_pkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+PATCHES=(
+	"${FILESDIR}/catkin_prefix.patch"
+	"${FILESDIR}/argparse.patch"
+	"${FILESDIR}/ros_packages.patch"
+	"${FILESDIR}/infinite_loop2.patch"
+)
+
+python_test() {
+	nosetests -s --tests test || die
+}
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch
index c5f40db51cd1..fe9cc347882b 100644
--- a/dev-python/catkin_pkg/files/catkin_prefix.patch
+++ b/dev-python/catkin_pkg/files/catkin_prefix.patch
@@ -19,7 +19,7 @@ Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py
      if paths is None:
 -        if 'CMAKE_PREFIX_PATH' not in os.environ:
 -            raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.')
-+        if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ :
++        if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ:
 +            raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.')
          paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else []
 +        paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else []
diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch
index 6c9855d627c9..06933d69a9fa 100644
--- a/dev-python/catkin_pkg/files/ros_packages.patch
+++ b/dev-python/catkin_pkg/files/ros_packages.patch
@@ -7,7 +7,7 @@ Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py
              continue
          elif PACKAGE_MANIFEST_FILENAME in filenames:
 -            paths.append(os.path.relpath(dirpath, basepath))
-+            paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath))
++            paths.append(os.path.relpath(dirpath.replace('ros_packages/', ''), basepath))
              del dirnames[:]
              continue
          for dirname in dirnames:
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index ae963526ac23..92673c0e788c 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -7,6 +7,6 @@ DIST cryptography-2.1.4.tar.gz 441557 BLAKE2B 66aa07930ee54469328977e27096e65b7a
 EBUILD cryptography-1.7.1-r1.ebuild 1725 BLAKE2B 3327c2607caa9f5fe09f617091dcb21ec637cc5621aa10dcfdb07c82af71a7663a603ae2b7a1597ede0895221c2cf57fb5eacb8883ceb10f89fc36e9c1ef2900 SHA512 9e31689524057c73cf174c8ec4621b57777f20e75295748c91c58eeec8a058ac5067d996aaeb5508d87b07b58c3484e8a5a09c9f4585cadd10009cdc7899e79d
 EBUILD cryptography-1.7.1.ebuild 1662 BLAKE2B e93ee9089ba409dcc50f7a09aed35fe63706c0c08feda1413c1127fccdbedbe5de857b9f4980d2348125bfab11879b71b48e12c2d187f0ed8db6f5b083466e90 SHA512 33688e944e9b4a46f8a49b643fb5f8203716aca424ae6fb84d0b9351310efe4f7941eb2c329a8b4f11c159511aca7e8ee94bcbd25d89d3da919f943a591eda34
 EBUILD cryptography-2.0.2-r1.ebuild 1624 BLAKE2B 7bc96039e6e97bb471124fbc1d1a669a94b6b95a1066fc3a06e5adf84514efcb5651fb9a8c837942ed649e910fdb86ea86b4d92c4dca2177d81bc41ebc6800de SHA512 a65cda871f652ff1e903226396c238185e01a666b84bf1fd15a41707989b5848e4b442bce23c3bbc78a49bd64bfd27eb4d75274b2cb99be6c6ec5710d82df896
-EBUILD cryptography-2.1.4-r1.ebuild 2171 BLAKE2B 7a287dceb41ce20882b35a7fd996ac598fd87cafca208896411aa06e2df4c6e4ec03ebdab88fff7fe944e418dc377d0c89bffe456188603723f573df8b07b9d4 SHA512 6894317b9206be6d3a576b48171f6ee11e17b838c7bc1b12958aba5087e4d0c3a8037fb7a28273bb6f128d24b208113a3d61fba2e88682043dd0865093186870
+EBUILD cryptography-2.1.4-r1.ebuild 2170 BLAKE2B daa5b335f8734a2ef6f18405ef943a4be49bdaa727b5f5266186726ed2fb01a0a563b2d167252f658f43e7ded1936b985bee465365af2e01d32355ec4801e3ac SHA512 a35fa6e77cc88001ecb3c302df741ac9b997288267661c9cb071f8c58d4676658c49af82aad16c77f5a5d72f97ae9a904fe40b674d4c22010697abb7f2c4eeb1
 EBUILD cryptography-2.1.4.ebuild 2044 BLAKE2B 2dd3ba08232364b585e92ed6fd83a204f9d1192ca016a796275a200b995c9e3244c687c042600be62a7245f327813ac6d95f6fb8fd1682c0b861cd106a5d2e72 SHA512 43cb90a1de0f0501cbff6385bff0e80eb1fe412479dbfca2bf8ac3d15e93b2c4621b80ca45c7482852620de97eab249cca0e7d2a050856cf4147c22d0523b2bb
 MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
index 29d1f950ff4a..96b3afa447fb 100644
--- a/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
+++ b/dev-python/cryptography/cryptography-2.1.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE="libressl test"
 
 # the openssl 1.0.2l-r1 needs to be updated again :(
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 4c6c8bdfa2a7..763e7532c3af 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -2,5 +2,5 @@ AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
 EBUILD mako-1.0.3.ebuild 1408 BLAKE2B 6ff326737561bfc128527020d21cb8ae0da47007e70d23606ffd0a8644a67b11aa6c0c7d0babc41c8b038d99fb3db28a899bcf04ab18873e7b2afeffd01e4c6c SHA512 9ffd33d5236948976f8b00f1b0d56c3904a19c90fd17d30ad965e450c6e170b5d285aaf2cc21d77564b8d19ff87a0c17010f52037d6dfb39f7d6d4691e904793
-EBUILD mako-1.0.6.ebuild 1480 BLAKE2B b5e1b3f511a8c79b3b66e6a8b0ea36fc0b66445cf52841e354e72092328e49bbab19efb177374526fa54d741a7efa54d35fc033448774f135d2f5f5c6f40e34a SHA512 9dd53fc72593a834d9e2fdbe948f48c4e23f79a72d84663b5671a435114797a2da2cf57c771486348d7ba710b239eb32352c52509c66cfb8aca0eb5034129e77
+EBUILD mako-1.0.6.ebuild 1479 BLAKE2B f91c031c6e5a5fe86d94a3edbaacf8466c3c75ec5097dbf4778fedb7738ee37a3a3e6317dd9d0f85806dfa12129c7cb4de4efeabf8d7fea8ca6edb376ffffa5d SHA512 a14b40d210232b05b79fd5f2cc8c4e94bd7ae3a2e0da1924d3f500951fde62b073a26274d691fa83163810121912b81fa8f0c79315179c45786a61d1ef928231
 MISC metadata.xml 317 BLAKE2B 1b8ed4d3958df0960dda7060ead69fff4ea6f0c6087d99af4ceeeb8d1fae9a88657aec6eb1695ec5f990e48f167e729ce65507080ef0ea5d23617d439621921d SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
index 0c1a8d144ceb..208a95086da6 100644
--- a/dev-python/mako/mako-1.0.6.ebuild
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 0c57ac39d1e1..b53b7a72e64a 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -3,6 +3,6 @@ AUX matplotlib-2.2.2-doc-make.patch 363 BLAKE2B 043318c6a584427497f284d1e770b7a7
 DIST matplotlib-2.1.2.tar.bz2 33422388 BLAKE2B cb4826b563e9820a17e568de78044cb81af6fbe86221505fe9cfbab7e06fb95cc3a4eff8772443197cdddf6e49b4b59d204fab39054e627b95f0169b74f630a4 SHA512 861354363f625a45f40ce7b31263088c950c8664b8ef13f8019da222ba4a8df7d0a8ee048a1bd84102e472ec48318cfea9df905d58a28efb788ba59cd5348061
 DIST matplotlib-2.2.2.tar.gz 37317332 BLAKE2B 4120265263c5b1e4ab57f7c0eb7a477b4071a5f219d1d6328d6ed51d44460217c7c4da82a4b7d13c6ba9f80308406a217f2dbcfa310f3137cbe8bc56a9ef0eef SHA512 1d21ef821190f22354098f8f0db6449f237acbf3c1419ab3815ecd4e9c6922fd3f00c4a8f60858e319b55b6fb2e8fe2922c0bf8e72b204e7edff0b409cf76320
 EBUILD matplotlib-2.1.2-r1.ebuild 6334 BLAKE2B 16f4f9037563e799c5ba9108f090afa1a713ae532646a9ed9a65ae0b810df0e4915b7433901c622c92663f2955db7ba1ebfe025b1bb0668106e99ae958b983b3 SHA512 d171321fade8193ab2d4a4c858400c150ef0eba95ef81f497996be828555015438f7762baf94720cdcf4045d244d2e2db6a88434b758d2f6e9c05f76e328c44a
-EBUILD matplotlib-2.2.2-r1.ebuild 6352 BLAKE2B de15e3806c58550e61aee15cb1d3b5e8e80476c697f665b8e7479e6700c67ac7a52c029ef116e74b1813a701dc12dc2d87266391e16bbca578ffe09a3538557b SHA512 edca02a00a6bf62cf14cc2f4996d2f8652472e90d623036a9445cde8db5c2e2768070bcb743cf705b46242f9044032374105ac5a5377966d00aa4775db01888d
+EBUILD matplotlib-2.2.2-r1.ebuild 6350 BLAKE2B 7a9e722e3e19cc39c186b6edec908415261bcf24475dc1d650607b78ae84b95977f9c0780bdb5fcf1affcb4ef359c443ba5fe9c5b52a6b520e522dacf2babd88 SHA512 181f035f759253e06f78c57d29576c7ddfd5dcd57633f7a4a23795c2c589cc33ab820c0abc7b42ef4cdeead624c7489ef6f867ac24f6fdcaf61585aad4b7dd61
 EBUILD matplotlib-9999.ebuild 6302 BLAKE2B 7f9c15979be0366406fbe3f0b20ebb1b22d9daa45b451b5fc0bcd09abca6d4016aba9ba5a5c04bc59d0eaef619673c59da949ecf369cb172ed7f661315d2f1dd SHA512 2eeedb9851175d1f77ffb817ebf541904fd3abc3a8d2ae159c556f85ff5bdd316d07c37bb1566d2565aab4ef823b51cf4a23e6e2cee2506fcf276340f1609d2f
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
index 6cf20a9bd9ec..63cf533dd0ef 100644
--- a/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.2.2-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 # matplotlib/backends/qt4_editor: MIT
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="cairo doc excel examples gtk2 gtk3 latex qt5 test tk wxwidgets"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
diff --git a/dev-python/namespace-zope/Manifest b/dev-python/namespace-zope/Manifest
index 5c8aa3bbf919..cd977331546a 100644
--- a/dev-python/namespace-zope/Manifest
+++ b/dev-python/namespace-zope/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-zope-1.ebuild 938 BLAKE2B 504736bf54ace670a441be25f8badd05ed260a822af4740b713fe84affb241cbb8fd6e114fa26fe1f43ee398f6b79a06003264f1e77e5aa35efea90fdeb0ae06 SHA512 ab15b8e1f2ef89033ac3a6112b84c97b5fae1a448dc0b56e02e8058b73300ecd63c83057f8dbefb8f433b5594c10b547f495c406e89eb9c23cb794a5e88ac648
+EBUILD namespace-zope-1.ebuild 937 BLAKE2B 71fba9e272b3c5bccc4f283d88492da4f98eb4a71f07d714dc6b3b030bf0ff2e8482341425da4426913ef7a45d9ec99eff3c0848b1ee9e1de4f71d666ce3bf1e SHA512 5eae70a70dc6f257960e414467df31d80eef4a158172ab41b49f958846bf10c6aee4f1ca3f4185dcf237de538f850d46e86777500943e0090920be4cd6dd4251
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-zope/namespace-zope-1.ebuild b/dev-python/namespace-zope/namespace-zope-1.ebuild
index fcf5d1fdab7d..2ddc51d5faea 100644
--- a/dev-python/namespace-zope/namespace-zope-1.ebuild
+++ b/dev-python/namespace-zope/namespace-zope-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index f2d95b508f2c..e76d8cc159c7 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -3,6 +3,6 @@ AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd6
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
 EBUILD nose-1.3.7-r1.ebuild 2470 BLAKE2B fa467c94ff2c2a656d6c44cb90f4741feabeb146e46fe93657ba6d12258fae1f68d0d0f5130bc04a2ceadca42c3c7efacaa40dd8356239cc495c9477a44155c4 SHA512 651f41e8f6fc187365d768b90ec6419e5ca76510eb74075feef9bc30ecf7a8cf7cdcc40ede65bda7b8241760ef1c706f4c9a6f2dee25d75cff13107e300d0bbf
-EBUILD nose-1.3.7-r3.ebuild 2778 BLAKE2B 3433ac0ac79e81b82b62dbfd765e4967e35f87688fe0bfb2130280e16c4a7c31a394d6751db1741955e6ece99aba37e67ac9f936c6c9ea99019dbcd85759c92c SHA512 4a53d17d63e61cec66ba99c087997dc2b9f9eddbb7bea16e79a4157eb86939d238b53a3dba48da33d74318512a8f6d612df62ba6df5d99b9dda1cd7dd43e9431
+EBUILD nose-1.3.7-r3.ebuild 2776 BLAKE2B b477523949a586438f4a94ab8d727e795cac7533e5ae338bf06cb83f8ecd4f60c83b455b34707d346c3a9eb121e64841f22439b3d3d90796065065cf68cf5855 SHA512 ce8761eea2b50b07b46298930800807e686e08cfc7fa5117396ac9a490a37a7f732358c4c33cd4b8159595d39c6aa38ab9721b46f82bc19ac6b58058c1acc393
 EBUILD nose-9999.ebuild 2234 BLAKE2B 098036df8fa1c951ccd5936f411c1b9d9334cc2dc9713bd7450cca44b1f35f225111d663481697db34a4f36ca6ad5d13740d020afb7852d168c77e84eaa295df SHA512 77b669442f6589d63af0c3927e4e6c120667d42717fcff6b835de1abd46a26415e622f265b17bb64da0381bd2c49bf9c9bd0443b0d83ea61ee2f01d942599f6f
 MISC metadata.xml 432 BLAKE2B d2e71400e1d6c6fd0f03ffe106d6c5c7e6ee4b657a2958b4dcc8749fc475bed1b0f44279a557b27451ef5fb31363bac7c5cf5d6433c1ac1901eace3a66bfd826 SHA512 d4ff137034358979e2b59fa11e18ff17ade90c1c2127f5c769a58c8867a5de1a4736c2d22cad063b9119067578feb6401305f6acfd3e05d897b3f01f273e5530
diff --git a/dev-python/nose/nose-1.3.7-r3.ebuild b/dev-python/nose/nose-1.3.7-r3.ebuild
index a8f8cc78ea20..c2608c7c4455 100644
--- a/dev-python/nose/nose-1.3.7-r3.ebuild
+++ b/dev-python/nose/nose-1.3.7-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 
 REQUIRED_USE="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index c6b68b33fcd3..de647cb73345 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -4,5 +4,5 @@ DIST protobuf-3.5.1.1.tar.gz 4584489 BLAKE2B 995ee2f06a6358e9935b488269ee50f0dcc
 DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
 EBUILD protobuf-python-3.4.1.ebuild 1250 BLAKE2B b531ad3c2ace5bf9a2ca33b04d7b0f977b78fa47a3f0486183e938a85cf2583c06698160996946c80e093d3f7b9abac4cb66ffed9167875a37d0268b7ad72d07 SHA512 a82b7e00afb6408dfeaf3c70fe5df077792daadca9e0de3b30689fd5ef49405e81f615fa2e586f14548715e189bc9db1a013b69bc17b599a0119801f74857d14
 EBUILD protobuf-python-3.5.1.1.ebuild 1243 BLAKE2B f5ede3256ff9071cd86b5a6780c80d5ceec5950a9d315a55eaf6d72c066128f1faacfe98081cbc238a770b5ca45624d8ace5c492ed4c3f70b004bc66b643de15 SHA512 6f489d407300a5a3611dc3ec9e2622c91fb97e3cdec7c790601e9d1c2f2f103eb1919d43c4a50cc2a4e6534146f3c519cfa62d3194922509b4b33b38480ba8d8
-EBUILD protobuf-python-3.5.2-r1.ebuild 1333 BLAKE2B 5e7c3e17ee7c96626366c9f8146c49de7547efca62549724f68f22fd402089c7bb151b1504e3888f20f132aff33dafd655bd2945c17ccc1b1039845a3b6e7a53 SHA512 0dd30f54a75205b6f458a502b75ecc9b985a6fedc9397926bd9ebc03d2c9e4fce5079c3ed37f23b9ba6d64c66da0406a2676b96714c80adc34ad0335909704c7
+EBUILD protobuf-python-3.5.2-r1.ebuild 1332 BLAKE2B afd359362054ce0f69e3891ca325b23e39f652a1656cc16b5295f82cefb1cb3a20ef3703aaa3374321127ee5a6c1d030eaeedb305b1f92370fe6e7f0f459e0aa SHA512 ee7eea7087afa4f39b39573d0b2efbd2b01d582370c97011bcd66baa6642e581b5eacabaaedcaebd369051843d655aeb80dce14d5c29c0445ac4859b39b87f3f
 MISC metadata.xml 647 BLAKE2B a24942cbab04e847c0921371c22ac14ffe05b99c5a75ce99f8413e3c98e0ee5951e03b59faae740bdc0fda56e53ad36ab609fa9e4b19a6975725b4e9bf562d38 SHA512 064197fbb9f4857393236d4b4633aa389df5ebb6ab75c59552adbf80157feb20b3e2b2e5f526002652b12ea5033ea50c9db0ec02804a747fa4305505c715a87e
diff --git a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
index 49bf24b5519a..c90151f42ce3 100644
--- a/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${PV}.tar.gz -> protobuf-${
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 7c342509c00a..1c24d1e147b5 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,5 +1,3 @@
-DIST PyGreSQL-4.1.1.tgz 100883 BLAKE2B 8b3876803b61fde62a248cf6499b9396a16069fd5cebad8f17ca942990a5502a702081b395745863d54b304d426455dd94d816caea9e09809a7ff0ca1b4903b0 SHA512 4b37c56f2112471aa5f3003a1d867382ce1b7510afa0963f0ceeb2f8175ca601bb5bade9ea2038d44a1041f12233e364f138a635bb7b353d0a82aeb7d9d49b7f
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
-EBUILD pygresql-4.1.1-r2.ebuild 1592 BLAKE2B cf71efda28ab0c4cd24540307c5b68d8585cc06ce92b415b399d4a2ce4bc70d2a9a2a4293061e75a3c3e061b37ae0d56165010ae7b048bf2512de46981ab87f4 SHA512 c862f696772b9b8d6242fc98721d8b1e7e608f3a54ddc2bd4b34e24e782390cb1ac8e4060ab13ae025b9d8c229d4b9bb03cc2a6facb254ec49073477cbe32c2d
 EBUILD pygresql-5.0.4.ebuild 718 BLAKE2B 9d1729500f651809825cf91647736bd9c6fc096f77755fe5400200adafb9325699be202dc0144cfbc45a573c1c4dfbd75384a16334463ddb1de0e9168bf1c134 SHA512 61c8ccd1da12803cebaf112b453d414df85e035ebee4d909ab3deecd8402df206a11361a22badf9a5d752503e37faa29b5f998ba8c7c60db8b3f918c397410dc
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-4.1.1-r2.ebuild b/dev-python/pygresql/pygresql-4.1.1-r2.ebuild
deleted file mode 100644
index c3b79dd202cd..000000000000
--- a/dev-python/pygresql/pygresql-4.1.1-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-POSTGRES_COMPAT=( 9.{0,1,2,3,4,5} )
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="PyGreSQL-${PV}"
-
-DESCRIPTION="A Python interface for the PostgreSQL database"
-HOMEPAGE="http://www.pygresql.org/"
-SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tgz"
-
-LICENSE="POSTGRESQL"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="doc"
-
-DEPEND="|| (
-	dev-db/postgresql:9.5
-	dev-db/postgresql:9.4
-	dev-db/postgresql:9.3
-	dev-db/postgresql:9.2
-	dev-db/postgresql:9.1
-	dev-db/postgresql:9.0
-)"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Verify that the currently selected PostgreSQL slot is set to one of
-# the slots defined in POSTGRES_COMPAT.
-postgres_check_slot() {
-	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
-		die 'POSTGRES_COMPAT not declared.'
-	fi
-
-# Don't die because we can't run postgresql-config during pretend.
-[[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \
-	&& return 0
-
-	local res=$(echo ${POSTGRES_COMPAT[@]} \
-		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
-
-	if [[ "$res" -eq "0" ]] ; then
-			eerror "PostgreSQL slot must be set to one of: "
-			eerror "    ${POSTGRES_COMPAT[@]}"
-			return 1
-	fi
-
-	return 0
-}
-
-pkg_pretend() {
-	postgres_check_slot
-}
-
-pkg_setup() {
-	postgres_check_slot || die
-}
-
-python_install_all() {
-	local DOCS=( docs/*.txt )
-	distutils-r1_python_install_all
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/*
-		dohtml docs/*.{html,css}
-	fi
-}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index c7baf6ca3565..e0e4dce42c12 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,11 +1,3 @@
-DIST pyOpenSSL-16.2.0.tar.gz 167305 BLAKE2B c6daa906695b57cd48153ad6e86ac1ca24f561a9468934cde3f6848cb195dcde4079313e6e892ef607ebaf78ee1b5edd7d7de0814e83fc65b5a5dae383062fc7 SHA512 c1b068137a492564fe958603712d401b7ee0def94c01a28be55f5c89e07c25684ecb0f465f3c56f35924bde038894f2914ac49539144845fb586d12b80307078
-DIST pyOpenSSL-17.0.0.tar.gz 167121 BLAKE2B d3aa8713ecba18c6018e83b4da2de46ec8a0bb7bd24fa0b069c32f4ea75fde8aa371b9fa90625e536ea64cb9ee9c349d3c129988cdf495de8389707198248e43 SHA512 819be95f920a70b40ae48ed6740bd1d8cd3bf2fc080f682db8978946929994cb87ac467e220267dcdafc40aa7ed2cce51a334a49b06c1e2665d295157181ddad
-DIST pyOpenSSL-17.2.0.tar.gz 170816 BLAKE2B 10abfa61ff329d23c99897c58a02a487c28d19ce7c5d312bd5c769473aea40d846c3b036d34d674e008d155e2be88e26190f19a890ee375893a08ecafe6afaf5 SHA512 aef1628665353445760a0c869c5b88ba1f61a3ade7471bfd1ad9e57672573501574dab5a2491aaac1dc283893fcac1a81dd9b972f43d53fe7ef1aa48e3f0e88a
-DIST pyOpenSSL-17.4.0.tar.gz 169362 BLAKE2B 87a51efaa157b4a91a48edfcd9348402b6734e1c9f78e7ed638e3d245ae3922083c625e3d967e7513c588e131f96b06f110ae528cccbbb820f685afb9dda72ef SHA512 c3c791b15f2245d3c1381f84471f9e1b07b4a01c318a5a4012ec70193ba055fe948ba150f9c88d2dabe30b37f2025fe26ffb95c01682ca656d561014d41cf965
 DIST pyOpenSSL-17.5.0.tar.gz 170870 BLAKE2B e8b8986a7c5475ac3898df4877a8be86db359af79e1718bad85149440cff543c501ee23eb369270d2c539a9e3f4e13165ea87b858ef6916ee79ca6e49f6e5370 SHA512 f194662b5842f1e3a4fcb910b9f2e6482d1dcdf834f306acc3dd6d9723f65038f7bff550248fa6268d90c839c9d9e8248bb6c7d399495fe6aed25291b93ece86
-EBUILD pyopenssl-16.2.0.ebuild 1593 BLAKE2B 3cc0e7d864677614d33be2efe7aa757034f74e04bfe8af043ca4b180af1ac388c291cc093b2bd403f9aaf6f9ba103a509afd5a3db2f1724cad74f8c5f1893fed SHA512 bfd4e2daba859ed2fefc7c09674ceac3a15526b684e3830248daebf268951f4b9f390c3e47ede7d4f25f9d82e40b1ed0f9c0fb26bc2a72d35e7cc31c078fa61b
-EBUILD pyopenssl-17.0.0.ebuild 1603 BLAKE2B 246bfbd883005c179bbc135efcbed859b98789bbe549dbbddb1771a7872ef93cdbbd4aa8808d60dc25b97d8fce279fa5f6f0aa35a1ac7137815301cc15d4f3c5 SHA512 f38362a5976ab8b8c0c0f0a9620afa13fb8e4f60144169257113ff1f3f50fdb8583f562464337088e6ff588efad5a567c518773a97f78abd8dc05fe5ed46d033
-EBUILD pyopenssl-17.2.0.ebuild 1570 BLAKE2B b3cfa38d377429a04578c01705016bcb8db0312441c7342929411927721de1ee6209a7a8227942c95d7ff3d81aa977482772d9191cd8ab1b53e2e08fcd64b7ea SHA512 77500a97895391cbfe72ad12210187b7261e1142c859df6b434a63be7a2e248f5c63821677c46a902c223c80ed7c589b9b1bbbe4b9c20b0227ba6d269ac224db
-EBUILD pyopenssl-17.4.0.ebuild 1578 BLAKE2B 15a3c9cc32a6d7ec29d72b82ce5065dc3148a67f9e1bd487c8970c80fe107ce06cb7746703dc175f8741f0389bbd437cf748cf96a2d9f61650194585166cc71e SHA512 ae71a2e4cccddd9fd8b766745ab124c23f4211cc986a2674cb7a2d2193e869f7f4859a103d324a5714f0f86330f417fe0d8a0ca81e44abb49fd5675681a3c837
 EBUILD pyopenssl-17.5.0.ebuild 1627 BLAKE2B 20ad9d740bbe796302a4311d8eade95d349c936a3f4dba22c271439452413121cbead6fc822c847933202e9fe2dce1cc8e52bf12d6641c32826e372d2ec098e8 SHA512 e0cfe96a7f9f2ad6b8047284df2347e3bdb19dc13d6643b67eb58cb1c2fc4a7e6c74139d3711994ce8ad1e65b32d9aebaa3854ccbbc539ca5e39afec2b2d4762
 MISC metadata.xml 418 BLAKE2B 69f135bab3b0cffa47cc8e807e1f537f7fa0bd599bf3309ab92ddf41f894c21ab0e3f793ea4caa65d272043d2dc0352fc54c7160b31fccabbeb165775a895d97 SHA512 5cd4b0381e79245626500a2a38b9f7bedcc8e4742445ac16f12a96133f1291ec49592f2259294f153d5f1b27969cd6f7f364d49f32d0793b12b2ad38b824f441
diff --git a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
deleted file mode 100644
index f66a312dce44..000000000000
--- a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# FIXME: for some reason, no-ops on PyPy
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
deleted file mode 100644
index fdade9be5e31..000000000000
--- a/dev-python/pyopenssl/pyopenssl-17.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	# FIXME: for some reason, no-ops on PyPy
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
deleted file mode 100644
index 9b0988e10f52..000000000000
--- a/dev-python/pyopenssl/pyopenssl-17.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild b/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
deleted file mode 100644
index 1437b723922a..000000000000
--- a/dev-python/pyopenssl/pyopenssl-17.4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	http://pyopenssl.sourceforge.net/
-	https://launchpad.net/pyopenssl
-	https://pypi.org/project/pyOpenSSL/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="doc examples test"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.9[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	TZ=UTC py.test -v || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index ce2c56d62b90..4ba950567e09 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
-EBUILD pysha3-1.0.2-r1.ebuild 1015 BLAKE2B 40676d96aca454e8bc87a092f7fdafef8c90cce57a24859343006ee7ff50806106331150c523a00e0cf97917f6611caed254b4f5cfd10ae4bb8705d604a1dc89 SHA512 5d0aa80f1afb5d201c4dfbae828afc69b08f8d8efca32c2c7587410f9095f5e9c2417c4fc36b32defc00ad25c149e75a2560d41985aeb5daca3860c886903030
+EBUILD pysha3-1.0.2-r1.ebuild 1014 BLAKE2B 334f685eda76cce7a752d0d6db27436de8d4e081fa3be9e6d0c71a644dcc5eb98b8e11fe0baef21bcc40c9d56bef3d077cfd6b0c9b407c117fceeedcd9a3f554 SHA512 7df66ad960e90f22b01881c5fd158e3c850a4050d86b063fa0abb780a31c83d39a37b191c2301da764b983a5e49d4dd03fc0f732587ecd1faeba13a016adaa86
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
index 62b786603571..a01c4281e69e 100644
--- a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index e67c7ee8d9e0..69d1cf43d967 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,5 +1,6 @@
 DIST rtslib-fb-2.1.62.tar.gz 64481 BLAKE2B 121da0560decc4297e1b695038dddd83cb876bcb0c7523b60119d74922cb10b0389fb6d9246a86b79dcf9b6dc55e263834adbc107146a0e96fdf7eca0dd2a0f3 SHA512 12202f828234aaaa3a4e86ac45a2e3771baa76406d57496765c4789bae00f7043f0105c71f1f5501a37eff8004788a41dbb788532f93ebee2ab79b3e5eb00c76
 DIST rtslib-fb-2.1.66.tar.gz 67612 BLAKE2B ebfddc235ae2492f6e9f44cff4c80f767fb5fae34833ae0027cc0fc0fc32df49393d55e553ad326e64a53280108256374f486f10cf22db3ca8834f382b5a2cca SHA512 36feb8614edda50fe91b9c9db18fd3d73c8f7c8e0cfb9d397f5b928dcd6683586b0a8a6e446d56a551d04a7d27243ab13d7ccb51fd906bf4e8ffba7cb8fa4bb6
 EBUILD rtslib-fb-2.1.62.ebuild 616 BLAKE2B d6e4333fae6eb964572fca087152a46994a1b4d9f7b001dbea502b8f96716336adf3aa26e7899c57606270344aa1159fb7c6e27c4f59bad26d273280cfa017f3 SHA512 685ae458f4eda8dd89f652ae35230c3c1491852bb4b4d14a914de1957c320ed93f5dacd92f0320a1a0165938407776b8f9339e349a6a28b06dbe30961bf35fc4
+EBUILD rtslib-fb-2.1.66-r1.ebuild 628 BLAKE2B 4adf38883512ed50fb9e80838f62fc994fa07e1189322743af53b427a088653043b5159dee62a4d65ef63a96e316568b48680da7ea22ec81f3d9418cb606d5c0 SHA512 997d91b486cc8c739f439f5f1987c0b5b3bf10b79f309108c6aa73c38f149df41d0d37d170e364ad8976bfcc4a714ef77018ffd16d543a33637e2c9f84ad926e
 EBUILD rtslib-fb-2.1.66.ebuild 616 BLAKE2B e2697dbf353d972ec65d9a4dea042de06980235eeb1ae61becb67a0359fd2345c5b45bbdf680b0d66ccf244238da9083c45f8ba29f48137a16313fbc8964924d SHA512 bc244364b854c8e84d36456c4ab2c8fc94dcb3b135a0769d3df26f2dc6d7d0e227095c823bbe3f61174995e8a95266b03ecb5cfbb1bdd25e8c16c7527cfcaa7f
 MISC metadata.xml 625 BLAKE2B 849b1694d5f8fbdd1ca4b54990c7d9feb00d4465cfbcf97672a2f3315288b681a7dd15d9978e99d8c438d229e933d7e7a4cde7095d8a0f864268dafb228930b5 SHA512 838fa39adceaef8854dd2b5f873e0f2253bb1fdf616da974154166d7fde861d11806ae439c573b6cb7d392ec37de18956bb119bcc83e48ce0a9602d6d559e0ec
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild
new file mode 100644
index 000000000000..b656b2ee1857
--- /dev/null
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.66-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
+HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/rtslib"
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index a9aee038e591..ce887b12ca1e 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,7 +1,5 @@
-DIST s3transfer-0.1.10.tar.gz 95508 BLAKE2B 5cab0a8a34ebd00936e8c2ce0baf90c2b37d97af9b62b6c552e1965408d8cb6e809785898cdc45c296c9d682454006b364a864ea68c7c08ed165036d283797ae SHA512 56ae7d13d0f7818728adc08b458ec1937693e4232383a2a00f03ade725baea239d5fc2625d7d684d20191b51b109c187f3f2ec3633923ed5871db061af00f2e0
 DIST s3transfer-0.1.11.tar.gz 95555 BLAKE2B 404a058ad371161d2f7d44b3fdf835b6641e6f299ec3660b322afcbd0036860a658e641479f0214b67b6e96d1b652d2b2fd888bc84473e8827f907bdcc5c6477 SHA512 83b85dadb696df9dfcd28719ccadba8aa0e8f36b0fe4ce4f61dfe00460617bae74307cbe6ba924a8de86fe527e18a34d66acb72f7a3d9001e670d76dfc8b60a2
-DIST s3transfer-0.1.12.tar.gz 102902 BLAKE2B d0a211985753893b714863268d41f23f9deeb6ab4e31e24ad9bac4e4e522a03d11ad4bdbb6cb4dca9eba06b63144e9e7425f852c16273d27673c9c25a195521f SHA512 1e7ce8db26bd1e9cf94f0754739b2a8caaed9b21c759627dd6ee6c265823c27534e0dc7bfe55aeacfd5fd42eb5999259bf3917d873b49cc25aea42e3095a9f9f
-EBUILD s3transfer-0.1.10.ebuild 1030 BLAKE2B 1d5fc2cee9433164f63c29ad5e2859f2ad7d49abb52540eecfdec10dc24aab9d2b6ca3ee54b89b5bbb9f192bbe37f00aec177212d46d8ca1fc4031c1fe8b28fd SHA512 adec1d6c1623fbf35dabf2080a2d48c9ed7fb5313fb7f949c85970a3594774898eba1fb87d9f329f6ded843904fa39c4d6524cfbf227a556ce956ab33e7bd81e
+DIST s3transfer-0.1.13.tar.gz 103335 BLAKE2B bbc6e76647a9b531f0ef70912ddd17a186a5bbe4ecc9ed21de4674cdc20d39150be3212065bcdf6145c0721644c59d157fd528b79039bb091d750f28085bb476 SHA512 90aca5cacefa19cb8cb21b7b82c5f3383bc0478503557de9c2277db2f39d98f6e11ad74bf56ec84a1fc8c4a920337b0bcb34bfcf509a49f347144b7f13afb37c
 EBUILD s3transfer-0.1.11.ebuild 1028 BLAKE2B b17a39966352d5f81aa26bade63947f94c79c6b01dbc26a56c8a9cf8ffe508f9ad399ad3c9b6186879a354bf6484af3b73b67a31a81d552760f6ede192da636c SHA512 2a9ad77eb825d0851ad68e02c70f4873925379c1cb91b7fa7faffc8315fe67fc3c47c32d5c696724dc012500a12edf774a4a13ada56579d39bea4c72ac517418
-EBUILD s3transfer-0.1.12.ebuild 991 BLAKE2B df84ae436a68c1e0c84a9b7f86f415ed75035f3221cb951b88522f82622f132d391dda88220637402aafd1c522dc7a19de9b351440e4a5e48a505154dd917513 SHA512 575dc8e1e46dbaf1f1166edd258dc38c18d39f559e32a3e7001bd5e3ccec0f6f849b2591d08132946e8c16c5decbf648502f164a53f59c017ce326bd9b105dae
+EBUILD s3transfer-0.1.13.ebuild 893 BLAKE2B d6fd015623b4463fb75ef84d7ee476d4efdadb85cae04bce9aba3343c4649d6b94dec8c9098b6e50743c8461b673e93f945d3a28c36f115ea0196433a1de46b6 SHA512 a22263f3eb37dc8d067585c48202bf36335b4cd0f42d288e1c456a22c5f51846813f38fc8944ba3679eab784acc30d880b2e678ea50f1da30a2552f07af2dbaa
 MISC metadata.xml 379 BLAKE2B 71ab13315921746f0b71ac09c3f7a5e4e182e4efc0dda7f0e9cd6fe2948f52eddde9b9fe7c117ced64f4e3f6646a2d15a1fd3630ab814b067a10dadd11448def SHA512 452e566006f5a6ec91765cdeb4fe75edbf890f3a8e495bca7d1db859a882109eecb252dca18f1d1e4dc970c62c7810b5e51cf1b5ab61553c76d4dc04e38bc5ee
diff --git a/dev-python/s3transfer/s3transfer-0.1.10.ebuild b/dev-python/s3transfer/s3transfer-0.1.10.ebuild
deleted file mode 100644
index 13a77a3441db..000000000000
--- a/dev-python/s3transfer/s3transfer-0.1.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-CDEPEND="
-	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/botocore-2.0.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
-"
-# Pin mock to 1.3.0 if testing failures due to mock occur.
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_test() {
-	nosetests -v tests/unit/ tests/functional/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/s3transfer/s3transfer-0.1.12.ebuild b/dev-python/s3transfer/s3transfer-0.1.13.ebuild
index fe60b291ed8a..73b0b99fd598 100644
--- a/dev-python/s3transfer/s3transfer-0.1.12.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.1.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 inherit distutils-r1
@@ -16,9 +16,8 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 CDEPEND="
-	>=dev-python/botocore-1.3.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '>=dev-python/futures-2.2.0[${PYTHON_USEDEP}]' 'python2_7')
-	$(python_gen_cond_dep '<dev-python/futures-4.0.0[${PYTHON_USEDEP}]' 'python2_7')
+	dev-python/botocore[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7')
 "
 # Pin mock to 1.3.0 if testing failures due to mock occur.
 DEPEND="
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index 7616b47e8040..2cb8df333e2a 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -3,5 +3,5 @@ DIST zope.interface-4.3.2.tar.gz 143139 BLAKE2B 60e8d1ed360192cfd2bafc5738f1a527
 DIST zope.interface-4.4.3.tar.gz 147052 BLAKE2B dea636ebed2f66035510d467615a9532a7c082ddf4ad3bb26fe0101f790db667817e12c4fd3f4a0b654151422e6ff8cb156f3d2e4310e0294ffdc7b5b4e836f9 SHA512 29d9f3f1fe9af8a4ffb1e6d2f067bba1fa1bac7b02690ba8429985aa6ca76d3f337076bc8c48f39d0f338ccd855800b2f28b319a183a285191cc007bf8d9c9ad
 EBUILD zope-interface-4.1.1.ebuild 990 BLAKE2B 0729e2f728a41900e3700f862484779805efaf9663fe44c052f3401cc3bbce1e3adebef7e2cc14817c2d14d4af6968ddc5a24e7921eb78ea18c0c47656ed36d2 SHA512 1c29fc3ac4e42397ebe0aab827b21f43793486f23af0492c66feebdc8f303b13e24206e660f623d1e37421d394af415457de9096487b23f80d5c2a516828c3b1
 EBUILD zope-interface-4.3.2.ebuild 1035 BLAKE2B d7374a0b31b73d857659b569dc33a0575fb97acc462178e976b3071c4926642181e624495a8df816c9fb7fb939b62e14e99a224539f8df966e7cc662647ee63e SHA512 e7bc7ce215f332423fb4bd5a1def6199ea8a091931366e12406217a7a4dfb2a4700efda24537400e13db8305d98a52f5e3222b2328c8fb2a9f458e73eb665ef1
-EBUILD zope-interface-4.4.3.ebuild 1286 BLAKE2B 8b28c4677cb4bb79981f2deb9d91fe859294edea7acb2eaf3e2d5893043e679ab3a4afae04ed15fed3e8fadfd6b969870381bf4c1b75f115f62d51fd79870a8b SHA512 b815ad11e05680b57364f259caf10637906051171ccb91764acbc27fabce5d244535be6a6a6f5e9d451f34bde93c6343c956057a40e47de8a077263884b9fd55
+EBUILD zope-interface-4.4.3.ebuild 1285 BLAKE2B 77f03cbafc5f45747a6d90ab9efee9d2953f62a025afd73a24211e4985cdaf6e4346a7ac66edc705e41a03d992a52a9391c2c3abd9aba8781c863bfd76915365 SHA512 3798d6a1405c5ef1670e30f9250199183d4533cc3a0ee25c5cd3fbab9a77d4c5a1f19230d491da15848853439b2229b95ed0793a4dc0d5a3f90671eb9ddfea93
 MISC metadata.xml 386 BLAKE2B f8454bc6cb7c55f203d75f44428b0fe404d050e4938f80e5ca1e0504811a3ea73980ab474d12b47f31a87ed508a2f23143d6393eaf2f66eaface7b35a2058a61 SHA512 fc31e083f990006f9a4bdf1cdef5b8efee3e69e8444f614dd5fdcc0d7ddb8291cc1e45c21ab1418668c2e247068a39467e837aa8b869cc050a856635b8789fdd
diff --git a/dev-python/zope-interface/zope-interface-4.4.3.ebuild b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
index 50d2bd0e6506..1a9d0c5ef17c 100644
--- a/dev-python/zope-interface/zope-interface-4.4.3.ebuild
+++ b/dev-python/zope-interface/zope-interface-4.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-05-15 13:19:56 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-05-15 13:19:56 +0100
commit	d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch)
tree	2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-python
parent	ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff)