gentoo resync : 16.02.1018

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-16 12:59:29 +0000
commit: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree: ade7cb031f363fad64c77139dea7aa3d81908537 /dev-python
parent: 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)
122 files changed, 2696 insertions, 772 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d9f5303261bb..9599da9447ec 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index ad85dc583775..4bee9ab8340e 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1,3 @@
-DIST sip-4.19.14.dev1812231555.tar.gz 1020224 BLAKE2B e3df5a8b7829278987c5b368b8b6c28c04fc0b3bb3847451e48411ef9ba5cda932007613ad31f34381446ea02d62281b27ae4951babca5ec8b75f065aa296365 SHA512 decf2f7baacede27c42d359eb875a895c9a92b36a8e8a29f4666b3f98f570d821e80dbb32fd946ce230f726fafc4000af9b167df8cfd188bcd7f85fbc71bd4b1
-EBUILD PyQt5-sip-4.19.14_pre1812231555.ebuild 2071 BLAKE2B 0d47c6c9403e8514aa96cebcf929a3118a0f14bca0b698ef9ccf8351d0b42009576c3bb75803bda159b14c512a8f4636665958dd11760b6def2961a6d257558b SHA512 100ad00ea6a43dac271400488baa3d8e8735e9ab4ea9789c0aa6efaa5ac2f00ea4498563285faa33ca67485c0e4e93e8a86640cf3248dff7bcb8b0ebaf7a87c4
-MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
+DIST sip-4.19.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
+EBUILD PyQt5-sip-4.19.14.ebuild 2099 BLAKE2B a578672bafe7a45d1650a64e3e0bc39faf237b0fd8fbac8122c4fd5caf117825199ba5c477ad727bfaff0d394e064b34d42d0d8b4474c21b99016ec7361f8f23 SHA512 c94768f4cdd1e2a07810f3e8a221c8d8b224b736f95813f4ec9c1630446d5bf7001ae16812e5469bb32e6420f054c50e948d7d27bd435218f1096cf73502c32a
+MISC metadata.xml 654 BLAKE2B f52693b58abff10e80d2fe004ccca0b97aa157e07c27005c72fe79bc9ba3894c33042c9be2d10f8fc15aa8f0451041b60255eaad96ec78dedc422e7ca2f58564 SHA512 4ad600dc1af2a9f6494350a028909e51deea7b18bf6a50a6f1860163310bc0534cd530ac5d6dea043e7b7e532fd2219069e12b33271cedc00c7a9dda9161711f
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.14_pre1812231555.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild
index 457acbf36542..d71ee7c69488 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.14_pre1812231555.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-4.19.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,14 +13,14 @@ MY_P=sip-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 SLOT="0/12"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
+IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -54,8 +54,8 @@ src_configure() {
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
-			$(usex debug --debug '')
 			--sip-module PyQt5.sip
+			--sysroot="${ESYSROOT}/usr"
 			--no-tools
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
diff --git a/dev-python/PyQt5-sip/metadata.xml b/dev-python/PyQt5-sip/metadata.xml
index 9b8cb511f250..8c05084f0625 100644
--- a/dev-python/PyQt5-sip/metadata.xml
+++ b/dev-python/PyQt5-sip/metadata.xml
@@ -10,9 +10,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/sip/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/sip4/</doc>
-		<remote-id type="pypi">SIP</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
+		<remote-id type="pypi">PyQt5-sip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
index 109da7744cec..7186a9a1d891 100644
--- a/dev-python/apptools/Manifest
+++ b/dev-python/apptools/Manifest
@@ -1,5 +1,5 @@
 DIST apptools-4.2.1.tar.gz 274521 BLAKE2B 020159d52c07e83fca35ada2d73a027405a31d7b23526b57394390cddf3e5c51fc76566cea61443749c8c7651b2ef30abdfc58f35d8bb1c7eb28e1b6e882eca5 SHA512 03f89b431db496082ac404456f97792f68b580ee77451e6f003b5a2830cd2f698124487045b6cd5fc15b700fbf7467553a384d6e638a322627f8dad7c0b45fc6
 DIST apptools-4.3.0.tar.gz 291137 BLAKE2B e86ea970fae0c1e5b3961c6cc2cafccdd43d6135b9c524d533a09e1f631c78cbc4cec841ac1737695fe1fce957f19823232441d1ff3470f33f4e043e03f7c373 SHA512 ba3ad2c157bd1837522d8edbb834cded0dd6d9c2440ff54af0abfa0716f0485b3519edf79a74c64133d963b1afc769e743688a3bf60fd1d2fa384e8e3bc399cd
 EBUILD apptools-4.2.1.ebuild 1341 BLAKE2B d7424aa57e5c9daa82f172ed578fbdae7ebc77a73d63bce123ae141e2e2999dc31b7dd8f3f0037354285384422b8eca3bf22f8d932e892254af52b2d5bd1cef0 SHA512 9b5bb078a1b36d9c0bcdb92bb96f151eb85d017a7cba8ac553cd5195485759474eb32319659b8eb9e587d007d23c228c4cae5f99a805f5b6521527ca151d9a31
-EBUILD apptools-4.3.0.ebuild 1382 BLAKE2B a384a948bbdd0204d56446a08165ed27d8519cee609604d5bcd4294939292e82dcd7dd567da5ea9257ed7bb2047573b238a69649cd841c37ac4424017ecfe1a2 SHA512 e8abc10c2d72ad9ae190b1f56ae73672acfeaf2a46bd7f48b12d2b64eef4b1ccf466037ae32b1bec50fb071772d24d8d48c8299a5c1a6adc13b58825b54197af
+EBUILD apptools-4.3.0.ebuild 1378 BLAKE2B 61ab4d581aebd16df83001de85e26697b39d3d1879798e5d33dbbe299ca68caa34000558ae8e9d70e030d647e4154307b14f59f1588c68354505b7aa4ee0410a SHA512 6c50ba13ba2fae2d468735536ec957d8b67f730c8923af0acbeafd8b8117c76095e173c4f586775253297b958af15b1cccc1d3f927a47d74f1f74733f5b328a1
 MISC metadata.xml 524 BLAKE2B f83435085fc0ad0e0b88c38359c7d2fd3dc09e7b86b08dde22feabf21e524a296bcf037e683cbf5e3b53f6ff1cd151517eaf873f5d36ca36f949c07fea7c4e3e SHA512 5a3f6e40a6500043d2ceb95c723a2df155d17f1978490c1330bba584a514e51e71cb456dd98f6fcf8e701fbe0900e5d0e71f242bc863af88742dbdc7c73f4f84
diff --git a/dev-python/apptools/apptools-4.3.0.ebuild b/dev-python/apptools/apptools-4.3.0.ebuild
index 0a9200944972..6a4fd58b2c81 100644
--- a/dev-python/apptools/apptools-4.3.0.ebuild
+++ b/dev-python/apptools/apptools-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 6fba1afa8683..18598f3464fc 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,9 +1,11 @@
+DIST awscli-1.16.104.tar.gz 1186611 BLAKE2B 8f0918b86c37e184ffc8055cb16a02379fd35e685c5ddfcbf2b7e1fb71a80f829569eb1c2264e75563a316d933143a662cd7dcf4d6d25d236d72c268fb4985f0 SHA512 738ceac890b28c335f0c9bc703975af3467f17723b8accf713ef131224602895f6b4fae06cad93495933563c08ede18e38cf67abff744e6f5b0042b182bddec3
 DIST awscli-1.16.59.tar.gz 1147247 BLAKE2B f8571f2397735b4aad17543e25cd2764731b2986f420faccf76dad2bdab912029d7ac592607290bd76fe4c99ef57e168dfbc5a2a92e20927343006f964a4a3a8 SHA512 be7f6dac8d2ed27f53a0f50323d40395c51d7e0ef513e1410bd4ce5fb4affe1033919e01755ba768739e7e327a827d004a8da42353c0be05e90be3e5350399ff
 DIST awscli-1.16.62.tar.gz 1147749 BLAKE2B d0a578478f5aa6e08c8de3c0e5e85b99e09a8519931b35f5fa724f922b35e2981464ba2fc5fc842350dfe1cd5740104ee293caf13b2154c5140caa9f762c976c SHA512 b7b0247c7c28fe3195cb6e2ec81fa15e8d6e9a8120d124d4cc84e827f8f9c904fb7feaa00d28173e0739066eb5ca77fc7f2af8b1f2b083605b23a4cc1c38fd1d
 DIST awscli-1.16.72.tar.gz 1169697 BLAKE2B 3ae37ee02bb821dc5e5578ff9937d6fb313bd369e9f57c276d3e3fb722743b5f07536ed60ffd98ffbb779e0ad3882f9345d0ccbed3572c2e7332c2a339320f49 SHA512 88914546c10e14749b6811a31ff664cd464ab424d2140f1218b03128fb8a7e4fcfb33feaa29cac534ea3902f1d4e0565c7578b61989bb6b8f8edbefa2d992355
 DIST awscli-1.16.81.tar.gz 1171490 BLAKE2B 343e5ba75f8cb3b058e15346627b0d9c5d6e294147843be0608ccd2a92e643d05c5b6995771608af602e565a860d4088e1f7988c567343396054cec813ed660c SHA512 44176ae796972571d07923ba13ac5a245af7b0c74488bd03a6fb5077f204f175f7ddfa9c4d592eb93d3dce14d9406b04c92ec2d1d9ce58c3a092a0b998efd2c7
 DIST awscli-1.16.91.tar.gz 1172430 BLAKE2B 158f7420299c56f2e40883bbf1ad01cb7a747d04047b47aaf8c931c8aad02ad9b39cfe9fd69b86fcdbd76d02d652d68f33d707326307c600772fab97b93f7b60 SHA512 ad489cfc1225703b9bae26f31a94c7d9c143b8e355f4e1a2f1d7e3685b7ee9a6dbd0938db512cac83775292a1347fe72a9ae192717b1c73a21ac07bea4c9fede
 DIST awscli-1.16.95.tar.gz 1173389 BLAKE2B 0babe5cb23b36e39bb495cef57bc1cba0b0c4ab3a613b88e6c52a0f22f94099116ff1a70f9149333be16f7243f2c5498e98bc0c8076aa4e24201c11b8db7bcbf SHA512 37eabd6e7cbba5e3d635098e9c273ca143dd8f37dc7dedf6b85882f08fa01931ed2c56a7db191bae2c260e065c03fbcc7c473c5065b8e111616fb1341b4bc9a0
+EBUILD awscli-1.16.104.ebuild 1304 BLAKE2B c5036ca3dd03a4077b8c091fef0abb357ed2d494ef4362b1acaf8b3ff5f40ede4713014a3f6e825b553ecf296fbe88af18d3982cc4ee95d509cd0b3b176d848f SHA512 ba3dc354c4aada5e7343c9322d313badcf4ed3344aafd22069e367542349ccc0e877780722c5ac2a6aeb77619fe8f304c81d6e970e4825a7db67389039278bc2
 EBUILD awscli-1.16.59.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.62.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
 EBUILD awscli-1.16.72.ebuild 1024 BLAKE2B bdd6f7f25949aa2366f7e70bded817ec214c77e0863030faa1ac06ab43256964dbfaee886643a48a5ebf522dad2590485946c87ffa2667db51f0cadf4591fd7f SHA512 33570db8155986bf66b8b4ca1505ee2eaca9cb17651ffc91bcdb1e9eb5e0d5b38a723ae7878892d84c3e66c3335c857851dccd9f4f6a359c29792ffe3c944296
diff --git a/dev-python/awscli/awscli-1.16.104.ebuild b/dev-python/awscli/awscli-1.16.104.ebuild
new file mode 100644
index 000000000000..bf41cae512be
--- /dev/null
+++ b/dev-python/awscli/awscli-1.16.104.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.12[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.3.9.0[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.1.12[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED%/}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/bashate/Manifest b/dev-python/bashate/Manifest
index c739bbaa51ab..b9be0738ca69 100644
--- a/dev-python/bashate/Manifest
+++ b/dev-python/bashate/Manifest
@@ -1,3 +1,5 @@
 DIST bashate-0.3.1.tar.gz 16016 BLAKE2B 72bcb6ef2c8dda48b40351f37971473b9c2137f3a727a355f1742f20355aee8a3898d4aaf61e0e6538b22adbe3ebd34bb30d67d0fb6b5f3535c9b46c1544ce5d SHA512 dfa3e8f98879169cef445cc9a788b4ed051630330e2270c721e472f080899d6742cd3deb571049ba6b943ada0fc77a70f5a7e4742a54d1ca6d5f075a92a00ffb
+DIST bashate-0.6.0.tar.gz 30980 BLAKE2B 5b210edaa44a0652a03f30a641a072dba1482e1ca3b42c6b7140a52349ddb271f0137373a4d2f364032c22c176d6caf14be2635038df8a4e86585773d17a1f97 SHA512 bb64d8de0143bf2662497b1571ce654f4ceeb7d1dea3f625705b609ab70ed3b4bca6266c4eba7c2e7d99a1520fb9566a4a4daefa34c9c16538537b446c1da255
 EBUILD bashate-0.3.1.ebuild 696 BLAKE2B 8526f14e3d10b51de9c2951567af7ffcf5c34dce7275597285058f10fef7be965c79178c1e25becd3ce85f91beab3420093c5c5fdf5d22c2e98827092f7c5c00 SHA512 c7273658b675a68e334b2b1de30afc7947d334c1fecf31cf90f1f0be7aeeb5705158d4aa114d2541e89ee03f7359738be5960316f73099cf69e42711064dd29a
+EBUILD bashate-0.6.0.ebuild 707 BLAKE2B 885eed09cadde21a7400e5c81b490db66d3e094c3eff90b4a6b40549ec1bac8773e84b58260e396086d5d5aff111234ba47ef225fd365abf2935671571fc8a03 SHA512 def0e0dd2aa1df16a439c355e7d82aba1949b6325b91de4b22d5a71d25ecb92eb1291bb03ee58db09ee2254c18643596c56188d3193bb6d3dbfbe45aa75a9c3c
 MISC metadata.xml 517 BLAKE2B 74c61fabea9ee345173582be1486426377f97187d976b992380d6670fb024c00ccfa818e6bac19e1e637c371280ca8d5535c8e84bff52ae874eeae939728a400 SHA512 eca862a58ed6a1571e626ddc24e73fb8d295f0a6e5fa36246d261688d9de81ff7780018df8defd159094ed8badf8449982dcf07c2415067080f38ba516da481f
diff --git a/dev-python/bashate/bashate-0.6.0.ebuild b/dev-python/bashate/bashate-0.6.0.ebuild
new file mode 100644
index 000000000000..3348f8aac55d
--- /dev/null
+++ b/dev-python/bashate/bashate-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+DISTUTILS_IN_SOURCE_BUILD=TRUE
+
+# time
+RESTRICT="test"
+
+inherit distutils-r1
+
+DESCRIPTION="A pep8 equivalent for bash scripts"
+HOMEPAGE="https://pypi.org/project/bashate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+"
+RDEPEND="
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-pythn/Babel-2.4.0
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 6ff1e49c65eb..049a3831f30d 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,11 +2,13 @@ DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d
 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.1.src.tar.xz 12488668 BLAKE2B b80247b5caf81661dfa715d9bf454b8023221bd27ce49b6bd8cd66f40ffe01448e40fb828fbcc64e49f059af7a7c5a95a0737b0b998454ac5c1dd39388150fa6 SHA512 df2f38153ebdc261bcfa6a569567f759bbb1a803192882a9d4eca55a47878166ac9057151a94ad341dc1281136547e4faa783a68070dfde2307b48cacd4b9194
+DIST cfe-8.0.0rc2.src.tar.xz 12861448 BLAKE2B b4f671b6597b46cb84b241bf602d7e1b12c896b9d3d5857c61a731c9ea0d94dc850c79cbbcb4a56cf2b54f2ffbc81e04f2062c59d4c5b800841e60eccd0dcfe9 SHA512 2bf1e39f5fc7842039b8e20913b3c71fea46b541825c703ce329f3fa01e45cf66c2cd39d9a0f92cf2c38eeb856e42023b087da0765baa0377226534a554c0d9a
 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.1.ebuild 1103 BLAKE2B 880675335893e206636b121e60d025df935a8ac0c08d77c2b9d399f1152e8067f7fa4a95a06487aa51bc5ca53254ec8d661ebaa68c03286e19f1eaa2f26cb6e8 SHA512 a12d2a01febd8cab4e04350e897aeb59865f2a4a891a7aaddfe38f7bb2556595d6e367a9463bd4478b3aa691e41c031e8323c0bc36130c4d96449c0a84999e5c
 EBUILD clang-python-7.0.9999.ebuild 1059 BLAKE2B 1ab0d9234fbebea281bf2235f870e6cd468063f2ec5c20f7af3b797e6135aa6730ccea8cbde5ae5993394da1563897f5b45adba1d644257f6bc300b6da5500f9 SHA512 23882089855c9485ccf23129542f3b6a5e891776cf422c9b16a0e534e4084f59d5bfe4526d2510cc094ce8cab311ec141dc76ee45cbee7d43665aaef58c9fec2
+EBUILD clang-python-8.0.0_rc2.ebuild 1106 BLAKE2B a02a1b4e88343f276c1b5efef16ff11963cc9c3a6b27b25506e3bcc60225991e93fa56728c11f059957881c062d133166b63ae1fdcf725d0dc565ce9b981aa31 SHA512 ea05b647ee32b17b215f2039e3ad93f76202fc80277421e8a616ab044c8179b879327d3221a628a4634754271d8d430177b10208a88b271f0b5ecf3d213d9f81
 EBUILD clang-python-8.0.9999.ebuild 1056 BLAKE2B 9f18a22421c36ba3796b6fe759e05d5ee5b8ca449e292145c7eda6733c614ffe012f40d0e12ce336ef496a9889463f090fb96180c146975052adc73d8cacd690 SHA512 39239de81290208b734fcd8035a9b8dbc75a0ae9a9cbcfbb7432be5f83b71f2254389ddd139b1c0c9ad59eda86269932a720a02f6dc277ee15178298fbf49a1d
 EBUILD clang-python-9999.ebuild 1034 BLAKE2B 3a56c0e391daf98889ba3959f8aa5c944c9930ac482c8beca5f814978507f9869a213384224c6965ade96a3f0b17f83aff9924f07d5ad2d03ed7df8660a54df6 SHA512 bff0eee11762f352ab6616086b19506a2ea0530284f50da24538eb8078d2c04af1d1aa2a8616adecb6bdeab8853728b2f4b5c3133fa15810f00a64855182c486
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-8.0.0_rc2.ebuild b/dev-python/clang-python/clang-python-8.0.0_rc2.ebuild
new file mode 100644
index 000000000000..ba2878b26983
--- /dev/null
+++ b/dev-python/clang-python/clang-python-8.0.0_rc2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+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="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+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/commonmark/Manifest b/dev-python/commonmark/Manifest
index 0265e64883e1..8becf879c504 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -3,5 +3,5 @@ DIST CommonMark-0.7.5.tar.gz 88702 BLAKE2B fc80d9e739d27f7e5dbf539b624c2fc2e700e
 DIST commonmark-0.8.1.tar.gz 90795 BLAKE2B 718c2b1af035672d74e2c6b6f89ea0cd23f45d7b0e47b6dadeef742d772f5458e08ec5f69fd4f34df9ab2c491d9d7add4c4acc7018c4048649aa0d8244d7db91 SHA512 dbab51d45c1973a8d0906148d785fb8ddc2b52177dfe0e69fe79bef2a5eb05a5a7ab8693852f4aaa8545af19d741569d04a24f06ea65171e6e80d9f66af47fdf
 EBUILD commonmark-0.5.4.ebuild 816 BLAKE2B 4623bcdc238c125819bf1abdc13d5784fa38002ff745d295b8570008bb265d60f5958de44ec7afa324af5bb3676fae2288881f1592863fb15a5f994916dbec84 SHA512 53d96ed5ab173d09aafc4a5001704f1bd29d5c3b9d20f8df9712a570504ccf24bdc75526c9f1b988bd7d5b46e7bf936838efecbb92d50c6e132ed1b033ce7879
 EBUILD commonmark-0.7.5.ebuild 1072 BLAKE2B 663fb0549b8dc91e3324db235612c655f28d0edcb50a9af1bb5e0bd8ddb34b3772cd0aa1901efe564cb1175f444a1f2a47c1f529f8af84cae8f5da8c21accd4a SHA512 68857c0969b7be6e7ae489cf63abdc77063b5368760b6aca4149733bf69bc2a3507664ad55642bf13203a0a79346f0a2745505d7eca901a8723b11c9a4be6b12
-EBUILD commonmark-0.8.1.ebuild 1031 BLAKE2B e50fa84d7ede6e8913e23bf9c6b9cf24fda6e4c4b0a375642f8d6cf9a85bd6326866ded4d0d13aed318ea9a12a40f4607d1f80c4d2b03d1beca82617a750678d SHA512 13232416ea18395ff4e0146d74e67e81274e0c6d2ab6c7f89125e1a118c03490d582f685c59961d86a46f1ec6465c61cfdbddf8899c8aa6f288eb3c3dddfd4c9
+EBUILD commonmark-0.8.1.ebuild 1038 BLAKE2B cb4b394c27fbed16fb7e9e3d29b3ac08fb035fae2abc63564e2e80c328bd14bf41da5aad6d5397a558891289941c6d38d12b4d0131de23e0bd121e379dcaa67c SHA512 f55ed04642b54be080dc05bd6c282882f9a7e7707a22fcd2936242a180c795c1546ae7116bae721ba31426c625b2c0cdde1eb079b3698f5b7f0757842e29cbfe
 MISC metadata.xml 756 BLAKE2B b169766e4e9850c3586f1359fb0103bfeb27d494c3d20c2a502618a20a397ff9ba7e9f0d13d07829e59c1350e5ced938d58b726704d00d0499b3ac1c614952d6 SHA512 1a28755c041abef9cb797c8d9ea448a62a500a915ae9c4002a22f85886fbae62c2574675926e80e5ffdcacf3a3257fc9065a14d6495574c556288b334274b03c
diff --git a/dev-python/commonmark/commonmark-0.8.1.ebuild b/dev-python/commonmark/commonmark-0.8.1.ebuild
index b8d22c16d6a8..7f3a3f2647ed 100644
--- a/dev-python/commonmark/commonmark-0.8.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index cc9a536d111e..bb44cdffe6ed 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
-DIST denonavr-0.7.6.tar.gz 62285 BLAKE2B 45004465f1d8c371535c0e64b5d6decb224a80a986a5bfb1a960d320564e28a152a06c3c5375013261110a1d7c23ee301166580614dd1a727dac296c38b38899 SHA512 87c35325e46d8dc3129366dc45632705157e793d3faf4377f884b1d40430047fc2ff2613a975d6223a925c8c83c807454c03331b706a2d06474e649bbdb85c10
 DIST denonavr-0.7.7.tar.gz 62745 BLAKE2B 56e2ab0430a9b1fbc540b24d279bdab24f1bda2121031c48ace92b81b8a28371fe02a34e8f763b87a83325d522526faa577a85239f02d02fa0e86b928b152200 SHA512 4b17d2f663f8fde88bd67d8050e86c7a5adcf1890ce87c630ffa7f0107267b996234e707770ae56bfe9571335b320b70225d697f1cccc72ba29c765a422b0896
-EBUILD denonavr-0.7.6.ebuild 737 BLAKE2B 6bd02890359a2513508e06e324765385552092882605166c28a3c641c2a7f06c253c659559b06ed76e86f01c98649061ca9d8b8dfc05de53bb2fae7dc3138b61 SHA512 e584987d381b2439101ee760da869bc6efb4e1f8ede5f835989792538769f527260b6fd3decaea24c0a7aacb1d9dd693d82738475421ef974920886fc4811274
+DIST denonavr-0.7.8.tar.gz 62774 BLAKE2B d601c24f6825202de69401c0778e8e1b5010d1475ef69a78aefa9ad18d0bfbbe99cc1405606c1a9f01d937e9937c0f33dc2f54b69213869b017571706014b444 SHA512 c7fc9b47b2acbca32277f8601f8dd63435a7e31c614f8cde6e101f9230691c389f3b758a2217fec9fbf15869dd95ceb371f88c4dbf121b25478e2713cfc7a09b
 EBUILD denonavr-0.7.7.ebuild 743 BLAKE2B 807713a1d064ddee0703c8ac875e1a59f9619f66b03d66d386c2a7239d9c3d1fbf9a412b54fc687b0aa038be82e2320d37e2be8f8267b12aae387bc405ca6150 SHA512 3bf53b49c35f3dff98de41521d0a9646f5cf307b49088af7a17f38138025fb717663b208202a170cb24a7068872872821c3f4e47526f92fd72a41ddf61348bc3
+EBUILD denonavr-0.7.8.ebuild 743 BLAKE2B 1af2103d8b70de0c3451a42d7d83954656da72356d27b7e48ee226a2d52b6d98ad79bdfdccbff0a60e6de6e3834bfef3b5220eef476a509f99b363e8db055b17 SHA512 81783ec925599c287be4bcbb772805f19377472b7689becffc1b8ec4d5a32ecdde382e2f29fbbf12b3baa0e8f44b3876bb363bc3853a076795a5c92b2448cf1a
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.6.ebuild b/dev-python/denonavr/denonavr-0.7.8.ebuild
index 6d935e83ad72..07fad1d6a946 100644
--- a/dev-python/denonavr/denonavr-0.7.6.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( pypy3 python3_{4,5,6,7} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b8e6b0e09fc2..d4d500a6100f 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,15 @@
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.18.tar.gz 7847617 BLAKE2B e5c97a370c47caba2aea53245fdd8d11218c91d8fba230f2e2e9ab8068fbb7ebce6c7a969016d62a08a8226e13664b54202073b7726b7d6091d1f45dccde9ca1 SHA512 35c885e835c5e85257774c65c11bf851e710c745df3366487159f21f90e092236dd8d2cee86e8165945e57fc710989b0ea2747682fa4ce37d5e93d4f664b76c1
+DIST Django-1.11.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
 DIST Django-2.0.10.tar.gz 7992290 BLAKE2B af4ee0841e01911c987128f70c0a3570951fc57cbd75165c8b81a4b6847a29fdff7de4f17f5f80e2f4e6b8e87aee017b256f45380fbea931e257f2a999175d78 SHA512 aee171bc10387b2685930887ed9e86564fba273210cd9d7929b7a97eb913ab537408a779bd06c37be63b3b9ecd3e48398e92de33e1a634521872dadf9a3e16f6
+DIST Django-2.0.13.tar.gz 7990057 BLAKE2B 8172d4ac3e74ce41403d3825ca102673e78cfc47c799a05de6543d3e06b69f97ce475b314d78d88226564cc2cafa1cbd1f6237232967ba15d88d94fa83514e1d SHA512 cae1977bec5b23475bb8b3b67444bf3b12edcd212db11e22e4d10456b1ae5d8dcc1734f1f07cb1e19dd39577684b03821cfc247174d687e29ea8fbed7b628727
 DIST Django-2.1.5.tar.gz 8612384 BLAKE2B 71396905dd4524f4ec8112d6c36967fcb381514eba6231b02bedf0f0a7cf9a164bb5d7df30bb4ae0dd8e77c4acd34ecd83d237713fbf58ca8b0db32446986044 SHA512 0a8c72e131867787d475feb0ccd7896fe2aefbbda60d85450fc5ce336eb1f1b7c77d7a17ba0a89e4bac84b7fc87f6c22d7afa356443958e30e958eeec7d3ee6d
+DIST Django-2.1.7.tar.gz 8608548 BLAKE2B c391fe2ed0fe9a4f4ef45cf828a0a85c16d5ede7c1bdc1ed5fae1185f04052290817900e97f95fa199425c344d91a9d32c7fb7ac8aec5d12152e7f8a39f8136f SHA512 bacbd52c834a14267588f7bcf57f52c246beb9971352e60eb780e28872884e0dd3701256dcd9600ae0faad29f42460391ea973e9fbb3338c2c08baf0d5ca2fe8
 EBUILD django-1.11.18.ebuild 3225 BLAKE2B 680a455b510afd47a56289169e22fcd160543408f6d28b22423fe461ebb952695d6764c22cf1a7f3ff0c75820b774411eb31b3fe3de8fc0384ac05ebc1abbb65 SHA512 62aa91d0b0c41d46735ca622b56ee29de303d018ce5cf3f48abc0bc277c81af66320f90c6390c0b51e9c04f37f83112f4d4017ca7588abd4667a9fe4562ea5a6
+EBUILD django-1.11.20.ebuild 3227 BLAKE2B 18eb4aad39840e8f36acb32d2c0329d83b741f940b9c41b91571c365b2ec91355651b942741d8056c5e2936478f770d6e2210d3d69acdab98772e6f5f1015db1 SHA512 c4691add4998e9b144cc086d9908d76e354d51a1445ca91c311e05784c59c84e05a80dd34ed91e694ae5195cecc5d04de9ba68982d1ecafeb31db4ffbe17f90b
 EBUILD django-2.0.10.ebuild 3054 BLAKE2B 5604ab5ecda09fe388695b010bdca03eb5e35b1695e067a6344461ff414afb9816ecc43578465215416df637816fa8dc99ec456984f6fa966a511e1d784d6981 SHA512 1d093fc15a04482b7f94e340eeb2fdc2bb152c2bb4d50089b1ceb0e906866d78b26847810a3fbfc41e6381e5d61d35cc3927593d8c0ab8433436bcb9487a3326
+EBUILD django-2.0.13.ebuild 3056 BLAKE2B aa41de26e621ab1d328877d2ed1a4c96826d829f96b6a382b376641c6a2154765b8d733a50822e98dfe76f2ebf9814e74c6ac97cea60965f1592c9368ded379e SHA512 d8acbef54ed9bd97ce85c0ca1b94307ecfe6a55522debb19605fd017dba9999685c3ac376d4220d19d12d11a10b88c5f25b0b6b086f7da6e4c75b8de8cd086fc
 EBUILD django-2.1.5.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475231e6328457be807dfa0e5d944dd20d80da6de742dc4d4f91bf779ef63944bae2720203214e409cc4910d2cf SHA512 83b8407d681a9eecad1b6e70db357029024d059133ebd48d9e35488e2895ee4f298baecca2e5b4f683a74258b4844ebec9fb2a342325ffc6f98d17dc28fbcddf
+EBUILD django-2.1.7.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.20.ebuild b/dev-python/django/django-1.11.20.ebuild
new file mode 100644
index 000000000000..e6b8db11ff63
--- /dev/null
+++ b/dev-python/django/django-1.11.20.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+		)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.0.13.ebuild b/dev-python/django/django-2.0.13.ebuild
new file mode 100644
index 000000000000..0761bad51346
--- /dev/null
+++ b/dev-python/django/django-2.0.13.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+	echo ""
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-2.1.7.ebuild b/dev-python/django/django-2.1.7.ebuild
new file mode 100644
index 000000000000..fa8668065c0d
--- /dev/null
+++ b/dev-python/django/django-2.1.7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+python_prepare_all() {
+	# Prevent d'loading in the doc build
+	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" sci-libs/gdal[geos]
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 1b6518a1a69e..94702b6b2013 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -6,5 +6,5 @@ DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d
 EBUILD docutils-0.11.ebuild 1865 BLAKE2B ab64496926dfa4984d2c43aa079e8674288ccfe46aa177bba9526737dd87e6c0c608bc79326fab385da3e1cdc049b1afe27d4916ea832db005efcc917c3b97fe SHA512 5e2853a6ca36e893eb6df7392745091970c8a2008b39fa3ab9a5599c2100c889fe2ea1bf9e66cb28023214896c2d84403160fa0b9f4913caf80b962f07148c17
 EBUILD docutils-0.12.ebuild 1812 BLAKE2B 69fbd3323beffc4f47358bed59b1cbe1047a999173c244de9e1847eb1c7d7246b75f089426fc9b05c0f7be9e7cc02f99dce8a3ef2cca7fe76f1cd5764af4d0b1 SHA512 551c27aadc5132f4d0d1d38c900b711cd5e1bec371bd0f7a588a885409f11500ce4d7386982643af2a095cccc6655311ae06cf8901e506be428049bc5ec67468
 EBUILD docutils-0.13.1.ebuild 1826 BLAKE2B 7ce8a58e17edf3ae4fba6a8adf45b7e5f407f4aff58b82d62a0fd40285f17f83cc7824268e18dc3e6640478d51c433f708482ee40f2fea469a6806577b1f7c4e SHA512 82b9ad9c28a2f9ffccbb5025eddd339d6fe2366c32a95c819e06bef6a480635ecd4fea5c1aa7857386c83c36c046bbd046535a21132e802158084c5b2dba99ea
-EBUILD docutils-0.14.ebuild 1841 BLAKE2B cf31c5fdb92db4e1af68e6d9efe47a3d38e8dc02fa2bf864118c793f018bd294e8f4fb91796f0c6226644628d29220ff46c0da356d068b21de83f792d52e043a SHA512 5d2950d05b82029c3524278b74030c32a820298ca97166a2fae074017e28c65e33fd6ebbeb481c15e9ffb806d2ebe94f9b7ddd523d4a605049b3a55fd24f92e1
+EBUILD docutils-0.14.ebuild 1831 BLAKE2B ed4fd90b160e98cdb5f41b1ff8885e3b726a74cfbd680959e6315f4323926783bb7595e5f28f2745752a9329e7f2399bb2a5a1ef5d937c774ff6e7a9b4d8d29b SHA512 3647ea0cafe6ff3d61dd01972c0fcbf7386830d465c12453301a1792206e66484aff24ec3b586b213536a53b376fa7b6f86c57d2a57c23f4b2df89d458c943e2
 MISC metadata.xml 318 BLAKE2B 396ae24ba924fbaed55e84016c94fdef294c87d791c3fa911f16ffe04b452980d112b27112b58b0092d1730cce7db36efae2851d150102046a3379b65d347de2 SHA512 3cf09c6d943288ec0fd9fa92d4475ac184a87b47b7bc8df80fc24a712d8bf0363d4c2a08efb2ace4d94adcd59fdd6f82ae9fd9bbe58561ead5715f7daf84a96f
diff --git a/dev-python/docutils/docutils-0.14.ebuild b/dev-python/docutils/docutils-0.14.ebuild
index 2ad28f4556e0..570e3a4fc876 100644
--- a/dev-python/docutils/docutils-0.14.ebuild
+++ b/dev-python/docutils/docutils-0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/flexmock/Manifest b/dev-python/flexmock/Manifest
index 153e0d981607..f177cfe633da 100644
--- a/dev-python/flexmock/Manifest
+++ b/dev-python/flexmock/Manifest
@@ -1,3 +1,5 @@
 DIST flexmock-0.10.2.tar.gz 44425 BLAKE2B e49db5b7a4a739f72a2560c52d0493cc284641f7c54d11e67a4c40ae3681ed2ca22fdc17c9f8ffc667bef409e1ecb5e36acdcd73a968984a38992927ff7c416f SHA512 6824da47af260a93ad685b66bcbd2d9a93f98eec218242e0dd9ef885594d9218e4c7170c832a0b3ea3cf201896ec1efc2afacbffe1fc5dab032240369d7b3ac3
+DIST flexmock-0.10.3.tar.gz 45017 BLAKE2B 03e6a709bd6c7889fa91692c27041f3d8109a57aa188a7043d5f45f757dd2bf929f80b9e57375bf7835ec4a88f032ed026c183320098546862f30c6bfedf6e8d SHA512 9c19e7a6765e57789065e6f5940270f5c0395194eddd8fedaf0abe52e0ffaaa33945385e981285caa1b7facb58be92b76dd0f370c242216626a30ab97b926bd1
 EBUILD flexmock-0.10.2.ebuild 595 BLAKE2B c4b1e7e4584cab3fea285d4959731d07f285e65409964e0584b3f395b4b6c6b7cd1e783ed0e0a0f31b51d2b0212aea54859a82139e17823b3904430c97b6b4f4 SHA512 834cf7d3c5ca52147c3feb85761b39fdbfa046ab2ad3db290bfd47eb783fa6d0877450e92599870bba5247f5f6837230a3aa81fb48338071a743317274595c35
+EBUILD flexmock-0.10.3.ebuild 594 BLAKE2B dfee14fd63ba83f07b346c00b112868638f48a8d9c04420ba15adeacb34c3e3af2447596a2dcf18ec93696f011bd35b587416eaafd2b7d86967990d95c6e4211 SHA512 a0969d41f5dd7529d774b47a20407a59cf7d76043b40b6519c3a9385779da90c324aabc03aebe8157215f5c26c92d32439a6b82e8cce9d78b973b5e4573344e2
 MISC metadata.xml 603 BLAKE2B 7bc248befb25b5071da321c7ad0cbefb6c57ee6f4fb9870a27c4888dac3239c90cac23a7adb0cfe41f7301edcb453463decf1c1b2be644a5e0c2fac5a41c0c0a SHA512 30088206cc5e7f24858f474160bc646e4744a0ebf14ac39048d5c31cf767da5f97d02559062c1002abba59d0a1ecd08861e52c3d2a29ad6b7e9d1d35c06e96f8
diff --git a/dev-python/flexmock/flexmock-0.10.3.ebuild b/dev-python/flexmock/flexmock-0.10.3.ebuild
new file mode 100644
index 000000000000..8c999e830bd0
--- /dev/null
+++ b/dev-python/flexmock/flexmock-0.10.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Testing library to create mocks, stubs and fakes"
+HOMEPAGE="http://flexmock.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	"
+RDEPEND=""
+
+python_install_all() {
+	distutils-r1_python_install_all
+	dodoc -r  docs
+}
+
+python_test() {
+	pytest -vv tests || die "pytest failed"
+}
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 96338fef8da4..422bdf68e084 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -3,7 +3,9 @@ AUX future-0.16.0-disable-tests-with-internet-connection.patch 2253 BLAKE2B e141
 AUX future-0.16.0-fix-tests-py37.patch 1700 BLAKE2B 175dd229c31768555aef3ed3156c040ed440a480afb6a3179cdbcf8bfec31f2a018cc0c193a0a6306c8c020388827647f4bdce07d05ab418b7003fa6125511cb SHA512 26dcd5fcb18dd0e01032ebbbf2135167558a08c79ed226eed461e4d6c48bc80ded90212b9e8c427828b52e2d6186992f8c2b60558dbb4478c6b0be10e596faa3
 DIST future-0.15.2.tar.gz 1583441 BLAKE2B 9c552a5f3598922f8910480d054015020112aae4f7e14d2c139dda13a0b26e878b75eaf5068d66f20823ac4659d85edd4087a95d9474dc27bf15767cf6e9d921 SHA512 24a0eaf70795efe1644b098c5abbcb0103d9172a5243721f0d26b1cbd108872b6c0616180da8f5507855ddfc7b26bb10a606a64e59d307d39042b346700f77ee
 DIST future-0.16.0.tar.gz 824484 BLAKE2B b098366cc7a7866c4aa4a35f1a6a5cf113698307de8f4cce6c77e4ce72a8433dd102111f991e35ffa920c09a0d31cc048b9502dacd0aba1b701c11eaaeab8392 SHA512 41c795cd1746a76df84de2da9fbc611fc6164322c1c712ec9e8a8626c21c2717cb4899ec150d95c5e0c037270e6bb71e099edd169609369aae619daea9df2e5f
+DIST future-0.17.0.tar.gz 827812 BLAKE2B 14bfce4927386b157da91e6bbad547e21bb622f7e81997bc4ac400842cec5f7a50d7a0f5a743c4c76a7b80be0dcb6f54c06901311fd27781d89a8d2df1cce7e9 SHA512 f2396379e8e36753aeafdf27225c2551a31b10036f21201f1c24d63c1bb318dbd491ec977af514a19a4d477b397df9eed9711be797a64e86fc00c4692729d876
 EBUILD future-0.15.2.ebuild 495 BLAKE2B 6796334fd8cb1a1e2c90a4a55c4262bbfba55eab6defad0deb788466ed93790887b38f1e3d63f41baa0b586d7cab5e5731c08cbc4f958ae9799ef7c085ed4b8d SHA512 39de67be4877db5f248267e72642090763473ea15935e69ec069a726a5d4836c1de9efc46626e422d4bb18299b5ddcb5e42514781020417fdfdd6038350ea2b3
 EBUILD future-0.16.0-r1.ebuild 1277 BLAKE2B 1fa567c5e96dcd183accb7f30d3c52bfc3fe74b35c534d4261e7545724f9158ccfa850d303a4483b1d8e50dd1d26aba06f8e0ad83990b611ed1e534f1b2c0bdc SHA512 f99a558be25f3b8c2df29fffae08a681d88dd53b2cb240bf8852ea0274f286cbe3207022b3fff8d715635014e3d46a2ac416a9fccd26fea59fbb18361fa8a081
-EBUILD future-0.16.0.ebuild 614 BLAKE2B 40f614b47a93320680e6d44e8921cc9e615addd818662b9a03ed87ee8affec386445365c8e9253afe3b7881d451d3badbf1a9ba6ec86455a47beb3fd982b723f SHA512 2f527a66bc8efdc8d5ad0e191af6c8012a96bec239335628ee60ea7479d639f30d3b5de7f5096ef20002f4995becc37d19e7c7895cf41f1f241fd0658ec786b5
+EBUILD future-0.16.0.ebuild 610 BLAKE2B 62777ba338901883572fd237a80f2e1ef2f9c5fac6770ec2e9ebc879fb64339d691a00404f256290120a377669b709ec860b5125030f449fe1cf4bae1bf29c68 SHA512 a8da9953ad31e8dfbd5dfe406e3f3091a7688931ccc7a6131617b39b3d716e07c4629f4abf3215cf18d1652437f3cd0985bc5fce2f4f52bbc191ed8e8748771c
+EBUILD future-0.17.0.ebuild 1049 BLAKE2B 9f474b608a2fe0ef46014db8d9867041739a2f2f3d272fa341d455b04eff94430d1d31aaf0c81dff6e4b557cf766a04b641e82b44d59800f92d77245001534d7 SHA512 dd1705db48ecb931c718adaeafc134f49661d74ca63b6703042d8cd3791b51af9122baa2f5790f2abb7f7d555257bd4a8b2194b8dbcf90da5ca829f728555a02
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.16.0.ebuild b/dev-python/future/future-0.16.0.ebuild
index 7a0c15fa841e..711a3e0a5916 100644
--- a/dev-python/future/future-0.16.0.ebuild
+++ b/dev-python/future/future-0.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-python/future/future-0.17.0.ebuild b/dev-python/future/future-0.17.0.ebuild
new file mode 100644
index 000000000000..860a64b830c0
--- /dev/null
+++ b/dev-python/future/future-0.17.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="Easy, clean, reliable Python 2/3 compatibility"
+HOMEPAGE="http://python-future.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+)
+
+python_prepare_all() {
+	sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs/ docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	pytest -vv || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-pasta/Manifest b/dev-python/google-pasta/Manifest
new file mode 100644
index 000000000000..faa6102c4371
--- /dev/null
+++ b/dev-python/google-pasta/Manifest
@@ -0,0 +1,3 @@
+DIST google-pasta-0.1.1.tar.gz 34476 BLAKE2B 04de1237eda9449e4648af0fc43b538d4c71f43b1205fbb531981c773266e404d9673adc9f7c3e74706b90993cae31d7a2c812c3ee5a02edce6ce669491f2823 SHA512 94a5016acbba72261ccd488f788b23934651149c7d763aed4f998018bdbf299261fe125accb1359f70d024c3bc3db0f1279e5e780e1e4b87b328f2c473a1b003
+EBUILD google-pasta-0.1.1.ebuild 493 BLAKE2B f88568ef689ac10dbd03594de9af15862b1f74280ca6cc219b5c9206acd5db00910c7f3e07f911437bbcfeab01843e474e862b89c0716e9d2ea4434ffff48bce SHA512 dd94c0acbeba54126f2b6fa713211001e479ed913788250c7b100151c6e8ba0a6ea4171a4e0486b8ce09c7a1452c068342d1e72bb257e74927473700abfb62a7
+MISC metadata.xml 347 BLAKE2B d79fee4b6f6d09c97796965687666f353324ddc6e1f83b6a1f9138ff95ab07a77bd66049d5398d39220e7685412ef79111f89aaa11045efbebe55a7c915592fa SHA512 c0eb9737d40e4e982775ca900c962b676b1ad863c1a48c170163f42cf42ce385b44f2d7e2eb26fe955e146015fccaba6d25aa3318347fde65aa999baaa722f90
diff --git a/dev-python/google-pasta/google-pasta-0.1.1.ebuild b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
new file mode 100644
index 000000000000..d361a804c7de
--- /dev/null
+++ b/dev-python/google-pasta/google-pasta-0.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python{3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="AST-based Python refactoring library"
+HOMEPAGE="https://pypi.org/project/google-pasta/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-pasta/metadata.xml b/dev-python/google-pasta/metadata.xml
new file mode 100644
index 000000000000..7e9a09758906
--- /dev/null
+++ b/dev-python/google-pasta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+		<name>Jason Zaman</name>
+	</maintainer>
+	<longdescription lang="en">
+		pasta is an AST-based Python refactoring library
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 6d19148bba31..3ddfa2763048 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,7 +1,7 @@
 DIST greenlet-0.4.12.tar.gz 57319 BLAKE2B 8260e495bb67e1a2b5b593d3513c3e2157a7b68b71fa3cb2a77de3b4ccc21b5d56bab26b6f0caf00cb669f051d22d7d6ad2700059a3d23b9ad7591f3d6608f43 SHA512 f3bf0f82b6e3bc687fc9b89469339cfb05e64518d1e49bc96066e8d47b8559f1c1aa53692cd25d839437a2f1b81df6fd9a4509a1b4063ec4ce1d97b73842e9f6
 DIST greenlet-0.4.13.tar.gz 58382 BLAKE2B a4afd9621ccd6444738c9b536af7ad5ceef5d3c8c4193ce637b4a8580c7070805419a917bef131f397286fae13f6e6f23409f5eedb814a41fcfee98356c0951a SHA512 625aaa8875b408442139191e1a63eca71c668675229907335f5caee623487aba5305c1d53b51e1764ad982b8edd07d04f984e08a75318a0a5672805667917a61
 DIST greenlet-0.4.15.tar.gz 59694 BLAKE2B 8409e356e7724e1651606507d0d082e77f7f21b8884f304f5db55ce6ba6e56446525e3adc96743566b03bcdb9bdea7c47fd144554a7f60825cb191e19d6e177b SHA512 a3b7856aadc988fe153f5cf62552dd6219358f35ee2ca136e5eb5c9871cb7545986753af299e6b3e95877e9aa564559e95c548785f78e680766630b047a1ec89
-EBUILD greenlet-0.4.12.ebuild 1081 BLAKE2B a44f6300782684c246198cd08e402da31ce12c5985e5ceec15a6eceb400a7debfe086ac8247742fcb32126ff23ffd557907e9d792e2b34b603c2a2f2273fbaf2 SHA512 2e8d55611fe7557649612cd79e793a7c4163fc2c11c8a8006c7132e284d0ff35a0a824bd512e96101a9d7c3e21686eff6b5e87e216a1e5db84088e34ca5260bf
+EBUILD greenlet-0.4.12.ebuild 1080 BLAKE2B ef74fd4fd531ea37c50e0e5212ce324128d930d4a62bb4116902513691a960abe0f2c16016f016312716358885f004a4ce93a2e60c4675c4f753f5ecd846bcd8 SHA512 21bac26445c483ea63fd7e27b27c037e28516a9b59073f250b6581ff34c06bdec80c421f32a26216712897afa972062c23a98fe4cda49d0286ca370dea2c84ff
 EBUILD greenlet-0.4.13.ebuild 1089 BLAKE2B e77763d69c718a05b57c8d0608ef6ee10a280bd47d193396e6ed22a0e54b53fe6f1582b91a2e31611f9484c241ab5742a6c326bc574564de53ddaa8c50e38e09 SHA512 fc07f61fca7406ba03b813f1b2d6596824f9442e2ab79b3f54de95e7b7bb4a9f57dd45624e8d544ff0c4a20ac885c37dceb787bc38a3db67df475e1517d36055
 EBUILD greenlet-0.4.15.ebuild 1089 BLAKE2B e77763d69c718a05b57c8d0608ef6ee10a280bd47d193396e6ed22a0e54b53fe6f1582b91a2e31611f9484c241ab5742a6c326bc574564de53ddaa8c50e38e09 SHA512 fc07f61fca7406ba03b813f1b2d6596824f9442e2ab79b3f54de95e7b7bb4a9f57dd45624e8d544ff0c4a20ac885c37dceb787bc38a3db67df475e1517d36055
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.12.ebuild b/dev-python/greenlet/greenlet-0.4.12.ebuild
index 6ace647d1690..a6d58112837f 100644
--- a/dev-python/greenlet/greenlet-0.4.12.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.12.ebuild
@@ -14,7 +14,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 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="-alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 7f0307e1b472..94e37b949bba 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,7 +4,7 @@ DIST hypothesis-python-3.59.1.tar.gz 500529 BLAKE2B 5c171045e363f2337d7ca30797b9
 DIST hypothesis-python-3.74.3.tar.gz 552616 BLAKE2B e19a0991e7ae2fa6208c81d336cc66e3392bb78663f567fe28b570a1463a5359ccf713776f1f9cbd19a27a53b9a71a5be6eedfa05599fa12c047c373aa339592 SHA512 f4927d6e908a9222fa06f82ad6e4cf90c62a0a3d0c7632c17ee57a3705239901fcb5dbbcfca402c153bf2bea9dde0e51c852d2024ed5a236888327963fe13a3e
 DIST hypothesis-python-3.83.1.tar.gz 564466 BLAKE2B 7b4c00a46b5a547bfc98711b795525c09d91ed41ac2c1dcf9c3c571e32819c77c6f6a4311ff32020a6d8e837dfcd03f7e2d842613148201d476615831483a737 SHA512 d828dbfe8637b6388b8c77af08970c2b45cd8f6960f26b1c54f3fbeba012e225d116802cae70ee28321de9d961397e60a5ff8cbefc02d085b6f6978f6bddf56e
 DIST hypothesis-python-3.85.1.tar.gz 568995 BLAKE2B 65297e73ec833beee05f7ad4f137cdbfe1b28cc478df31fedf8fc2c5183e70c10d5254fdba906842551fcfb7280ac59b3a7dc5cf752700c770c90d158cb81324 SHA512 cf6951d8cb70539b57147f422e43296518edf416200eec220f0c3f258ee6215f858e496f66b340ea68d1754cd936fc26a4ce4d1ee7a38cf338398d316c06cc24
-EBUILD hypothesis-3.59.1.ebuild 1160 BLAKE2B 13fa63fc01c0432759bf651cc09a6e7b61a8272a6d16689e18bac080d229ea3fc5a439f1c135bc7c5bd788e0b410467aee3245b5edf60390e6f8dfd86c785ff4 SHA512 1aa2dbb5d0d9418a9dfd095655a01cd845bd445ee412618655b9fdb2fc897ebdaf5ee30b775811a0368fc34330c4d9919448afb92b13430faa12b4532fa4cb42
+EBUILD hypothesis-3.59.1.ebuild 1159 BLAKE2B a18bdad60c3f21181fa9faa44960e9baf2a6a44600ec0b2f71705873b088a715aecb560705ba0d2123cf68302905db2f17b92c634624517e04d0e0be19b636be SHA512 7271928ef2191de6b3cf64ccfdd59082da60aa55a362176ee927d690f7344b3e9b97592550efb2e6ef2e95e1a5f730fb2093a21ee2c7c14d0e8381da5acea4d1
 EBUILD hypothesis-3.6.0-r1.ebuild 911 BLAKE2B 4107db5cf3dee7f521f54dbfe0488742ddf21876b88b5b637c361d8808fa09686252e5d464391adb3e2e45737c2e347eb963fc0e49c41a04c0ff84536a131885 SHA512 315866abf6fa890934c3125d86beba7c3bd799f1472c5661725418806f68f20c850b3204b687a03c1887ecdf6a535117446a049509050da5f9d6d93cb0f6cd0b
 EBUILD hypothesis-3.74.3.ebuild 1587 BLAKE2B 054b13c44587d63e9e82aa54832201e8eba16bd0c00c37595636ecc3a119c5ec6e18586d8612344fe7a840abe9e2bbbb9a52c5d8b1eb29da3402afee13c676f5 SHA512 b3d646c35ec68c74dd315df5e1db85c47580aa7370868a1ae8eb5d4015c2c3bbd79216194e6fb0ce265d4f400551804682250bf97f3baf94e9d3feee7ccbfa38
 EBUILD hypothesis-3.83.1.ebuild 1475 BLAKE2B 4b318a70b04fb5178eabe75a5e211405de6ae53238ee46f5f33ec5e074cb452290c941b65a607dd39257e5cdf491ebe72ff21de8ef869cf5063c5effa4df5990 SHA512 99fc201b4255b30085c82ba5c5709aa23c1867f7439236695f4dd960e2a0065dffa6bbf20ce29ffd0608b8ea7bf63a8d23387bfc5fd90b2ad4b65f234f71e2d0
diff --git a/dev-python/hypothesis/hypothesis-3.59.1.ebuild b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
index 64644cff3375..6a3fc52a1e58 100644
--- a/dev-python/hypothesis/hypothesis-3.59.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-3.59.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index dfc86e3b42f6..5a1f64d0195d 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -3,12 +3,14 @@ DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10
 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.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
+DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
 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.1.ebuild 1017 BLAKE2B f901810a470fdf95f71bb19e6be4a1321e7abe84054bb529541750dea272ffb33c4eda1e131d2b9984225f25d28036876b56d8bb0c9a76a623f7d678098b4932 SHA512 ddb2c555b404d838b4717506a3bdbd40fe5a8d1490175ff65c12601ab1805882b48eb585a1ea1ed761638469145d1e5ecd0696bb01c4ff3d83c5e817a99d5c9f
 EBUILD lit-7.0.9999.ebuild 963 BLAKE2B afea4754348b5b93f93ef1723974f218ccf92bcceb342ba5f453e8d82399358689b4bb30d04e65e63de761ccc92bd2c776d6233c618a12abaf4fda1a770974ff SHA512 dab5c3d116a590f677a9d3773d5652e7a676d26a4477ed10a4f8248f93297881ec1bd9cd6fbca6c06546d0926bdd5aedc9f478736550114bdb777c61ccaf5bca
+EBUILD lit-8.0.0_rc2.ebuild 1020 BLAKE2B 7c3cd9a7fa0682dfc62ae3be51e04bd65c2f38e1027b14eb452d8f7d73afda2b878e64097ed982a707a40d85979abea1747187d503c0567a18b30571b5321336 SHA512 af4806c74ee9f8cbfe0ac97f1f7bfa3fc8c78b283ab72f88c438dae96c010d9fd34b32a36cb09d325c9fdbd13fe8a87a0026926d606affec8c9e16557784bbc8
 EBUILD lit-8.0.9999.ebuild 960 BLAKE2B 3c1be7024e1f32c6c1c73e03f6a909d1f16cbc0750a4dec454806dc39c2fadf32f006045cbf71272a0a35c471a68daa142e96683610573627d82b81fdbc7751c SHA512 d1d2099ef259dc024f91074b5fe5cc6f9d1fa834f8922823dad0b67c8cb92f454e9694aee0b325762ad6aac2ca1b47c497e25027c1c82a186bf937b56c2d95cf
 EBUILD lit-9999.ebuild 938 BLAKE2B fb5fe20c62d06e44e847f6e9f16429e9814d2872281295eb12ea25baf2448be889ec3bac37ec4350971b44c6785aafe9795fd68cbfda1b2cb299f41f28a254fd SHA512 a21a7a2935e8d8c82f319bf65e1b01e135448c2d342baea28b05451f4f9de938b52d3a8e63d544ec35cf4e7ae7bc9bf432eea3f4a44d044631c9ae7ea6fbfdcf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-8.0.0_rc2.ebuild b/dev-python/lit/lit-8.0.0_rc2.ebuild
new file mode 100644
index 000000000000..2252897106f8
--- /dev/null
+++ b/dev-python/lit/lit-8.0.0_rc2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+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/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 04abfe830241..61f2ce7d039b 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -1,4 +1,6 @@
 AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e7569b7d6709cef8cc627d984c6a3ddef3265a6d069e3ae4a371e35804982ff9e5cd41b795a69576223b3a4ec8c591032f2f2f99f4 SHA512 bb099cee440b318ac12f68d810e2a7848df0150ecce01ba05e8f60cdff8fa0efb61ddc958586ffecf1bd9b0c15ea41954a6170e59028a24eb5a225e8fffdea33
 DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc119033a645da29471b31705fdee8465808361057804496821f845112fb8490d351f67a5d5c9e1fef522fc6e6df8d4ac34c1 SHA512 68dcf76fe62223de80610afd392f14f46af2465796c3d4d46daa0c6f1f7e99034368b2484e260e718d42eef480644a684e83d4c0f32a6108fdd544cfc48443a3
+DIST miniupnpc-2.1.20190210.tar.gz 94125 BLAKE2B 1cb8e4cd4d015d82eb15eec20e93b14a9f280aeabfc54e96ff9511db7fddf9713b9bffd0893c17f29beede29c6bfe73e6a459f7b20c9e4b33c88753b39cb7a0e SHA512 51f662c2a7a78cd99a793ff8b89097d895c80aaca696109c06106f8bb2601465207e068a410134cc66a61b4c0e11d4635bac6e9efdfe3fe8c4f813ac9e7a2fc2
 EBUILD miniupnpc-2.0.20180503.ebuild 755 BLAKE2B 09f856aa3c72074d75a01e1b1d15d48da5d2dc82f05a1167cbf0f04667db97f8688c6b7f54f3286743b12caa861490201d0d0727a21bb0fad8e2739bdf90234d SHA512 a4f28b3223ce19f6c6cacc4b299bb667865b60979095737577fdca1b94dd9d72184db42a076450607309dfc90344905e521aead19f99d82382089c39322c4cee
+EBUILD miniupnpc-2.1.20190210.ebuild 756 BLAKE2B 7979b77b8bc3245374322e59dfed7907cb867cfdd52b307f00a38ebab6409899b9d578412bea3942d43b419cf77d0f522097afad0756a1c4a8c3a12262728fc9 SHA512 ccc13cd1a65667178455b4ba0ea4c549b173511811385dec71c319c161a15086b6ee433c63bc3f400921878d9ec21887a6c774d5835c0d32d1163b289fe4f3e7
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
new file mode 100644
index 000000000000..4474c7bf0051
--- /dev/null
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20190210.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for UPnP client library"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/miniupnpc-${PV}:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/miniupnpc-2.0.20171102-shared-lib.patch
+)
+
+# DOCS are installed by net-libs/miniupnpc.
+DOCS=()
+
+# Example test command:
+# python -c 'import miniupnpc; u = miniupnpc.UPnP(); u.discover(); u.selectigd(); print(u.externalipaddress())'
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 62d2d140a8ee..5e9f139fb87d 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,7 +1,7 @@
-DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
 DIST more-itertools-4.2.0.tar.gz 56871 BLAKE2B 48cdba3eebea94483c5cfd9530d4bd2cacd02e893b87482a01ff1fdf10336f3c2a40d32fbb935d38320c9c47a1fd1942a48ea12ff07ae56793ecc5870fef2452 SHA512 7e205a575fb1d17ed3be9225c5c60139db41cc4b866f6d6732c955536b1d606bb7ccd92ad77e41159965abbddec3a85761d3649c28f06d52afa8476160d70e77
-DIST more-itertools-4.3.0.tar.gz 63266 BLAKE2B fcad717550931f267594f0e338def6e8d6119f28452ed8654b9e3ca073c4219f78d58d691855c4f6b4817afbe94d176077c342fe9b57ae522bc113049da97b57 SHA512 5fee3d99fd796b0f0f6b5aa99a8db22e219d3dced71fef6f4b16286fe67061dce280389b3638c55c6e5f6c828ef1286cee845d76a6861d2af66d90e995d5aa4e
-EBUILD more-itertools-3.0.0.ebuild 943 BLAKE2B fee0e2ba67b0b5ae02665f090be10fe7f9a1610c72857b4ea56b44b4709e0af7f93ebb48b9d12279e9e9e77825868e4338d7e6724095ccdab7d17e49e88a3fd0 SHA512 7e3546efeadde855f65e9aa5b751e0186ee33125544d8a0683ebe5e3997bb00f1e150d35df184019e2df26230cb4b50562bd2b10d2d6745e202ab70957913167
+DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
+DIST more-itertools-6.0.0.tar.gz 68178 BLAKE2B 64a389cfd3449c4711228fcd3092f6d7f62968aeaf0574fcce4bc3223da8b7633d0cbdd727cf4d56f536aa925dbcf78b6b8c3a2a3ba3ef8a0b677811367d087a SHA512 68ac1829a1a27d3f1de1f95c33a9c3f236fe80f597b9183707de0d9cd193ca5a662080e64c54c376ae59fd0a3a224ac62a9d39be4d0ba425103c4fd6e93e61ac
 EBUILD more-itertools-4.2.0-r1.ebuild 1060 BLAKE2B 10360bca9acf96e9635f98f4aba1dd49b65b607cefcfd6eca8102069972093b638a46a4224c6b68420eb45d6a687f1e66fc8688a5857c72945186d826e23255f SHA512 cfcd1e13aea98418912ae9937a8edf3f7a10988ceb836dd0e251c0d274a8eee2826dafc53ec5d09eae089f0ae8cc852f5b7c64c9184654e89d2e365a0c014864
-EBUILD more-itertools-4.3.0.ebuild 973 BLAKE2B d23fe81c2d9f94021bafc39fbc82751cb1e5af4b913ea05b83eb93da66a3c65b6d7090d046c08f6d3f1ce00f96dd17e017a0d5c3fd1b314fd58dda8f10076505 SHA512 dbc0f68bda24d67d0ccdb8080c1c4d49769171ecc2759648075967a5dcee83a45d9c48a65c34804f6858dfd0032c64e7b4b61ef294cca0091ce5f49bf85245b2
+EBUILD more-itertools-5.0.0.ebuild 986 BLAKE2B ac405deb88b19349ec602cfff8a1cefbf4b06e3ad83ead10b11e3ba86919969eee2eb903228c07f197b42e30fc0bf9e117e379f151c824c2a11b5c54da6a5988 SHA512 eb79b70d2a551641fca10756514edd1b895b0572dd43272c674b0fca2a8148d63c89fdb93a16bd391dca9eb21781d0c5e9d157dcf14171fbff2ae0b4c8082ca9
+EBUILD more-itertools-6.0.0.ebuild 913 BLAKE2B 28b63906e3b8f643a4b527d854f4b27419916a58faa2386599e1a64089b078d350855f87b51affeaa43360ce490ee8c65915e92aeaa26d9ea07ed0249db5e269 SHA512 34473c3d501aa19f0a2abe45dabcaa8c4bb927be1b69b18ade98999eb4ffad82ae515a091cd3647747503fd8000f2476d3ecd30cc8a2751348795330b6a9c5c4
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
deleted file mode 100644
index 337eb39858c8..000000000000
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc x86"
-IUSE="doc test"
-
-RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	nosetests -v -w "${BUILD_DIR}" more_itertools --with-doctest \
-		|| die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/more-itertools/more-itertools-4.3.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
index 4528d7a54516..2645ba7f5b53 100644
--- a/dev-python/more-itertools/more-itertools-4.3.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/more-itertools/more-itertools-6.0.0.ebuild b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
new file mode 100644
index 000000000000..ba8a123f9b57
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-6.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="More routines for operating on iterables, beyond itertools"
+HOMEPAGE="https://pypi.org/project/more-itertools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+"
+
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 7c04abca9b94..4b44e701a6b5 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,9 +1,12 @@
 DIST mysqlclient-1.3.13.tar.gz 90368 BLAKE2B 34e6aad0d53f93017120334b09b901530a84cc5a5dd806381dcc3f12742764bda6f42699fef226b22274efd8f61304af0d1366abdf44607cd9827e9718ecc285 SHA512 e8e385490bfb2d926a94695089c9532981d1e3fcf1fb89a4dbabe98f0bbb25beed1cce8004b71a11fdf0161824e86826565cdb1ba5f2162450847b6b467f362e
 DIST mysqlclient-1.3.14.tar.gz 91391 BLAKE2B 06a781f21f608246ec2da8a591d7bf5e430d96bc4069e589d6466a2deb4e53ab8a51db0015e4db73a748d6cbdba9c8c550e888e415cf9390afe5f0d7f0620156 SHA512 2623130f67b989f981bec37d19fffd400ba1b144657ff25575d055d19297d0f94c0a70eac980d90a76ef2b0455a56ca033ad92bc54c9456b2c57d5a84475ae50
 DIST mysqlclient-1.4.1.tar.gz 85332 BLAKE2B d5a19a440ef2187f59e54f97100b9b10ddbe9357791b546f13330b5b9fcf4aa7931e453ef5f6b8445295a5241eef73f05c1fea2c0eca3a6dc02055b2433699ca SHA512 d1606c19bb0d05f69eeeb7699ac131405e06f386a0d752c4f9a5ea28f90a2c26cc5eda44bcda2bb934a88276f6685efa21fe1680e2904578a295da8827af4f9f
+DIST mysqlclient-1.4.2-r2.tar.gz 85662 BLAKE2B 5e375c142d392d79ca3b119d52625c3c65a074fb90e71eabd2791823738995d390de90c50c20dced9df91e071d74d7a318cf09779c44387eb4103845486b48ad SHA512 d42969bc37b5148fed14b815280890f07058f75ef99390674f6ba3921f5dbaddc3ab2344f41e3b6d36f35229feffbc419a2ad31e2268e70165b1973356ec9c32
 DIST mysqlclient-1.4.2.tar.gz 85634 BLAKE2B 76c6de6e40a76b1629da4854ac3fbbbf77c58b2dfa3d2c9b815dcc840e62798094c6260e745727043c7e20f136f1a8015feb78e6d6232f917bef3f823fb4bb77 SHA512 1d5a62fbf70d59fa5674c733229f50f60524d2e6d6355e7c9d99186f2a8ad5566f830161996128f5a681b3601687754d8e581b3231b666bb70464fbb9cf4f94f
 EBUILD mysqlclient-1.3.13.ebuild 832 BLAKE2B 2db089a19b09d41d950d4b083a740a177fa256fdc5b7d6b34bb71e1c8c4201ad6afc23f56fc5027a8dee8b9460780d478e1153c2b97cfa0af36900d3ecd3319d SHA512 834a8db1152aeebfcffa0bc71b0da3add6eae1f60661396768a2938b6829ec7f7e650d213b43ce4162bb4140326f2e98399bbb1d648d729fcc624ceacc429cb5
+EBUILD mysqlclient-1.3.14-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
 EBUILD mysqlclient-1.3.14.ebuild 832 BLAKE2B 71d30ed916d8f5ce442d26aa7f0ca559c083fdd2e81c8fbb64fa9e42d6c7b4d5d31cc11ae6bfb21769ec19f2aea827b75e655269d90741686ef1b4a14e3b23de SHA512 6339636e0fbf4b2b5ac9731e01153abd9ecd17a4e444c6bd10b7d603d03e77201fbc9d6f8fb02e27da1e0d9920b84c78cdbb97290fe07b6d4ea84ff3469e9991
-EBUILD mysqlclient-1.4.1.ebuild 834 BLAKE2B 083392f523353dbc8fac057b0e20aed7000f62986c6c9a757159a27f6ad35a27dc0f2747ad44140107ef1f5424b9b2d6134255324b39068aa4ba702232d75a8c SHA512 310fad0be34dd9913dd5565231ee709d9fe934c2649b919de7bf8941b9460b0df34e983e6b660144ab2dba85617b34ed026e488a6ed17a2d7d6edbb7d8e465e3
-EBUILD mysqlclient-1.4.2.ebuild 834 BLAKE2B 083392f523353dbc8fac057b0e20aed7000f62986c6c9a757159a27f6ad35a27dc0f2747ad44140107ef1f5424b9b2d6134255324b39068aa4ba702232d75a8c SHA512 310fad0be34dd9913dd5565231ee709d9fe934c2649b919de7bf8941b9460b0df34e983e6b660144ab2dba85617b34ed026e488a6ed17a2d7d6edbb7d8e465e3
+EBUILD mysqlclient-1.4.1-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
+EBUILD mysqlclient-1.4.2-r1.ebuild 848 BLAKE2B 6e7086d364ecec6314fb1cfe51de1d9472ae5ae4722f2c018932b225f884f0666c077356f80e8637ea779950e5fd97986f9d7597f9082722bb2c2562a33b05ba SHA512 e8f0fd3ea1d7bfbfd0e8824cc61e6ba5c51ac7e274284692abed3cff6424f7809773d90d1b9e653b2801f814dc93ce8d1d1f0ba58762f5dedbdb6432e863f549
+EBUILD mysqlclient-1.4.2-r2.ebuild 870 BLAKE2B 8893ad50a95021b8fb92bb817e5291679a2527d6128c4d8613f62badcb501229fb660b79fc741a138f64ecc7c2b9252aff2d8ef90cfd29cbf91f08420b540f94 SHA512 a962508b1c8bd1bbf48ba0c36835181905344698b8aa12cc466281b6a4d2ef277ac9fce30f0b10ecaafda29ccbe7273146f11f4fb8ef5b3ac948b172165b5b11
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.1.ebuild b/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
index e39a11aecb9f..32c8bf147197 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.3.14-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="doc"
 
 RDEPEND="
 	!dev-python/mysql-python
-	virtual/mysql"
+	dev-db/mysql-connector-c:0="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.1-r1.ebuild
index e39a11aecb9f..32c8bf147197 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.2.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.1-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="doc"
 
 RDEPEND="
 	!dev-python/mysql-python
-	virtual/mysql"
+	dev-db/mysql-connector-c:0="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..32c8bf147197
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.4.2-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	dev-db/mysql-connector-c:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..20c583caca27
--- /dev/null
+++ b/dev-python/mysqlclient/mysqlclient-1.4.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Fork of MySQL-python"
+HOMEPAGE="https://pypi.org/project/mysqlclient/ https://github.com/PyMySQL/mysqlclient-python"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.post1.tar.gz -> ${PF}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+	!dev-python/mysql-python
+	dev-db/mysql-connector-c:0="
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+DOCS=( README.md doc/{FAQ,MySQLdb}.rst )
+
+python_compile_all() {
+	use doc && sphinx-build -b html doc doc/_build/
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 208c15088d6d..8b26a9f5f084 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.ebuild 666 BLAKE2B 0e9801b14d3a80705cf183f3b4b515dac141dfc4fbd213380fd57c69e282d0a42752e472c94f83940a7ccbe7eb23bb9d77eaf42c358add77f8ecda536e1402ee SHA512 b08e02607eadcdefae2823b2fd0ab68d44c970e184345618fc594ac6676e5590e8c323ffd77cc34b900033bbf0a99139b97ca7f975969a36f8ee528a11c77c0a
+EBUILD notify2-0.3.ebuild 665 BLAKE2B 905dcf1b214ec568eb63042528828ea9179d61c5c40e39190868a5738b99ea939cc88f15a24d639a89632693693f1ea6301f9e7f5b9107d8169fd2476eca9708 SHA512 8b02ac16935ae26ad0297dcf5356ded20c05edc80c8c2a750f8fe9692526dd7b1fbf32e70807d8da2f74c2ad3c713af8452bbe0cc1efcc0bb44b0d0f116a5ffc
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.ebuild b/dev-python/notify2/notify2-0.3.ebuild
index 80734c4f82be..1f378e278717 100644
--- a/dev-python/notify2/notify2-0.3.ebuild
+++ b/dev-python/notify2/notify2-0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index fe179dfe5e25..91562f6169ca 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,11 +1,3 @@
-DIST os-brick-1.15.5.tar.gz 161371 BLAKE2B 0fdfb5978cb1d1ca635d64f98b75210b03353c033affd9834294c4d505a0d9e580f0f829a5e5c96fdb53f1cf2a29ba63ded6fbba4ae662a5dad0d20fdf98356b SHA512 c73c0f227e68aeba80b6b5687fc876e7dfe3ba36a800b7241ed08a0f189e0a57adfdf3b3e1f63230514ddac848be84e1f05e6be6aa0f50412695c6d37124717d
-DIST os-brick-2.3.1.tar.gz 166518 BLAKE2B d58acd3ffffa6a5ca328eda9f74f4e9897846b047fc96777fb438c5e5a2fbef642e1672bd7f216acddef29138543627ef79fb6e6fc01e9e7cb34ee59663bedd8 SHA512 243d574289a95a07c43b112f9c00372a8b95560628f1d86f3ea750755b4026ef9426864a216a459c159b7275218a08df585aaf0f4f3c973d63af5a59083a6b2b
-DIST os-brick-2.3.3.tar.gz 166088 BLAKE2B d5bdb748f8cb00ceef7649198470be3beb58bc9824ce74d8781c65ad87125b5480dc22fa978817fb89842ed347fbe7f0d1a3b5c94642ca418b7c6a694423d56d SHA512 8373641ee102eb7e522da400dcd960672341828ce252610bc65b042e5d0e614ec8af29d8fc87564a29b62615d71aa8b1074b4155c8f70cf35232fb2b37105f94
-DIST os-brick-2.5.3.tar.gz 172125 BLAKE2B 3809301fad05883bd81510452189506a05561bdd1d95706df9690a5d0bcd3165ed9c55b06cbe4b3f24a4ee62877c784209b38348f224e6c82e5683133cc13d73 SHA512 b2f0b75f90ce973569c25ea18fd3b1372209a4f49572644fe1b99bf295edf8e1346624ce95eaebaa37653b7753169b42a054e5f9ea4763c35ade5003b8ef47b2
 DIST os-brick-2.5.4.tar.gz 173675 BLAKE2B 9e1906f718b79ed3b0b332864fc6263af7d3c9ef0da2d93b2b099e48faf805a0250c525589280b9416897d3751d01d0331867c10ee971ccd849b60f34ac2cea5 SHA512 bf6a696ee48591e49ff6e1eea7d74eb4acd0457257c7733ae649059f307170f4f7bd4154ada3498a801c4e54675c802eb9df096d44063b018a2628bc654ae17f
-EBUILD os-brick-1.15.5.ebuild 1636 BLAKE2B efa6611d1e5a4aff93de21ac1620ae1197cb4f279c364d3f0fc0f7938fa5039b460eafa99894003d49a82dafd75fd0bcfe34ad7f2f412e67fd78278ae8fb2151 SHA512 f2f08b712035ef08499f19d4ee4526d6549faa0a0826d9398a8ea67985cca6d570c84d2ac667a279bb411301f33e1082180fa19e71c2c65c7aee2cb0ce0daeb5
-EBUILD os-brick-2.3.1.ebuild 1473 BLAKE2B 6ec89785e32cd5a19ef533cf6400444025c7bf3804057bc9b96ab60ebd3e5983a43c32d669027cd711ef0534f963228d3dea7922952056cfd4f687ca6152c64f SHA512 4b768d5f4a052c409b48298d3a832bfae5540bf7ab814353b67ec1697e089e929c8f8048b225363881c58b799c00bad6992ac214b05433b592fd9174b4ad4a0f
-EBUILD os-brick-2.3.3.ebuild 1475 BLAKE2B 481cc3d60132a46dbfd27ab84799ee954a9ef79bde0ad972fc3e0691e65667520ca662e6b8590894530d9e08629262e696d974d2593c13a89383791f51a613b5 SHA512 aa6d2bf01e0386c73ba64a1b344ede2127da0bb115252301bded3d799255783ab50e205ad7e8682d727a57e8e81b12c117123313712610836774e17a4a59848b
-EBUILD os-brick-2.5.3.ebuild 1473 BLAKE2B a352ffdc7033f6f941764fe47a7e8aa03b8850ac4de2c1dd512191f8f9ff8de60e2d23fd37bc58fad1bab71976e523205bcd9368f872272a595b2f0d6502970a SHA512 0b93bc60af329f9bb25e52134f50c34210b1996a2f4217b6a921813d0720193476485f769f336621d62787c3e2637323e9122547d5d0fa39af60966658bbd52c
-EBUILD os-brick-2.5.4.ebuild 1472 BLAKE2B 86d05a04e24382895c43b44dba2f0763b9b4aa135e08050a974cccbf066558fe280c528fe6f4dfe126b27ee68448bae9ad7284950b904dca0f0f39b67e92927b SHA512 a08588a63e9515bcaa03056e82a3289b07b54cfd41d0e334c5edfd1aa41a34cd898ab85966180110ac85aeab5888afd76017973fbc1c3111be33bc1ad7c442a7
+EBUILD os-brick-2.5.4.ebuild 1470 BLAKE2B 041a7235a073214b604b51271698a307640794b870faa4300a311631598cb1fdb2cc93aaa6d30567cee73f89e3a201b4e3894d0c1ae182f053b59014a7059624 SHA512 285d75dcf94e3955c6f3b0f530e622e41b3c779dd86b8065a63faa8c233b4a9d077c539f897c22b660894d35a28831f3a3e6275b6842c6d4fecf086991962998
 MISC metadata.xml 381 BLAKE2B 6d5a168e81b27c1e9a5ada920a182616c150d5f5ca204e334067f4bcce2878b19152810391d0506b9e4bf1dd287bc56fda035d576c5fee64a9ff2fecfb7b39c3 SHA512 b3cdc328f38ade8cd2ebb44c533ec0c79fbd1c187999bcf6c9c04104ba7c29136f0a0d6d57016aa6c7b607e66bfc511eaeff90c6d1a9708c494f4358b324f3b9
diff --git a/dev-python/os-brick/os-brick-1.15.5.ebuild b/dev-python/os-brick/os-brick-1.15.5.ebuild
deleted file mode 100644
index b24043bb0104..000000000000
--- a/dev-python/os-brick/os-brick-1.15.5.ebuild
+++ /dev/null
@@ -1,47 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-2.3.1.ebuild b/dev-python/os-brick/os-brick-2.3.1.ebuild
deleted file mode 100644
index 97eb4708dbe5..000000000000
--- a/dev-python/os-brick/os-brick-2.3.1.ebuild
+++ /dev/null
@@ -1,44 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-2.3.3.ebuild b/dev-python/os-brick/os-brick-2.3.3.ebuild
deleted file mode 100644
index f562cbd3491b..000000000000
--- a/dev-python/os-brick/os-brick-2.3.3.ebuild
+++ /dev/null
@@ -1,44 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-2.5.3.ebuild b/dev-python/os-brick/os-brick-2.5.3.ebuild
deleted file mode 100644
index 9700f7164c28..000000000000
--- a/dev-python/os-brick/os-brick-2.5.3.ebuild
+++ /dev/null
@@ -1,44 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-2.5.4.ebuild b/dev-python/os-brick/os-brick-2.5.4.ebuild
index 0229d3350c19..fe3071c689ee 100644
--- a/dev-python/os-brick/os-brick-2.5.4.ebuild
+++ b/dev-python/os-brick/os-brick-2.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 002866209cc7..3ee6a00db173 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-cache-1.28.0.tar.gz 52015 BLAKE2B 897e54008ea99f367f373291d874736287dfd3d480046bdee0ab2b54969e8681144677713794ff32682b1ef65547618d5fcf403e9ae24b57768905daf7ae7f5e SHA512 44deabf9dbe3c24afd04d09f91f95d902221995130559e7895045eed98356ed9e085f5ee9b7e2bd0b4581df563a67707121b7571b0b7f822f0bb5a55b6dedafe
 DIST oslo-cache-1.30.1.tar.gz 53406 BLAKE2B 1b518c7f7af4b95fc71f76567f8742de7c7ab520cf4a1943fc7ed7bd9f3dcfd4150f83774e507d4135c7b567e53c3beb79a0cf6295c23e23d88a49d9ce63d2ed SHA512 8ee8ef32d07e8112aa7280f541446d13b3bba90fc7314eee60972180b0382a413e02cfcffbdd5bf4313aa394a25265665579f43f702a4b3754dc00f50441ca38
-EBUILD oslo-cache-1.28.0.ebuild 1045 BLAKE2B 5a476016a4a20177ffdafa93bd970a2da0e87fa07a50b7ee493f5a3292f66a727849f33fbae9dbc2d5b36d6b2bf8727d8d75e7be82e25cf331d7349cf1fe0746 SHA512 6b2078d289a99f5fd9db6c7c658064ebcea2cceff76ffe6572e1a44fbe31873378b99450274f431b162e5de8bb5c329707036aef50f3fff871b2a05cc7210495
-EBUILD oslo-cache-1.30.1.ebuild 1044 BLAKE2B 79d39645f2b468e0d1329808882ae4b62acea6eb3fcf7aa2ba205d6892c25c8cc0aae7117bda7798d06d036e5047a0025c38a518769e2c3592b09b328b9d8e4c SHA512 d0a630a8c4426db273533583efeff4590fb8eea5339075484002418d2c85b71f02a0caa21e1af7e1071c279400eaf34184a6f95705dd4c1c8fa02c902533edc5
+EBUILD oslo-cache-1.30.1.ebuild 1042 BLAKE2B 4d82c2dd4a0093367c89e2ce5b30ebf1143d72095ac1d8c269b36e64f4cb0e363951752cea9b394ec278711212f40a13cffc923f48ad9e85d3889cc041d27a51 SHA512 c6c825f55d65dc3150e4a5e8d325f54d127af5d573332e67ebe4c8c9e2a9fef1094dbd3da948e9890f345356d121c211bde3ca21fec0df9934aaaf8a4d318211
 MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
diff --git a/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild b/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
deleted file mode 100644
index c11639ecaf0d..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.28.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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,5,6}} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild b/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
index 71b251dd4d54..476fbb16b396 100644
--- a/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-1.30.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index dd5e05298588..6ada49a70e6b 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,7 +1,3 @@
-DIST oslo.service-1.29.0.tar.gz 74957 BLAKE2B b56869cb28704718952c5e151eaf0442b1a4295b8e25a422d91baa241a990d031cd408474e44bd5ea2af2b7451e0c13ec491ed4c2ccf0b07c78b65a81bec4527 SHA512 84f1b8e6abc7c8c95433da53b1a1992570695b80e182f5cb7d87ab394857d8d47c0ef0528b7a45221c897eb4c5c13112d86b8a929efc2988d22844a4c712a340
-DIST oslo.service-1.31.5.tar.gz 71865 BLAKE2B 2ad5ff5124e1b33a216510d39e7d37f3371257281cda9ebe0263a3dc741762d8c737478772cb89000a01bcbb7d9647a3cc3bbeaa62949f4957d1f2eb7ff0ba1e SHA512 9c6ebcfc9683601bfd4a54dfa8eeb3d687ea813a5081550092845350fb178fb9f609ff9f3caca6f0cd48ca6280ec71b4587741ed5a836ca38bbc6958aa521fb3
 DIST oslo.service-1.31.7.tar.gz 72069 BLAKE2B 8a40608ba3b4ab8c78cc48f89607af5db3e493aaec48e4b33d917fd5ea32478dc04a0ccb2f1aec524acc900a13d9880d8bd51e49bd3b2eab787d7b7c55872e47 SHA512 18bd558cbbf67441438f62a212ca61affd625597a02cbe8948bf055e61887a0e1b21dfc18e7450ec21951377daabcda8e5e7f57b39f5dcaa1b1d635df13f8e21
-EBUILD oslo-service-1.29.0.ebuild 2027 BLAKE2B 5c9eaa83c83e38b744f34bccbde1cf493d3e8a986c52202759913d8c22aa7b2f5879aab02ce695686589159a2ac726ef8c487dfb2a2a30990b311886fe04a2bc SHA512 de0398cc0721e39adb1e20143725fd7d7b113ef11bb41279dead12b1697a4615648d50287fbe6a460306ce1236bce5b013b072a3e0ea695c9b505ee2d4b842e3
-EBUILD oslo-service-1.31.5.ebuild 2117 BLAKE2B fc227fc56866d82d9df62a0e25f8c7937409690c252c531b196641161397df3eb3d0ae57c7c49d64ca6cf3667fa3415cd402d828b9772295dbbf119600f22bf0 SHA512 43e8ab766cc75352d68c1cd2bb6bae3c9782544c54c84e6d09e5dc857ad1d2950267a87040bd59362b5916f1e87b33db0af2e08122f57e6ba66778e91ba04a0d
-EBUILD oslo-service-1.31.7.ebuild 2119 BLAKE2B 1b4dd17ccf34e3453b22886932a5a2df2ba944998ae99af18c53b7b6045d7c1761646a8da9b75540b04dab5b8d156e7308d334a1acaf88635bea73877f5d5cc6 SHA512 4540be244187b0c0a9201d824be3bab18138c767d868d3ae036571aadc8a3dc142d357437d64e5d44c171c03e906cdd08ef0437b25f83c0303447861eafcbe53
+EBUILD oslo-service-1.31.7.ebuild 2117 BLAKE2B 9ba1aa06b80c5c768ac3060ca36a5c2897432389e8a49d5b8681a2ddbcc48f882f0676244778a3aa77f7089fce69fbf33da3b2f7e299cae6394532967b69276d SHA512 18ba86db6e81d4fd4e411be2b8770fcd1bd37890227ba21f8071c21ddb1f39a8756922d56551ee4569a1f1dab5f4de9e40e3ab2a88319a77e08d0fbfee9f3f02
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.29.0.ebuild b/dev-python/oslo-service/oslo-service-1.29.0.ebuild
deleted file mode 100644
index 6f1036b88463..000000000000
--- a/dev-python/oslo-service/oslo-service-1.29.0.ebuild
+++ /dev/null
@@ -1,61 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.31.5.ebuild b/dev-python/oslo-service/oslo-service-1.31.5.ebuild
deleted file mode 100644
index 51d7ec7608e2..000000000000
--- a/dev-python/oslo-service/oslo-service-1.31.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.31.7.ebuild b/dev-python/oslo-service/oslo-service-1.31.7.ebuild
index 2a0093adb6f1..1826f7701238 100644
--- a/dev-python/oslo-service/oslo-service-1.31.7.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.31.7.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index 4582b83acc1d..994bf3cc0f2d 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,7 +1,3 @@
-DIST ovsdbapp-0.10.0.tar.gz 71376 BLAKE2B 3f8c79b57b68da303c11d4b963367f9c9322bda1c9a02c0f7e28d57572c3056b89ae6f859592e955a81acbfe16725504163a1d799ef4d23b0ca1d77ce9eb044e SHA512 321e3efefad6ac87f9b64ad22c3d1241d6839de8dba556f2aabdecc99209457a35b082f5d62cfba4ae67f50b265e8c6a55717fc2270470a7a1b0a1fe601bb3e6
 DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
-DIST ovsdbapp-0.4.0.tar.gz 35790 BLAKE2B ae41b173787b761eca330e159ce3f1ac2c953c18edb706cdc72a556d680c591cf0540d20b65035c6dcfacbf43768bac81a69b95f4ba5dfde968011fa0c22b46e SHA512 6eaa98745c2c438f43bfc9ce3fe00b100689a2df7564e487bf9c2abce81a725490813d969ddd9ad56b4933f0822d6d8801297e8b6a0c81db2ccff562c1ca62ec
-EBUILD ovsdbapp-0.10.0.ebuild 741 BLAKE2B 53b677a655b02135535267c42ce4146e19e796445a52d10eac45b7e8fb58d69d406d8acabc1f0c85e4b685ff161bd320401594d8edf2f84c1d8a229ff036f931 SHA512 cbd194e6cf0878bc8450e120ebe3bf1c07bbeac74db8bf65dade2d6c1f7a8dad2ca2095b07f7e86c773e3d2edf05c847cd9ed3baa8e656a9e48036e8971c1350
-EBUILD ovsdbapp-0.12.2.ebuild 740 BLAKE2B 1c25af658074f88fadf3d3a26d61de49ab8977521f647e800fd84ce4a8f185130f2ad5182e80175530cf7e6d56ace35dfb511beb27f0415c300d95711e8d7355 SHA512 11f9e8e6b2250760a68933d6a076238784eac40c7f36bc2f2a56ad8d12afa4f2f851f396f45ddfe9151dd5054707a17eec05341db1920e6f44952202db8dc11b
-EBUILD ovsdbapp-0.4.0.ebuild 655 BLAKE2B c0786fbcf260aeeab56df42a7807e13625a3ab1c56e452e64e2e66b43ef436ffa21a3276a209686b9d60c849d2261a9b8f0790e73324b577dfb782dee77b6add SHA512 2c4605eeff18c4dce326426f8ddc694b06ca85bf8ed6b1117b6edbf345b9c6b2192b890b49aa0579d836d1820713ebb2af8ef96bc69a40de566f894b46e2e686
+EBUILD ovsdbapp-0.12.2.ebuild 738 BLAKE2B dc9d45aedcbe9c7ea86bb88aa13b1d98a60e5caa0a9c40d2e808fd75ab5339193e7dab877a4ab7b056161903c03ebb8c374eed75786a1c866d31a2a8f37ae558 SHA512 e0c8bd0c794bbab877fe9227f37b6c3753d1869c225d698d14aa8189de91f4d8f4c0110781a057d9644d584257493609c60b223ae1bbfc309665dba46882c1a9
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.10.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.10.0.ebuild
deleted file mode 100644
index c765e9e790b3..000000000000
--- a/dev-python/ovsdbapp/ovsdbapp-0.10.0.ebuild
+++ /dev/null
@@ -1,26 +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} )
-inherit distutils-r1
-
-DESCRIPTION="A library for creating OVSDB applications"
-HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
index c4a2f23537a0..9ca178f336fd 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild
deleted file mode 100644
index 7b62858c464f..000000000000
--- a/dev-python/ovsdbapp/ovsdbapp-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +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 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="A library for creating OVSDB applications"
-HOMEPAGE="http://bugs.launchpad.net/ovsdbapp"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/ovs-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 6e9f90661485..d99cd6e40fd6 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -8,6 +8,6 @@ DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f
 DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62
 EBUILD pillow-3.4.2-r1.ebuild 2498 BLAKE2B b91e53211dfde64340575814d273d6d7afff29ae15689d4f98d411cbfa50b48594b79c0e5faa692c7630dda7955f6cddb3918227c4eaec293e065d28dc98e9e9 SHA512 37f491ebc17403dedeb9a48444ce49c5851a0d6b6a9fc24ba3bd81377133e6671df7b03fa7126d53b366ddd18e2952a445e7ca7b94a93f71743e769a5b1a30c9
 EBUILD pillow-5.2.0.ebuild 2726 BLAKE2B b1348ed1e9fcf05a440283451ebef5424101e3481d15493e3f6e35349dfa1948aae274eab8dcd82b6ddc79fded4d473f77cd79efda76cf0328586071f4dad333 SHA512 bfb638325d369e0f3aa018fcadc5ae8d56f5cb14fcfa0a97a105c6086c5fdd073afa3867f4bea58b85303bb94d0b41450f971e7d321c2a107a02d4f0cdb615bb
-EBUILD pillow-5.3.0.ebuild 2313 BLAKE2B fe5bf8d779a8b9c329a341f0c5530f1bd750c73bfdc35eb36e33fdf5245c3c58c09fe2b2e20649275ee0dcb483e7e2d7219557c7ae95c94564a3d7ac4f3ca3c8 SHA512 b44f5ebce53f79980627b1bc2bec30766c2375ee7524113c91176bfb013a217a2f7ab1888d7eb2d82fe15871b6d351a91e643c53ca1564bf910b55a6ec2a5eef
+EBUILD pillow-5.3.0.ebuild 2312 BLAKE2B 403819daff14ebab5b69e8abb8e9c164d81492d1cc910b4eb8c851dac0217cc2bc4aee1f41fc16d4fc03f793336d52ec322d61b582b2b1802eb32a5f86f3b81a SHA512 08f83a48005c19097dc45a4f7d4afc12ce0eadc8f0b49869fb31b9e62eae7926042cd2969e3e27e4502e7d962062047ab82e0fc5deb17115d2e48bdb9ada576b
 EBUILD pillow-5.4.1.ebuild 2772 BLAKE2B afa6d46629d173a37de60a50bc4e0942cd07a502c728d39d260cec21b21877605c1d802e05e8a2ecb9be40793d235824bf9ce12f8da6af454162f6bf79890818 SHA512 6e28e2c71b65f7c0d715817d852d9e5dcf89d97fb7a51199dd71d38f3959f4444cdf7ee890a06796f581c5406959dc189015e5e4eadac45a7a7aa0af7a848f61
 MISC metadata.xml 590 BLAKE2B 085c6481058e0ccc50934eaef9ee5fe97666c067f847eef8f569af8d5f4f41fe5934d77cdcb0679f24a4ba411bf1885e03c74f365919080e86a4f8a434d2da8a SHA512 13e51fa5ba4ce8e0ed0f81b0a1d16ba8be875a24c9e93dcc87f08724a151c90ff40c8a9e09ee69143dc4400f067a7de90324ddd5a90c8d33b1d818a716194e9a
diff --git a/dev-python/pillow/pillow-5.3.0.ebuild b/dev-python/pillow/pillow-5.3.0.ebuild
index 2f99b2249374..69d0c2bb081f 100644
--- a/dev-python/pillow/pillow-5.3.0.ebuild
+++ b/dev-python/pillow/pillow-5.3.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 ~ppc ~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/psycopg/Manifest b/dev-python/psycopg/Manifest
index 8a94021e058a..e0fc05768adf 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,6 +1,6 @@
 AUX psycopg-2.7.3-avoid-mxdatetime.patch 1832 BLAKE2B dff21302f85dc05be27147d1a53ac525bca24cd9c2282edb92168ba38e73c38bad9f5a8b24910a690105bb4f98888e174f8d7c2a285e6e42efb36a45499ed02e SHA512 1c582abe153d73bd71cdfefff4293f2c497a5818fe2ea7e0deffe71d0acb89ccde8e20aaa33acf3d47900743c548eecbf01db24b01abe35b5ed60ca20bf4a658
 DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8c079579b0621d8043af34daade05b9cec5465c6b3990f537a4350d9cf60a43062a0aa34db1f39b336296b32d3f SHA512 e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034
 DIST psycopg2-2.7.5.tar.gz 426358 BLAKE2B 301bd4c6ecbc29b1b02e477ffd3576c4bbb00142998a85f5a79678a96b521098a8d0bf75779ab7ecb082c6d374cbf41cc845dcba0e1413b98621f67f9b139135 SHA512 5bf85b6760871f904b6b570ea454f99b72cf97acf9cce10b63dc7b6b0b18913b50ad4f24c469d101c54de6ad6100f1cac3c58225076b5e584a677f5ab4170a93
-EBUILD psycopg-2.7.4.ebuild 1561 BLAKE2B f3f777c8efaeb7f31a77b025a2dafca2df253603b295af25f1193110820769e2fceabf305160bc7ffdb2deb68aa0069cef2ea1734e388cf337659a6ed3b454c7 SHA512 01afd0d38aaef299d9590f9d37b3f3bc5c2068e5a24da0cac44e417582952c93e372838f7922f01f58d6aa178d079e9036022c7ed044d66263865b22767ada5d
+EBUILD psycopg-2.7.4.ebuild 1557 BLAKE2B 31e58e68e36e51d3b3e59ef731debe70dc2c8f47bc5d773abe74eadab4b941cc1177626f423cf43546ec02228d1e45c3435ee22313570a02b2eacc347fd08d3b SHA512 dfa0479608709a00f15e5075ee8a5b5ef03ba9c80848d9cd14dedebb034d1c304fcf1037ba7cb629e9cebc1498f86a0779690579351dab8c9fb140e827cfbdea
 EBUILD psycopg-2.7.5.ebuild 1568 BLAKE2B aadbf7b22637151227f36add992b5b8cdebffcff15bb9e185304790237f0dcc18f4640d0019ab15b6405afe4b6f3f821e5025721d5d2e9df687105ec5ff51413 SHA512 36f52384fe13174d6cedac08ec629874c5c9d802245702bf7e20761e38631fcb65a1a6ca4f3bc1280f5d21df3eadba9e92a92d7ee891ac55451385d5f4d23bc0
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.7.4.ebuild b/dev-python/psycopg/psycopg-2.7.4.ebuild
index 9e54fde2ad0c..88edd2eb7a54 100644
--- a/dev-python/psycopg/psycopg-2.7.4.ebuild
+++ b/dev-python/psycopg/psycopg-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc examples"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/pybloomfiltermmap/Manifest b/dev-python/pybloomfiltermmap/Manifest
index 2815cf97d4bc..617813346cae 100644
--- a/dev-python/pybloomfiltermmap/Manifest
+++ b/dev-python/pybloomfiltermmap/Manifest
@@ -3,5 +3,5 @@ DIST pybloomfiltermmap-0.3.14.tar.gz 446760 BLAKE2B 05a70819374af7e5cebfb9f05def
 DIST pybloomfiltermmap-0.3.15.tar.gz 448288 BLAKE2B ed140f43d80f438e82c6659dac1c7e234872b0b1c620db3fbfdacdfa9476bf36e8508549a5cbdab88aa76c5db26ca958c45494c699c2080e17b7cdc07cd2d051 SHA512 36ceff5860e97686387932945d6ee2f342e07dd45b4320b09e8153987c5aa7da678db86179759528c5a4c0d8fbc1e1a98b549c55e17a6d66f1c83c0f1ee46ed1
 EBUILD pybloomfiltermmap-0.3.11-r1.ebuild 395 BLAKE2B 18961cd14ec564d84fb6d086bb6472f58843d93d257864168da5ce75cda83b242a878dbb4ddd11c9db07037e19c463079f22e6d16f8ee3866dfc9e1fd83b5e4d SHA512 cd4f75708c592c04083d710af363ffec5cac3aac99816b99337184cb4d3ef671affa5a3a23372a401120dd54da661db37e49adef19a099ecba6c0b1f30de49c2
 EBUILD pybloomfiltermmap-0.3.14.ebuild 629 BLAKE2B eb510bf1080f83ef2e3880d604588bc1754e3d403f6b6b36c479afc207ca3643a8e6a3fa4d68fe75ccf8e5238048bc131410d45bf15f0f9e36507415e496884a SHA512 ccb49fceed31481a76dd6e67fcb7a7248ff792813f0cc695a00c649a9420616899e72c7d26d1aa8b98fc47ffffe31dacad968008c8d2c68a56d35b0372e0a985
-EBUILD pybloomfiltermmap-0.3.15.ebuild 629 BLAKE2B 1165f5d42b153e99dc8da3b91431f151aa37f542141d1474d99c2197177353ea8edaa3f59e48edd91a80a2e492a7d9dc94b34fb3321ed0d3987f0ede2ae6da84 SHA512 a119ddf77ddfefabdd063d47c940e4e4b474e844279047cf969a1cdeaadb5e19d148147878484696d5cee4e49c20dd763a9147e3389f01b379d96e46fa473c78
+EBUILD pybloomfiltermmap-0.3.15.ebuild 625 BLAKE2B e3747350668d2939298d2e9878b715485309639bedf6785834173737294407698f4d06af9d2f1ee21b536ab9ff9827a9791ca3d6d384e46f00b76480ad1c087c SHA512 57329c25dc147ce21f5f42da1594f53b049f7c8d37db67f6cb6c26384c01ef1cf8f5dbe55934dc27f82bb1383694ac4a522a0420eb41ab3b0934e2f02e317a3e
 MISC metadata.xml 248 BLAKE2B a94be11b599bc6cbb04189c01022a88c58b8edaaeff79568edabe3fea49173f82537d3d495982343cf0deac5b6551c480f4bafd0dc629057328e96285730bbd9 SHA512 e83bde93e79baa95018fa49df49461ea3c84313095099040492ed43c9eb5136fdd173564123ac69a8cd9bf6f591267a405a01ffb11eb46b7f04bca8da78bf6f6
diff --git a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
index 9ddb44c2c3be..72aadb37665d 100644
--- a/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
+++ b/dev-python/pybloomfiltermmap/pybloomfiltermmap-0.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/pybloomfiltermmap/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pycapnp/Manifest b/dev-python/pycapnp/Manifest
index 195861bfa80a..b21dc231647d 100644
--- a/dev-python/pycapnp/Manifest
+++ b/dev-python/pycapnp/Manifest
@@ -1,5 +1,8 @@
+AUX sdist.patch 437 BLAKE2B 772ad2962f35c470496d2d13ccababa442183e12df2274c207bc9944e889c14aa72c27c90512dcdda7941ebe68324f706ffd033a39fff2e89ae0f757becdcb28 SHA512 1036fa52cc7df49740d9c4cb06f4fbdce52c2de9181d44559ef4182e6f469d0236bc8d0103576516826b78a0e1d6a841a89d15e1b2283a8fd2099b205fc0b222
 DIST pycapnp-0.6.2.tar.gz 455092 BLAKE2B 5cdffde0a88398328f6e6908caf4ea2c3626a4a4d47100973a2bb3ae0e10406734354e40afe60f7d4861c79534e05bee6aeecfee4ffeca50ef7e24101ca4a08d SHA512 6656ce4a67e38fc301fb4dd7e80daea3a7551e01589b11c8fd7aea0d4af7638387fecd712c968f549ff596bf64caca6bdf7add20fbd14396a92e49ac3ce47188
 DIST pycapnp-0.6.3.tar.gz 455075 BLAKE2B ad4ccb7e4c83ed686a419ac97652b50853e4377a4d59579fd276b89c60c7f2a0235c73da711288ca4843c5277925dedab8bd4ddaa4d84e8615d9aeed325521fe SHA512 e125af41d46ca32f94cf548b778f554587074ee59993f4a5bf243b66650976c2c219ca572094daa51f3718272dd9e3529e27bda85dc52d2a644ead8e16b6e02c
+DIST pycapnp-0.6.4.tar.gz 531404 BLAKE2B 035e0f37292275af8d5e292cb98f85f3d40ffe6284c0defecdb6d0c79afac97e4570e0042c0be6716a992ab904b844c9f046c5795b97cd8b7dd7625af1b2b219 SHA512 3f2c9d93bcf226fb39ef233b8b5fbc86af73d796986e82b897a571db5d8223fb4f65cc28a8bf4ed57b787b6e5defdca70388ac865f036daff48d6d6f93cbbfc3
 EBUILD pycapnp-0.6.2.ebuild 632 BLAKE2B 59a2b92092b4a432a2fb4318705c00cd4cd75cfffac548ed7789be527553ea532288038d46152ee95514fcabe4346b8c7cea5a66033d513d2aeb9e557855de1a SHA512 db976db02a0a39e2e303cfa7c358ff9f26492eecff886b9592255f46bdf816382a42afef06c144d34544185f33bed59e48a49da5037c11617dd67be35819c885
 EBUILD pycapnp-0.6.3.ebuild 632 BLAKE2B 04acbdc34e242a55d652c1cae625a98dc1d2ac2767a86fee29d580e96c26c0aebca3189121b1db41d1b8b949f58f9c6499fb3be22393b4120b1bbccc0e4b8f34 SHA512 61ae68d9bd273e235d1fa46744470d0c3042189ac59bf02608579dd6f4dcc7b77028633678d0b537bb1bb265704f3bdfb279b19debf3d43b675608d5d9dd4334
+EBUILD pycapnp-0.6.4.ebuild 806 BLAKE2B aba2ce0378cc738f117911c2442c4232404bb58da747a46f041285fabe590d0097642b142a17e1e22170961f316109373573f7b03a1a0e92d1a059475f62fbbe SHA512 3c129e6df55d758918b572d0876aa227de9e0b724b377f3d440b7b72c227a6876e6eb1c5f8c7b292fdc090dac79b5b776f0dde1e4fd5d49b80e22cf6df0aafd5
 MISC metadata.xml 514 BLAKE2B 0294a7ef4293cdef64d7a287cc824e81b4c22b75ea1e7c2f770c756a56c5c251610e006bf63a28b549527b99b9cc958a5535d43a1c822d9ad724c45f1113e5bd SHA512 10bc088e1650bfa18b74023ba1cd5fd78618051febe89be2756ba0aa706cd695ca98548096392a60a38c94ab168660f347c6e73e2789c32acf7eb927de7d2923
diff --git a/dev-python/pycapnp/files/sdist.patch b/dev-python/pycapnp/files/sdist.patch
new file mode 100644
index 000000000000..e4ef16ec5699
--- /dev/null
+++ b/dev-python/pycapnp/files/sdist.patch
@@ -0,0 +1,13 @@
+Index: pycapnp-0.6.4/setup.py
+===================================================================
+--- pycapnp-0.6.4.orig/setup.py
++++ pycapnp-0.6.4/setup.py
+@@ -49,7 +49,7 @@ try:
+     changelog = '\nChangelog\n=============\n' + changelog
+     long_description += changelog
+ except (IOError, ImportError):
+-    if sys.argv[2] == 'sdist':
++    if len(sys.argv) > 2 and sys.argv[2] == 'sdist':
+         raise
+     long_description = ''
+ 
diff --git a/dev-python/pycapnp/pycapnp-0.6.4.ebuild b/dev-python/pycapnp/pycapnp-0.6.4.ebuild
new file mode 100644
index 000000000000..2eb401e85b86
--- /dev/null
+++ b/dev-python/pycapnp/pycapnp-0.6.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapping of the Cap'n Proto library"
+HOMEPAGE="http://jparyani.github.io/pycapnp/ https://github.com/capnproto/pycapnp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE=""
+
+RDEPEND=">=dev-libs/capnproto-0.6:="
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/sdist.patch" )
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# regen cython files
+	rm -f capnp/lib/capnp.cpp || die
+
+	# Need c++14 for capnp 0.7
+	sed -e 's/std=c++11/std=c++14/g' \
+		-i setup.py \
+		-i buildutils/detect.py \
+		-i capnp/*/* \
+		|| die
+}
diff --git a/dev-python/pygresql/Manifest b/dev-python/pygresql/Manifest
index 1c24d1e147b5..4906e0ab1c58 100644
--- a/dev-python/pygresql/Manifest
+++ b/dev-python/pygresql/Manifest
@@ -1,3 +1,5 @@
 DIST PyGreSQL-5.0.4.tar.gz 637569 BLAKE2B 3f7bddb8b5e455ca4f181d254d4d125b89a64d7aaa1440b9ab5d916c395b9d93fc9814269992c134b6fd8a81f436752dbe4d7c06125e683a5257361d428c6a6f SHA512 f177ca3b023c007dafe80369b86a1742ff334137e493c3c19ac8bda0181d2543cd2431b8ab8d2d43f30d681121324bc4f236a9ebbddf1e927b071db7c9b34ea6
-EBUILD pygresql-5.0.4.ebuild 718 BLAKE2B 9d1729500f651809825cf91647736bd9c6fc096f77755fe5400200adafb9325699be202dc0144cfbc45a573c1c4dfbd75384a16334463ddb1de0e9168bf1c134 SHA512 61c8ccd1da12803cebaf112b453d414df85e035ebee4d909ab3deecd8402df206a11361a22badf9a5d752503e37faa29b5f998ba8c7c60db8b3f918c397410dc
+DIST PyGreSQL-5.0.6.tar.gz 648481 BLAKE2B 7e1d96b5c09a3d2f0e412504be27fcfa557804ace8a4c24d657f586a8e647f5001da943543d49f6d2bdec48a34017b7379305fb760436065ba7f36ce981d85c2 SHA512 fb42f462d749f824f52dd424464ecc3591e615e7e0d220a63a217797aeb3f05379fab071480946d09779dbdb9028351a596160989066589dde1be18f7d320ac8
+EBUILD pygresql-5.0.4.ebuild 714 BLAKE2B 9365cf32ddb6a06926680bb38ecb93de0d1061e2955978b7d3adac5fbe4c0161e712ab73f577afe2aa0cadb16fd2c6432712b485c9bb30831778a431777a2415 SHA512 9a08e9e54ed38286f4ad3004baa36be5ca1f0b54dd0181ced529a301dd4aa7a6b42e9dc75ab1afec18c2849f1936670fd86b9a426dbc2e9bae507d85e5aea7b8
+EBUILD pygresql-5.0.6.ebuild 685 BLAKE2B 2796a98d19d8941e40bf58288bd956c33556abe45fea2840db4208fd99f6ad43b75e3303511c7544909edca69be797d8ff58f95ae8f6d092f058f5643732c3b2 SHA512 32606c0aa6dcf66f8d9f8582eada44f2e5fa1cc990784f236122a33ec826f744b9bb03720dc3d588ca47eab0f6266f9d262966c39acf265b37e47a3a51e3efa3
 MISC metadata.xml 452 BLAKE2B 8d60fd06e68e39b5d373f30fec25979a0a67c51eee216425e382b559b908ccd12e425c95995dfd28d8487fb306f03fa10d8a71320a4ff5ebd6349e887af624e9 SHA512 f6877e2fd8cb2b6606a29e421d0f0ab4fd66a5e7446a4307718d1c0435c2e8ab3c59db795ca1e18e58eb79d0474c57bf35a3d0544095d2d7d618cf25e96ff55f
diff --git a/dev-python/pygresql/pygresql-5.0.4.ebuild b/dev-python/pygresql/pygresql-5.0.4.ebuild
index 02d9d5b7bc8d..dd8ec73329cd 100644
--- a/dev-python/pygresql/pygresql-5.0.4.ebuild
+++ b/dev-python/pygresql/pygresql-5.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 REQUIRED_USE="${POSTGRES_REQ_USE}"
diff --git a/dev-python/pygresql/pygresql-5.0.6.ebuild b/dev-python/pygresql/pygresql-5.0.6.ebuild
new file mode 100644
index 000000000000..1647a3dc50ca
--- /dev/null
+++ b/dev-python/pygresql/pygresql-5.0.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+POSTGRES_COMPAT=( 9.{3..6} 10 )
+PYTHON_COMPAT=( python2_7 python3_{4..7} )
+
+inherit distutils-r1 postgres
+
+MY_P="PyGreSQL-${PV}"
+
+DESCRIPTION="A Python interface for the PostgreSQL database"
+HOMEPAGE="http://www.pygresql.org/"
+SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tar.gz"
+
+LICENSE="POSTGRESQL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="${POSTGRES_DEP}"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+	local DOCS=( docs/*.rst docs/community/* docs/contents/tutorial.rst )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pypy-bin/Manifest b/dev-python/pypy-bin/Manifest
index 5178197f6b5b..11974a6c8331 100644
--- a/dev-python/pypy-bin/Manifest
+++ b/dev-python/pypy-bin/Manifest
@@ -26,9 +26,22 @@ DIST pypy-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5979890 BLAKE2B 8f47c34f88b7f4
 DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.ossl11.tar.lz 5940234 BLAKE2B ba4133f9c261c7b8d7c3a5c04de61398f48c1d34d146009535c5445dd8abab17e914fa675c6c9f4717cafb1be5ee8defcb6d1ecb20cda60223677bf5c2b22db9 SHA512 afe12fcac3a93b8b139a0cbbc5475edd23eceddf3b6e58e5d425459dbc51056ad10459133adee3f7d282c403e881fa0d4d1f9c30955163e580c87be7e1b7825a
 DIST pypy-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5939972 BLAKE2B 86ca6f1dd9f00d993986476fbeb253b2a7efb862dec7c8b90945c32e9418d52460d3d305fd0e182e9351e6de148928cf786f461cb3174601d84f5604ca1ae132 SHA512 4d14693ba0bcf3d6f56c9e8a45959d84ba5aacbccee0a643a8c713569a0e5de1449e726e7c813a93105c8dd145f1be6a7f78eec22bbb5c5a8aba31f15cffdbe5
 DIST pypy-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5941591 BLAKE2B 45a4c150e1403fd5a579c3d452cd09f4954238fff18702c5cafc1b23f12134f07a05c1aa9277b76b5d8c4e1da48d64699a2540feb4000b6bd1c285ab59b6c4a1 SHA512 3a69284917e0c233ac27fd96707b43499a5d9e05da946cad21f89fd605d34483454703887efc1049abeeb1d503800061027794d277123ad874583074203ce3a0
+DIST pypy-bin-7.0.0-amd64+bzip2+jit+libressl+ncurses.tar.lz 13183739 BLAKE2B 41e95be3e48f0b53425ce9777b7bdb998dfbccb054c369cfab9b15f3835649d1520ed6ff6bb746feb96517b608b711678e3efe2cb8b70012c29347cfcbeb144f SHA512 974b438233bb9fbc3d3b9979a4f7591ae9e6b5a36795cd9a86c2a9b45e2288aa478811433b62696e33aaa4f8c9d3579b909554a4bb0a2b53975d01357fdb0b58
+DIST pypy-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 13129901 BLAKE2B 9966e298e25d3a40c78f5d729c61e57c82423dda7415b692179131289bfc64506dc347586b7ef0da3a134398671657d89281e35c217d422a343505492dee0081 SHA512 0c00195abe6481ace527bb0653f6f0df1e3b431246948f76d608dc5ea606a1f7ec9bfc014dff8070047c607648575d29356e44b1768c8fb7d07b50be4feded04
+DIST pypy-bin-7.0.0-amd64+bzip2+libressl+ncurses.tar.lz 7650838 BLAKE2B cded65d6d3791f36f8bb61909555bc85110cbb2550336b2366444217d55ed6c615bbd58d0797048e940bd67dd049df063207bd46858e69c7f1ac70dd6c6eedff SHA512 db2d2aff65662dd1cfa2cf42d9bd588f6d7c6f031608931807435c31b4c2b53277e56b517157e8234b386eab2299c51828980817e3d730d946288571f11ea733
+DIST pypy-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 7652033 BLAKE2B c2a8d54ae2ea6c727ee686d5c2e6b612c940c61ea335596ed8fee0397396a0d7a4344e4e03ebc4f3c50fdf311ea6932b93b7422ad2147c5ea6ec8ac1ff8b7271 SHA512 fc39e427fb1b73136d8786d9f594fa355e8d93cebf01a4f5b319e0506b9d6843ef2332086eca569ff694bfb64a9808eb65c727e96b9c7d998f28cddb35717dda
+DIST pypy-bin-7.0.0-x86+bzip2+jit+libressl+ncurses+sse2.tar.lz 9985530 BLAKE2B da9155481b466ad6f3b28764c01c49fa397a728ec6646727038cccb84fdaac9a5808ed73aecebad7d8e1b436932554e5f65e1078547b96dc82c6e6cc1f4b44b8 SHA512 2c378a47473152e464e2f497f959c1f0bad9f5237d18e83969643e267123d1819c2a551892279800b0b810d6ebea6b0e769f9ee6f2077bee5e92dc3c2c80df3e
+DIST pypy-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 9981851 BLAKE2B 75d89b10e9220c2f8b507529404849d24a88678c0884ce1c8c0254306165c5a6782c4a6efef63228e813a4f42103d7ef33a514dda8726e4ff72c3ff1fbf5f127 SHA512 e09f4f1d7c4e12735d2a4529dc603bcef43c76e97ee6ad7b4505675c7fcdc2bdb3d6550f45b8b731dd7c4f0813ad25a0c503084b4822c44d45e1c6e9aac23171
+DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses+sse2.tar.lz 6050854 BLAKE2B a8fb831c82f7056d30b5ad2c7829be82e282008a5840ba32edea97394819845281825ec88885daafc0097bf11e572ea6021249ca424f00d6133ed274b3fc990f SHA512 3fe84c10c7f8e5775137d154dea45aefd2b101acd10da38f70935fd4cd69000d64656a96f1452c76537dd7297ca45fcfdc5be2b383fd7fdd3ce0d4848c6d0a81
+DIST pypy-bin-7.0.0-x86+bzip2+libressl+ncurses.tar.lz 6010259 BLAKE2B e841ff1809424a06b018d8ca219aa57d6bc0942e2bfdae545bed548efbca0d19e84365d5e9d0fd3324904d9ed8c5e50bee5b87ffa9742af7d23af84abd11ce82 SHA512 1f736593a1ae0c49e6929498a655bf778a826cb104908356c1ce13298c36fbdb55d4a8de0e39571d74d9ff3757815e81249b301983d6d3efa8cdd21497781603
+DIST pypy-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 6023604 BLAKE2B 07a218bffe485e6b39bea2f901a2de473ce7f6e334739bcc8d9fc9aff1e83cd2fd72aeb420a61464e69bfd9eb9468ae8401a597e8b8251bbdeae5b5644dc44ac SHA512 e74a868e6e12e266d75feeeddf4df700eeb84be70d6f259efa1a5effb0c9c0fe5d228c16f5015b2b993540f17e3b2f45644f6b1ba0356dfe71b778358983e2a8
+DIST pypy-bin-7.0.0-x86+bzip2+ncurses.tar.lz 6022022 BLAKE2B 26f7e87cdbafafe956e143bc5b6814ac9db2e1a3a53a5dc7c10ed436192645951e2a4966514081df94fb918b871a15b68afc55289e611fa04339591a81d3f90d SHA512 47a8d1ae2c3ba5caf7b0c08c37b01f7ef7dc3b2fd44ad2f61823305e02cdfac551080b80958bc1dfbe738fd5da960f43a37bec318e2805b8bdf90dac4dfab5b9
 DIST pypy2-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
+DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
+DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
 EBUILD pypy-bin-6.0.0-r100.ebuild 6329 BLAKE2B c2533c30797562a60c8db615279cbf110c3b7756a8ea772da095936fd6125da948d4fe625fb9edccd5c255610287b09280059d3b3c5a324de6030f4dab1b0dab SHA512 644af55ab278e7b4d5441f5dc8adc1b0b91e9b5a901aa32c2eb0979ad290ea5164844e78bb073aa303d9c90847352f158aa9b53da6fac7e39fefbebb79a84356
 EBUILD pypy-bin-6.0.0-r200.ebuild 6493 BLAKE2B 2b6bbfd1ec9f0828ef30765a6e8b1c5f3ac59a296f1b3174136ba74b3010a1727a5032f9ab27d282e453dbdfa9ff8d377d26f7248a1e1b6204dcce43538a58ee SHA512 69d360de30278f0d4048ccd66c604b005a1174b8d46d98c5ebc6782cdc5cc65ece9ee913046230e58ed85f9433a8fd6a8c152f30190bd40f85bf7c3339e25cc6
 EBUILD pypy-bin-6.0.0.ebuild 6277 BLAKE2B 87ff3104c49ddaa0ecdfe85433ab8e258de55487f025dfd849dc48cd6885e4d3365b398a6ec22fa53a71830fbc206bd87270233f355cf903600acd7a0cd0c8e0 SHA512 2158d69a46abb87bea0f7f006ee6ce6a681bada8ca532042416a5d1797e241293988d5070ada0f6cac02ffa822a08397aded11e8009d7c56ef8e7cb9cf4c0bc1
+EBUILD pypy-bin-7.0.0.ebuild 6132 BLAKE2B 44163b8adee7131a76680dd1fdf2b89b0d81eaff8f79454140f26899ab8fa2ff482edd5e95fa906ef5a7c81531dff5322517808312e4c6ea7e0fba7196d2e9c4 SHA512 29db83d245bf9dcc8598998d50c0395758f8d178ae7baf644e5cafc79826bd2bb12e6c67bb35c606117b862d8ade20dff803ac5360b9fe8344c90ee9b9869d4e
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild b/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild
new file mode 100644
index 000000000000..3793bd49daa5
--- /dev/null
+++ b/dev-python/pypy-bin/pypy-bin-7.0.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1 unpacker
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy-bin/${PV}"
+CPY_PATCHSET_VERSION="2.7.15"
+MY_P=pypy2.7-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/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")'
+# pypy 7.0.0: install directory changed to 'pypy2.7'
+SLOT="0/41-py27"
+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/7
+	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/1.1[-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"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy/pypy-c
+	usr/lib*/pypy/libpypy-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+
+	# 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 -p2 "${WORKDIR}"/patches/0011-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
+
+	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=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	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 ../lib/pypy2.7/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
+
+	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/lib/pypy2.7/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 8659d9950308..9a1bb6c05831 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -3,7 +3,10 @@ AUX 4.0.0-gentoo-path.patch 1915 BLAKE2B edc8656d4bed771124c22d45e130aa7ef812ae7
 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-v6.0.0-src.tar.bz2 19741694 BLAKE2B 55f5000e590613b516b12c3682a658fe6a17fbe264be3d61a81698cdf098b39177cf4355eb3f28980209c7a0e005498201cbad8884e3aa02cc86a228d1552046 SHA512 d3bdcd65fc83f2fda3203a604733fe6765049a17cca2715cd6045dc302a6159b4741a821c53fa4c97acf7297cef4c62e941a6a6eb7f8a253a93a28dcf2aa2ca0
+DIST pypy2.7-v7.0.0-src.tar.bz2 19811330 BLAKE2B 38089896934d79d2b3f5813cc9dae23b0534d9d312871b22336a277d5a15b82d748f66f896558cfdb45a23004944a648436e89ae36fadc107930e7b99963e12b SHA512 7fb5682ee4226af51008f50a81c922e44c231410fe36b7656efa20f22c855ba30a01bc96ee897b4c7a02941d37a405c922b09855977313878e34aaad6bf023dc
 DIST python-gentoo-patches-2.7.14-0.tar.xz 13428 BLAKE2B 0048e48ddaaa4bef08451354fde95a123042880f26dddc9267c7f9a90fd8abb40955e26ee8c9dfc5a1165556bb3e11585b27288e635d42a4000dd3d7654c41ad SHA512 6da5b52065752b54e9215d0f0809c75167dc3690d0e94fa21dd7595626925bc5c1dd065d31b3bd696d7087f3986de145d3a335a29eb7bd77442637a7ec2863c1
+DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
 EBUILD pypy-6.0.0.ebuild 8186 BLAKE2B 5f77473fd6044bdf93b23420c3905e55d6b225c63124fac1815563580ba495cd7dc1dee9b402564f541bdf0a2318ccf306219a9b3ced13103bfa729193456e16 SHA512 c99870cbacaa963c3d94ddeb22c2da64c552e3de7d7603205df53c6eccebafbed89a4adfcaa1b2c7a509a7e5a6011ac7435b840690f2a4a1f91782c247a07ccb
-EBUILD pypy-9999.ebuild 8196 BLAKE2B aad05ace0ebe6cfd5bf8227febd78e0f84447890310d8127e27d11d77a97180dfffc1783bc635ccf08d7df278e338ccb08fa1f7ba4b2ac0cf88019c42a1fc18f SHA512 1e30f0f9f8e2879687922c16a433bf9a27eae88e804c725eebbdad8e531956f5a938d00e178de0de31ff5ae2e25360ffee1a9e260f0f3874bafe5032311ab1e7
+EBUILD pypy-7.0.0.ebuild 8032 BLAKE2B efe1f0405e7c67120ccd136b0e80d3ac9a70c0b896a6e28c7e315b4d06505bbd27d4d0334589f19f20341b50bd5e18098b6575de778d9e2ad339a7661977d45d SHA512 1d58b112c831778a7e06c38c8c7eab1138175c39e6e4f8edf6058f4fcb3645ebb6d738480dcb0e7bc1e1a16f915e8f00a94c0be7d60a0fc9220925450c013d27
+EBUILD pypy-9999.ebuild 8042 BLAKE2B bf2dc9a1a2ddc21c649449ceb88d263c3f736f73ac1c04db93914368dabac444ec04e095ac2961e146ea268f3076d939139e618ca00a853e1381ef7c519215b5 SHA512 0b5c6b869a67b0878c7d394d05792f33e0616bb642d1eee6db6deceb00cd4ef1d800e5a5d5e7a725a6db4a6e4a16fbec56c2d4640fd24844d17dc6d384f61361
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy/pypy-7.0.0.ebuild b/dev-python/pypy/pypy-7.0.0.ebuild
new file mode 100644
index 000000000000..b3575616959f
--- /dev/null
+++ b/dev-python/pypy/pypy-7.0.0.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+# note: remember to update this to newest dev-lang/python:2.7 on bump
+CPY_PATCHSET_VERSION="2.7.15"
+MY_P=pypy2.7-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")'
+# pypy 7.0.0: install directory changed to 'pypy2.7'
+SLOT="0/41-py27"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 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}
+	!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}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
+
+	# 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 -p2 "${WORKDIR}"/patches/0011-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
+
+	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=
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+		# no module named 'worker' -- a lot
+		--ignore=lib-python/2.7/test/test_xpickle.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	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 ../lib/pypy2.7/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
+
+	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/lib/pypy2.7/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/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
index 11f050a7d0a6..762e9c5e7e90 100644
--- a/dev-python/pypy/pypy-9999.ebuild
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 pypy )
 EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs versionator
+inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
 
 # 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}
+CPY_PATCHSET_VERSION="2.7.15"
+MY_P=pypy2.7-v${PV}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="http://pypy.org/"
@@ -18,7 +18,8 @@ SRC_URI="
 
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
-SLOT="0/41"
+# pypy 7.0.0: install directory changed to 'pypy2.7'
+SLOT="0/41-py27"
 KEYWORDS=""
 IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 test tk"
 
@@ -104,20 +105,15 @@ src_unpack() {
 }
 
 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
+	eapply -p2 "${WORKDIR}"/patches/0011-use_pyxml.patch
 	popd > /dev/null || die
 
 	eapply_user
@@ -249,7 +245,7 @@ src_test() {
 }
 
 src_install() {
-	local dest=/usr/$(get_libdir)/pypy
+	local dest=/usr/lib/pypy2.7
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy-c libpypy-c.so
@@ -258,7 +254,7 @@ src_install() {
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
 	if ! use gdbm; then
@@ -279,7 +275,7 @@ src_install() {
 	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
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy2.7/site-packages
 	python_export pypy EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index 6c8de7ebf00c..c063a0553231 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -1,6 +1,7 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
 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 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.ffi7.tar.lz 10697120 BLAKE2B 3e368d0fb6b875472d79b531bef926bedddf73c1f2bb25e00f56cd41c4349be119281d2c2d52239bd2769f3f9810280f8c00d9332e02b8664e46de06f2c112d8 SHA512 2e9c405212d35289a8add374cae185bf9096a46604c4e2935f1a58bee51aa756b311e5b611098e917da7fbd10194706fca809249f627b7d4b8c628bf9b38aa54
 DIST pypy3-bin-6.0.0-amd64+bzip2+jit+ncurses.tar.lz 10674209 BLAKE2B f9e00ba0cdc113ebe156212c5497e122a45bc9544cb242ad02273e06210eb691f930aee7faf1d4ed3a7b14080905a9cb6d30b309c38a2c3795f2183750b4469f SHA512 52e615e2b51a43a2c91f9a2a8f0cec16a6090bfd230ef08dda462bb530da9ee66acec9c449e77f299e0b3363d6bcbc7150b14e7adbe9862d36f4738dfc6be1ca
@@ -12,7 +13,14 @@ DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.ffi7.tar.lz 5384351 BLAKE2B 952676b1
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses+sse2.tar.lz 5363942 BLAKE2B d53b89ef73c2d4ee2bc00360a0c4a791fd8b6ac2d28dfeeb7510a465e6302f79c378aacebbaf4993b6ee55dbc6d85876149fe3f5a0d689713f029c928d93a729 SHA512 ce72d84200dd275841e691810dbf402423883b282cacbe8bbdae9285936869d40b3d43d053b0f3d4904c7ced72f35480d1780358180a1c98e8111852fef1f77f
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.ffi7.tar.lz 5384380 BLAKE2B 7e452d0b163f401d0741e95aa2f55e84eb223eb3152f0299b365d1dd53268d315496977d988149c29e0e3439834d7283bfa9a9e05f2d7a8abb3f3d65aa05e567 SHA512 d743c4275abfbce1ef1ae2949e93097faeca8377e38761183ff7d0cc23b92d93700bf370d1511c968743e769a0b41acfeae01543885cc55bef8cdd2c6817af0f
 DIST pypy3-bin-6.0.0-x86+bzip2+ncurses.tar.lz 5366917 BLAKE2B 338a9c221048dabc548250edec05256be64dd5d1aeb5b2fff839d7d5e8dda29e7d4e0a03b1fc0c9cd418685c558bb47598c625e2d28cd4caabc45e21eee9f4f8 SHA512 5274535d01564a9087aea486320921c8784cabcc7bde3634c27b9006988fdc745e6e5e5c2fb8e7b0318fd5ca6fda3fce208743cfa079a7474ea44277237ea873
+DIST pypy3-bin-7.0.0-amd64+bzip2+jit+ncurses.tar.lz 11042296 BLAKE2B 3717c92b3e3a0239c3089cc86434db42725f7e42891fcf5c46f7234aca09a6c693ce662a8bedda4e5a9f646f3266ebd16f25668068d6c1d9df30b6696627ec42 SHA512 5108388bd322c5af4e3d411a4c59a4d8b8b4a75e4ad1e53e90ddd9f76f64868b2c31210d8ac5b0d8222402441ca58c781264742e74e5ff872189ed6c24c2707f
+DIST pypy3-bin-7.0.0-amd64+bzip2+ncurses.tar.lz 6873174 BLAKE2B 6ed19040d3af0dfd6614441e6fb838328b687c44415e1444f27e74f3db4bd3eeb7c077f0cc95cafcacffaabd396d68f6ff481fdfa44f9e6b26f83f1e61e99e30 SHA512 dbdd3e6a21b4553060804eef1036698324743e5eeb4b9e2933785f93871a750ae98daf5a1ef7061238d6161a6df8d18c590b88dcd0ea97ae4ab742aa4df7dbd3
+DIST pypy3-bin-7.0.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8484244 BLAKE2B d23b84aa9f045e46c2461a4d26383e4fcd0c33283f54e11d0693faafec2d3792039534c9a93b418cb78f3e4d45b98f1377cd0555a20ccb2fdce5b9b2e17a133d SHA512 4c90ee87585a448466883aa47ebd4a3f92438d54fceb6cf752fd638746f1c0f2ab7a3145b310555ab19ba53838352523e981485904c4092bc457c7002931ab59
+DIST pypy3-bin-7.0.0-x86+bzip2+ncurses+sse2.tar.lz 5529689 BLAKE2B 038ad3c9132d430268dad3ae7b1c2b6ca507743f3b2f7a3aef8b7aaa580b070287767878d2b528297c152ecd0a440aaa6a47e32f7aa5400bfda2703302c583fe SHA512 8932dbdf49f7a227e9108bcfd0e7136cd1287b036eee7665bf16868a0e322ca841eb6daa6a18b8a57e4184b8878abd20de9616f90845c0dc76d5382f7f53f3a3
+DIST pypy3-bin-7.0.0-x86+bzip2+ncurses.tar.lz 5537714 BLAKE2B 49cdf63c1f94899ec4642d395dbf8ae6fe44fe9fc46e7f64b31e30d20f9e1dcc5d40b511d582f6c902724f5629e7b3b8e1090d76a3bb1a789b32b1c29b533e87 SHA512 42c8afa8fea5474d5b2c7c7192b2a79d8a3eb8d832038aad68edb011c056d6efb3903e67084f423ff167b1757804a5d796fddfa6f6f077966c855a1e56eba9cc
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
+DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
 EBUILD pypy3-bin-6.0.0-r100.ebuild 5574 BLAKE2B 8cfade201d213feccfd71ba3ea86afe43c7a659a9fc3a2fab7f584f5e05052a4bf07ba8539484bf135daa96623a816ec704420aa305fafcf803655ef07eaa425 SHA512 7b5fb47a68cf3b9c64ae0cc6ae5309b671dea4d8fce026c16240652d0778ebe0bc76f2fce34686c0a29f9c91f8b3e6aa9c5a864b4d9273a864fbf98805a45894
 EBUILD pypy3-bin-6.0.0.ebuild 5547 BLAKE2B 27f7df0cb40c23e17bf1bca4d350f42fd5583a4c034cf79b8b6e213137089f1254c38f90a81976a194ca908c9046219646b4326a4bd1acfdaabfd67b275cd215 SHA512 23523b49c740d09b4e871e8ecfbf72e40a929be0500153398aadaaf8b17ee9ef92f3d03e8b3ef7d189ad2c377e4ef03dadc4d68716fe36e797c0f360a19962e8
+EBUILD pypy3-bin-7.0.0.ebuild 5340 BLAKE2B dda984bfaa5ca268e539034266c13a51d3bd81b26ab2105a641eb025b629938f22e13ebad361fe392616b7c2db2f794f32567d2aff8debd8b65ba74252e7b82a SHA512 d4dc638ce51d931e33d53a66e9b352cc431b0c085ec17f6a96557f4834ff87aac7df80986a9f4ed6c27cf24e8f894343fb09047440dd698b362429a3bf2e8d8b
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..a9099e5c9dc3
--- /dev/null
+++ b/dev-python/pypy3-bin/files/7.0.0_all_distutils_cxx.patch
@@ -0,0 +1,347 @@
+From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0
+
+https://bugs.python.org/issue1222585
+---
+ lib-python/3/_osx_support.py                | 10 ++--
+ lib-python/3/distutils/cygwinccompiler.py   | 21 ++++++--
+ lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++--
+ lib-python/3/distutils/sysconfig_pypy.py    | 34 ++++++++++---
+ lib-python/3/distutils/unixccompiler.py     | 54 +++++++++++----------
+ lib_pypy/_sysconfigdata.py                  |  1 +
+ 6 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
+index 13fcd8b8d2..0525be1cbc 100644
+--- a/lib-python/3/_osx_support.py
++++ b/lib-python/3/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
+index c879646c0f..a6157fbd5f 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
++++ b/lib-python/3/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
+index 573724ddd7..0a04f33a86 100644
+--- a/lib-python/3/distutils/sysconfig_cpython.py
++++ b/lib-python/3/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
+index bf1748e300..70dfd72a1a 100644
+--- a/lib-python/3/distutils/sysconfig_pypy.py
++++ b/lib-python/3/distutils/sysconfig_pypy.py
+@@ -145,36 +145,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -183,13 +199,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
+index 32030ed150..1db3d5498b 100644
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
+index 2ceafe80bf..ee3f802c41 100644
+--- a/lib_pypy/_sysconfigdata.py
++++ b/lib_pypy/_sysconfigdata.py
+@@ -15,6 +15,7 @@ build_time_vars = {
+     'CFLAGS': "-DNDEBUG -O2",
+     'CCSHARED': "-fPIC",
+     'LDSHARED': "cc -pthread -shared",
++    'LDCXXSHARED': "c++ -pthread -shared",
+     'EXT_SUFFIX': so_ext,
+     'SHLIB_SUFFIX': ".so",
+     'AR': "ar",
+-- 
+2.20.1
+
diff --git a/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild b/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild
new file mode 100644
index 000000000000..820cb2321a3a
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-7.0.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Test runner needs Python 2.
+PYTHON_COMPAT=( python2_7 pypy )
+inherit pax-utils python-any-r1 unpacker
+
+BINHOST="https://dev.gentoo.org/~mgorny/dist/pypy3-bin/${PV}"
+MY_P=pypy3.5-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of Python 3.5 (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"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+SLOT="0/71"
+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/7
+	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} )"
+
+S=${WORKDIR}/${MY_P}-src
+
+QA_PREBUILT="
+	usr/lib*/pypy3/pypy3-c
+	usr/lib*/pypy3/libpypy3-c.so"
+
+src_prepare() {
+	eapply "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	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
+
+	pax-mark m pypy3-c libpypy3-c.so
+
+	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 -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.5
+	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 ../lib/pypy3.5/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
+
+	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/lib/pypy3.5/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 7e5d5687acbf..9d6831e55786 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -2,8 +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 5.9.0-shared-lib.patch 826 BLAKE2B 745ad99f5fbcf63abce99104147f0169178d8409f1fe09b3016e43a572ce6f7db2f27b895690d3920d1f14d07a8055050a51a636df0fc5bb04c9cb473aaf6b73 SHA512 96bd8c55f7014e9421c8f648922f63f9a7c4a1b2791c733e6807ef28e83d8fcf7eb0b84a3d844e66f864634241301e5c115fab4378a6f63c7027b02ac4b95945
+AUX 7.0.0_all_distutils_cxx.patch 16381 BLAKE2B 776394aa16d35563d56677ed956d107933ce954ae470db55dec44b3f9a054203b93e2d43ae0aee4388b664cb83013a7e67cd787ef8e464dce440ce702624a9d8 SHA512 6fb7b0a0fc9bc552f78460de2ee5867c8a4ca11c4254572ffebae3db92829572091bfe3f46f99c1188a28827bb4ea5bde8b9efbb285cc64608a4f21875d74d14
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3-v6.0.0-src.tar.bz2 22648140 BLAKE2B b8678859b0c24494788ddf6f410a3ec1a56a04663452e1aba25d3f41c5073a95866d1623f00cb1a6c9d0256df728fa60d1edb5b58d26c0d88577769cc8a6205d SHA512 ea406c4dd1837a6ab13026de01330790f3c18f6e2bfb83e8553e52acf78b43dfb559ce75c2d91395055c771db359356c8183ed950da6f01a21bf09128935af5e
+DIST pypy3.5-v7.0.0-src.tar.bz2 22730690 BLAKE2B 312aea1f88303b225bbfa5e82a28d3c2893d9977b03a3fd12923db15c4a77f04ec3fbce947f0684c4e27073836583ef8a5eaf5be05612e564172170740c2a6e3 SHA512 3facac26e06e254cbf244841824b35ec211859123f6ba9f095dc980292c10d9cf1d11de62cc6372cf77e92ee1cd2358bbd794b3ff25cb7172e1b21c02c8ce6c2
 EBUILD pypy3-6.0.0.ebuild 6921 BLAKE2B ab3d2be852a4687f570f9eb5aac9c04679c5f23fa01b4fd41932fff060307c81fd8b1627aafd9e9a905473ed9bb408accda15611d3377c11c4d8fe008a42bda9 SHA512 b0e217e44bcc83566ffe7bc0bcdecc76e86103abe9fd7fa268b5370915ba3f929963bdce600ddd9857cc66936da4452aeb6aabcabfdefb87606ff645378e34b1
-EBUILD pypy3-9999.ebuild 7510 BLAKE2B f76a8d31d84391fbd6026bf57c2e7d9b75a33ea5bd8096db3935d03483acd1f41461d0da131497ea574d6ff64538311bf514ee7de9d1fa686bd4a76b934d9de2 SHA512 4c25f0cc9e328fc28cb4e9e4acfecc2e33b1bb7366c10dfb1ce9b7a9d405982ebe03ff7c05f6458550d460ab5b73d3c60c8f44b96257218cc7ecdc9955691cb5
+EBUILD pypy3-7.0.0.ebuild 6712 BLAKE2B f57125d598cbf08d354b2aa58196868d3cfa20d94d33f85519b5430fb37436a3a58686319d9553744e173bc82b09995f6a6e05842bcf4bb08e863f53d1283ae6 SHA512 2b3e715387bdf7c468791e9367235b00ecf50d45e2d1b20bf203f167b39af8605adc1f5184570db098f80db458a98ef29d3817d70bbb59c88be5d4f7ca7650ae
+EBUILD pypy3-9999.ebuild 6762 BLAKE2B 7113f6af1d63398cc2b989106146d1fa5e0fcf8705badc740e8a304482372d901969cd832ff19b97568acc63cf003e848980c4cbac7f374003f198def348a373 SHA512 e069ac6144fb99f11e38355aedeb46a8140033382de752ec070ad1ed4b36711c62cdbb9e969d1a9eaf21e909a1b6f9ea035a3863c659c2b7d5be885394c10c4b
 MISC metadata.xml 636 BLAKE2B da5771ec2ee59ac934959f6e72c5aee2225ee2d88e2c4c5d6acfae95b9652c973160ed0ea29f0f6143d25a249944925ef157693979871863c04a483da972bd7e SHA512 c52d59231928b12da09c2c7149afbb852ceaf1342a2747d85493c9abc15b8d68fd24495349e583aee5cea18799bd4dada3943bc523a4e18745e2036446cd0841
diff --git a/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch b/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch
new file mode 100644
index 000000000000..a9099e5c9dc3
--- /dev/null
+++ b/dev-python/pypy3/files/7.0.0_all_distutils_cxx.patch
@@ -0,0 +1,347 @@
+From 5c396fb8b644e5de82d9b54cdb088ea673e16e14 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 25 Apr 2017 17:42:33 +0200
+Subject: [PATCH] Fancy distutils C++ support, rebased for PyPy3.5/7.0.0
+
+https://bugs.python.org/issue1222585
+---
+ lib-python/3/_osx_support.py                | 10 ++--
+ lib-python/3/distutils/cygwinccompiler.py   | 21 ++++++--
+ lib-python/3/distutils/sysconfig_cpython.py | 25 ++++++++--
+ lib-python/3/distutils/sysconfig_pypy.py    | 34 ++++++++++---
+ lib-python/3/distutils/unixccompiler.py     | 54 +++++++++++----------
+ lib_pypy/_sysconfigdata.py                  |  1 +
+ 6 files changed, 100 insertions(+), 45 deletions(-)
+
+diff --git a/lib-python/3/_osx_support.py b/lib-python/3/_osx_support.py
+index 13fcd8b8d2..0525be1cbc 100644
+--- a/lib-python/3/_osx_support.py
++++ b/lib-python/3/_osx_support.py
+@@ -14,13 +14,13 @@ __all__ = [
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
+diff --git a/lib-python/3/distutils/cygwinccompiler.py b/lib-python/3/distutils/cygwinccompiler.py
+index c879646c0f..a6157fbd5f 100644
+--- a/lib-python/3/distutils/cygwinccompiler.py
++++ b/lib-python/3/distutils/cygwinccompiler.py
+@@ -125,8 +125,10 @@ class CygwinCCompiler(UnixCCompiler):
+         # dllwrap 2.10.90 is buggy
+         if self.ld_version >= "2.10.90":
+             self.linker_dll = "gcc"
++            self.linker_dll_cxx = "g++"
+         else:
+             self.linker_dll = "dllwrap"
++            self.linker_dll_cxx = "dllwrap"
+ 
+         # ld_version >= "2.13" support -shared so use it instead of
+         # -mdll -static
+@@ -140,9 +142,13 @@ class CygwinCCompiler(UnixCCompiler):
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll_cxx, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -166,8 +172,12 @@ class CygwinCCompiler(UnixCCompiler):
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -302,9 +312,14 @@ class Mingw32CCompiler(CygwinCCompiler):
+         self.set_executables(compiler='gcc -O -Wall',
+                              compiler_so='gcc -mdll -O -Wall',
+                              compiler_cxx='g++ -O -Wall',
++                             compiler_so_cxx='g++ -mdll -O -Wall',
+                              linker_exe='gcc',
+                              linker_so='%s %s %s'
+                                         % (self.linker_dll, shared_option,
++                                           entry_point),
++                             linker_exe_cxx='g++',
++                             linker_so_cxx='%s %s %s'
++                                        % (self.linker_dll_cxx, shared_option,
+                                            entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+diff --git a/lib-python/3/distutils/sysconfig_cpython.py b/lib-python/3/distutils/sysconfig_cpython.py
+index 573724ddd7..0a04f33a86 100644
+--- a/lib-python/3/distutils/sysconfig_cpython.py
++++ b/lib-python/3/distutils/sysconfig_cpython.py
+@@ -173,9 +173,12 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+@@ -190,19 +193,27 @@ def customize_compiler(compiler):
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -211,13 +222,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/sysconfig_pypy.py b/lib-python/3/distutils/sysconfig_pypy.py
+index bf1748e300..70dfd72a1a 100644
+--- a/lib-python/3/distutils/sysconfig_pypy.py
++++ b/lib-python/3/distutils/sysconfig_pypy.py
+@@ -145,36 +145,52 @@ def customize_compiler(compiler):
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         if 'CC' in os.environ:
+             newcc = os.environ['CC']
+-            if (sys.platform == 'darwin'
++            if (True
+                     and 'LDSHARED' not in os.environ
+                     and ldshared.startswith(cc)):
+                 # On OS X, if CC is overridden, use that as the default
+                 #       command for LDSHARED as well
++                # Gentoo: s/OS X/every system/
+                 ldshared = newcc + ldshared[len(cc):]
+             cc = newcc
+         if 'CXX' in os.environ:
+-            cxx = os.environ['CXX']
++            newcxx = os.environ['CXX']
++            if ('LDCXXSHARED' not in os.environ
++                    and ldcxxshared.startswith(cxx)):
++                ldcxxshared = newcxx + ldcxxshared[len(cxx):]
++            cxx = newcxx
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -183,13 +199,17 @@ def customize_compiler(compiler):
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+diff --git a/lib-python/3/distutils/unixccompiler.py b/lib-python/3/distutils/unixccompiler.py
+index 32030ed150..1db3d5498b 100644
+--- a/lib-python/3/distutils/unixccompiler.py
++++ b/lib-python/3/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@ class UnixCCompiler(CCompiler):
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -125,12 +128,19 @@ class UnixCCompiler(CCompiler):
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -188,22 +198,16 @@ class UnixCCompiler(CCompiler):
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py
+index 2ceafe80bf..ee3f802c41 100644
+--- a/lib_pypy/_sysconfigdata.py
++++ b/lib_pypy/_sysconfigdata.py
+@@ -15,6 +15,7 @@ build_time_vars = {
+     'CFLAGS': "-DNDEBUG -O2",
+     'CCSHARED': "-fPIC",
+     'LDSHARED': "cc -pthread -shared",
++    'LDCXXSHARED': "c++ -pthread -shared",
+     'EXT_SUFFIX': so_ext,
+     'SHLIB_SUFFIX': ".so",
+     'AR': "ar",
+-- 
+2.20.1
+
diff --git a/dev-python/pypy3/pypy3-7.0.0.ebuild b/dev-python/pypy3/pypy3-7.0.0.ebuild
new file mode 100644
index 000000000000..c318a1f521a0
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.0.0.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+MY_P=pypy3.5-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/71"
+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(+)]
+			)
+		)
+	)"
+
+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}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
+	eapply "${FILESDIR}"/5.9.0-shared-lib.patch	# 517002
+	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	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
+
+	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 -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.5
+	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 ../lib/pypy3.5/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
+
+	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/lib/pypy3.5/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/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
index 9aabe19e3d37..3b0362d0252f 100644
--- a/dev-python/pypy3/pypy3-9999.ebuild
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # pypy3 needs to be built using python 2
 PYTHON_COMPAT=( python2_7 pypy )
 EHG_PROJECT="pypy"
 EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
-EHG_REVISION="py3k"
-inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs versionator
+EHG_REVISION="py3.5"
+inherit check-reqs mercurial pax-utils python-any-r1 toolchain-funcs
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language"
+MY_P=pypy3.5-v${PV}
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.5) language"
 HOMEPAGE="http://pypy.org/"
 SRC_URI=""
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-SLOT="0/60"
+SLOT="0/71"
 KEYWORDS=""
-IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite cpu_flags_x86_sse2 tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox sqlite tk"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	virtual/libffi:0=
@@ -47,8 +49,7 @@ DEPEND="${RDEPEND}
 		)
 	)"
 
-# Who would care about predictable directory names?
-S="${WORKDIR}/pypy3-v${PV%_*}-src"
+S="${WORKDIR}/${MY_P}-src"
 
 check_env() {
 	if use low-memory; then
@@ -91,17 +92,12 @@ src_unpack() {
 }
 
 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
+	eapply "${FILESDIR}"/7.0.0_all_distutils_cxx.patch
 
 	# 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
 
@@ -111,32 +107,12 @@ src_prepare() {
 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}
+		--jit-backend=auto
 
 		pypy/goal/targetpypystandalone
 	)
@@ -197,7 +173,7 @@ src_compile() {
 #    "resource": "_resource_build.py" if sys.platform != "win32" else None,
 #    "lzma": "_lzma_build.py",
 #    "_decimal": "_decimal_build.py",
-#    "ssl": "_ssl_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 )
@@ -228,7 +204,7 @@ src_test() {
 }
 
 src_install() {
-	local dest=/usr/$(get_libdir)/pypy3
+	local dest=/usr/lib/pypy3.5
 	einfo "Installing PyPy ..."
 	exeinto "${dest}"
 	doexe pypy3-c libpypy3-c.so
@@ -237,16 +213,15 @@ src_install() {
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
-	dosym ../$(get_libdir)/pypy3/pypy3-c /usr/bin/pypy3
+	dosym ../lib/pypy3.5/pypy3-c /usr/bin/pypy3
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \
-			"${ED%/}${dest}"/lib-python/*3/test/test_gdbm.py || die
+		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.py \
+			"${ED%/}${dest}"/lib_pypy/_sqlite3* \
 			"${ED%/}${dest}"/lib-python/*3/test/test_sqlite.py || die
 	fi
 	if ! use tk; then
@@ -260,7 +235,7 @@ src_install() {
 	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
+	local PYTHON_SITEDIR=${EPREFIX}/usr/lib/pypy3.5/site-packages
 	python_export pypy3 EPYTHON
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 09b3d004d5f0..fd9155dbc801 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,9 +1,8 @@
 DIST pysnmp-4.4.4.tar.gz 436318 BLAKE2B 6e6616a79fc15d457b8da2e2260c65d9d8ef29888c033d80f2f47c8de035d0cff73dc4be1eeced8ef36dac1301b7da0d845837b780815792f545b6ad18d5496e SHA512 960ac73b7356bb236d3853432c094d3aa86a343f5e211065689e6c784293748ec6f2c1c17bf9d96b4cbe2d9d476ebbacbaff4bed7d86370e5ef61e6f03ba8c0e
-DIST pysnmp-4.4.5.tar.gz 438424 BLAKE2B db989eb9faa0d548c7e58a5e9b7127824f2798c116d27b8885b4920f5e0acf9068ea5ad88e13e8e913e24c0d21d414026f6d733cf680b41e59370c960d856197 SHA512 3164e93a8623512d903c86eebdb6f9fa5ffee29309747df4a836e257e87dc5480cf706ab527e1a8966e80c0626961f6f1b68b60cf07df2ddece305706f5445f2
-DIST pysnmp-4.4.6.tar.gz 434508 BLAKE2B 0613cd115d9b52b12a9e4ca45c0dc6b51a6e8506f5fe4d93641dd53ce61e88f4ed89783692c4220008c345179808bb4a79d4aaf1d828e072d822a0d131204fa1 SHA512 0b53fcb7d266a861b3f8dca228371a7430b5513506b4b7083e112916730cc25311cdef549373271c2da62441a603d3f33e6a1e9417dec3aac074db25fb2be7c8
 DIST pysnmp-4.4.8.tar.gz 435494 BLAKE2B 801d52660af23f9db9fd6e4fbd7b93f06db65d1c4987d44239da0927a116559ba502f295a5ba345529f15a41971a0f407b60266ef0cbcb328476e7e58e3646e0 SHA512 a4b0954a65818e49ce76455ef48c7c363bbc69031b699b303e8e301e7aa5db10ac5042557cc1727e885b200672ba35aef995baadb989cd95aa90e528c7e97e04
+DIST pysnmp-4.4.9.tar.gz 436017 BLAKE2B 4fa4d1cab4e783542164d8bc5313e2b900cad9fec42e3bd6bc37239514d279d849ee857b3c9c01021750773e02ce951da600f5fbf8676efe31c3bdf580b99f12 SHA512 0832abb4134b77d43f6c750ce6c797c976b5fb99ef02602e7aa6034e4524e229eb33ac5d5b086acfb5740893120eb5b17df648dda48decc5d038476270e5fe1e
 EBUILD pysnmp-4.4.4.ebuild 1247 BLAKE2B 4335ac075030075f0651ad238ed7561ff1048e37d43605fb891fcc7e3252a3dba9fff254299e1c86063539fa84c6dcdafc46ea4c3cec59ed4e8bfc03617c42f9 SHA512 4f7b1edb9039b4d3c25fdb590e92658b58bfb3d13147208897fb621bd80f0f2d185aa0d5b126da637fa8046a3a480f3232dec5da6b79addfbcf39d9d55b35114
-EBUILD pysnmp-4.4.5.ebuild 1250 BLAKE2B d29142f5288f773e13b5df43f9442799eebe134d1160ba1e90ef614bbcf9d30af8b3c384bf20fc49b1a0de6493fb56eeff9be9c9bdc55fe1fa8934cd213bff29 SHA512 29af54adf7e4769075772dd06ee3919519aff1afe28ec3c5e8102f01508afc2b3dbe28d78981d867fa1c3256a1e3b9fd1af5ed09bf8edca382cfd394183501b3
-EBUILD pysnmp-4.4.6.ebuild 1250 BLAKE2B d29142f5288f773e13b5df43f9442799eebe134d1160ba1e90ef614bbcf9d30af8b3c384bf20fc49b1a0de6493fb56eeff9be9c9bdc55fe1fa8934cd213bff29 SHA512 29af54adf7e4769075772dd06ee3919519aff1afe28ec3c5e8102f01508afc2b3dbe28d78981d867fa1c3256a1e3b9fd1af5ed09bf8edca382cfd394183501b3
 EBUILD pysnmp-4.4.8.ebuild 1247 BLAKE2B b5428d3ca11e85c91ac206c27430fb5e905e928b69a70479468dcb88f1832b5f5b2c204d4e6b6fcf2f0e5ae48f8dabc230bf3ca124ce34a7f579003d0c0fcbbf SHA512 55864eaa1ca2a56d4443c6f3e3aa62eb79f29b92336a5acf5211dd82affde2f76ff96e2f73601852dbb0b886ee00cd4ef50e7f547cca5fb2d54c8ecdac4490d4
+EBUILD pysnmp-4.4.9.ebuild 1247 BLAKE2B b5428d3ca11e85c91ac206c27430fb5e905e928b69a70479468dcb88f1832b5f5b2c204d4e6b6fcf2f0e5ae48f8dabc230bf3ca124ce34a7f579003d0c0fcbbf SHA512 55864eaa1ca2a56d4443c6f3e3aa62eb79f29b92336a5acf5211dd82affde2f76ff96e2f73601852dbb0b886ee00cd4ef50e7f547cca5fb2d54c8ecdac4490d4
+EBUILD pysnmp-999999.ebuild 1252 BLAKE2B ba19483a048226e1d1600b53f176bae5540d363188755a755b73b1f9cd2a569588a4510a7e738f457b29cad77a7763b62fc3c9b3b5d006c25626261030252d47 SHA512 6b0eaef6b4d41fac681f1aad57558e3f4eb043d1f5bfd276983f49494760431d710aa7fb8b86b16a56d78c9bcf5b9de889213f568912dd4aefd480aadf67506f
 MISC metadata.xml 1567 BLAKE2B bb80fc30033d338354e1b5539aa5afbb23df2ef574a55709f62ef399a67fa7d659fbbad4d3a10120d0a7cf2247e6637127c115deb3741421a73f3222b769d632 SHA512 3ec28aa833cf162493be384e095a4aa440dc9fb19941b5c503d81d1bff83428d5aa8af80dfa24c88055c573c09529c12e3fd4962dba3d171ea8d2e87a7bb7822
diff --git a/dev-python/pysnmp/pysnmp-4.4.6.ebuild b/dev-python/pysnmp/pysnmp-4.4.9.ebuild
index 3d1c8021a0c7..242ffd41f3a6 100644
--- a/dev-python/pysnmp/pysnmp-4.4.6.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.4.9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
diff --git a/dev-python/pysnmp/pysnmp-4.4.5.ebuild b/dev-python/pysnmp/pysnmp-999999.ebuild
index 3d1c8021a0c7..7d9fdd38f8de 100644
--- a/dev-python/pysnmp/pysnmp-4.4.5.ebuild
+++ b/dev-python/pysnmp/pysnmp-999999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Python SNMP library"
-HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://snmplabs.com/pysnmp/ https://pypi.org/project/pysnmp/	https://github.com/etingof/pysnmp"
+EGIT_REPO_URI="https://github.com/etingof/pysnmp"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS=""
 IUSE="doc examples"
 
 DEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 2ea9447410d6..edbba423f5a3 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,9 +2,9 @@ AUX pytest-3.4.2-pypy-syntaxerror-offset.patch 996 BLAKE2B ff6d362d20f6432f73956
 DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
 DIST pytest-3.2.2.tar.gz 786396 BLAKE2B e669da930890e902b0323ec3a6685080ddd889e74655f7b4cb08ec421651f987597021a31471aab5a32d637b99620ce7792cbdf8f85561db3bb10ff06a446ba1 SHA512 6df3a50e7d1efeaf7a283920b16d1daf800798f422bc851b0aacd2bbd5cb0a88c95f9057fae49943b9dfe6527ed552cdf8d983b944ab91d0af252ee4f6eb82db
 DIST pytest-3.4.2.tar.gz 812719 BLAKE2B 96623d6cdea4bd79778175c18c949938505f1862010f700f9a8cb85f445910381af391a5b69e664fbbfc254bf46502c798c72026772070236a0a3bca7aeeb3d6 SHA512 787065ab76d4482799bb2da9f024c9c383e68cc1cc01f3b80f6ed9444ca6383d20953615696ed4dd01668777b094cf5002b23c4ce51828879dcf8ebf2170c71b
-DIST pytest-4.2.0.tar.gz 909527 BLAKE2B 6aa206603e81f21b7e25c1f8ab1a906954f2a08afec4b70fca5ca428aa875fbf0f012ee0122c64e1f592080b24f211cac03809f788456e8419a8928a37d4a596 SHA512 71d77b391a096877597ca5130e5433fd8e41ec764f79acbb9aadd7abe782089067ae025ebf41df379ed8dd0f48d590db64607478e6f3c240fa8a2c91f96c5a95
+DIST pytest-4.2.1.tar.gz 913065 BLAKE2B cde085627872d601df1c6d91d9620fbb97789b6e176fe104bc991faa800268e5e61651e211a8840743b21f8cd9b57dcee8685143e2f4d56d197afae35a577aed SHA512 e41bf7c685cacd62261df6d356911297a65ba85e13a50f8aed23d382d257c4c1cd3213971a3970fec210b8e97b72bd0034c0c1f87be7f306286d541c5ea57097
 EBUILD pytest-3.10.1.ebuild 2223 BLAKE2B d6bf6267602a7e9f94d28ca14846284ec9834dce2036b2313e999aec57d38c30e18b117e60431babadfe96e955e9c3758dd16ac4e660fc9d2d9db782a11ec7b0 SHA512 aa782c5dc1a4920a036da3ef4d3b7f3706ec0774d840b12539e1bcd16372bedea3b5520b42d75589defcb288efcbea778e00adaf6517b11c16a06a6fca82817f
 EBUILD pytest-3.2.2.ebuild 2112 BLAKE2B 5d60971f4ac0e85e21bba987a80e4124b99ddcb2fa92249127f379f1f6c6c9e1b5e59ac5bc6252eaf2fb286a2674e9deb25cb032e4ab3138be7ef9f990d29899 SHA512 b8c78dcb725d879ab6f6b7e3a24dc1305acc2569a2b02169f77b018d68806fe410c6094ae025bab43312ba79447fa1fe9ff6f6c1fdf7354b63fd6cfd9ecd84a7
 EBUILD pytest-3.4.2.ebuild 2524 BLAKE2B 3695b3a275622ec4d09d835829a1d59f6c6e3636d133b2586e63117d32b873e45a41409f112eebbb33608b21ce9cc8e05d37924f1e5237b925ba1f38bcbe5035 SHA512 d51dafd6345671662b1fc16e343885284be3a785328852b6b997512c68a34354fde36677e781dc1a7cc2f5f90c0816cebe92e223370d3b95ae08c4b4c3adf4a8
-EBUILD pytest-4.2.0.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
+EBUILD pytest-4.2.1.ebuild 2143 BLAKE2B e7463180feebbf298729a59f3dee445e066e10cad50e48a2c6a972cda537cd8b2078299a7c8b5f13e4611d122276095840afde9c19e4f3a2e04d000704fd601e SHA512 ce095f5399acdb7e05ef3f80959ad858e49004dd58bce5ce46ce6f61cf49830f9c01a9935ab2763066b86e91898dc9a697ee8078eadff47e8bba4b3482151c1b
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-4.2.0.ebuild b/dev-python/pytest/pytest-4.2.1.ebuild
index ab4d81909734..ab4d81909734 100644
--- a/dev-python/pytest/pytest-4.2.0.ebuild
+++ b/dev-python/pytest/pytest-4.2.1.ebuild
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index c6ec19126538..2e6df4cbd739 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -5,5 +5,5 @@ DIST python-gnupg-0.4.1.tar.gz 44534 BLAKE2B 0b58312b9f094b29f7009bb7a44ea3607be
 DIST python-gnupg-0.4.3.tar.gz 46958 BLAKE2B c83b13f8b36c136ac75e8a69dccb07025be3397284e27d9624677cd76ac8527bed67644be7a00958fdb248772a0c37de09257fb711eb16a2c982dbca0368dbd6 SHA512 9381acb1246b6ceec4de21091f2ce57dba9c6600dfb52ddee181effbd2e749d18935e6b6bb2183816064e9129cd1bb3ebfdd28a5dcddc9be1c56261a501067d8
 EBUILD python-gnupg-0.4.0.ebuild 668 BLAKE2B 997b51a02c0d170687385fd2970af5fa43872d055414e76a3bce2b17d37f39511572b9ace9d97ac94c4ae9e1141fd582df2b3073c9b294e2c73fc5eb3de5054b SHA512 360bae4d63ae2834971f548f00be76065a38f5456e0387fe4fa4810d9b4fc66be0ef2846a5581d92a6890c5e5e18732ae75c375f71863bfac89272702e9bd388
 EBUILD python-gnupg-0.4.1.ebuild 654 BLAKE2B 77e2eb575c2376b94ea96bc0244ac00af0d0c17cd5f7f3ffee1e5a89559dd5c1acd789e75a0a45a51768123040fdbc0b5a1bfb1938b0477874acb5dfe41546dc SHA512 828537af3a81c46752c7ec0af2291cf0f38382bfffcc113c3664f63360783d57c0efe7a6412b0743e2cacdea7eeee8a8602ae7d72ce8c78fe613b16ec95694ee
-EBUILD python-gnupg-0.4.3.ebuild 812 BLAKE2B 1db0342e433a84ede71b2ab854646620c13a757a5766a3f752c72dcf505ea7364d0db9a7574ddefc829d23cfbc34ffcaa09601a34eaef18850d9e0c724b2f800 SHA512 cd5b487747e7341968491f1c85a6c1099bc3aadcd797a83907e033389fb9cecd8128698feca5eb53293919a886b09e4562be9f0d11c52649e994cdc09e37dc83
+EBUILD python-gnupg-0.4.3.ebuild 808 BLAKE2B 9d2b2b910dba851100709ce9aab1de1d834b0dfebbffc84d1e73445bc2ece16ce95a3804953cefddad10a5fd305256005ababde60b6c70be2aa79fc9c44ffe1a SHA512 decd7de01c429e9609ab5b616d09cfa210035d55e6f87414649f13cd4a0bd5075cc0f9c1b17e5cac9822d28d0e95950a5240fdeccb2ea0b7898b3594660f2723
 MISC metadata.xml 645 BLAKE2B 23e7cfc3792cd9aa1c8eac9c52fe3d01076f93880a17f4fd8aed0c6c30d8e00b866a9f3e71664ca08c41d1a8a6ea4a1ef55a01d6b12285ce36aa0654e2a837ba SHA512 77f5c9739da1875f655257da826acdb16e5dbdbac02f5c05ab66a91c842d63b478b26af52901fb6dcb2ab0b6ea19c3ffd09e761ddcb1df0d5e55d25c105fbc65
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild
index 419c69562293..87f2996e9de4 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/vinay.sajip/python-gnupg
 	https://pypi.org/project/python-gnupg/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 LICENSE="BSD"
 SLOT="0"
 
diff --git a/dev-python/python-poppler-qt5/Manifest b/dev-python/python-poppler-qt5/Manifest
index 240165c0b3d3..8a6b2f4d52d4 100644
--- a/dev-python/python-poppler-qt5/Manifest
+++ b/dev-python/python-poppler-qt5/Manifest
@@ -1,3 +1,3 @@
 DIST python-poppler-qt5-0.24.2_p20170214.tar.gz 20676 BLAKE2B 450f1f40618686f393a21bb2f9ae25b71ab31b4270420a278c65dfdad722a7505cab50d17968400304df936f8694a7d2d5aafeac355675756ca70271f3ff666c SHA512 28fbc4584d32ae18a0545beaf2954f89da6aaa5c2d4bbb25dc36996dd5799c38c491254330c5ac12f3a97df33656f1b49bcb672207602031ff37086a08cbb1fc
-EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 770 BLAKE2B 7d6581b6a496fbe192a73d56cf7c9209ca47d9fecb8be3130d140d60fbada8b3daaa899634a6cbc82c6910d758a27ef3cde2420e46bd39eabe6dbf14644d62b3 SHA512 c909934a2f55b2b8a484151b7ec5274bdb54b7811bdbe6b6fd08bb00e8864c66439757367ccec331ca3808c8cb6decb60910e3292884d8b2754f8a31cb0ee482
+EBUILD python-poppler-qt5-0.24.2_p20170214.ebuild 765 BLAKE2B ed6d02121d92bd0986ab64198abc6fb17fcb4c39d597423ff7a2258e1838825fa8076256c61f85ca5b15ce3b90f364d2e4ed8c00d2885e424485278fe3ac321b SHA512 e4bdf9735d92ee0fdbdeeed4bcc7b6649e1781ee87cf1863684bd0ca5a7bd215fe04e64f3daff1102b5f2d2883b7f634396216594976f5e53bca035d8d455644
 MISC metadata.xml 330 BLAKE2B 8ec299c2f0c45f1e6f1c0da00c43ea51ae4b93117b5c1fa29d31692e8b7b553c9f977f54bc379fd01addcd682a2a357670696972e953410972d1cafa670cc1cf SHA512 5ceefef72bdb03860d693c39df292964f2a81f477a872541ec2430062cadd5ec945c9e60ae7b157bdfea804016d3d5aae1ccd19c6fa75a3a86bd9ce3e4f30f14
diff --git a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
index f1567a6ae081..558f311df9e7 100644
--- a/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
+++ b/dev-python/python-poppler-qt5/python-poppler-qt5-0.24.2_p20170214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/wbsoft/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest
index acd5b9811d0f..2b339ca71337 100644
--- a/dev-python/pyutil/Manifest
+++ b/dev-python/pyutil/Manifest
@@ -1,4 +1,3 @@
 DIST pyutil-2.0.0.tar.gz 125079 BLAKE2B cac7ce94671dbb2b4070aac76da2d9f8b3a48640a2422e8f9fd0dbd6a61eee43636b9b8a003ee3c528ffa7e866baf0254c4a2369ba8038c63aa072e2df9556ac SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b
-EBUILD pyutil-2.0.0-r1.ebuild 689 BLAKE2B 3f6d356e13df9d58785f1505e09ef47aee954ca0771168f1bf7e2ad6e7b2cbf9595d7a12401c150c3c6dbe7fe6b810f0d2fef20a59939ecb87f36072daa72d2f SHA512 e5fee0dad5463d923dd71ff2687cd8edfc60c9cbc1432f314a1c4dc38a3568ed5813650780ebcb64b8ec567c6eea303b6c6314bfd1ff10633b5eeb431761abc3
-EBUILD pyutil-2.0.0.ebuild 644 BLAKE2B 47eaca54d26ad3da866e16e369f58de07bd9b206227f5d39f7f42d01fef18c27cccd07c6d772478476a5018c43753139b857788337a50e111c3af172b7f2c228 SHA512 8a6520c84e5f90543f19d4f412fcc3440239747bbb001e43ceedabf0d87f57d472788532ad0e33612d7bfa26258e7fa04b6b9c5f8f9761d6fde4ad2757952d7c
+EBUILD pyutil-2.0.0-r1.ebuild 687 BLAKE2B 954c9d7c146c1eda29e78c0bcceb84d24aee454ef085b74dd15bc44f528e2434b4b8caa45193f8c52603b25f4eff46b921082675a417b2ea31ce5a5c13853678 SHA512 a49da09b13d9e2bf41b02d8aaba92ec8da0c3c26a9ceedcc6d534ef6dfb66d90fd18b8fe9ddb9f229d1d4a162a086d718894da37a2b580b64ca6cdfa0e3270ce
 MISC metadata.xml 744 BLAKE2B 92a7150e6ded208271a22f52fcee0d6402006ee4a71e97236652485aace07d35eaeb4094e6ab9ed6ae197fa91d4f5f6236f4e591ffb1ee3270e22bbbfce1e641 SHA512 a23c7e3e981737b2a5952cf4ae5fb5017e68c68ded1d2e2dc534cfe630aa95dbe8b32c6fc784cb2a5744d66e91131f97a5c201029df04122cb1ac230a0bd0746
diff --git a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
index 26c90066e3ac..333b418acf79 100644
--- a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
+++ b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pyutil/pyutil-2.0.0.ebuild b/dev-python/pyutil/pyutil-2.0.0.ebuild
deleted file mode 100644
index 64fccd9672e4..000000000000
--- a/dev-python/pyutil/pyutil-2.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A collection of utilities for Python programmers"
-HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil/"
-SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	rm -rf "${ED%/}"/usr/share/doc/${PN}
-}
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 29808dcc4f71..c63eb5550ab5 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -3,5 +3,6 @@ DIST recommonmark-33b5c2a4ec50d18d3f659aa119d3bd11452327da.tar.gz 22085 BLAKE2B
 DIST recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz 22249 BLAKE2B 7466fc1448b54c2fd6969fa06e10c11e7bf1f2d772d96d749de9023d60570387a5472c74d660e8bd0722d294dd2ac1dec8d7d6fc49b281eea14b1f9ce423cf94 SHA512 67fa0b13d49d1f6b08e2fa28cf127c6dadb6454329a35e1e1217ff3bc93aff1a1a040740478cfdcab1b72acd939e0a81d7d8638e7ecdcc76e2791ddc33b8f0ac
 EBUILD recommonmark-0.4.0.ebuild 551 BLAKE2B 555de72463a0749dc830a6726750f8697e9e8bbb87adca2cb9c6877964107ede4628fc0fc04943cb47326a49f6c94c680bfc5be7b5863125d959cd85a37d9537 SHA512 65c1bcd475acae52ed68c897c5c6ef0daf9c054591c4e48ed5377474673e8ff3b7ec64354899f495ca2e1532e2007efb571f88e246208f1b30b583cbe329d20d
 EBUILD recommonmark-0.5.0_pre20180907.ebuild 989 BLAKE2B 3984d521869c36ffd02144177c6fc4f2763bbe37731ab38e3c02cbd938d5e29d5febf8b9379f96736cbc72c4f40c5cd07d9e079c5c734818d21be9ee2aada269 SHA512 eb0092326e1c3f7759703b65147d683dcf09b1526701d8a677c4c8744d4f1804cf36fa58b569fb4e54561c0a060323cdb363db6f09a0b2327686ed90f9e6deb6
+EBUILD recommonmark-0.5.0_pre20181012-r1.ebuild 982 BLAKE2B 7114a82ae21591efada3c3ca75be7839570685f53aedd282a6a0993b5147085293be693eb5d3d8e97a4159096c98e3acc51174233668145b7c62ecd99171a655 SHA512 2227ee36142b8c7beba76da7472e0399ee70eba49f57c77172822c0ba5eccf0dd7df7cfd4750819ded5b62dce66464ac5c290d4f33f9db0c331841ef678c4def
 EBUILD recommonmark-0.5.0_pre20181012.ebuild 968 BLAKE2B 39e5821284b5c7eaa23f467f2531e42026961fc8b40f9a5565689ae314b2a47cf9aaf5064ad231b326ef4d3ce3668518ec8874a58cd41a39c44be2bbd85ccc80 SHA512 43bc3f86870bd993b0a250644b3cc8960e20cbdf546c0fd50164fe008c7794d10ef4943724a7026c147df34b7f7965942adbfaeace0a1cdc85793df4e164c951
 MISC metadata.xml 519 BLAKE2B 8ea8a1e90a05ccb7f78d0de5213fb0ab447a8e8d9ebef7011eb4cb237c909d8bac77319282a76e3db32f58ec0dc6d76f6dfbe3c29c4c71c7f93398d91afffc0c SHA512 83dde1b703e097ce74627ad0139fe6cb97de26cd080bf0b191effe61ff8bd6593bf02a98be1e27ee142520142adebb48c4cb13066cb8d2109ecd642785b78c9e
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
new file mode 100644
index 000000000000..1a8cc5b1b150
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+
+inherit distutils-r1
+
+EGIT_COMMIT=fdeeda5f6fe3ed8905deb7a067cc5951a477d091
+MY_P=${PN}-${EGIT_COMMIT}
+DESCRIPTION="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 4123e8e07e2e..682cdb8f150a 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.18.4.tar.gz 126224 BLAKE2B 98ab1fe39832673ea7900029da275e031fc85811d6ddb0f37609ec50b18e17d8a04b6cef397bc626ba13da32e16ffa961626879106941d327694d8763dc1efb6 SHA512 5c59bed82ac1094194f04a973b299f7d783264d372abd7a5229295bccc6b2f7a9f082ee4b0dff348e9c22cf68ddbd7cb67f60fd0b7d9eda41c02e40d075e9472
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 EBUILD requests-2.18.4-r1.ebuild 1410 BLAKE2B fcb5b635943e9a458e75a7fbb67c20eaf25eb2b26b5ab184b5d9ef928e5ee4b99b1e968fbcd6cc1597b0ca5ba9153e75ca0e1e42560ea42251b10e223ee10273 SHA512 87896952b23e4c151a00f5e636a1260dce944b1a67b00a7cf8bc285869608e399eb3a4aad842a79f44ceb5aa095f3cab26679dfec66efca99963a78347dba1e4
-EBUILD requests-2.21.0-r1.ebuild 1465 BLAKE2B 5e8fcc3e5634a0e9f60358f8cbce3d887d7a55707cdc9c5be87adc4d47ee1d813b167c41b652fae56312612330e71eac8cb71c8fdbf30523906aee39e2a916ce SHA512 34f6edb1e629b279f7b9847ea199b5212418a8139f21ccd1a45bf92d0f3b2aa6a32ed44458166bb9b2214cf07a7d60a3c2057cb7abd5d95a39732be06d7d070e
+EBUILD requests-2.21.0-r1.ebuild 1456 BLAKE2B d2ab5e5dbaa95527ae331323b8c25ebd21f5c3833c26b64f3dd9021eef8fcfb5f45150fa5262184d318dec5e78bae81837111298069ec0aba6bfbd4e3483e153 SHA512 1da379c9e725ea6e797f7f521f6dd1d55df31939635088a2794b34e10e0c39d4d55a6428d6802336508f115f639af29865a1753d4521222dc8faa9a49ce4ab84
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.21.0-r1.ebuild b/dev-python/requests/requests-2.21.0-r1.ebuild
index ff17bcee2afc..0202cb06770a 100644
--- a/dev-python/requests/requests-2.21.0-r1.ebuild
+++ b/dev-python/requests/requests-2.21.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="socks5 +ssl"
 
 RDEPEND="
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index d80d525d52d7..7ab865f4a4b3 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,6 +1,8 @@
 DIST rosdistro-0.7.0.tar.gz 60092 BLAKE2B f68dde51a3e6b5efe26608130d3a69536803baad92565c7d7cb25b22f71be4cc8bb3869d72abefa7e4de4446ff7f3f49037e789c39d9ac401fff30dd8d9fc082 SHA512 8def3e3d405483f9cd51dbe82bfbb7605a50d2d14dcd9712e3e93c5c091953df430203b2383d46c1db2248678fbf2b84638328f47a256296c78229b7783e724e
 DIST rosdistro-0.7.1.tar.gz 60093 BLAKE2B b6e16af1b20ccc31a23365e9c74123c6cd2b17b4b522b925e66628cec0608c29bb73ffd22ca21e05f85ea20681b37d1acb95634f652e16e515e4615aec65b1b8 SHA512 cb22d331fc71324de518336b1e3afd8b9e54180b3deae55dedc619aa6308dd5ec0ffe22dfd7e2e8e362bb56b14602db9242a8b81d71f2745c9f94db94aa91ccb
+DIST rosdistro-0.7.2.tar.gz 60091 BLAKE2B 40f2a47fcf5a13d0b8b9eb29fcee9bfbd811a7541dac74e6be76e2c67ba34adf0b7c2df8804300e35262bbb36efa890128e06217c93ecfc834015010e344e42d SHA512 ca6c0d19c2218efe8bf27c1cc22c4c9b683dccb5f8029208e0b581cb358fbe32733895896b1afece45b6576f254f4535032cea962587aa47d93235767c6baf60
 EBUILD rosdistro-0.7.0.ebuild 1038 BLAKE2B a4248c4dd092ddd577e9530db7c264cf31af851f49f077fc0db94cab60ab7b80aa3bb6ec6a3e32552177d2c4c88b196fa0e4556614a9280ca1a92334dd6c2ff6 SHA512 b594386a4db0614524b36f7948d3c1fc8f06fc44c56eb8db4bdb6a828cbb3a59fafde25c968fd9336ef957990be5997f24cb7b88cc8fdd872b094616f20b2b36
 EBUILD rosdistro-0.7.1.ebuild 1038 BLAKE2B a4248c4dd092ddd577e9530db7c264cf31af851f49f077fc0db94cab60ab7b80aa3bb6ec6a3e32552177d2c4c88b196fa0e4556614a9280ca1a92334dd6c2ff6 SHA512 b594386a4db0614524b36f7948d3c1fc8f06fc44c56eb8db4bdb6a828cbb3a59fafde25c968fd9336ef957990be5997f24cb7b88cc8fdd872b094616f20b2b36
+EBUILD rosdistro-0.7.2.ebuild 1038 BLAKE2B a4248c4dd092ddd577e9530db7c264cf31af851f49f077fc0db94cab60ab7b80aa3bb6ec6a3e32552177d2c4c88b196fa0e4556614a9280ca1a92334dd6c2ff6 SHA512 b594386a4db0614524b36f7948d3c1fc8f06fc44c56eb8db4bdb6a828cbb3a59fafde25c968fd9336ef957990be5997f24cb7b88cc8fdd872b094616f20b2b36
 EBUILD rosdistro-9999.ebuild 1041 BLAKE2B 20b6315393af48a04bd289c3627d52ecf126e522dc9b6efed1cad61464f9eee6dfd1da64acff5d7e110bf17666656f3fd4514e5029a953a2bb86829b33ea06a8 SHA512 a73a13b78e9b27103b3efe59c32d64e865a493154b64d76ec0fe916e816755a8215ed22e7acc64f09518f8fb9b2f6051338c487b92e68069dfeec0019a20663d
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.7.2.ebuild b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
new file mode 100644
index 000000000000..df8542c9a22e
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.7.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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="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}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 48ecacefae55..f0357a0367e6 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -3,7 +3,7 @@ DIST setuptools-40.6.3.zip 839328 BLAKE2B ddc87213439ce2ad96ba54218bd5b3e41a7c31
 DIST setuptools-40.7.3.zip 842920 BLAKE2B 53b5845f157d088fa0848384770f185b2daf8f1bc0304e8d5ab3eb5cae44a42133e7cf2f655e95be351733760ed401d55e3717c4a1257c77644796c08cbe67f6 SHA512 fb61e4d7ae620684b128bd60112938a4a9721a82ed3aa4daa774837a2db60e989d608ce2ba7f51393f412b78244d6f4c8f1025416b137d8ce01a2c0375ffec65
 DIST setuptools-40.8.0.zip 845071 BLAKE2B a76b92a7e3a5cd87d74f3ff5f49fe4c6b2a1f0c5cc3b04219f6f773585be479ec5d092185129ada1fe5c5ef62714687beb3a316a6d50b559e9224aed468aef24 SHA512 f14976a76bff74b7494d44fcfffa511de0d142b4d308fcbf87b34c31c51491102e152acc11a383c5f6b693d1b18eb119c5186ca23deb12b2bbf186794b062868
 EBUILD setuptools-36.7.2.ebuild 1923 BLAKE2B b7f55129aaef27eee778fdfb97ef06f6f70e558402fe503dd73c7a23502e6454f8c1f0e8182770d9c3334ebe3c1a21eb19e3ee8a0bc26ed99a819e7484b040ef SHA512 98b9465fb954575ed3a4a0b3b5be1c8a4c30d60112d4d222e95786a5a221a5a13799c4055bf7cd074476bd7d65ee7cd5c9a4fcad2a571ba83583e67751bb8376
-EBUILD setuptools-40.6.3.ebuild 2057 BLAKE2B c63cd36c3ceb7bc6ae10b90994d1834d82d98ee99d25c045b7274a701fa4a9a8b053876e32a6870a55a275d632971ae4bd75ca2649b3d9641eb9454575132961 SHA512 a8416c4203d7fa5b21d22a638797ade77867ff54f827356c6d3b45f2de15637351a4971cd971701232e9806c8d3bbc35e58b21bd550ac144ab5ae6cd6fc5ec27
+EBUILD setuptools-40.6.3.ebuild 2056 BLAKE2B ca300bf06ffef94c44fb9aa4879a536c3c4319e0b29d8dbed82f223cee111a34c3db42fe82da4a5be1748caca6eb960683d1d0a4c5699058312a834870a01d43 SHA512 c332c72bb1e3cf38a98d5fc7903522c17a1ecdd850d076ea238e34f2638809ac9d1aecbdf9f793c67feac23045f3044298bdee6ce026f508394b2712ef2934f6
 EBUILD setuptools-40.7.3.ebuild 1993 BLAKE2B ae75fde0a8d0c778463f4ac50634b4b9f93b5ac15e5e8bf1c7ea9951fb8fc65c7d3ac8b11d57de1516b3d47e99a2756b492b10ce3b91eb401402d14da0d511d5 SHA512 06945865143b937fb74b601f1f0c598c93a6b3418432ab7963ebe44c6debf5d8823d5b0875d80ff15cce97e52dfb0ffab28914414ae8ea8ab530cb4efb0e6d19
 EBUILD setuptools-40.8.0.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
 EBUILD setuptools-9999.ebuild 2020 BLAKE2B f0ddf37f540afaf0bce258603b0d453abfa25b2616a8efc9c8144b16eeceda29b992bdeac4ef628e72fc073066293bfc30c8089944f5e24f191ee3f481d4e8e4 SHA512 269167eb6045429c55096d9daa3b752552dff68317506ba3dede93d4a84d056c72bcbad562bd94ec1d8d1e33e7fc1e8454d172d6a3357ddcb2dc634f739678cc
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index e34277df295d..2932866d6ee4 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index d7757d990d95..857696825a73 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,8 +1,6 @@
 AUX sip-4.18-darwin.patch 1187 BLAKE2B a3cd0418de90e7377bc2ae1206f4620c6be379a3bd38f22c19256b06f5ba0c90ff07f34dcc8d2f44a25244e11544176a5e1b91049d220bd56cc7b3876a26ba76 SHA512 1afe049fd21f0e8e5118dec4d4b74851cd5e2c75a66a93e1a79a42267954b1edfcff9644696c7d98342499fb27fde727a554b5739cbd791d17a0e319c1dddb7e
 DIST sip-4.19.13.tar.gz 1038815 BLAKE2B 0b6f2941140a535cfdfb51db71cf9a55e5f65be85961e304496fded7781da42b0ab7d01045b8802468a3ce3b57e7f571851fc7713fd47a03c8344017982d6632 SHA512 eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98
-DIST sip-4.19.14.dev1812231555.tar.gz 1020224 BLAKE2B e3df5a8b7829278987c5b368b8b6c28c04fc0b3bb3847451e48411ef9ba5cda932007613ad31f34381446ea02d62281b27ae4951babca5ec8b75f065aa296365 SHA512 decf2f7baacede27c42d359eb875a895c9a92b36a8e8a29f4666b3f98f570d821e80dbb32fd946ce230f726fafc4000af9b167df8cfd188bcd7f85fbc71bd4b1
-DIST sip-4.19.8.tar.gz 1024548 BLAKE2B e43dfe542061db9f1d5981d0cc172d9c8420c4e66c282c52974ab28314c33bd28e6056b61f74b04680c1735c9bd2c4656e1a541f4bae94c858d18713f6222914 SHA512 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7
+DIST sip-4.19.14.tar.gz 1049688 BLAKE2B 8e68910f533d0f58bef1f20ec58579ce0166efaee2caef1c64d4e9878b0887040d9284a9fa5ee48d7a4f0949866d0b988b0d962303f0ace03a4ad48bd08eec5d SHA512 afde261331f38eac863d8cea0e343649f460f0b9a603d7fe91f14583904ea4b488bbd88d20fad5c985c43c6c1683fffee38676d94831ac8f2de40d9ed4d0423e
 EBUILD sip-4.19.13.ebuild 2856 BLAKE2B 992b5ea525fd276db4ddeda3b067bafcedd4a603b869c5a847951d6c70050015f78371c66bd60589f5d13411ae35b62cc9cc90d5d82f69a25fb9f5479a76ac71 SHA512 4e75fd5bdad8200a6ffe53de8163cd03cb66a72a22c517dffcaff160b371af8cebdfdd81acb6451c7b0e1697c060adaa6488689f82a6364a97110eddbdd18951
-EBUILD sip-4.19.14_pre1812231555.ebuild 2428 BLAKE2B 4c90ed65cda608b72309fa750ed40b9caef6be7e1fd45dc015f1c141491b962dd2c3d03c62be727bd49adddc2787a1ba4a09cacabb8e84c9f10aed1d3a3fc84c SHA512 97f55007a9bb8b11271a836a0267a24f906e0a87af0b4a2515d6726e6c0270e5ebf996c4a4ee7b2023a8cf1b61d19de67dd2e548fe209835cee725e781a6dfd6
-EBUILD sip-4.19.8.ebuild 2853 BLAKE2B a91e020e4e7b94873647ac68916d3a11467eed22e594871c20ccb94b958f8c51a1c00288f3344897b371a55088db1411b6bac74d014743f0ee099de9a74383a4 SHA512 f64b92e9a226f4d15d62c672532ec175b2191efc423d5d29b13dd4187447e9d5d7fdecb5147850bc6d9065c11906236b9cff017d4ee17f78bfbe869fbebc9225
-MISC metadata.xml 593 BLAKE2B 3c4b5ccd30162027c913070a54eb9b836a7add04532e1c5b03dd83f0e4e58da0d2e19aee90f1fa4a97db0008a06575a5b0fe33986e1b0c9d473e4adff056afdd SHA512 91f8918bffb715bfb1def9aa6717a8c4149b36e6a1f79e7e3d4c56e0edc51a6585dad3a93698e956f1ff0e659c1f975c3f23be5a498479fc5052369840ac83d5
+EBUILD sip-4.19.14.ebuild 2428 BLAKE2B 9caeca45fcbd171794a03ad6dcbaba07fd187a3ccfb5f2120c97ba7ea8e6b1cf0d8e676902dd933c1582bd32d7105da27b598dbb86d67e04859e711b743e8a9d SHA512 43befcfad315a2f2d642ae587fe44e8a646bf528baa58b34873509a249d4459d38df905cf0126adb0cc67a64ab262b0ca4f933822ef3f8692451980a063a73a8
+MISC metadata.xml 648 BLAKE2B f49eaeae5e37d91c569b93fdadc4401e478c54a754290ce37dd51d1d03340ead54f4d0f52389d87b91801a2c1ad0040347e629068a6c0ffe79a9e3442498e4f6 SHA512 1a2a4fb4e7fb35fb6177d62d5c866a5c65c1915ff38de5815823864fb6d9a90beaa8897e28a65f79770a621ccdd83755c682df29a25bf00a76ffd51b215dcdf9
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index 9b8cb511f250..bac1beb353f3 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -10,9 +10,9 @@
 			<email>phil@riverbankcomputing.com</email>
 			<name>Phil Thompson</name>
 		</maintainer>
+		<changelog>https://www.riverbankcomputing.com/static/Downloads/sip/ChangeLog</changelog>
+		<doc>https://www.riverbankcomputing.com/static/Docs/sip/</doc>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<doc>http://pyqt.sourceforge.net/Docs/sip4/</doc>
 		<remote-id type="pypi">SIP</remote-id>
-		<remote-id type="sourceforge">pyqt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sip/sip-4.19.14_pre1812231555.ebuild b/dev-python/sip/sip-4.19.14.ebuild
index 47ab306936cb..e694b38a121f 100644
--- a/dev-python/sip/sip-4.19.14_pre1812231555.ebuild
+++ b/dev-python/sip/sip-4.19.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,18 +9,18 @@ inherit python-r1 toolchain-funcs
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
 
-MY_P=${P/_pre/.dev}
+MY_P=sip-${PV/_pre/.dev}
 if [[ ${PV} == *_pre* ]]; then
 	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
 else
-	SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+	SRC_URI="https://www.riverbankcomputing.com/static/Downloads/sip/${MY_P}.tar.gz"
 fi
 
 # Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
 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"
-IUSE="debug doc"
+IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -49,12 +49,11 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		local incdir=$(python_get_includedir)
-
 		if ! python_is_python3; then
 			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
 		fi
 
+		local incdir=$(python_get_includedir)
 		local myconf=(
 			"${PYTHON}"
 			"${S}"/configure.py
@@ -62,7 +61,6 @@ src_configure() {
 			--bindir="${EPREFIX}/usr/bin"
 			--destdir="$(python_get_sitedir)"
 			--incdir="${incdir#${SYSROOT}}"
-			$(usex debug --debug '')
 			AR="$(tc-getAR) cqs"
 			CC="$(tc-getCC)"
 			CFLAGS="${CFLAGS}"
diff --git a/dev-python/sip/sip-4.19.8.ebuild b/dev-python/sip/sip-4.19.8.ebuild
deleted file mode 100644
index bd65f8202bbf..000000000000
--- a/dev-python/sip/sip-4.19.8.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://www.riverbankcomputing.com/hg/sip"
-elif [[ ${PV} == *_pre* ]]; then
-	MY_P=${P/_pre/.dev}
-	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-else
-	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/12"
-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"
-IUSE="debug doc"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-if [[ ${PV} == *9999 ]]; then
-	DEPEND+="
-		sys-devel/bison
-		sys-devel/flex
-		doc? ( dev-python/sphinx[$(python_gen_usedep 'python2*')] )"
-fi
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-if [[ ${PV} == *9999 ]]; then
-	REQUIRED_USE+=" || ( $(python_gen_useflags 'python2*') )"
-fi
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
-	if [[ ${PV} == *9999 ]]; then
-		python_setup 'python2*'
-		"${PYTHON}" build.py prepare || die
-		if use doc; then
-			"${PYTHON}" build.py doc || die
-		fi
-	fi
-
-	# Sub-slot sanity check
-	local sub_slot=${SLOT#*/}
-	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
-	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
-		eerror
-		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
-		eerror "Please update SLOT variable as follows:"
-		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
-		eerror
-		die "sub-slot sanity check failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	configuration() {
-		if ! python_is_python3; then
-			local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		fi
-
-		local myconf=(
-			"${PYTHON}"
-			"${S}"/configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--destdir="$(python_get_sitedir)"
-			--incdir="$(python_get_includedir)"
-			$(usex debug --debug '')
-			AR="$(tc-getAR) cqs"
-			CC="$(tc-getCC)"
-			CFLAGS="${CFLAGS}"
-			CFLAGS_RELEASE=
-			CXX="$(tc-getCXX)"
-			CXXFLAGS="${CXXFLAGS}"
-			CXXFLAGS_RELEASE=
-			LINK="$(tc-getCXX)"
-			LINK_SHLIB="$(tc-getCXX)"
-			LFLAGS="${LDFLAGS}"
-			LFLAGS_RELEASE=
-			RANLIB=
-			STRIP=
-		)
-		echo "${myconf[@]}"
-		"${myconf[@]}" || die
-	}
-	python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	installation() {
-		emake DESTDIR="${D}" install
-		python_optimize
-	}
-	python_foreach_impl run_in_build_dir installation
-
-	einstalldocs
-	use doc && dodoc -r doc/html
-}
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index a62245618cc4..e5682b51a675 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,5 +1,5 @@
 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 BLAKE2B 77cbf582412c4c800d18979165f501a684c1c4bdfd2e488b75ab10aee86e5696481751b7f146fe9b259ecbd94b7d456ec86f24ec2d4ef2333e79991c1846151f SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f
 DIST sphinx_rtd_theme-0.2.4.tar.gz 1392456 BLAKE2B daf2365d74823465a73ea37352f0a8e85f196ac9c89006e79610a2981b1a266e523865c3b6f7866fa9e77a856c5a6fe001a2eb114dcb252920b19231eade9709 SHA512 865b09febc1c289d47a8be3f3d7caa9d2a4715b350e2e2d058855831321a6f870e8339b2ef22eafc2b9fe72ad48f96b8d2fda4bc032c5f8dcdf23f314869cfbb
 EBUILD sphinx_rtd_theme-0.1.9.ebuild 535 BLAKE2B c3826e00c2b5031a4a62e6610ffef29d874171c42ad1cb3d1e85f42b66b37d54728bce53849beebb4b4a4f07af638d093ed96474da22056be86e2e854242f4d8 SHA512 d2319f60ce16e54a0128181dd514ee15834650698bd92ee0c5e8a11f3c698effa7f2fd282e0def285e9a8a0a2d688ae8caa4d83953c9cc9548d135844902b87a
-EBUILD sphinx_rtd_theme-0.2.4.ebuild 569 BLAKE2B e3a0269ab62272f43df0c2b7e55077cbee930c0a4fa899bf6f488614c07c0aa34b11e0ff7ff5de3e7bde96771be33ca5da7d73b10b9d6b510e2a2709ebb2f378 SHA512 46ff5df574ff2cd935fee28e946be9c13a7e21f205d247ff02678cee81a1ff6f1360f1499a1ffd4384744c61e0dfd4dbdd0103a84e94bcc401e1287e15dba1d6
+EBUILD sphinx_rtd_theme-0.2.4.ebuild 563 BLAKE2B 6081b9c76a90c8999af37ab2cb996fbcbc34de1b3c71acde8991fc1c1690e113d46a0cb1b8430da3c313c4b565997688f5a90f51318a1c42058a4bf74dc41b58 SHA512 2758700735c219cc778ba82d066c9c86ae2b901808a851a803485a1dcd28974f08f1d7019df12bb1ded2c49fa4d8cf42fe8e5801d5482dc632caab2b290044a7
 MISC metadata.xml 393 BLAKE2B 0964b64f29bebc684900cd181b7947897d10f617c091d6936ccbfb27f91356d83de2ad0172a95245b363cf6005fe2defe8e80aab2bbcec5f292bc79fdad7b7d8 SHA512 f3ccf901c6d0a891880bf06e1708a1e19225cf1ba60c3cad1e8bf5dfb665274fac7de87b4363734f8f299a9af589e3de64b9e38ca14a405fe33e4c63321e4572
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index a56c81e8e5ce..69445921a796 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.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 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/tracing/Manifest b/dev-python/tracing/Manifest
index 8d1aa5b3c1b1..1566f13c2a64 100644
--- a/dev-python/tracing/Manifest
+++ b/dev-python/tracing/Manifest
@@ -1,5 +1,5 @@
 DIST python-tracing_0.8.orig.tar.gz 18796 BLAKE2B d8f8e76c8a37e457be3806e7fc24192756198bda2689c47d60cbc62ad4b43cd53ff18c4cde392a276fd560ccdca316126efd5d7171a3efebd1e2021645e8a307 SHA512 9a5262ce63dbcafff83a75586e90be280ff41f902d9f71f4274dac944db4196c6a5777e290ca5e49aa010fb3129d5352d8c10a554918375557525b9a56ac9096
 DIST tracing-0.10.tar.gz 20364 BLAKE2B 8c37ed178d037c8a3db22955999df3c6716c4cb35b1eca04e53e788aa0219e2eafa77ff489b1b6f77c60c6aba078d8e12f67a191e9a25d22bc112ee5124d85ee SHA512 3e9874d55df3b599cddc817680e49fed2bbaaf510597c4f41984a742b22c0b3596d29875f2fedcb890b3acf43cd5c52faad7de334781d9eec16676e9f10bf5d1
-EBUILD tracing-0.10.ebuild 662 BLAKE2B d6f4948b6bbf2030cfc0a33806b54ad07a83c9cc91045c1db72e808716e6ba89029d218be041a5b885bffdf8d396c0297357a0b62fb34685c04f04a6f926a2c7 SHA512 a1d054229986168cfbdd00b6dc0f787ac39ab4623bce1a06b96596afbe2cc5b300afaaaf2633eedd48aedf9d9c1fb504c02b2fc4a4ca900b26ac1c261e3829aa
+EBUILD tracing-0.10.ebuild 658 BLAKE2B 49dec3127a3171fcb81c9f8162dbaeeab0ecc7f21add5dfc1dd62f9fcd822452fc6f02e27a6e7ab7eaf207fda6565f512fd76142e4cfad66e80b73669ff95853 SHA512 60be95126a325ed66b21b68969749e6035528ca6f24325d09f307793208027ea7f5c406f7c8316d7ad8ebc57d48731852f52fb41490811cd58d8a37d2cf00433
 EBUILD tracing-0.8.ebuild 709 BLAKE2B 7529d5b57fc74468af068366392b8e5aad9d964dee83c4e03eca6bb67dd2eae88be353d3f429e064cdc2552a1864a2f0887dcecd57026afdbfee20eea8101816 SHA512 e2dd714778c6bca2005e443e58ee55bd4101d4e93247bddcad97cbfa91baec003a9b99ff9f1972b0f08ba422e94bb0dc93bc513b43ee8882f66d9117c3ef7cfc
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/tracing/tracing-0.10.ebuild b/dev-python/tracing/tracing-0.10.ebuild
index 06900b879fc1..09b209a18b6f 100644
--- a/dev-python/tracing/tracing-0.10.ebuild
+++ b/dev-python/tracing/tracing-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://git.liw.fi/cgi-bin/cgit/cgit.cgi/python-tracing/snapshot/${P}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc examples"
 
 python_compile_all() {
diff --git a/dev-python/twitter/Manifest b/dev-python/twitter/Manifest
index 800e4faec4c3..df287bcb463e 100644
--- a/dev-python/twitter/Manifest
+++ b/dev-python/twitter/Manifest
@@ -1,3 +1,3 @@
-DIST twitter-1.17.1.tar.gz 44023 BLAKE2B c647834b658799c0253e58207e433f4d648f71544ec2b81d78bdedb09c5e090ae920c276f1aac3fbead4e54548f4f0e09b2c26aae82bdb11f1fbcb38da2c0ed4 SHA512 17ea867d0c4183cd97aec610c8757def6c23648f18c4bfd3bceca150de6bdbeab036fefe699e976fac11d3d0b0d2c574c0f1726818576a898a92a8335d0342dd
-EBUILD twitter-1.17.1.ebuild 468 BLAKE2B e9d0e697d2fbd6568c332f7e8ab15829dbd1b84f3c7081aae99051c436f80b8b0a3fc5152faabb3ca0eb17babb642516b6d9ef2a574e620b3d3e48c156d4a4e6 SHA512 180407eb67d5c01c6334fbac2a3f18af197e280ada91ba18ffd9c7e5a988b64c204b2f82f92c69045e433e646a1da62e076be193d86dbd3a190ccc547609c1fe
+DIST twitter-1.18.0.tar.gz 47695 BLAKE2B 2604370a303c479d371dd0c5b6c1855b990c38cf0d9ef710c740ae69740d0cfddb2a18d465deaca2146e43debea0175f9e444c0a7bb5931a95f9124d80237ae6 SHA512 dda752b194efe88df88a2c9e2279cd3045a36c466f05493727a73aaaa74ca99873c1dc1742491f2f4092eff5afb9ad7680a779f16041d9c3dae7c6eea013ea48
+EBUILD twitter-1.18.0.ebuild 444 BLAKE2B cdc27ddbbd9383018b63039376575482f90caef5b456268dcdacfb15cca4dfc4f3b2c7dcab844bb77c33a8013bebc3d83792cc2ff80b0154f05e96367685a2f1 SHA512 cd5161315e144b632ffbf287b6747482bc138a3682be481f3ca3f3c067db439dae41e949463f555226c72d42c14294c843f7ec72901f6f044904ecd692536505
 MISC metadata.xml 430 BLAKE2B 2e81a109681748c54ff8adabf59b7505651b87fd1e7bb41c0582eef0633dac9276961d833b8bdb3117683eab4483c17e06b61b82e82a44770c9ce408e8241850 SHA512 a09ea3d4855ee4999f5cd2b182066044cc578abf5a68bf6dc5c0c6fb2e3913aae825d2a5a174501957dbcd1fc92d047f4997ae067fbea6d2f674ed1f785f820a
diff --git a/dev-python/twitter/twitter-1.17.1.ebuild b/dev-python/twitter/twitter-1.18.0.ebuild
index b569a9fb5ff3..171b7cde139b 100644
--- a/dev-python/twitter/twitter-1.17.1.ebuild
+++ b/dev-python/twitter/twitter-1.18.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 
 inherit distutils-r1
@@ -13,7 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index 7c4e24ca7af1..4061311fa898 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,5 +1,5 @@
 DIST zope.event-4.2.0.tar.gz 488532 BLAKE2B 89c2c2e9e75a57afd43f7ee984cbe8f7add3cb4eaf1271695b2a5c31e77e5fccb0c884d3f8c44c54fbd06be209e4556bc2438cda9bc987124d46e795822bd841 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989
 DIST zope.event-4.3.0.tar.gz 17829 BLAKE2B 5d508c834321c70399eb9888bc2b000f5b18de625c68dc089f3ab8571a7948c1e43e76c62811c955777fc2caa65585347c124e24f2afc46b23e9d30b6c4a4599 SHA512 dad303d1b76c75dcc98f1164c6dec8f8458f1adc4109146942cf9ff40ed3f92579b2da742b10798bc720ab17cbdebc86e54008cfa5155616e2ac68b332e62571
-EBUILD zope-event-4.2.0.ebuild 869 BLAKE2B 8ea1f0050b13e3f65a5d7575e78ce1d0f5e1cb0da128031676aba13a90e6edee488f0e215861ecbc382a80355b51083a5c5e33d07fa33f06d2a6e24036a38af1 SHA512 c522d3536a55c0f6bc85ec5cff427fb4332c97f4b60244b4b573f06fd7a89473d5ea621277fe9bbf4e278c4029a10367779e262863fdbad182d23135d2d3a33b
+EBUILD zope-event-4.2.0.ebuild 865 BLAKE2B b82445bef60a1fd53cecc3c667e780b13bef310f7241fd010f842f037affd9ed3de3f63b3c962e753bf75b9abc746e064455ae1709538e05beed2386be75cd7b SHA512 d45706f5347d229223452449f09868e5d93598650e3f91637735b5e87148abd3b5c358375bec49d3f1ae0cfd39bdb617caefb6c12d7f00d3613fc5d39bef67e9
 EBUILD zope-event-4.3.0.ebuild 1105 BLAKE2B f8dd37b31f9377129cd94910cc24fb3686c3e22cd9ef2aa6eb885bbb1718e8dd328cc3fc6f5a8352f1803df954c05a4c1fd7ec94ef68c74df0b1083084e564e9 SHA512 846a2c0d13b23c8b29f57d7d5d1a66115193a853fd55e4f68d9c20fc73a4fabcfa65a74641cae4acb713ec119d5534a8ad1a55b65f6863710eb1741c5d276222
 MISC metadata.xml 378 BLAKE2B 53e40f9f0e2a3c17be6503b23c943f72c4221f8d131e56378bc7aa56ed8d889706a4e09f177e137fd1cdece259a2b13a2c6aabf4709b57e20d7e3964fdc580d7 SHA512 b04f8e3a6a16e89458912a27c16154f89067883f11c35552a00cd273095b30ae085b19eb0bebe860055db4876d23085b062b57f937eca21bbc98098a8a06a831
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
index 1e495e37dd31..d767f84d1b53 100644
--- a/dev-python/zope-event/zope-event-4.2.0.ebuild
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="ZPL"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-16 12:59:29 +0000
commit	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch)
tree	ade7cb031f363fad64c77139dea7aa3d81908537 /dev-python
parent	6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff)