gentoo resync : 28.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-28 04:06:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-28 04:06:07 +0000
commit: ccf84bcd604130256d1377cd58f0a634ae6ee20f (patch)
tree: f42a709e0c7805183f5680883bc76dc935b7a0cc /dev-python
parent: c85a90f90521c7e11d618b527d6630cc64cecbd4 (diff)
80 files changed, 1140 insertions, 93 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ea9260f0c8a8..78181cb05c55 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
new file mode 100644
index 000000000000..a90161cd74eb
--- /dev/null
+++ b/dev-python/backports-csv/Manifest
@@ -0,0 +1,3 @@
+DIST backports.csv-1.0.5.tar.gz 12050 BLAKE2B b6c5c4b846040167c081166fc4f0f0fb2df4f4d68e28a00e43762044f86e35c5e104a07028bcb7a7fa0f2d377b2da16d202308b4b905dad979118786c0ea0f7e SHA512 0b3885d818153bd50da2c7d931f64464cb344100622d9692925f9eaca056bf973f7d1d3546520e54e03472766c7d8b600c53e0674eb5958e768f713ec16a96a8
+EBUILD backports-csv-1.0.5.ebuild 717 BLAKE2B a1550d031ea9a67fe6206ccfbd75a37a4d83ca362a51c92f602a42ee937c8e667f55bf2e957f99ad97c611f613599eb8939d24734563d82d5ac8e692778d7e43 SHA512 c54fb0175220bf772737cdca4951d3bd58f395693b113532b0bae4d1c59b70c11757d2b1fdb6b2b9ccee14174c9e0667c31d09aa0937e3b59062cc22437e7536
+MISC metadata.xml 399 BLAKE2B 7013785d5d06455f6e2062c5a4eec4ae0307112a322b5110f4a19a9b119009f228127c065f58b7e1e7f38454f25bd0ece430a335114c4f4d6ca32964841cf286 SHA512 bccd4c436f799645181113dbdb7b08c6013d4a60808259d6fe41fe5ed313df928b45342852299329e0a547600fa6d092e501fc06a64d020e777cbf52be42c6bd
diff --git a/dev-python/backports-csv/backports-csv-1.0.5.ebuild b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
new file mode 100644
index 000000000000..f4ea47f10e5e
--- /dev/null
+++ b/dev-python/backports-csv/backports-csv-1.0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Backport of Python 3's 'csv' module"
+HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.python.org/pypi/backports.csv/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/backports-csv/metadata.xml b/dev-python/backports-csv/metadata.xml
new file mode 100644
index 000000000000..8da7e8504f78
--- /dev/null
+++ b/dev-python/backports-csv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grknight@gentoo.org</email>
+    <name>Brian Evans</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ryanhiebert/backports.csv</remote-id>
+    <remote-id type="pypi">backports.csv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/backports-functools-lru-cache/Manifest b/dev-python/backports-functools-lru-cache/Manifest
index 116ebf4c0d7d..1fd5b30c37c0 100644
--- a/dev-python/backports-functools-lru-cache/Manifest
+++ b/dev-python/backports-functools-lru-cache/Manifest
@@ -2,5 +2,5 @@ DIST backports.functools_lru_cache-1.3.tar.gz 6685 BLAKE2B 7007b08fc536ba2a31d21
 DIST backports.functools_lru_cache-1.4.tar.gz 6927 BLAKE2B a0ef9f56abcfde51b9d7f03cb9170c3d500652e43c9498fb7dc4c404276ceea15dcd6ffb2fc7efd723cb12790f99e6fe249136ae0d4c949f06ea06cc41318793 SHA512 78dcd12f392bc110d1556f567a9f8fe977fa4ddc98a2121ceaf43606687171866832b8d32220dfb4ca335f53e89acecabda9e48ad48571f1741b21ab2d3b8a21
 EBUILD backports-functools-lru-cache-1.3-r1.ebuild 1191 BLAKE2B dac5105515a6920890f616e9c14de7ed2281b61eb849777055a7e5e39b5c24faaeff995dc6c6a2b835ee75a28c256af92175481c6d706287fa547ca21495548b SHA512 a20640c8a0055cb9358303ad9a4e6de3c46ffe712542f1b2458851012969fd5f651ea7864fa906893e6ac59b2d28c5b994e7c8852b1457c263a7592c5fd16dda
 EBUILD backports-functools-lru-cache-1.3.ebuild 1087 BLAKE2B ac86552e0af27134bf1ee6c7e9a5c734b903a7a0a28b8ee173e43e5397bd32294898a808cf083016d088f541d9a30ee2fb052c4017ef5cfdd7982c533e7fb8ac SHA512 7e12c596df474b656f6089bf719b9fa1d4421face8a917343e764eab4fafba734ee0c990e047cf8c98528a856d6ed63de2ff88e94e832601b920d4b7973600ca
-EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1296 BLAKE2B 5f0a89fa594e7bcd8371915acf01497ddcf8f70870836c90710d26bba10b6d5f04c619e6baaf65c64c5c315c69a3abc3df5c8e7e25a71b15ce58047ab9c9b9b7 SHA512 fd3f0c7c92f351d6b0eb7600f6f79c50e93c23d04c8c2fce6561f59b8377edb881c322129b82f8659d7de308b80962b3d69e3748fcca6da018f1fc9692116ce7
+EBUILD backports-functools-lru-cache-1.4-r1.ebuild 1329 BLAKE2B 7cb8bc34bb55d500adfb253449439bde98e12b18eb761f1433864a942f7fb75d99a90e730405c728d092536235c7d3d7da7ef725451b4c3dad1b6c88b2571198 SHA512 af64f7a5ff9f4f256c58d064ddf30690fd3cc2245a86fb0cc7733b4f3b7dfc6b8161d5941ea9c3244ba9f7237aaca5bd0d626b3fe118e092b047a9322ffe0ae5
 MISC metadata.xml 803 BLAKE2B 1c196916295cc785c25a66f27d8534f4ca26d549a5f7355ddab41d97e04225a18e5fe1b560c9f8a58f5b1c52a26b18f7da0f1aa0879551e5045195096a66d295 SHA512 c8ee92d957a9af691eaf06ba40124ec7ffa668ccd98e77d5cc8972b3d18be145fb33c672b36150cd350274d753bc9a53b8b7d15525fc59ba17ec2235d006b11e
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 2b1692f2a274..386f4d9d26d2 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="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 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 dd5de84a4f82..3192e2f0300b 100644
--- a/dev-python/backports-unittest-mock/Manifest
+++ b/dev-python/backports-unittest-mock/Manifest
@@ -2,5 +2,5 @@ DIST backports.unittest_mock-1.2.1.tar.gz 4580 BLAKE2B c935c378bae1f39e0658f4be0
 DIST backports.unittest_mock-1.3.tar.gz 4687 BLAKE2B a01712eaf5cb32d7da803aa9034f68508faa4d8db8d6f6eb02e20cb9f42c4e6bda3b409a0e2f676b6b7782f16d78877da6f093af6ac1f1deb100b19969570787 SHA512 71741db5c2e43beac8c72dbffa0efd4bbae140177f56c3b2bca3e13a3aebd8a418b5ad7654421899980f73b8dbfb3b02d85d2dfcd7b3827047fa6ba84a8dcfff
 EBUILD backports-unittest-mock-1.2.1-r1.ebuild 1327 BLAKE2B 3fa3778a780a330cb90c5270e3f505324e393296dbe361703b9c7c5f9980ec0847c24f5d1bd38ef72bf80781c356c23084ef42d4e1ae2993675b0610e0b745c8 SHA512 c97899d949bdff414b6c714989cbc673a1e4639003033dda61c85555deb8ca90446230a714cbfaaa87130b702c4b5becde1e9f8b36100657c5d38d9f89646876
 EBUILD backports-unittest-mock-1.2.1.ebuild 1227 BLAKE2B fcc6f659db7bad1f15d564693a40ec95cbff67ec8031dbe29923d62de7907fc71ccbc914f219cecb6b271750e29fcc10b3414a022e91b0d85f7d5fc55a0fa944 SHA512 682fd1d5f7ea37c91328657dd06b89e72d88fc6109b7da3b05f4c08d115389e81e67a8e988cbc7e81258d771159cc4134d44d18234c4f6d756fe09dc8a37e122
-EBUILD backports-unittest-mock-1.3.ebuild 1445 BLAKE2B 98c073c59df36f1867627f11d47630f9b55e05881b477feabefb5a4afbc24fbd5b61d5910fd72a6812e1146d85274496c0583c93013e6792e3a77a46b715809f SHA512 a9e6eebac9387f66a63c43dcde714e7b079f9baa9ec70b299e8333e796a59690e907e6b589a4a197dbf571fbfc46e36725de7dba7c0982d1dbf7d2ba2eaf1dcf
+EBUILD backports-unittest-mock-1.3.ebuild 1450 BLAKE2B a4aec6d9ad22f7a9467c4304ed67e3491e99aec0ce972ea7925095ba241dcbe26e78eba3e589d81c3eb3cbcce51edb7bf38b90c2602f5830d37fb6c8af1e2a6a SHA512 2bfa769553670e207466b6f36c6b191d6d90e57b12f57d1f70fc8e051f1f2e2bbe1c33fceeda13fc4ec91d92f1a6da8ea7f2756f4487f78b622405feeaafa5f1
 MISC metadata.xml 858 BLAKE2B f85dba9357ce8da05df41b2fc04c34a9a0010a3c7ff88c8246978fa73ce541562e6f4c73808a378f9039c646a0a3af855404a38e5b4b3d41ab584926dc461910 SHA512 076bb148f419c52a09fa1a89cebd65c0e581828a261da7e62eeab3c30a4e8db4db95af4ee6a5fb1e117a1815ec2e7b4bace522879d9e2773e37ba8b10b247eff
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 de8ebebd8eb4..790ce2657d3f 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="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="doc test"
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]
diff --git a/dev-python/backports/Manifest b/dev-python/backports/Manifest
index 4e136b56e121..4c1ac3741770 100644
--- a/dev-python/backports/Manifest
+++ b/dev-python/backports/Manifest
@@ -1,3 +1,3 @@
 DIST backports-1.0.tar.gz 2070 BLAKE2B 7fad9ef13abdc5bab550ddf62061a952991ff601642f5e03359c3ba2bf20d923701d86aed178dce530c60870efd33a4a2b4b2498802c78df73d406bc496239fb SHA512 069e155209d6036dec09000e4543abea9383f13b229a7259b1d3d02fff4b51be1a32c766dee434215c8a5209afc5e7d24163d188a77cec7d354d34170665bd37
-EBUILD backports-1.0.ebuild 566 BLAKE2B bbd740ff1ec4fb875128155a59c363f09126e2fd82779fab01954a62a66e97abddd4e6ea8fa583ca96118b7e8eedec10476f32fbcdf1cf5532e584c5e53ffbf6 SHA512 09f54c9f2a7feeb2220a4d7487d9ec1e1baa10ff63bb6d4844be54f8fca0665e000fe4b02a47e3bee0aafdb20c4bbce4ef231265f9bf2daad8350b40a3d7fbb5
+EBUILD backports-1.0.ebuild 588 BLAKE2B 62a05a56fb26612b2664490f0c2ecfc23cfccfeab501fcc91afeeeb4fedd99f3cb455dad3774a24d6d4ff2302c83696bac1fa32fe75023858569f76a24f6d3aa SHA512 5349cd7d513cf4d41d72041cbef1aaee9f16c77a979c8e656af24a5e9d93fd1632a43452d08d2e796de72baa90f1f15e817e868aa68b8b11809fb23d6d07a8d9
 MISC metadata.xml 335 BLAKE2B cd3125c95ede34cf51567293406cfb3b489874a7a2fd594e157c9167fa2b3d0cc5a4eea670851a648ed81100f0ccb246ea64d316b432d516219f61c02425feb2 SHA512 d0432bc56a1e591a0f699d61f2195872cb62e591027212cba00a127c89d9a2c29a54da495436233ad93c3868f98b184c73da9057be26ce9abada2516be518e30
diff --git a/dev-python/backports/backports-1.0.ebuild b/dev-python/backports/backports-1.0.ebuild
index 5572d6a1e019..0936b79a6007 100644
--- a/dev-python/backports/backports-1.0.ebuild
+++ b/dev-python/backports/backports-1.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="!<dev-python/backports-lzma-0.0.2-r1"
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index b383a54a7067..002e94a648fb 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,5 @@
 DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
 EBUILD bsddb3-6.1.1.ebuild 1949 BLAKE2B 5b06cd8a78f99f8f78d45d1d27d9d0f23e860982257c3000983a1fc90973abcfb0f4a19edb773da660fe405912a6159c3353394572c1ab6aaf7c434ab3182b22 SHA512 4288d31c4c38a8f4d8e2319b6a8a81712fb6fe77f8b4baa87a3d65459abacad1fa8c28b437c9fde8035404c518949f65229e0a545a37f35f21d3ffac2c40febf
-EBUILD bsddb3-6.2.4.ebuild 1935 BLAKE2B 4b68c6522130c8b8c0a00b04e959da2611bb918854eef1cc15e0d2ae5fa9fa58661224529703099686648e5e97622681a1efd9a4fe6fbb765dcb4e2144ef42d9 SHA512 f7e969f18e9b52a1268818b9018fa405e83ec31ed7cc5a053359ac3f33b29fbb77af671368f75b4a5950a253945beaabe0374f4e22efa1770b8f1d2b0ec9ffec
+EBUILD bsddb3-6.2.4.ebuild 1934 BLAKE2B 4ba782d515e72254d3e1c94021340a8ea0c4b3af0c2495acfa798a93ef85ae819f9a983f29f8ea355d003166b939c90f097b37b2394e7f6a1c3b9cd549dd9d99 SHA512 7c8fda0d1229b754dba542d4baae297f940819f5a2b3375f9fdabde90138a202f06fb2d1701b8d6e33220b5d668e8ff26a2c9f2e62708fa3fd8131e7eb13ff0d
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 71205c0c5d00..301e962da2c7 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 3f5a326183de..82bf32785876 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,6 +1,8 @@
 DIST cli_helpers-0.2.0.tar.gz 33855 BLAKE2B 8509fd6ea4ce1af77a522d36f98261a019d6b4b7250549af8014c4aba01bc4f4a63106c55b3d5ce40f058f0927db4044af51c7f948879d44a452b35369df8f2b SHA512 7dfa9791f472ccba3d49d0e87daf859257e74349cfbd8920a624f3e8d6905d8c8b7fa7be70eda97091963e548fa16dfbb1171e198cbbaa9d7810bff2321ebe54
 DIST cli_helpers-1.0.0.tar.gz 23269 BLAKE2B 2de1729b32a690d5832cc956c30bdf3ec35b3bfa94d1eed391dc18a1aadfd7229a1cbb4368a08406a3c6bf2bf59c835ac975bee797a58dbb3121c34586632d1f SHA512 8137b081cfe3d226c63cc7c17165f884a42147ea184d11a1e0ee5805f2d22bce37ded580a0c15566bcb057df4c39f2685595d74b2e21d46932e2e635f77eec68
+DIST cli_helpers-1.0.1.tar.gz 23382 BLAKE2B 544bf4165315a6459ba203efc7f55e3a48d4af8a12a4a3dcd4742c9e8f9d72c9163784e4adc42f5910d5ffd42d957aca47f4765e01cc9fc8c17649494b0396c4 SHA512 f4999f20d7f785a143d672ea9e62375dc6cb1abf093796dedcc01003970931a397096cded3515d060b47aa8e38b2a03fbe12f919f84451365d078126a5b35021
 EBUILD cli_helpers-0.2.0.ebuild 553 BLAKE2B 6dfbe3109866ae86f7afe8f736f3c3109dc995dac8ece8d3db9956e4c9c604d8d1468fb69e9c6860baf9a02f078085fa1bad6dffee876bd6bf0a078607291bb2 SHA512 a89d1c2935ecb3ca96757e2c553e1db960af6452a214245ff426335a134e66bc082831d2d05af3df7f096f918969b472255eb42185f087e9ce5a67737e51d65c
 EBUILD cli_helpers-1.0.0.ebuild 606 BLAKE2B abd1589d0cba5cf009ace5b7f8dfeae1ec853748f54c12b1d1ffdfed00477e643d3eb822a21c2f96e71831f88f2ba66c440ef111de5225448f0ba16d7ae617f6 SHA512 d8f0abe5209659609ada8ec8c9bf1a868f87648cda9a4f0d553b724e8d76ce39ab32ce68a289ea0e770e69b6b536b1289e08745a768b74c7f51357e53960b22d
-EBUILD cli_helpers-9999.ebuild 533 BLAKE2B 60b7a15a4e776415da3446ea01294f10d96d3e1f98499a26cc045afa46609a6c1fd895407d98da5dd37845182ea4b6a1bf522c94e4aa09abf255932aabe9fcbc SHA512 84351878f15a177bbaf1a0eccbe8c0020c494d401c6f1e233d2360a6dacf97875c01b44edb7aa9255336a737c20da5e276bfa379909e371c71b95846469cb015
+EBUILD cli_helpers-1.0.1.ebuild 656 BLAKE2B 019befe378f30bdc42556464f83c91b53ca3bf202c9650690766add5094d75b14b98f0d19e1c0db702377e564c7a912ca7498c5afc70f4b5172faec543f1f7d0 SHA512 48594fd03a874846966c929d30faf7566c341b2640130a8f3901247144796486c683d9063d638bab6ccf9442ed1e3083d51c295bd9f5560f856f5e526acc166d
+EBUILD cli_helpers-9999.ebuild 638 BLAKE2B e0b1a8056d1ec64f0d83e025b31e6da2b6e97ae4b035023a0693380273f6851495d9f9641d877485a95fe1e42be4721f85e460fe6efd3d983a4f4ccf77e1e393 SHA512 fea1f9fd3262b125a9e8c2f525dc3d4546bc43c38aa8b3f39bb8b31754a408e3e76d4312566949f5ef07c45709f02ca0ab82894146028c55d3b108fb84fd0a16
 MISC metadata.xml 322 BLAKE2B 16f308194537f996ff6a54d92c996267e2ea37d78d9377d3d3b5a6246ebf511c9dae536f03627a32885753a2d3943554a9748513a036ef6e10b952e5281ecfbe SHA512 ae5215f13b457aa43dc95d67bacc371292f0c8f6540dcb49633f0120232dbde7fe12479c3ff16c203b20ac96700be12c187444a768f50e319320684553509dd1
diff --git a/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild b/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
new file mode 100644
index 000000000000..34fa368a6eac
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-1.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+inherit distutils-r1
+
+DESCRIPTION="Python helpers for common CLI tasks"
+
+HOMEPAGE="http://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/cli_helpers/cli_helpers-9999.ebuild b/dev-python/cli_helpers/cli_helpers-9999.ebuild
index 95d68a34211d..58fbc1ea0cfa 100644
--- a/dev-python/cli_helpers/cli_helpers-9999.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -17,6 +17,8 @@ KEYWORDS=""
 IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
-	dev-python/terminaltables[${PYTHON_USEDEP}]
+	>=dev-python/backports-csv-1.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/configparser/Manifest b/dev-python/configparser/Manifest
index 9e52d7a556ee..766a57947481 100644
--- a/dev-python/configparser/Manifest
+++ b/dev-python/configparser/Manifest
@@ -1,6 +1,6 @@
 DIST configparser-3.3.0r2.tar.gz 32885 BLAKE2B 395a6fc69b1b4c8f6d59bf088ade94f0573faf26964a38a64393912fc8ea7279d4d8bc67d3f7cba5d754cbe82572ddc12e2fdef1ae3ce18cd216f4705eb78b85 SHA512 86c095bb64766e87ba59462a99d0287ec52073f27a1c9be7d37568516bc0cc4af6f362ca90a1b90f52aaa4342dc275d769c77f18d80c0efb114ba6fce37fff5f
 DIST configparser-3.5.0.tar.gz 39573 BLAKE2B 100baa33268376e44bc8f7f8e875e93f081baf71226fd84430823617805c0c983e49b5ba08261ba0d73e92d30e0151a9ef9733031673e16fc4012f4020881298 SHA512 490b9f7807bce02667f41a48389b51f550818d2bd4296b528833d65d4b04bdbe5b906e7584e55eee4495405267a697ba26a056e6504fe6b3f8cf07ea8f55f7d3
 EBUILD configparser-3.3.0.2.ebuild 500 BLAKE2B 7a2d3c01e3f256c953e6d5609572e3aded6f23d0d8420b9e7a701aef341833822345fca08e4d2ddd417bd56f593fe4deee2677bddb912c36ddb46f2051cbde60 SHA512 16602bb08b32942017d65476aea2599975e1aae9cdef2cf883d4e7be1521ab9cf2d6a92c4e4e556893d9c10fb5ee9a1df40d3e45e1f6e77aa1d0550f77589d95
-EBUILD configparser-3.5.0-r1.ebuild 651 BLAKE2B aa74cf77abb99b6b43e60fd2603058cf47326384f8da1f007d6e542be559e8f421a2386ed6b0f6371e37e1fd43cd46275c66943a8a51da3a898ac036370ab40d SHA512 5732b02199691c6cd83047ddb47850c48181e48eab4ce512bd58b76b6f96e84f139327617b3973b728e25300eff3976397db76ff9044fbe53705262fba9be638
+EBUILD configparser-3.5.0-r1.ebuild 684 BLAKE2B 7a3644a9276746a2879eb38c1caa27a08884d2a646afa099c5930129729f67ae33b49094645fc308cf3a2cf2836d7cadd0c365624e2b67fc55d57de5617ed076 SHA512 bea819784cb7d9b89c3d7d8c662fc73afc5a19a36b764b091c1220c0a9b1fd2b5d43e3f3b0e467299822ba9ceb56e4952512860699f46a532b330bce25b42b8f
 EBUILD configparser-3.5.0.ebuild 481 BLAKE2B f2e30b2f547e6907ef248c336a3ec6119e8840d0fd136e1f4b0ae9d68c6e77554f1a426c7a0013d605d822cbaefb35d3a278aa6856d3680d38278392c34db8c6 SHA512 ab1da86a7dda7d63fa301adf70106318588137031df2e478f67c8b7b5d789a667863eb8f4921836a8b7ee92bfd2dfaee8a8d2486def28f7b63e08d5bc696e902
 MISC metadata.xml 325 BLAKE2B 8b2c0dc1df941bc82398abee2ba3521a98bf318d2cb7ab34105eae2f10582c94d9d6c14dfc4eb9dacf1a87c0e4e0b80aaedfcf8d172205ed2b945abf1d3578f7 SHA512 84ae4fb022faa7158c67ee9be02019edf93a84b0f97d56e9bc4384bb57abc4f7c93db747627cd87696506383922101f3f5c58ed8509111b75eb6f3574cabc75e
diff --git a/dev-python/configparser/configparser-3.5.0-r1.ebuild b/dev-python/configparser/configparser-3.5.0-r1.ebuild
index e81b1d796161..7e15dbc28dfd 100644
--- a/dev-python/configparser/configparser-3.5.0-r1.ebuild
+++ b/dev-python/configparser/configparser-3.5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index ebb3ef93a9bb..300cd9ec946a 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,5 +1,5 @@
 DIST contextlib2-0.5.4.tar.gz 28523 BLAKE2B ada08a83e968f58caba5851b0f6ea0eedf8242d5e4b0d4e9c036ed0576c4ce8300669fd09d4ab3b019d8d49bdb79dfcdd03668d5af8519119013c931f037daa8 SHA512 c8bb5bf9dbbf5bfd882663813f2a456d82215be7ace55aed1d5047ce7f21f26d5518982ec26344b1e950d3aea27cd8a5c48627730bb28f8b3cfb6a331fd7ba66
 DIST contextlib2-0.5.5.tar.gz 28755 BLAKE2B 4fa16a0591c5e2138123b4f6d539bae8993bf826bc92b9ba08d335efd142b5e20c53e0d4e3cf5d7ac5d8b43cff45a19e170a7d97a9300fe385fa53d042cbfa38 SHA512 d5c97ff8eef7d8b14da0bfdc3515f8019bcc05e24cb922ce08ca2366d5182b029d873bbf172e9e6791297df05e24f6faf40868550063dcdb54f451b14c9e505d
 EBUILD contextlib2-0.5.4.ebuild 615 BLAKE2B f3020ab69487a87067ce7148f7833665ff3d81bf04f07b1dead69e2e12d307dee6319bfffdf80ac18427a5e98a8cd7759bdfb6a7a14082380e8260a137cca116 SHA512 79df172750eb66c1137916eaf2a09d5cbb9b2601f0608c1c57c463d14544d5847da6fa5b4af22cdea763cb4b00aa2c95a58dd1420da53f4f6d302f97939ed20c
-EBUILD contextlib2-0.5.5.ebuild 648 BLAKE2B 4e5842abd272c21a02752cd8dd4168379fa09d77071434023e2431b326bdd31a54a03d29946313e6568a54a0ea2f6da79e933351c3f27fe376d1d5a64e81e016 SHA512 180ce915cdbf0b71f7af2b7fca33339196f97221d86498dfaeeba18d7e01d240e330fc2132a2a3cf4191aa152c1ed9eeb34fc1dd47e6f975973550ebfff64781
+EBUILD contextlib2-0.5.5.ebuild 652 BLAKE2B 16429a3d6cb5a3ae826047acc323a9988b9d8e65320d40c99d0fe170a7f8d7a4532d955452254d987c3b19296aac7b47b70b2ba9a6aeabca4758f9574c1eda24 SHA512 26b27e2c153afcc8f4d16e6537e109693bf8c001e7269576358c5c8b99670fe93df98ad978a3b77422596bc8ea09f4833c1405fcb1c1a771059990e6f607e624
 MISC metadata.xml 324 BLAKE2B cfd3b05583ab0f14acf1057ac34124525ffd63c1855689ac19fb10fa9f998f477d1c070226c9e5798dd68c8629b2564e2112d24f38306a0f3958526179c4caf5 SHA512 616fe24d7cf8c1e1c52add7d9a8fc15d6e41cf20c116e73997b1e3a732110f6305e5ec50de9a4be75d58c588f55da30980bbdcbd65078c05a6da0dccd89cb36d
diff --git a/dev-python/contextlib2/contextlib2-0.5.5.ebuild b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
index 43aeeaddd916..df30dab09b42 100644
--- a/dev-python/contextlib2/contextlib2-0.5.5.ebuild
+++ b/dev-python/contextlib2/contextlib2-0.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2.4"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 8e058a013dfc..8914162a68ad 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,5 +1,5 @@
 DIST defusedxml-0.4.1.tar.gz 48889 BLAKE2B 4b4225c126a4d8997e7a78a5257991da4a767b3ca8b0ffa7e1414a1342995c02a389271579329990b786f71919f17a81f093a2e4f14d10a50f88563ae4acb6e5 SHA512 78a7a1f3d1eed9d7cda00afaaccf8153c7f616303c53d3918341d75970d532932b04effcfc8b1b8ed88ba6d730cb56400e9e4ecee8aa7d2181c7577f1d535783
 DIST defusedxml-0.5.0.tar.gz 60405 BLAKE2B bd57b3b705abff71ff99ce4e43fe4c1fd708463546cc5d614dceb56f36e98771ef5c952a1aae010d32e4b557ed687c194c61723a0b3334dc1b0d517591d7c3d3 SHA512 71e1a604df9be41ded454bcdfa63610e897eb405295d7365fcddfc5f50f7572c36f0bd91a4a1fdf47d1b097637bd9fdcf08f1cdb73e2fe64eea0320a7532e452
 EBUILD defusedxml-0.4.1-r1.ebuild 634 BLAKE2B bfa607f44a3a403141d6c1edec56c4c0f8274bbed35f1f7d4b92eb900eb2769e2ea5d3b84beb9556feed9023ebf4d7f89dec1040e7d6f0fb92dba1adbd007796 SHA512 c9fe185beac58bccab22be9c73c8a3afc5dfb74572092e89b6947faa16eff6780e304ad83cf885eac9dd4c5f1c31b14112b55590b608d5e1c0a7caf789cbf892
-EBUILD defusedxml-0.5.0.ebuild 704 BLAKE2B 6da573ff37c9c79f847bc4db34ca574efbe3d455b56cb2645332a16fe60da4ea7d41c7adeabd98a72bec5d31600250ad739b7a303230e049a087af24418164e9 SHA512 33537a6a14afd0c544220bbfd81245912a0156b276f181d544b63ddc83317feef724a0e0dacbca71d4ed226b877eea1ace8703b0b0d07e9699504d54c6f76ee7
+EBUILD defusedxml-0.5.0.ebuild 703 BLAKE2B 3f44a941a3ad8a208ce08ed3f226bf15e528fc50113702e98cf9dd2d9b5fd1dc46c7379ba5cf9c36d07d35c92d8dc645de83f8b0aee7d49fe2f629bccd22aa99 SHA512 a91a38f6f1b31f8bfe21988b0f1809543e66e62f2376fcb0a42c1daa376c6db4613771a5ca76c1402c736e84b5f0c56a0085bef85afae08feafa7f6b752756e1
 MISC metadata.xml 384 BLAKE2B 27ce5f8830ff4e0646f95d633cbaeb85576ec01fea3bb46d7b54d2be2acd6f154ccfe8455169d61014bce03e5434eb449c2876c53a77f64bf083559985531de7 SHA512 377bdeac0f80c45f6f6f3387182e75c47e8cd526f563a1ce5305119113b4a1c4a99dc3a76bc91d81a967498645c9a23dc2746b62023dd0dc26e8d55d15424b6c
diff --git a/dev-python/defusedxml/defusedxml-0.5.0.ebuild b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
index ef0a86519e59..91a0e0407c60 100644
--- a/dev-python/defusedxml/defusedxml-0.5.0.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.5.0.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
 DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
 HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="examples"
 
 LICENSE="PSF-2"
diff --git a/dev-python/enum34/Manifest b/dev-python/enum34/Manifest
index 8b366f0c8e30..f9dd9a98693e 100644
--- a/dev-python/enum34/Manifest
+++ b/dev-python/enum34/Manifest
@@ -1,3 +1,3 @@
 DIST enum34-1.1.6.tar.gz 40048 BLAKE2B 3960e78f27f3ebf70e9aac5c4ced87d974cc61e5d9afe5d787188e3e877eece18153036035187e4d7ad63bf2a54c1c393f0f46f5ef7bcc9b67658b4ea441bb7b SHA512 51652525adc37bd1af1d81933f965dba9c508838d9f759c80ca1392991515a29c2c0263264a4e175b37a6ba11dca68c354774e448b19ef1bdba96be5474d93ec
-EBUILD enum34-1.1.6.ebuild 742 BLAKE2B ac19d83b5fd485936d7f081e19c5ea11fc773d2fa6411114785d9a6979bb8c66d62333be31538bb215359bbdc4286c2e5155b245786e49a6de945c3f965ae069 SHA512 d89e1b6f75572f1a3a6397dcd01d5adf65c5cf9a9d385413ebbca4ed46f190ba65e82dcfc2be101105e0bcd538448fb33523d0949cc7c2f0b48027568e6c98f5
+EBUILD enum34-1.1.6.ebuild 753 BLAKE2B 9680e87dd26bccd5c70635ab3f19963564d1b29279228850479116443663d68f1bd8e467663cf49348526a42ff9227373e5430f07a405f6f4da90b8602c92fce SHA512 510af69f9c0198bf545136aedfe7f2e400a36c2356fc24def82c0e271687e74ae5b751a98b15dff97f12362d2a7cdf4e5a60739b5c84e9d3db0c80174ba4001c
 MISC metadata.xml 432 BLAKE2B 3a9e10694f057f6e3c483217b91cde6c42429defa247fa0f658a06541a77aec2cd6babd25dec4989e9a0246432358fa34c5211f36939b706d28705c0414ba698 SHA512 8c05be54dc369433faa69fba6fecb610e74d9f71d6f3feb53bcb2c7882a8e5cd64d90456a20cdfc73c87555acb62c77307ccef393b84dd6e979c83bc3cc3d640
diff --git a/dev-python/enum34/enum34-1.1.6.ebuild b/dev-python/enum34/enum34-1.1.6.ebuild
index 0223ef3faf92..ee80909f3304 100644
--- a/dev-python/enum34/enum34-1.1.6.ebuild
+++ b/dev-python/enum34/enum34-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index b98793c90895..bfe1bfa95ce2 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 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
-EBUILD jaraco-packaging-4.1.ebuild 1184 BLAKE2B ff7e760ec0986df1fa0dbeb175b18191d9bc3d69e67024dd047cda9cd819314935ba703a70c328fba1b010c954221f2132ade4ecad3ba01fcccdd9825474d766 SHA512 5cd75c418bbfc975f436c3e5acda00154e6e4d1c029063c496d52e3cacf2dc3ddad636a5cb526a9934bc97f8e5416be0cf2ffd2ad9bb809b41960314d293e5f1
+EBUILD jaraco-packaging-4.1.ebuild 1188 BLAKE2B ce0a0c130ffbe158bd6fe3de352d451ebaa0e6d25a02196772e0b06b24e3b0d5c7429f2163dee63de807e4c2a6af51314359ed1fe1eeeff16bddd2df0b64e51a SHA512 ac85ce69f202233ac90f265630b841f0a8ede36f8388087024afb27c965473fbab7cee925c3c514823819d12e9441b780d6533d3f0ba1aeafe2a4d905aec0bb4
 MISC metadata.xml 683 BLAKE2B 25b11a2a24ca06ab9adf0962d870a763588af81bbde85446779ec51735b7e11ee3cd5dfff59fdedf304cefe9fe7d1c2867e917b4a0b5a08777ab2986fccd2f00 SHA512 b6f9d4889c3591dd7e70a4945408a75ccb7eda388599cf9fbf0020ca15152ce4b585b61f8f669980b01386fd277dbe3f8f97e633a148f60726b5260d216f3071
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-4.1.ebuild
index 2dd0e6e77747..1fc9439153ac 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="~alpha amd64 ~arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index eea34043ee91..543d96321dd3 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,5 +1,5 @@
 DIST lazy-object-proxy-1.2.1.tar.gz 28860 BLAKE2B fecf6830111c9ac317fae2ebeae624b4b62494eadeca08bc6cb63bd6a23132cd954a55c97efbede3b136f4bd20d2c35c861d3f89022403d7d777bf762c656e81 SHA512 60813fea51e14ccfa22974c547c7179593da25e4ba65380c39493d2b91558bfcdffa298fe0a043170414d897bd72fd22f0bc3bc3fbdc8202873fab6c2a8e45a8
 DIST lazy-object-proxy-1.3.1.tar.gz 32237 BLAKE2B 3052c6952d80365c6698f50c5f4508d7448a68b33ca899d251477e9a728fa740a0bd1d3a85f5ccab63905fbd062e5c37da59a827ca58e25268e7ced6fd9a961c SHA512 9ea4fa0185431859ff79fd6dc59106c2b64e372b5052d034b3638e362695f10b27b59f57c5aed73bb2350d3963f98190e3069f9129b9f3f4932212f9b5460962
 EBUILD lazy-object-proxy-1.2.1.ebuild 975 BLAKE2B 244526fcb91eb4b406fb88789ec4330e0e2cf03f7ca1fb991da284827e709e49cebedb0cfd1605df2a70bf5b47a66234a04edc55531da8329a0aab7670d70370 SHA512 ea371aa4ccee67ea2edd437e8f932ac538f55c4ef77bcba8d34bf362f16295465c853342943e5b281dadb9c62a38f4009bb913f6137f248e447289f56f5cbbe6
-EBUILD lazy-object-proxy-1.3.1.ebuild 983 BLAKE2B eef9a4350bf9fe1d9875921eebe5390cc226d98b670c69354ce6062108f28228030847af2c76783541c8f1c922d78ceb32181f0514254d0638e32c0d03ae5c25 SHA512 670e2a6bec451777c793c26b64db1fb5d7cad6861c44be941e9725fd48458ab67e5ed066281403acb8fba09985feb43d482da5b75a9eae34f846a71c0e419a90
+EBUILD lazy-object-proxy-1.3.1.ebuild 1005 BLAKE2B 7fa76a418c145ad42df48edc7d65aae7407ba3ca92c48fd8c8bbaa2e537cf5962b173bfebe1ef08d6a0ea08b7f3694131ae8418354f3268b39638f97b4a0c90d SHA512 f09f7f5edd677759387e56ebbf87ec0fcc6f22ed17dba637c87d6862e82b87f25cbd2b7b83d660049c0d951ed0c12c8e63059f744cd9f468cbb06fc9aafcb976
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
index b96994cca333..dd696262ad70 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 4e15d54b436f..107752a8c4df 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -4,5 +4,5 @@ DIST Markdown-2.6.5.tar.gz 301781 BLAKE2B 527a84bc8c4a891e64749bce273bf10c439376
 DIST Markdown-2.6.8.tar.gz 307330 BLAKE2B 6867f15425bd84bc030ab52000dc2f83bff0c9885854cec4a2a785f80b18129160bc57da30226fe17f42043b4938482e2e4eff9cdb3d4370b0146cc09f1ff576 SHA512 85c1a16ebb50af79f378eb2fa936342df6174a4f597a74fee6d0495ef2bc4c7c8337463799e427cb6788b3429e400309958b5c4784f536593047ab2e47ac7c23
 EBUILD markdown-2.6.1.ebuild 1262 BLAKE2B 00d62a618cca711ddeb1979dd00c5d486382d16c46d213d23fd8e9f764e75294bc4a04667dd16ecfdf25aa7a7adccbada7adb8623e7a7ebf6b8aaeacacef4bbf SHA512 ddaac99dd6fc3f2dcf1f2cfd14d8401058fe729fea31bc82f949cfe168fca6d093634b98eef3868f80bdb7a5386e2b6b1e87eccab17f969c60dcf365398ac41a
 EBUILD markdown-2.6.5.ebuild 1413 BLAKE2B a58769e42e854c1904f23b3a6dc72465d330c453a3f40737df17e29e98c3d7478352c106d02a97d400ae95e8c70cf8be34b6591f79a9665d3ec36cc9a9172c31 SHA512 0447c35221a7aaa7ea6a2d9f82a6114811f6c468bd6d6d09e3faf788b696c69ae39253e1293b2a1b44d6a72a53b2e203d8280780706b37258980094c0570d3ca
-EBUILD markdown-2.6.8.ebuild 1453 BLAKE2B f462dbd5584fd0847506d6f1d05bc88ed83d85a1ad9ef70f6e161c885dc9458bd7510ee83a211c2f83e0ae48b619ebd6f5e00aac2bb2281c3f60c792e5603d30 SHA512 0942d87c8d3c263ff03a245cc0fbe8d83607fd2254f8269cc1359f715bbfbad481191fd1dd8a3b25d63fcee1f920d8c2f9f6708860b91443b7e44d795559f417
+EBUILD markdown-2.6.8.ebuild 1452 BLAKE2B 82afea69742bb2c23686105aec9d7fabd8c0b72dc229a1c6ebb62cbbf1d96a105d4b589c365487936f59ca7def80df3431f9c5907ef98a2f0aeba9e805667e15 SHA512 bc386ff85c870bb5e5890b6aeaf921c0e92a8cf46965435dfa5a93bb757dbe88d6eab0c74413ac0585e1e45d11ba65cacacc998f5f51b2b4e154f410be94dffe
 MISC metadata.xml 465 BLAKE2B 8eadaf9d2733b1b3d93a389b0009652eecc3a0c3b6347ada4f27d99bd69b0de1be199eb1da7854655b8814a946f40a711e8fc092b22b214c18dc696dd3c0222a SHA512 4c9a52b62e49040fde94cc2d3d9edf88c42d085639d893fb81d119b8c216100f912e2725a1bbb31b1136b505ef8102f560989289da5aadc6c8f433f0186da44c
diff --git a/dev-python/markdown/markdown-2.6.8.ebuild b/dev-python/markdown/markdown-2.6.8.ebuild
index f207fda4bd1d..a9b09e5182fc 100644
--- a/dev-python/markdown/markdown-2.6.8.ebuild
+++ b/dev-python/markdown/markdown-2.6.8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test pygments"
 
 DEPEND="
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index 0a89398d2a54..144643e1dc0b 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1.ebuild 811 BLAKE2B 8001d057561e506802834b29c6620638203772cf79ca4382b5e88f94f5f4683e377e7b90fa3c1c468b12ac7eda906885ab242d47249c38dbe2e7209d78034047 SHA512 c4ca372354ff8015253d5a4ee2da332f66a3d59c38b1ce647c56f51f9f9e3dda44bc2aaf68c67fdedeee5e9020776eb1a0a2e8383e161890e5d861c25b26c2a0
+EBUILD namespace-paste-1.ebuild 810 BLAKE2B 723361dc32be467126a370550fd44374983a3085cee69f339e1916156369190cda2e32694a02ef4c5150ec771b9e0058ddb9c327df81550a2e92fc1b0934237d SHA512 9ccdedc9f8f9983bd45d77863bc8a4979f28c20ade15f9e4b9b78dbd82bba31112140628a079c37e03c884d47dc2be4b6ab5bd9ffb999a0075020b07d58dbbae
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-paste/namespace-paste-1.ebuild b/dev-python/namespace-paste/namespace-paste-1.ebuild
index 7fc9d2d1715a..697b31cb5022 100644
--- a/dev-python/namespace-paste/namespace-paste-1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 8e293efdd5b6..f168f63b75ed 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,6 +1,6 @@
 AUX pastedeploy-1.5.2-py3-tests.patch 606 BLAKE2B 8f7d5a9f8c517e14a1ecdcbfa040977ab9d3c8e7a072eef3c31d50ac74c02b377ea25fa965d36a89f3c9e0fbfed63364447cfe5525468766df976445d9cebe9c SHA512 0301653864071de976bae24a945ba6d8499aaf21d41c5117ad922254055ee8a3b975cdadc6590677cd458a233ad115647a01a05d52feb0dd40d16bcf4de8f5cc
 DIST PasteDeploy-1.5.2.tar.gz 24006 BLAKE2B 1088d5cdafc80402b44c6c0e62829d1efe666d9ef8c84409125173ce927aecb8ed3ec4283b9821a42cc614d27e74e43e79407554fabfd79f6a913f9742532c72 SHA512 03147b2e735f4504b928066d35f46e7d19a49b85afc506b793fba69c8827a4d5b8185074bdd4a963ac392cc104f5a608d1db9a3538d7d3239da5febcbff4ccab
 DIST pastedeploy-1.5.2-r1.tar.gz 29528 BLAKE2B 0c36f24e51eb66b9a2176083d42726be5be8e7eb9b7d73972bcb5a2b0094beb1c88f3eea9ce94bfccaf688b6f5fdbf18e43e38694b91107a141ac0acf0576ed6 SHA512 5d9f648d4bddb4fa0b018f5e1c100d0899ff9e6a429a0a54aede69800fa13b7bb0d606ff454c516b36c3b056320bbda4581de9d57a154e71493a8bd6208fb3ce
-EBUILD pastedeploy-1.5.2-r1.ebuild 1059 BLAKE2B b13690f6764fbdf1fa8283683f5a9be9e0b4bee7025100875d9152565839d7ca5db5e8d474a2fdd3691cf331270404ff25c73482778c4800e1ac6c42e626c178 SHA512 5a41b52d04f6f4f04007c9e14be7e51898579eeb0d8d5da040aeb970ceb031e1d94bfe279229a3cc4eb5ba1b09df1f65e2f622fc2a1d19fd0ee33fc55c3ff4b6
+EBUILD pastedeploy-1.5.2-r1.ebuild 1058 BLAKE2B 0ad38a1c33cd8ec6176ecf562c1f4f4f5d9dbe15dcffbb89a82259475f05f8390d28c1bd598ae5047a18d59698195e851f3b62f94bcf37e48c5ef2ef043be261 SHA512 25ebc671272eb7d630b40cf1a6008b1d4ae7d9e84a103fe32fe9d68be72b83d3c60e774e4fe269ce07f68c3a57d35f41c57b25162baff7f2ac1d59bff569e348
 EBUILD pastedeploy-1.5.2.ebuild 756 BLAKE2B b3120edf4162540cad0940cc076b7edbfe426bbc383d6ca62510aa9b354fd1789c0280b94d56fbe4e81f90edf062daa98b513fdcead777e464fa8b8e9ffe5c38 SHA512 d8dfb64442a57535b875302f9e0d7d95a81353c7cc3909c92160842648c08a27e3cb4ddbb62ed4dc3454d30033f9d4c537e6884e0cc7f3fa2c25ade913d51032
 MISC metadata.xml 806 BLAKE2B f945ec7a43dac81abc59fa63d078872fe4bbd9bf3945ca0f03b4d78bb2511bbe137ef8d01424c5c54a55b73f22778dbd9efa009ab64ef41a20d55bd71bb15e99 SHA512 da770a4fe1f5918391fa4861dab525dcee34d5aeb362a464307c6c8b32edb4731effd22339056f01d77eea8d3729d3ca57572d1d95ebab8b786cad9029250f7d
diff --git a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
index 4bfe800fc67d..d33345d81cd6 100644
--- a/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-1.5.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://bitbucket.org/ianb/pastedeploy/get/${PV}.tar.gz -> ${P}-r1.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
diff --git a/dev-python/polib/Manifest b/dev-python/polib/Manifest
index 426ef93afd41..540a67b0f902 100644
--- a/dev-python/polib/Manifest
+++ b/dev-python/polib/Manifest
@@ -1,5 +1,5 @@
 DIST polib-1.0.4.tar.gz 151634 BLAKE2B d0f28ae50e1c082f695867da2b65721d161b9df56b4978feda59388b20fee3c3a060438aac0f1f08420d5133d1b5425715a3c0cb00dffe0e7515d642e287d2cf SHA512 a38d57acdaded0371be83825a28f14f178aebdbc0435724f33eebda109adb2b8210e33659ebec88d2d9e98aa60c482d7f8a958ec18f6769fda7a2fb14edd2744
 DIST polib-1.0.7.tar.gz 156282 BLAKE2B 4d4a9f9901fe7b7b7aa5fc54b9391e051b8d02d1749752e1c9a563d9285670db5d43d7c5015fe266f78c89d1ff7a334bd2afe2d7d8b68fb376df35f8902cb0ed SHA512 bfec3538f9ab499ff2149bb40e0685b4cb6d5f0bc7ce8dc33e1fc511a6169e01c1a317e652daed7b3bfd9bbfe6ee1d545b4d8913f54e91504c4debb5b1b94b6e
 EBUILD polib-1.0.4.ebuild 754 BLAKE2B e21ccda996b866c4e4aaa37aa6290ffc897a6910b2c9cb3d7415b6aa3c4316f7a04449ac0f7617eaef6e32a02f1c6cd9b74c8f2adf0817e145ee0807e9c5fe62 SHA512 7ed72366cc0bd3b039bf9492143c9627ff9213e86473f7e98004d9f0aa4869cc36d939678ea30fe83206b1b5c19e1df6441d4bdf34bf7958c638d5225fc5e3ee
-EBUILD polib-1.0.7.ebuild 788 BLAKE2B 7995b3b133567a2a5acd5039660bc080234fe490df91ac517efcd764e5d29faad185fdd9270c7f95272fad2e8e4101a656f5ec0f359defecc30045072c7f91ab SHA512 77b9a64a3f17fb8fc8c783818fc3b2103969c165ffe77a450741d576590fcb80ebfb2730f2a33a82240df45acd6be3cf379ffc1867e1c752fcac3927948852e9
+EBUILD polib-1.0.7.ebuild 795 BLAKE2B 3eeb15f30f2ed4bd0d6c1982298a7eaaad72b222b0da786e5de8cc02a268d06c27f96eef60d141368f871359d352a0373995a57b7c3a722bc31703a2b44bcfdd SHA512 6cd86d5a5bfb89e1282804cf69ef19994a3cc6db6b33fabc7786fa832d4ed8ccb32defd569d1cd4b32f69d67eb4f63dcf0e13f3ee4e57201bb7544f71783b213
 MISC metadata.xml 388 BLAKE2B 49be94fcd86aefe8e2c4ab2035478b470236492908f7d08822a4e035277c83d557f78076d72cd96d6320ec08276c629dcd52d04380518cf694c10ebdee0bce16 SHA512 7afe518c98f3cbb71d13aa4cea16fe59eae8f711a1d1dd58c982c1dd8946b0a69196e0979612c995d53be215148d05615226eecc4be457adf8cd35b96f3f3f57
diff --git a/dev-python/polib/polib-1.0.7.ebuild b/dev-python/polib/polib-1.0.7.ebuild
index 6ea5f07ab43b..5ca7a26e11fc 100644
--- a/dev-python/polib/polib-1.0.7.ebuild
+++ b/dev-python/polib/polib-1.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 666e2d8d39a4..d3aed74666d6 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -5,5 +5,5 @@ DIST py-1.4.34.tar.gz 194450 BLAKE2B 3e5733bb53d4f7eb8e6d43a5140f2ddf692d4272b56
 EBUILD py-1.4.30.ebuild 1267 BLAKE2B 0bf04f6cb87a246da8bb59f350879ca0b8e7c260d1afeaa397ec279c0988e2dadf7e3dc9a723229631fe0589003ff0d55d23977dd845341cb7d4808102abdce4 SHA512 0eb97c51441aaa91215adda3cfb127518b4b784d785447e9568a9b6bbc880c9693ec6fe0e370840f56a157eb10102ef7eef1169a302a2f9a4672568ac9d3ca0e
 EBUILD py-1.4.32.ebuild 1280 BLAKE2B dd0078e082ec09527ea7d44ad962dfdd4aa29aeeb818bde689c3e5e543634a99aa98c547009132988b498a625a749b693bfe4bdcc6824d350a9cc5443e9550a1 SHA512 39076a753764ff3a27a5fae530517de09f4295ceba6c689e99014935cfd183f86ba25b12997ca05177ce71aca6d5d202476bc9c2a5e2680120fff655954dbabd
 EBUILD py-1.4.33.ebuild 1280 BLAKE2B dd0078e082ec09527ea7d44ad962dfdd4aa29aeeb818bde689c3e5e543634a99aa98c547009132988b498a625a749b693bfe4bdcc6824d350a9cc5443e9550a1 SHA512 39076a753764ff3a27a5fae530517de09f4295ceba6c689e99014935cfd183f86ba25b12997ca05177ce71aca6d5d202476bc9c2a5e2680120fff655954dbabd
-EBUILD py-1.4.34.ebuild 1276 BLAKE2B c889c6babbc3d7c213d50e3c5a6b8330ac039a2f27bcb1db3b8d3b54d8f9bcb5a8cd219a368ea9ab3c4cd8c7df8e89b645abcaca0c8a60e84dc2663ad5df7922 SHA512 ce5185bb92b0089c408859fe96ba760eded1884d606d68421931b63576a32a0793009bb68d61141a81a4dc208daa86c7e3d04d8d6f50b5731e82c24b933f046b
+EBUILD py-1.4.34.ebuild 1275 BLAKE2B 3631338dab456c8a6cdb7974cc519b20347c861695581216b2b5b26dc69dbc24ea41cbba8047735ac4b65dad56afc118545b821c940ad3c3b13e94f61fbaec4c SHA512 d8baf73703766c1726b4c0e754d90d0df6703258eaa28cb5d1d17800ebfcd026c73150e8c71a527edf6683d20b740e47ee4159192485fca2194aecb5498217b6
 MISC metadata.xml 315 BLAKE2B 3154c92be7826e4b562d5172b792f652ede8fff96b3fd3abebea5d6107eca432718bd0c8be7934a9f90a34891ce6e9b74d02c82881976cc86ed9635a0457b2da SHA512 e2ede56189d791c18b64d1db6615249e6ae5a3afd31f17b9ae6d23e9123d4c68a22bc61b7935deb284d2fa7e6732679e2286a271854dc818e7f651e9daa54fbe
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index f8b5156bd86a..69b9e77d840e 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND=""
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index a045b05d9df1..5ee8d6d17760 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,5 @@
 DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
 EBUILD pyaes-1.6.0.ebuild 556 BLAKE2B e1c2649a0f766f9591a6413a133395f75723a5daf9a69f7e34889547965b7c418966efa9cdd432cf10ea32cd2e04bbf07d5c10115eefe219cc2f51b2729fc8a7 SHA512 c4a462428fbddccf281c512e290a0058a7ab40b4aaed6441b8626257a06762e6f5ca7dd9e4badf00ed4e93f88d6f5e6be0f4b426c2d2ee46d44b4f9aabca0145
-EBUILD pyaes-1.6.1.ebuild 554 BLAKE2B 9f4db3387341c8bd57e83ef7a95b5fbf18f6abd99ed58221a74bc6eb87beaff5782f034d6d49cbb9aaaed1bb0fd7ddd007a56f8a9a985aa5b4c301f8dc2ee3e0 SHA512 c17cedbdf322f1a42a16911ea18187b420a0d704a1b555966a94e5014fc910cb00f8a7ab3c09f4fc9a8e5865e6e5d53f962283f9d73d26e4eebad2f3adbebf40
+EBUILD pyaes-1.6.1.ebuild 559 BLAKE2B 3244f8519aa4d7af3c869619ea436cb5c2c888054239ea7ebf857d01e8384bf34a8a12f0308be149bec76fc4980975816363f0ea4e6e94c664b644b343244ff4 SHA512 953cfda3bbafb445261748711a93273eb01891919300d55331822ffa8d9827f3894000b9c36e78649e0863494ccfb16ca137420af16620462bcfa7eba48bcb9e
 MISC metadata.xml 330 BLAKE2B a1edc8608660194e47165b930dd3f08c6251d1e1899f2c5b986b14a67eeea1911ba1fee97516b640d949ebed958f4523e0351839e25c1f99771d02feee8f532d SHA512 709c6dd149b11725af862bb5d43be89be3f2432b0c3315e4d6cbbf45a98345b8bcbc092e9dd4d21b3501753f3fa9001d5d4ed5c6db6580ad311cc96c3c76cb9a
diff --git a/dev-python/pyaes/pyaes-1.6.1.ebuild b/dev-python/pyaes/pyaes-1.6.1.ebuild
index 380ca382c34e..cfbc10bcf359 100644
--- a/dev-python/pyaes/pyaes-1.6.1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index 71b292047647..c75cbaea56dd 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -3,5 +3,5 @@ DIST pyblake2-1.0.1.tar.gz 128037 BLAKE2B cdee6ea650b152ba8d41698b6c08e95a33b4cc
 DIST pyblake2-1.1.0.tar.gz 125855 BLAKE2B 46af4c24882040bbdd221f90e06652918798e4555c0a7307a596ca4c9ed3147f00297269a44d174782c2b0402eac03ecf5387b1c5a16efb57d036730b58b2630 SHA512 e13c7e4f3a35155cbf531e337895349ec01f0ac36908a4e746cecec063601adfc8a73a7961a9c310d01d3231f44f08d2cc92e891e9cb87659bc7170b9fee6102
 EBUILD pyblake2-0.9.3-r1.ebuild 1485 BLAKE2B 9249f9d8c7802c08c01e726f552532bdcf6fc072f5f826f919d8c3411bf2e7e80ba780f4b7a517e9609dcc98f9e9f1105134df19f36e52660f409197887d6f4e SHA512 840f62b6ea7355b97f7898f94ef88392f0dff8e909a5383a5d601d6c5a013a1cb9119e6af92033e6d28bcc62a7745f0ea98377a18c63e6d1ee3ed75045cf5749
 EBUILD pyblake2-1.0.1.ebuild 1471 BLAKE2B 294227a89b8516d8362e67ff714bcbef947e80eff9a06ee56a60464d4889d33eb15a28a943f94490f9dcfb38c86c01ca7b5dba47e31a92ec617fd39c8799f913 SHA512 c687fbce7c0b625fa1d03cb5a63a494baf1f3fb0a3471875a7fc91c84ef5e50946ef90119f916d0219683f2864662a7c52be564fe739ca0f269961c926116511
-EBUILD pyblake2-1.1.0.ebuild 761 BLAKE2B 02cc63dca87fdaced773298ee6dedcfae71ef57f2c3d37bb71aa5dbbe17b334d15e6e2abb7c884ad0cbcc7f7714c5020b56dc0ab56f227782ddabd5d134957d0 SHA512 16bebd7d098e55b91a550e59043ec6962417c6ccaf35af6b3f9e0350bd73cc9348914f239a448cc89fbc30ee463321cc1d26c11b9942186c7c36603100bbdc61
+EBUILD pyblake2-1.1.0.ebuild 783 BLAKE2B c034ef54bab98ba4460f09a29d2ea50405d3f16e32452877d0e91de31bc4996cdafa9d8a31bbbc6eeca0cca10b7796e24d0a4b4b5c95f764a8ca14fa185d61ec SHA512 fc1d0fdeaf357d634cc42ddf7127c795aa92ee3dfdc9fcb2e51df73afa1b4a022f22b1bfb92e05915f8d0d0bec345d75cfba443d63cd8691bf61edd54791b579
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-1.1.0.ebuild b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
index 5b0697139d1f..304362c5a0f4 100644
--- a/dev-python/pyblake2/pyblake2-1.1.0.ebuild
+++ b/dev-python/pyblake2/pyblake2-1.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 # pyblake2 itself allows more licenses but blake2 allows the following three
 LICENSE="|| ( CC0-1.0 openssl Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 7aeca0435374..5bb701971f35 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -1,11 +1,9 @@
 AUX pygit2-0.25.1-cffi-1.10.patch 2309 BLAKE2B 99584632af0f26ef92ada55fc0f8b3fb31c7bbd6a1c74211c991db8ec7f792b5d74c551a5e0d457512ed156a5536ab2b25f8b21994706ebf7c7af3234b3faa95 SHA512 adcd46ccf81d01afe5d959e50f0acaae392fc2422a7e0582a9d065d860c2d0d9245505ce5c156136921f48c126a3741bb65be5a021b53116ccf5f0f1451c00f3
 AUX pygit2-0.26.1-internet-tests.patch 5484 BLAKE2B 6b2d9462add5dea62e33da13aa0de137d1004b17b820796e78154944883e43a941527f344a1ea57469029228e5b9be3585fce76eea95e773cb46cab770f69c06 SHA512 2fa9fd5cbc726bba25b4163fb446c97161194e62b7711989cd676a5ad0b641174923bae5d8a72758262736b54ad3e217f295b39f60e6cf052945379fc3822184
-DIST pygit2-0.25.0.tar.gz 472116 BLAKE2B 5d3f487d99bf9cccf5ff646d011963d61e3b58337da68d6534bf9a1840f3f86095dce95b5308d6156206cd0ee86640af8fe230721b92a895d8ddd6ec81c08bd7 SHA512 44f94869718111acbd4ad41bc4c37ac66557e979241dd5a7bb080cf091fec3fc3d5aa53a8a84eb37b2e6f89518b2ac69d058e1970b7cf98c35b8375807fd8f86
 DIST pygit2-0.25.1.tar.gz 456580 BLAKE2B b7a9ce90076f2475df41f2e5ee8cbf7cb2ca68553076ae05cb2e8bdd68067f7373e33dfb03cadf90b7f410b5d5989b902b545fddbb1e3a9f17eb17d50692e982 SHA512 19908c874d5c2469609a54893f37367480d27ff03583c38b474ebb125dc9db95dc60776a120bb05662938d6eb62d4bcef24f684688e97e3453ccc27e015736cd
-DIST pygit2-0.26.0.tar.gz 457263 BLAKE2B 76469a53a529fb6dcc12da952821edf9fbb100d6043371748e493de9d453866adb1a790ec7f996eefe588db1a32faa66e9deb05eda20abee815cc85bcc616eb9 SHA512 e8626712a3b75aced14997dda0155f5c7be9a7e0e43aeb2c767c848fcbe711780137f663cc9ad5268cd85e2c61fd40be6853573f68b457cd5d46d6c32a644076
 DIST pygit2-0.26.1.tar.gz 458526 BLAKE2B 703093a5a292e92c90987785065f3a1590addc09d72311f75b22caf6fe1a17be8fb16cf777189835204cb7dc4d2066e841d3d4327e2cc040c312e22a4c75a8ee SHA512 23585bc0f41458442889b5434347cbc11d6c729898864262426f84e5b9239164bb58c6e910d2381b25f1b8be271674c1a6960630a504c40accdd30e487d27a7d
-EBUILD pygit2-0.25.0.ebuild 641 BLAKE2B 89b8b90fc1beb8001d578f13f001c1dff74be602564e821f821249e0cc0fdcdf1c88c3f37800da50408ef474bb8d9797eadb53f875d096d02106154a1e6ffa3e SHA512 d884ca94c0b032f1df2de58c91099a16df92239582a2b672dc95a4c3797956c56dd82c36661347129acd4e5be6f57e3c845d2cae34a40d28a4a5d11e8ec0747f
+DIST pygit2-0.26.3.tar.gz 462080 BLAKE2B b3c4b9b8a6aeba22a70a8d2ef1393dace3a065a3625ee3574058e333bca4ba1d60223939f412eecf5ae9d93a81fb81c4a536af46aa047c2c82a48bd81afe4cf9 SHA512 6f727686221d4e8c348f836b7ad278b48a4b971a121b9953c2cf7163bf093936d838aaf83e9edb8628757624ab27e8345a2fb29eb1a79a30e06c0ab0a77e4cc6
 EBUILD pygit2-0.25.1.ebuild 699 BLAKE2B 88dd65d7ad660682316bf3d85aa83e8c9c6d091e24cb28888a194cb77afe9713fd921363f9e8f263cf2de558cdeb5a40ca6f1152c2e82dc24030fa5a7710bf03 SHA512 5f55fd77acb4ddbf3fdb8d7d56dba9e3882dfe30a271cb5f0bb1a8dc89ee65172fd66ab0f46c543c8722af020be751055c37589e6d9b91f1cefb6d22b4e0f72c
-EBUILD pygit2-0.26.0.ebuild 619 BLAKE2B b52887ede77873c0b2cf686fd462ade5b36d811a9a3fbf43e0b5ebf7ab819322ba863b6d329cb30fd182ba367a75364932eabe9c83a22d730a72e4c1ee2ed0cc SHA512 cc8117191d84109951f47045fd4c92183fccf91f73a1abbe3880b71f4d0967874118a2a36ecf4cbf2faa2fb84cf82b5629ca48f185e2e0daf446d7af367995b0
 EBUILD pygit2-0.26.1.ebuild 694 BLAKE2B 48a8f3a97d7cbab3a2e97fb8868e5f7d98763482a9dd80252f75ee83c11996c7331da7ad56f71327852804055f40b08ba679a1377b1e0d471bdef6ab589ebeed SHA512 df7a9b2c20d352c626562c38e966065c4d33550def9806ab2abb73ed5ba4112bb3b6b9a8a87ef5e712a19ca4082d7e31253db6ebcc1d31ee2d17943bfe4f4928
+EBUILD pygit2-0.26.3.ebuild 631 BLAKE2B 0f4903e3613c3ce410c919c17c0a7686996c408e29519a505fa38825bfdbfcbf777c8c419288441801ca6a5123d9c5e9e185ff9fa7945ce58144afded00b5dcb SHA512 b07ec6e01ef855ade0bff6848224e278cd30a991f9c15bba5e9ae2476791a5f941cdd5d51294d412ea1186cc2748fe2a13a3233e01ff54cda88fc5c72ec2d927
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-0.25.0.ebuild b/dev-python/pygit2/pygit2-0.25.0.ebuild
deleted file mode 100644
index a88aff4993c4..000000000000
--- a/dev-python/pygit2/pygit2-0.25.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 versionator
-
-DESCRIPTION="Python bindings for libgit2"
-HOMEPAGE="https://github.com/libgit2/pygit2 https://pypi.python.org/pypi/pygit2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	=dev-libs/libgit2-$(get_version_component_range 1-2)*
-	>=dev-python/cffi-1.0:=[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pygit2/pygit2-0.26.0.ebuild b/dev-python/pygit2/pygit2-0.26.3.ebuild
index f250bd2d58d2..145de65074a1 100644
--- a/dev-python/pygit2/pygit2-0.26.0.ebuild
+++ b/dev-python/pygit2/pygit2-0.26.3.ebuild
@@ -22,5 +22,5 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 python_test() {
-	esetup.py test
+	esetup.py test --args='-v'
 }
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index e44270449512..a3e35cac1390 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -8,5 +8,5 @@ EBUILD pylint-1.5.6.ebuild 1671 BLAKE2B 2d216c6d5e454280d9537a5aaf3296333a3cba44
 EBUILD pylint-1.6.5-r1.ebuild 1808 BLAKE2B a1db2fcb6e86958263388212da4e34773d91e9de7de8eea08dfeb63d932f9626e809990782084c98cc52869a85ab7375ccfcf8cd44318e892bc3f8468a2b3ae3 SHA512 30c46db64c4bb9b9d5998812a4ed6141806f3f65bb9db6337dec2b8a8bb2370c683ca63bfc61b6024bf382daeab1f04c780285b58bd530037c92b22bb38e9119
 EBUILD pylint-1.6.5.ebuild 1720 BLAKE2B c6c27066f1fe15e279539929b102f689ccd863cf18b13ccbf83dad02705aec3fed0311bf995986ca62da2ebe3e880c531e53d342b1e62c038b37c9d1b77a412e SHA512 30b539c069ded628fcceec28fc83969109b02ec8c4619c03fd0bb44176cfb184b7055d4b0fbac3f0bcbe6fa3fccf4f3f3eb5694d77b31b823f0502a959bbc775
 EBUILD pylint-1.7.1-r1.ebuild 1822 BLAKE2B 3cea5b3d56abd739b0cf26c29e3bc919a8622fbc5460fc71b93886d09c689356ffca9d17bae7f5d89e5e6d906b8f5eb09fc0b8d7f8ce3c60661d6f28ca6da2d0 SHA512 d5bc3bed59b7566bdbe499608240f4f429f9d08a4ff053c85000e2f7f3ef4d616ebf9a169784a03abbe8128c849fad3e3e34566401711706d6aeb9e43cc08356
-EBUILD pylint-1.7.2.ebuild 1840 BLAKE2B bd68f993a6ea3b622b3739cc7fbc86e5a03e583ef945dc78fd1c4b18e3a35f0eec45fe4b67cbcc526e2d9ed0fcd0c255dd0c34f2473106a94d85261e082763b6 SHA512 2638f2d63f7ae074e313707f7c26938468524a057c7c4c36996b8e062d790ef4ac35299b49a6701dcf42ad6aeb0a3760e0cdda32bcf2a42c1bd41cd9e6454f8b
+EBUILD pylint-1.7.2.ebuild 1873 BLAKE2B 36b160c2f5f5719404f33b100fc8b41f7db3e361fd216defa3a5e50854693c421f50155aa8026558a2e52ee258b87785eb91f095cfd82189d930c8972770b664 SHA512 1d86c62a19d06ba93f20ea35b8b1f06e0f993a6d57cb8c328d5f82e96d477c4bb1baf56759894ccf4fcb5852cecdf5e1207c676b3fc01d41aecbaad1c8e28eff
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.7.2.ebuild b/dev-python/pylint/pylint-1.7.2.ebuild
index 426704a7abee..f0e8533ad012 100644
--- a/dev-python/pylint/pylint-1.7.2.ebuild
+++ b/dev-python/pylint/pylint-1.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 60f291387505..5d07d4764068 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -1,6 +1,16 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
+DIST pypy-bin-5.10.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 12749801 BLAKE2B 7fa3ef4f1b5dd155fae35a840ea037039e8fe3255c83ede6024e9cbe8684ea4c66fc2281983315a812decd5ef130939621a497eea4e1cbc2751b251d03c9f86c SHA512 21a6df3f03194759ee24fac026942df1c8013cee7eaf0e97c717df2631e4e0579406eb8c45c451e45d89acd5cef0c6176b34070bbaa2b0a4cc130bbc4aa2de18
+DIST pypy-bin-5.10.0-amd64+bzip2+jit+ncurses.tar.lz 12926081 BLAKE2B ca5277804b218043c25a95f3e45e67a0a3f99aaea582c1fcae093f6bbe3ffd061aaae86855388dced3f8a62e37bd7fb692801cbe88b1e5f6e4233feebf063322 SHA512 426040e5b1baa8a2029da85a02fc9de225d07666889f1721b99618ba1e81f1f841292e8ba43b02138a39bb5a53ae31264ab6ccfca864da89fc98856e9ecc1237
+DIST pypy-bin-5.10.0-amd64+bzip2+libressl+ncurses.tar.lz 7406840 BLAKE2B 9626651ebff3a470f3172d34891ca65cf7b4c1c58879532e7b6b5665af56b2c8e92f79c63503c09f2bd97d7ba8d18507204edbd6a8e8ded086fc2a6165103f58 SHA512 8713d148ee7c417ad26c5681adaa1e7569c29f3924188f2e7a63a142b924f81224ab2f228a96f1fdc062f386c94e0fc29f69d6b1cb1fdb8bc33902eaa03fde1a
+DIST pypy-bin-5.10.0-amd64+bzip2+ncurses.tar.lz 7496681 BLAKE2B 2b8bea302ff2fd45a0b02600ae922063f4e5928df293af60df7512b2b5399da3f453d5a2f01d2ea7e2337984523e27582b09b8c174828019fd01432aa25cb9ec SHA512 9befa9a5225fb520609504520fb59d6eaf387d9115edfdaf68b13fbebfa9b85f755cc96e78fb4ca72c2b7af5c2abae95ef35c6e82cb991ed6f4442a12d30d9a8
+DIST pypy-bin-5.10.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 10334239 BLAKE2B 84f88b4d3c214d5f6f05c353e92e57fcc563d55c849ffcb4d0539ff4cfa215abbe63a6e187d219ccc75a9e3d32108b3abf7601b88b1d3a5c393bf51e787ecf03 SHA512 948477992673a5928cd9171f274dce7a180d5129ae6395ae9f4a4cdf5bf16b1fba80211a479cb4f5c093a13b82ca9b12a761c1f33526ca2ddffcafad5739d58c
+DIST pypy-bin-5.10.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9700133 BLAKE2B a57ec7bd7c6a1db61b0001ecf821271d9e8c69bf803a8c20577cdeca83bd7cce9a49dcd587453d543bec6835c31e63f4151fea15fe39b2f0400435af14f2b601 SHA512 92ce40203365e5321c6b4ea641a77c6b4367466f9c02efdf9382c8bb7c93968c114e04e6586a9a26511cd3218863e62d0a583610e8a73d1b68b6979853a4345c
+DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6264162 BLAKE2B 67bb6849c8c35c31c453452e3dc8c5d268e5921a69de72ba46694c9324c270a866f263f723edd30a31c6fab7c259c78bcfcadbb694e9761aaa83e9d4057e3c2f SHA512 aaba99aca142395b80cc3d7a28d86c02cedbcdb5842db2676a4b8b2c655d0b4503529febe27ecf9b4ebb5fc9a13f693e8647ca526a52e2431fd3baa977c7dfb2
+DIST pypy-bin-5.10.0-x86+bzip2+libressl+ncurses.tar.lz 6252626 BLAKE2B 6f036b0a526a2ef2c6ea0d559baaae13d4ec0da2d4705c959ec84c85fdde171319da9be1a2d859ebf2c7d6168464dccb057904596a64c0ddc33724a706e699da SHA512 5f284ae0230b22775978525d2f53b57f5c808b6a47b783b6bdccbb9727af412f640abe79e7c05792acdda861719ed9a0c392a9c906237514ad4285f50e283ff0
+DIST pypy-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz 5912628 BLAKE2B 5859cb60c9cc68cba1bf3e1f3f58ff8e86d352aef990a837baf5a1802116dda4bc9e550a3c38163d7a165efc65ff26fc1c004dbb845a4df401ca6c986866a658 SHA512 d2aee265718cd75e02ad4e8dc7cedcf006180960128a10cc4b3b1920092860a1d1a110c27b60d45b88ef99822e0a2e9c74c2c7d3c899ef049adc9916ea5fefb4
+DIST pypy-bin-5.10.0-x86+bzip2+ncurses.tar.lz 5912272 BLAKE2B e50e3f5cc2c8411700f00009bfb6d9fe0c06b32faed6fc5b94dfd3eeb404e37fe353741aeb0851a4e42dc86e2bed524750cfe527bfc005abbec4cfa6e65444e1 SHA512 ea63b7ff20633bcec55258cf02d0035e213e94595032cf7a43342292cbdd4bf4276ea36d299bb3342e6de8919dadb338f879393950770473329ed6a0fd982897
 DIST pypy-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 13029615 BLAKE2B fa2d6fa3bed0baef16af8b18bc0a9b76a960e5defbccdb3f059d2fd6d0a3613968e42ee49e82bf26f63058d0d1f74540a30d663afca896f3de929b16b04750ef SHA512 4234bb85c527999fc9ec91e7187d7b05e9aa5fa9965ac4a7fa7a652f678b1221cd04d119316073c5f8352d7bd533c4a7b1c79f5cafce6eb04f32b0a764fdf36d
 DIST pypy-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 7617650 BLAKE2B 9eb3715cf2a783917b1d1e8ba38511f9b41c8f991211e08a3078ec8709bc5a43755b833e8594f820c3f3693fbb4731c6d9fd4ab1b6d0701003dafdb4342a0198 SHA512 532d7fd9bdb92b1d5c8e8ebcf60c56fbe2a32b8b89f8650d91b6e0a7cfe6733e3e6b6b232f02a6f24bf9f30569dd8b9cce0b93268d0bb45cd808671ee41be3ae
 DIST pypy-bin-5.8.0-x86+bzip2+jit+ncurses+sse2.tar.lz 10744836 BLAKE2B ef49f3ccfc1f9b7f975f3b36b323257765e5c1b886b753fff6a222bac463d54de54d2e2b50fd7038c8229cc70b2d444759e955348352326600b97cf74695c453 SHA512 bd39bad8f292eabae37b384b9f9f36bc221606b1d2d4aa3df8a45fb1f7ad94755d5fe5dbb7983a49c4e44df87f745ce00691bcb3a5b6c197509c360d9b24d24c
@@ -16,10 +26,12 @@ DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6261405 BLAKE2B 37f44
 DIST pypy-bin-5.9.0-x86+bzip2+libressl+ncurses.tar.lz 6262511 BLAKE2B bf70bf73bcfc503ffe7024a0e1df37cf64471de0b7060c49c08e1b339f6357b0f8183de7d035e12fc1e884cd25c5b43a05535274b2843954a459581bb2dfba88 SHA512 376f801dad960b3e36cb401d8221596e93248abbc40b1118e1e2f3f79009a44866612df931c3b91b1b72059f48512bf3a5dd0d58a21733380937577851e5dc92
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 6269532 BLAKE2B b0ca490135a6b4215a09e5dea24be5c950fba24aceca50bf2e04ad0b3bb5e6a8511b167e567aea9d3ca9b92a53d093c3746b38abd9e5266148621733430767ce SHA512 ee447e8b03733b41f92625a02653ed70a9f4cb3866a27bcbdbaf1383a00551c5f4617540eea227b120a7adab5cf87afddffde663c7cb79abde852e0bbf18d622
 DIST pypy-bin-5.9.0-x86+bzip2+ncurses.tar.lz 6261498 BLAKE2B 7d0dace223ae6793ca18b36628f7a43b20d55d6b702c6dd0bad413055261614bedba265f2f1411bdf4543ca64612d32cda93f609c2433a3fc10e3fe44aab3984 SHA512 6151ed379dc3dd4d9eda892718a5cdeea55386251c27230cb4606fd0a16589035de332c549d108d699c506f8ff46bed3cec3edb960155550a9746ae2fc0d2349
+DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v5.8.0-src.tar.bz2 19163498 BLAKE2B 377971cf9e9a5ea75966937e9f22fe24d149af28678947d33356333fe67c8295cf07bf2dac3e7b45d265fef6126d8ebb23aee132e3b43d872bd61ec1ddf17a2c SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 BLAKE2B cf60845f320f46b6be3755a50bb24b8c55478caaa86877f35015f4187eadaaa2f0e95216f04eca3c9c3fe8347ca3b82c529435033e7935f32067ad45cca5d18f SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
+EBUILD pypy-bin-5.10.0.ebuild 6224 BLAKE2B ab65602ada1b7b10f4f8516a6db8ba99058b62a0c2bd7743a19d9978a2af4331190b3e5d40b96a1fd38833f355a1c2d7b69ba733358759b924262a858e26fdaf SHA512 12ca960476b14ae81b2f21e7a603c48ab70e1cfebcef23fb016dfb6b6735321bab883ceeeebb24585dd6decf8217cd941276f2de22160665261c1eb5e12a0d47
 EBUILD pypy-bin-5.8.0.ebuild 5819 BLAKE2B 98a6bc8e545b01b21d2a1d9113ebb52873cb4019133b9d663a26ae716390adce268750ebd71bfe035a70b0a964688ef1abd786d3c1bfca98dc1ae936ff03cf22 SHA512 8ba2d88b641b86a6b7a64f271b56a80aa98139307bb4e294cba6f4ed34a0821a7fae66ec037cbdbf6a6fa00b2d381044b81b24c3f805345c2de77bac0e60b7cf
 EBUILD pypy-bin-5.9.0-r2.ebuild 6224 BLAKE2B ab65602ada1b7b10f4f8516a6db8ba99058b62a0c2bd7743a19d9978a2af4331190b3e5d40b96a1fd38833f355a1c2d7b69ba733358759b924262a858e26fdaf SHA512 12ca960476b14ae81b2f21e7a603c48ab70e1cfebcef23fb016dfb6b6735321bab883ceeeebb24585dd6decf8217cd941276f2de22160665261c1eb5e12a0d47
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
new file mode 100644
index 000000000000..8c3b3d419da8
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-5.10.0.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="Pre-built version of PyPy"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz
+	amd64? (
+		!libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+		)
+		libressl? (
+			jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+libressl+ncurses.tar.lz )
+			!jit? ( ${BINHOST}/${P}-amd64+bzip2+libressl+ncurses.tar.lz )
+		)
+	)
+	x86? (
+		!libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+			)
+		)
+		libressl? (
+			cpu_flags_x86_sse2? (
+				jit? ( ${BINHOST}/${P}-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz )
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses+sse2.tar.lz )
+			)
+			!cpu_flags_x86_sse2? (
+				!jit? ( ${BINHOST}/${P}-x86+bzip2+libressl+ncurses.tar.lz )
+			)
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	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/1
+	gdbm? ( sys-libs/gdbm:0= )
+	!libressl? ( dev-libs/openssl:0/0[-bindist] )
+	libressl? ( dev-libs/libressl:0/44 )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	doc? ( ${PYTHON_DEPS}
+		dev-python/sphinx )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		use doc && python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy-c.so,pypy-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop curses syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index ddf3c4a7b31b..4d5640ef320a 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -3,10 +3,12 @@ AUX 2.5.0-shared-lib.patch 734 BLAKE2B 2c56388ebdc37f9a819252771ee4af312acaf37da
 AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7a4829091216222fa80371cb7a4100850f366e5065b565f27542bb7e4e599d06cca6bdfa2bf189905e2c498ddf SHA512 d1c9925ddd19c252d4222dbea6db866a867abefff65219f7fa0fe070fa68e675f3a815f418d214eb508375a49911dd3cc4851f42552e5fff0b7fc2d7f0272278
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
+DIST pypy2-v5.10.0-src.tar.bz2 19181430 BLAKE2B 4a0808c74fb167a7e98625f1d5b8559bb3a0383445387a0c48f951d75d009c57806eb600a141a84a7cb800e2f53fe091367cbb0b23192bc52b995cb65246c076 SHA512 11892418d753ddc59e928a5f59b3406b7c22b8689ad6995eeb183182dbb5184117e68bb567c770ffa60a14d6763550d658e260584e65da5025ed481f48501379
 DIST pypy2-v5.8.0-src.tar.bz2 19163498 BLAKE2B 377971cf9e9a5ea75966937e9f22fe24d149af28678947d33356333fe67c8295cf07bf2dac3e7b45d265fef6126d8ebb23aee132e3b43d872bd61ec1ddf17a2c SHA512 222c6ce11b00830e310b766df4c145b7f554f23b87fc6146f214d758d7a6159c5c00af475aa7fa630ef4c37b52cdf2fd73049b6ec3610715b6abc0a925fe1365
 DIST pypy2-v5.9.0-src.tar.bz2 19175394 BLAKE2B 0d5fa0d013d8cdb9765bf0f535877894d7a3544c19481973f788187251d1bd2ba11f88950430e85c7608ea394cc952ae7dd7275b9843397ab098e153cf96ec7f SHA512 3170747e81088043c6a4885bd0bc92e911556420b6c2539a4ed7e62956f1c741651f772def0fb00d8826a1bef9d6f4e79a13682a4456a31d987f7c9bd8608a4d
 DIST python-gentoo-patches-2.7.13-0.tar.xz 13292 BLAKE2B cf60845f320f46b6be3755a50bb24b8c55478caaa86877f35015f4187eadaaa2f0e95216f04eca3c9c3fe8347ca3b82c529435033e7935f32067ad45cca5d18f SHA512 d70f6baba1a465a752c515e33dfdee2a5cc75400fadfb8ea0bd1e82d50089abdf02d7726c697850dc47de2054aa494bbdc08de2673c260b54e609f29dab259ad
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
+EBUILD pypy-5.10.0.ebuild 7987 BLAKE2B bb23d3399fa7bf74d3eff1c222d2eb06f41a39ed06f340980a44130a27bd6b96bbbdf42b46c04f661f2f1ca242536b135148974d036f92e53b4f54929adbd20f SHA512 7e79e31ea5073ce5581258f6649406320afccc37b01bc83d1ee6a05d0f6980b24f8bc08b314d9394ca85f98583953f5492ffc8ee2f3aa9b92b2f93f6d4943033
 EBUILD pypy-5.8.0.ebuild 7705 BLAKE2B cd02f242abcc02e323840f6782552b83e6d69438a78f03edaae171ef11cbd6fa5df709adf6f846671e56334555f8417f524f6d72486ebed21744a45728527ddd SHA512 99af9fcf702a83353b3c4c582ef0f0c3b3acfafa4239ba3599279ecdeb7cc45c7783234dfac2af956352de35e61b925ff8997772f242e408dcac59c3e9ced90c
 EBUILD pypy-5.9.0-r1.ebuild 7987 BLAKE2B bb23d3399fa7bf74d3eff1c222d2eb06f41a39ed06f340980a44130a27bd6b96bbbdf42b46c04f661f2f1ca242536b135148974d036f92e53b4f54929adbd20f SHA512 7e79e31ea5073ce5581258f6649406320afccc37b01bc83d1ee6a05d0f6980b24f8bc08b314d9394ca85f98583953f5492ffc8ee2f3aa9b92b2f93f6d4943033
 EBUILD pypy-9999.ebuild 7997 BLAKE2B 30affa36be13cb3ab09b22cf76b1458b421f07bc4e8279097bfa9650f67422963b624349e1710a501277da9620c6d3b2ca7fe3238b121eb25c49f0b81ef881a0 SHA512 1fced57979aa3902cf12f95e61f4bd946beec808ca78d162e2a9b19e8d7be4b58a2c7b2653c6ccbcadf813e7b34d9d31a19b342e11cdfe6ee75a6239b1a4b137
diff --git a/dev-python/pypy/pypy-5.10.0.ebuild b/dev-python/pypy/pypy-5.10.0.ebuild
new file mode 100644
index 000000000000..7cfed8fcca3b
--- /dev/null
+++ b/dev-python/pypy/pypy-5.10.0.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.14-0"
+MY_P=pypy2-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/41"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk: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 )
+	!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"
+
+check_env() {
+	if use low-memory; then
+		if ! python_is_installed pypy; then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy[low-memory]."
+			die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	# TODO: cpy turkish locale patch now fixes C code
+	# probably needs better port to pypy, if it is broken there
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die
+	pax-mark m pypy-c libpypy-c.so
+
+	use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy-c libpypy-c.so
+	pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dodoc -r pypy/doc/_build/html
+
+	local -x PYTHON=${ED%/}${dest}/pypy-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 9e004df9d967..7d076c90c01d 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -2,6 +2,11 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4adafe47a5b2fb269b32d7b0978b996bb1aeee9d1ddcf7dd2097a494317851408c6c9bc56a829a77126376f5c7853 SHA512 ddf5664d289b3134a30e675a91ab9aec1a81c0df7bd4f6b0b43cd6fdbf99aca8e6d123c1df41f061784e5fe1a0a3ed4a7ebcd16790d76fb8a28cec442037d747
 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
+DIST pypy3-bin-5.10.0-amd64+bzip2+jit+ncurses.tar.lz 10612860 BLAKE2B 57a840754e291240b8c64c583501c2ec881fddec0f97d407a5076dc1630751c8c35ebb369aff3b3bacdafddfefc39d8bb481cd0220691efc8e9dca4ea5fffd80 SHA512 abed6c09ce41c84eba9bc535a25f025417f9debb8235136410161f9b49111ed5d3667d54f42e4913f4cf8718fa08b724c77f944917252c6753ff23b6722ec152
+DIST pypy3-bin-5.10.0-amd64+bzip2+ncurses.tar.lz 6651701 BLAKE2B 2971b8c39eb7475e1e574486a273c7ba387d79acf965fdf3125e0457c59fbfbc48a31a76af54c07eed099de64098902951b80ca104c1a0eade92eec0264487d9 SHA512 faa52cff84422dc9280da60c574f7de9a69495ec48c58c7a24ca1ef8acdb096382732fb4145b43c71469de7c6531fc2cf538032205477c8c925d355df962a441
+DIST pypy3-bin-5.10.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8213224 BLAKE2B b168e80285afcc7fe6210d061d98337d4b8c5184d0d2a5eb2d2b30a7af391ba91c83aa543a9a9f82af71039a0bc86cbbf1db7017ed8a5d666b570df558d7ae05 SHA512 b5629c7a9a3097bd4a407293e01680ccbd8887a7c42530a08123112ed94291c63cac705491bff4e8b54eb33e4409b893a83adc2c385d04456825ff3d131fbf17
+DIST pypy3-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz 5356294 BLAKE2B 01d282d28676cc7ebde528620aa4bbfea227b2130df4a2b9e14bb31d24a0063436a9961aa174b393bc9f7ab2615593e667cb773d155b634248da2a1e7ba3e5e7 SHA512 03d11482961a811b96ee75becdbdc97bf55dcf79fbc45b325fc43d86ca947e64b043edaa87fec3b2e5bb0fe777e035ad252a65e7b372cddc62efd2137f6148ff
+DIST pypy3-bin-5.10.0-x86+bzip2+ncurses.tar.lz 5334935 BLAKE2B 11be55a106f157fed0570d3fb684e8a7a7b42d061fa841511721adde0d5572d12cba989984b872efa76ed8ed15001a412abef115e65439d80a9497f911d3771e SHA512 b788008566bb409f55ebd1d7204784f322451fa6fd28db2a2adb3929c0dfa3e0490a71c697ca29cdf1251dd58090ad8dc6fa1c597c9cdac77d52fe84b77e3542
 DIST pypy3-bin-5.8.0-amd64+bzip2+jit+ncurses.tar.lz 10706804 BLAKE2B ab3fffd38cf177e322179a45316d99e82485835f283a1ea4e919d4ca5d016d841424bfd4aac15af51749961fd6b588879b45a81afcbdf6af8f84518b6353a4dc SHA512 38e46503ba50987a36b68e7d6316b64a00c1e2fa0d2d0b0e0e517bbfa96cb777522346d2c4a78cc7bdf44fa237453dc97867f9323785ba38b21c1f1058d5e701
 DIST pypy3-bin-5.8.0-amd64+bzip2+ncurses.tar.lz 6626453 BLAKE2B 94997c8b91716493339b1a54ddb422526d37cb40fe08ad21ce38d3550942e2e9f630be8115772a986e997d474a5a5096dd9336c1be8c1f5ceba1b8c1323b5811 SHA512 51d418668c48f8e2d740264855e193353900d56893c0fc81de09e8fab338a36a696a725dd3387ee1d626f82e8319b797bfa4957a5cc8f0b11610b3e6ece67539
 DIST pypy3-bin-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 10510722 BLAKE2B d0f16b1c71686fa477484cb068c0e09f9a40bef83a0fed1721f5f60a5bd11eb39799e97b2da16fbea4f7255ea19d5e8c3f2a2da946eebe10a6d243f207ef2242 SHA512 659ed24c9f540168203098fc9b6086cc22a42767b55f3dbbf132b11cf8e1bc01a66baac78d7689dcc31d9f06e7f2ecfbda9969c9ba150d5af9c462e480aa288c
@@ -9,8 +14,10 @@ DIST pypy3-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 6589457 BLAKE2B 6b182a6bc25c7839
 DIST pypy3-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8595527 BLAKE2B 67e749a5153d5d75c09d27dfa5ed57bac8e886770e5264a2596c4f9e5cdcb7fcae63b709951a8ad862f1bf658deb3cbdf25ac3d0a3af12aef2dfe40942016329 SHA512 6d118cf2e9a657dcf719ca5e508b5b4bb2ab7f85ec3597840706b748ea2f6d582ed884fc34697a3ec36e343de4a40b113d7c8749683a53f2dda299a9e106a2f8
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 5654668 BLAKE2B 964c06920e2d5d69ee9d1f2133d2453e096bc871e63ecdd815370187510f9391738432578b5be49771ad8d24fc735882df266655d88924b2776849a61a943694 SHA512 a378159ca39654fbf117e3bd5a0cdcdb23100a21caf837bba5d764b63bf039a791b27d397a6be918a2539d721fc8564f2b10a163df3bae89a4ddb3991ac33ec8
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 BLAKE2B 4aa4a8cdfa536aea52cf6b94813e6c70f071ed62bc1bceac0584b2ab1a0b9d5a60e6d219ffe67f09f418246847ccd1f32f280b38c9bd973eca2c30c002a42856 SHA512 663fae9004eb7f002b849d4697ef67fb72df33faddfba7272a6d795432ecca4c110dc1fab43617909f962584c7519582f085854f55829ccc63dc988654b6add5
+DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 BLAKE2B dc6c906109269e8d1bd6b171cabf6475aa803e4326a9974ded86fbb0943798317761bc0ae0ab09829a48c073b3755c8a2bdcb03bed4b06b9a70cee061867edb6 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
+EBUILD pypy3-bin-5.10.0.ebuild 5731 BLAKE2B b3c6d18c7f1f6cd8da43c3427c97b681e7179d8e43fc075981cd39ea69f555d59351d8c693901d951da71db5b2d3b4cbc050e5b529328d1a4406e98d927f1f38 SHA512 57a4470d880c96565d00692e7c685b6b8e3016bdf21d954b1d13a8fbf6aa5d4c48965945c1488dc677c24b7fb5c03cc8c5301fb3e1034f03a24530b1555718dd
 EBUILD pypy3-bin-5.8.0-r1.ebuild 5345 BLAKE2B cbe267e95477eb8e3245d87209829607c78e032004e1e02f05d81ea300ace089ee8e40e7fc6b37fc58864988b8082bc2b869d8346c6565b0eb5fba1ffe0edd4f SHA512 e3d34a52716a66b42e37c77dc7d4b3f98ac7a80bc511156fd63ce47c65f549441a1b96667df58d9c2bb51e3b7280244c8619744ba9ccfccc06b73df365cb2d1b
 EBUILD pypy3-bin-5.9.0-r3.ebuild 5730 BLAKE2B b254df486fc370e41ef7ae7f53294299ddaed93d3a8e7d1900b9cd3c846b48835a589cbdbb4357ba065c84b08d7f3f13df9e33cb14e1acb4604054683fdb3d8e SHA512 1b79b1603a148046e6c333960d0e35fc05c5e92bc6ed9fb10e62e519ff158a5ed331c31774152c28c07ec8aee45504fef403e9fcbaa6698dc68d0642d996fab2
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild
new file mode 100644
index 000000000000..2365033c5b06
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-5.10.0.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# some random parts need python 2...
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker versionator
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.3 (binary package)"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+	amd64? (
+		jit? ( ${BINHOST}/${P}-amd64+bzip2+jit+ncurses.tar.lz )
+		!jit? ( ${BINHOST}/${P}-amd64+bzip2+ncurses.tar.lz )
+	)
+	x86? (
+		cpu_flags_x86_sse2? (
+			jit? ( ${BINHOST}/${P}-x86+bzip2+jit+ncurses+sse2.tar.lz )
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses+sse2.tar.lz )
+		)
+		!cpu_flags_x86_sse2? (
+			!jit? ( ${BINHOST}/${P}-x86+bzip2+ncurses.tar.lz )
+		)
+	)"
+
+# Supported variants
+REQUIRED_USE="x86? ( !cpu_flags_x86_sse2? ( !jit ) )"
+
+LICENSE="MIT"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/510"
+KEYWORDS="~amd64 ~x86"
+IUSE="gdbm +jit libressl sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND="
+	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/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=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3:0"
+DEPEND="${RDEPEND}
+	app-arch/lzip
+	app-arch/xz-utils
+	test? ( ${PYTHON_DEPS} )"
+#	doc? ( ${PYTHON_DEPS}
+#		dev-python/sphinx )
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy3/pypy3-c
+	usr/lib*/pypy3/libpypy3-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_compile() {
+	# Tadaam! PyPy compiled!
+	mv "${WORKDIR}"/${P}*/{libpypy3-c.so,pypy3-c} . || die
+	mv "${WORKDIR}"/${P}*/include/*.h include/ || die
+	mv pypy/module/cpyext/include/*.h include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+
+	#use doc && emake -C pypy/doc/ html
+	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "ssl": "_ssl_build.py",
+	cffi_targets=( audioop curses syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	#use doc && dodoc -r pypy/doc/_build/html
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 137b7f5eedf9..6fa02b2ee185 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -4,8 +4,10 @@ AUX 4.0.0-gentoo-path.patch 1906 BLAKE2B 0f09d41b6f2b26881e5f69059877d9c555a4ada
 AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909bf4f73514ef1e9034f5a15cde7756f30fe6c4337f5c0fd254c1869758c798b9c450cd3044cca768ab8f654b19dc6c73ae SHA512 195dbc6cc75179c090b7f461f36e3fd19e341343f2d50c0a4ff24032da1074581578d51d62dbfc04349a8a46b9332097bb310bc923ea3813bf1afce91edfcea3
 AUX 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
+DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
 DIST pypy3-v5.8.0-src.tar.bz2 28986883 BLAKE2B dc6c906109269e8d1bd6b171cabf6475aa803e4326a9974ded86fbb0943798317761bc0ae0ab09829a48c073b3755c8a2bdcb03bed4b06b9a70cee061867edb6 SHA512 d78b4c899a5643028664365ed973a7b292a8e5b3989cc75203cd381ea3cda7dd73121c574726e23dca86e8364fcfcf42c372c9deee438c805f30d6e1c4ac115a
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
+EBUILD pypy3-5.10.0.ebuild 7045 BLAKE2B 14adacd8c97eca79a3d70c770af1e6b9e9d28bd810244e083a3031a837472a8ce7da765e92f3b4cad7d489d0c349dd3f3ba4d8aaf300716ea95104dd922b7cfe SHA512 c69a165bf40f968efc3a00d04573750319fb4663082b107bf14eb46f40bd0a86534eb8939e303c8db3686a4c6644acb6668d5d1da325d9717c466ec799db6157
 EBUILD pypy3-5.8.0.ebuild 6832 BLAKE2B 07f125dc11c74cb23f9fe0ef04ef7f852188637d08323e233f39da0f89c4f4481cb2ab8eb53a5026f1a05884648b58e930e652f2301a5ab23e2b6e23a15b9b96 SHA512 30b57bc1d62d7e30938243ac4d4970b29d41423d6bbf0ef8430e96d038a4c1ef7300294af1e83f6450f3e5fc0f1458dff25bd554aa82ab4de1f585a6d4185186
 EBUILD pypy3-5.9.0-r1.ebuild 7043 BLAKE2B fb91156cf416003da95dc67787018676f4f3bd75f4d218e9b0213cecb400db5c3882aacb73cfe87d8482bebdb7fb51f1621cd4868388830b0fe34aef9deac3ab SHA512 79f2187c150dc0c28e4b4062d38485a2e2aafed46e4375b28a023d1a43df20fbc31fec933c2f221d73f306e92e5bb6011568229885ba0b70f67d332e3e2757da
 EBUILD pypy3-9999.ebuild 7633 BLAKE2B 72cec5d50ab90be2667bfbc153805fd74156614996f189dc68112e94950718baf533d26a2b95fdd24bf798cf959fccf19fbf8c0cac908ba7b577e50c63efac44 SHA512 72552f667c38ac510094d6642d22db004e80860191c4ca93764e7838ce1d2da441739fe42248b1bbe8d25499ee2590209099f1d941feca39d6d9d33db6d21580
diff --git a/dev-python/pypy3/pypy3-5.10.0.ebuild b/dev-python/pypy3/pypy3-5.10.0.ebuild
new file mode 100644
index 000000000000..8d3c3e165e4e
--- /dev/null
+++ b/dev-python/pypy3/pypy3-5.10.0.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs versionator
+
+MY_P=pypy3-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+
+LICENSE="MIT"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/510"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	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"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/4.0.0-gentoo-path.patch"
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	eapply "${FILESDIR}"/5.8.0_all_distutils_cxx.patch
+	eapply "${FILESDIR}"/python-3.5-distutils-OO-build.patch
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex sandbox --sandbox '')
+
+		--jit-backend=auto
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	# translate into the C sources
+	# we're going to make them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+
+	# copy back to make sys.prefix happy
+	cp -p "${T}"/usession*-0/testing_1/{pypy3-c,libpypy3-c.so} . || die
+	pax-mark m pypy3-c libpypy3-c.so
+
+	#use doc && emake -C pypy/doc html
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "_gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_ssl": "_ssl_build.py",
+	cffi_targets=( audioop syslog pwdgrp resource lzma decimal ssl )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	"${PYTHON}" ./pypy/test_all.py --pypy=./pypy3-c lib-python || die
+}
+
+src_install() {
+	local dest=/usr/$(get_libdir)/pypy3
+	einfo "Installing PyPy ..."
+	exeinto "${dest}"
+	doexe pypy3-c libpypy3-c.so
+	pax-mark m "${ED%/}${dest}/pypy3-c" "${ED%/}${dest}/libpypy3-c.so"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/sqlite3 \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
+			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${dest}"/lib_pypy/_tkinter \
+			"${ED%/}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${dest}/pypy3-c
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+
+	# compile the installed modules
+	python_optimize "${ED%/}${dest}"
+}
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index 35d31d35ef93..5da906c6d64f 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-fixture-config-1.2.11.tar.gz 6525 BLAKE2B cae41f542fedfcc8587dd5a4cc117480f22fc8abd6f5b85b38451e8199c52d2cb20c4a44fd014504fdc6835be940b4935c95e73dd16cd42049a0e01737a65f6b SHA512 9d335621c7aec41ce769f450fb618ca1611a0e97bf3bd3bdaf43bb827dde62af28fb255a36643c4e6e9c958e7f7efe3f4fc308b3129fe7625c0504c0c46f1518
 DIST pytest-fixture-config-1.2.2.tar.gz 4995 BLAKE2B fee7acb10140320b2ae14968fd99bb11f6c23f54cc86fc74a52855b58071c8deaefb1343c4d92726f7fad5e873c25c426f04d8ced3ecece3d953dee4c7693b7c SHA512 c2d2346c50c8a73e37ce217e240eabdecf872700c9f4b020f1ca7532a06e6a5dc6b140356d96b1bf8c83f1cf737d95775abaa206c3dcf7e02555b26aa995f12d
-EBUILD pytest-fixture-config-1.2.11.ebuild 726 BLAKE2B dda59cc6002dfed22ebb76d6b8ffb1111a870f488d386f5ff80116e6fabdc0f56c8af1a3da9ecad8d2f2914ae20bb67e0c058ed9c6c2942c344868a59b15f14f SHA512 f1ef95c8a75bd0e0fd4e014c144450db65e4d25e531f9165dc3bb8fc4bb12c5307d99f34975f9de2fc97bbe43e03587fa9c898f615880e597133438ec9a9f1b3
+EBUILD pytest-fixture-config-1.2.11.ebuild 730 BLAKE2B 7bc4b3c2bd5993e5a3309b3ae99d03d898740174fcea4a237e42b45cf605d3d924fa1a911c0fb7653278aa9250b6097af05dd8e342d636478b75026284f4ef63 SHA512 1c1a2f4b3555b1a1f41e71ae92516e1ef0f996a117ad5173b573f3113c7b50ea275c252d9c6f568dab043ffd900bb5cf2dbbf91711453f76d6e4ab5f89e1eba6
 EBUILD pytest-fixture-config-1.2.2.ebuild 707 BLAKE2B 50cb74b0a9b4cc1ea33c850762f2f1dde94497e47f99808323b9cf2fdcf8b9817cfb657881e256a7aa638b5bd8ce40ae5c33cec56a3547da88aabe2bc3010aaa SHA512 e1554212104ddce7d35730af725f612cf646e469b7f154e5af843d555c4e3e8d45d3081a413b4db69deb11f124503d2a4ba75820a7a2cfdb804c2bea23068316
 MISC metadata.xml 676 BLAKE2B 7f3622c69e6d371d1ab8d57d06d3aa045bcb21829a2ff0d4f160941cb804fcbf2c0540a460e50e3ca6286b6a31e2e6b8791f92fd711fbcc9eaf1186b7cb37ed9 SHA512 9e4cc39afad13c0cdce47c59c42c4d71436422d37d4f113a446238036b1f05d38eb8fa6d53b9001ca630483492dd315090062efe221339e63776f126d964620d
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
index f46f05d25a2a..aa91d8c32711 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 4814c9135d64..a61687648511 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,7 +1,7 @@
 DIST pytest-shutil-1.2.11.tar.gz 18310 BLAKE2B a85f50a8a0e98de6dd71af0b27f76181b1ff80b518877155122998c3f8992c2749ebcc837d630dc19d60d988410eba8dc77b1be7faff7cf27003ebbba9194bcc SHA512 2a998218bb997a6ceb277965e2f150b2d7722ba518f579154f804568f552e2c41ced9a491c1745382dc119d0b92f3ea993ae77a61851809aae59a1e17501bde8
 DIST pytest-shutil-1.2.4.tar.gz 16327 BLAKE2B eb5bb96c78be5b91de29f6c30634cb56a69e30b5ebee9b43a0e970691a7094dfefb83ea741650e0732ff60b9d08cc8ad94d80bb95f1222ba8670402c1fb1d5ab SHA512 9ec6baa3cf53bb80103b1dfbf6c26794090c26dd74b29cd19e76b1037c6939538c7b05ea16368a76cce6969216c291e27b00833a990268239bfd2222f69ddfb4
 DIST pytest-shutil-1.2.8.tar.gz 17051 BLAKE2B 9006ccd51bce6e5035ed93a330e460666bd0782fe56ef400f66de174914aa89b49d6684d1a3a2d2d69b308c4d8466db83eb0865ad20649106dac735b9d1e6772 SHA512 de73b2c350709e356810f58d2a8a4c7668144701639c45a0690081e707e7147762f650af2e9f826429d0488655dae0e3366611da5e8e3ecd0c6382e215170b2d
-EBUILD pytest-shutil-1.2.11.ebuild 1008 BLAKE2B 44c811a0f8dbe2c7028a08f1c4f1226f1a3bfc9db31f5a082c0f8999c8689677bfdd37b49deae32e18a27274b90ac1a7c4536b381910f2bf083ab88e6d7146de SHA512 e7c5968d9cfa42b9900ee177259436afd1c21fa5c8495ef1994fac23eef2f70a2817b9465da58954a3b7ffc130ed74036e0e79db2d90f432d888b172d9b31c0a
+EBUILD pytest-shutil-1.2.11.ebuild 1012 BLAKE2B 14d64840eb058db1a173734d1c4d8310fdc34ccf399e33cb500a27a66e35a7aa61e8d3d36ba390c2631c431d9d12db72495d87c1fd00dd9b7dfbcb1b09902d4b SHA512 6b8fdafa8938035c0f41219781872c07a2315a6d9a5d5b784813853644030166786c864de9208c7e2bc2138fd34ce2fc1f7128ea99348e78d6ec1683e72111dd
 EBUILD pytest-shutil-1.2.4.ebuild 872 BLAKE2B cab69c456f8db4a45fdc6af7a992cd5f4e160ad522ecc23a4327a5ee447ab82147bccf0d3d0a104b2bda58451e10b2d2626ff163d3c7880595aafe35df6a5409 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c
 EBUILD pytest-shutil-1.2.8.ebuild 872 BLAKE2B cab69c456f8db4a45fdc6af7a992cd5f4e160ad522ecc23a4327a5ee447ab82147bccf0d3d0a104b2bda58451e10b2d2626ff163d3c7880595aafe35df6a5409 SHA512 148ca3da3d06f2d26a9799cc2cc8eba28a99cef29de0dbefd2e0957527655cf53c623fe4bf5ea1a542fdc48ddb9f56608521913b9837cb1c352af8523f62691c
 MISC metadata.xml 730 BLAKE2B d12c0e9355407f6bb2a942bd03b56e4c516a0deac0d0e1f246749c21c330778808a0b30c34e50df39dda8e591680e947bd64f7a09063f2c2fdb55657418c57d7 SHA512 c775452390ffa0666b23f3f78bc96fbfbbbd94796ef9bfb79fcf251b97ca94f96b0c2980b2ca1828104499c78da15fbb198eeb000e55006debe9ed03ebebb0ca
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
index 58b700520251..6c6ce8eda5a3 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index 70127defed27..3a42dd736762 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.2.11.tar.gz 9528 BLAKE2B 2ddcba76f89d207e8efaac8d59c6c1209fb9557fcfad586e1226b70d49ed8093aab602149335d23d497b0674e606d00d289fc291dd721aa7470f12ec221b5f61 SHA512 317ef8717f0ad4da6d38167f1f0dd65b6f1b3bd08bd1361fe6a27e6e422cd9fab62f3fac3848082bb24411505ecd41495fc1cbedb970d43945c8f6f8cfbbdf41
-EBUILD pytest-virtualenv-1.2.11.ebuild 860 BLAKE2B 33063265574b6ffca28b6060ed55a634441fdaf082bafd20a39a8a728e1a0767389d3d2f2b655707d4c92c364ad3ffb58a06f2685d5922f818e9c485a98e203f SHA512 9ce56175e40fb69549abb26468319fb217113b6264a3b3e890e9552e0d39ebed1813a1472b2647f7b0c0bca2f7aea7521572a0560a98d933c471cd34dc868606
+EBUILD pytest-virtualenv-1.2.11.ebuild 864 BLAKE2B 3c2d095dcc0de7304162264bfbd0b57f524bdc621b1e1c7cf787e3ddc67a509f688fba4cd71d1f7cd907dbb825d6c6524370421c543591991384f36fd04bc930 SHA512 1d6a7c832d5ed45e1b324b47a25556dce34fcf994f4ac4b111850b6e09cdcd5652a5bc7f0467260124a075c74eef70e7d375d7acfc2de2f1b6b3c0efe5d54f28
 MISC metadata.xml 704 BLAKE2B 5def8fc368efcb89f29107dead2b04bbae8f868d94f7d95396292e35933e556f1f0cdaace88e9063beb890999d2db384da85ba44e61fe5d48fb660f9f0f220fa SHA512 856c8ea08f2f1f4f2e1be19e2a2cb2aaad2a143f270417a2632685b44432c36a947d7d98b51bb87cd6f32943e814a39790943e0c4799dac97d84b92103b759d9
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
index f18ee1a9e264..a4a887148236 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.2.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index d9b97e20457f..211995187176 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-3.0.3.tar.gz 731934 BLAKE2B 7fb57d75bd54eb8a31d9701fdf739119715c475eaaacae3cd038057c1d2bf43fa86ccdc45b3c84962708ef606976ab39ad41e0c3690c8b5f4c04d870579a384e SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 EBUILD pytest-3.0.3.ebuild 1969 BLAKE2B 4413fcae34abc9ab190ee8274f0d35e89842c95b91e98a4c61be0e69e25a788814c986911820c0e0e361eac385b3a3078aecb6c70b0aa03ccfa54f603cb065c4 SHA512 6c2a5039ea0da514625e3bfdb15578aec046ee6a8feeb1fb8a5daff232b74a64d467af0b7efee481749de9b84877cbaf39bf7c5ae98f2e11db1fc2f8350b35fb
-EBUILD pytest-3.2.2.ebuild 2101 BLAKE2B efe4c2258f13bff2154acea3cfb828e3b37b8d65c191a2829b27ca10a6861975b759f8aba2fcb5bc9a1f9d8a4f1c3899b865d33eacbaefb2f914825499e68077 SHA512 ebd6166600570899bfa38b20045838fcb949d701821974a2758589bedae8e87df8b57a1631b6201a1068da1145855e01964db0b634082bf3ef963a062731b87f
+EBUILD pytest-3.2.2.ebuild 2100 BLAKE2B ab07341407c3a737ada173465fe1feffe08c5210fe37724b01c90f522df19b6c07806834c4376eec83df59a9997c403982ff2b94f66c87c1cb18c1502894204f SHA512 6814aa6e5ccd514b44b3a999d1e8ef80d98bb2239377e1f155337f89775e84df4550536bcedc7b1c85467ea18012ede7b7806abe53bb75a7cd9b84330030e919
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-3.2.2.ebuild b/dev-python/pytest/pytest-3.2.2.ebuild
index e840a70e9947..1bead6e09096 100644
--- a/dev-python/pytest/pytest-3.2.2.ebuild
+++ b/dev-python/pytest/pytest-3.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 # When bumping, please check setup.py for the proper py version
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 2ef6d43f79ad..5936dc96c96d 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,5 +1,5 @@
 DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8b44b5b495cdc9bb83df16d425214bb681f8f841e053a3cb4d52edd30988afcf2c301a96f699a70d9c129cca5 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 EBUILD rdflib-4.2.1.ebuild 2687 BLAKE2B 28a7f358ea1c1ce4785f9d374aff553021147376a05c62a99600263a10df6159b3a5814bcc9d8bdf0909e45d727244088da219974fd3c9e1f7844e620d19f393 SHA512 86091ab53bc5103f5a673678504e8b99520e314c0b290240595f34df13740a4fca2e580082f9cf8fa18c517a220d87eb87c87e8edca97e2d4373ac177a2147dd
-EBUILD rdflib-4.2.2.ebuild 2715 BLAKE2B 345fb47275044feb9634967741ad672098bd967099991566d15af62c248f21b7f77807bee3234559e2c311d13402350c2e1d578e37a8ace207a74d28606564d6 SHA512 0742af6e2eba2ab84d3ecf076c2fd5c89cca4dd07f8704b0064a409b58320d56a9cd21281de4231a2ccb917b84b24f938b425759f03a71f863f96c9efb62155e
+EBUILD rdflib-4.2.2.ebuild 2714 BLAKE2B 8064c9d2e3bb27cc5a5e2822d5b0fe4b6aa0a3289271fd3baf48b8672b701cc1f94bf7f6c2edbdcf9af21a631e5916bb708e134b405280591e1319fac24e0af3 SHA512 c78f9f6267aae657db214094bf126f88701567734a15a188054bca116d21f20577f6112d2961c05e7b4147ec4b5294d86c1148a16d38b2d96cd14f6da2c32c43
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 8e7727a9eb31..b50e6a418b9c 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc berkdb examples mysql redland sqlite test"
 
 RDEPEND="
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index f3c14686192d..02af4c58b514 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,6 +1,8 @@
 DIST rosdistro-0.6.1.tar.gz 48699 BLAKE2B 87bc8d7d90d3731c5994be94bde9932e16cac8e4c257a97c80c1cc70b2af68bbeaa6c36c1eeba9dc32a75b33cf69196f1520c3475f1dfd56d4ab17804ca6802a SHA512 9f7c9eea737da443b1daaacde6bcea163ac2ffc707efb23016fe77c68423ee192e0610b9aa1c8a4b07735d1784e30a509dc78cf256061fcc4de75ed4c4244f75
 DIST rosdistro-0.6.2.tar.gz 42658 BLAKE2B 5f4c574438ff6e791adf1ee8076ab898b656c00bfa8b48b6cd2d871c71c48f3c5b609108ed8005ae47e2554ac92a9512382c1dcdd5bc74614aaf4573b13322b1 SHA512 df7da98a2b46d45d978bbb371ea98cf24aafa0704c1cd991db0f1b785eb3330227d42a505b765653bf11d267f676844e1043e5fcff52b7295afa1b21ffc99301
+DIST rosdistro-0.6.3.tar.gz 48789 BLAKE2B f26da2b2624501321033390d554559a0b807b224c35e96ff1643d6060e0225b9de6e2f9df354c5f6f13d277ba5b46453fe5db10d31cd5b05f50a78360d2b03dd SHA512 9fe50a9ed67d5772912ad7d15c60179894f3d775b593e4f42fff6c5221a77ea89176c9239ac0e962d2997eb6b1b365ad47da1080f69e62a4c75e1ea3f26294f0
 EBUILD rosdistro-0.6.1.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
 EBUILD rosdistro-0.6.2.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
+EBUILD rosdistro-0.6.3.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
 EBUILD rosdistro-9999.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.6.3.ebuild b/dev-python/rosdistro/rosdistro-0.6.3.ebuild
new file mode 100644
index 000000000000..e9ccf8b2beb3
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.6.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Tools to work with catkinized rosdistro files"
+HOMEPAGE="http://wiki.ros.org/rosdistro"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/setuptools-git/Manifest b/dev-python/setuptools-git/Manifest
index 4b3d57ae7a2e..c62f59330ff9 100644
--- a/dev-python/setuptools-git/Manifest
+++ b/dev-python/setuptools-git/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools-git-1.1.tar.gz 9450 BLAKE2B c659e3b894c3bcbed6bf8d40aa390dca476912782dbb2222c9b1dd5bebc6c98ba28b50562eba776232014093f8a222cf1075d02752da7d90a18bb594b4e724d7 SHA512 39e19c107f6398aaa1b78961c3b0d9d7b57b181d8ce0d93780460867fb7535ce45d266b93af43f45aa7afb89299199df22b0fdea61e9090932aeb4bd69c5f1f0
 DIST setuptools-git-1.2.tar.gz 10546 BLAKE2B 52b7cd8387037b1eaee91e9df7de9944ea08bf02f4cf9ea74fa9d0febf85d930af989e9a07289935d8886f0fa4439c4cb46556ff81343981153ca35314703a9b SHA512 c070911618b6b92c862fb0bd40f1daeaf79e2ba10389fa1e69e4c50cfdd39c8e57a612082cbc7d932f8cea12a769e13451e35e1c8fe34f170d4817fd0d44f156
 EBUILD setuptools-git-1.1-r1.ebuild 631 BLAKE2B 3a9bcb27ca70dd491d8d90d9d4704c2a2b03775d3b15a55b11c440612ec1c9da42c4f7f797d78aa608be9be977feb8aac32fc2e35dd936e270a0384591729d38 SHA512 00a140936e3adf214b3ddb0d67eb6bc84588d7b245711c43cb1ca47c9db05aa19e605e98b9e4317300e899f00c211e21e0841a5199bcd8d5bfb0a5d715fb0eb0
-EBUILD setuptools-git-1.2.ebuild 676 BLAKE2B 2b774f4d5dcc7d079a9f047834da0161325143f68ef8de353530f949301e7ff5be58bb2a33a61d18cbd14b2877ece0bb7a59a9bed332c3671ca6cad09c3f5081 SHA512 a04efc1460648418dadc55e57a9d12710194b7a6df07e761870d4e398e467109c7a28a3d7cca83835c77d62ed046bfc77db960857db24179356a19f78780292f
+EBUILD setuptools-git-1.2.ebuild 680 BLAKE2B c9005a104695a4cc251cf035ab5f18f1bd735a10338ae2f13b0071a33b83a3421a6851c0be14d73664be4fbbf761bb650db12edb0ad4f89f24c7304ae9682e6b SHA512 beacec7f7115876733782cd63066fd09d09e978e512775c99647ad620069831a7a792d76168229ff2e02dc81f59e9ee3fce17cd75679ddb38c31193231366afb
 MISC metadata.xml 617 BLAKE2B 6a8553d2d3deaa7eedae6706e516b6cab014df33acf8a4589084ce2ddc8b3bdc619253ccc176cfa28a7092efe9044ab171b585fc87d933ec5e833303ad2b6dc1 SHA512 057677807a316be80d26eb8aa9b07a87a60251a6185c85ac1042db7040849ef4e9554be1d9ac15d1b8ff212df2f39446f3c56208fe83d12581fb0ba283d1ebff
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
index f6eda1f45b3e..d5712cf06a7f 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		 dev-vcs/git"
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 1d13736f21dd..c6fe6d85c8ed 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -13,6 +13,6 @@ EBUILD setuptools-35.0.2.ebuild 2035 BLAKE2B 33e913654fc4d814a01c118c115163db856
 EBUILD setuptools-36.0.1.ebuild 1902 BLAKE2B 35f16b636fe826c5dc788549b3e24922ad2009fc11ba060e2a99250bffb383091447e7096dcef8c7dc35fe092f7f5d3ed428e1562bea5bf5ce30e5a22920e5c1 SHA512 b205802dbfe7a2c0962b3399b4cae6fce1437f3922f2f138c5055497e514dd49a52d1513dad9d2323eb2360c4d59f37607f24dfe17176cd1c6f136875198827b
 EBUILD setuptools-36.5.0.ebuild 1791 BLAKE2B 1af27895f3764195595f2674ec4cdcbb697dabbef7be50d4c64ce86a58eb3d714c023ff3301aa2c4c45098d1ae3ff89fbe05e5cfea68ef3ef54a6249bac67d0e SHA512 3b85d8349146d3f82e0c589934784c96b6f24cf3a1f4ad09eb05cb07ad18ae250dd2daf01816fbbbe2e7c285534a58690e8f5f359baa1c0ea9557acec142fe03
 EBUILD setuptools-36.6.0.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
-EBUILD setuptools-36.7.2.ebuild 1846 BLAKE2B b12f066865783acc7d7690fa68b7891e3350184aa68a0717e4ed9aa7044b14b09f8d0d387d31a3d6fd73da520ebe4dbc82bce5e882dd1db364c17c07d01a7aee SHA512 427400f89216c150ac090f363afdad2590ddbb93c489a845bc5e38f1fc9e13107d3a0d982f48dc5ddce64a5931ab84bcaa3184ed3af18303221a7f1842755564
+EBUILD setuptools-36.7.2.ebuild 1851 BLAKE2B b5c5dfdfab43a9a67d081a3d5e904f8eabe79d9fbf9bc543b8431efb3bd4dd125f70ce303f7403e4f432da7a6e13855e75f89ad4064b5da10aae5902ddf9e75b SHA512 61e6059be529b53c634446354e94bd242f6af9a0cc1f2b3fa588397cebaa8d27c9268ee30ba33efc2d0b8ddc18662c04e4fe937aabbdb35d15f227bda78cf9b7
 EBUILD setuptools-9999.ebuild 1828 BLAKE2B 24067d8da779d29d821819cb7b620f69150ab580e4438232a94f8b335c07ee5fb383b3b52db8a7fa53086af9813157204f816b3d4e8e322c9b210d0aa6df385a SHA512 fe855fbf0f1012ae83b82c138d1fb8f2822d09285b0dcfe5a31e430922878da217549943e868c0a96493f83d4b26d9e47312de7639edb329eacaf9e13d9d532c
 MISC metadata.xml 380 BLAKE2B e6c532ce30c0def7dde2f2ca91e1663f290954f1f099fc837247540c31979a215be5550bc42d4d841f62d3a81554ae5377c148ec34dc2e92bbca3daaa1021fb1 SHA512 70bfa11a90dc1bae499e235e01c05ff1b0ed2960062fcef46ed07095b59309c4a0c3adcd47f7b0131ff1035c8e77c5bdf75975ac1eaccaa1a9fbd06a3f868f94
diff --git a/dev-python/setuptools/setuptools-36.7.2.ebuild b/dev-python/setuptools/setuptools-36.7.2.ebuild
index 908d31e355b2..f0ae5ef5d299 100644
--- a/dev-python/setuptools/setuptools-36.7.2.ebuild
+++ b/dev-python/setuptools/setuptools-36.7.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="amd64 ~arm64 ia64 ~mips ppc ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 5446e382edce..70d3e241e427 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools_scm-1.15.0.tar.gz 23677 BLAKE2B 72d1bb9e3bfd15157ded9a46804dc8a18bdb529268d014e5a4ba9d4a32e48cbc124cdb65ab93136a7a1b6b62a3d24e4c5775f4738db8e3e75c9c149ae9c61f9a SHA512 860fd9460f0d1d5ec9369c2936342f9679b8815e1d705999698b7bd82adb41a65048df68e57065e530972ef57e43a251ac41d6587972b1d5af40cd0249bd081d
 DIST setuptools_scm-1.15.6.tar.gz 25779 BLAKE2B 01d6771c24015f072a46ff1429b964130f370f42a5cd3c634cc1bf9a506ca8547783087a0b9589ed4038168d034dddbe435540cd25a846536dc5a5c116f4168f SHA512 ae91ac28d396215be5418df3b36af726b6f2fb89707424383e920072fe8f9f75f613a99fe406cfbfffc61f9a857a3294259191694899351ef78aebba73d08816
 EBUILD setuptools_scm-1.15.0.ebuild 772 BLAKE2B 9bafd5038719360380e14ebc8c3b2039ba572898955047c25988cceb1817196656b4b97a79afe13eb8e49578b4c0673f6b916195a3b73e7cf1b520ad77eae099 SHA512 b41121afba5603f74e4f791620a388d228ac8b827eb7b6cfd71da714fe3ad1ae35088f718c004509aaf710c7a79251d300e8711a034bdfafb396e7fc48c1d4e7
-EBUILD setuptools_scm-1.15.6.ebuild 795 BLAKE2B 1f1f3f2c33980ab44bd549101b34166ba2061918c6ab7ce1e41a880c1b9d9b123c2f1985b51d9bd760ed0eb58828dd98c53822dbcb3bbc9a38833aafdcdb9bd0 SHA512 20397fcfb1fbae455b1f2a6690b42a32a87a75a5f357a8b8485cea59863e26ce9fe1c507b05f48a29f4a1b9221155b37a3be93f5c7966b63ff22d4d8a4a587fa
+EBUILD setuptools_scm-1.15.6.ebuild 828 BLAKE2B de7fb849b2fae93c8ff9d9d1a5189027520a08770d01f88e6dd59d6511abcaf23241914d91f229a288d981ad6141626e1b8d3e4a655513cde28a0d734730802b SHA512 fe5f8586a7894266f1a09df5883e5f2d80abd04a5fa7e399a324f8ab44bce5861f003211857d2b2c6b68dce28c63ba269d9517f0151ac1737c625f9af1d248a7
 MISC metadata.xml 438 BLAKE2B 10b56535d3839fec5a07d9cabc381dcc94f9ef5dc956cca1f74d29f567f5b99f0cfd068b53bb92792e4b55ec4af3109489e00d35695c6165dc4ae3af167f654b SHA512 cd0e323a85bb13cfe7ee6b3102e605e800aa93a4d4452c20b85e7f48541f5ebec23140ef7f2e3f282cf3c3e7bc6764c0efbe34eef48ad1fd722d57803d668b01
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
index 4a9883705d0b..0920029dae82 100644
--- a/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-1.15.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/singledispatch/Manifest b/dev-python/singledispatch/Manifest
index 58a1b99d4b9c..261671460adc 100644
--- a/dev-python/singledispatch/Manifest
+++ b/dev-python/singledispatch/Manifest
@@ -1,3 +1,3 @@
 DIST singledispatch-3.4.0.3.tar.gz 9529 BLAKE2B 51e948c1a60adac7db3b97931becad4c699277b7c6af2e211e160fd6ec8fdf0501a3a2b40780b9bf7a2a5c62d08d905c7058c5a771018f9ec78a60688e3b03b5 SHA512 ba065d36092ddee6527be3d7cb777c51c0949855bf6dd0ffb7c25acaedaa35d36fe6dc096587acddcd1e9e54c6ac5f92c196b11f9ee1270cc0c1cf2f410446cf
-EBUILD singledispatch-3.4.0.3.ebuild 602 BLAKE2B 1c5a7a0f100281371b393b9787767629c022bdef7baa5813d21c592fc3afa543021cf63003e8d99ff4275dcb61e45f82d3d2e149138f5fd00726ca4e56a2e9ed SHA512 d0fd2f4af4ca0a10e1d013704b78cdf08322f5bfd2c85cdbde24d492f2c6d63110455b7205295c6ec16af9d3bdfe2f88d543c53f43557e2abc137f753ff73e8d
+EBUILD singledispatch-3.4.0.3.ebuild 635 BLAKE2B 9f056a56a1dce90fd9f52925b4416a3463324e433ce312e54d2bec82fe92040baf0f5476f04ccd24d8b465b9e14ca875511bbac37825c57aa230ef69ed1e3769 SHA512 60867a2a09d86401a9a8c3aeb6f7c1f5d28b682251ceafd50a2dc92c2cca62eb1ea4226990f90d848ddefceacb4b87be0fbcc27c89fa30002b64480f3ad80fa1
 MISC metadata.xml 509 BLAKE2B 82538994b4e960527c48a62552c468745f7a324eb65e47ad1d7887cb0163cecf83df460cd0b1d24d89bf159d166820ed16c338852370d03ab4803fe31694d91d SHA512 a8bade1abd688b4c1788ef4e62d986fd76e8d17c8f0e142fb94eb34e7a0d783ea208deedc058f571ad3aa50eedbd32d019bcdb1715f720be30d067ba0556735e
diff --git a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
index eee91417d804..a22289732893 100644
--- a/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
+++ b/dev-python/singledispatch/singledispatch-3.4.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PF}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index 44f1ac33cf7b..5e0741a01040 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,5 @@
 DIST SPARQLWrapper-1.7.6.tar.gz 26597 BLAKE2B ef98640257d06e1814d57812864b2fd23ccbf2bb2121e77b84e87b26f4daf9cac576dc005659a023ac318d7da4dfdf4b6f96ea30f159e12f444cbf7f93a7e97b SHA512 cbaafe8986f7da88efc383ee7e694559c9314244a03f616e5f2afd186205ad625fe0601a2316013add4c11621fc697aa6d4672f8bbabdc485c11e873ca6342cb
 DIST SPARQLWrapper-1.8.0.tar.gz 28775 BLAKE2B b8ef5d3e2d52f4e17c47a7a398d01037dac3f6b62722faf92b6b76f37f2ac7e242ebf3cdfa93788744f632e58caf95207d1c37c462639151e20db74a94f4d69f SHA512 bdfa3d5efc2deb8202a27e8a4770cb69ce57c1a71133788fe7acf8aa4cbc2d74024fd5f7fe5188a0fbebd399d31f62ca23d85f7ebae5562046b5b782311d8907
 EBUILD sparql-wrapper-1.7.6.ebuild 607 BLAKE2B 8b2f8eea948b345e3246d41a30e50edf3c2576eb6983da169fe00cfccce538c17b7cc1982d23153211ad7f2ba2cbfbde8e7ccdb8bc303092cc25d0d2aa6c1e41 SHA512 cbe8508cfdc3eaac33ba07cee40fe8410aeac49d192e854854dc865af61cadc6a9b93bad42d12458b283638c2eea074ce3617db5bf4aac4de47a654d09711016
-EBUILD sparql-wrapper-1.8.0.ebuild 615 BLAKE2B bd96f51c2763f1d012b86f8bbe6b0810212597cfea1ee935685076e59ef6003f590908b2f326e90ef8037edc462497ce1d6a3245f11708a31a8ebd1149f32468 SHA512 b7e022527fc740ddf06c9a1972c7e702e1bf5f5d5a868eb927fb343cdeabe741c4dde085d3eb3864cb1e3ce7c2b837884dc8cfdf53c38cb33b1e038f98fe3ba0
+EBUILD sparql-wrapper-1.8.0.ebuild 614 BLAKE2B 9128e3a1e5fe213d6d3b722564cecf47950c7318afb9c1004b9e8959b3ec3ef5e3b7256c6b3b705e67ab74479ccd1e86a3270b544b3a12cf865cd7c3c900d68f SHA512 eed9551e9a570f4f7e71650308dc6fcfa67d562107fdfbf3aeee8381f38c80ad9bc15be0225c4d1688309a5108b88e13fc1242da34e883c9f06fabf46a272659
 MISC metadata.xml 326 BLAKE2B 0c3bfdc601d5e93c90d7966cf8b7de667f7c71b2353ea1a7c28ac0c52028999484f4cee8601d346d78e963055df1bfb115a1acb79bf0a07e8de6df600b63c83d SHA512 9cc7b41b1ba7fbcde0ecce7638a3b2df50d6290d65d9854ae6611ed144220d9b292235ab8916330c828a4f9a1c5605de6d0d71d1a08fb0f6ddf37f7302c03e40
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
index 0743831619d0..2e693f46d539 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index f5122af574d4..394aba42a712 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,5 @@
 DIST waitress-1.0.1.tar.gz 123934 BLAKE2B 1e7d2a2d0850096b6b0d5654208ebe23d4e78360d8eedf3bce98276b8710eac0f544158f9efe5fa72abbab27d3ca5c4f3ed9afed43144d4d06f88f8068b2f19a SHA512 0205a0a5fc9e65e20370fc1e97ba456337313c93817e9b2b283610e5045eb32de80f45d19ee0cfb9469a93e4fc9267b785feacedd70b362474f4af5c05a3ab21
 DIST waitress-1.0.2.tar.gz 124685 BLAKE2B 4c9edd2d7c37964616311ee6fe5a58ff1f6a7677226956e47f03f629d7765b3015c1f652f39ad7b0f81608f8638e63edeb35f120ee57347e89b029918e418c04 SHA512 b7000e1198ac306ce189f70c5dcfcf41318e5ec47c8d6183cdbc360c8759ca726405d5da70f1c7fe3cfeb39d528af94d693767c2a7a1a7fe460c6407857ec6f0
 EBUILD waitress-1.0.1.ebuild 797 BLAKE2B 67eb57070f777a7bd54d72b92578970f88f28d0eda42e8790628328a9a82e4f9e9f6c3bde9bfc0359a0260a2fac5ec058fe22db12a2916c562ccfe6781276e67 SHA512 a9b6288942450bafe1f52f8e368d19492feb50db0f29df91853498e4836450b5feec1db4c390d5265752bb0b76bbac5f1f7388a0e7007ed2b267a722d7599060
-EBUILD waitress-1.0.2.ebuild 790 BLAKE2B 6a6854b5e9f2cd06b8740332ec970a3f1dc482783aa3321c6a46df6d81ccacd26c98dc231d427799080ddbc0acc6bc1c0b66f44496a90e4ff7d034da18b72ac0 SHA512 880a419f3c3bf38ade5b9b12b5a7b38442c5754001aff2cfc0c9792dd538b42541024096a2ec8bbf5ac5fb13a5040be71ff38c4e93db5ae40be3947c3e85c9b2
+EBUILD waitress-1.0.2.ebuild 789 BLAKE2B 2ae08df8b52183188729ea3535a5badd5b3366d2b7bf047def541c5ca0b50a0d8f2dd6e437031fa2e0904fbb631814852f38eabd87d02b14d631f498e9a588e8 SHA512 f3b3096a2aa7e11fc830e8edf342484f4020f9f9ddce14bb0b2635bdfe66228e2e1b5811ae976d90ae0d978c2b7f906a02f6733d0151e17565d8ab5e8fa03705
 MISC metadata.xml 378 BLAKE2B ce0ade449ef1c9d58ced1c883c0adb2a27573bd74f5299bdda36ee60fe073a56e8c44f5a81a36bdd7fa2c595c1a2f55abd3eb876fd5d0909256bff4310fdaabc SHA512 02bd27d7e984ce3ca047d34dd5acfe9c0b23e9d8fcf59484262e19e9df1206939fe2837a58ac00fe58575c2db4abe28b89a5a1c8a8b887d346c30635ee2b10fe
diff --git a/dev-python/waitress/waitress-1.0.2.ebuild b/dev-python/waitress/waitress-1.0.2.ebuild
index 7d301f061df4..dbe5eeeceaa5 100644
--- a/dev-python/waitress/waitress-1.0.2.ebuild
+++ b/dev-python/waitress/waitress-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-python/wrapt/Manifest b/dev-python/wrapt/Manifest
index 6d419c7809c1..2e5431e828c5 100644
--- a/dev-python/wrapt/Manifest
+++ b/dev-python/wrapt/Manifest
@@ -3,7 +3,7 @@ DIST wrapt-1.10.11.tar.gz 122499 BLAKE2B 1398bc84e3d5490ba6e6f6f386d5eb6439ec750
 DIST wrapt-1.10.5.tar.gz 119157 BLAKE2B 70c7bb43106e22c53a9938f6f87c4545ad8807f2de3a0e2c73168bcf04638cec6801c2e28847174025a700cb83f015228bdca31074ba428377bdff96b297b403 SHA512 450b32eea67774081d23c0e020ed7eea3c8ac458925a16cd606a4f95ee5b7631bda5ff00ceb914e9ccc28a5e0a7302534b6711bb23d637c77327a8a9d228cb55
 DIST wrapt-1.10.8.tar.gz 120359 BLAKE2B 779c19a3bcde28140f09cb490c41164d78e25c6ba4608780851197b2197d37571ca05ec768018f393b54fd5acedf1793123f8eca683ac432f358dad149847237 SHA512 2a37584b3c3a33a2d39d5cbe9f7e61a50131db55ffd5be7902b5ee84c347d8ff4d6094e5639d2f854fab274b2517a0e47420da9f543f11cf92973acd6d15d42e
 EBUILD wrapt-1.10.10.ebuild 1005 BLAKE2B 8a6a13c76f4294ab4bccd5e990ea3a0c3e8ecc78dc19a43eb83d0b0789ff6128b9efcd19af7047997cb105e1f0c739d872dbf122778be032d1b639926250051d SHA512 1dc3a85bf196351bea5ed15cedf09e0c13ae3d22bc3e6e0bc5847fedfc63fffc171e0f0cf81dc859763262f9d10a25f870fa96acec20fb81ce2341b0133b894a
-EBUILD wrapt-1.10.11.ebuild 1013 BLAKE2B 97c8ce744f76a5f5b2d9a5620b33dbf946b093149c53157858ac53f5a4da287888d644d3e01b869b800eb0becc6f6459beddb22ac919dc127c1bb5180652ff8d SHA512 8f4d620fb18f11d0988df280debfde8d6fdd7bfc550e9d237bd514aa82e9db241a878b30eeb63e103627a9ee0ddab68eaa2190a6c77ba4856f94674bb78edb04
+EBUILD wrapt-1.10.11.ebuild 1046 BLAKE2B 2999993e485f2dcd9a144b93527092c94ebb3b428e2ea7b07416979282db6080f3517d8d39a2db80af09df4deedd0f424888d7314176734c62b9c2f6ca7f1ca8 SHA512 4b8481c99e9ae070f1484cb503a1e81ff16ee7f93063afad2fd06c3fbfa6e896b9fb8e95c626bbf71d2465b800e5b4d63bb4265eeb15879cb0b5e4fee8e4944a
 EBUILD wrapt-1.10.5.ebuild 950 BLAKE2B 6c2cc55de84a4a36c20e46c536ad33bd0b6b81e0bed553ca21d3a041719aa60d428986deb75fe2ea3edaf80ccbe799e042099ae9daac61cccbdf3673ff4b4a61 SHA512 4db2adacc68f4339200e01ee316efad4e7d5df68c6149681bb6a78e694886ff6c0acd033e9ca2948297fba8e95443b57046cdc631a5fd47f9301daa01b5d4adc
 EBUILD wrapt-1.10.8.ebuild 1013 BLAKE2B 5f8f642d1cfd83227670df1948850aac1d8253cb210fccda2c2e3308d12d3deb6661707384d9c91c14262131c8b64cec19562b44685aed835806d555a9949dc3 SHA512 94a5c130a722f6b8de4cc00451ebfe795fcabbd672ff688f6731312449c6e038b1e94600aee0b0e6dfaeedc6e9b44fd5655e9702f4fdbbb5e2b965b7c61efabd
 MISC metadata.xml 476 BLAKE2B 19a66be86a3b9ab0d7c90f7f180cde19350f55a7470daff9f369b8c29b92b81a6c02e811519adb4cd55a97b9c3f6f674f2110f1911a81ac3d62bc917df66c50e SHA512 2768e1bc9684fe8fd1a71fb82ca897a629515112d79a2ab62601532bfd5792bddff737506ad19c0b780ca817a3e6ad41a475deaebba134de2aa5c88d2efe3c26
diff --git a/dev-python/wrapt/wrapt-1.10.11.ebuild b/dev-python/wrapt/wrapt-1.10.11.ebuild
index 5ff5ec966398..2622cfe2fbfd 100644
--- a/dev-python/wrapt/wrapt-1.10.11.ebuild
+++ b/dev-python/wrapt/wrapt-1.10.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-28 04:06:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-28 04:06:07 +0000
commit	ccf84bcd604130256d1377cd58f0a634ae6ee20f (patch)
tree	f42a709e0c7805183f5680883bc76dc935b7a0cc /dev-python
parent	c85a90f90521c7e11d618b527d6630cc64cecbd4 (diff)