gentoo resync : 12.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-12 16:49:02 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-12 16:49:02 +0000
commit: 519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (patch)
tree: 7e99d88a777fe8c9d3ec6310bf7eea639b0e66b4 /dev-python
parent: a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (diff)
47 files changed, 462 insertions, 85 deletions
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index 8039cd2ed17c..f7a994190fb1 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -2,6 +2,6 @@ DIST backports.functools_lru_cache-1.3.tar.gz 6685 SHA256 444a21bcec4ae177da5543
 DIST backports.functools_lru_cache-1.4.tar.gz 6927 SHA256 31f235852f88edc1558d428d890663c49eb4514ffec9f3650e7f3c9e4a12e36f SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21 WHIRLPOOL a223576df439818a247784e49d1d401807955a64eee4fdae9b937daaa96afc42e535819b4f6bbd0aaf04a0764a241809a79909ecda359ede60891dfb33305414
 EBUILD backports-functools-lru-cache-1.3-r1.ebuild 1184 SHA256 3d632fc1c0954356afbd9cd0b2fefecdb93b040a16bd8820d9e62b05a6bf1530 SHA512 a624a2120b590a0444cd79fc0292354574f1e875fb8c3e973584539255236dd99821b96ab80992e802883b1faf788b7c4bcf7d651deb064404897570e415c6ff WHIRLPOOL 40ff9de5107b95dbc1d1e6d7d61dc0c618acd9ee58bdc3763f59cb5986324a9a7902c9b5a12a0a096437f56365d39f586e09f04f5987da47bccb33735bccd545
 EBUILD backports-functools-lru-cache-1.3.ebuild 1081 SHA256 64be30432fb739edbe677aadf5473216d919bbbb56b83e2f20e16a2095fa64b2 SHA512 46b2852ab07fbce2b7945b9b93b9aeff58999448f6cb040e52f0097c3664576ea55717c268df2794b2cb391ae5d23128a01736fa36239605aeaa5438d5886f67 WHIRLPOOL 250050afe1a1ab57e26e08c568f77d6c6c9d70b5c988ebeeda35e489e28b271a72a03a57a9b4daa2182342e53dfed32763607b0cc02120dc56587f97192aaa6d
-EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1276 SHA256 1c5a860f7122d1f62ba2d37b8b338e7c3da60ec5e640b69b1a6bc4cfcadfe5ee SHA512 20caf4f6f9b280299adb4e8ae1f5ae82a6fded7729a0af76e0af4c0304ed9284e2aac74715fe2f3f6ccba839d7805b2fbb223385bd0d7af3ec017b1a3acde1e1 WHIRLPOOL 06924a1898c1cbe83309a2753abf03748f5496ce23ad5c34baa0cc1ae18b78ecf7e488d9832e94c757a83b0ed9ab51c976c291aae61cf5e644602d65e53608fb
+EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1282 SHA256 dfd1b63fe292a7f3b5fe8451c763ec99c5069bf18ca6c3c1d6ce8fe58061f254 SHA512 05986b645658cad198f565c27e7b076aa2682ec6a73dde4e381647009e1a7ef3be80b49c2f44e68418ffe4e40fd2c260add391d525efc31676f2167fbf4f3c2a WHIRLPOOL 70a905e9719e09b7f208e3d02ced33f4ba56e7dea3e83fb69bb6b1d4aa1678b19918159a2e58a72581db28f3b1b144639f48474274d29aaeedb2289294861837
 MISC ChangeLog 1372 SHA256 317c753b80f1c142a12a7317436a117f50968b87988dd3df588097159ff50d2c SHA512 ed0677553ff8414febbc8eeac1d232592cf4f01867cabc2bad7226df738923a2b4c878a18913d6b0f4b119a777ac2b9cd0df8fdbc7e0fb1990031c369a9c3e04 WHIRLPOOL 127a7236fb8759128086b044037ed5a2a33e5154085daa8f0d0fbd5b9668ed820c9e101388414d77505a616c053730f82d4d1c07a18e6b586a3ce7aef5a7b4b4
 MISC metadata.xml 803 SHA256 988749c9ceb2ae71874997dc20ab83235108e974e27e180203e333d441566fba SHA512 c8ee92d957a9af691eaf06ba40124ec7ffa668ccd98e77d5cc8972b3d18be145fb33c672b36150cd350274d753bc9a53b8b7d15525fc59ba17ec2235d006b11e WHIRLPOOL 6a3950cc272516f71d2f9c6ad1f4d196501eb93432f439367a6fbc3c964347623b9d9156c90a0a3b63c2acca353dfaa460e32b5ba3d2c98366358cb27b6cd114
diff --git a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
index be136551e498..5ec05dbc52ab 100644
--- a/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
+++ b/dev-python/backports-functools-lru-cache/backports-functools-lru-cache-1.4-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux"
 IUSE="doc test"
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/backports-unittest-mock/Manifest b/dev-python/backports-unittest-mock/Manifest
index 9b8e9aa2c1d7..2c19ed8a292c 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -2,6 +2,6 @@ DIST backports.unittest_mock-1.2.1.tar.gz 4580 SHA256 3a333a7a7641e4c7657c6086d1
 DIST backports.unittest_mock-1.3.tar.gz 4687 SHA256 c6d964d75112051576daa60746cc6a66afcdc43f13ea2bda175ca8e278e9b375 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff WHIRLPOOL bd20ee64f45d84274e1ab51aa3df50c66068517f4cd144bea381648433ba62d2fb91b4def06d06403e9d2435980c08d2ca6ddd37270c45ace735401085470f8f
 EBUILD backports-unittest-mock-1.2.1-r1.ebuild 1327 SHA256 8e10311c4b0a5990b4151eb5674a8ce2d3b168a78691d291bd1d5ce678a093f5 SHA512 c97899d949bdff414b6c714989cbc673a1e4639003033dda61c85555deb8ca90446230a714cbfaaa87130b702c4b5becde1e9f8b36100657c5d38d9f89646876 WHIRLPOOL 781f694ab275563ec327cc6bd0e85245f54d32dbd9d9609bfb7aef871ceb229f12657012323cffcb46167a8fc305b743e90d471bfe0367862f53f26e02961353
 EBUILD backports-unittest-mock-1.2.1.ebuild 1227 SHA256 2798481d8fdb915abc821bee5fa7ac83165add650ffa5ad3c3482ae668ad3035 SHA512 682fd1d5f7ea37c91328657dd06b89e72d88fc6109b7da3b05f4c08d115389e81e67a8e988cbc7e81258d771159cc4134d44d18234c4f6d756fe09dc8a37e122 WHIRLPOOL 75348772746ba12001c0bb950009b1b17fc22dcef92bf9234b53a87f2c9ced5bb84ac7b1598a04350e5ab89c28d54aebbbdea26acf70718a6647985c5d4fdd26
-EBUILD backports-unittest-mock-1.3.ebuild 1420 SHA256 f0bfb5a933f7064572b6ea5b090dbd878e89d485c556735a5b6d27868c27df86 SHA512 e760e1c0695d24eba9939890e9d951a72ffadbe936a6544686a79984fed83c202d90e2d06688c8b7675cc106f912e47a2fdbd5611073a288997c07a442f1ea23 WHIRLPOOL aa867621eba849fd569c7ff38d05b3b1f2040183127502efd43ce6fb2ca4b88ab8ffb693a22d3c4d5e29542ac8d9e7aaae65fce2c1f86e578cfc20b017e7d563
+EBUILD backports-unittest-mock-1.3.ebuild 1426 SHA256 992b9c16920a742f648b1a3050c291acc3be94be890f0d77d1359d1a5c8013fe SHA512 0b1006f12a0895e1c959a746dddb13b5c226fefd13e1d7b8f93a2500834e0ab40c17a6932831df1411b207f43510c237669200d3836a942361a3fef658f31cfb WHIRLPOOL 846e99f58c6c2bb7d60d4b59d5307978fb23deee7b5cb4bd55274c8327d63ffe56eab1794cce1a45b998e2e2b0fa788702270293fceae2a89db25dcc8b5591b3
 MISC ChangeLog 1143 SHA256 b66c0df9b12e6b04f003655a9553a17656ce7a2bf97221cc878d8bd67fd526fb SHA512 24e4e9f6d42a0af9bb1164871357004b552a3f438094bb07de1a101e4c7d84457fd28f52904969f0d3055ec8fbdcd251fdfb2be7635370ba8aaeaa603879816e WHIRLPOOL 6e7131a3e47124947176c09da42a9154ff7079ec45e53116bb127d8ab822b8b769a68c9401b123fb283aa9d3b96b214a0bd0748a578381ea7ac7c45649c70157
 MISC metadata.xml 858 SHA256 2281f088ef4b4a4f06f4c5e77aaa0d640cd810a329e89f190d43cf4d792b6066 SHA512 076bb148f419c52a09fa1a89cebd65c0e581828a261da7e62eeab3c30a4e8db4db95af4ee6a5fb1e117a1815ec2e7b4bace522879d9e2773e37ba8b10b247eff WHIRLPOOL dc152d16cf57dca1c705eb6b330775245298e0d84438cd39b84abccc0a6f56f5c73d6c0576cfaf345c1ed47d0caa2ca6223e708276650bd853d74deed9492b3e
diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
index f8fd45a134d6..08865b361ebf 100644
--- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
+++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f7fafbe53fec..435c7ec7eadc 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -3,5 +3,5 @@ DIST cfe-5.0.0.src.tar.xz 11437024 SHA256 019f23c2192df793ac746595e94a403908749f
 EBUILD clang-python-4.0.1.ebuild 864 SHA256 17b2d7993fa0e03dcc678c9813e2e67a14b49ab9b6b96846dc797809e1c384b4 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324 WHIRLPOOL f773ad78a27d8b899d5c25b9280bb9c33b5f3b39645aad364becf7bda4794369ad866e37859ae83aa20bcf2a682b6c8cd3bb2b14dbeb33ed7feb3e5b774c1fdd
 EBUILD clang-python-5.0.0.ebuild 1028 SHA256 4c25f18e595adbb7031d2b89cf7d98a59806cc228c8a1d204a411daae3bb5a03 SHA512 7c5a20034ae0deb3820692f651a8a3a69741b00b71f8465656a59fc2ad17009555420dddb8105d2353ffbfdd1a32f4f377ca412fbe3c4f15a0e9b0e1d90b29eb WHIRLPOOL b625cb854b1e5a3e03db98e5b53b04a031934d6ae12d592d14c6ac28dc88fe32cad6f63d44dc362ebc3168b1158302e53af87071c9e1c901556daac4c302ac6b
 EBUILD clang-python-5.0.9999.ebuild 900 SHA256 315c3e1cfba2b384853cbf4e0e97070bfdc437cfdb0c73c377046693a1b5916f SHA512 589aabd4f0f8e8adaa54b010c153246bbbd95c0a357f009d94f9127a6a4cdb73e3cd8d2c254119eb3336ab386bc0552dbf1bdb560492cf1086cf2c0a40bc8a05 WHIRLPOOL ccc8c8644a1ae3003c96e8f0cef5b55668312a669b38e41787b771b111f291e10264cd7b4aaea7bade2df55a8dd86fbb71ba309aa772c1cdf3d8d5b37a960aa5
-EBUILD clang-python-9999.ebuild 889 SHA256 bc8aaae237f284e53047359b1f971227f9b16cc931c20099d3666845af9f2f7d SHA512 23ac21ac5e0023aa9eda71f4e686eb818078c26eca56f8431db0ff519b5661856ade2c40ac0c7318ada7e027e9ca90b0b8bfc1a29086895ef5e6f41c51bacaef WHIRLPOOL 8e3781f8e2ac45cf5345a04b7671d9db84b54a8dccd2f68087222e177dbd73c434b6d062e38d7df30b9e086f1688f8ba46aa6ef24199abf9e4c3f98ce50ce592
+EBUILD clang-python-9999.ebuild 862 SHA256 6c22503baf5c4a6c1981511e7febf7887182318d75202f2a3e11ac7269b0b3b6 SHA512 c5496bb5e22c2a82cde4d486b5b723e84c2f10693ac9ef136a4e1dbe4a62218cdbd10c5aadab28fbd9a59f8b85aebb9bf256f409a6ae2bba437b468ad8e5e01a WHIRLPOOL a6fc86ac979b3c7df5c824dad3a2716a6331825be27c4875c32cf508668df9a7d97a5647f8da124c0c29a3712c3e93dee72cd3d15f5c72bf1d2189da2802d9ac
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index 9e661ff1a4b7..854d44c3f77b 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -25,13 +25,12 @@ RDEPEND="
 	!sys-devel/llvm:0[clang(-),python(-)]
 	!sys-devel/clang:0[python(-)]
 	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
 src_test() {
-	python_foreach_impl nosetests -v || die
+	python_foreach_impl python -m unittest discover -v || die
 }
 
 src_install() {
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index aac7960c12f5..ae29446a7066 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -6,7 +6,7 @@ DIST gst-python-1.12.3.tar.xz 388220 SHA256 c3f529dec1294633132690806703b80bad57
 EBUILD gst-python-0.10.22-r1.ebuild 2148 SHA256 ad01d5164839df14bc10de659b53c6d78d4fe00f31f4b9533141207b8a9b2183 SHA512 ebc646247140167dff59b882007d1919cfcc03cbc872d2d0db1dba3887287b3f9110a523df844da4b59ac70f764a8cb1f9de570ac660458a29d0802b7791639f WHIRLPOOL a95ae5bff61a4db977c442527d75076b8f30fd0460f6789db43d83f1261a1ca96e90ba5572f38f581dafdb463b056d9f5aa11e796034831fd0f1c9dd13a9c1bb
 EBUILD gst-python-1.10.3.ebuild 1121 SHA256 7f451ae76de262b1383f95ec700be01a3c5e8b48bfa283cd424525167bba9322 SHA512 82a9e5b7ad9811d59cfebe0772b4003822bd179bad5d00ccbcdb4c9cb1e03ba57b9c116f0827c635ee3005c0bf4326f4d57ac51c77b7d941058a2e524ede4545 WHIRLPOOL 8a92d7d87beab2e4e3977455b21b73635885661c2e4f5ece4e9cbc674648be16e4087491c7f9844b7c712d98cafd35b361f100f7bc72a6134e71dc3ccf827525
 EBUILD gst-python-1.10.5.ebuild 1126 SHA256 bc7129b274d5602c5057279b495d006379368b275add16d8856acb662750ae87 SHA512 cc95c1e419634aa8b55cae379c7d57251281c9fe65a8b2ddf4e8d17ac113173f5c71ae0e602fc287408d60a0aba7450a5c0d9ef15db9fca3acd8556c53f9c702 WHIRLPOOL 2272e84b73cb036f8fe3dd335740b34c3afbe73a65cf7a2f4c278b211bb4ff7d7500edee4ebeae4affeeb0c38abafc9754adae836268c63c6b0e2a2cf71ecc1e
-EBUILD gst-python-1.12.3.ebuild 1128 SHA256 fe56b16477a0e85f105becd205e1ab281e02c235b4498b99b04438ac9b9d32bb SHA512 9f7bb18118c6b95be31e000defd86d563551100a6e3a0ef04082facc2a7c443ed7df48518ea6f296026c14dd536ff76713dfd777193bbb45a2d665cf857eab75 WHIRLPOOL 4c010953dc789f268a8b938748096b4bc0cf7f0851b7d524cce982950e9c5785ffdcb90b84fd2d64b5b96ace179ab40b1e7bd49530532c452ad8a0ba3103d18b
+EBUILD gst-python-1.12.3.ebuild 1127 SHA256 5eb8c9b8dd9ff4fca1cd67496591212a210d67e67601392dc393480b555cd2cb SHA512 0b38f3240fe466afb3d1b6fe8c2248beeee7f41245a0042d5d6bef29dfa42a42b63de6550653e07ccdcd91110131ab7b65a9aa5532cfa7510d5dffc06c987e89 WHIRLPOOL 7ab6adb8b8718d05edec9629ee9fa68b28c899be6e2e00b7f5a7e098ba1f566e658d19910957f32b79ecaeadc937721c740a423ae6fb7465aedf1b390b244e09
 MISC ChangeLog 8901 SHA256 5b4d606ecd7d165a41fc1fd440ecf2a4f80f098db793db1d717b8a6b805be372 SHA512 8a818af9dcdcbc2daa50ad8abda2beabed387aa301e7acd8adda9119157f82ef1754eeb7ce923fbf6c9ae0399a6114946b60938282462f28e6e8ac11f99af22d WHIRLPOOL 3c3cb3912b79fe75e2aa41b4ea6fd1bd32a991826fb5e1481ded90eac868b314e3d04973417db3030027e006dc7b4c1a6d60a4f4d1b8a5f096a64828614354ff
 MISC ChangeLog-2015 19499 SHA256 faa35ccc2dcdeaf3f92a918338451aa330a6e7e959268cbf03d8a83f11a0de77 SHA512 93fbf1c4c68e5b7212ad6d310a8ed1d13710d4f2e8b7e92715d7303b6b7bf71362b0813962268e4b7abb21c9ef8f5789e0ad5fd129e96cfc2199d52de2d271c0 WHIRLPOOL e1cba65dd70b859bd351bd0634201adfbf91d00db882d03bc7439bc964d0ce17b66f6ad3b8433dbb483ca1c0e49bc3a1209fbbb2a5a410e51d9b35e28c6b1b00
 MISC metadata.xml 272 SHA256 c359e335e2d2a52e9d3462702b8e24475e6f1e6e62673d13cc64e4b49a97a059 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea WHIRLPOOL 10927e64702cd2ed921e795e80c874379a66141393d5bcb46a86da71b47bbf9a04ecc0ff0dbd01d1d5634ae00b2f6af5c5ee17de8073a84e47b0daedde9bf618
diff --git a/dev-python/gst-python/gst-python-1.12.3.ebuild b/dev-python/gst-python/gst-python-1.12.3.ebuild
index b8944d26f019..93c72e0c78c8 100644
--- a/dev-python/gst-python/gst-python-1.12.3.ebuild
+++ b/dev-python/gst-python/gst-python-1.12.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="1.0"
-KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 5bb6a600e32c..f193a3e3ee2c 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 SHA256 9980b0fb6a0d2ee754d5979c9e5e02f31853da8e9046dc99f5abfcb7ace9e189 SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd WHIRLPOOL 887d743fef6d1e5b8aa97b1ae0d83500f2c68f61520978557a0a53ec7d58b6f42740e3669340e7101cf1c3afd9638da4bf27e6ab5402229b614a27267d62df9b
-EBUILD jaraco-packaging-4.1.ebuild 1157 SHA256 5e800e615b5087fe80badcb71446a8f550a64938bd14b9a44a26515b8d66379a SHA512 93a0d86b1e8076fa96a78352a26142bcdb89af6c09f5481289de744c55b1cf5ae98f30f7fc5cf0636948710ecf0c322475f681f3527b48cb41960905cf406397 WHIRLPOOL 72d9b79ae6176e52938918c393b69146e13d39b06d7004b2938f55c15e95d7a33fbe8bef0feb5fe065b2ab3d6a3d4878dc4614a897a3d32df463b4e8ab1fdb92
+EBUILD jaraco-packaging-4.1.ebuild 1163 SHA256 821e53e7b9c15d191f752616d2e576c78f9095dd4c18c9dfb5bd2401cdd206f0 SHA512 e6eb361abcad95bd7e99f048820f44baec7f189a5bb47b525b9cca03c1ea50ecc20753783589f733397f554323344db270baa8df515d643dc258354a71e80c08 WHIRLPOOL a2b07fec589ab56ebf811c3225d6d2f49c964c9dbbd57ab85664cd837e6462801ba700d78fc7e62fe55daff8e442e16e23a53564914bb3234a7af6c71c012731
 MISC metadata.xml 683 SHA256 a74958f7cc90ee6751c4f2ca154197b289ab054204b3935eafdab3335b2e5fde SHA512 b6f9d4889c3591dd7e70a4945408a75ccb7eda388599cf9fbf0020ca15152ce4b585b61f8f669980b01386fd277dbe3f8f97e633a148f60726b5260d216f3071 WHIRLPOOL 8b96550a2de07d5522706085a31e2d613c622c025c34f77e107841eab207fce97cd868278e3520a10b7fa22707ea256e4fc1b15ba04d26782c7a445f4285e64a
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
index cdebb345a179..58862d3f940d 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 83f9b3f7410d..63991977bc36 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -7,7 +7,7 @@ EBUILD m2crypto-0.24.0.ebuild 939 SHA256 bfa6031ec861a3e04bcd464b379d90a803958ba
 EBUILD m2crypto-0.25.1-r2.ebuild 872 SHA256 144e7206804b5044ad294ae816448f3e60b9ca8d1263aaa2482e316794face3b SHA512 73f1f2d87a9bddce1d2ab241801f78f9891b3be29dbc90803c4571fb5852d8179b8e945b7682e2ff69224dfe16ef9e2e4d046c5f604cfc18aa3f0a37d4fcbb26 WHIRLPOOL fa6e055d35d48e6e5fe6d07dfcdffa4ad12fc4922b57894b365b0bd1fa5f3b1c781b64653f31d24404023fa8797d3b50ee9f54f6874a6908a40ba56752fcfd61
 EBUILD m2crypto-0.26.0.ebuild 997 SHA256 3b2c1c5998f7916f1c65b60fb6d59b1083076956b823f18ab2ec883c3855b8d8 SHA512 a7569727bb1b958ab175d88f919119fc03e48c09931d83390b35d23dcb6e8ee4492df06ea6192315ccb86d8235f0597657c56c9ee1823ff4688719398d2eae7a WHIRLPOOL 463fed62e2fd8e3776d2b917313f30bfdff835f01dee1aa6ea64c8ab8cea9ce6535e7eefdf9d98d5b732e459cf3397d1c2294b2c57f1365ebcff83563e8d8a3e
 EBUILD m2crypto-0.26.4.ebuild 997 SHA256 3b2c1c5998f7916f1c65b60fb6d59b1083076956b823f18ab2ec883c3855b8d8 SHA512 a7569727bb1b958ab175d88f919119fc03e48c09931d83390b35d23dcb6e8ee4492df06ea6192315ccb86d8235f0597657c56c9ee1823ff4688719398d2eae7a WHIRLPOOL 463fed62e2fd8e3776d2b917313f30bfdff835f01dee1aa6ea64c8ab8cea9ce6535e7eefdf9d98d5b732e459cf3397d1c2294b2c57f1365ebcff83563e8d8a3e
-EBUILD m2crypto-0.27.0.ebuild 997 SHA256 aedec5c6c3458ac9f77131121a81129349af0dc211813b5e13a0459a8f4ccf64 SHA512 5c4f80de77ae3f46a9f5396842aa6a3eb3d39f6af375f004a60158637b3f8b7f5d2d62e6ae59d07742bf6384143affeef23be50d07d9f8e72e53df71bade20e8 WHIRLPOOL f600170c3ef19f2ac8c32fd70423fcde65b9bd523c7dbf86ea7e10628855119ed406191b5c7208129370a18c975221240ab8196d9d1bffa9be04162dc70708af
+EBUILD m2crypto-0.27.0.ebuild 1003 SHA256 25702240a5b23ccb1c793c45812c501d512dbc81eb3c9711e0da267d97be20fe SHA512 34c37ceec172096816dfd0ed0392bd47477f65d11a624ccc477613fce865d2651fec8ae379f7a261d8a45131a6f06d756b92530684e0f11485c824fc9b8a73c2 WHIRLPOOL e218d73010a11ff08a254f5bf1a6d2e3bdc529aa70fadd3dea81d061289c9eecbe6f5af8a45ec00ceefcd31253f624e73a3415608c10ecd98ada6aba1e82eb0c
 MISC ChangeLog 4266 SHA256 cb2c5c4b7e3f369ff5771668f735d21ccb7220e0d4f0087823cbf857571e7694 SHA512 ddd1c2a62e02a76067b9dd7c78f6c0db466938118f89ac3e0fe80dcbb1836157fdf845b3a71c14730d18d696555ebb9ccaf724be9c7935dd549f43d30e2f9c8f WHIRLPOOL 176157383668d784462e09697ecbf240110622b7f63eb423ab85c684beb3452e3cb177814c6925864607901377bef1fc48d32931254cfe36d9d58c6842f4d1d6
 MISC ChangeLog-2015 14785 SHA256 bc1f5e8965bd259e09aca3df7f1f04e5730b88839a8624159adfd0098202b627 SHA512 fc570db891f03ca71c118ce6662fcad9a219d15d2dde18b3d914aeecd1108783abf2f4659e96e3f5e8aa6cb4bf476bd7f98f1975fd395411e5725118013f82b9 WHIRLPOOL f6a6a35ab0566f54b3d49bf5714c8173a0ab9a91114a25ff508507469c6d538869231119b338e9bb9ad7baae81e62aedec3978e5292b8e4089c849d6e0e973fa
 MISC metadata.xml 380 SHA256 5ab7583a3fb8617ce68eb175d57b6a1ba951baca62d0179d80f63aca9eba3635 SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6 WHIRLPOOL f7bbc7ad82ae17374b32f1606bbf8960c799800debf709111abffb1df8da39d4492038dbeb3e3eb135f81f43038615d6d0fc0810151a58d5c27a3936237df9da
diff --git a/dev-python/m2crypto/m2crypto-0.27.0.ebuild b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
index 5745a2aafe43..6bd2f3b372aa 100644
--- a/dev-python/m2crypto/m2crypto-0.27.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.27.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 IUSE="libressl"
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 8c3ff6313df5..c16dc8d8dd9d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -8,11 +8,13 @@ AUX matplotlib-2.0.2-nose-fixes.patch 586 SHA256 744722572f56fd020a54ba4eaff2a59
 DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
 DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
 DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df
+DIST matplotlib-2.1.0.tar.bz2 33051088 SHA256 0ab32ed55311dccdb42a488e1e7be5029695adf9219bc2b545ee0443dcf365c7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f WHIRLPOOL 0fb7d7e7e2b45ca6ae9ece32fa413f9c5b47fc59f64b877fad1f8becff4828a3be948f6433222008256c469b7760075c1d694b13ea771dfcd4193c2cda405aa6
 DIST matplotlib-2.1.0.tar.gz 35727251 SHA256 4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387 SHA512 8f512400f1f15d5400e23dd8e402783c54f62567d412863530a982c6513206d49fb91fadb3ef477648a4a38d6dd032eb90741ff4495d2be71911f83677d768b4 WHIRLPOOL 4795f3d49e3a624a22debe738cbe42ce3594c91880b3e6273f7ee05ecb7016353550cb39367f1edc6588d0e75d227d79f29af709e9471147171dd7ea5b6aa687
 EBUILD matplotlib-1.4.3.ebuild 6150 SHA256 a9aac5050e5e2b85e2dabc87ff854b1a6a1f2f93ba752497357aa9323c40d34d SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46 WHIRLPOOL aee3d4046f0554a4f6f45359826961bac81d95f1533c40dedf5232f27e4e3b751fddb54285c20b69ee40c5abd79cb5dbe7a833e88775b339cc98296468c7e2b7
 EBUILD matplotlib-1.5.3-r1.ebuild 6411 SHA256 1e382cc3c6ef71005b07259d2c06d64be30b21228dda6ee4ede4dba09d0c0d58 SHA512 2b82734df065dd850ab99e4a19ed8001c45f9f9a472c54b29930f2b2447b77a2b5b2538c75d8c940d1fc5ffa774ddcb85b065bca923e9a46c4feacab0c3764af WHIRLPOOL d0964372a2796304505e7d8761f4b0d401513569f50386c9b50a3550e0a1080ffa75aed9aec897a2ae7d56216c6e7a08983acc70c51ea4b49464999da2dff121
 EBUILD matplotlib-1.5.3-r2.ebuild 6559 SHA256 6b5eee62e57b305290e0e1e64a3ed37242f3236d2cbcfdf6705e26695d95a89d SHA512 00b3fc17023fa04a4e7dc35e3c5752f0e4b16ca1edd21138448ea9e44d843762b7111a018b002fea762b6c6914f1171d72054da52427572c25d87f1c2157c537 WHIRLPOOL 6639184ce4dcfa65aa3647af85582105428e1c3fbb381873af738e5eea56c53619dc88bd3e5ca2a6b8032679ce0f54ea365144a5dbac3e4bb45ef8e9bf774ead
 EBUILD matplotlib-2.0.2.ebuild 6182 SHA256 bb37b2e70a7157fc15da9afb9fb2598e35ccd9ff13cc07388c58dec3abad56e7 SHA512 ab6b634f44041f3dc17615acece6bd8066842c42203a28bad2dca4923ac3ea969eb57354f59aac417f575aaee2c6d2f77ec0384dab08ee6776106d7971078f66 WHIRLPOOL 80314ec11af2a9f06eea0e35c47c9244e6d7dbda46bb16fa859b384fa61ec105de317a1f5cb37a9a8e4f13f723ca63e08dc4509540e52a044727050f8f89c089
+EBUILD matplotlib-2.1.0-r1.ebuild 6018 SHA256 05dae419a87304fa97eab55bf887eb2165448e62bcef0aa1844da663caab4b05 SHA512 ad3290d1be26616a206919b0f5f6f2fbeb279b7c5e8b059f55754ed175ed175d586c8452967b3a8fb67b91af8cc6acfef976f8b90742f9c44731e63495d9395c WHIRLPOOL 11b079c47c24f660567f031a89dd0c73bb0949cc8c7f9328c650943ad44e056c29dfee3641c868e2761fdf7931cc7a14d0e02c4acc3cfe792aa480d618d85cba
 EBUILD matplotlib-2.1.0.ebuild 6071 SHA256 ff5ffa4cb211dc0e032a119387c4cdf2aec9a4abffd1406003717231b1e2f7c4 SHA512 fe2f89b32566e3dc4574aa950a059b4083692c064424bab96ba732baa58449366504401366815be64b981be5eafa9957c14c4f57ba9b1c0a76a2eb96acbdf404 WHIRLPOOL 4382ac0478479b4a919716b3b0474bd3ce1cde260a717a0284081c43858f3c20c57b8cb794c34ee6aadb579491a79902cfbabaed21019f960ebb0c33d78a4e02
 EBUILD matplotlib-9999.ebuild 6396 SHA256 85daf537315da546a0b98cc4a4da704047d8499b17a9358f4ad732a58434b2f9 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc WHIRLPOOL daf26233c729a7e37d8aa6e3ac33301635215d78adc475eb2397b253868cbfd556a9d6c421980abd6ba3d217b7c4490ee1441f852f5925f2b2e89ece721faa76
 MISC ChangeLog 9810 SHA256 587f82b153d9c79045205c763ff839c4c4efafc28c9ce8c1f55181284b5ca10a SHA512 0d520483f15b6775938e767a926902f828d2626b80028a34f92ee19bb9b1c9d034e6bfa92b89b1d6ba190d2bd34f4d00db7d83571af00d3d799d2204471b42d3 WHIRLPOOL 274049289255cf08568a5eb30d1e21e3d59a6abc974b47afb0ed5c615a4fec52858cf0522174b723889e09b017b464df1266fe7a6e34709d20014923262d717c
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..db96f8cb7fbe
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
@@ -0,0 +1,249 @@
+# 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} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+	doc? ( ${PY2_FLAGS} )
+	excel? ( ${PY2_FLAGS} )
+	gtk2? ( ${PY2_FLAGS} )
+	wxwidgets? ( ${PY2_FLAGS} )
+	test? (
+		cairo latex qt5 tk wxwidgets
+		|| ( gtk2 gtk3 )
+		)"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+	dev-python/cycler[${PYTHON_USEDEP}]
+	dev-python/functools32[${PY2_USEDEP}]
+	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	dev-python/subprocess32[${PY2_USEDEP}]
+	media-fonts/stix-fonts
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=media-libs/qhull-2013
+	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+	gtk2? (
+		dev-libs/glib:2=
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		dev-python/pygtk[${PY2_USEDEP}] )
+	wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+#	dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? (
+		app-text/dvipng
+		dev-python/colorspacious[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PY2_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		media-gfx/graphviz[cairo]
+	)
+	test? (
+		dev-python/backports-functools-lru-cache[${PY2_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+	gtk3? (
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+:3[introspection] )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/dvipng
+		app-text/poppler[utils]
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-xetex
+	)
+	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+	"
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+pkg_setup() {
+	unset DISPLAY # bug #278524
+}
+
+use_setup() {
+	local uword="${2:-${1}}"
+	if use ${1}; then
+		echo "${uword} = True"
+		echo "${uword}agg = True"
+	else
+		echo "${uword} = False"
+		echo "${uword}agg = False"
+	fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+#	local PATCHES=(
+#		"${FILESDIR}"/${P}-unbundle-pycxx.patch
+#		"${FILESDIR}"/${P}-unbundle-agg.patch
+#	)
+#	rm -r agg24 CXX || die
+#	rm -r agg24 || die
+
+#	cat > lib/${PN}/externals/six.py <<-EOF
+#	from __future__ import absolute_import
+#	from six import *
+#	EOF
+
+	sed \
+		-e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+		-i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+		|| die "sed pyparsing failed"
+
+	hprefixify setupext.py
+
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
+}
+
+python_configure() {
+	mkdir -p "${BUILD_DIR}" || die
+
+	# create setup.cfg (see setup.cfg.template for any changes).
+
+	# common switches.
+	cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+		[directories]
+		basedirlist = ${EPREFIX}/usr
+		[provide_packages]
+		pytz = False
+		dateutil = False
+		[packages]
+		tests = $(usex test True False)
+		[gui_support]
+		agg = True
+		qt4 = False
+		qt4agg = False
+		$(use_setup cairo)
+		$(use_setup gtk3)
+		$(use_setup pyside)
+		$(use_setup qt5)
+		$(use_setup tk)
+	EOF
+
+	if use gtk3 && use cairo; then
+		echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+	else
+		echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+	fi
+
+	if python_is_python3; then
+		cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+			gtk = False
+			gtkagg = False
+			wx = False
+			wxagg = False
+		EOF
+	else
+		cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+			$(use_setup gtk2 gtk)
+			$(use_setup wxwidgets wx)
+		EOF
+	fi
+}
+
+wrap_setup() {
+	local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+	unset DISPLAY
+	"$@"
+}
+
+python_compile() {
+	wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib
+}
+
+python_compile_all() {
+	if use doc; then
+		cd doc || die
+
+		# necessary for in-source build
+		local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+		VARTEXFONTS="${T}"/fonts \
+		"${EPYTHON}" ./make.py --small html || die
+	fi
+}
+
+python_test() {
+	wrap_setup distutils_install_for_testing
+
+	virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+	wrap_setup distutils-r1_python_install
+
+	# mpl_toolkits namespace
+	python_moduleinto mpl_toolkits
+	python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pluggy/Manifest b/dev-python/pluggy/Manifest
index fd7e53ae40e6..6209e4975753 100644
--- a/dev-python/pluggy/Manifest
+++ b/dev-python/pluggy/Manifest
@@ -1,6 +1,6 @@
 DIST pluggy-0.4.0.zip 19054 SHA256 dd841b5d290b252cf645f75f3bd37ceecfa0f36394ab313e4f785fe68a4081a4 SHA512 1a6e28df05751767df1ac3dfac4c29ba0367f05ae9c8c6a7f5163bb53de36f90226ed18baedeb41bc8ca23504ca61a9b32ef907d3ec3fee7512bcdf45a56d19c WHIRLPOOL 6fe852f807f8966d5df39a118871097758885c95c7aa1e722278704c8ccfaee14e6c18abf7e2033e4801aa0934a2ff0eb64ac3a8db5a53fc86841f6a9cf688cc
 DIST pluggy-0.5.2.tar.gz 18935 SHA256 bd60171dbb250fdebafad46ed16d97065369da40568ae948ef7117eee8536e94 SHA512 850b1a7b9e55d46d5deb16b8bc71e3f9d6c26b78fe34379b295a9780f3da8abb3c44f524f175d0392b61fc2d36d66d156db3f499a3c1666e2ff3e3c6344153cb WHIRLPOOL ae602eedb539f3e2b995edb474edf9de6a6637e6eee6e78987b43c6bcbfe8e9984beb9d1cbf5f33ac5e50367ea0a4ef2c69620fa3b776b0ed885e95b5878b020
 EBUILD pluggy-0.4.0.ebuild 646 SHA256 df0e85cad358fe18716a1e2fb7cf750b2acbe1ceca28559507a88abeb8eaeedd SHA512 8162cd6fbfa32f89b28219e4a8710e1b81047e76f4f0f709df0065f7210f3144db36e698efc4f8328f4286b6d872fe23aa19421f46786e63b9483f03fced005e WHIRLPOOL 4cf51fcd6e8f7a85f9cf6e63361beb112eba799fa2c6811aa07817d198a7cb09886fa748bb9a08066fb0290119f6f28c552749b9869ba354a8ba155e425eac3b
-EBUILD pluggy-0.5.2.ebuild 734 SHA256 0292836f1a277e55322f2370b8c873e8e9bb51b5f9205d620b306879f1076ce1 SHA512 772f0fb34d578a667a4946f5ff3d028bb96b354067eb77327ccee5715b848f50daa33652f1d7b2a80fd8d36c5aa8b789a4f1851d0208ec6dbbb2dd674d1e6b8a WHIRLPOOL 603875a1eb0ce34cdd5a7f8d3716b061352e18249bc731ad0366815ee744296395db6ae6b59f2a902616bdfa548347c3abca1b85b975ddf4ea3d6a7a7d498fb9
+EBUILD pluggy-0.5.2.ebuild 741 SHA256 38e00cb443a61b28bfa4cb8da8b4193bb4cba91fda3fb7acb8512f64669d254b SHA512 02c74e1d67e07e2a834afa4489df7118d402e40b0df98c40bf82d3461ce748c61942503ed41a07ab93c3ebee506f98bf1489853e3da327e35b0c4375a9a64730 WHIRLPOOL b344b90039a4b14bb734f51646d8f21bef888ab8c5b4507bac91260a62f44638acee336fc7af92ac0ff0895e5025dd7e0748f073439366b42f85010f158fbbe2
 MISC ChangeLog 625 SHA256 976ca4cc79431cc05aa6a8b6bf9841c1bdac49ec8c2b00c15f955af321eb0b2a SHA512 c813f93009204e2521c1413d8a2df6930ec7ce9a154fc675161aaff484e880a1999c8652a454ef847cbdd76612673ba525ad255438eeaf5f69b698f260255bda WHIRLPOOL 144e8aaa71c35a923fafc7dd95d75bbb3b8fbb2037018bce75585eb80fe7df7b0ddbf55e719b571dd1d5d10e00017189cf89766c1ebb33dd76ed90c269a38ef4
 MISC metadata.xml 444 SHA256 3d74ca22912b635cddc345092c6db3c5f60e861c8c5ee8ed92f4bca966d3b493 SHA512 2ecb5fb612627c44f3499080fcde9241daf2f25a974a8e24fe8190b7d5f8baa6a457b7a902e788f98fe9ed1fdb2cd0f46770337e8f836e430b0aa6f0d323ad50 WHIRLPOOL 7fe2f58f039036f5d73785c55f8d3a3877509719f4ff8588c7d8a01960323d1b0c21447987c7bcee60f0c2bfafd8dc7247496bef28dfbb1d952d4a28604b573d
diff --git a/dev-python/pluggy/pluggy-0.5.2.ebuild b/dev-python/pluggy/pluggy-0.5.2.ebuild
index 19a7a49c85c2..c880c006b53e 100644
--- a/dev-python/pluggy/pluggy-0.5.2.ebuild
+++ b/dev-python/pluggy/pluggy-0.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 88bc15af405d..a7d5ad4d4afe 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,3 +1,3 @@
 DIST pyblake2-0.9.3.tar.gz 130641 SHA256 626448e1fe1cc01d2197118954bec9f158378577e12686d5b01979f7f0fa2212 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e WHIRLPOOL 0d8f2aaf35a5eb0ebdedd9219a0ee8b126c93b11ae3e406ef637d8930a34783886b212ce50a33d677b0a19289cd32f40dc3da22a9a9fec108b481268f153d45b
-EBUILD pyblake2-0.9.3.ebuild 1349 SHA256 a1c4703ab3fe28fbdddb7532fe008f597d8ffee875354082fce493c119ab6a4d SHA512 5957a643ffab1129b76ee1bfaa284fdb5bd8fe12923d43408ab25e1649528d879becf082b45af7da4b901906267426fe9244a470fe8c2e070409100a3fd154ce WHIRLPOOL 63860ea795d0a7541781d92940d44d4e1197204a7a6074b73bb4fbe89c56bce7d229c9af0e508a9f0b50e7b74d363a6edda0fdb55dc47651c48f389cf9aeba37
+EBUILD pyblake2-0.9.3.ebuild 1355 SHA256 4bed48011be9b979c2a70a85b6257d518bb26c2b0165aff3fd5467a85e3b4faa SHA512 0601740ff2ec9d5a537d17465c1ed51a550d352a855f326d0f78190ecf8f3eb185537dd9de1b829a9152ff198d9fc574633f7cd9e626189cd1b390bbad5f682e WHIRLPOOL e2a454012485164cc3c3cdc7a961aed5f05885262da76573ad4b89fb6ebea06c113ea559b9bc6cf4ed969be5959c4562983ec9695a9d9f0f281e74c6e91caf2c
 MISC metadata.xml 452 SHA256 327935068e4b2311b5db81380ca0323b5bcf8b0769fce733e0407500bcdd58f0 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff WHIRLPOOL afc476bc3e3dd531ec5e886e0180bd8a3a78bc274b410c6f54fbb24ab761c0e9bd95ba7bb5507aff0c162fc69c62a12dd4858e688aa21bca0e0b48509f87c3e1
diff --git a/dev-python/pyblake2/pyblake2-0.9.3.ebuild b/dev-python/pyblake2/pyblake2-0.9.3.ebuild
index 619cb27c3cf6..2b9c9f31ba3d 100644
--- a/dev-python/pyblake2/pyblake2-0.9.3.ebuild
+++ b/dev-python/pyblake2/pyblake2-0.9.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 blake2_impl() {
 	local code='
diff --git a/dev-python/pyinotify/Manifest b/dev-python/pyinotify/Manifest
index 29cf7378e1c6..cfce3d8e818d 100644
--- a/dev-python/pyinotify/Manifest
+++ b/dev-python/pyinotify/Manifest
@@ -1,7 +1,7 @@
 DIST pyinotify-0.9.4.tar.gz 59604 SHA256 a09767e4e0610e2e1e9f9dc89483b0ee4a53764e700f5866a570bec51d003fec SHA512 cdaf9f239a43e3889cdca0ebe1e3559bf6411e4cd829120cc2199cb91122bfe4af62f61a9bf297de28036716f974abd4d7bbeb210e22e96245781fbad08a2b75 WHIRLPOOL aba8f4e4fba5e684e0bade9c3a02a24747f3af4a441209f138223398860da8fdbc6b52546f6cd55134e72c69e6e15b06e45c50767b13ffab6f12afa4484cbfb6
 DIST pyinotify-0.9.6.tar.gz 60998 SHA256 9c998a5d7606ca835065cdabc013ae6c66eb9ea76a00a1e3bc6e0cfe2b4f71f4 SHA512 b52de43293b06b32236e90b7c33fac061f3095cd7d4aecec89a099d56020db1a85440ab9dcc8b521238c001fc49a1f37d1b16d621bc1acab4d7273aebcaadbc5 WHIRLPOOL 19e5c96528e3092d9a0e08e4853afc1765afcb0b286875e9583c703dda066c8372def076416158a740b248ade21b14314464232bdc70f210f306f3d3ca5c4a7f
 EBUILD pyinotify-0.9.4-r1.ebuild 688 SHA256 f942cbcda514c3a9f7c71673bdc9d803a73b7fcd4940a41c92ac80c2fad9bbdf SHA512 000640c3eec6e793aaf07be397dff70db879dd3940abaf3bca24cd3fc8f47d0b7f26e597984a76be775bda8372855bcdf2e23ce524bb40290b86960f393a55cb WHIRLPOOL af92d7669d9ea5301b0c3357514cb639c853681e1b128b05ecaefd7b5261f0ebeae73491a433392a32c79464734258d8ddceb8982dbfdabaea3ef119751388c0
-EBUILD pyinotify-0.9.6.ebuild 748 SHA256 9a6211b5e7eb363c76a5fb360864fb3f3066d549af41dcc09c53a1e6d7adbbb6 SHA512 26753fd51f779d97404ea832e2c7118340322d1cffedd05da867b0b589fff4416a5c883ef32e0b959b6207c4ace988fdf09da71603e9313925eb88c16d322a5d WHIRLPOOL 294ba0e39e32f25e7a69d7a19bf89ff84a3e59d68c690d2e8d5f7ab3b8dd6d3b5adbc0909cffc18bae344781991c64fa70b446020063a6ad646bd7d797c9ae4e
+EBUILD pyinotify-0.9.6.ebuild 761 SHA256 1e2f0c2ec971ba3c09cdf0e4ba1aa98489169780ebf4c99267fda8923a953de9 SHA512 911c02716782b9b44ae02585fe9260e25352f51b5ca87a692bd21698846f443a800b546b88a7b0baef5040d7b5042772835b4da7a89b80af68f839d8a80f95d5 WHIRLPOOL 59c0965c600eb66e05644cea0c43c0b7de75c139345d00279d67a908131764074cce237dcd9b8ac19d7b8a50c41d735b10fc045743c9038dab51a44990a04522
 MISC ChangeLog 3528 SHA256 e964efb0ab624f64f26987da93c9cbda885083d6f9a7540dbf5ae7852dee83d0 SHA512 3b99109008e4f6c8b640fe38a139be82c4568ea9ca16bc1a91da9ed909cdaf4875cab36f66543fd26fe69a51fddd48a4eb9a873b4c3cafe97e7141b17e7fcba8 WHIRLPOOL e4d557ddbca0aa516826a213b3074246c09466b7af3b81823a53e1b1fe725ef4a1998dfce6584d356dcff4d1f0faf378c4f4a0bb6db2bc3f2314879e10a4bf71
 MISC ChangeLog-2015 7853 SHA256 da35f50a90c28f626ffb47368a63b9246f66d434ff5bd863038e31e33193b2f5 SHA512 85e96794dd3bb632b90d6047f9d684582245a7782aa1254749c6f1373689ea95313bc8663fdfe03aacf6a8cc87075783cd466e9f43856ba85a7f658ef238cae7 WHIRLPOOL c4c7c45550f2ae3d0b0864368a06808bd4d46c9440fdcd46c7006dc88e8cbd8d0c71b41888bc018a66d898813d8def297f75b5ca8b036ecfe508f5c47e44f71e
 MISC metadata.xml 240 SHA256 07a76e79a43ffd9aa15de0e4ae548ea85aa5bd165c4602630c3519e60f113ee6 SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59 WHIRLPOOL e3e059953c7c36bd942545f4e2a0e94ba938a17fe2bd04df81b137c185e64a213152c11918922563509e4767e601b41105f80c5983a87ee4d6be7704bcf7cf54
diff --git a/dev-python/pyinotify/pyinotify-0.9.6.ebuild b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
index 6d1f0d41c2ff..b00951fdc6fa 100644
--- a/dev-python/pyinotify/pyinotify-0.9.6.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://seb.dbzteam.org/pub/pyinotify/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index b493c0023fbe..8a65c7dc3ea1 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -16,7 +16,7 @@ DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 de4bf05df47f1349dbac97233d9277bbaf
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
 EBUILD pypy-bin-5.8.0.ebuild 5819 SHA256 a328766890d2a892513e895518884de98f67d3cf7429aaf18bcd7e182fcf872e SHA512 8ba2d88b641b86a6b7a64f271b56a80aa98139307bb4e294cba6f4ed34a0821a7fae66ec037cbdbf6a6fa00b2d381044b81b24c3f805345c2de77bac0e60b7cf WHIRLPOOL a877c7eec69b9020756a8e0addbc854e2656f897adf476f3fca341a7ed8e24061476843a551611dc6df6b5db1808a5692aaf9e99a50c65855317ad519ea9af3a
-EBUILD pypy-bin-5.9.0.ebuild 5672 SHA256 48d3ec8dfac15e52212e697c1f0e875fd8482c2c682d8fea9087112d01e70dbf SHA512 344ed0c59b61d6a31021b811e68b5c74762d96286ad21dcaebb05f18ce6c7a32d501d6a2d1df577fb0e6a275a40e2be2c328465459741487924a259895752185 WHIRLPOOL 1ab2cf626a999b039605a8f76c35ff773936bd4590f0f57ed4825c5a93d019014916f1b736a1c824e1fedcd60ed12fd1e05f3fef912743e0a92c99244f270ab2
+EBUILD pypy-bin-5.9.0-r1.ebuild 5622 SHA256 dd4770fdd799f326064f30aebe63e32bef85d8e99a07216ba28aaed0144c6479 SHA512 c45a9028cad1fd61259b114713f05122ab4e3d99fd8f9a77a1f9e506b07eedea72590cb16b1b808b6be618c978e4885b41ff3f46a35ac9d9c4007905f3f1e803 WHIRLPOOL 091bd654355eb810f1ef943f66e96611ea308c7fbae32f9394d1dd9885696f20479be8e706b5c1021d619cb2e87b51aa93b20f90e78740a7634f3ef600d46ec6
 MISC ChangeLog 9199 SHA256 9c47a49b40abc59f48abeb8422551c11d6fd22baa080d4748c480f998e4ab4b9 SHA512 f29475889f803f8e330e2811bd96aebb6bb829ca8043056ca539edacb6d513f772dd4b192a85b995caa626f468ce5bec3f98acbc8dcf41f54f16cebaf6783325 WHIRLPOOL 4231ef2b20556aa4e6853f40f1f89f58205206ea069204efe33ec2a2a5553e3e03d83c3e21b55226b64c4ee377d747b0e6352cc37f0e3b7f93c2862bd3c6ada0
 MISC ChangeLog-2015 7187 SHA256 ea84ecd028b95b790792d4f80386a8c5884a667de5de21d37747412ac6868d66 SHA512 afd832969505f5ea599a10a629fe0e068c3282d5b8f3d880dc04818e25034c9df1821b0dea2b623b91ae6561ca82ec9de6c4907badcc2befc2230dec986c9302 WHIRLPOOL 05c59d774d47ac5eabd74c1af2044ba0c2d2fdd0f4b3bb8f4cc9914c65a8133dcf59ee047c13d676783a84b28a4ea9c2fcbd9c910ec6057581b9c3ca227ef410
 MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb
diff --git a/dev-python/pypy-bin/pypy-bin-5.9.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.9.0-r1.ebuild
index 0ebeca4356ff..4ef3618ccdbf 100644
--- a/dev-python/pypy-bin/pypy-bin-5.9.0.ebuild
+++ b/dev-python/pypy-bin/pypy-bin-5.9.0-r1.ebuild
@@ -37,15 +37,15 @@ SLOT="0/41"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
 
-# yep, world would be easier if people started filling subslots...
 RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=[-bindist]
-	sys-libs/glibc:2.2=
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/0
+	dev-libs/openssl:0/0[-bindist]
+	sys-devel/gcc:*
+	sys-libs/glibc
 	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
+	sys-libs/zlib:0/1
 	gdbm? ( sys-libs/gdbm:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 228117691617..10612eab0d7c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -8,8 +8,8 @@ DIST pypy2-v5.9.0-src.tar.bz2 19175394 SHA256 de4bf05df47f1349dbac97233d9277bbaf
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 SHA256 271835eb36125d09cc5e904ef23a5263acd8e5f513202a8d4f8a9a0f64fc80a8 SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad WHIRLPOOL 6a6d8b099fa814839bf5b3455b3889205c649ef522b35c3a501831d63d0e916d7747b83ac9b8991f8f8c34b328478d84cf7a12a32161ce0fec37204f9c019e2d
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 SHA256 3567feeb8f0c66161efaea1922bbfe4e71f6051533ef5f54a74b6ccf9e0359b6 SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1 WHIRLPOOL ab77023ac66def132d1dce72f98add3108fd7be303ef5b167a2374df3a94949c75f089dcfdd84ed05a5eb813d6c22cfecd0de03b5819817a20b04f30030f5f6d
 EBUILD pypy-5.8.0.ebuild 7705 SHA256 4e058cb539b7735bdc0729941b0318d8f00120e913a2081222ec5e7b0f586f6f SHA512 99af9fcf702a83353b3c4c582ef0f0c3b3acfafa4239ba3599279ecdeb7cc45c7783234dfac2af956352de35e61b925ff8997772f242e408dcac59c3e9ced90c WHIRLPOOL 5e4750964256829e9e6b914aad54509d7bbfc7c59b91c3bcfd4a61d479999da23e97ca41863c8c09c17337b5889fd93230c8059e7bc00e2da22b1e12b331a63c
-EBUILD pypy-5.9.0.ebuild 7627 SHA256 d8a048df483a69184efe7ad6354fcbc6897a1a12c39006daf2ebf0ce50218f47 SHA512 a90e86ba1906573dbab8a897ff0afceec07fa2127bb2cef0c249285f5ede0bdba102e0ec6c818ad55bb83c5db62de1881ec0a7173b18985575c29ee4b7ed62ec WHIRLPOOL a0f09bca13f7e490f472fcc2b348582f132df36a38a5843557b9eab1977f48f8db461a959bb66d402264449c2010efaafc167184c6d408ffc3aa8d26bcadb2f5
-EBUILD pypy-9999.ebuild 7637 SHA256 0bacf767aab159b04beafdba355c63ec28b5c36ae1ef035dd940338944fc7685 SHA512 32bd760b59eea862c73e4505b0dc73e0bec2923f140d6237a06a0ddc009c113ca00fc3d38499606ed8f3ea01b29925debb7ad3523a9f154f598c4d22250dba8b WHIRLPOOL 1b789838cb6ad8fc96f8123239160a370787b4508c4e123df01b2bd00b79f22cbca10e55717e44a8eee0666d9fa6fdea02075dba0e3f9667ece87eb6b092da39
+EBUILD pypy-5.9.0.ebuild 7929 SHA256 743ae622b1980b9f5365a0a34870f249c9e7d8b35e0ef8177c9a66775618b292 SHA512 7ed85a912a9a882742e8531cd80b4a7326d19d22c9536e1cfdb71ffdb861dfb53414e8d377fd65cc60d328f5e847d8c306c64290a6c833065668dba9b929589a WHIRLPOOL 3c0dfd61875b7615f7257fc64bf07110541027f9b8073a0597468a23800ba8de8b5a02e7a6af7b3cc6983044636774da89e8543771c29eddd8b3fecea333d593
+EBUILD pypy-9999.ebuild 7939 SHA256 8f2bdae1295e0ea440d97b6fabd6edcfa30012477a3be0e9d397b0b8419b9ffb SHA512 deba6eb9469c73b2afab3c0c4ca747b3302d4461f3d2c94ded449a9aedb12ae480109a18aeb0324368eb9810ebb7ee9d5b1b45882b6d1a8dc96419e0383400e8 WHIRLPOOL 11071344e5c3088a9a762d42663d4c93045997a54325766043a6c1e380646b258261f606df551caed8a6cfb17590d5026ed6583882e00170eac6d6fbb3d4d15f
 MISC ChangeLog 9456 SHA256 2c487622b9a986cf7e958164a53f87c23fec4c87fb491b0d04f5dd96f17f911f SHA512 b639ad32b6eb4e456547d2df9cb739f88e736760ccba2bbbcf044b9140991d2b9a58944ad79dd8199a20a444cd0da79b8a0248f9072d1c4e2fb2e6f299f924ac WHIRLPOOL 6cc1e181530a5a48ac39b6adb8c52d01bd406b7e94f8cb8bd874d25b1eb708c4ee77e52e2bbcc7b40e257e86d1dba3e6db9be387828578d0d28d33b73b0e63b1
 MISC ChangeLog-2015 16042 SHA256 657b5025da42db387e3dd4b8ca2b081412e2fbe4ed95d6b633f7058107538777 SHA512 9395cfaefb8972adb9cc709884eec37094387490fd26b1ed51b45fd957348174f17dc577e826e72f758b4ba215d12af3c7c79989187280d8d58032966571ce4b WHIRLPOOL 69229bea7c34d0c718648dedc4aaf1d46e540961f65a577290649b3f799fb7e47116b2bc55d39b00a92291e21755440f0024abae2053217140c50b5b9f145880
 MISC metadata.xml 636 SHA256 f73161c46ef3c8187a80d861f0c29e04816b04b2f5c7fbd56b8b7ff140459c9f SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 WHIRLPOOL 8eb2d191fcbb21aeb2e8bb10672a066165c809aedc45cbe4e7cbe00ed75db009cb95c16d57d7e87d80e6de5c3953e4742bd68a21a58367ae92f4efd9b8a8e794
diff --git a/dev-python/pypy/pypy-5.9.0.ebuild b/dev-python/pypy/pypy-5.9.0.ebuild
index cef567ec30c9..ce877adabdf4 100644
--- a/dev-python/pypy/pypy-5.9.0.ebuild
+++ b/dev-python/pypy/pypy-5.9.0.ebuild
@@ -36,9 +36,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 		dev-tcltk/tix:0=
 	)
 	!dev-python/pypy-bin:0"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
-	${PYTHON_DEPS}"
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-python/pypy-bin
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 08bd414c5901..805c5e7f777f 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -37,9 +37,20 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 		dev-tcltk/tix:0=
 	)
 	!dev-python/pypy-bin:0"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )
-	${PYTHON_DEPS}"
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-python/pypy-bin
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
 
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 2af72b456b1e..76885453146f 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -12,7 +12,7 @@ DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 SHA256 13c47cdd603d647e8a5
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
 EBUILD pypy3-bin-5.8.0-r1.ebuild 5345 SHA256 8737f3cd44ddfcab4482136f839bb9ac57c6a141b5200ca3e50efde9151bbca9 SHA512 e3d34a52716a66b42e37c77dc7d4b3f98ac7a80bc511156fd63ce47c65f549441a1b96667df58d9c2bb51e3b7280244c8619744ba9ccfccc06b73df365cb2d1b WHIRLPOOL f0afc372fd717f09023b650bb1bf5babe775a121357f986683b47add213aad924436cca6243b916f4dc68dff096f1d5cd1c30fb1d4917556aa613d5b433f2aae
-EBUILD pypy3-bin-5.9.0.ebuild 5665 SHA256 11c7c48e243232f10f41c83ae577458cfddab1c3bd8ecabc42ab83402920e1cf SHA512 295ec4adf05e9ee18609b3ebf358ad636d0a8edd6724d3ad99953ae4bf2ad3e983754b59dfc7298f7fbafdb85c6a6b261040142b8a49faf8abc3342cd24a8686 WHIRLPOOL f210558fd0c2abeba2429815f75956d1616d67100bb6d6e1e80978a617a2a63db8cbadbfd3ba4892fa901a48f7dac35e1397a830c8f9807f7a2809b0f312256d
+EBUILD pypy3-bin-5.9.0-r1.ebuild 5674 SHA256 ef69ff2e49e8323996c492b857e8cf7ce25cc1595080d590c70865c547fe940a SHA512 401d081d0b073b8edf1799c73b4355755097dcbc4e048e7b859b4db84923e6f4f6dab5fc16565f9165719ed03d5901736a066105b2434283ca22dc42a6a0dfe8 WHIRLPOOL 3fa5b54c68972808d72df3475f0d14bf247a3dc86069a7e32ab02a2504e79360b840a50628f4036d0edd94b61be59b922d87e6cab79cfe97e7a6fcbb8d649323
 MISC ChangeLog 7700 SHA256 ba2326f1007aebe17871ea81213c69cc07c7dc334bbc267a50353ba79c0c4197 SHA512 e8b2817533bcacc09d120de24278ae3731235f26ce7120fb3f247fb202657667cf4b056e005786b40d2462d6e65f74dc94175e242f209725d24285192b64c2ac WHIRLPOOL de020e520c4befef4ca2bdf167d28ec7bd1b5ced194ecfb58c05d086e77c35abe0e17a20f4a65750c221aae0d1ca76c1cbbc524b9251a97584096aa5cd92ec65
 MISC ChangeLog-2015 975 SHA256 9ec6d637bd1373be724ded99f8deaa041e5587508f68cf15c8537f25235709fb SHA512 58290569acccc81298a0793b797e858365767629c94bc6d8b08790341cfa0c3efd6116c6c54e4585d65d158256767dd762a3eae431b8f3c0ca6571a98bb0bf34 WHIRLPOOL c52470823ec3e6e5b639fe454c705de58d02fd32155b72e49ae8cb94775839d9aee7b0b096f7128bde80f43a78dd6590a71daafc9bf52524161bcd548fc50947
 MISC metadata.xml 317 SHA256 2aec924d1dd9649258f8fa5468e176864976d3516e72cd7a5828a485f30931a4 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294 WHIRLPOOL 9f43842af1bdced8a7ba6b47f57def4960f066272a625063b508431c007ef51bd13149afbb3f1a136160778ee3dedb4f5f4b98f43e0edc22c7c714ba2b3481cb
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.9.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.9.0-r1.ebuild
index 55abb1af9eeb..9f1abcf1f689 100644
--- a/dev-python/pypy3-bin/pypy3-bin-5.9.0.ebuild
+++ b/dev-python/pypy3-bin/pypy3-bin-5.9.0-r1.ebuild
@@ -34,18 +34,19 @@ LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/59"
 KEYWORDS="~amd64 ~x86"
-IUSE="gdbm +jit sqlite cpu_flags_x86_sse2 test tk"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
 
-# yep, world would be easier if people started filling subslots...
 RDEPEND="
-	app-arch/bzip2:0=
-	dev-libs/expat:0=
-	dev-libs/libffi:0=
-	dev-libs/openssl:0=[-bindist]
-	sys-libs/glibc:2.2=
+	app-arch/bzip2:0/1
+	dev-libs/expat:0/0
+	dev-libs/libffi:0/0
+	sys-devel/gcc:*
+	sys-libs/glibc
 	sys-libs/ncurses:0/6
-	sys-libs/zlib:0=
+	sys-libs/zlib:0/1
 	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
 	sqlite? ( dev-db/sqlite:3= )
 	tk? (
 		dev-lang/tk:0=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 246b6dbe509d..683bdb925fc5 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -7,8 +7,8 @@ AUX python-3.5-distutils-OO-build.patch 3627 SHA256 9b0b86d8424304fe87a460bbf5ab
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 SHA256 9d090127335c3c0fd2b14c8835bf91752e62756e55ea06aad3353f24a6854223 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a WHIRLPOOL b7567fa21e3ded400a72ec06197184df37e0b5893adfb55622ea9afb668bfbda7ebbecd9b80660efef42f160838966d103c4181a9b07355e873981b35f4bf104
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 SHA256 a014f47f50a1480f871a0b82705f904b38c93c4ca069850eb37653fedafb1b97 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd WHIRLPOOL e0936d56c64c3c077910c4713295010ec3e0fabebe654115ddf07407884d1564db7de2f85bcedf1226449c516085f3e4814a2c523f0d48e3ad8ac21150a93a72
 EBUILD pypy3-5.8.0.ebuild 6832 SHA256 355980a2bb1518191b5d5b409095b331cad0704b92165a5d5868fa0e34dc0e7c SHA512 30b57bc1d62d7e30938243ac4d4970b29d41423d6bbf0ef8430e96d038a4c1ef7300294af1e83f6450f3e5fc0f1458dff25bd554aa82ab4de1f585a6d4185186 WHIRLPOOL 9a39782805102c41558015cbcb6a13d745af5191ac2fa8fedeca0d7d43ebab2d47ea0a88338b9f12f041ee576486e3a52198382e9d33399ae69d67e616b0e6c5
-EBUILD pypy3-5.9.0.ebuild 6854 SHA256 1f9fda45b1f79f36c40cb227a9cc4f8e82374cdb0e346da4f576ba74feb96cd7 SHA512 b1234244ff71d78552a251a292c969ef8fe6b3b2083c1d1b9dc014ce68f91ee713bcf9e51c4a8f4b6c0b3e6ec94e7b85ee9cefb43b3ac3789da4f7175f8a7cae WHIRLPOOL 8773f2248da993d235b5daa2f755d8bfcf5d2169ef99c18b3da178e5adb4b1970374c577f4ccce39fa15e9ecaf4385639431e97b5740d3ad77d87ea370a18831
-EBUILD pypy3-9999.ebuild 7444 SHA256 664f45490474a795a90354de882e4574fd9d31d2b2d5899e099cc7b515a11e37 SHA512 4447381b0c4bd2b7630362781ea7a848bc29720cc0eca475ff8a1708af1ccb7caffd19f1719636f460a12fd3187d7fd3d910cd569a6643794af5c8ac942fa4a3 WHIRLPOOL d73c096860181dbb125b054af20f56820666057b015c63096eed99485d16df18e29754da90df9b81b005ad450f8467ffa8c97873692e12702a3d12383278f172
+EBUILD pypy3-5.9.0.ebuild 6987 SHA256 78d170540c0e99712ff10789b1f70ec2c9c7f37c1f4ca8933a2137e13a8c8a56 SHA512 1deb6b852c20211d754c4a0216de596b3118a0b5189df18fad82a00701209610b2253089257160cc3b7cbb2655b22f7e6add4e57c8fbf8bfc88f8cd17acd3725 WHIRLPOOL e9e370000f73ac91ad338e20582fa8ef6f39607376667e74ce224c2db44608c253ad12316584fe87e4f62439bedd984500600b4a7589ad53ba24626ef1150f02
+EBUILD pypy3-9999.ebuild 7577 SHA256 182cbd59a5befd025d3ef047d151deb51fe351ab216b204be76e4cd9e5dd8679 SHA512 e484c243b4790b59015aa2ed088a50557bb5cfa476520ed503147e6372ab0cb7598225b5d6ab67d3dee57c8266eef431ffbbc06c645f9135afb880bf1aa0fb6a WHIRLPOOL 4eec41db0738524ba106d3db4d77abdeda805c91fd3bcb063876e7820bb1616fded5981fd68fa588acee225e8633c53dfef45b67f1ecd26980ae3418baa97f26
 MISC ChangeLog 7714 SHA256 43954837f6d63a6ac2fa2e265b67bbda3937f9279620f08c62d8b6453ee63969 SHA512 6d51ee24600930fd9788432e3ace144e3699858fe1e3a6ddbb0076f7fff291b9792e581b6e2afc48e81868d43132bab96271a0397511afe03ce8a4c6bb54871c WHIRLPOOL 2c54a361b9007165f2b2ebd0e097fb040d539ceb27ee88b672654631070145645b445f697ee206463b1c80b85022ce52854e1d1f31941dc74a57051e72d401a6
 MISC ChangeLog-2015 1344 SHA256 7977d9be34ce1b3faffeb354d9a2acded00259e353af50632e071b43b026d8e4 SHA512 49ed62552780d9581a2cfe1b78a68d1a3ed4de603729fac05346148c00de9ccf66f4b2aaee38379f209a1ad8dba23b3a0fd773aa315a50e01258960f29796b28 WHIRLPOOL 95cf929498ad50c099b66f6c7b5f036d15ffc53b6c1a69fd60f0a529b104ec018ac2f676fd62b6b7cee4a7fa7fa99389437edc1cdd5efe3c2cbc4df957f6d4bf
 MISC metadata.xml 636 SHA256 f73161c46ef3c8187a80d861f0c29e04816b04b2f5c7fbd56b8b7ff140459c9f SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841 WHIRLPOOL 8eb2d191fcbb21aeb2e8bb10672a066165c809aedc45cbe4e7cbe00ed75db009cb95c16d57d7e87d80e6de5c3953e4742bd68a21a58367ae92f4efd9b8a8e794
diff --git a/dev-python/pypy3/pypy3-5.9.0.ebuild b/dev-python/pypy3/pypy3-5.9.0.ebuild
index 68ba1a3ef97c..d81c5775b403 100644
--- a/dev-python/pypy3/pypy3-5.9.0.ebuild
+++ b/dev-python/pypy3/pypy3-5.9.0.ebuild
@@ -35,8 +35,16 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	)
 	!dev-python/pypy3-bin:0"
 DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy:0 )
-	!low-memory? ( ${PYTHON_DEPS} )"
+	low-memory? ( virtual/pypy )
+	!low-memory? (
+		|| (
+			virtual/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
 #	doc? ( dev-python/sphinx )
 
 S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 92c2f84f5b09..5be752f1fc4c 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -36,8 +36,16 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	)
 	!dev-python/pypy3-bin:0"
 DEPEND="${RDEPEND}
-	low-memory? ( virtual/pypy:0 )
-	!low-memory? ( ${PYTHON_DEPS} )"
+	low-memory? ( virtual/pypy )
+	!low-memory? (
+		|| (
+			virtual/pypy
+			(
+				dev-lang/python:2.7
+				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
+			)
+		)
+	)"
 #	doc? ( dev-python/sphinx )
 
 # Who would care about predictable directory names?
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index e89333365a40..c4574fe59916 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 632 SHA256 c2f4a95c55de627ce3578526bb4fcde16084899178b986f65c800f67a2422f4b SHA512 ecde025ae55542036f69ff71dd833913cf64a56481366ff519d631fd21029fb920311491c79cc97b0ff616fa8c9197844b8dfd9133034587905f296c85d97179 WHIRLPOOL 962322c37b926812d6738133da5a560e2181cc61a3d00868551a92899d0bf58709ec4a22a4a5232a7a24802b05cfaaade19414b7616e505bd8077c41a1cb69b2
+EBUILD pysha3-1.0.2.ebuild 638 SHA256 b4cff982535ccc6ef26e0db5201ec90f4bbe84874d8f6e9e2ed294c41f0a3d42 SHA512 1c99e1b1a4dfa7760f8ecfec130e97fef86541c0444da217e18da3a6e81676365f4d86700082203981812464f918f548dafc71e8253df2df5097a77f135a9c2a WHIRLPOOL 575ec67744d9cf3a965d5d9819cc351c975d4bde18e6a17c315d1dfd720904863feec7d02b9f2d77983d6a6c34b8a4977c9f3ad9c91a10f5f1bbdb25a3710ec4
 MISC metadata.xml 447 SHA256 20e1d0abd801718c6a7145bbc1f8bfe93ba10ec12c367ce2aa50830655f9f93e SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d WHIRLPOOL 56a1d3524f24596aab3bf5f1fdddbf48a59c33e2532eeda65f14971d5da1ae2c026f3ddc08bd07a39d24c09684ab69c2a8b61d2f5c67d363cbdb6afed39bc199
diff --git a/dev-python/pysha3/pysha3-1.0.2.ebuild b/dev-python/pysha3/pysha3-1.0.2.ebuild
index 30759551bb94..1782d4b8865e 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="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~ppc64 ~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/regex/Manifest b/dev-python/regex/Manifest
index 7545acdab59f..f89519576dee 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,7 @@
 DIST regex-2016.01.10.tar.gz 574017 SHA256 02a77606e3f4a0a16a2727ed8f067681635a56221e8fca863ff64b196d5d79e0 SHA512 4f4700ca746763f857449003d32d56b5aa8069e3b71b160e719633b0cf00f80efc0766d8e1e193977278f91bd3e73c87aab31bee23aec77557ac9b3652ff6a2f WHIRLPOOL 9d493c0695b5920dfa71d94636d9f2952cbd5db97f60ae68c30fdf81fdbdab05c4726a41dae036541de694ec1ca688acdb20eaa48e514865da26c9a9569e30a0
 DIST regex-2017.04.05.tar.gz 601638 SHA256 d811874ed669165fe1059a54f860db5c6ab5f48100bf4945d915fd2f877b2531 SHA512 4c3e440e11f57e2323892e10fbed7f2c89b35771fdc970164ba69bb154dde535f6edb51a0997c924eb776c61e5efd1d04001abd343110518a89b5b7bf148ae49 WHIRLPOOL 52f9f16312efb2f9a7c3d8995590fc240e4a4c8326db04eea4d45cfcf49e255d273ed78013f1736d35366e97adbdc8388816d24c955935a1ca941a09680f4435
 EBUILD regex-2016.01.10.ebuild 1154 SHA256 aba7b0cfb993fb3c5582817d4799700a2b54bde52b339e1b6b66f5c730c561e9 SHA512 aebd29d84c8a237ef3d544ef777be950232aedcb9b9a6c48482eb03cb4c991e56dc911f75c1da1849cc42239eea06f2e968573aaf03f405f60a50daea11e0d39 WHIRLPOOL 384058fd0544eb16c242c5d31dfa6cc002213079ef312e81b4e3da88130ab4145cc9b9f91f2d5c05bd1acb51e12d621a0f09c0ca0b546937922567b3bc7a47ff
-EBUILD regex-2017.04.05.ebuild 1196 SHA256 5a1ba3727784e08f14846f61e45cd1030b67d09b850e1e4e69d6eefc162426f5 SHA512 2c06f8ad155fcd571b534bb69720fc9648a0f6b0851f8f11134b321e7ce2e572677f0b7efd560a6729c8c3e0ec75a442769e1ab8536f367766d3600c6af01ad2 WHIRLPOOL e0c75fc0248f56304857d0766932317684fdff5b58b0c5be80a601d5f3b1cc7ae5f6dc37ed3cd40a83efbaad6f4e28c91880958bf9b179a16823243a636d5537
+EBUILD regex-2017.04.05.ebuild 1202 SHA256 f209e9dfe3012e24c550c23bd611992a71d99bd2b7da300146ff64956c93ed55 SHA512 67cf74abd813efe63c2b8205a96ba8aa6815cd3d55908f0dbc6aab5fe5d1ad0c82334b35adc8abd0d90711081ccca6b1a239654c4f78240db23a841432d42072 WHIRLPOOL dc4c96e385880ab1838666bb536f62cef44e1dca1836c6ad6bf16b8db900235bed009f7e806283eb271872ba722bf9b0ff1970b0c2509967a70eea842ddd8815
 MISC ChangeLog 3394 SHA256 543b47b13f49b5a62d2cb1e4b9975ac877172d140435d7633fe7dde66e21b26a SHA512 4ab3d0018076bfbb10f362e3f9fac88538d0d7498d6958d3d0e471d59b3b85c310f251d85b2cb44d29132624eddd9fc311969bc46dbe689e6f0e0093fc53112a WHIRLPOOL e9c3c98f5478a43b4a92ac71df6614bf0099cad6bd4708ee3ec9f6341f2c37f42ef4caa6cc01398c9f80d4914b3f02f947d82f19d0f695dc1da08f7fbf9cd1b1
 MISC ChangeLog-2015 875 SHA256 6eaadaaaa905d55526a8ef169a192234b1fb207464e51d24ec9b1f28dda11d45 SHA512 cb2cd43587d47a4dc9eef9883fb32284dc21f01010d00acf58b5fe0822c8a9696e9e0ee16990dd634eb87e8341473d3428e9d1913fcabe7f060761d6d7c0c219 WHIRLPOOL 6ad28fd0ed96bdd5c2e2e9b7e83c09b60ecc5576090c89fde244538203bcaaaa963d4acd095afbe2b758e61ed10b26dfcafb3a13971b54ab61218ef7ad6b3f73
 MISC metadata.xml 384 SHA256 fedbfc6d42984e31794e3dbbed4fca94f2b324304e4e2126ce1a0a16353b11f3 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07 WHIRLPOOL b6c0fc493c3d23eeb2d14b22bf7154b48efbca10ab244fd97be50bd94a3d3b189f9d52daaa9b122f715c3786c3ada47a933fd7d7e01bf95771d66357a06ba88a
diff --git a/dev-python/regex/regex-2017.04.05.ebuild b/dev-python/regex/regex-2017.04.05.ebuild
index d3a7cebda51d..b18fe2176113 100644
--- a/dev-python/regex/regex-2017.04.05.ebuild
+++ b/dev-python/regex/regex-2017.04.05.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DOCS=( README docs/UnicodeProperties.txt )
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 2814695ea5d5..957ee4b785c5 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -11,8 +11,8 @@ EBUILD setuptools-35.0.1.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2
 EBUILD setuptools-35.0.2.ebuild 2035 SHA256 0168ab06838a36702973806762e30cbc72a2a4bd55662898f0cf7af8f9175cc5 SHA512 bf2b6cc66a48202471b0c904075376993d26edb0fe4cfeaa56c44d4610019f359404810d4bceff35fb7cc3f5e7dbeb469f69dfa911ffa223cfad51c8e6d18eb4 WHIRLPOOL cfb66cd81c642f03546f01395b2ad1e67a5797c0a97fc701ee2602520ef827aaee7b344bacc79525edac4026120610c5def45768fcc18e388642391e18d10f3d
 EBUILD setuptools-36.0.1.ebuild 1902 SHA256 21e17a1e229890cd6bb9e86c9c33bc16fc04fb0e9196341d7d1b1eb1b11bc521 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b WHIRLPOOL c45c02f0e4ee088e6e44fa076abb33ad2317f2344777247eaeb9b33cf3af5105c9b45632644769da62d1ea00cc9865d264ac15b70121b3aea015c6dc9802abb8
 EBUILD setuptools-36.5.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
-EBUILD setuptools-36.6.0.ebuild 1791 SHA256 bd91c146723054ebfb78d33811b3f998b08ad52c002af6f37205dd0b00e94fba SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03 WHIRLPOOL 3b9c38ac6cf7b1ffca735c5c566b96fbcf1171097f244477ceccd22e2d4970017ef00d512c0525ecd1500f056b2b3789788ef096f0fab5e08ccc9add98441617
-EBUILD setuptools-9999.ebuild 1896 SHA256 27917cfbea477fbcc04bab18db0547a18d69cfb9825eaffae785a4bb1a937547 SHA512 4a88df7828f94c34c4131626054fec2d6fb1f1dcf2abe48ae872efb0d020e07fda6c6bfdc126a53e4463d1e7f932f84bf24d992913726dbbe98488d539f9ff64 WHIRLPOOL fd6ab34da65bac9a0bc60bb0dd4fce0ef51920a648dbc87355d44a275e3a2a089be651210a8356330c413289da3323fef2ee3070e594961c761c80d87ca72aad
+EBUILD setuptools-36.6.0.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
+EBUILD setuptools-9999.ebuild 1828 SHA256 439ba0542110b7a37f7c67f997c9f9ac3d84bca817c0e1e8b01b467bbefeeb5e SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c WHIRLPOOL 8ee243dd3d9de88589dbb07b8bccbaf3669ed3bd55090f2bca3305209c02dd066fa3e592e014ed9f908e88b5d81f2b3f6632ac8a7c63781ed547b7e38eb88e79
 MISC ChangeLog 17985 SHA256 b31d25f57897e897354a84f36573decb09bf17e88b4f8ceb1fe0cb8cbef64a3a SHA512 099eb73daea0a5a0035af624f7c59dc7ecdd77523df9de74741cceb01b64514d8b58ce98c13b58729d900f680416e97408a19e46ddca1c9c34f1a845af86ebc8 WHIRLPOOL c5e8a538a838684f6c57ac9eb516b36572c7ca62697ea12b59a9db6c89c7fd555f6af6877aa24761c6ee6fce5b262c4ba31cd9c03b44378532773653164262d6
 MISC ChangeLog-2015 40164 SHA256 688e239d071bc1023126c3f0bb1e62c72a1c217a7290312441ad91829ee51d84 SHA512 d009c942ddc4d8beb2ba9f756a0f00d292c1accd029288727ef23811dba8854b0cdffc4b753883975adaa1572c4cd15e5a1e14d9fb2afb50e852cb14e71b635f WHIRLPOOL dfe2b05139f33b1b94481d040c5b58cd687331b3d96f7d0cb6e49d28574c3b0f4325b22aec97cd5ba138ee7caec989f18c94456cdb0651bb19611328623e11be
 MISC metadata.xml 380 SHA256 569713c1c2db0d1e3d052dcda58cb2c25cec18a554152d646f377affd0c7c09c SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94 WHIRLPOOL 29131f5c4625e3415fa2079dde921e3d8a2849c382e1408edeb35157b4e8c931b6ba43fef383c4fa83cf8279f8eaeaf1a6bbd15dc949e35b1cd9085c61811623
diff --git a/dev-python/setuptools/setuptools-36.6.0.ebuild b/dev-python/setuptools/setuptools-36.6.0.ebuild
index 569852df901c..b9335a39d953 100644
--- a/dev-python/setuptools/setuptools-36.6.0.ebuild
+++ b/dev-python/setuptools/setuptools-36.6.0.ebuild
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
 		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
diff --git a/dev-python/setuptools/setuptools-9999.ebuild b/dev-python/setuptools/setuptools-9999.ebuild
index 6b01e904a243..b9335a39d953 100644
--- a/dev-python/setuptools/setuptools-9999.ebuild
+++ b/dev-python/setuptools/setuptools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x64-cygwin ~sparc-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/pip[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
 		>=dev-python/backports-unittest-mock-1.2[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
 	)
 "
 PDEPEND="
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 5a0baa32a0c7..149da2a1afbb 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,11 +1,11 @@
 AUX sip-4.18-darwin.patch 1187 SHA256 a4ef0943e992b6313368805f093ffff261697887acae39d4e33a7bfa02c40174 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e WHIRLPOOL 834ef3eb9b75dc887b684ec2b3537668617f183b456b522e2d7a401b2547a4c041d7ebc6201fe6f82b97ae20a3b02bc8539d934f1c8cd28edfe05b4db4fcea79
 DIST sip-4.19.1.tar.gz 1000644 SHA256 501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e SHA512 fd98002117e9526f7f981b46362c41171e703a0e18e57112fcabf33d71fa13a4a091fdcb05c879ea721da59fa8c03087b8dc983fb2f832f764e5ad950c9bbecf WHIRLPOOL 87deee5786ca5009ca139bf6993e82231b1dd5be9bf7ee1d94eb5c8aabf5bda980f6b0fa4571e838275ac7cd8615757a58d0b9d7e776705834db35a1dc92125d
-DIST sip-4.19.2.tar.gz 1000746 SHA256 432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533 SHA512 6f14f387a899130cf15820d2b58d937d134a2eefd53c65a82af060e88a6ca039442b21f822880c4a3742d6f26328853a552239873c55d7b22de62a6cc5037b3e WHIRLPOOL e6a59dfde801b38c5ab2524e8142cf5f87edcd8171512241f88096bdfc43734cc0346d2d6a607ea2a14a41b7f05c820af30aa0b125a3f06be263d65b99c7b239
 DIST sip-4.19.3.tar.gz 1007481 SHA256 740df844f80cc45dcc9b23294a92492923bc403ce88e68c35783f27c177c4b74 SHA512 b2dea0cb5e1b23531f35e94bd604ec9874f0875badb5b20eb5abd2732a1005b2dd15bb42e0007b65053a2153b50659f24671abd83a434991661168a5778b94bc WHIRLPOOL 6283491e6baf6b7806a9fd68e77463983c475f7ea721832e573dc86158e226428d5bd9da084a554180ac4308ccf23d98f4c51f9af11fcfb5ecda8bf4dee028f7
+DIST sip-4.19.6.dev1711101252.tar.gz 999851 SHA256 f4152acde96c4cff72cab53004023c40139390a159188e0861ec666c94418d13 SHA512 87478433fb5a093f0f48465455eb731a90ab660d8d9b08f72071cdbe645220f5b923301214d524de90394dd55166e017a66427bed0fcc8731a08866e494c15d5 WHIRLPOOL 793e5a4515af673bc85cfcf11fb19a37f926237b7432c701f6b32f2dfd6a203e4f11f3362f401eb583ffc72e028144c441e79b261274c09705bca5ad07f2baeb
 EBUILD sip-4.19.1.ebuild 2113 SHA256 0fd02f37c4e77038a4027e635ef5cf5aba5512e15696cbd13660114070e204f5 SHA512 ce4a55289b9b1b53d2c48803e4b9ff013fe8c9fc577af73000aa6d39b1bbb0fd5f83d808743d44a86949183d2621bfc7d8ac072eb7ffd341971ad8aae4eef1aa WHIRLPOOL a46fafce6d3758c74d30f1f802efa72a1cfef14d48058ada3bdbf8a6fd53ef673322f5088ebbb09086dd046e03012fa71d304c66c12b2fc777a98fff8730d52a
-EBUILD sip-4.19.2.ebuild 2128 SHA256 0643be8db6bf2685aa02f85628d29de925251d390bc976a51f97c35ce8004121 SHA512 fd5bfc20f613f79a9a57d3cc138864a70cb3c333a719adc7705e854d9bb3354eadc47f341b2246f36ae93ef0203ae45039f88b3d9f795a5ce5ff262b8653ff5c WHIRLPOOL ddcf098b12e490302b0ac55dea40230646f6b66ad44e338a3adcd8fee908922a3255aa01debf730341c428129fdacab635e3caaff3f08b302ccdb39808b7afc6
 EBUILD sip-4.19.3.ebuild 2128 SHA256 0643be8db6bf2685aa02f85628d29de925251d390bc976a51f97c35ce8004121 SHA512 fd5bfc20f613f79a9a57d3cc138864a70cb3c333a719adc7705e854d9bb3354eadc47f341b2246f36ae93ef0203ae45039f88b3d9f795a5ce5ff262b8653ff5c WHIRLPOOL ddcf098b12e490302b0ac55dea40230646f6b66ad44e338a3adcd8fee908922a3255aa01debf730341c428129fdacab635e3caaff3f08b302ccdb39808b7afc6
-EBUILD sip-4.9999.ebuild 2275 SHA256 283f411de6357a250a7d3685a20a9159e629408a134e0ff4f5ef7719e0c7b121 SHA512 6f682b3254e4abf899d0d8ff02f6b32676771171170aed2562ce6de2224261839c992681b6f561040308f622d2a9198c036465f1ad0149851a79c38d41f0b9e8 WHIRLPOOL c11d4ef865da8c6c253981655fdbb380e2bb51b617de2744a1825b528ec5acaebe0deeca5dd6df98527b65b5994d20e81c89e1350f7d1710be97e4400073ac8d
+EBUILD sip-4.19.6_pre1711101252.ebuild 2776 SHA256 41dc3f17cb79274ab607f523215c818441f2c1999227e94a4b29199b3841083a SHA512 3ccbd79cd1a8004364afd688b22a7920fc58ec9bb9271555c1ffe26fddbf97b612a4bc0e614b6797d085584e780d55e25b10603088439ccb302c67624b4b91ff WHIRLPOOL 1d86da2de6d937b5d12e155288186d152ccdd692f8fecf45066e73eb270f43c1fd2901ec07154b05dc74e3ece30e820809d3ddd0cc8f3eabbaeb66d0caaee7ad
+EBUILD sip-4.9999.ebuild 2648 SHA256 dd36b3cfd801da5090013ee7b15855208f023f2ab5246556084f402609bb4ea9 SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7 WHIRLPOOL 28f4fdc54fbcece6805d53ddb5e1270e6e7a9f2e4ebf5bd7c643ee6e860ea80f2a301f3e7cfc16839079986406467de82a46943560640c79f3f165b38b03d1b7
 MISC ChangeLog 6672 SHA256 6456ef04eb08319575ff464d5a2836c75ea7f7e7efadbbdb9c349f06dc4d6c4a SHA512 220d43de36be4829a2dfa23b7239cc68070d0033c9bef9444890c5b3d51f685a8fb54949e2eff61fe85742cc95d32b57ea11ef99162351783a588da668eddd2c WHIRLPOOL ee02f69254fd24504598b76fa0506e3998857f8eb5a7d238718a703759a999742d70226cb02c281457c45f633bc10c90cba1bd7ea65d4dae58dae78757055bda
 MISC ChangeLog-2015 37462 SHA256 4472562d9fb77fa3bd61325e5e038b7d155b9854c055efe54460cbd70e50204f SHA512 d73800b8fc3e163f77b895284eea54b07b6eb17a8494d3bb9d2c0da223815b372382e7b7238544421ddab6a8d999c6dc2e91c8be672519142c426bcbdce58d28 WHIRLPOOL 24b6a8684791c6faed989cd4f46042c57231a2ffe0bf226059c9c87506337c80b11cc8f7dd0aedaab1dd3f877cb85572f7606d6210a1094bf11ce3b42e2719a3
 MISC metadata.xml 593 SHA256 dc36f709f65a14b880b37ba425adcf21670e319b130c2e33cadba4935b18fa6d SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5 WHIRLPOOL 51ef4d0340bd324a2364c5f70b6822c512204dd658ff89b9ba53ff49434bf08d294a3853f8e5dd50ceedf1f1c1662e3899bba5a951c1b7743b18d616f5f391ab
diff --git a/dev-python/sip/sip-4.19.2.ebuild b/dev-python/sip/sip-4.19.6_pre1711101252.ebuild
index de3979095c5c..8782d5f10654 100644
--- a/dev-python/sip/sip-4.19.2.ebuild
+++ b/dev-python/sip/sip-4.19.6_pre1711101252.ebuild
@@ -9,7 +9,17 @@ inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
+elif [[ ${PV} == *_pre* ]]; then
+	MY_P=${P/_pre/.dev}
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+else
+	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
@@ -19,14 +29,29 @@ IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
+if [[ ${PV} == *9999 ]]; then
+	DEPEND+="
+		sys-devel/bison
+		sys-devel/flex
+		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
+fi
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+if [[ ${PV} == *9999 ]]; then
+	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
+fi
 
 PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
 
 src_prepare() {
+	if [[ ${PV} == *9999 ]]; then
+		python_setup 'python2*'
+		"${PYTHON}" build.py prepare || die
+		if use doc; then
+			"${PYTHON}" build.py doc || die
+		fi
+	fi
+
 	# Sub-slot sanity check
 	local sub_slot=${SLOT#*/}
 	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 04bf7478ce7f..8605ad96cf08 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -5,11 +5,21 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-inherit python-r1 toolchain-funcs mercurial
+inherit python-r1 toolchain-funcs
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
+elif [[ ${PV} == *_pre* ]]; then
+	MY_P=${P/_pre/.dev}
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+else
+	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
@@ -18,24 +28,28 @@ KEYWORDS=""
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )
-"
+DEPEND="${RDEPEND}"
+if [[ ${PV} == *9999 ]]; then
+	DEPEND+="
+		sys-devel/bison
+		sys-devel/flex
+		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
+fi
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
-"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+if [[ ${PV} == *9999 ]]; then
+	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
+fi
 
 PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
 
 src_prepare() {
-	python_setup 'python2*'
-	"${PYTHON}" build.py prepare || die
-	if use doc; then
-		"${PYTHON}" build.py doc || die
+	if [[ ${PV} == *9999 ]]; then
+		python_setup 'python2*'
+		"${PYTHON}" build.py prepare || die
+		if use doc; then
+			"${PYTHON}" build.py doc || die
+		fi
 	fi
 
 	# Sub-slot sanity check
diff --git a/dev-python/typing/Manifest b/dev-python/typing/Manifest
index 98ea6f1bf080..e90d28a3ed1e 100644
--- a/dev-python/typing/Manifest
+++ b/dev-python/typing/Manifest
@@ -3,6 +3,6 @@ DIST typing-3.5.3.0.tar.gz 60350 SHA256 ca2daac7e393e8ee86e9140cd0cf0172ff6bb50e
 DIST typing-3.6.2.tar.gz 78726 SHA256 d514bd84b284dd3e844f0305ac07511f097e325171f6cc4a20878d11ad771849 SHA512 a975980e7ba6ec3e15c938336877071785bec7212443da079770348ab9441c8d918cd806e85ebea8af66a5d94f684566ea07b55e7623ab11e7d922c8c3dfe981 WHIRLPOOL 0259037ee7c135b7f9a6887eb6a9cb95a181254880e6e13ccc3bab88385b0c0df1a5db1d7bfdaf250b4ec5e624d82c85c97521b670b1b2177298586ea3ef87b7
 EBUILD typing-3.5.2.2.ebuild 718 SHA256 86ad921116e5c74732c84c669eb820c128828e079a0d3088cab6e218fa2a651a SHA512 6707ebdd7854ac6aa33510f5e61b2080ef0fd4fefd6bf9966e82ecad9db9e84e127055e2f6f979decf8834c7bcb291736633d26537bdb18be2942e70e0473f46 WHIRLPOOL ac20ae8ce10d610c86860b6071b17b44caed1cb3636fb5fc33cc8e9262cd3f72437c11f1fdd0d815e94e01b8ce9c6ccc6b924ff9c0a6b3938c60c52fdbcb6519
 EBUILD typing-3.5.3.0.ebuild 735 SHA256 baa3839eeebd18f7a5d2757a430e1678f5ec4ff1f9971ab8eaa4465ec2482842 SHA512 3241d86cd8a8f82be1a4f13aa56a2dac6200b446edeea2409305d393d65381c33442667892bb17f5df56436927696096ada3ed126555a295b40dad636871c5df WHIRLPOOL 86a4b83ee399d5eaf5da990f5c7aba0fc264439c5b0cdfd8e38ba7818094e36614d8c448a1b04c9740650b6ea78d8169d47cc8131a63a126ec2d3e9bf4d69e3a
-EBUILD typing-3.6.2.ebuild 753 SHA256 1827a3bc11cc4ad5e33a40c578096cf87c76468b6f5b2f165d12ff6db7364379 SHA512 6011be71d92e87ea101ced15d7ff0d41eb083a09d96292691d7160d0b2a7df0b80fae484c404327a4b72fa8f5c0618f70b658e4578250d5c6f737b13183084f0 WHIRLPOOL 8d689d6d533d7db6d6db9fc5fa3862624ae6e542e8b5fc428b84382e1c2340ed81702776880d7b9b1a9bad8b5e313816086eb1d38beff30d970b1af91c7a898a
+EBUILD typing-3.6.2.ebuild 759 SHA256 319d2eeec42320d58c2b5b2f1adfddc018edccb407fd1c498b0e05cb6d1e94d3 SHA512 211d44fff4e750b794de37bad1e7dcac0d3ec400764489ca6547b6be2e3e025c4ae7fc1e072ed07c54ebbe12a01e10dde726a23e1f27a6024febc551d4894902 WHIRLPOOL 024f871c989e227788af5e36184f97e30014e01143953101270f85551ebbd1e5960b5c762faa02e402054e13f9b790e7e4a85650aed7ec3d664d675fa506e02c
 MISC ChangeLog 806 SHA256 36c24d5802d4cfc138330463bdcdbeea5bafbf73798785e773084345aa81e89e SHA512 745dc5f385d8dc377c0f1f99835bf4fbff953ebe9fa9bb68d6f1630462174b0232d39a8bcdc94495d04feb8912611f056a28bf41c033d5111848b9118ac45f91 WHIRLPOOL a1dd65775533f8eb7ae59a7caf45ce66b97263b4bbba8fa462439ed97265afa4e8337dd2e4e3647295935153e8a093a7c2aa84c920a5b8b38ee34f04ced2ccda
 MISC metadata.xml 315 SHA256 78117e46fdf3199b73dae5d5e385d70151572f84a2e8bf356f6416eb564b739b SHA512 cda57db8293624642470f9c44e1ac73bfe45993c4cf9ba4240d988de0098088566edc0c381f9f5356071de76ca9c4af7d26f1404e482a7c49e2a06bf2f8c94a9 WHIRLPOOL f81299035287e58260fbbb5714cad5a241157ffe5252406c5140033d8524de8fecd2b68e42fb94f625c6240a8f3800ca51aa060342a8a6b73d28e621bfff4b53
diff --git a/dev-python/typing/typing-3.6.2.ebuild b/dev-python/typing/typing-3.6.2.ebuild
index 8b63ed6335d9..b12723ade6b6 100644
--- a/dev-python/typing/typing-3.6.2.ebuild
+++ b/dev-python/typing/typing-3.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 45cbe3b0db86..40764e6c8f50 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -3,7 +3,7 @@ DIST WebOb-1.6.3.tar.gz 206375 SHA256 1b03115e162dd0102f6147c5d5ed71a3a2ba0f58ef
 DIST WebOb-1.7.3.tar.gz 216028 SHA256 e65ca14b9f5ae5b031988ffc93f8b7f305ddfcf17a4c774ae0db47bcb3b87283 SHA512 23a51f184754c525dc293b8b71855d40f52445c0df5434af7ec091219e0ea81be162623157b6ec67214cd151b25014bf86991246785816ebcb5a0d1eec9479a1 WHIRLPOOL 3a90c00f17a09c5a44b3bd5e10dcb66f80d6f0348837864a8e58730a70a834e19316b73096be70c437db3d4f33123c31292794fcaafed301e02dda3f4c993b87
 EBUILD webob-1.4.ebuild 1039 SHA256 5c6d585e09d5482145c9d72ba194406ac61efccdd4897d6055f8b28563252b67 SHA512 0c2fa25ce2e5dacbc67646aff56ebcf6199536c979d299a22cd77cde195cb1e6069ecb1ca7f20b4e70958b458351a50a565745f16c121aedd35fe3e8352adee6 WHIRLPOOL 3e5941ebb122f95e14b09cf8d909a077759de14386a421ae42be5a465398734896b7c066ee50637bdea6fea4f67705dd00359fa6fc75621a15f85a126c0a7ad3
 EBUILD webob-1.6.3.ebuild 1077 SHA256 cbeb78a88f3fcd4592b24621966b3db10597b0670a739c25001eaa6c6cf8b1e4 SHA512 09f33b779434fa79e0e7d79dbcf5174cf079d5b934e482886ed5bc506d7211a7c459bb076900e886e2ea3806c2dbe9e856a42ec0242edb16ed617f8af6c24c73 WHIRLPOOL 76889c0dff8835d932f0bf338e581c75971dd4eaf5488915d323c008fd234b2b8c23870306c00056ca36c6c1764dadbbf36a076e705883b188d6319f8bd91c57
-EBUILD webob-1.7.3.ebuild 1077 SHA256 cbeb78a88f3fcd4592b24621966b3db10597b0670a739c25001eaa6c6cf8b1e4 SHA512 09f33b779434fa79e0e7d79dbcf5174cf079d5b934e482886ed5bc506d7211a7c459bb076900e886e2ea3806c2dbe9e856a42ec0242edb16ed617f8af6c24c73 WHIRLPOOL 76889c0dff8835d932f0bf338e581c75971dd4eaf5488915d323c008fd234b2b8c23870306c00056ca36c6c1764dadbbf36a076e705883b188d6319f8bd91c57
+EBUILD webob-1.7.3.ebuild 1076 SHA256 6678c452d06e0a102f1ad7710d5a58dc50b0a2742cacb323b7106a00957fcc5f SHA512 0ae3edf2b0898fa0c6f1cdd214f87d8414ccfbaad5522b870bc7e2a8a5322028c0b72dbe30566133a817a1cbbbb9951da2e978d8c12987594c5acbb4223401da WHIRLPOOL 2ed467b685457bb0eac987ebfaa370b160c42b73879e71a32685ff9ab614e5bfd872c09bbe89a2fcd80522840db300ddaffaf76856500b710fb82b6801d4b54b
 MISC ChangeLog 4844 SHA256 32f55e0f79ad7bb38663e1afc1ace86a922536d1e940b88219137a2aa15e836d SHA512 acd8340d6428ecdaf10454ddeffa96f15d1479d8a0cc25d276625e9b254b426107196bc7cbdf021c6f04ae65b6aa07c3d54d4988d2b25c18e71a69efc5c3d28e WHIRLPOOL 762cfa6eb35188a1f0aa82d26899021a87377126651e72d233c1dd8008ef10513eeb72c229b4246c360022cb3981bc0d936525a6b785c3b14c90aef8abb9be01
 MISC ChangeLog-2015 12090 SHA256 81045782b78c4ef282e2ef571f16cf0df744e7c6d06dd5fd4cf047dcb4e03326 SHA512 60571038fd11661853d1b1843be5fa597a0e61675ee965a63c9f01878a2e8436d890cf6efbf955165cb4c49262632506513e5f671be27fea942c04df6a79d9c8 WHIRLPOOL 65bf77f8210cb16331da6362089d8318e34929334e88f5b7de282e84ccfacbc05bcb9ab39028a6dfe02f2d87fd49a988469bb89601dfd46444851bc261538fd8
 MISC metadata.xml 308 SHA256 ac53c173fbe6031c8c6d771b680df7d9c04742f272d23ee9748c070f3277340e SHA512 cab03951839671b7600ab7903e1b27c98a02101d4a5f34b6a2382ad8f925049d82e4e4ff32c904d4dfcd7f4865124d7adf194933a5d2790b9f3ce1a9478e8234 WHIRLPOOL a95b91c226315c783777a2a797869da7c02b15a18a993847a8ef3a1759d4246b406561e1c1e5ec1c3e2b034526b746a6ffbb851b400407a5d69b7a043b9fcfa2
diff --git a/dev-python/webob/webob-1.7.3.ebuild b/dev-python/webob/webob-1.7.3.ebuild
index f759ad261b4f..83bf98f38b28 100644
--- a/dev-python/webob/webob-1.7.3.ebuild
+++ b/dev-python/webob/webob-1.7.3.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 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
index 39544ad57b1b..6b0b043e3cde 100644
--- a/dev-python/xdis/Manifest
+++ b/dev-python/xdis/Manifest
@@ -3,8 +3,10 @@ AUX xdis-test_magic_bytes_error.patch 808 SHA256 a0116556e3b49068602311176da5d62
 DIST xdis-3.2.4.tar.gz 127507 SHA256 b311253b97a321ab45625089a729ccbf8bcb1319a8c4c0167b719f81c081543c SHA512 6c9274e10f2a41ab4a173c8ae4462374fc7ab444a589ab572172550d0f5284906f7d9c9cf4a640f163f6012d17f40bc5e1c36e5963f8b6106a9c37e420027a97 WHIRLPOOL 5a0910f04e3d9ec70129d5d3b659fe06034e7a6298692d2a776f2616a8b895a539efa7f96972b2adc6986c2475e697552ea071d33bdd22c60bb1e0fec1950dd4
 DIST xdis-3.3.0.tar.gz 146531 SHA256 32eeb690e9376ad404c1fb18c1f87a09345f9beca31cee1ea8f21dd0f0dcaa07 SHA512 ebd7656c04d5583243eae4442409bde910146f7c5f6b66d58933d4b62818345401523428a596f00cca31a9d6fcd2eea877da57ab3e796dc04c92842456454b3c WHIRLPOOL 784c88d905d47d22a0d0ffb0206f57250f535abce9df6b02be16492c47ffe199ebf5f900eb3199e0be2b89a1d96f951971de5ba8ae33be57013870c1e25f828f
 DIST xdis-3.3.1.tar.gz 154152 SHA256 d6e5439269a2abe1fa71ac4cb670ac6dfc9e18a09e0c4acb2f6457f0542d5383 SHA512 93b1a092ae7790e84dfd8dc4128659d48be85c4e00d9914bbd748fad5ec4246bbfc6c19a5c5de366f4bd6d91847dad4ce3c1c3affe8f7608652f2f6e343650e1 WHIRLPOOL d137511eb788cdb43ef5e9165415fb4c7fa4885b9e293d4da7a7c4360e0dad7b00c8ea8df299161cff539a9f7a390d8b39ff6c5697804862259717d54c21f38b
+DIST xdis-3.6.0.tar.gz 144766 SHA256 3ea226c201f4be86000b1d09f8585c2de39757325d0b686e3fb14a7dad21c832 SHA512 8b45ccd6976204004f27ee5b1a9da9b29ec0e28f4b462d862be5a1238d3ebd4a5d6f3df5607f3e2f037d80b2d3ae77ec4246ab1aa0671466c1e07e3a65453f3b WHIRLPOOL 156874ee1918eab2e096aa36be0bafd87a32d843d76875bf4eea9366b22616a8aa93610bb959e5ab47f74627f0abc4144a8be345ccf3550858138a860121e793
 EBUILD xdis-3.2.4.ebuild 1280 SHA256 9505c12bd74fa89f31ff2e073830dbc3f48283ad9ce0c6fe8c2731e962bac0bc SHA512 f151336e351ed8ca2b240452baa90b43844d69ea80c86f61144d61b49bf16eb92746fba163359c66508789fcd6f345e5057771355054b86d1a56ae1d2f11a01d WHIRLPOOL de9e889e2891e73ebd07435cd81a02f8aca98375c647a30b45b955cd975f3cad91d117bfcd5c8f51225b734a5fd02411f71c8860ff946ce2f50cbfe514d5e036
 EBUILD xdis-3.3.0.ebuild 1178 SHA256 394deffa7011d4ec1c9ebe60c7d714d5fdee4c70dec84741e1bb9620a89b0db9 SHA512 2919a1ceb6de25293ff5cba1fca1eb15661968f929b93e174fd2930db0d3ddf5171ab93838169754b42c3528d98c686f615b39e4cd5260bd8ef72656026c2116 WHIRLPOOL fb79c25a6c3f5a6ac462d433f58d67d34667b5d0d08fe49a0e816c605930a417795e7ba63ea6deb34de08919d6843f8fc49cdd543f9d7ed459477cbaa39796a4
-EBUILD xdis-3.3.1.ebuild 1181 SHA256 db63b01c14e11a5b711994dc37eb842f6de6f8abd7771d28f4829e5aa22f5748 SHA512 f2514f28e1ca07340ba3a5792dc5b2e54bbe866dc132f629da95aaf9122d87438968f5b00c08420b325c76ea5cc18d1dfe9e09fd5afb946785ab40838b752869 WHIRLPOOL ce2d97e0d4ace3795bb019c5d1777df26ac8dbcf085f8353e46cfbfc7b7e1c04d33ef361a4ae770c4f0b4393fc62454e41ce30dba001926cb1627c6710791cbf
+EBUILD xdis-3.3.1.ebuild 1130 SHA256 ddbc76a9b1f9e27880283f28b7ee6c5c4037a416950c6129982770c882fe51c6 SHA512 725d051d3b233c5a008597652b0bd143f1b24fd81bea45bf4d1ce4e508bcbfd95e66c206915a36267595e138ac57011ec5a07557bdd0b1f8fd69cdcd468eca03 WHIRLPOOL 3be266227edbd789d181badd135fbedd5835e92914ee713941dc745aa9b9bc93b09ef1fa4ed0d98b2eb45046e5a3c760aa93ac558813ee8d27eab36e6f006007
+EBUILD xdis-3.6.0.ebuild 1194 SHA256 c29fd6bd24af151e27bcdd1dd44aef9536c57b9ec6fd9397e7ded31a239078b3 SHA512 f5e48a5ef291b73d6f67b042a363baf850a897b398175a3bfadaddf4a237467c98ec7b4ef31476a0eb0569ddd3d1d435717b0fb50431c5151b8a55f24cac8461 WHIRLPOOL 020509044b8c51d0f70c0eeafeaf7dbee430845f621dc2ff9adba48e4acfd23d10c4d3301e3f2f4fbd9202c721b1813e2d05c7d4dac6deb680f8294f81bf7f82
 MISC ChangeLog 934 SHA256 24b4cdec0b9dfd440ca08b4d4608d601d68d078a81ce2797519ad261f1de0b5d SHA512 c5bcbdabad268c87e39c6d1015c974996f5d600520ad0223261277db1b6c8e7bc10600baf5c959205e4d20839aa53aa184c53fe62de537768022f8a1eb2d7cce WHIRLPOOL 8ba010c713dc4e36117690d06d5fcb73511128275d582abee42ea52c041237b4278a10cae5b90b8e47c0eb56cd96054be8d5c108218be8a873eddd755165979a
 MISC metadata.xml 923 SHA256 8515314c5b49270ed58e97f813af80297c4671e1e0a5e301a9b015de88261821 SHA512 666fd7ff723b4ebf5fff3b3776a6a9a14df3d886cd82348218f57ec552d55b31712af30907ac39598c60ebbcb9de26091638e909dd02794c5761f6a96ff389f1 WHIRLPOOL eba7fcf4c519c4943f8d88327002ccde6894ae218a813946a91872f4f572db05d0f2c00fbcc085e23d026998bb3175c057478dacdcb0372a4ef614ebc6199c02
diff --git a/dev-python/xdis/xdis-3.3.1.ebuild b/dev-python/xdis/xdis-3.3.1.ebuild
index 6d44417a7807..85750f5bc90a 100644
--- a/dev-python/xdis/xdis-3.3.1.ebuild
+++ b/dev-python/xdis/xdis-3.3.1.ebuild
@@ -25,9 +25,9 @@ DEPEND="
 	)
 "
 
-#PATCHES=( "${FILESDIR}/xdis-test_magic_bytes_error.patch"
-#	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
-#)
+PATCHES=(
+	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+)
 
 python_test() {
 	# Need to rm any pyc files to prevent test failures.
diff --git a/dev-python/xdis/xdis-3.6.0.ebuild b/dev-python/xdis/xdis-3.6.0.ebuild
new file mode 100644
index 000000000000..587faf12da9b
--- /dev/null
+++ b/dev-python/xdis/xdis-3.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+# bad pypi source tarball - test failures
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/rocky/python-xdis/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/xdis-3.3.0-remove-pytest-runner-dep.patch"
+)
+
+S="${WORKDIR}/python-xdis-release-${PV}"
+
+python_test() {
+	# Need to rm any pyc files to prevent test failures.
+	rm -R "${S}"/test/__pycache__
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		esetup.py test || die "Tests failed under ${EPYTHON}"
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-12 16:49:02 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-12 16:49:02 +0000
commit	519e4d5d99fc43d5c9a038098c029dc4ef9d6792 (patch)
tree	7e99d88a777fe8c9d3ec6310bf7eea639b0e66b4 /dev-python
parent	a5332b59346f7cbf0fdbd148b54aa8a84aaf8190 (diff)