gentoo resync : 27.03.2018

23 files changed, 67 insertions, 104 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 58069eb2aac3..00ee97d1fd2c 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 2ee75f373425..123d16ab6b23 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -2,8 +2,10 @@ DIST brython-3.3.3.zip 10040987 BLAKE2B a6a238ac6189e9170653c1987db46f2e0735f25d
 DIST brython-3.3.4.zip 10047374 BLAKE2B ba4719476206fd71f412d646deb6a7eea3a0aef930814d7fa3589a3e736818f2bc7edf7f642998ae1471da87e3ad05ce89fd9dd32d569267ba45174543e4e520 SHA512 818181e040eefaeffd1e8866af471626ff5874fd99c3ee9fcc09c46a4b4b836619045a2712a8e16121a1132c86407b0676a8125e707eff4c7e867851cf20cecd
 DIST brython-3.3.5.tar.gz 9215864 BLAKE2B 985671d9d60396101b01813b151798d57ca8b7e6450c9a0eae2f14e65cf06cd12e416715219128ac17ff8fa66f1aa3e736dcbfb17537140b7373598d4c873eb1 SHA512 5226d01e4d0f824885329403e2d9b80dd0bec3ed456102f54fcb3900ff08508e3268111b51b892687db21f2936d4feb4bfd328775812206790bcccb4d9e366a8
 DIST brython-3.4.0.tar.gz 9303732 BLAKE2B 18ef80ce4390f052b6743a545236f57339378ebb3df5e51cf56385fc6c25e43a8e40fe4887d86d8390475c3e02e148188c9be1622fbda4938031559a3fb72bf1 SHA512 4533dd07293efd96b8e6d8f690decb65bbe6c511654f2872b4751e549e4fae0bd48ac80f80983d1b5c7ec029b8df455dec83ba544286dd84c64124d55fdd68e1
+DIST brython-3.5.0.tar.gz 9232597 BLAKE2B a01c01cf0e67589bd58312e05eb56b11b7905c19e2ac62b895d3352ff9aa0eba141a52437ab12a1aec43e63d07714b56822db2aa82bec89b46c2c9f8b0980c45 SHA512 a0ba2e66712fdf41d64fee4f832d1e620a965099cb506660268d43c9ff00c808d853ac7b7373bad9bfc16f3ec7b60066ed6ba28c33d7df151624169b272951cc
 EBUILD brython-3.3.3.ebuild 747 BLAKE2B 2c672a8e865b552476c5e59e7dfec48e5698407b595803b2e9d46d8a4cd446052bae546fe6ce65c50e96884e3f9f720638f42121250d2762b1401dafaa54f96e SHA512 57185eba9f856aabead84341def359931f577e54fa2f53b11d46eef0548e3c616f4de6a2a3b6c71240cb50d7b4ea97958dd877bf1004e578ffa22f1230793c6d
 EBUILD brython-3.3.4.ebuild 742 BLAKE2B 7442a3ed384bc1b5e27dd940c61d41337e9c824970c2bff8cbae70d2d35ded4a3773d23739f98822c8eba0b797a344e10f9b5e70bf671c68b591cba7931b7685 SHA512 49387c89eb5bdb29983ce0264336a44c25dde16051645a3b441b674aab6b3a1422faead47fda2135e50c0aa322c49232e3af8cfe92856b8e103d20003e08a6c3
 EBUILD brython-3.3.5.ebuild 748 BLAKE2B 3c85ab366af664de90544aad7974918c895e3d322ffc01f2f2eada889203f1bb4cc9cf82bc35fed5f68ae0bf3f4dc77b9d960bea0ef8b4756e0ad7dc004151fb SHA512 2490ba9dae38ebb397cd020f03b3b1e2cb63397f7d9db30433afd7d269bf829bd08b94243714f63bd981d1b19ab926020a2bdf194ab1ec5d74c7ef8dba131b60
 EBUILD brython-3.4.0.ebuild 748 BLAKE2B 3c85ab366af664de90544aad7974918c895e3d322ffc01f2f2eada889203f1bb4cc9cf82bc35fed5f68ae0bf3f4dc77b9d960bea0ef8b4756e0ad7dc004151fb SHA512 2490ba9dae38ebb397cd020f03b3b1e2cb63397f7d9db30433afd7d269bf829bd08b94243714f63bd981d1b19ab926020a2bdf194ab1ec5d74c7ef8dba131b60
+EBUILD brython-3.5.0.ebuild 748 BLAKE2B 3c85ab366af664de90544aad7974918c895e3d322ffc01f2f2eada889203f1bb4cc9cf82bc35fed5f68ae0bf3f4dc77b9d960bea0ef8b4756e0ad7dc004151fb SHA512 2490ba9dae38ebb397cd020f03b3b1e2cb63397f7d9db30433afd7d269bf829bd08b94243714f63bd981d1b19ab926020a2bdf194ab1ec5d74c7ef8dba131b60
 MISC metadata.xml 467 BLAKE2B 06e617c5b2362ad41950d7d90d2f3ef25a2858f6c4b88df6edfd6ee01aeb32d1988d30bb66c0d9b0f3c5ed771596678f03aa5c707f016dd1d01259d11f1acced SHA512 a9c3c34e617cc5a3ea80f30c8de8964712af694d8048197662ce2c68d521279761751824a55c68bde5b75444495f176cbcc7d867c46924729391d3488fc3100a
diff --git a/dev-python/brython/brython-3.5.0.ebuild b/dev-python/brython/brython-3.5.0.ebuild
new file mode 100644
index 000000000000..50f67db89823
--- /dev/null
+++ b/dev-python/brython/brython-3.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 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 webapp python-single-r1
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/enzyme/Manifest b/dev-python/enzyme/Manifest
index d00cc3f908cf..945680b60b7b 100644
--- a/dev-python/enzyme/Manifest
+++ b/dev-python/enzyme/Manifest
@@ -1,5 +1,5 @@
 DIST enzyme-0.4.1.tar.gz 47953 BLAKE2B e81faf1c0b3316511706c2a31f56cdc2230fbce468017134692f1892439c4aa043c5537b78fd267b83d84a1811e2c015aa37d724813da5864f14ae04a9fd961a SHA512 62a85c076a7eb320249a507dcc9dd26572e3a9b9643e0a960ed114a80c75213e6e5028a726fbcdd0c2c46c53af980a69828a54a66af9a17af3210273376395b3
 DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
-EBUILD enzyme-0.4.1-r2.ebuild 988 BLAKE2B 48789bcbf5275e3a987386dd212c885e4690443a638100cc0b47f8df8f9064a0e3378b9978a1dd1e20edfef96c020b74c187bb90a845a17cac9298ecc343309c SHA512 85ad8c419566af85ae21c2ba14044e633c57f2b8f06e282c2aceb8b5c84a2777ee385b29388fe58ab800a0b59311f3617bb307a719fad970387f6d61e8b548ac
-EBUILD enzyme-9999.ebuild 1049 BLAKE2B 01c63ef7e8b08355e1438bf22bc76a539625f8a1075cb3bb7901669e9b03e73ec2204a5267d5fa8dfe6ead403f9ee8c874e5a9258f17afef2ccc0f14b5436a62 SHA512 ad866aeacecc41678755d28e14088952110abcf76be11b88e3287ac55b04954b4dcac4d7c793ab4859a4389c0568205726230d57755ff0accb8b5544ea164480
+EBUILD enzyme-0.4.1-r2.ebuild 992 BLAKE2B b24e16b9f0f9160208bc041b5193bfe00b8982e2f4f15133fe9fd2a6ddae342b084a4ecc6b39370abd6b02882c39c0b5751b477d617505a6fc2ab666b3f2fc7a SHA512 d8a1022e152c6d9330aa25e8ad134ed852e57cb9de13d280011a9a914e820157fd0f592137b3a5196189e73a207d0d14888f8d67b54ef282462317c6b4c03c77
+EBUILD enzyme-9999.ebuild 1053 BLAKE2B d4a99d244f14881d6b5b6cc90b5d63a9c075dd21a5846372c93ebf072864ba86fc71c5855a34a2518d8e1c2fea7380e40b83433ba3abc0ed1e2584d320aafea2 SHA512 cd82916bf65a6ceec8825878bc676719f1e180297668225ff24198727d548abbaddee9a0ad7facc2aed73c2db58cbde5662c62e6351d731f98c59063fec197cd
 MISC metadata.xml 541 BLAKE2B 1272102c2cd342be7a673733dccdf47508d6334813872aa0fc4c6ea26dd85a6df68013569d07e0ffd925599fa3ace634e5f648507db1a854f642686fc2e9fb66 SHA512 0797f0d2d0b20c8a14d165efa4ea4b564ea4c714dd4d799c8b3837807a9b8b8a34b41991e52e95a63a44a7c9bcb56df008b1ca3b36fa35f8ef46b1b133368782
diff --git a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
index 23e0d26b393e..69c23ce38739 100644
--- a/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
+++ b/dev-python/enzyme/enzyme-0.4.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1
diff --git a/dev-python/enzyme/enzyme-9999.ebuild b/dev-python/enzyme/enzyme-9999.ebuild
index c9d243a749c9..3c717ab3550d 100644
--- a/dev-python/enzyme/enzyme-9999.ebuild
+++ b/dev-python/enzyme/enzyme-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE='xml(+)'
 
 inherit distutils-r1 git-r3
diff --git a/dev-python/guessit/Manifest b/dev-python/guessit/Manifest
index ea4fb014a4cd..f35ca3e1eeb5 100644
--- a/dev-python/guessit/Manifest
+++ b/dev-python/guessit/Manifest
@@ -1,4 +1,4 @@
 DIST guessit-2.1.4.tar.gz 102907 BLAKE2B 3b3652f331498bbb365debf18c74f789b5c9e9c1f711481b0a392c73e9fbfa6628ec58f45ae482ee74cbd4c3d26662f2f1776d9b5fe19f35dec02e438c8b0901 SHA512 c6465c32a68d40698b75addb343d765e47b867dd7f9b8c912f70532a9e9ca54d0e40f70a393880347eea64535a65df5f79d83ea99dc996cd126ba91ca130a879
-EBUILD guessit-2.1.4.ebuild 1262 BLAKE2B 78abd33baf9cdeab590b7451f20613b37e9f3f817b239ff163a0e9e43d68ab9cdb51a36a7f8cd80890bf217b2247e1c6221d09b5c17bb2a2d244437764035bba SHA512 20f07f80db8c96352db4ec5124ea73598152bc8ca1cdc852a49ca30cc531a3fc8920bf666d4bae4a61ffba8f7d115fddd70b579b6fa70403f97e1b2c41b9a70f
-EBUILD guessit-9999.ebuild 1284 BLAKE2B f591036cfe19d2cf6a4245154e5af22298eec03e6d31784b8601e24b7ea070c0841a1b7dd3b98003456bae7befaa9283e24a62fb895c28470d562d35daf1b754 SHA512 3e0caedfbce4eb60c2eadec02e2f48e9a1901f82833fb2ce165414c7497f5609d0856ea2b4e10251c6d6f7d0903bcde60bc8142adce721af780fffe71b8dc64f
+EBUILD guessit-2.1.4.ebuild 1266 BLAKE2B 760c4a4f26b2ae750c624bdc2d633ee7b95e9ff36be6264e73f312414ba651610c3ea4ba83fb0574173afbaaed499b7f18c006a5b42fe17456de9b6ab61e563f SHA512 76502738289403bee96d177cb33d505a2ebc5fa248e34deda64a6f42ddac87fb67bcfb6782b92e3ed68ce3972f99e997d37bdc14e5d86029d8d023413b7d9c0a
+EBUILD guessit-9999.ebuild 1288 BLAKE2B 989b2cc1d3c7ed15d35687d11591d097d08d4b51a22c8d606c778070ef4b0635fc7847d5c4f80affcc6664b4f95901ac50989e62d179398a1fc9e8626780c4de SHA512 89af1004838d7c20812e2568895b119b7d09cf454e54dc5b561a0281acc779661e1a7d1ecfa72370d174ca4d3f7a83d02d44d18ed456415bcece82d85fd2b7d7
 MISC metadata.xml 494 BLAKE2B 1263ff6357d817ed0e3fa8939860c0c2718f0f9d6d15dfcc0a7980d6040a56075c79c4e580c92a59a10a9f26fb0e0579592fb3e94272751b4f071e3d738eccbf SHA512 7a9448f171bf023c39ca5bdeb3f3c079ad64ecfb07a15d8d3708e00365ed9cb9dd547e404197fca308fab1e52f8c7f3669bb952b370c8ca707ff24d6067a1c32
diff --git a/dev-python/guessit/guessit-2.1.4.ebuild b/dev-python/guessit/guessit-2.1.4.ebuild
index 98774b237126..b991bcb90ea8 100644
--- a/dev-python/guessit/guessit-2.1.4.ebuild
+++ b/dev-python/guessit/guessit-2.1.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/guessit/guessit-9999.ebuild b/dev-python/guessit/guessit-9999.ebuild
index 8c6ead3c27e3..7cc74ef41be7 100644
--- a/dev-python/guessit/guessit-9999.ebuild
+++ b/dev-python/guessit/guessit-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-python/html5-parser/Manifest b/dev-python/html5-parser/Manifest
index 63cbed24b5f1..193e62d37b0c 100644
--- a/dev-python/html5-parser/Manifest
+++ b/dev-python/html5-parser/Manifest
@@ -1,3 +1,3 @@
 DIST html5-parser-0.4.4.tar.gz 267787 BLAKE2B 9fcaec9faa906914d43f2b19381fe3095d4cd009bfb534537d2eabb420195276b3690d760c1defc92ad00e4965b3eb34ce4700d54f4f0291dff88026d890c90d SHA512 3aaeb32f360d2c131ecbe11fa1dcd3dfcd62c9ca046fce7dd4ff8127d0e62216f666e83bb20c7809c6adc591e1fb2798e382e78a1cf6129b1f0a09a71377f8d4
-EBUILD html5-parser-0.4.4-r1.ebuild 783 BLAKE2B d08b896748bebcc3ec1fc42d03aa7b9170715a4d41187260b21597e6fe99ad7aa04d354b4a6f48af2a4b77bceb1df6f1012079afd914f802c9d779b78fb19911 SHA512 7d30f1e98f56871112543185f490b5451cbaa8cf3270a548683cccd4133e0ebbabd61f5ed7b230657fa5fba5c344c8e9cd15d631c2c3d5cf82d77be82822da5b
+EBUILD html5-parser-0.4.4-r1.ebuild 782 BLAKE2B da66c97b3d85c0073647a47d314be4e75badefc8abb6994d46053c2bbe90a06b150a6f1e8562dba95857292662f11056c50a516db03b820314f02c1359e90e71 SHA512 46abe3fe7a4c794a8fa81e4883a1912fdb0f69b2b5437a90a2caa0f87a52c943538678f24b9696fd188ae0826a036fc1b3345daec3dcd9e3ba99a8b5c0ac4c6f
 MISC metadata.xml 356 BLAKE2B 8e97cfc61c6249d06916c0c6464637f4d776d81ebb060409181ba40eb91a65485a3c067b50f18dc9d9c9bf29f5a98bd40dc6ff89a0c68b30bc00353917db4e08 SHA512 3452ea432c8187cf09b7ce3b70df1c951ae243c153300093583efc337d9f6c42c41082b34ff6a81c19337ef508c90cff4308d0da63a44f4976d11ff57779baca
diff --git a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
index 39204b859065..72db339fab9c 100644
--- a/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
+++ b/dev-python/html5-parser/html5-parser-0.4.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2:=
diff --git a/dev-python/pyblake2/Manifest b/dev-python/pyblake2/Manifest
index e230103b43ac..68434622e064 100644
--- a/dev-python/pyblake2/Manifest
+++ b/dev-python/pyblake2/Manifest
@@ -1,5 +1,3 @@
-DIST pyblake2-0.9.3.tar.gz 130641 BLAKE2B 5165f104b5d6bc10bf8b72177b4ad08db55e1a92ad1f04efae2c3d73b6f3f52a0962cfb23832a5f5c1ed9d75c7c3a04be9c37643e381abfc7a2f843fefb43151 SHA512 6336a7f7e79bd3e6ff7f8ff4d279ae170e86f1464b9fa9e7ea7f0dbbac6fcc044caf225111e065f9cd9cdeea0f81fae8d373e1f65be3e418929f53fad063205e
 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.1.0.ebuild 803 BLAKE2B 5bebe0ba5b5964d352aeaa003d55c34f6fdaf42d9e9ed2a760d7967a3d441d5065962c8b25dd023f38db03d75c8d78bb419bba566255af3b9b3e56030748f84d SHA512 6a514eb812db504465bca3182e853212199a07a50bfc1afe06f0402e394ed964229c96be2c904bc1a527b614bd58ef44d57810d57cb188c1aaa513533532bdf0
 MISC metadata.xml 452 BLAKE2B b5539d95846469f07dc0ec47d4c34f4ae7fa950c58d728f5ba92efb3f74d849598af1eeb7c3d3ab90a41591746e94b3d4c3ea5330c423fb340cbec4a1da28e80 SHA512 28acd5472435f8832eb8cb7587e651f428309e9a37c17cad378fe8f01c47896115c4d42ace1c6125eb99ddd30de562d42503b6dac42432b55b37775cdde7c1ff
diff --git a/dev-python/pyblake2/pyblake2-0.9.3-r1.ebuild b/dev-python/pyblake2/pyblake2-0.9.3-r1.ebuild
deleted file mode 100644
index 9245471a8a72..000000000000
--- a/dev-python/pyblake2/pyblake2-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="BLAKE2 hash function extension module"
-HOMEPAGE="https://github.com/dchest/pyblake2 https://pypi.python.org/pypi/pyblake2"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-blake2_impl() {
-	local code='
-#if defined(__XOP__)
-	HAVE_XOP
-#elif defined(__AVX__)
-	HAVE_AVX
-#elif defined(__SSSE3__)
-	HAVE_SSSE3
-#elif defined(__SSE2__)
-	HAVE_SSE2
-#endif
-'
-	local res=$($(tc-getCC) -E -P ${CFLAGS} - <<<"${code}")
-
-	case ${res} in
-		*HAVE_XOP*)    echo XOP;;
-		# this does not actually do anything but implicitly enabled SSE4.1...
-		*HAVE_AVX*)    echo AVX;;
-		*HAVE_SSSE3*)  echo SSSE3;;
-		# note: SSE2 is 2.5x slower than pure REGS, so we ignore it
-		#*HAVE_SSE2*)  echo SSE2;;
-		*)             echo REGS;;
-	esac
-}
-
-python_prepare_all() {
-	# uncomment the implementation of choice
-	sed -i -e "/BLAKE2_COMPRESS_$(blake2_impl)/s:^#::" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# reported to break stuff, https://bugs.gentoo.org/638428
-	append-flags -fno-tree-vectorize
-}
-
-python_test() {
-	"${EPYTHON}" test/test.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 8c660d4d3d2b..75a66e6ba075 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,5 +1,5 @@
 DIST pycryptodome-3.4.6.tar.gz 6968560 BLAKE2B f066199a9d05bd046303be62c43835908c90a4545caf7681d2c13db78ce345858b8565daa26ccd4a328eb944de469b943cdd0bb3f58591de4e2a09e130f7381f SHA512 40c9ea4cf7fca06bd7cd3a100e1d602e0130fbdcc75544ff1353ced2fae8925d29286200561832f2524a0f3db155a6924bb653d964408d4486aab694bf275cdc
 DIST pycryptodome-3.4.7.tar.gz 6483140 BLAKE2B 02368e2af0a12686cf2e635cca8e2c279f7c3b147a66f99e97cf04d829aa66eca5629f7cc8e76420970a4fa5ca5f97e7d2a04438b3a2ac5feb980fa96998b3ff SHA512 a328df1f3b2cfeccbb5984aca4c5cbd59e8a352c817e82411d2876b2494476027f63e61200b0cc87e9420e8b47e91fffe71865fb2c23a66da0276814641eaab0
 EBUILD pycryptodome-3.4.6.ebuild 824 BLAKE2B 7a3d9132f8cb32ec3779dc8976fdd68716fa532e88f09eaa43a7cbb3aa563d722ea68d006d6fd32658bc12375086f5b6fd08c4aa0c8095de499baf194aa95a0e SHA512 92013712e2cb90fbedb4229a48456c7ad08cb750c68d937673dae5a29452b4bde4f27dfcd1d38e25b9e820f95449f88475b150b1f4f7dce736b1ba7a96f46e39
-EBUILD pycryptodome-3.4.7.ebuild 877 BLAKE2B 0d9282a29018eb2f9ec05446c6f0409223e24772286cfdec917ec7ad083c39322bd03f7c75cb54384a2d8949f3c358c8db9798b956ac884766aa1be3474b9b4a SHA512 4bffed71932ecf16a23ddad7b72c654fc2cc9a0f301352b32a1ca270983da8d954dbc213d9f2287568cf3ab6b311b4d2ee209765836b9cef51c4fdcb9ee24935
+EBUILD pycryptodome-3.4.7.ebuild 883 BLAKE2B 8cf1a81294380040e3966abc76f11e3690632ef2ebcd09764599aa79735d5e4a71050f3f7cd5e5b8d48d280fd4191d1b4ece3e3a2529b305c279ad9b30b8e95a SHA512 07a95e8a9e69a31f0be247f57f1e5061050702c6c7f8078f64a2bbcd93e6c13dd65ea80b032e5276f2d3eea728c5ff64655828091ac9576ab8f2e5abd679b125
 MISC metadata.xml 334 BLAKE2B dd22c5da46085356e8049d290266f66f81a648683dacb4ad33faedb86b890c911047f245eb96b418cbde226b91bd91567036ab31919ae28e488c5eb993418c1b SHA512 f314a41851c5f31d68a7fb93ab304aab44007756472c9f18c746a0b0a7bbf464a9f196559f4ecf6f8b68b265b7ba9ef571398e1893d316b48a0fa435eb7a1b3a
diff --git a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
index 3de522482088..c7fabe3d3c2e 100644
--- a/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.4.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pysha3/Manifest b/dev-python/pysha3/Manifest
index 61c8be3c9dc4..36f0667eeab9 100644
--- a/dev-python/pysha3/Manifest
+++ b/dev-python/pysha3/Manifest
@@ -1,4 +1,3 @@
 DIST pysha3-1.0.2.tar.gz 829192 BLAKE2B ff0c0e1cc35f5e2efc0a7d3074022aaa1e05fa72cc151560180fe08958c8f83ec2b0f50f9e1bf772fd386647f3d44e8b4139f5593f6d0d678412eabe4829e939 SHA512 57476d24b9d399471cf56c8c1413f58dbc863c16d4fe9ebd2cf65df8092e139e2505252605e3fccd68978f5ee3fffdfeeedee6788aab38a54c918a452fc19720
 EBUILD pysha3-1.0.2-r1.ebuild 1022 BLAKE2B e49ac9340154e90df9d52f7f658ddcc76eb904243093213fa861545af3852304d401102a27121e9a22b6b306926dd65b370ae2992abe1be9fb34c7fb7cda80f3 SHA512 1cb4338f00d6c02362c9fb4f95e590cf4487a91968d7d38d360b79ceaffc20f2c950ff30d222434f4536fae27a04647a74d4a7333f0b33fe7e8a28eba4249cb7
-EBUILD pysha3-1.0.2.ebuild 670 BLAKE2B 63824f1f7e6627ad0af8d413df4dce5c5cd54d5b9dca196f22bdd6ec884368c06b69076fdb579cf3f53ef8af6d79cc92ff1e26ca986e011751d4969aea46690e SHA512 97caa72029014f15540d6e398f299a0605cdc65eb6835246634f60020c0b4772fdf3fb2c7f8c89be4f2164414410ed7012cfd73c58adca4711c8fe02183e5a33
 MISC metadata.xml 447 BLAKE2B b29243faa53b7068fce5b86ff8ffeaef920340c92bee35620fb2977b02a1f543fb6cfbd5509fbe784753d9e1b123bb1ed594dfd59e2ba611b9ce0e1df6319174 SHA512 e29bf7eb65b03e9190be49df6e924da2e8a6d30eb74bad5cd5b3551df5184c720c9666a11c0cf4afe4626a3d433edd0989507583d97aa24cf5b8bb9ffb535b9d
diff --git a/dev-python/pysha3/pysha3-1.0.2.ebuild b/dev-python/pysha3/pysha3-1.0.2.ebuild
deleted file mode 100644
index 2d74cbfc8274..000000000000
--- a/dev-python/pysha3/pysha3-1.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
-HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="CC0-1.0 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 9284eb46e3c6..c6aec6e9cf14 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,6 +1,6 @@
 AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
-EBUILD pyzor-1.0.0-r1.ebuild 2140 BLAKE2B a9d5c8f734283120563234a6cf8ceb0b931ccc34cfa513a25d0750fccb7376f6ed6e2741b5b1efcfa3748ccd5b6449e402ff446d8dff0b1215e47b6a7761ed60 SHA512 ee4ab225b8b8d6b8d6af0127400b6ac149104689dc4e86dbafaca661d4900a4843e42a398b916d9e15a32c84ca36308792149a262b3af17c96b49e22c1ca1012
+EBUILD pyzor-1.0.0-r1.ebuild 2144 BLAKE2B e6027bcebbebb591afb98a33cf4587a78d3bb609ffc6bb5e32109bdad74a0e633ccb7db6dfc7b3c6be9fac1ec79b45af5ff101ed6671e4c359853062334ec9c3 SHA512 26f6a117e83342e572370b819ebca810f8b513eb70cf4c445c464224678f28269300b9492635a6730e666de996df04b3940ee2a4de1ebdb595d970a96d601d22
 EBUILD pyzor-1.0.0.ebuild 1797 BLAKE2B 9e3cd862816d96ecb273cd796271c27ac74d95ddaa31f572b450528c52275af3ac396f1e6d8c58e7542a3116a3436e37e9543374d8db74a78eac49a2ad146e41 SHA512 08044189249d9c0530d5007424b9ec6e9a5b92f3ef518c80e41779612ae00195cfddaf54406c8ac667bfc7ba4e1424391a7c58bfaac98d6377730f94119f25a1
 MISC metadata.xml 1061 BLAKE2B d2ad7e863f055f46e4ab2048cd8cf042444476da9423743c246ede1f6b3f2b8be4b9f980da10e741726ae25625af09a8ce6eeb7710c2f5a8ceb4cc4f915d2e61 SHA512 58d18a197dd3575d7644f0e9f446344ccfcc321d33493fadfd89f7f233a1dc58e0c899b42a3ae72b219dc1327e2de6eeaf90a8de3735fdc0dc1f6c67c5cc8722
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
index ce7d0e7b5cf1..54e002c28b3a 100644
--- a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
+++ b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 4b23ee7f509d..52bb94b50810 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -4,6 +4,6 @@ DIST sip-4.19.7.tar.gz 1022209 BLAKE2B 51b29bd436ce7af2d4a3b45ace100075bd257c239
 DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
 EBUILD sip-4.19.3.ebuild 2120 BLAKE2B 83b365b259bb57a09a645afaf1def7a57096cbcd6d5aa56eb066b9f680746a49d0528c364fb3aac4d73050bf570caa3ec2a70361f0561f28fec49bafb003bd41 SHA512 de1ff1f0dd2701e4e40b12aa0ffb5fba5f2cd380439eaf292a835812a08a449517769bfbe9d74374b18a0122390ee5449b9fb135797782344aac824e56f1ee23
 EBUILD sip-4.19.7.ebuild 2776 BLAKE2B 787ad402476cc19ed1a690d0c2fcf748b7c12429f9f61f6a2008dd772c21853745c2f110a3d1f4c57bfac8116636301ab1481fd54652d76b8fbc3c0b257e1f5b SHA512 a82ee1ad2f33b3b4df3b2816f0839a9ead6d52c55c23f9fdc0e79e68319e982d8827db3aa51c9334852e9ae5ae948fb692174e2234541d6c5d2d67f851c63f1d
-EBUILD sip-4.19.8.ebuild 2772 BLAKE2B e3233c3914581665ee6697572c77609cc4675914374be2580c9bea0e4b16f85bc4e29aab7a45bec374616a296cc1530a31302783e0f8be42789969360627e736 SHA512 07f12d27f8c2375cc69594e8b98102e0b0f6faa4537bc78a941c8ce78338175a854934df714e23f62a372e6f50805ce647ba5179c850f7097c4528c4ea44ecbd
+EBUILD sip-4.19.8.ebuild 2771 BLAKE2B 0ccfe87d57e9f38f698847003c730de8c010b12685012b7d7365a2712c7de7e6a5580222d8673e3a3d710f9ba178e56bbda772670375173779dbc5098a45a5c4 SHA512 47fe6a72281fbb0e05df874d969e529a255f806915701ac1605b892714316cedf9daa7a1078117de79d15983374a6dbfc5bc51baa66aa2304c65841abb5d21f8
 EBUILD sip-4.9999.ebuild 2648 BLAKE2B 8e7fdbfc969f73f30cf5c26282f06439be6e7d01e9ee087e0377d946aced09295c01ed685e4988a09967c604c3d378e2716552076ca509f6d808fe3a02d470bc SHA512 be5b35c951f7a93d8fe1dd751d4b27132f0249a052cedc4877a3ea7bc56b646744a174a4e0796b127ab0c0082fbb2bfbb1dcb8ef4fd02ff5c10059b44eaf8ae7
 MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
index daecca774b9d..5e03ec09d160 100644
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ b/dev-python/sip/sip-4.19.8.ebuild
@@ -24,7 +24,7 @@ fi
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/socketpool/Manifest b/dev-python/socketpool/Manifest
index 0b3cbdbe30a7..c580b1902770 100644
--- a/dev-python/socketpool/Manifest
+++ b/dev-python/socketpool/Manifest
@@ -1,4 +1,4 @@
 AUX socketpool-0.5.2-locale.patch 615 BLAKE2B eecb66a15dff1ca068da3147b7e27618f49cb414e34a27b10949565dfac46f5b714bd00bcfc152c9d3b98b59ae4282fa5431aff61295086abcf0e5367f45954c SHA512 df27a0b1cc8ef2475ad8c68e3f77153ccf5397e962bfae2f6116dd37d1ad3a1a45cfa0912ee4d4597560004b8875b609bb8b0a6298861651ff23ff2e70955dce
 DIST socketpool-0.5.3.tar.gz 9793 BLAKE2B 89b7b71d9f05f7f5e560eb3cb5e7cd4d2254ff971066d236b98903d790dd96f6c580333e9fafeab7314c50f499c9617df706a20efa1c52de069c583b6dabd928 SHA512 6d16a18927672157703fb5a29f4332241f9ddf743dfee8f2606d600dbb75d547f2e0dcc0398febe55df3319829a80b3f537b5877679e4f674569ef55de78c1b7
-EBUILD socketpool-0.5.3.ebuild 825 BLAKE2B 4ef2b4b561999fcfedce203a6f0dd8aee777b88002e2a6e50a936861e59ffc7552f367ab34233e55d737f6c877fed2a43361e7a9377f1e1fb2bc5a84f0ea4ebf SHA512 2151bdc4e5b6ace91ecc0c6c81f0c10b2e8a470f2c85bdd02532bcfbd9ad4c8994a5654a473f0c63c59a4c52e934fbfe443b82b6c547b178cc2df24f6209a52c
+EBUILD socketpool-0.5.3.ebuild 943 BLAKE2B 6f7a8bc86c731583aab2170c45989c99400a4a6045457e08b6c613a798780d951a71d051680cdbd7162642b2faafbafac0f2c57a94c009a9afd8080f1907a920 SHA512 da84c454d5ac42ef4174d448b26db22be480a80bcbf6b083c3e70430964da5b55ab51849df5fbb0f7102bdde127fd0757e302f9b7892dd7768ece34497207436
 MISC metadata.xml 383 BLAKE2B bd4f1eccf7f3fdd7c416bfea5e96ff6b1b28b4bc5e703e1e236be4932e20bdbb8d9bdf6712f0bfd8845b49fe0a7ebc032f21bfadfe419554ce54c2b790cf73ce SHA512 3051b0487ab4dcdf440c36b12829a30c03db7256c99eef6623497b8223ebf6cf188a9ae054342c468771b2a38f8b3508ff0f49aa19398f3aec0a25a7bc1e9248
diff --git a/dev-python/socketpool/socketpool-0.5.3.ebuild b/dev-python/socketpool/socketpool-0.5.3.ebuild
index 60c307504a97..e73308b6f454 100644
--- a/dev-python/socketpool/socketpool-0.5.3.ebuild
+++ b/dev-python/socketpool/socketpool-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,12 @@ python_test() {
 }
 
 python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
 	distutils-r1_python_install_all
+
+	# package installs unneeded LICENSE files here
+	rm -rf "${ED}"/usr/socketpool || die
 }