gentoo resync : 29.08.2018

27 files changed, 183 insertions, 118 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 108d71665fc1..4dc8bf89ba41 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index dd772266b0a1..4de426ed4977 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,9 +1,11 @@
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
+DIST cfe-7.0.0rc2.src.tar.xz 12539260 BLAKE2B 7e7f006154aff2e4cfde377820c3482769ddb22a14ef45c98cb1645262ba36a5cb2159097bd159141e37cc4a06dddd93e38fdac4d763450834719daf088a2d15 SHA512 ae4c4f2b5f3c97147bcbb5d74e07588ff2ede7c131cb4e782ff077b68da1f02042a87f44227574a2883da7ce6827cd188898c862b0e09a4a70316df16193811b
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
+EBUILD clang-python-7.0.0_rc2.ebuild 1070 BLAKE2B 7597139dda30eb1f934c78d8afb6aa105a5fb7aaeb3ac16661b92b6d63c77bea709e58ba1f160730ba2bf367f31a1247e822e3a5c2de194d015d23f8660063ce SHA512 a16f77d6c554f954fdfb20bc1b04a16aa7b2508d660aff4179912661a3f998cd6dc0a6985417a3de80639aac59a1d8eac447b7dac34c5794d4face6de23fe9ef
 EBUILD clang-python-7.0.9999.ebuild 1055 BLAKE2B 8ec9fca2212d73599c2f53e3bdd64da4f92829e07d6e382de98b7acb0b49414d6df86a620291bd2cd4ea3c106c45920e4103a06ff4a97c1754e032b5724ad418 SHA512 6191b1ba3f2fb318a03149d7e909fb0e55017b917fdb6f9009d8fcf05678babb64835077a680d77c756c2f5c1afe4639ad70c07939e84cadd49582a03f0f0f20
 EBUILD clang-python-9999.ebuild 1030 BLAKE2B 4152729630f6822b4a22e1ec754bf99833951c49e94eb55583ea8d3b2dedd957b435dfc3e24bd8adbd9f12a02161fcd5a16962165f9ec592469a4716820332af SHA512 5889e98300f26a540c93017e72b76232b2c9c871be3bb39c248d30a88316d44114fd1d7545acc0963ccdb4d15dc55f70fa8f30825cccfba69b33ef90e3d73401
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-7.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-7.0.0_rc2.ebuild
new file mode 100644
index 000000000000..6d1b45006af5
--- /dev/null
+++ b/dev-python/clang-python/clang-python-7.0.0_rc2.ebuild
@@ -0,0 +1,47 @@
+# 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 python-r1
+
+MY_P=cfe-${PV/_/}.src
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}/bindings/python
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cliff-tablib/Manifest b/dev-python/cliff-tablib/Manifest
index d09b3fd2bc55..0ad79a67bf1e 100644
--- a/dev-python/cliff-tablib/Manifest
+++ b/dev-python/cliff-tablib/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-tablib-1.1.tar.gz 80508 BLAKE2B 11faebcfd01813467850f17f49d9ef18f6d15b8a9d13b58b2a36e115ef17913b8f21cb19709f9938e8cdded2538b5c3affbe548896cbd95f0957eda4f5fb8a71 SHA512 26beea20ca1ba5c96276ce974c24bab572c6efebfe44ef45bd3ee6197593a34bf29843676a4e37fe400272f3ff59f703d60ff1abda22a1ca28c2434c0f224aac
 EBUILD cliff-tablib-1.1-r1.ebuild 786 BLAKE2B ce3f74c1d6d5f87f850f968473fe5c3951e6082cf70cfe1ecaa22035d1db7cde69fd04506941afc98bf8d17296857bdd82ec61706f490066658e219aab8f68c3 SHA512 225e0e5b93a7599717e4428ef9059151173b5ddabd884229f98136821c1c54133c17659f1cfa5ef2366c78cd2c5a11444b7d3fe0a105294e9ac217e5d8a4174e
-EBUILD cliff-tablib-1.1-r2.ebuild 785 BLAKE2B 9db946755fe6c7a7d6c42fa439f6e7892825039ced943700d8bb30909d8fa99de7810448bea3b2fdeafcb299cbb891cb3a42f3f5fcd753404e38d8d8aed834fa SHA512 bf324a8c854bc7cddfecc8961641fc0be34bf3ea44c22529aac183e61d3e08847f15b9cd2772fe31876dd5532d661438b41d20a527ef84720a56c49a9b34ffe3
+EBUILD cliff-tablib-1.1-r2.ebuild 784 BLAKE2B 004668292f5ca06916b5faa36fba12b964a67dac4bfa1fe9faae08dedb11a91ce50a74262aa61c6fb894df646abb287809892ed1dbf0be7ca24f1f79342aa109 SHA512 ca3aca1b7cc6ed6ffe178378cc0a02dc17b4758d09cd7ca4a846ada396b8a15844078c2f9812f9ed0489438f6560ef423da2b33e24f7e2f04ac0e4da39d382be
 EBUILD cliff-tablib-1.1.ebuild 783 BLAKE2B 15f1ca9519d7817edf7f0678d44f80ee420b4f06fe0c8ae874814553b3dcb44620595fbdeb3f9237f71a3a079f072d35c0a36f6e9cb40c892b42cce317e001eb SHA512 a5a9944931fa2e4b11aa06c8661d4ef35c6c064c41d32b41d9526678bd7182c4e31f73412b9727cdd64ea6853c4e1196c7bf239e0c7588ee27b6d6d14b3c5235
 MISC metadata.xml 395 BLAKE2B 875c5346b128d3653e234932bdf62471ad993980ad77006296bc6ad3710fb71089df8c375b42d5f5e219f433dfafe67a389b0a2a04a2f99db0537f89f496bbc1 SHA512 874e5cc1c3b1c7341127ab43fde400a9341d9475f6c32f44b3f0faedd8e422324d703eaa814b9cbb4a5fe0ac13a09320c60f83f236cd51bd6247def77005e71e
diff --git a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
index c2af04685f61..57adb6c422c3 100644
--- a/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
+++ b/dev-python/cliff-tablib/cliff-tablib-1.1-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Formatter extensions of JSON, YAML, and HTML output for the cliff f
 HOMEPAGE="https://github.com/dreamhost/cliff-tablib"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index fa473588cccf..6ffad0eac763 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -2,7 +2,9 @@ AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc
 DIST dulwich-0.18.5.tar.gz 330097 BLAKE2B c29f3016ab63082051c8c4fc42301c12ca752008a317afc41defceee2db47e50efb69b9a21b3d50c241b3b51c32222c1e9cf35eedaf2811f66cec2330ce7865a SHA512 4ba0f70ebddf4c7f4e71721812e228f820226d4ea42bda4d5f06a0720a029d4dddb800cfc05b2610525922c5fcef1020edd1485105706d9ef3fcf810e6381035
 DIST dulwich-0.18.6.tar.gz 331325 BLAKE2B 781227bf91d8df8f941dd2eddb1682fb8c358d37f35671b08334ef197355e33dbbd09d18b43a179f9200cd6abca563a2fc833da68bd860859a52d951fe679ac0 SHA512 2d2120e23dd4bc2c9dcfe601f21ac757ee3fe2a343923c50b32c067f4d329ac89cdf0894bff450bf52c69e99759bb8692f0f14ed73d01be6bc3b0402d58d1148
 DIST dulwich-0.19.4.tar.gz 349813 BLAKE2B a14dc2dccdb68df639a6a4bbf3aa8314fe831f7086573d7cd194f7426eb0021b2faa1663edf318b37031be90121e64a1186c381bfb2cd32a3824abac2a3aa52b SHA512 42aa7d35a491f2d98a8afae6e0afc68089f9d37dbd706961359f1d624a47c627dceb73bb614b608d29dd28faf87406f2e81b1ddcec607aeb0fabc9744b733232
+DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
 EBUILD dulwich-0.18.5.ebuild 1326 BLAKE2B 14c458bc4309065c3aa4cb92ff058a1077aa3345c6709c302e3abd5334c7617f57496efd3cac225ee5aac1a5bd42e7cd93c86dd8fe8f8500ce8075860aa93ede SHA512 370695ccfaea526cb0eb259ebddf559d3ca8cd6118a63778583caa3e5581132ac2e6a7b13a87b5f6c2c408020cd73476985058feeb7a60dadfe1aaa08e953ddb
 EBUILD dulwich-0.18.6.ebuild 1327 BLAKE2B 45d2bf54b482a513d2b0ab84bfefcb70897d6d3c7ae76e4dc6e3e3cf68f2a26380f46b979e4bf6f2710c4a0960b5178b44d87837508ec72a0ef63100a38a9ef0 SHA512 5e77058029cb530aa303474e2c2566378c515d64f3ec68b9ea6d151c3f5c652baa345620afe8ee7985bc0bab1cd8ba518629c2c3b952a1f52e0c8ece2e44c83b
 EBUILD dulwich-0.19.4.ebuild 1632 BLAKE2B d163b58ecfe09861fccdaf2aaa3563c9a59d3571cccc80fc0115ae80ec87aa9d892caf84a9a9af72478d2389120c98bbe4982e5474905e41be31b86819b50ae3 SHA512 742bb05cd3c6262c2d06109f667f4b494c51dd33927776331a4f0afc93c11376f46a7416941c51558414baabcbd28137e8302167b471272a87cf6a9decf80b27
+EBUILD dulwich-0.19.6.ebuild 1634 BLAKE2B dda158388c16489f875a21d39260914b8b43464fec4a9a90f6b6f0fced96458d99dd22703e569d788611726c752c2fd23b5e7e469fa09bc12a65e25e4af500dc SHA512 6e2142027b0c89a986d908f6d47a12feea026afb544b38443f4db5e83e29ac07228c0a0973fde0d36e1d0bd2660cebc3c44afe0210de7785ce5a969b64056270
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.6.ebuild b/dev-python/dulwich/dulwich-0.19.6.ebuild
new file mode 100644
index 000000000000..19df9baad280
--- /dev/null
+++ b/dev-python/dulwich/dulwich-0.19.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
+HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.21[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/geventhttpclient[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/python-fastimport[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# One test sometimes fails
+# https://github.com/jelmer/dulwich/issues/541
+PATCHES=( "${FILESDIR}/${PN}-0.18.3-skip-failing-test.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Do not use make check which rebuilds the extension and uses -Werror,
+	# causing unexpected failures.
+	"${EPYTHON}" -m unittest dulwich.tests.test_suite \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 86f456300fe6..0152f58eb251 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,10 +2,12 @@ DIST llvm-3.9.0.src.tar.xz 18235716 BLAKE2B c348d36cb21e716e8656b97489a0b7223fe8
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
+DIST llvm-7.0.0rc2.src.tar.xz 28320756 BLAKE2B 92707da30fe73a6dec2614acceada06560332d3b54edeae5047543f23808cf13b24aecc9c853ccbc3341951e1fbceff85509465aa6207275fc54c75f94baff55 SHA512 4211fdbd2278ed325d3f6a1f1fa706351e768e2cd1445abf6664bed39b7b5d0c5e04514711d627f9ae1e271300f410635bb54ba004a5bece0d68450d3a1b52e4
 EBUILD lit-3.9.0.ebuild 790 BLAKE2B 13015298e24920449372388bc9a0fe5b5c705b49bbc50cc6114c8b18f9861acca1d394d08de4ee87db70ee9d363309a3cf8f3ac1bbff865a0c6c6f5c14aaac6b SHA512 57854f8499794d42e9c312b006f54454bbac7679c166c603872ebffe01c47411bff083f7fce0eb817151056ecdd72562224e383de96bdd5c46487f895e33a6e2
 EBUILD lit-4.0.1.ebuild 811 BLAKE2B 6a11590228ab794a2da32f75b8d72edd64a6a394640230a0d524b5784b21caf710fe6085fc913f48671e1812365d9665ae2dca3dca8697636b5149f69f6163a1 SHA512 583bb3c1a0fc61aa0e8fe1ba2beea9c4910f7af699b782b038ecce78e509cc2ffd219f8b63b8c83edd475eeee54c46c4cca4dbe602c6e833859fd784649d0820
 EBUILD lit-5.0.2.ebuild 904 BLAKE2B 74ccf4ce59c6aba63fec1f0dfed1e49bf751abf8cf61626f95534f46ecaece80b793481d7cf8115193007c9c13139018f28b6e4c86566d8481614229a84be5c6 SHA512 13a3ea3609045b3cba077e931b5ae52837c4510640bd5b6df7df6819166e069f3d4eef85ecd5dc1043868d7889539383f64c9f0655de0d88129e6b0d7a4f8986
 EBUILD lit-6.0.1.ebuild 1014 BLAKE2B 549c00ba1da9265ef26ea04d574d139f1fbab99f79ed60f270ff960f940df4507376fe31d48776241ecf4a4cb84f134abec61c000a27756ba057083527cd6607 SHA512 729a2b96a49758b18e59ec9df38ddff9890953283185cbae0abeef1cf4f11c2680485f26ffa70a85b326a389a3230e459700366b06f6bcee5a4be9854afeef62
-EBUILD lit-7.0.9999.ebuild 945 BLAKE2B 23e293c056263d0dc4c5c1ae7a8eee94a581110d93bb31287aa823f2e2d5ff39e485d0e0608c177ac24babd375cf1bf40df3500758ab86cdcdc4a72d9c3e4680 SHA512 5ec3c6c5bbda9b31c82641d841d00ed411f06aa52ab403d30890bc935c1f6322f0822c14d19e5c4826e7a5e38f236c77c21e097e795b87496c80c40b6f93407e
-EBUILD lit-9999.ebuild 920 BLAKE2B 3327119d4508e44c9f3a7658a38e6d6b15ec021761584764c8fb32af8469490d428fab66f20de3f75f2e72cb2f8682f0145805059b3723d8d7361b0aae18966d SHA512 95606df1e8ca840e0512b6dc6c9b06d161646fc71f41bc2e1c459cc2dc4fc1ed3883265c43f575d493f89477616b530b8e7a62414da82bb315ee175bb0dfb80a
+EBUILD lit-7.0.0_rc2.ebuild 981 BLAKE2B cb09dc1d360334e3be97e2195c9b4fb94554702c9bc7e79dc30b25122269a2238bed88c47496b68b03f991946d03a8cdfdba6e33c31103c25bc1291ad917a349 SHA512 bcfd460db8aced910a13a21b0d8310e1d7c9dd49d4e5b9c761a40c4b111eff5f8cf4e315227412201c09da018da69362e6e309c11a8c26e4bd2549e3744d8482
+EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
+EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-7.0.0_rc2.ebuild b/dev-python/lit/lit-7.0.0_rc2.ebuild
new file mode 100644
index 000000000000..bc93c7fb0b55
--- /dev/null
+++ b/dev-python/lit/lit-7.0.0_rc2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+inherit distutils-r1 multiprocessing
+
+MY_P=llvm-${PV/_/}.src
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${MY_P}/utils/lit
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_unpack() {
+	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
+	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
+}
+
+python_test() {
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}
diff --git a/dev-python/lit/lit-7.0.9999.ebuild b/dev-python/lit/lit-7.0.9999.ebuild
index 470c4cf4dbe9..c6039efff373 100644
--- a/dev-python/lit/lit-7.0.9999.ebuild
+++ b/dev-python/lit/lit-7.0.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1 git-r3 multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9999.ebuild
index c4da526844d0..9c3c669ff21b 100644
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit distutils-r1 git-r3 multiprocessing
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
diff --git a/dev-python/odfpy/Manifest b/dev-python/odfpy/Manifest
index 66b67bb9e154..a81febcffe1a 100644
--- a/dev-python/odfpy/Manifest
+++ b/dev-python/odfpy/Manifest
@@ -1,5 +1,5 @@
 DIST odfpy-1.3.2.tar.gz 479554 BLAKE2B 3b9d2d144f11727471002dd1dfb9289028423d05d65fea040041dbd43a674ddf6c893fa8895a2e198e6a82e79aa2af92f21a6381cfd67233b4fe57401370121f SHA512 c5be79c4077f40a56821790d4b6062e3715f8b616b1e9ead79977ad00ecf3f506ebbe73790f215bb835a233833fa471af7f619cfcd88320cf8238e4c9502e248
 DIST odfpy-1.3.6.tar.gz 691122 BLAKE2B aaaf2c1613beb6775d22e4d1739b7c144d8046e687f0dc8f7b7b1ea7400cc32dd572ed5a1cd12cb01c5fec27b5c37950b710b279a46d60da8735154d2b2d7030 SHA512 09f3fbce633949035842cff16d2e016271b7f6abf04d74fcaa712c9b3afa18943dd566a2d88a7256a0a52d88ea689d6ef8262f6d8d67d6ea1025aa56e10300f8
 EBUILD odfpy-1.3.2.ebuild 1087 BLAKE2B bc285573ca2b541623371ff7f7de62e7c5444a777f7fdb69008a59ac848a8889dd339657e17345d2f6eeccb81791dac22510512d9eacbe400cb303ac03acb9e8 SHA512 82b609783b919de843845c2c358c1fbe5e23701ee960fa0e7445f5d98deec87a3cdbb774fb90241460624719efc0e3ca3539e50073266a62e9a04c7af5029ab6
-EBUILD odfpy-1.3.6.ebuild 892 BLAKE2B fffa9347f451e7b899e797b6767dc18919c59791c2a5aa44407543003d2bfcf8c10a8ff5ce582e5ec186cb43c755a39498e86786510a9c3ce5994af9125b574f SHA512 a42fade914429e04f2d688f047d1e6e1577cdc1c426548016ddd8302da2f0169bf90b48eae58e47ecb93d0f78867817412595b7346a0bacb2c3f7266a3254865
+EBUILD odfpy-1.3.6.ebuild 891 BLAKE2B 80ca311a5ddc84334d434b0ffc7565133f1c89e55c77833802287bc1aaa415b4df5b76de8056b8a0189edef7a4cd9fa1ca5107a6bc68d0e1ecd6421cf35d0434 SHA512 377727706b019d305e4072fb21170089caf1036c67b0178fb10624859ff4a0ff33002345c360e919bb633de0210e5cd1073e857ce9fbede689623394153f4ad4
 MISC metadata.xml 308 BLAKE2B 4d370440c480d97acc4b9b2e51aeb78f27227e8dd2c5acfdb99747b6b2eabdd624f8a8f90af28287849216d874bbcc81bb9ca8cbf78c1221e947fd479476b1db SHA512 919a3c6c182828bf99396da71e83f0b982aadcdf0e0c5e6e7f29e15cab19e2d3c6d5afc26864a324055e97be9563cc30ef10b701716678c7cd44e8403adaccde
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index 35d1e10f5509..9db00a80e474 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="examples test"
 
 DEPEND="
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 7aacc09c17e4..823e80f03d46 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,5 +1,5 @@
 DIST olefile-0.44.tar.gz 57903 BLAKE2B 2df4078c147ff737b845fe4ca57b6520c39776efe6bac399b0b8acb4ca62f946a653f85ad0511f5fa42d8b544d539474d226fe144bc2604737f3b16e5edd5ff2 SHA512 92b6ad1bced5b2c8e5332a01e5a2e59527ec2303046d0babd665b0f02fe56966574eff56619de168c50f1ea40df2e61ce589ee61b634222146d049b129514c65
 DIST olefile-0.45.1.tar.gz 97969 BLAKE2B 246198e69cde316f24a183fdf07872edf9b1db2a168571eedb7efdb91166d4ad2658acaaa90e733950e437ef5c6ab8d1bb275cd1b24283b95497e254a39c9b26 SHA512 72d40056cac1d9566aa8e32b7b5484f61958a689130e71fa86bc0b9fed98f27a8cf34b824971357d42ec3dfd2d5bfa86d0f212727ff91d8daa3967969ff576e9
-EBUILD olefile-0.44.ebuild 668 BLAKE2B 61f6dede0374fbf21d54cc18d93a8e2ce5dd5d23c1e41912199e586a7185476028b301b498ae17f82e209c624ddca3c06c122dce55cc25cd3c41b1a04d2e75b9 SHA512 71c7834d9d6dfb6c1452a10c9dd61e46b8ff2e4ffc169ffccea80b154851a97d0936fab1d99c0fbc47749e4021198e7326b55163900e8b04912472fcf8a434e6
-EBUILD olefile-0.45.1.ebuild 655 BLAKE2B 462d6b3affcf05bfce39ebdd90fefc9bf77269c3cf261846937d26e6a8bb67e57e9a461f9752b33a00cf41e7968918a3c5298bc914dd7a7744069544e89458d9 SHA512 28033a2432870f33d9892dbba3b8138eec7ff4d9b38b92bee1d962e78c96ef54a0de020b94f6b34a5b0891358b65d5c90799c8c463843a93db201a3d93e70172
+EBUILD olefile-0.44.ebuild 673 BLAKE2B d7ccf0305e91e0e000ab4623d1e7d10bb11fd25598fe0b24cf225ca925695433cbe3b5f8c45a74b1f428dc7eb643763e050eb63112e2522f70cc6aa5a22bea49 SHA512 1e877185e201142eb7beb84bb6aa00141411a8d3d98fea677f9134b8ad6c7013c53c6d0bbaccfff83761f5221a8ed717b6527a7b14e242066a67aca185030c32
+EBUILD olefile-0.45.1.ebuild 660 BLAKE2B 39b2bd3604679af9d54ebc8d235f9b53e5ad765b6af79219e8e7041c6fbe3fed5d64cdee8c6aac0775f797e35c6d1e2546b68d929b8b7896f7e311d63ee9c1ff SHA512 f9fdb61fffbe61f053d752661fc68e03d72ba3c153cee9712b7771dd43c5df1be69d24b9f9eb1024559d164a6650f5e511d1c8dac75b973cc75ebaee307934e7
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.44.ebuild b/dev-python/olefile/olefile-0.44.ebuild
index 378741b24c58..e3a01470d4ed 100644
--- a/dev-python/olefile/olefile-0.44.ebuild
+++ b/dev-python/olefile/olefile-0.44.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/olefile/olefile-0.45.1.ebuild b/dev-python/olefile/olefile-0.45.1.ebuild
index f26085310c90..7611f446918e 100644
--- a/dev-python/olefile/olefile-0.45.1.ebuild
+++ b/dev-python/olefile/olefile-0.45.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND=""
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index e66359e63f50..3733da678f45 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -4,7 +4,7 @@ AUX pandas-0.23.4-skip-broken-test.patch 1027 BLAKE2B cf6c1d8a2a99a04a30ba989fa8
 DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
 DIST pandas-0.23.0.tar.gz 13092442 BLAKE2B e11ae088c9a4be481f516d83797b1b1d5e9c82f7d9fa98f1ea65e3405e33c99e1e1cf7a35f56a21d9dc922c1d0828b4947d9c6189a5f76ad5c1b28618293f9da SHA512 c9dc7bf843e3392b8b1b4d46c6aa6dd12435aa974abc875574a7a8794abe6ea531fa92d8a635153839fd3fef9059d96a4512831b86b1fb6fb69588c8b29a95d6
 DIST pandas-0.23.4.tar.gz 10490077 BLAKE2B 28a78860e0aa5de8def7bb529fc98b9121a516b7fd7620e31e000ae14217165e6677ce26b56da0b9c603930ab1304725c644426a135d8f9b2a84921b88f3d23d SHA512 0c89db820a49e0cfb9764e64589ff9af819f9a53c01bd0254cd1b6dbd1e9fd452b2ff7c7330ede7623c7576589113e831a19a57c735562b55f90506df15805b9
-EBUILD pandas-0.19.1.ebuild 5913 BLAKE2B 994e9ea3397d2dacb0a01ad17c8285cae39a898c5615b42598f0a85745a74b4c01a2968da343a969160f18658fdae8cc6e6f0288f7254189d6233a4e16b21923 SHA512 6e88582440d02ad3adf338692082ff671c0c4f93f56adb029abfa5dea7210de30308371f990e4b2bbcdfbd510040e40c18a373123a862099d779993f81dda714
+EBUILD pandas-0.19.1.ebuild 5789 BLAKE2B 1a48461ca3a2c779646b50ed1279c44f7d0a5af9b7686968704f7538035eaf55133c0f92e9510c8781e3d3fe8704ec5428ea826dd20225864d87a08d76921f9f SHA512 4bf3ce6604cb8815fe26843983c07ef9e17969d98cd24de24e614bfd12fe826644893f81f74daa64df2148651c2c80ea944a719211c90cc4c6bdeb8ca772bf2f
 EBUILD pandas-0.23.0.ebuild 5907 BLAKE2B 552a809a85a1ec3842c5e3ef7da41c32b07818f11a00121eed4fe4ff3131d8e90a3f56dba4f2f546fa226e23f29da8d3827bb17f676caf654b7c1293de294226 SHA512 e1b4cce520baea14cfaf7c46e7f4ac881b6871133b13c50828ed946482b4d4f3fca688db4508007a108fd7f94997f384f6ca14eb53667e9f28e697e8d8aba94e
 EBUILD pandas-0.23.4.ebuild 5778 BLAKE2B 1fd378e985e5794f331e45741b5f2fe7380b4f0f993ff727a34d4a0879cc7dfb3ffe6c0bfb119a59ddc73fee2ef5554e31790a638673d5ee652dd1e55c0e55a6 SHA512 999dde9816f75a305e223dfcbeac0a37bd5ec084a0af24547297cb8553a57d1ed33e10279fb6a1ed43e4295c6b9b7ab805cfb413e3833d540a7090e8fe25f071
 EBUILD pandas-9999.ebuild 5864 BLAKE2B 23df5dc740f518ce7c82cda5d351b248f8d8e0983b937be43200f2a2f5bc6d48ea71234203fc6776f94a9460dc6e6340dbfa0248b64205eb2792a7b633ee58a3 SHA512 80c4d885b9dc3872b3da9a9daa9f18e2e1b226d249b23eb2d8b3b3161458648ebd77a2c3b17d25e58d2f278d9a9fc2372a62b946acf24bdc441da882067fee67
diff --git a/dev-python/pandas/pandas-0.19.1.ebuild b/dev-python/pandas/pandas-0.19.1.ebuild
index 4ed143486987..4d95ee302e5b 100644
--- a/dev-python/pandas/pandas-0.19.1.ebuild
+++ b/dev-python/pandas/pandas-0.19.1.ebuild
@@ -48,11 +48,7 @@ OPTIONAL_DEPEND="
 	dev-python/xlwt[${PYTHON_USEDEP}]
 	sci-libs/scipy[${PYTHON_USEDEP}]
 	X? (
-		|| (
-			dev-python/PyQt4[${PYTHON_USEDEP}]
-			dev-python/pyside[${PYTHON_USEDEP}]
-			dev-python/pygtk[$(python_gen_usedep python2_7)]
-		)
+		dev-python/pygtk[$(python_gen_usedep python2_7)]
 		|| (
 			x11-misc/xclip
 			x11-misc/xsel
@@ -161,5 +157,5 @@ pkg_postinst() {
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
 	optfeature "miscellaneous statistical functions" sci-libs/scipy
-	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 85720d294e15..e399324e2324 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -9,5 +9,5 @@ DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
 EBUILD pillow-4.3.0-r2.ebuild 2335 BLAKE2B 927d5247c0146ab1a304bdd2985f2606e336b766ec6bcd5718508f0f51b583c27cd8256ce836e7f6100625b36c53ffe11c63cde624d682bff96c45eaa49fa5cd SHA512 4e387bf4d17babe9b33856391a7f66d0849e6d652685faeb8e6afb8770514502ebd5dd10dafd98855891ae1802583b0f8cc51b9a012cc9288146c281eac60d4f
 EBUILD pillow-4.3.0-r3.ebuild 2656 BLAKE2B a5134151a03fdcb4ae3f5e5c5daaa0ec251556ac18fe3b66dc1f8d8ab0be6bfcd571b28f12d98c5ac6740e83941912474b5b5795d9e44b889f9d4f2bca9385d8 SHA512 d32e85250fa166d4d03b437f3ac801d38466878626f6a743e6719295343c6271f067467a78891f8d16c95023851d8e17cf646a9cdd4dfa34bbd2eec54c681023
-EBUILD pillow-5.2.0.ebuild 2713 BLAKE2B 87239e3a3784e9709cbc0aa973277e8384516c950918c8cb484d0900fbaee3a873e37a2ff17d3ff407d5875d75bb81a9d1b8ff19175353553adf786fb23df627 SHA512 e7c80da120661eff79c7c814006ae02311f22c72f9bfafc162be45337bc26a2150e3d271752435964371ac4ddf67b8edb504d57005af64e74b77c04fd17f6bea
+EBUILD pillow-5.2.0.ebuild 2718 BLAKE2B f2f08e2628a3f22880f1dad0e65572b4a3a6f7c2e9fc91522237a748de12f15d22581fe9da6dd8235073f992c07d77ad861b08dbaaecd90601a970fbe04129c5 SHA512 e473121b380b3bc5eed149a3fffde8fcea49fbaf177c54b2266682f0806acabc2697794e6394c615fa31ffe2822b35b31dfa800cb342d3d1d9d3701d9443aa69
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild
index c6228f599dfc..406d711de0d9 100644
--- a/dev-python/pillow/pillow-5.2.0.ebuild
+++ b/dev-python/pillow/pillow-5.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
 
 REQUIRED_USE="test? ( jpeg tiff )"
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index 1c912d61bfaa..8fa19d07c4d1 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
-DIST QScintilla_gpl-2.10.3.tar.gz 2721287 BLAKE2B cc85eea17e563ae5f4a130d26ca88bec3e1a6cbff7bc0af096c63789384d03149105641d6324f53b37a2bd8ab4681a285ccb76e6063a06e5db30d070d3fd8219 SHA512 a1b9d6869797ec074e4e0727164804779792fb77b2230aae80e6d6b5fb3a3ff9d84e17d775d18ab74c97b78bac454511fd2cb49be1fa36f71d9097abf88045b6
 DIST QScintilla_gpl-2.10.4.tar.gz 2721322 BLAKE2B df50dd0a34db96dd57147ddc399d4a30751b1bb4922dc1b8b3c3c1989e810937dc8345f92128e8a606b1edc04fde4b930a424ab8344818c9899c8fe496793a77 SHA512 dee6684f68173784d098931554c839a30e129b89f980cd9704f818c44eb7023199bd3682e4b342091fa3e0ce577ec576d34046477bdd1d7fc58ca5dd2ba947a3
-EBUILD qscintilla-python-2.10.3.ebuild 1528 BLAKE2B 29f01e825027fb0c7e7a130ae9b2474c920a69bbeb7662a0a08cdedd308ec8eba446762a4a7dd9508417338feee6f798f33a50a2ccdfb76fe217a3b51a6d2202 SHA512 4822e5bd19abcd917e6bda804f08318ccd60bbc55f7b191865d24590c73768ea059aa91f985f14ba72dd2e436c01e11e22342948b010e102f785c1b3142f1e94
-EBUILD qscintilla-python-2.10.4.ebuild 1528 BLAKE2B 29f01e825027fb0c7e7a130ae9b2474c920a69bbeb7662a0a08cdedd308ec8eba446762a4a7dd9508417338feee6f798f33a50a2ccdfb76fe217a3b51a6d2202 SHA512 4822e5bd19abcd917e6bda804f08318ccd60bbc55f7b191865d24590c73768ea059aa91f985f14ba72dd2e436c01e11e22342948b010e102f785c1b3142f1e94
+DIST QScintilla_gpl-2.10.7.tar.gz 2734778 BLAKE2B 9fea764828e1c95ce842b06b06c45398b52669c0823a660bcd45a4af4a33a4a5b75b6349f84dc844e18d394c301bbb66f3485abd9f56a5c056d2b507b67a0148 SHA512 d5489a308da265f09c305128d9984b195c90003e52a55f5342c8ea50090392619425a0fc3df692aae0d09467d5b0b496b548eb31ff93cba97c9f4f406500007c
+EBUILD qscintilla-python-2.10.4.ebuild 1528 BLAKE2B 45e4c6320d385e1653b710bfff8e085db962365615f5fdd297fa1fde160e8467b47bf5e4fef379094fe2515f885581393c7b6945795e7928e56061e68f2c4601 SHA512 47d56ca71160e66b44e6dd4ffc37cd368b97e1216703fddc30a2628dd03ca89a0507376bf9c566fd71b13f074093ef8c38501827d3cfbf947d042c05e4faa4ed
+EBUILD qscintilla-python-2.10.7.ebuild 1488 BLAKE2B 8c9cf0d755fa3c9c584974eb01ff0d5dbda9418272f57e4a0c95f859ee9331ace883a86f77ec5c19068a78e0c46f0a26a7467ff258e7c56c702ea616bac92ea0 SHA512 fff5cfe70e8ac1c761f6e8ed0cdeb2d23c0efae49389f5a2693ea567f7fa7c6a55229455fec2bc8642c697f95dd2c1a4ed1db547c73e461076575bc3b15a09c2
 MISC metadata.xml 666 BLAKE2B ca3cfedb72c4bc624270f669034a78c1fd41ed48a261b6d2fd84ee9994d130d1b558578925028eed57a85db021f3cfe4b70e51eeb9a42f4f71392994f7bade82 SHA512 f78ce18443d32b17307e96f8177bc5fb46f5b9f6b4d797e79dcacb6eb76bba578f7d666469576bd5e326717bcd9167fe34a5e1bd1ead5679619816ef8f0363da
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
index f683ef80e872..dbc23b01d914 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.4.ebuild
@@ -8,7 +8,7 @@ inherit python-r1 qmake-utils
 
 MY_P=QScintilla_gpl-${PV/_pre/.dev}
 
-DESCRIPTION="Python bindings for Qscintilla"
+DESCRIPTION="Python bindings for QScintilla"
 HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.7.ebuild
index f683ef80e872..d9ffd92fb6cf 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.3.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.7.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+EAPI=7
 
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
 inherit python-r1 qmake-utils
 
 MY_P=QScintilla_gpl-${PV/_pre/.dev}
 
-DESCRIPTION="Python bindings for Qscintilla"
+DESCRIPTION="Python bindings for QScintilla"
 HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -33,14 +33,16 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}/Python
 
+src_prepare() {
+	default
+	python_copy_sources
+}
+
 src_configure() {
 	configuration() {
-		# Fix out-of-source build and installation of .sip files
-		ln -s "${S}"/sip || die
-
 		local myconf=(
 			"${PYTHON}"
-			"${S}"/configure.py
+			configure.py
 			--pyqt=PyQt5
 			--qmake="$(qt5_get_bindir)"/qmake
 			--sip-incdir="$(python_get_includedir)"
diff --git a/dev-python/scrapy/Manifest b/dev-python/scrapy/Manifest
index bd4b1b570378..05eaf4840a42 100644
--- a/dev-python/scrapy/Manifest
+++ b/dev-python/scrapy/Manifest
@@ -1,5 +1,3 @@
 DIST scrapy-1.0.3.tar.gz 1006911 BLAKE2B 19f53eb9580c383dd92852f3d270b7c031d3f67dae56dea73d3be346b5b39ed7d63ca345425c48466080e84d2ee82f08f9e46140d65c1b57fc22672897fc0b98 SHA512 bf61d449d7309de0ebdc36c73371d01518ee5cfa5d4ac1b68ee42389466ee15dba82690dbc885aa6bc1b9fe0b2e29a03fb3a3af3889842e1039e3a81749fc0c0
-DIST scrapy-1.4.0.tar.gz 1114816 BLAKE2B 4ab32584c46cc7cae02d231b536a6e5620202e28a57ecfc370aa627419c38e8a2036f3cf67e42f85a76baf8e5b098b8e9e953f0cf9d88fd889b3a510b9258c1d SHA512 1442cae1a26b5c7c8c27998ec6ef9ab374111221180a5933d53aff0c7aeb31102882c387581c1455c1dd246e11f0c0f5ab5989a21037204e5314054e303f7312
 EBUILD scrapy-1.0.3.ebuild 2451 BLAKE2B 44f25f7a306e0886a4506815667b5b4e6f09dd7667578dcdc4e29dd4e57200020c174b62d913cf04441163a58d849e85447305bef8ab93d02bc85ceb79873256 SHA512 93030d173dceec55dfe336a5ab8e3706e5c2f04255c5e8434ad844790e400085501045e5f770f9e941e5da0bdd1d5d82e58261ba433041f78fdd95ecfa29d6d1
-EBUILD scrapy-1.4.0.ebuild 2435 BLAKE2B 6e6049da79f2308e51c3844c91cbb08bbdb0127eeb66416880ade34f3c29d87886455741d4bff2b29a4f870327cd57b66d1f6ee6b6480d35f0851764b977bbf2 SHA512 2e6ad8a49cad64a9ae2dcdd5f4e366923a3d73d9322cd0093102de7643f229f4797d51ccdd794a49f1ef987c2a9b8e56a74cb01e44def6eb87ee2a3b3775cf05
 MISC metadata.xml 606 BLAKE2B ab0f29acb4fadaaab7bc9193c27480b347651ee6c8700f321b13738021e28f234a1537020993af68e6e0e4f0c3aca9a15a5cf25957bb289ce272fa2766e5a261 SHA512 6c507058cfa5501fd3e8d163ee697b5b00fa341374431e6d7c43dd61cf16fca5c935b26abf17f8be38657463c7e106bdffab5eacac9764b2a3a960b80c24fc9a
diff --git a/dev-python/scrapy/scrapy-1.4.0.ebuild b/dev-python/scrapy/scrapy-1.4.0.ebuild
deleted file mode 100644
index ba726b0ccdeb..000000000000
--- a/dev-python/scrapy/scrapy-1.4.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A high-level Python Screen Scraping framework"
-HOMEPAGE="https://github.com/scrapy/scrapy/
-	https://pypi.org/project/Scrapy/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boto doc ibl test ssl"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/parsel-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.4[${PYTHON_USEDEP}]
-	ibl? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	ssl? (
-		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}] )
-	boto? ( dev-python/boto3[${PYTHON_USEDEP}] )
-	>=dev-python/twisted-14.0[${PYTHON_USEDEP}]
-	>=dev-python/w3lib-1.8.0[${PYTHON_USEDEP}]
-	dev-python/queuelib[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.9[${PYTHON_USEDEP}]
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	dev-python/service_identity[${PYTHON_USEDEP}]
-	"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		=net-proxy/mitmproxy-0.10.1[${PYTHON_USEDEP}]
-		=dev-python/netlib-0.10.1[${PYTHON_USEDEP}]
-		dev-python/jmespath[${PYTHON_USEDEP}]
-		dev-python/testfixtures[${PYTHON_USEDEP}]
-		net-ftp/vsftpd
-	)"
-# pytest-twisted listed as a test dep but not in portage.
-# Testsuite currently survives without it, so appears optional
-
-REQUIRED_USE="test? ( ssl boto )"
-
-python_prepare_all() {
-	# https://github.com/scrapy/scrapy/issues/1464
-	# Disable failing tests known to pass according to upstream
-	# Awaiting a fix planned by package owner.
-	sed -e 's:test_https_connect_tunnel:_&:' \
-		-e 's:test_https_connect_tunnel_error:_&:' \
-		-e 's:test_https_tunnel_auth_error:_&:' \
-		-e 's:test_https_tunnel_without_leak_proxy_authorization_header:_&:' \
-		-i tests/test_proxy_connect.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		PYTHONPATH="${S}" emake -C docs html || die "emake html failed"
-	fi
-}
-
-python_test() {
-	py.test ${PN} tests || die "tests failed"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index 509a0beb0ebf..b314b36a6393 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -2,6 +2,6 @@ AUX tablib-0.12.1-no-ujson.patch 335 BLAKE2B 199bb7440bbae26d0469b5d1963d26584d9
 DIST tablib-0.11.2.tar.gz 758287 BLAKE2B 103ffaa755d7066b19243075fc0069fd7fa256e77f21c5a972a2077633e69064bdb433e3784780d2ac5a439aae62fb94dd128af755714de1fcdd5be46e3cb446 SHA512 356bf308df7c3d7d20800814a945c83fc64e98fb859d180cf5d9455ec2634e0a20f0c6ed788a75117c7c3d7bd4cda319c2049ce760109d102b2cb9a0707fa4f2
 DIST tablib-0.12.1.tar.gz 63420 BLAKE2B a4c4b2cd7f54045480fcac41ae55150ed903810de9f97df1a04ae74bdce16cd7c57027d38addbca8230a05ecd591290f2cdfe7736ccb02597a05cf7ffa0f5f4d SHA512 5207f59dab59f465584fc6c55d6322150f550c50f50a35d6901a39ed05a624a52dfdb5a9a9ddf0d6bc7285e5a3a4972c458895e4cc204a365c3df0d9ada0228a
 EBUILD tablib-0.11.2.ebuild 622 BLAKE2B c175fabd0d303cde927d31fcf594f18837c230c076196d84f6aaf07419b263bce34ec21bde797d4aff737cda373c6caa188294411e55e3a1d4a4a85af38da8aa SHA512 647dcd96e70d026c5f9627cfeb86c1cdd38a04f1fe900d7e10b6c7c88ce758386570320a8ad9661690c8126feb6c30987e6d12146162f64c059082eb5be466a7
-EBUILD tablib-0.12.1-r1.ebuild 1129 BLAKE2B b884b7630dc2a83956563472cc8f506c42d092b2c19b11742cb8cb4696819d66457d2fe83606c35f925af5edbe59270463f721ac666eada6092c288c21701b25 SHA512 0b0bfbaf1815f78d8cb80377496e237c17ba8052a026559425a7354055cad050b9c4d2798b56a98004fb3f49347f31c474e317a0f1877f1e366f941ecf85692c
+EBUILD tablib-0.12.1-r1.ebuild 1128 BLAKE2B 4ed5e841ecdb0b6438af795f02c73ae80c0d46267a283e27e8f32d4efd3e029392a1a090bdcce7001bc8c7aaf1f4722867be6f752582340c1bf371a60f5ddb3f SHA512 809997084686aab6402fc9f5531d56fa4a54e0acc28f878bcb3bd1bc82fe1f27fc49164fa59f76f57d3cf0a8a41d9e3d151e6040d792764657d166357939dc61
 EBUILD tablib-0.12.1.ebuild 735 BLAKE2B 7dcd50e3aaab71de9cb4dba6d389ffb43e12ea7687db6abd9484ea46e4bba73b7e94d512f8d0906048cf1572f73b288626a9311bbd89d721c5f5c80b20d37837 SHA512 21be349ec04136a2cc448cdae0a50ab6179f40175907cdd63a26a9c98e63775d0d7956457a2935762552d4a7bd8f3a763d4a7ac081756c5b2ae62ac45d9f03f0
 MISC metadata.xml 325 BLAKE2B 0d538ffb3eded02a3816d40244c9561fbb269b14b2dcf16089ffb41f2b9808d416ab1adfd13329098d20a8887d0c41da5c3ef92a8342b82298dc503155d8a551 SHA512 abe357f80a305ac2f770f5fd7e40a7919abfe477cbebbe0ca36be32d49d630f7941f29d296222e5ed7b1d14482b794ccf86b3c4acaec47cada5fc7005e5dfc7f
diff --git a/dev-python/tablib/tablib-0.12.1-r1.ebuild b/dev-python/tablib/tablib-0.12.1-r1.ebuild
index 8f70686e3f7d..1ce9ba150f98 100644
--- a/dev-python/tablib/tablib-0.12.1-r1.ebuild
+++ b/dev-python/tablib/tablib-0.12.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="