gentoo resync : 06.12.2017

31 files changed, 223 insertions, 106 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5425484d621d..0af5dcf33709 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index aa0bb52a470e..a647aef8aaa2 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,5 @@
-DIST ansi2html-1.1.1.tar.gz 46591 SHA256 5c8a482e92fd49005c083d5ed5aa946d424a71eda60be27fda005bbb5ed8c53f SHA512 5f08e6e3e89797f23759da7aac8cbd17e86ffcac37af8db8c345423c69744d88a1517cb0f17dc9c366b509b972484d25877cce8c7466a7a463eea24af17133de WHIRLPOOL 3d2555784c7077b6541df30b485af5f7f4884c40018b11c8a78afaac8c942f7f0903bf2fe442cdc75ddbb09b7be77cf58cc6a1f980617ded3b6eb68324d441d1
-DIST ansi2html-1.2.0.tar.gz 46748 SHA256 3e5d5ada557e0bbe3e204a686f959de17f76c86c20615c034767e5ebdc0740f1 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860 WHIRLPOOL d19a79d21c630ccbb5ad7a66fd076c47d93d06879f493cb1e6c2e2eed5b66f8a9208c38ada9ef37159d9d27bc2915abdbdec5869b53cb8678c8316c98eedf04d
+DIST ansi2html-1.1.1.tar.gz 46591 BLAKE2B e2eb3d9b2665fd495ee8591a3cbfebcd1d565edec9f8ec6840bed8303bbc094e71b9371f496f5f479da9d61937fb2e4ac4deb485631c2576bed33bfee731fba5 SHA512 5f08e6e3e89797f23759da7aac8cbd17e86ffcac37af8db8c345423c69744d88a1517cb0f17dc9c366b509b972484d25877cce8c7466a7a463eea24af17133de
+DIST ansi2html-1.2.0.tar.gz 46748 BLAKE2B c5ea7d35640f93562f6098a46dbeff9248e25b6210bfa5e71265d529599eea7713581ef986faa5afefb445492fe09d2170d164a63b2a602c57a79f2c72cbe118 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860
 EBUILD ansi2html-1.1.1.ebuild 977 BLAKE2B 55799e5d290f30c6e9e10f10af4d990600b1ead2e63b8bac84b5be5fd75ca08938fcf1229c04647ddde2447db1e9f016f04ed5fea617be740afbfa314af2f818 SHA512 8c19c40da749aa75813b08e479fc316baa63a21d86068094f9f0397872e485348a8c9e252583abb789a8d9de8576870e41f98e4d5e9bbb6dc795bd734402068a
-EBUILD ansi2html-1.2.0.ebuild 978 BLAKE2B a2838a70d9b1d8b2657078e4472bebc0332cc61898a13c2f7e9e09ff1be0241411da579aa2bf4c82312a82117ae8221ed67681854996c7deb4198c58b8b56699 SHA512 a4c7b1252f6743d55fc11a83f3882967945668c65a5bc8421060e6fad5a4e822bff02fe4425e14b6e06f8de48a235698ea75b0ac49049b8d60f3622ba4eaba41
+EBUILD ansi2html-1.2.0.ebuild 977 BLAKE2B 2cdb3a473a4a2a8bd350425edba570f95b9efad7cb085deeafdb3e65bc4a66085864e97b3f3cad267c0cfe5e60d974b21abf77e6a7bcfeb03dd6e7a77249ec3e SHA512 f12ce0f4fb159bcf287d085c99f4f3387c8e667c90faeab5d6a4036191c5aa98fbca498c64e1b1769cf0c9af1d6b556f8900b324e61dccb01997a2671f4bca50
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.2.0.ebuild b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
index 971a67c314ff..226d154d1043 100644
--- a/dev-python/ansi2html/ansi2html-1.2.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="test"
 
 # They miserably fail.
diff --git a/dev-python/appdirs/Manifest b/dev-python/appdirs/Manifest
index 430f45b469a8..cd4248f928f4 100644
--- a/dev-python/appdirs/Manifest
+++ b/dev-python/appdirs/Manifest
@@ -1,6 +1,6 @@
-AUX appdirs-1.4.3-distutils.patch 495 BLAKE2B b16c8b9876bb1b9c65813ff7d614e2167f0c44e14f737041341e54e3ccd59d489bb6717a038f88bc037664e197e40bf66082560a8577519d34fd323a922357ec SHA512 605a59544c6b9ca1ef5ddac524c3b699b667c9001b1e720af5b94740c1c5467dace55432b8d3524710a98a5861f638623fb8b6dfa4db8915ae06b21c8466eaee
-DIST appdirs-1.4.0.tar.gz 14358 SHA256 8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5 SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac WHIRLPOOL 0e12bf1875e489fbfb2ed48b125917bb6e176b90051a0afe2b64f431bbd1f5be499b7c0631302513387c440a05b2eb067fefaf54141424c260834cba854b7e6f
-DIST appdirs-1.4.3.tar.gz 9641 SHA256 5ce44e43c3fd537ce1aaf72141c525aa67032a5af0a14dcf755621e69d72414b SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc WHIRLPOOL 4e88de235789556a220134c9b6cc1741d6fb65070c62e278c94585e3adc464562e3dc259340a8147b33de417e9533b7bc40cc66eb558d04ec3b197f5a092980e
+AUX appdirs-1.4.3-distutils.patch 782 BLAKE2B fcb1553424c0d22f4b60702ed7f771897cbb6e3f39078169bd1afe24a5c5825d629a286e620f5692414cd3f2aab9c38ae5ee20c2a18baee540ca685cc40a385e SHA512 e23630772b76f1a339ee74354f74f5d25d7c07a16db2b5ce307dbfd33f665c187aef86d7b7ec9e92bd43a3d8363fb40686d2bf49c10baa3b2825c8835e149905
+DIST appdirs-1.4.0.tar.gz 14358 BLAKE2B de0248d7ca8211a287bb76f516d5ae5d3b3ac0a5c3e2060fe0fbdf3fa9131e6ab26d0b0d293cdec4cf86f26e852fad7534eb44c386797d18964232fe85239bde SHA512 a16fbad419e593acf1b58a3f8f893d206b3fc1a269757213a34d129e6fc39aa041efacb7964d326b82376373315357c93e85b272f374a096d9a63e73e3ce1dac
+DIST appdirs-1.4.3.tar.gz 9641 BLAKE2B edd7f6372e25279f6ba0f36cda595649cab7e69430e22bfdfd1bb5aa8d566a4a2fbf24c281adf80ab3eafea93f0f4f79b396688134395c3e5565476f24db75df SHA512 787f551ef5af355bbc77ffb3059553fab77614cce466b4145e4b55fecb8553d329f8748865fd69005d13451a9b11229a65721095a122db83a8433a2661503dfc
 EBUILD appdirs-1.4.0.ebuild 746 BLAKE2B f5d0a2b32c78382df027f26a8a9630e0b91d01a97053c733363f792e94a2e7b269e546aecc754cb45ca0bf8e6a7135cb734f5bdcfd90c89a552ba80b31c7f8ca SHA512 2c665d99c5767e12395d4e8f2efd65c5976c1e865d75d475e830cffb467d9be0d84b31004277d0967af57f1ade0bcd828c89087d6e48814ecbdffc9e81357408
-EBUILD appdirs-1.4.3.ebuild 783 BLAKE2B c4fe19b2437661b6b4e139ebb7c7c707359e856175c02399b76af2b86be1a3a7ef6846522c1df3ea885bc7cbfbb24a88924a97378d048acb2da9a7bf4ed4ffae SHA512 b4411e01521d035cc81fb4c7e8972b9d7ea5ce76e0d84cd89a9a957fdecc97f2f4a21e698ac36d1c868d404aa47a58467c74a8349cf8a82fa417d27ca3914b17
+EBUILD appdirs-1.4.3.ebuild 1178 BLAKE2B 0285e4e635e9252da8c0bd0b3c0718bd4c949213c764f1c33d573eff01476b5b076d47d89a5dc4b7f404027594ad39c4aa9de03afd6f49cdcf0e3778efb1e980 SHA512 7c51409b6a9279b50c298ba38672af0762ad9a16807e64c61b233c971b677ccb8e1279f900f22ecb8c41631b74700d07c984f1e58d5c479c65fd9bafe6191152
 MISC metadata.xml 742 BLAKE2B 4731940c3aa6e3e0616487d4600c77f31712455aa70eff1bb900ec121cb062e45e1551206b86a5716b49f6163612096cb5ab9e3cf693af2d1fedaac023de29e6 SHA512 c1e35e090d6e3af99b8879a8a553c89989b149617857696fccecb4ea0435979f547049db2cdb7c505b50c20dc9f081233990f6fc0ee05de8ee27c7629292244e
diff --git a/dev-python/appdirs/appdirs-1.4.3.ebuild b/dev-python/appdirs/appdirs-1.4.3.ebuild
index b809f43510ff..4162f84ddb15 100644
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@@ -21,3 +21,16 @@ PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
 python_test() {
 	"${PYTHON}" test/test_api.py || die "Tests fail with ${EPYTHON}"
 }
+
+[[ ${PV} == 1.4.3 ]] || die "Please remove pkg_preinst from the ebuild"
+pkg_preinst() {
+	_remove_egg_info() {
+		local pyver="$("${PYTHON}" -c 'import sys; print(sys.version[:3])')"
+		local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
+		if [[ -d ${egginfo} ]]; then
+			einfo "Removing ${egginfo}"
+			rm -r "${egginfo}" || die
+		fi
+	}
+	python_foreach_impl _remove_egg_info
+}
diff --git a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
index 11ce163d14ca..e5245f255fef 100644
--- a/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
+++ b/dev-python/appdirs/files/appdirs-1.4.3-distutils.patch
@@ -1,9 +1,21 @@
 Force setup.py to use distutils in order to break setuptools cyclic dependency.
 
---- appdirs-1.4.0/setup.py
-+++ appdirs-1.4.0/setup.py
-@@ -38,8 +38,6 @@
-         Programming Language :: Python :: 3.2
+--- a/setup.py
++++ b/setup.py
+@@ -3,10 +3,7 @@
+ import os
+ import os.path
+ # appdirs is a dependency of setuptools, so allow installing without it.
+-try:
+-    from setuptools import setup
+-except ImportError:
+-    from distutils.core import setup
++from distutils.core import setup
+ import appdirs
+ 
+ tests_require = []
+@@ -45,8 +42,6 @@
+         Programming Language :: Python :: Implementation :: CPython
          Topic :: Software Development :: Libraries :: Python Modules
          """.split('\n') if c.strip()],
 -    test_suite='test.test_api',
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
index 2a7838f191cd..d362aa659e4d 100644
--- a/dev-python/backports-lzma/Manifest
+++ b/dev-python/backports-lzma/Manifest
@@ -1,5 +1,5 @@
 DIST backports.lzma-0.0.6.tar.gz 34475 SHA256 c9c97b10fb1941abdd896b9447e3745da59b32750b27c015ddb8eaf3654daaea SHA512 6196e64e81c2427d07844dab984113021ae97ba9d0c136cfd20b7213cdb8cda8b9a2643c8df21c799d338031cd49d4cbfd7f9ba9c30efd6cd28e63e8772a032b WHIRLPOOL 3d0f8a5f34d18c2f1e0072a0b6fa4ab22bfd61031ca521d423b4007b8702ec7d901560dc5416389f1e9839590a2326ac7ad2850d1a39e7603cb66f598a2de66c
 DIST backports.lzma-0.0.8.tar.gz 36111 SHA256 200584ad5079d8ca6b1bfe14890c7be58666ab0128d8ca26cfb2669b476085f3 SHA512 bc5e7672a0ac53b7cf97ea52a566e96d92a3dd334a8321699585225e32ad7c723b4ffd6e4b153bd2ae3ead2a2cd6a48678b915257de4952ddca8389032db48ad WHIRLPOOL 1aaa4ac5b0a2d25a932577ed52843a99a92ef152e1eaf5795bbdd9ec13cb048acd0f01a99eef1182392b33ae62aa2b4f61fb0e801e44eb729d665d707ca71ebf
 EBUILD backports-lzma-0.0.6.ebuild 930 BLAKE2B 3caa188c2c895f9d56ea35820a1697c922c0f420653db35ceb17ca7c81bc333bf639d969cebe6d7658d1a9259d45f5f64fab15ccefc208c845014958e46a8aec SHA512 21d6fcaf62639d5109f0531eb5b675b7ace6bea85a9ec5d4a7eb9c1df3e9bb92734350126b481c83a755f2f130421b64f4c2f510b6decd37600ad6a3c3b2ac90
-EBUILD backports-lzma-0.0.8.ebuild 950 BLAKE2B 244e21a5cbd072b04f21ea8864c65baba1b91f5854fff97c3477fbc57fe67f0d7d7905726410899eb2de1ea4911b4856b765fcbfeb69484deb6f568c16d0ab8d SHA512 ef0069f192fc6ee3a196e4a8c327c9579624f140f114c06d90acfed078813b54ea242fdce4e8d898483ee2077aa8196f304c3a53de0d4d6f9d41b6354d556182
+EBUILD backports-lzma-0.0.8.ebuild 957 BLAKE2B 9fec6a9e53aff9fee02b3bd0bbc8eb810c9279579280e43f387c485a4af2f5704a92436f70454ce42a82d043d767dc5e62b103d96446a2e6d3e9b2189e8c3fe3 SHA512 bbaecf82841a4188ae17c3b0f12842dd16d50aad0b20e77b4106b614f06e565adf94cf8e878b37821405fba301302672b12f61f57438dafd6d495f5ca58e1231
 MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
index ebecdc999393..727d6486d949 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/xz-utils
 	dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index aac7360b4255..0b33d41f8f51 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -17,5 +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
+EBUILD botocore-1.8.6.ebuild 1363 BLAKE2B 05763a811a32b99da423c5af8d8487fc6f0b0f7a7382a2aaafb03f69bdc5714eca288c32acc9167d72a256af663ef5e7e5f9dddb52bb00421bb9699480dbe253 SHA512 a5460c4ff8270866efdcb70a983a133b17e468c8a96fdf63ee3c950e2f89c34fa8c281604d157ac6b6bbcad489cd58c979112b75b70872ea9ddae917b041501c
 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
index f4df2f35b9af..8ec458cb0679 100644
--- a/dev-python/botocore/botocore-1.8.6.ebuild
+++ b/dev-python/botocore/botocore-1.8.6.ebuild
@@ -43,7 +43,7 @@ python_compile_all() {
 }
 
 python_test() {
-	nosetests -v tests/unit || die "tests failed under ${EPYTHON}"
+	nosetests -v tests/unit tests/functional || die "tests failed under ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 29114f7ad2f8..116f5e71a9c4 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -2,5 +2,5 @@ DIST brython-3.3.2.zip 10140819 SHA256 396326912d311d56ec6e2ba413f059e8f2242cd6e
 DIST brython-3.3.3.zip 10040987 SHA256 b48f236a55a220520ca98b5c1caf705d8eff1742e622c8440d7bc23632ca6984 SHA512 e182a6c859cd18b90b205f751260b0b5c8d250746e48844c59cd61608dfdaf0fd6f0f25b8061de9505b7c5d094ac68fe57536c52cb31adb48f04c2cc5624e249 WHIRLPOOL b604b4a0bba610fc84ca059696ed37fe8b6735a806c7616fb1f41a378271ab16e76f4f063a51568ec774af2ff694551ea4f67970a77230551223aaa1071c4be8
 EBUILD brython-3.3.2-r1.ebuild 742 BLAKE2B 9a19c4a8dcb25ce3ec0ccbc17a1b730fee92a8e1ca23af5f76aa9af03e83c3f935b567b85f8c28b624aa1716769aa25deed44e8453c190d18b89172a89d27104 SHA512 55d34698e55243e8b757cdb141b1ec445c54520039b09f54f829d0319d90767f76a8af2356c9599fba9121ac6c15710d7a114f9f1465c628f27ac606e58a6c60
 EBUILD brython-3.3.2.ebuild 629 BLAKE2B b035e7c2dd2aeb7ec1064399e8297addce9c6c150e89092297523d2f92ff303cdd36c3d61c7f91760bc8b06e0714cf3f1a777a23d80f5f9cf69edbc6ac091bb8 SHA512 f5a1a99ce16b6f699ec1884b572cbed011c1cb07eebf1600e335211e4f9ec8f0ab03e9b56edcf3bfc8a84270092c7a2058917ea3ec34acfb2adff0c8785f772e
-EBUILD brython-3.3.3.ebuild 739 BLAKE2B e23dcbbe692dbb11c388040aa8bea57ec84ce60f8ce41f770bcff99dbea7ce4261fc141e3b15829960afdce43d218cbcb50999919ac8f20061fef56ff4b72097 SHA512 5931959d2203684cd800f8d9f212391ab0519450772bfe6851c122fe962a29d6fcaf3b884e8b7db6a41071cc2de50ed6789d92d6ec5e1a9814b79a98538ee254
+EBUILD brython-3.3.3.ebuild 738 BLAKE2B b56b0a47006068b90794ec3673972e3e2fccfac1d46624ca94193c4874978debeefcc7214e2b2009e6d7fae90793bceb58a08df8860850affba6cf6cf9680ce2 SHA512 454f63ccb33263c37e4e915e692a3c656a4ef04702e2070e49cd7584463ee52fc54972d69f6039461988e1d9fb7467ae5be847d13aeb6b846f3853bb188b3b55
 MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
diff --git a/dev-python/brython/brython-3.3.3.ebuild b/dev-python/brython/brython-3.3.3.ebuild
index 2ce53f2f2110..daf93da7bb9c 100644
--- a/dev-python/brython/brython-3.3.3.ebuild
+++ b/dev-python/brython/brython-3.3.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.brython.info"
 SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.zip -> ${P}.zip"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/bz2file/Manifest b/dev-python/bz2file/Manifest
index f4db335ac7aa..d4c111979119 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 547 BLAKE2B 76f368aaa094c3c54daf0502778a983cd3b0f4d1ec834d2b35a8dddd136d54c31177a543ec299044c943562cf98fe087e39a037528540d98fa4f442fe524f566 SHA512 026f74897e65f2ac5273c030d3d7d78607fe0b6c5fb01061e7c4998145b585c8c57dc291a2d0fd4786bcdcd0f1b727bdcc1a634c051dbd10843a6648dd5f6464
+EBUILD bz2file-0.98.ebuild 554 BLAKE2B ea2d4b51ad050b55230f276b6c31d2909735260575a5a063c7988f2986b999bb78deabd2ac1fea19cc20a05736a886e3ce6c1aaf5f5196b0db911c4538311652 SHA512 674455893ede4913b4fc67bc01d132452468ade48b13d61b8014fcbbad3eb6442ea3a66b79de12bc59f645aaf07b7f4913d85a4f0380ed229b4861bf01adf53e
 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 8ef56527509b..2aa8b2d143dd 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="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/oslo-rootwrap/Manifest b/dev-python/oslo-rootwrap/Manifest
index 8eac94d89ccf..5a70bc3df933 100644
--- a/dev-python/oslo-rootwrap/Manifest
+++ b/dev-python/oslo-rootwrap/Manifest
@@ -1,7 +1,11 @@
-DIST oslo.rootwrap-5.4.1.tar.gz 42202 SHA256 a76cf545515c1cf6d4d9b1a01a339c1356d1eb78ff3b2190e168dafead3c7e7d SHA512 71980ea266703c7880834cf75b69be9f7bee834a3be314f13ade1bb9903ecf6337237a32a1ed06d020c2fdd3807642af1dd676b6736052d4e57784942782d960 WHIRLPOOL 321a2e9774e3702015510d608e4e145d9fc69c4069865dd5215ad6e94e3692e7e56e029298e908fc007f487d54737d3cd4218dfc93d0625c6950edba45da56b2
-DIST oslo.rootwrap-5.9.0.tar.gz 42352 SHA256 f8947b42d02ae26942f0c1166b410016c7e1796b00f00983f685e9eccb91ba91 SHA512 5c299b8701d308f0f02a8edde08d56145781dfe9d25f4b064b2ce926e38a0be5a5dab20d6d57ebaf289af2758d97b81089407e1851edaca23c36436abf8433fd WHIRLPOOL 94ada80d8cf286fd20786106f37ac3579d387157a8125bd74f819b3fbccb31cbd5a00117507e836609c5dcaa64ce6983cd179aa8cd82333fdffeac7f0ddc3d5b
-DIST oslo.rootwrap-5.9.1.tar.gz 42056 SHA256 11df3567e52f4cfd77e498713248f981c95a0cf01511610dd3bcc604c576799e SHA512 1c2505970217676954948546bd161a9038504f14ee3425c4d9a91807abe0e282e8e44c493c3d20e2e1c17ae506f3b768cf87c75ee46a0194c360663856796460 WHIRLPOOL 1b5f892d7d222e3ab7a1c3f1ee3fc3c18f11766ed085eb83bfb726d2e114623bd6806429a81dda63014874e8d215b48852ee19deb01ba6e33b6b663050f55caf
+DIST oslo.rootwrap-5.4.1.tar.gz 42202 BLAKE2B 3ae54e9a10bcf3b1073731ca6800d9c2b1fa100667760142a7ba33c32ba308810525e61768ad353f6cf3c4a78370012698ff77b60884be55b2205a8d793d6e31 SHA512 71980ea266703c7880834cf75b69be9f7bee834a3be314f13ade1bb9903ecf6337237a32a1ed06d020c2fdd3807642af1dd676b6736052d4e57784942782d960
+DIST oslo.rootwrap-5.4.2.tar.gz 42789 BLAKE2B f6587ff6f57bbef75f39808373b6d76b86fb0cbb5129c0c3421aceeab29ecfc5b2cab61471dc80d7ce4a6519a432b4d572f158ac513c7a76ec4148f717346e44 SHA512 32f692248e4006e5809edb2669d4f1105cd8592c69b36bd17c4cac786f26face4971e60505e7d2d775d4b2f54a369c7acdfb3da85e19dbd96d65203f5d8df7a7
+DIST oslo.rootwrap-5.9.0.tar.gz 42352 BLAKE2B ea689dc299ccb02e0268792916f595127e060fa43c0ae33eae669307b249c34a5125e2267be418d008ad8f1127b86c20e84d76b70c5d89f749a3ee1996619480 SHA512 5c299b8701d308f0f02a8edde08d56145781dfe9d25f4b064b2ce926e38a0be5a5dab20d6d57ebaf289af2758d97b81089407e1851edaca23c36436abf8433fd
+DIST oslo.rootwrap-5.9.1.tar.gz 42056 BLAKE2B e6601f75a5b843ec97ae51b86d475b3c2646d1ccfaf52fd3289f29b08da429c15a7d1df1a0e68bd22ab0038b745653d1a1a1c2547b3f0bd5111048fa51de6f0f SHA512 1c2505970217676954948546bd161a9038504f14ee3425c4d9a91807abe0e282e8e44c493c3d20e2e1c17ae506f3b768cf87c75ee46a0194c360663856796460
+DIST oslo.rootwrap-5.9.2.tar.gz 43716 BLAKE2B 4e455fe52c6f20824bf220a8444dfcdc916dfd85f0ff42edf8e3a6b8a065a45344122f56272943cc06f88fc272522af9914dd2a961d3c98c30ba66741419aa1e SHA512 3ad7c2d028c3052476bc26c00bf34c421b44db59cae2d45b5d1041902c14227f6de89a9b8fb36f123c9a9e477dcee42e567425439d9d3eb12a5f701c5a13be6b
 EBUILD oslo-rootwrap-5.4.1.ebuild 1539 BLAKE2B 6f80ce9109cff652cd2c1d62ec00e144556ae3d5bddf910eac551ed6875f950810058f7acd046afbbc345f5e7bb027a62744fe57309a0013add5da5758d907a9 SHA512 6c0935fd483284d8c3eccfb31452129360a4293f73bb2bb40f083a51406acdce4a1f32cbfde5e41deae710cb1d29820b0bc62019d08683be334cdfc943ccf026
+EBUILD oslo-rootwrap-5.4.2.ebuild 1541 BLAKE2B a75b400d2961238705a1ac663407f4fd92123e3d5d6041498287b7dee6a892cdca0b91611874f2b782d9fbbc493164b1f6f460532af5f97f9d4bfa7d0b2eccb1 SHA512 46cc2f3fc8a7e0eac7c4d3d6928a4acdcbad8d219ca51f944ae618e153fa9d8fc08feb251c468adb32ebc306f703e486a155fe3c68f2de8c63890d8992b91cda
 EBUILD oslo-rootwrap-5.9.0.ebuild 1669 BLAKE2B 8a899bd3fa1d535647bdd6b160f51b0497104adbe7aea79d98c0f288f6c54d0b604b3eefc581aff44638f6b5b91aee208ab1d738e5083218b21c4f569933a0f7 SHA512 3cdda533c8eb3d524f19f886734932d5934eae0c81346c502637fcfd6d6bb43b96bbe36f1230f675f750dd4ad637a488c1e76e86af6e8a6fbc19236562a8f159
 EBUILD oslo-rootwrap-5.9.1.ebuild 1671 BLAKE2B 49638c10793ad3ffc6b95aed8e3ea854e0c35aed1e4897f8db34d1680dfc69209f7f70ea80026e55541b68d35f45b67ae2dfe273a231a4c6f4aa1edcd15c4e95 SHA512 c37a93aa35702297279602c5e0a1ad224b9d3b072e3ba7033274ca40c71e18781a315b831dfa0e5d7f27df7a0ff4ab2ad81566375252534541de71f12c1cd4cb
+EBUILD oslo-rootwrap-5.9.2.ebuild 1671 BLAKE2B 49638c10793ad3ffc6b95aed8e3ea854e0c35aed1e4897f8db34d1680dfc69209f7f70ea80026e55541b68d35f45b67ae2dfe273a231a4c6f4aa1edcd15c4e95 SHA512 c37a93aa35702297279602c5e0a1ad224b9d3b072e3ba7033274ca40c71e18781a315b831dfa0e5d7f27df7a0ff4ab2ad81566375252534541de71f12c1cd4cb
 MISC metadata.xml 600 BLAKE2B 93dce16794b8495f34be98af703ca0ba06ff4a2e378805f7f3b08d4805f01ad015a1144124e1ad32eb63e6b5c9a9378aea30a4b82eeab54b1cb9dc95280fc6fd SHA512 ad1012d9f43875065679837f787f6a8087876d4ef1e56d24fcd2aa379c85e628848dcf5fa03e84e5929cdfabc4c1b6e2f7167ac0a508f7f26b6b533405932e10
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.2.ebuild
new file mode 100644
index 000000000000..42e6fb2940bd
--- /dev/null
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.4.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
+S="${WORKDIR}/oslo.rootwrap-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND="
+	>=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
new file mode 100644
index 000000000000..2f4f98729156
--- /dev/null
+++ b/dev-python/oslo-rootwrap/oslo-rootwrap-5.9.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="Allows fine filtering of shell commands to run as root from OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.config"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.rootwrap/oslo.rootwrap-${PV}.tar.gz"
+S="${WORKDIR}/oslo.rootwrap-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=">=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	sed -i 's/sbin\/ip/bin\/ip/g' tests/test_rootwrap.py
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index 042ac56b3565..112bed0ef631 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -1,6 +1,5 @@
-AUX capn06.patch 1212 BLAKE2B 9997e0f5f769abf8aa624fe62d1ac0cb7b7fb64568c8e6acc1b2992b1b6c9a48c4606eef5d5c032572ac17748e2b06b32fd183d194f7c090c0911ecefed5c521 SHA512 21f9f7946b93e7ec6c9dfd1a0e360bf2a4bada5ef1a0f917a9287a674f6d993589a5745064e9638880fde037d0df9dd1e1e6ac93004fc63b875908045f97068a
-DIST pycapnp-0.5.12.tar.gz 454294 SHA256 b71a0e71512796e993a5724457d77f36ea21528cf1ca59fc6c7036c8cf61dea3 SHA512 c4344aa30a8b3b0ad7c28c2fe151e7d3c2866910c10a4b96881e5ecf352bc8331dfeff4e0ea8d50cb680eb3013b53ebd4a6dcfb07491cc5292329d9a26c80e29 WHIRLPOOL ef36bcb90f5c7b2175706a11a2f59df3b31a578f7bb61c4480af7c14d2b39721520a1a61484e4365a8dcc9880d02f237d2427ac0282b4371c7da7b656310d594
-DIST pycapnp-0.6.1.tar.gz 454873 SHA256 ea60837533307849e98bb3494555cea28a52ea0c301cfdf32bce661931940696 SHA512 a1bf209626effa9970da3b6492bf4b2b73585ef0f3ac0c8e8634071fe74631dae09a94671dd835d3c7934d697c25631b0d8227b3b23150609476e7c699efbfc9 WHIRLPOOL 0aafef6db12d39d16816d19c730015736e6e9440a1f4ae383ba0d7cfbe608f034fb65c84103feaff0231160e448dbd224bae0c7c3682e99293314cf6dcb880c1
-EBUILD pycapnp-0.5.12-r1.ebuild 635 BLAKE2B 5bf713780bfc519a76b8b1925aeb6513e14ba0f63afd170be705d49515b192ff26f620124385a3ba2e0ac9f215962718a17e15c88ca7a7290420e0c042f18fc9 SHA512 035b7d68aa059348061f46b240cb9f6692eeefb9969c3b12b4f85956d3c8e01884933e7a333aba86fb35a4efd0f71ad7cd5b8cfc09ab79c942e2580694d52628
+DIST pycapnp-0.6.1.tar.gz 454873 BLAKE2B 5b8eeb90a371ccafed7dbeee9a44b1f4ee1173daeeac139a67c4e97484df689a581ebb2c5783dd4657964bc83fdcb02c67231a350b149cafc77d348ee4218247 SHA512 a1bf209626effa9970da3b6492bf4b2b73585ef0f3ac0c8e8634071fe74631dae09a94671dd835d3c7934d697c25631b0d8227b3b23150609476e7c699efbfc9
+DIST pycapnp-0.6.2.tar.gz 455092 BLAKE2B 5cdffde0a88398328f6e6908caf4ea2c3626a4a4d47100973a2bb3ae0e10406734354e40afe60f7d4861c79534e05bee6aeecfee4ffeca50ef7e24101ca4a08d SHA512 6656ce4a67e38fc301fb4dd7e80daea3a7551e01589b11c8fd7aea0d4af7638387fecd712c968f549ff596bf64caca6bdf7add20fbd14396a92e49ac3ce47188
 EBUILD pycapnp-0.6.1.ebuild 595 BLAKE2B b0810d87d6fbcbc090f081687d8f91238694fb66dc0fc12306884abdea538004e2f1b1fac457c1716735e78379e61f2ede7eb52f42c6cd49961cfe27e569a22a SHA512 63efb976e42915e52f9bbcbf28ae2bb5c2ca55e9e7415722a536bc00457614fccab72f78c1bffc413735a2f83f03600c32165ea9f1b3b4c9944a0d6242fce22b
+EBUILD pycapnp-0.6.2.ebuild 632 BLAKE2B 59a2b92092b4a432a2fb4318705c00cd4cd75cfffac548ed7789be527553ea532288038d46152ee95514fcabe4346b8c7cea5a66033d513d2aeb9e557855de1a SHA512 db976db02a0a39e2e303cfa7c358ff9f26492eecff886b9592255f46bdf816382a42afef06c144d34544185f33bed59e48a49da5037c11617dd67be35819c885
 MISC metadata.xml 514 BLAKE2B 0294a7ef4293cdef64d7a287cc824e81b4c22b75ea1e7c2f770c756a56c5c251610e006bf63a28b549527b99b9cc958a5535d43a1c822d9ad724c45f1113e5bd SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923
diff --git a/dev-python/pycapnp/files/capn06.patch b/dev-python/pycapnp/files/capn06.patch
deleted file mode 100644
index e1c1709fe8c0..000000000000
--- a/dev-python/pycapnp/files/capn06.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: pycapnp-0.5.12/capnp/includes/capnp_cpp.pxd
-===================================================================
---- pycapnp-0.5.12.orig/capnp/includes/capnp_cpp.pxd
-+++ pycapnp-0.5.12/capnp/includes/capnp_cpp.pxd
-@@ -100,8 +100,10 @@ cdef extern from "kj/array.h" namespace
- ctypedef Promise[PyArray] PyPromiseArray
- 
- cdef extern from "kj/time.h" namespace " ::kj":
-+    cdef cppclass Unsafe_:
-+        Unsafe_()
-     cdef cppclass Duration:
--        Duration(int64_t)
-+        Duration(int64_t, Unsafe_)
-     # cdef cppclass TimePoint:
-     #     TimePoint(Duration)
-     cdef cppclass Timer:
-Index: pycapnp-0.5.12/capnp/lib/capnp.pyx
-===================================================================
---- pycapnp-0.5.12.orig/capnp/lib/capnp.pyx
-+++ pycapnp-0.5.12/capnp/lib/capnp.pyx
-@@ -1688,7 +1688,7 @@ cdef class _Timer:
-         return self
- 
-     cpdef after_delay(self, time) except +reraise_kj_exception:
--        return _VoidPromise()._init(self.thisptr.afterDelay(capnp.Duration(time)))
-+        return _VoidPromise()._init(self.thisptr.afterDelay(capnp.Duration(time, capnp.Unsafe_())))
- 
- def getTimer():
-     return _Timer()._init(helpers.getTimer(C_DEFAULT_EVENT_LOOP_GETTER().thisptr))
diff --git a/dev-python/pycapnp/pycapnp-0.5.12-r1.ebuild b/dev-python/pycapnp/pycapnp-0.6.2.ebuild
index 1c45ebd80c32..8147a6362021 100644
--- a/dev-python/pycapnp/pycapnp-0.5.12-r1.ebuild
+++ b/dev-python/pycapnp/pycapnp-0.6.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapping of the Cap'n Proto library"
-HOMEPAGE="http://jparyani.github.io/pycapnp/"
+HOMEPAGE="http://jparyani.github.io/pycapnp/ https://github.com/capnproto/pycapnp"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -21,8 +21,6 @@ DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}/capn06.patch" )
-
 src_prepare() {
 	distutils-r1_src_prepare
 	# regen cython files
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 298b06ba0223..0100c2f98d20 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,3 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 SHA256 fe988e73f2ce6d947220624f04d467faf05f1bbdbc64b0a201296bb3af92739e SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720 WHIRLPOOL 0de14913b4c02b1c8310432f6a71ed986c6f525c7b15bb6e91d3972a84f5599b13d621b04a4007ea276089cd75d965798a84b11d378e02ab50e1b6d243b62bc0
-EBUILD pysha3-1.0.2.ebuild 651 BLAKE2B 3bd927ac08866b9f02815b4e713c96cc9c6e62c50dbb8bad4afdb8725e0ccd3f590297e431e577717450bfd8b9b82df5b645a34f903e6f61cb5dae936838cda5 SHA512 e8bffd80e888205738de21e41f1c967e59ef8a7e09891b2060d77b10432244539b7132efc2d78913277c78bf9a336de45bee8be63d69c753ff8ae1ef3abe94b9
+EBUILD pysha3-1.0.2.ebuild 658 BLAKE2B 53f4e6431f0502a6def5c5cb90e7d141319d6570f3f9661783171e30f7afdd1a421c49786911e8953ce00d86d73f02bd59567fe0a711871b8c5788a5e31814b2 SHA512 ac86ef3bf03bb28d6f3a9f08fd2a38bda9f2a85a3444d70d66cf23ef737ed7b07552885fd5b26734acc3e373a54e7ddfe2f54303f3f9f284de52e1e674410884
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2.ebuild b/dev-python/pysha3/pysha3-1.0.2.ebuild
index 25a4e9daa7fc..dddd0199d4f3 100644
--- a/dev-python/pysha3/pysha3-1.0.2.ebuild
+++ b/dev-python/pysha3/pysha3-1.0.2.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~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/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index e51f62d8046d..8f766bc1e924 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-timeout-1.2.0.tar.gz 13258 SHA256 c29e3168f10897728059bd6b8ca20b28733d7fe6b8f6c09bb9d89f6146f27cb8 SHA512 b86548843e9ff8c8f7d1c39735025cdfa98befe2860e2a8a5d422d08bd7f542032384f147125a2a2841268154cc3a3874ef0aa4765d454fd5390edb773b106ae WHIRLPOOL b2155fd77c5c1fbfd5ec7679bc92f3aa9c28f67db47f2ad93f6e868c11787c5988a6e612f432c20a32d82d55acc43f520aa5a87b8a1155e98fb6da066cc44685
+DIST pytest-timeout-1.2.1.tar.gz 11498 BLAKE2B 65b50ed52409ed0031c7c9b07ef5b96c088cdf98c0155c1a6405e701fbddc2da1070a9f5a63e22428bd2d18e0ad4eec4050239f7d786fa854256c86eb6be0b1b SHA512 749a0dad83b82e93a97a8590900f2285679ec368612fdcfe3f5f7a5b64774ac85196dc31df111c6a99efda92dc03f751f17ec20862bed1f6aea7d7e4140a06bb
 EBUILD pytest-timeout-1.2.0.ebuild 557 BLAKE2B 2bf24f70dc96f38a2e797d931ddf6b63bca6fad0834d1e935ce6c9f7d4a148af3518f0627ab78d8b4659656876a69ad4b5c273a77c0e2837663829497caa0be8 SHA512 9221abd10e116b9e46630a98124f8297146514e672f2562d41d0c34f903ffba638271c6c82d61306280f64198c7e3757e1e41f23fcfd28a02613d8be58a740d4
+EBUILD pytest-timeout-1.2.1.ebuild 566 BLAKE2B 4f5f77f4978592507cefbeea6718b2f3559031bf02d18d230dfaba8b6fbff2075b3c49cb3afccae6e1f91ce241348c1685138d0382e7d5e8d60f7b484bda2828 SHA512 61b5ccc9645419518b183e3e0db231015d1f5e64a04890cc3744061c8fa38b8b9059392f17a224dd5a639c27bff52a2fdf3c980a4ad988e4dc0dcff63909c4c0
 MISC metadata.xml 327 BLAKE2B 23dc2e5e6f023223ab4774206b2d94fd27fc0a6b2592c8e0c317e1c1a0e7c26ed4f8e23187c5499b7fc9c4acc0df601a056ab1dced8115a47a9e72697037fa32 SHA512 6040289d134f65896f2fb80538d9caa4ce628911c5ed21568a30087d1b0ffb14b9acbf874956720b1d9c56290c78bb965ac9299bc400fd89a258f3627180780a
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.2.1.ebuild
new file mode 100644
index 000000000000..d5be6744077d
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.2.1.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=( python2_7 python3_{5,6} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to abort hanging tests"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-timeout"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/pytest"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index bd8794e55cac..b50a9b3182de 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,11 +1,7 @@
-DIST simplekv-0.10.0.tar.gz 16142 SHA256 61ea1b6deba90c459b2b886598a86af324f7182f90f9f9b85a02f6a017618915 SHA512 58cf95e963631d11f55fa654e3a536ea5ce3deb8f9abefc05c2eb192fd87cd7cc5ff54d17da3651289d4fe1b7e827f82a27ee77e62df87e7f0b5a39f4067389d WHIRLPOOL bb5f2dc027ca363f1501c5c25c04281d4001807aa5dcda359410e147a387650c06e416b58b008f6ffaf4f176086026a5ed93b1764753a5b5ff26a79c9e8ac4b2
-DIST simplekv-0.11.1.tar.gz 19286 SHA256 d7a34c7cca226c6f8545f10563b88519dc1be3581e5f56b5ebeb01a1343d42c6 SHA512 ad9fb57fea115ad9bdcfd1b2aba4ce1adb3c6b36f859527a311ec0f281e915db4c145d33217e6966b527a81e3f2912e63d5be9b9af0640adc77f3f519b1e1c66 WHIRLPOOL 655b6a33777e62906d40b1273fc688e9e737dae6685c0009e4efd85376d12079592c00f88775cc6f2b7a89b1ed20da049e8b1e166ba918a8b282824b87d545af
-DIST simplekv-0.11.2.tar.gz 19325 SHA256 d1a62057e3184bfdde71271c22b714659bbf69164ec72fb3ba10d5a02438ff88 SHA512 73846870068e260bf44a716805e89184e68a7d348b3b3e47b4f6ac46e541188bffb6e37485cfe82a2b5f4eb0fc61391042d82a709cc25ce9b16853ebe9a4ae95 WHIRLPOOL 60d626174937976c20302ec8e7ea2c50fdc065da92e86c7f8fc9a9fe7f6f5f7b28c3db35688f488545ad7e685d4ddb21453c5d6bb1805d2eccb28b31ca8e4a00
-DIST simplekv-0.11.3.tar.gz 19317 SHA256 1dca8769c86029c643b1746ac904de8c0d5d97b5e22e7154e12f9ce0f332d5e8 SHA512 db37649a5ccc6b105280b1cc291bf2933eb7ad9d2c2c09add61cfa3f1e064e279228f916c0106a0c8673a610d4476c46f2b5eb80a6c52a1b54474734058d9ac2 WHIRLPOOL 480338368aa16215bd5be4debedc608d7b2e0270d14feed0e3d9abc52023cfb9c9b64fea86fef41506a90ef42ddce8916aafb51fc4f8304b23d5d58254079894
+DIST simplekv-0.11.3.tar.gz 19317 BLAKE2B 363fae6c0d85ba1208da9864a7e2c2b21090b7ac846356c29279d47aa4cb7556aad972cae6877fd4d014d8260c0f111e1d6d0389e494a342f21384f31b13afab SHA512 db37649a5ccc6b105280b1cc291bf2933eb7ad9d2c2c09add61cfa3f1e064e279228f916c0106a0c8673a610d4476c46f2b5eb80a6c52a1b54474734058d9ac2
+DIST simplekv-0.11.5.tar.gz 19225 BLAKE2B feb9ce889576aa45e3915442c23a1c488ef4218c2eaa1ac39cb6ed97c909ca97e1e1e8cd6ba4ae7971c88e2a1feb892987ce3b2995e2e5532a866f6318bb45f0 SHA512 68aa5340fbce187776e0228d5fc9ff6414d2f3049cd9fcef4b92c8d9a7107145d28fb8a30a37d075aadc74975bd355dcab9d8ff87880965ea4c42b41f909eef7
 DIST simplekv-0.9.2.tar.gz 13750 SHA256 448608199a9f76a25529005b5a28a4e548afd623e2b7109563b9ebe6ef4f3aac SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045 WHIRLPOOL 40f62efaba344aed99b3e6bae80eb22021a93958654a2fe2d881ece808a93f830923fbd2f00d96adb46442d6bcf3c66a71fc805a49f46e331db10df24c1b2621
-EBUILD simplekv-0.10.0.ebuild 462 BLAKE2B 117ee7363c64853a6138da1d28198b4bbc1f1a662badd5556fa0869f33a4e76135295ee0fd5721f4f521dedfed3fc4e6004cced08033628bbcdc201f6eafa792 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d
-EBUILD simplekv-0.11.1.ebuild 462 BLAKE2B 117ee7363c64853a6138da1d28198b4bbc1f1a662badd5556fa0869f33a4e76135295ee0fd5721f4f521dedfed3fc4e6004cced08033628bbcdc201f6eafa792 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d
-EBUILD simplekv-0.11.2.ebuild 462 BLAKE2B 117ee7363c64853a6138da1d28198b4bbc1f1a662badd5556fa0869f33a4e76135295ee0fd5721f4f521dedfed3fc4e6004cced08033628bbcdc201f6eafa792 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d
 EBUILD simplekv-0.11.3.ebuild 462 BLAKE2B 117ee7363c64853a6138da1d28198b4bbc1f1a662badd5556fa0869f33a4e76135295ee0fd5721f4f521dedfed3fc4e6004cced08033628bbcdc201f6eafa792 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d
+EBUILD simplekv-0.11.5.ebuild 462 BLAKE2B 117ee7363c64853a6138da1d28198b4bbc1f1a662badd5556fa0869f33a4e76135295ee0fd5721f4f521dedfed3fc4e6004cced08033628bbcdc201f6eafa792 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d
 EBUILD simplekv-0.9.2.ebuild 447 BLAKE2B fb7ed58150439e73ddf1155a75252a78c41566048edb19d707de4fa15337711622a99703370995839fa0ca56a541b3c04b88bb05026edbe28d71246f38cf6743 SHA512 348c87cc0280d4877f7d08c21a0db437996668a7392cc5c91ff9f2a9c9c0ad0bca2afbb5b9cb2734349cc29f49361f9039796e44fb32023ab97a536cffffea8c
 MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/simplekv-0.11.1.ebuild b/dev-python/simplekv/simplekv-0.11.1.ebuild
deleted file mode 100644
index 8f596d13dff9..000000000000
--- a/dev-python/simplekv/simplekv-0.11.1.ebuild
+++ /dev/null
@@ -1,19 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/simplekv/simplekv-0.11.2.ebuild b/dev-python/simplekv/simplekv-0.11.2.ebuild
deleted file mode 100644
index 8f596d13dff9..000000000000
--- a/dev-python/simplekv/simplekv-0.11.2.ebuild
+++ /dev/null
@@ -1,19 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A key-value storage for binary data, support many backends."
-HOMEPAGE="https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/simplekv/simplekv-0.10.0.ebuild b/dev-python/simplekv/simplekv-0.11.5.ebuild
index 8f596d13dff9..8f596d13dff9 100644
--- a/dev-python/simplekv/simplekv-0.10.0.ebuild
+++ b/dev-python/simplekv/simplekv-0.11.5.ebuild
diff --git a/dev-python/slackclient/Manifest b/dev-python/slackclient/Manifest
new file mode 100644
index 000000000000..48598a7ca398
--- /dev/null
+++ b/dev-python/slackclient/Manifest
@@ -0,0 +1,3 @@
+DIST slackclient-1.1.0.tar.gz 16479 BLAKE2B 8404be6eddbc3d8ca3dde74b04da7e18e80fa165842c0fb0b33fa28d6c2a182b8c553aaaa07f1676a7be202c324a95f23e7729ae24f037f0290dc263d18addf4 SHA512 3c62869ce4d830dd39e0723e4ab14c25eeea45a0f64965c2514095e0f8d11dbc07829f945d2fc3030119f9e41bbba29cddab33fcf314bcd80717df9d0ed1c3b1
+EBUILD slackclient-1.1.0.ebuild 766 BLAKE2B 7133a8da12b8ba7c5dbdc5b1abeb333365599c926268d11b2ece00a694f53ee27f0d625e65e6a5f17ddbcfb51d6ca789c53a739da48eb833f3395a98871af18b SHA512 c3e2759acac33e0086bd21a97842126dc2b882819013443da04ef9bead2f20e9f1d3d60d4c12e0cff4ff937c4bf3cb65dbdd767a3b3858d4c306630cfe6614b5
+MISC metadata.xml 381 BLAKE2B b373bd7bca301f2bcc906e229ff17ef0cdb69482b76567cc45a98774246169d17d3f77f6eddea8a52ea6ffaf3ab20d018246ccd224e81a660634922447d0e2ff SHA512 36faa9a06a4d10f9d8c75e9ce29a69dec2a2f4fa4f8bb836aea318364ae03a63062deab63c78e8f7713ed141db49d42fea92acdd2e5beda9cae2930a90f399da
diff --git a/dev-python/slackclient/metadata.xml b/dev-python/slackclient/metadata.xml
new file mode 100644
index 000000000000..ce78e75e6b31
--- /dev/null
+++ b/dev-python/slackclient/metadata.xml
@@ -0,0 +1,12 @@
+<?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="github">slackapi/python-slackclient</remote-id>
+		<remote-id type="pypi">slackclient</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/slackclient/slackclient-1.1.0.ebuild b/dev-python/slackclient/slackclient-1.1.0.ebuild
new file mode 100644
index 000000000000..4595dd047eec
--- /dev/null
+++ b/dev-python/slackclient/slackclient-1.1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Client for Slack supporting the Slack Web and Real Time Messaging API"
+HOMEPAGE="https://github.com/slackapi/python-slackclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/websocket-client-0.35[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.11[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${RDEPEND}"